dynamic / foxystripe

code/pages/ProductHolder.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     {
         if ($children = $this->AllChildren()) {
             foreach ($children as $child) {
-                if (in_array($child->ID, $idList)) continue;
+                if (in_array($child->ID, $idList)) {
+                    continue;
+                }
 
                 if ($child instanceof ProductHolder) {
                     $idList[] = $child->ID;

code/form/FoxyStripeDropdownField.php

Indentation +33 added lines, -33 removed lines

@@ -50,41 +50,41 @@
  */
 class FoxyStripeDropdownField extends DropdownField{
 
-	/**
-	 * Mark certain elements as disabled,
-	 * regardless of the {@link setDisabled()} settings.
-	 *
-	 * @param array $items Collection of array keys, as defined in the $source array
+    /**
+     * Mark certain elements as disabled,
+     * regardless of the {@link setDisabled()} settings.
+     *
+     * @param array $items Collection of array keys, as defined in the $source array
      * @return $this
-	 */
-	public function setDisabledItems($items){
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
-				array_push($updated, FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $item, 'value'));
-			}
-		}
-		$this->disabledItems = $updated;
-		return $this;
-	}
+     */
+    public function setDisabledItems($items){
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($items) && !empty($items)){
+            foreach($items as $item){
+                array_push($updated, FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $item, 'value'));
+            }
+        }
+        $this->disabledItems = $updated;
+        return $this;
+    }
 
-	/**
-	 * @param array $source
+    /**
+     * @param array $source
      * @return $this
-	 */
-	public function setSource($source) {
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
-				$updated[FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
-			}
-		}
-		$this->source = $updated;
-		return $this;
-	}
+     */
+    public function setSource($source) {
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($source) && !empty($source)){
+            foreach($source as $key => $val){
+                $updated[FoxyStripeProduct::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
+            }
+        }
+        $this->source = $updated;
+        return $this;
+    }
 
 }

code/objects/ProductImage.php

Indentation +29 added lines, -29 removed lines

@@ -7,25 +7,25 @@ 
 
 class ProductImage extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Text',
-		'SortOrder' => 'Int'
-	);
+    private static $db = array(
+        'Title' => 'Text',
+        'SortOrder' => 'Int'
+    );
 
-	private static $has_one = array(
-		'Image' => 'Image',
-		'Product' => 'FoxyStripeProduct'
-	);
+    private static $has_one = array(
+        'Image' => 'Image',
+        'Product' => 'FoxyStripeProduct'
+    );
 
-	private static $default_sort = 'SortOrder';
+    private static $default_sort = 'SortOrder';
 
-	private static $summary_fields = array(
-		'Image.CMSThumbnail' => 'Image',
-		'Title' => 'Caption'
-	);
+    private static $summary_fields = array(
+        'Image.CMSThumbnail' => 'Image',
+        'Title' => 'Caption'
+    );
 
