Merge 1e1258c into e880157

silvershop · May 20, 2020 · 62a3289 · 62a3289
2 parents e880157 + 1e1258c
commit 62a3289
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,8 @@
     "silverstripe/asset-admin": "*",
     "silverstripe/silverstripe-omnipay": "^3@dev",
     "silvershop/silverstripe-listsorter": "^3@dev",
-    "silvershop/silverstripe-sqlquerylist": "^2@dev"
+    "silvershop/silverstripe-sqlquerylist": "^2@dev",
+    "symbiote/silverstripe-gridfieldextensions": "^3.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7",

diff --git a/src/Extension/ProductVariationsExtension.php b/src/Extension/ProductVariationsExtension.php
@@ -17,6 +17,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\ArrayData;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 
 /**
  * Adds extra fields and relationships to Products for variations support.
@@ -49,13 +50,16 @@ public function updateCMSFields(FieldList $fields)
                     __CLASS__ . '.AttributesDescription',
                     'These are fields to indicate the way(s) each variation varies. Once selected, they can be edited on each variation.'
                 )),
-            GridField::create(
+            $variationsGridField = GridField::create(
                 'Variations',
                 _t(__CLASS__ . '.Variations', 'Variations'),
                 $this->owner->Variations(),
                 GridFieldConfig_RecordEditor::create()
             )
         ]);
+
+        $variationsGridField->getConfig()->addComponent($sort = new GridFieldOrderableRows('Sort'));
+
         if ($this->owner->Variations()->exists()) {
             $fields->addFieldToTab(
                 'Root.Pricing',

diff --git a/src/Model/Variation/Variation.php b/src/Model/Variation/Variation.php
@@ -40,6 +40,7 @@
 class Variation extends DataObject implements Buyable
 {
     private static $db = [
+        'Sort' => 'Int',
         'InternalItemID' => 'Varchar(30)',
         'Price' => 'Currency(19,4)',