dynamic / foxystripe

code/admin/OrderAdmin.php

Indentation +5 added lines, -5 removed lines

@@ -2,13 +2,13 @@
 
 class OrderAdmin extends ModelAdmin {
 
-	public static $managed_models = array(
-		'Order'
-	);
+    public static $managed_models = array(
+        'Order'
+    );
 	
-	static $url_segment = 'orders';
+    static $url_segment = 'orders';
 	
-	static $menu_title = 'Orders';
+    static $menu_title = 'Orders';
 
     public function getEditForm($id = null, $fields = null) {
         $form = parent::getEditForm($id, $fields);

code/objects/OptionGroup.php

Indentation +78 added lines, -78 removed lines

@@ -7,32 +7,32 @@ 
 
 class OptionGroup extends DataObject{
 
-	private static $db = array(
-		'Title' => 'Varchar(100)'
-	);
+    private static $db = array(
+        'Title' => 'Varchar(100)'
+    );
 
     private static $singular_name = 'Product Option Group';
-	private static $plural_name = 'Product Option Groups';
-	private static $description = 'Groups of product options, e.g. size, color, etc';
+    private static $plural_name = 'Product Option Groups';
+    private static $description = 'Groups of product options, e.g. size, color, etc';
 
-	function getCMSFields(){
+    function getCMSFields(){
 
-		$fields = parent::getCMSFields();
+        $fields = parent::getCMSFields();
 
-		$this->extend('getCMSFields', $fields);
+        $this->extend('getCMSFields', $fields);
 
-		return $fields;
-	}
+        return $fields;
+    }
 
-	public function requireDefaultRecords() {
-		parent::requireDefaultRecords();
-		// create a catch-all group
-		if(!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
-			$do = new OptionGroup();
-			$do->Title = "Options";
-			$do->write();
-		}
-		if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
+    public function requireDefaultRecords() {
+        parent::requireDefaultRecords();
+        // create a catch-all group
+        if(!OptionGroup::get()->filter(array('Title' => 'Options'))->first()) {
+            $do = new OptionGroup();
+            $do->Title = "Options";
+            $do->write();
+        }
+        if(!OptionGroup::get()->filter(array('Title' => 'Size'))->first()) {
             $do = new OptionGroup();
             $do->Title = "Size";
             $do->write();
@@ -47,64 +47,64 @@ 
             $do->Title = "Type";
             $do->write();
         }
-	}
-
-	public function getCMSValidator() {
-		return new RequiredFields(array('Title'));
-	}
-
-	public function validate(){
-		$result = parent::validate();
-
-		$title = $this->Title;
-		$firstChar = substr($title, 0, 1);
-		if(preg_match('/[^a-zA-Z]/', $firstChar)){
-			$result->error('The first character of the Title can only be a letter', 'bad');
-		}
-		if(preg_match('/[^a-zA-Z]\s/', $title)){
-			$result->error('Please only use letters, numbers and spaces in the title', 'bad');
-		}
-
-		return $result;
-	}
-
-	public function onBeforeDelete(){
-		parent::onBeforeDelete();
-
-		//make sure that if we delete this option group, we reassign the group's option items to the 'None' group.
-		$items = OptionItem::get()->filter(array('ProductOptionGroupID' => $this->ID));
-
-		if(isset($items)){
-			$noneGroup = OptionGroup::get()->filter(array('Title' => 'Options'))->first();
-			foreach($items as $item){
-				$item->ProductOptionGroupID = $noneGroup->ID;
-				$item->write();
-			}
-		}
-	}
-
-	public function canView($member = false) {
-		return true;
-	}
-
-	public function canEdit($member = null) {
-		switch($this->Title){
-			case 'Options':
-				return false;
-				break;
-			default:
-				return Permission::check('Product_CANCRUD');
-				break;
-		}
-
-	}
-
-	public function canDelete($member = null) {
-		return $this->canEdit();
-	}
-
-	public function canCreate($member = null) {
-		return Permission::check('Product_CANCRUD');
-	}
+    }
+
+    public function getCMSValidator() {
+        return new RequiredFields(array('Title'));
+    }
+
+    public function validate(){
+        $result = parent::validate();
+
+        $title = $this->Title;
+        $firstChar = substr($title, 0, 1);
+        if(preg_match('/[^a-zA-Z]/', $firstChar)){
+            $result->error('The first character of the Title can only be a letter', 'bad');
+        }
+        if(preg_match('/[^a-zA-Z]\s/', $title)){
+            $result->error('Please only use letters, numbers and spaces in the title', 'bad');
+        }
+
+        return $result;
+    }
+
+    public function onBeforeDelete(){
+        parent::onBeforeDelete();
+
+        //make sure that if we delete this option group, we reassign the group's option items to the 'None' group.
+        $items = OptionItem::get()->filter(array('ProductOptionGroupID' => $this->ID));
+
+        if(isset($items)){
+            $noneGroup = OptionGroup::get()->filter(array('Title' => 'Options'))->first();
+            foreach($items as $item){
+                $item->ProductOptionGroupID = $noneGroup->ID;
+                $item->write();
+            }
+        }
+    }
+
+    public function canView($member = false) {
+        return true;
+    }
+
+    public function canEdit($member = null) {
+        switch($this->Title){
+            case 'Options':
+                return false;
+                break;
+            default:
+                return Permission::check('Product_CANCRUD');
+                break;
+        }
+
+    }
+
+    public function canDelete($member = null) {
+        return $this->canEdit();
+    }
+
+    public function canCreate($member = null) {
+        return Permission::check('Product_CANCRUD');
+    }
 
 }

code/pages/OrderHistoryPage.php

Indentation +6 added lines, -6 removed lines

@@ -11,14 +11,14 @@ 
     private static $plural_name = 'Order History Pages';
     private static $description = 'Show a customers past orders. Requires authentication';
 
-	public function getCMSFields(){
-		$fields = parent::getCMSFields();
+    public function getCMSFields(){
+        $fields = parent::getCMSFields();
 
 
 
-		$this->extend('updateCMSFields', $fields);
-		return $fields;
-	}
+        $this->extend('updateCMSFields', $fields);
+        return $fields;
+    }
 
     // return all current Member's Orders
     public function getOrders($limit = 10) {
@@ -36,7 +36,7 @@ 
 
 class OrderHistoryPage_Controller extends Page_Controller {
 	
-	private static $allowed_actions = array(
+    private static $allowed_actions = array(
         'index'
     );
 

code/extensions/FoxyStripeSiteConfig.php

Indentation +58 added lines, -58 removed lines

@@ -2,21 +2,21 @@ 
 
 class FoxyStripeSiteConfig extends DataExtension{
 
-	private static $db = array(
-		'StoreName' => 'Varchar(255)',
-		'StoreKey' => 'Varchar(60)',
-		'MultiGroup' => 'Boolean',
-		'ProductLimit' => 'Int',
-		'CartValidation' => 'Boolean',
-		'MaxQuantity' => 'Int'
-	);
+    private static $db = array(
+        'StoreName' => 'Varchar(255)',
+        'StoreKey' => 'Varchar(60)',
+        'MultiGroup' => 'Boolean',
+        'ProductLimit' => 'Int',
+        'CartValidation' => 'Boolean',
+        'MaxQuantity' => 'Int'
+    );
 
     // Set Default values
     private static $defaults = array(
         'ProductLimit' => 10
     );
 
-	public function updateCMSFields(FieldList $fields){
+    public function updateCMSFields(FieldList $fields){
 
         // set TabSet names to avoid spaces from camel case
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -24,103 +24,103 @@ 
         // settings tab
         $fields->addFieldsToTab('Root.FoxyStripe.Settings', array(
             // Store Details
-			HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
-			LiteralField::create('DetailsIntro', _t(
-				'FoxyStripeSiteConfig.DetailsIntro',
+            HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
+            LiteralField::create('DetailsIntro', _t(
+                'FoxyStripeSiteConfig.DetailsIntro',
                 '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">FoxyCart store settings</a>.'
             )),
-			TextField::create('StoreName')
-				->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
-				->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
+            TextField::create('StoreName')
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Sub Domain'))
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'the sub domain for your FoxyCart store')),
 
-			// Advanced Settings
-			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
-			LiteralField::create('AdvancedIntro', _t(
+            // Advanced Settings
+            HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
+            LiteralField::create('AdvancedIntro', _t(
                 'FoxyStripeSiteConfig.AdvancedIntro',
-				'<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
-			)),
-			ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
-				->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
-			CheckboxField::create('CartValidation')
-				->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
-				->setDescription(_t(
+                '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">FoxyCart advanced store settings</a>.</p>'
+            )),
+            ReadonlyField::create('DataFeedLink', _t('FoxyStripeSiteConfig.DataFeedLink', 'FoxyCart DataFeed URL'), self::getDataFeedLink())
+                ->setDescription(_t('FoxyStripeSiteConfig.DataFeedLinkDescription', 'copy/paste to FoxyCart')),
+            CheckboxField::create('CartValidation')
+                ->setTitle(_t('FoxyStripeSiteConfig.CartValidation', 'Enable Cart Validation'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.CartValidationDescription',
                     'You must <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures#use_cart_validation" target="_blank">enable cart validation</a> in the FoxyCart admin.'
             )),
-			ReadonlyField::create('StoreKey')
-				->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
-				->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
-			ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
-				->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
+            ReadonlyField::create('StoreKey')
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreKey', 'FoxyCart API Key'))
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreKeyDescription', 'copy/paste to FoxyCart')),
+            ReadonlyField::create('SSOLink', _t('FoxyStripeSiteConfig.SSOLink', 'Single Sign On URL'), self::getSSOLink())
+                ->setDescription(_t('FoxyStripeSiteConfig.SSOLinkDescription', 'copy/paste to FoxyCart'))
         ));
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
-			$fields->insertBefore(LiteralField::create(
+        if(FoxyCart::store_name_warning()!==null){
+            $fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
                     'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
                     "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
                 )
             ), 'StoreDetails');
-		}
+        }
 
         // products tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Products', array(
-			HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
-			CheckboxField::create('MultiGroup')
-				->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
-				->setDescription(_t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Products', array(
+            HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
+            CheckboxField::create('MultiGroup')
+                ->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MultiGroupDescription',
                     'Allows products to be shown in multiple Product Groups'
                 )),
-			HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
-			NumericField::create('ProductLimit')
-				->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
-				->setDescription(_t(
+            HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
+            NumericField::create('ProductLimit')
+                ->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.ProductLimitDescription',
                     'Number of Products to show per page on a Product Group'
                 )),
-			HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
-			NumericField::create('MaxQuantity')
-				->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
-				->setDescription(_t(
+            HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
+            NumericField::create('MaxQuantity')
+                ->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MaxQuantityDescription',
                     'Sets max quantity for product form dropdown (add to cart form - default 10)'
                 ))
-		));
+        ));
 
         // categories tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
-			HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
-			LiteralField::create('CategoryDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
+            HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
+            LiteralField::create('CategoryDescrip', _t(
                 'FoxyStripeSiteConfig.CategoryDescrip',
                 '<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be accomplished by product options alone, including category specific coupon codes, shipping and handling fees, and email receipts. <a href="https://wiki.foxycart.com/v/2.0/categories" target="_blank">Learn More</a></p><p>Categories you\'ve created in FoxyStripe must also be created in your <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">FoxyCart Categories</a> admin panel.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'ProductCategory',
                 _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
                 ProductCategory::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
         // option groups tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
-			HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
-			LiteralField::create('OptionGroupsDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
+            HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
+            LiteralField::create('OptionGroupsDescrip', _t(
                 'FoxyStripeSiteConfig.OptionGroupsDescrip',
                 '<p>Product Option Groups allow you to name a set of product options.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'OptionGroup',
                 _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
                 OptionGroup::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
-	}
+    }
 
     private static function getSSOLink() {
         return Director::absoluteBaseURL()."foxystripe/sso/";

code/extensions/CustomerExtension.php

Indentation +4 added lines, -4 removed lines

@@ -25,10 +25,10 @@
         $response = FoxyCart::putCustomer($this->owner);
 
         // Grab customer_id record from FoxyCart response, store in Member
-		if($response){
-        	$foxyResponse = new SimpleXMLElement($response);
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
-		}
+        if($response){
+            $foxyResponse = new SimpleXMLElement($response);
+            $this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+        }
     }
 
 }
\ No newline at end of file

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');
+    }
 
 }

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('ShippableProduct', 'product1');
-		$product->ParentID = $productHolder->ID;
-		$product->write();
-	}
+        $product = $this->objFromFixture('ShippableProduct', 'product1');
+        $product->ParentID = $productHolder->ID;
+        $product->write();
+    }
 
-	public function testProductDiscountTierCreation(){
-		$this->logInWithPermission('Product_CANCRUD');
+    public function testProductDiscountTierCreation(){
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $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 = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
-		$this->logInWithPermission('Product_CANCRUD');
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $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 = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $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();
+    }
 
 }