-	public function getCMSFields(){
-		$fields = FieldList::create(
+    public function getCMSFields(){
+        $fields = FieldList::create(
             TextField::create('Title')
                 ->setTitle(_t('ProductImage.Title', 'Product Image Title')),
             UploadField::create('Image')
@@ -34,25 +34,25 @@ 
                 ->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
         );
 
-		$this->extend('updateCMSFields', $fields);
+        $this->extend('updateCMSFields', $fields);
 
         return $fields;
-	}
+    }
 
-	public function canView($member = false) {
-		return true;
-	}
+    public function canView($member = false) {
+        return true;
+    }
 
-	public function canEdit($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canEdit($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canDelete($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canDelete($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/objects/OptionItem.php

Indentation +163 added lines, -163 removed lines

@@ -7,84 +7,84 @@ 
 
 class OptionItem extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Text',
-		'WeightModifier' => 'Int',
-		'CodeModifier' => 'Text',
-		'PriceModifier' => 'Currency',
-		'WeightModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'CodeModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'PriceModifierAction' => "Enum('Add,Subtract,Set','Add')",
-		'Available' => 'Boolean',
-		'SortOrder' => 'Int'
-	);
-
-	private static $has_one = array(
-		'Product' => 'FoxyStripeProduct',
-		'ProductOptionGroup' => 'OptionGroup',
-	);
+    private static $db = array(
+        'Title' => 'Text',
+        'WeightModifier' => 'Int',
+        'CodeModifier' => 'Text',
+        'PriceModifier' => 'Currency',
+        'WeightModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'CodeModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'PriceModifierAction' => "Enum('Add,Subtract,Set','Add')",
+        'Available' => 'Boolean',
+        'SortOrder' => 'Int'
+    );
+
+    private static $has_one = array(
+        'Product' => 'FoxyStripeProduct',
+        'ProductOptionGroup' => 'OptionGroup',
+    );
 
     private static $belongs_many_many = array(
         'OrderDetails' => 'OrderDetail'
     );
 
     private static $defaults = array(
-		'Available' => true
-	);
+        'Available' => true
+    );
 
-	private static $summary_fields = array(
-		'Title' => 'Title',
-		'ProductOptionGroup.Title' => 'Group',
+    private static $summary_fields = array(
+        'Title' => 'Title',
+        'ProductOptionGroup.Title' => 'Group',
         'Available.Nice' => 'Available'
-	);
+    );
 
-	private static $default_sort = 'SortOrder';
+    private static $default_sort = 'SortOrder';
 
-	public function getCMSFields(){
-		$fields = FieldList::create(
-			new Tabset('Root',
-				new Tab('Main'),
-				new Tab('Modifiers')
-			)
-		);
+    public function getCMSFields(){
+        $fields = FieldList::create(
+            new Tabset('Root',
+                new Tab('Main'),
+                new Tab('Modifiers')
+            )
+        );
 
-		// set variables from Product
+        // set variables from Product
         $productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
         $product = ProductPage::get()->byID($productID);
 
-		$parentPrice = $product->obj('Price')->Nice();
-		$parentWeight = $product->Weight;
-		$parentCode = $product->Code;
-
-		// ProductOptionGroup Dropdown field w/ add new
-		$groups = function(){
-		    return OptionGroup::get()->map()->toArray();
-		};
-		$groupFields = singleton('OptionGroup')->getCMSFields();
-		$groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
-			->setEmptyString('')
+        $parentPrice = $product->obj('Price')->Nice();
+        $parentWeight = $product->Weight;
+        $parentCode = $product->Code;
+
+        // ProductOptionGroup Dropdown field w/ add new
+        $groups = function(){
+            return OptionGroup::get()->map()->toArray();
+        };
+        $groupFields = singleton('OptionGroup')->getCMSFields();
+        $groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
+            ->setEmptyString('')
             ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
-		if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+        if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
 
         $fields->addFieldsToTab('Root.Main', array(
-			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
-			Textfield::create('Title')
+            HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
+            Textfield::create('Title')
                 ->setTitle(_t("OptionItem.Title", "Product Option Name")),
-			CheckboxField::create('Available')
-				->setTitle( _t("OptionItem.Available", "Available for purchase"))
+            CheckboxField::create('Available')
+                ->setTitle( _t("OptionItem.Available", "Available for purchase"))
                 ->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
-			$groupField
-		));
+            $groupField
+        ));
 
-		$fields->addFieldsToTab('Root.Modifiers', array(
-			HeaderField::create('ModifyHD', _t('OptionItem.ModifyHD', 'Product Option Modifiers'), 2),
+        $fields->addFieldsToTab('Root.Modifiers', array(
+            HeaderField::create('ModifyHD', _t('OptionItem.ModifyHD', 'Product Option Modifiers'), 2),
 
-			// Weight Modifier Fields
-			HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
-			NumericField::create('WeightModifier')
+            // Weight Modifier Fields
+            HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
+            NumericField::create('WeightModifier')
                 ->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
-			DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
-				array(
+            DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
+                array(
                     'Add' => _t(
                         'OptionItem.WeightAdd',
                         "Add to Base Weight ({weight})",
@@ -98,56 +98,56 @@ 
                         array('weight' => $parentWeight)
                     ),
                     'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
 
-			// Price Modifier FIelds
-			HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
-			CurrencyField::create('PriceModifier')
+            // Price Modifier FIelds
+            HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
+            CurrencyField::create('PriceModifier')
                 ->setTitle(_t('OptionItem.PriceModifier', 'Price')),
-			DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
-				array(
-					'Add' => _t(
+            DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
+                array(
+                    'Add' => _t(
                         'OptionItem.PriceAdd',
                         "Add to Base Price ({price})",
                         'Add to price',
                         array('price' => $parentPrice)
                     ),
-					'Subtract' => _t(
+                    'Subtract' => _t(
                         'OptionItem.PriceSubtract',
                         "Subtract from Base Price ({price})",
                         'Subtract from price',
                         array('price' => $parentPrice)
                     ),
-					'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.PriceDescription', 'Does price modify or replace base price?')),
-
-			// Code Modifier Fields
-			HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
-			TextField::create('CodeModifier')
+                    'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.PriceDescription', 'Does price modify or replace base price?')),
+
+            // Code Modifier Fields
+            HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
+            TextField::create('CodeModifier')
                 ->setTitle(_t('OptionItem.CodeModifier', 'Code')),
-			DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
-				array(
-					'Add' => _t(
+            DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
+                array(
+                    'Add' => _t(
                         'OptionItem.CodeAdd',
                         "Add to Base Code ({code})",
                         'Add to code',
                         array('code' => $parentCode)
                     ),
-					'Subtract' => _t(
+                    'Subtract' => _t(
                         'OptionItem.CodeSubtract',
                         'Subtract from Base Code ({code})',
                         'Subtract from code',
                         array('code' => $parentCode)
                     ),
-					'Set' => _t('OptionItem.CodeSet', 'Set as a new Code')
-				)
-			)->setEmptyString('')
-			->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?'))
-		));
+                    'Set' => _t('OptionItem.CodeSet', 'Set as a new Code')
+                )
+            )->setEmptyString('')
+            ->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?'))
+        ));
 
         /*
         // Cateogry Dropdown field w/ add new
@@ -166,85 +166,85 @@ 
         */
 
         // allow CMS fields to be extended
-		$this->extend('getCMSFields', $fields);
-
-		return $fields;
-	}
-
-	public function validate(){
-		$result = parent::validate();
-
-		if($this->ProductOptionGroupID == 0){
-			$result->error('Must set a Group prior to saving');
-		}
-
-		return $result;
-	}
-
-	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
-		switch($oma){
-			case 'Subtract':
-				$symbol = '-';
-				break;
-			case 'Set':
-				$symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
-				break;
-			default:
-				$symbol = '+';
-		}
-		return $symbol;
-	}
-
-	public function getWeightModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
-	}
-
-	public function getPriceModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
-	}
-
-	public function getCodeModifierWithSymbol(){
-		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-	}
-
-	public function getProductOptionGroupTitle(){
-		return $this->ProductOptionGroup()->Title;
-	}
-
-	public function getGeneratedValue(){
-		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-		$modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
-		$modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
-		$modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
-		$modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-		return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
-	}
-
-	public function getGeneratedTitle(){
-		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-		$title = $this->Title;
-		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
-		return $title;
-	}
-
-	public function getAvailability(){
-		return ($this->Available == 0) ? true : false ;
-	}
-
-	public function canView($member = false) {
-		return true;
-	}
-
-	public function canEdit($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
-
-	public function canDelete($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
-
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+        $this->extend('getCMSFields', $fields);
+
+        return $fields;
+    }
+
+    public function validate(){
+        $result = parent::validate();
+
+        if($this->ProductOptionGroupID == 0){
+            $result->error('Must set a Group prior to saving');
+        }
+
+        return $result;
+    }
+
+    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
+        switch($oma){
+            case 'Subtract':
+                $symbol = '-';
+                break;
+            case 'Set':
+                $symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
+                break;
+            default:
+                $symbol = '+';
+        }
+        return $symbol;
+    }
+
+    public function getWeightModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
+    }
+
+    public function getPriceModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
+    }
+
+    public function getCodeModifierWithSymbol(){
+        return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+    }
+
+    public function getProductOptionGroupTitle(){
+        return $this->ProductOptionGroup()->Title;
+    }
+
+    public function getGeneratedValue(){
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
+        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
+        $modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
+        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
+        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+        return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
+    }
+
+    public function getGeneratedTitle(){
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
+        $title = $this->Title;
+        $title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
+        return $title;
+    }
+
+    public function getAvailability(){
+        return ($this->Available == 0) ? true : false ;
+    }
+
+    public function canView($member = false) {
+        return true;
+    }
+
+    public function canEdit($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
+
+    public function canDelete($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
+
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/objects/ProductDiscountTier.php

Indentation +81 added lines, -81 removed lines

@@ -2,67 +2,67 @@ 
 
 class ProductDiscountTier extends DataObject {
 
-	private static $singular_name = 'Discount Tier';
-	private static $plural_name = 'Discount Tiers';
-	private static $description = 'A discount tier for a Product Discount';
-
-	private static $db = array(
-		'Quantity' => 'Int',
-		'Percentage' => 'Int'
-	);
-	private static $has_one = array(
-		'Product' => 'FoxyStripeProduct'
-	);
-	private static $has_many = array();
-	private static $many_many = array();
-	private static $many_many_extraFields = array();
-	private static $belongs_many_many = array();
-
-	private static $casting = array();
-	private static $defaults = array();
-	private static $default_sort = array(
-		'Quantity'
-	);
-
-
-	private static $summary_fields = array(
-		'Quantity',
-		'DiscountPercentage'
-	);
-	private static $searchable_fields = array();
-	private static $field_labels = array(
-		'Quantity' => 'Quantity',
-		'DiscountPercentage' => 'Discount'
-	);
-	private static $indexes = array();
-
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
-
-		$fields->removeByName('ProductPageID');
-
-		$quantity = $fields->dataFieldByName('Quantity');
-		$quantity->setTitle('Quantity to trigger discount');
-		$percentage = $fields->dataFieldByName('Percentage');
-		$percentage->setTitle('Percent discount');
-
-		$this->extend('updateCMSFields', $fields);
-		return $fields;
-	}
-
-	public function getCMSValidator() {
-		return new RequiredFields(array('Quantity', 'Percentage'));
-	}
-
-	/**
-	 * @return ValidationResult
-	 *
-	 * TODO implement validation to ensure values aren't duplicated in multiple tiers
-	 */
-	public function validate(){
-		$result = parent::validate();
-
-		/*$tierQuantity = ProductDiscountTier::get()
+    private static $singular_name = 'Discount Tier';
+    private static $plural_name = 'Discount Tiers';
+    private static $description = 'A discount tier for a Product Discount';
+
+    private static $db = array(
+        'Quantity' => 'Int',
+        'Percentage' => 'Int'
+    );
+    private static $has_one = array(
+        'Product' => 'FoxyStripeProduct'
+    );
+    private static $has_many = array();
+    private static $many_many = array();
+    private static $many_many_extraFields = array();
+    private static $belongs_many_many = array();
+
+    private static $casting = array();
+    private static $defaults = array();
+    private static $default_sort = array(
+        'Quantity'
+    );
+
+
+    private static $summary_fields = array(
+        'Quantity',
+        'DiscountPercentage'
+    );
+    private static $searchable_fields = array();
+    private static $field_labels = array(
+        'Quantity' => 'Quantity',
+        'DiscountPercentage' => 'Discount'
+    );
+    private static $indexes = array();
+
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
+
+        $fields->removeByName('ProductPageID');
+
+        $quantity = $fields->dataFieldByName('Quantity');
+        $quantity->setTitle('Quantity to trigger discount');
+        $percentage = $fields->dataFieldByName('Percentage');
+        $percentage->setTitle('Percent discount');
+
+        $this->extend('updateCMSFields', $fields);
+        return $fields;
+    }
+
+    public function getCMSValidator() {
+        return new RequiredFields(array('Quantity', 'Percentage'));
+    }
+
+    /**
+     * @return ValidationResult
+     *
+     * TODO implement validation to ensure values aren't duplicated in multiple tiers
+     */
+    public function validate(){
+        $result = parent::validate();
+
+        /*$tierQuantity = ProductDiscountTier::get()
 			->filter(
 				array(
 					'ProductDiscountID' => $this->ProductDiscountID,
@@ -85,31 +85,31 @@ 
 			$result->error($this->Percentage." is already used in another discount tier. Please use a different percentage");
 		}*/
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function getTitle(){
-		return "{$this->Quantity} at {$this->Percentage}%";
-	}
+    public function getTitle(){
+        return "{$this->Quantity} at {$this->Percentage}%";
+    }
 
-	public function getDiscountPercentage(){
-		return "{$this->Percentage}%";
-	}
+    public function getDiscountPercentage(){
+        return "{$this->Percentage}%";
+    }
 
-	public function canView($member = false) {
-		return true;
-	}
+    public function canView($member = false) {
+        return true;
+    }
 
-	public function canEdit($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canEdit($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canDelete($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canDelete($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/objects/FoxyStripeProduct.php

Braces +6 added lines, -2 removed lines

@@ -141,11 +141,15 @@
                             Settings > FoxyStripe > Categories
                         </a>'
             ));
-        if (class_exists('QuickAddNewExtension')) $catField->useAddNew('FoxyCartProductCategory', $source);
+        if (class_exists('QuickAddNewExtension')) {
+            $catField->useAddNew('FoxyCartProductCategory', $source);
+        }
 
         // Product Images gridfield
         $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        if (class_exists('GridFieldSortableRows')) {
+            $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        }
         if (class_exists('GridFieldBulkImageUpload')) {
             $config->addComponent(new GridFieldBulkUpload());
             $config->getComponentByType('GridFieldBulkUpload')->setUfConfig('folderName', 'Uploads/ProductImages');

tests/ProductDiscountTierTest.php

Indentation +51 added lines, -51 removed lines

@@ -2,79 +2,79 @@
 
 class ProductDiscountTierTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$productHolder = ProductHolder::create();
-		$productHolder->Title = 'Product Holder';
-		$productHolder->write();
+        $productHolder = ProductHolder::create();
+        $productHolder->Title = 'Product Holder';
+        $productHolder->write();
 
-		$product = $this->objFromFixture('FoxyStripeProduct', 'product1');
-		$product->ParentID = $productHolder->ID;
-		$product->write();
-	}
+        $product = $this->objFromFixture('FoxyStripeProduct', 'product1');
+        $product->ParentID = $productHolder->ID;
+        $product->write();
+    }
 
-	public function testProductDiscountTierCreation(){
-		$this->logInWithPermission('Product_CANCRUD');
+    public function testProductDiscountTierCreation(){
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$discount = FoxyStripeProduct::get()->first();
+        $discount = FoxyStripeProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->FoxyStripeProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->FoxyStripeProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 5);
-		$this->assertEquals($checkTier->Percentage, 10);
+        $this->assertEquals($checkTier->Quantity, 5);
+        $this->assertEquals($checkTier->Percentage, 10);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierEdit(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierEdit(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = FoxyStripeProduct::get()->first();
+        $discount = FoxyStripeProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->FoxyStripeProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
-		$this->logInWithPermission('Product_CANCRUD');
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->FoxyStripeProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->Quantity = 2;
-		$tier->Percentage = 5;
-		$tier->write();
+        $tier->Quantity = 2;
+        $tier->Percentage = 5;
+        $tier->write();
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 2);
-		$this->assertEquals($checkTier->Percentage, 5);
+        $this->assertEquals($checkTier->Quantity, 2);
+        $this->assertEquals($checkTier->Percentage, 5);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierDeletion(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierDeletion(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = FoxyStripeProduct::get()->first();
+        $discount = FoxyStripeProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->FoxyStripeProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->FoxyStripeProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->delete();
-		$this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
+        $tier->delete();
+        $this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
 }

tests/FoxyStripeProductTest.php

Indentation +125 added lines, -125 removed lines

@@ -2,193 +2,193 @@
 
 class FoxyStripeProductTest extends FunctionalTest {
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
+    function setUp(){
 
-		$groupForItem = OptionGroup::create();
-		$groupForItem->Title = 'Sample-Group';
-		$groupForItem->write();
+        $groupForItem = OptionGroup::create();
+        $groupForItem->Title = 'Sample-Group';
+        $groupForItem->write();
 
-		$productHolder = ProductHolder::create();
-		$productHolder->Title = 'Product Holder';
-		$productHolder->write();
-	}
+        $productHolder = ProductHolder::create();
+        $productHolder->Title = 'Product Holder';
+        $productHolder->write();
+    }
 
-	function testProductCreation(){
+    function testProductCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$default = $this->objFromFixture('ProductCategory', 'default');
-		$default->write();
-		$product1 = $this->objFromFixture('FoxyStripeProduct', 'product1');
-		$product1->ParentID = ProductHolder::get()->first()->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $default = $this->objFromFixture('ProductCategory', 'default');
+        $default->write();
+        $product1 = $this->objFromFixture('FoxyStripeProduct', 'product1');
+        $product1->ParentID = ProductHolder::get()->first()->ID;
 
-		$product1->doPublish();
-		$this->assertTrue($product1->isPublished());
+        $product1->doPublish();
+        $this->assertTrue($product1->isPublished());
 
-	}
+    }
 
-	function testProductDeletion(){
+    function testProductDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$product2 = $this->objFromFixture('FoxyStripeProduct', 'product2');
-		$product2->ParentID = ProductHolder::get()->first()->ID;
-		$productID = $product2->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $product2 = $this->objFromFixture('FoxyStripeProduct', 'product2');
+        $product2->ParentID = ProductHolder::get()->first()->ID;
+        $productID = $product2->ID;
 
-		$product2->doPublish();
-		$this->assertTrue($product2->isPublished());
+        $product2->doPublish();
+        $this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostPublish = array();
+        foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
-		$product2->delete();
-		$this->assertTrue(!$product2->isPublished());
+        $product2->delete();
+        $this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostDelete = array();
+        foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
-		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
+        $this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
-	}
+    }
 
-	function testProductTitleLeadingWhiteSpace(){
+    function testProductTitleLeadingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
-		$product = $this->objFromFixture('FoxyStripeProduct', 'product1');
-		$product->Title = " Test with leading space";
-		$product->ParentID = ProductHolder::get()->first()->ID;
-		$product->doPublish();
+        $this->logInWithPermission('ADMIN');
+        $product = $this->objFromFixture('FoxyStripeProduct', 'product1');
+        $product->Title = " Test with leading space";
+        $product->ParentID = ProductHolder::get()->first()->ID;
+        $product->doPublish();
 
-		$this->assertTrue($product->Title == 'Test with leading space');
+        $this->assertTrue($product->Title == 'Test with leading space');
 
-	}
+    }
 
-	function testProductTitleTrailingWhiteSpace(){
+    function testProductTitleTrailingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
-		$product = $this->objFromFixture('FoxyStripeProduct', 'product1');
-		$product->Title = "Test with trailing space ";
-		$product->ParentID = ProductHolder::get()->first()->ID;
-		$product->doPublish();
+        $this->logInWithPermission('ADMIN');
+        $product = $this->objFromFixture('FoxyStripeProduct', 'product1');
+        $product->Title = "Test with trailing space ";
+        $product->ParentID = ProductHolder::get()->first()->ID;
+        $product->doPublish();
 
-		$this->assertTrue($product->Title == 'Test with trailing space');
+        $this->assertTrue($product->Title == 'Test with trailing space');
 
-	}
+    }
 
-	function testProductCategoryCreation(){
+    function testProductCategoryCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$category = $this->objFromFixture('ProductCategory', 'apparel');
-		$category->write();
-		$categoryID = $category->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $category = $this->objFromFixture('ProductCategory', 'apparel');
+        $category->write();
+        $categoryID = $category->ID;
 
-		$productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
+        $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
 
-		$this->assertTrue($categoryID == $productCategory->ID);
+        $this->assertTrue($categoryID == $productCategory->ID);
 
-	}
+    }
 
-	function testProductCategoryDeletion(){
+    function testProductCategoryDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$category = $this->objFromFixture('ProductCategory', 'default');
-		$category->write();
+        $this->logInWithPermission('Product_CANCRUD');
+        $category = $this->objFromFixture('ProductCategory', 'default');
+        $category->write();
 
-		$this->assertFalse($category->canDelete());
+        $this->assertFalse($category->canDelete());
 
-		$category2 = $this->objFromFixture('ProductCategory', 'apparel');
-		$category2->write();
-		$category2ID = $category2->ID;
+        $category2 = $this->objFromFixture('ProductCategory', 'apparel');
+        $category2->write();
+        $category2ID = $category2->ID;
 
-		$this->assertTrue($category2->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$this->assertFalse($category->canDelete());
-		$this->assertTrue($category2->canDelete());
+        $this->assertFalse($category->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$category2->delete();
+        $category2->delete();
 
-		$this->assertFalse(in_array($category2ID,FoxyCartProductCategory::get()->column('ID')));
+        $this->assertFalse(in_array($category2ID,FoxyCartProductCategory::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionGroupCreation(){
+    function testOptionGroupCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$group = $this->objFromFixture('OptionGroup', 'size');
-		$group->write();
+        $this->logInWithPermission('Product_CANCRUD');
+        $group = $this->objFromFixture('OptionGroup', 'size');
+        $group->write();
 
-		$this->assertNotNull(OptionGroup::get()->first());
+        $this->assertNotNull(OptionGroup::get()->first());
 
-	}
+    }
 
-	function testOptionGroupDeletion(){
+    function testOptionGroupDeletion(){
 
-		$this->logInWithPermission('ADMIN');
-		$group = $this->objFromFixture('OptionGroup', 'color');
-		$group->write();
-		$groupID = $group->ID;
+        $this->logInWithPermission('ADMIN');
+        $group = $this->objFromFixture('OptionGroup', 'color');
+        $group->write();
+        $groupID = $group->ID;
 
-		$this->assertTrue($group->canDelete());
+        $this->assertTrue($group->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($group->canDelete());
-		$group->delete();
+        $this->assertTrue($group->canDelete());
+        $group->delete();
 
-		$this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
+        $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionItemCreation(){
+    function testOptionItemCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
-		$option = $this->objFromFixture('OptionItem', 'large');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
-		$optionID = $option->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
+        $option = $this->objFromFixture('OptionItem', 'large');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
+        $optionID = $option->ID;
 
-		$optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
+        $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
 
-		$this->assertEquals($optionID, $optionItem->ID);
+        $this->assertEquals($optionID, $optionItem->ID);
 
-	}
+    }
 
-	function testOptionItemDeletion(){
+    function testOptionItemDeletion(){
 
-		$this->logInWithPermission('ADMIN');
-		$optionGroup = (OptionGroup::get()->first())
-			? OptionGroup::get()->first()
-			: OptionGroup::create();
-		if($optionGroup->ID == 0){
-			$optionGroup->Title = 'Size';
-			$optionGroup->write();
-		}
-		$option = $this->objFromFixture('OptionItem', 'small');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
-		$optionID = $option->ID;
+        $this->logInWithPermission('ADMIN');
+        $optionGroup = (OptionGroup::get()->first())
+            ? OptionGroup::get()->first()
+            : OptionGroup::create();
+        if($optionGroup->ID == 0){
+            $optionGroup->Title = 'Size';
+            $optionGroup->write();
+        }
+        $option = $this->objFromFixture('OptionItem', 'small');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
+        $optionID = $option->ID;
 
-		$this->assertTrue($option->canDelete());
+        $this->assertTrue($option->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($option->canDelete());
-		$option->delete();
+        $this->assertTrue($option->canDelete());
+        $option->delete();
 
-		$this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
+        $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
 
-	}
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 
 		$groupForItem = OptionGroup::create();
 		$groupForItem->Title = 'Sample-Group';
@@ -15,7 +15,7 @@ 
 		$productHolder->write();
 	}
 
-	function testProductCreation(){
+	function testProductCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture('ProductCategory', 'default');
@@ -28,7 +28,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$product2 = $this->objFromFixture('FoxyStripeProduct', 'product2');
@@ -38,22 +38,22 @@ 
 		$product2->doPublish();
 		$this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
 		$product2->delete();
 		$this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
 	}
 
-	function testProductTitleLeadingWhiteSpace(){
+	function testProductTitleLeadingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('FoxyStripeProduct', 'product1');
@@ -65,7 +65,7 @@ 
 
 	}
 
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('FoxyStripeProduct', 'product1');
@@ -77,7 +77,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'apparel');
@@ -90,7 +90,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'default');
@@ -116,11 +116,11 @@ 
 
 		$category2->delete();
 
-		$this->assertFalse(in_array($category2ID,FoxyCartProductCategory::get()->column('ID')));
+		$this->assertFalse(in_array($category2ID, FoxyCartProductCategory::get()->column('ID')));
 
 	}
 
-	function testOptionGroupCreation(){
+	function testOptionGroupCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$group = $this->objFromFixture('OptionGroup', 'size');
@@ -130,7 +130,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture('OptionGroup', 'color');
@@ -149,7 +149,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
@@ -164,13 +164,13 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$optionGroup = (OptionGroup::get()->first())
 			? OptionGroup::get()->first()
 			: OptionGroup::create();
-		if($optionGroup->ID == 0){
+		if ($optionGroup->ID == 0) {
 			$optionGroup->Title = 'Size';
 			$optionGroup->write();
 		}