Merge pull request #735 from madmatt/pulls/misc-fixes

Misc fixes made during project

src/Model/Order.php

@@ -19,6 +19,7 @@
 use SilverStripe\Forms\DateField;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
@@ -310,7 +311,11 @@ public function getCMSFields()
             $parts[] = LiteralField::create('Notes', $fs . $this->renderWith('SilverShop\Admin\OrderAdmin_Notes') . $fe);
         }
         $fields->addFieldsToTab('Root.Main', $parts);
+
+        $fields->addFieldToTab('Root.Modifiers', new GridField('Modifiers', 'Modifiers', $this->Modifiers()));
+
         $this->extend('updateCMSFields', $fields);
+
         if ($payments = $fields->fieldByName('Root.Payments.Payments')) {
             $fields->removeByName('Payments');
             $fields->insertAfter('Content', $payments);
@@ -430,9 +435,6 @@ public function SubTotal()
      */
     public function calculate()
     {
-        if (!$this->IsCart()) {
-            return $this->Total;
-        }
         $calculator = OrderTotalCalculator::create($this);
         return $this->Total = $calculator->calculate();
     }

src/Model/Variation/Variation.php

@@ -317,6 +317,17 @@ public function addLink()
         return $this->Item()->addLink($this->ProductID, $this->ID);
     }
 
+    /**
+     * Returns a link to the parent product of this variation (variations don't have their own pages)
+     *
+     * @param $action string
+     *
+     * @return string
+     */
+    public function Link($action = null) {
+        return ($this->ProductID) ? $this->Product()->Link($action) : false;
+    }
+
     public function createItem($quantity = 1, $filter = array())
     {
         $orderitem = self::config()->order_item;