FoxyStripePurchaseForm - only include Weight if greater than 0 (#372)

fixes #317 Ensure Code is unique via index and validator Move weight to Main tab due to being required
dynamic · Dec 5, 2018 · ec7e1c7 · ec7e1c7
1 parent 1a1c218
commit ec7e1c7
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 38 deletions.
diff --git a/src/Form/FoxyStripePurchaseForm.php b/src/Form/FoxyStripePurchaseForm.php
@@ -173,11 +173,13 @@ protected function getProductFields(FieldList $fields)
                 'price',
                 $this->product->Price
             ))->setValue($this->product->Price));//can't override id
-            $fields->push(HiddenField::create(ProductPage::getGeneratedValue(
-                $code,
-                'weight',
-                $this->product->Weight
-            ))->setValue($this->product->Weight));
+            if ($this->product->Weight > 0) {
+                $fields->push(HiddenField::create(ProductPage::getGeneratedValue(
+                    $code,
+                    'weight',
+                    $this->product->Weight
+                ))->setValue($this->product->Weight));
+            }
 
             $image = null;
             if ($this->product->Image() || ProductPage::has_extension(ProductPageLegacy::class)) {

diff --git a/src/Page/ProductPage.php b/src/Page/ProductPage.php
@@ -141,7 +141,10 @@ class ProductPage extends \Page implements PermissionProvider
      * @var array
      */
     private static $indexes = [
-        'Code' => true, // make unique
+        'Code' => [
+            'type' => 'unique',
+            'columns' => ['Code'],
+        ],
     ];
 
     /**
@@ -150,7 +153,7 @@ class ProductPage extends \Page implements PermissionProvider
     private static $defaults = [
         'ShowInMenus' => false,
         'Available' => true,
-        'Weight' => '1.0',
+        'Weight' => '0.0',
     ];
 
     /**
@@ -261,6 +264,13 @@ public function getCMSFields()
                             'ProductPage.PriceDescription',
                             'Base price for this product. Can be modified using Product Options'
                         )),
+                    NumericField::create('Weight')
+                        ->setTitle(_t('ProductPage.Weight', 'Weight'))
+                        ->setDescription(_t(
+                            'ProductPage.WeightDescription',
+                            'Base weight for this product in lbs. Can be modified using Product Options'
+                        ))
+                        ->setScale(2),
                     $catField,
                 ],
                 'Content'
@@ -286,13 +296,6 @@ public function getCMSFields()
                         'ProductPage.AvailableDescription',
                         'If unchecked, will remove "Add to Cart" form and instead display "Currently unavailable"'
                     )),
-                NumericField::create('Weight')
-                    ->setTitle(_t('ProductPage.Weight', 'Weight'))
-                    ->setDescription(_t(
-                        'ProductPage.WeightDescription',
-                        'Base weight for this product in lbs. Can be modified using Product Options'
-                    ))
-                    ->setScale(2),
                 TextField::create('ReceiptTitle')
                     ->setTitle(_t('ProductPage.ReceiptTitle', 'Product Title for Receipt'))
                     ->setDescription(_t(
@@ -334,6 +337,40 @@ public function getCMSFields()
         return parent::getCMSFields();
     }
 
+    /**
+     * @return RequiredFields
+     */
+    public function getCMSValidator()
+    {
+        return new RequiredFields(['CategoryID', 'Price', 'Weight', 'Code']);
+    }
+
+    /**
+     * @return \SilverStripe\ORM\ValidationResult
+     */
+    public function validate()
+    {
+        $result = parent::validate();
+
+        if (ProductPage::get()->filter('Code', $this->Code)->exclude('ID', $this->ID)->first()) {
+            $result->addError('Code must be unique for each product.');
+        }
+
+        /*if($this->ID>0){
+            if ($this->Price <= 0) {
+                $result->addError('Price must be a positive value');
+            }
+            if($this->Weight <= 0){
+                $result->error('Must set a positive weight value');
+            }
+            if($this->Code == ''){
+                $result->error('Must set a product code');
+            }
+        }*/
+
+        return $result;
+    }
+
     /**
      * @return \SilverStripe\ORM\ManyManyList
      */
@@ -421,30 +458,6 @@ public function onBeforeDelete()
         parent::onBeforeDelete();
     }
 
-    public function validate()
-    {
-        $result = parent::validate();
-
-        /*if($this->ID>0){
-            if($this->Price <= 0) {
-                $result->error('Must set a positive price value');
-            }
-            if($this->Weight <= 0){
-                $result->error('Must set a positive weight value');
-            }
-            if($this->Code == ''){
-                $result->error('Must set a product code');
-            }
-        }*/
-
-        return $result;
-    }
-
-    public function getCMSValidator()
-    {
-        return new RequiredFields(['CategoryID', 'Price', 'Weight', 'Code']);
-    }
-
     /**
      * @param null $productCode
      * @param null $optionName