dynamic / foxystripe

code/objects/OptionItem.php

Indentation +50 added lines, -50 removed lines

@@ -25,18 +25,18 @@ 
 		//'Category' => 'ProductCategory'
 	);
 
-    private static $belongs_many_many = array(
-        'OrderDetails' => 'OrderDetail'
-    );
+	private static $belongs_many_many = array(
+		'OrderDetails' => 'OrderDetail'
+	);
 
-    private static $defaults = array(
+	private static $defaults = array(
 		'Available' => true
 	);
 
 	private static $summary_fields = array(
 		'Title' => 'Title',
 		'ProductOptionGroup.Title' => 'Group',
-        'Available.Nice' => 'Available'
+		'Available.Nice' => 'Available'
 	);
 
 	private static $default_sort = 'SortOrder';
@@ -50,8 +50,8 @@ 
 		);
 
 		// set variables from Product
-        $productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
-        $product = ProductPage::get()->byID($productID);
+		$productID = ($this->ProductID != 0) ? $this->ProductID : Session::get('CMSMain.currentPage');
+		$product = ProductPage::get()->byID($productID);
 
 		$parentPrice = $product->obj('Price')->Nice();
 		$parentWeight = $product->Weight;
@@ -59,21 +59,21 @@ 
 
 		// ProductOptionGroup Dropdown field w/ add new
 		$groups = function(){
-		    return OptionGroup::get()->map()->toArray();
+			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>'));
+			->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);
 
-        $fields->addFieldsToTab('Root.Main', array(
+		$fields->addFieldsToTab('Root.Main', array(
 			HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),
 			Textfield::create('Title')
-                ->setTitle(_t("OptionItem.Title", "Product Option Name")),
+				->setTitle(_t("OptionItem.Title", "Product Option Name")),
 			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")),
+				->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
 			$groupField
 		));
 
@@ -83,22 +83,22 @@ 
 			// Weight Modifier Fields
 			HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
 			NumericField::create('WeightModifier')
-                ->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
+				->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
 			DropdownField::create('WeightModifierAction', _t('OptionItem.WeightModifierAction', 'Weight Modification'),
 				array(
-                    'Add' => _t(
-                        'OptionItem.WeightAdd',
-                        "Add to Base Weight ({weight})",
-                        'Add to weight',
-                        array('weight' => $parentWeight)
-                    ),
-                    'Subtract' => _t(
-                        'OptionItem.WeightSubtract',
-                        "Subtract from Base Weight ({weight})",
-                        'Subtract from weight',
-                        array('weight' => $parentWeight)
-                    ),
-                    'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
+					'Add' => _t(
+						'OptionItem.WeightAdd',
+						"Add to Base Weight ({weight})",
+						'Add to weight',
+						array('weight' => $parentWeight)
+					),
+					'Subtract' => _t(
+						'OptionItem.WeightSubtract',
+						"Subtract from Base Weight ({weight})",
+						'Subtract from weight',
+						array('weight' => $parentWeight)
+					),
+					'Set' => _t('OptionItem.WeightSet', 'Set as a new Weight')
 				)
 			)->setEmptyString('')
 			->setDescription(_t('OptionItem.WeightDescription', 'Does weight modify or replace base weight?')),
@@ -106,21 +106,21 @@ 
 			// Price Modifier FIelds
 			HeaderField::create('PriceHD', _t('OptionItem.PriceHD', 'Modify Price'), 3),
 			CurrencyField::create('PriceModifier')
-                ->setTitle(_t('OptionItem.PriceModifier', 'Price')),
+				->setTitle(_t('OptionItem.PriceModifier', 'Price')),
 			DropdownField::create('PriceModifierAction', _t('OptionItem.PriceModifierAction', 'Price Modification'),
 				array(
 					'Add' => _t(
-                        'OptionItem.PriceAdd',
-                        "Add to Base Price ({price})",
-                        'Add to price',
-                        array('price' => $parentPrice)
-                    ),
+						'OptionItem.PriceAdd',
+						"Add to Base Price ({price})",
+						'Add to price',
+						array('price' => $parentPrice)
+					),
 					'Subtract' => _t(
-                        'OptionItem.PriceSubtract',
-                        "Subtract from Base Price ({price})",
-                        'Subtract from price',
-                        array('price' => $parentPrice)
-                    ),
+						'OptionItem.PriceSubtract',
+						"Subtract from Base Price ({price})",
+						'Subtract from price',
+						array('price' => $parentPrice)
+					),
 					'Set' => _t('OptionItem.PriceSet', 'Set as a new Price')
 				)
 			)->setEmptyString('')
@@ -129,28 +129,28 @@ 
 			// Code Modifier Fields
 			HeaderField::create('CodeHD', _t('OptionItem.CodeHD', 'Modify Code'), 3),
 			TextField::create('CodeModifier')
-                ->setTitle(_t('OptionItem.CodeModifier', 'Code')),
+				->setTitle(_t('OptionItem.CodeModifier', 'Code')),
 			DropdownField::create('CodeModifierAction', _t('OptionItem.CodeModifierAction', 'Code Modification'),
 				array(
 					'Add' => _t(
-                        'OptionItem.CodeAdd',
-                        "Add to Base Code ({code})",
-                        'Add to code',
-                        array('code' => $parentCode)
-                    ),
+						'OptionItem.CodeAdd',
+						"Add to Base Code ({code})",
+						'Add to code',
+						array('code' => $parentCode)
+					),
 					'Subtract' => _t(
-                        'OptionItem.CodeSubtract',
-                        'Subtract from Base Code ({code})',
-                        'Subtract from code',
-                        array('code' => $parentCode)
-                    ),
+						'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?'))
 		));
 
-        /*
+		/*
         // Cateogry Dropdown field w/ add new
         // removed until relevance determined
         $categories = function(){
@@ -166,7 +166,7 @@ 
         $fields->insertAfter($categoryField, 'ProductOptionGroupID');
         */
 
-        // allow CMS fields to be extended
+		// allow CMS fields to be extended
 		$this->extend('getCMSFields', $fields);
 
 		return $fields;

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class OptionItem extends DataObject{
+class OptionItem extends DataObject {
 
 	private static $db = array(
 		'Title' => 'Text',
@@ -41,7 +41,7 @@ 
 
 	private static $default_sort = 'SortOrder';
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = FieldList::create(
 			new Tabset('Root',
 				new Tab('Main'),
@@ -58,7 +58,7 @@ 
 		$parentCode = $product->Code;
 
 		// ProductOptionGroup Dropdown field w/ add new
-		$groups = function(){
+		$groups = function() {
 		    return OptionGroup::get()->map()->toArray();
 		};
 		$groupFields = singleton('OptionGroup')->getCMSFields();
@@ -72,7 +72,7 @@ 
 			Textfield::create('Title')
                 ->setTitle(_t("OptionItem.Title", "Product Option Name")),
 			CheckboxField::create('Available')
-				->setTitle( _t("OptionItem.Available", "Available for purchase"))
+				->setTitle(_t("OptionItem.Available", "Available for purchase"))
                 ->setDescription(_t('OptionItem.AvailableDescription', "If unchecked, will disable this option in the drop down menu")),
 			$groupField
 		));
@@ -172,18 +172,18 @@ 
 		return $fields;
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
-		if($this->ProductOptionGroupID == 0){
+		if ($this->ProductOptionGroupID == 0) {
 			$result->error('Must set a Group prior to saving');
 		}
 
 		return $result;
 	}
 
-	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false){
-		switch($oma){
+	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false) {
+		switch ($oma) {
 			case 'Subtract':
 				$symbol = '-';
 				break;
@@ -196,23 +196,23 @@ 
 		return $symbol;
 	}
 
-	public function getWeightModifierWithSymbol(){
+	public function getWeightModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
 	}
 
-	public function getPriceModifierWithSymbol(){
+	public function getPriceModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
 	}
 
-	public function getCodeModifierWithSymbol(){
+	public function getCodeModifierWithSymbol() {
 		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
 	}
 
-	public function getProductOptionGroupTitle(){
+	public function getProductOptionGroupTitle() {
 		return $this->ProductOptionGroup()->Title;
 	}
 
-	public function getGeneratedValue(){
+	public function getGeneratedValue() {
 		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
 		$modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
 		$modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
@@ -221,15 +221,15 @@ 
 		return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
 	}
 
-	public function getGeneratedTitle(){
+	public function getGeneratedTitle() {
 		$modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
 		$title = $this->Title;
-		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
+		$title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus = true).'$'.$modPrice.')' : '';
 		return $title;
 	}
 
-	public function getAvailability(){
-		return ($this->Available == 0) ? true : false ;
+	public function getAvailability() {
+		return ($this->Available == 0) ? true : false;
 	}
 
 	public function canView($member = false) {

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
 		$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),

code/objects/OrderAddress.php

Indentation +23 added lines, -23 removed lines

@@ -2,30 +2,30 @@
 
 class OrderAddress extends DataObject {
 
-    private static $db = array(
-        'Name' => 'Varchar(100)',
-        'Company' => 'Varchar',
-        'Address1' => 'Varchar(200)',
-        'Address2' => 'Varchar(200)',
-        'City' => 'Varchar(100)',
-        'State' => 'Varchar(100)',
-        'PostalCode' => 'Varchar(10)',
-        'Country' => 'Varchar(100)',
-        'Phone' => 'Varchar(20)'
-    );
-
-    private static $has_one = array(
-        'Order' => 'Order',
-        'Customer' => 'Member'
-    );
-
-    private static $singular_name = 'Order Address';
-    private static $plural_name = 'Order Addresses';
-    private static $description = '';
+	private static $db = array(
+		'Name' => 'Varchar(100)',
+		'Company' => 'Varchar',
+		'Address1' => 'Varchar(200)',
+		'Address2' => 'Varchar(200)',
+		'City' => 'Varchar(100)',
+		'State' => 'Varchar(100)',
+		'PostalCode' => 'Varchar(10)',
+		'Country' => 'Varchar(100)',
+		'Phone' => 'Varchar(20)'
+	);
+
+	private static $has_one = array(
+		'Order' => 'Order',
+		'Customer' => 'Member'
+	);
+
+	private static $singular_name = 'Order Address';
+	private static $plural_name = 'Order Addresses';
+	private static $description = '';
     
-    public function getTitle() {
-	    return $this->Name . ', ' . $this->Address1 . ', ' . $this->City . ' ' . $this->State . ' ' . $this->PostalCode . ' ' . $this->Country;
-    }
+	public function getTitle() {
+		return $this->Name . ', ' . $this->Address1 . ', ' . $this->City . ' ' . $this->State . ' ' . $this->PostalCode . ' ' . $this->Country;
+	}
 
 	public function getCMSFields(){
 		$fields = parent::getCMSFields();

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
     private static $description = '';
     
     public function getTitle() {
-	    return $this->Name . ', ' . $this->Address1 . ', ' . $this->City . ' ' . $this->State . ' ' . $this->PostalCode . ' ' . $this->Country;
+	    return $this->Name.', '.$this->Address1.', '.$this->City.' '.$this->State.' '.$this->PostalCode.' '.$this->Country;
     }
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 

code/objects/ProductDiscountTier.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 	);
 	private static $indexes = array();
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 		$fields->removeByName('ProductPageID');
@@ -59,7 +59,7 @@ 
 	 *
 	 * TODO implement validation to ensure values aren't duplicated in multiple tiers
 	 */
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		/*$tierQuantity = ProductDiscountTier::get()
@@ -88,11 +88,11 @@ 
 		return $result;
 	}
 
-	public function getTitle(){
+	public function getTitle() {
 		return "{$this->Quantity} at {$this->Percentage}%";
 	}
 
-	public function getDiscountPercentage(){
+	public function getDiscountPercentage() {
 		return "{$this->Percentage}%";
 	}
 

code/objects/ProductCategory.php

Indentation +27 added lines, -27 removed lines

@@ -7,49 +7,49 @@
 
 class ProductCategory extends DataObject {
 
-    private static $db = array(
+	private static $db = array(
 		'Title' => 'Varchar(255)',
 		'Code' => 'Varchar(50)'
 	);
 
-    private static $singular_name = 'FoxyCart Category';
-    private static $plural_name = 'FoxyCart Categories';
-    private static $description = 'Set the FoxyCart Category on a Product';
+	private static $singular_name = 'FoxyCart Category';
+	private static $plural_name = 'FoxyCart Categories';
+	private static $description = 'Set the FoxyCart Category on a Product';
 
-    private static $summary_fields = array(
-        'Title' => 'Name',
-        'Code' => 'Code'
-    );
+	private static $summary_fields = array(
+		'Title' => 'Name',
+		'Code' => 'Code'
+	);
 
 	private static $indexes = array(
 		'Code' => true
 	);
 
-    public function getCMSFields() {
+	public function getCMSFields() {
 
 		$fields = FieldList::create(
-            LiteralField::create(
-                'PCIntro',
-                _t(
-                    'ProductCategory.PCIntro',
-                    '<p>Categories must be created in your
+			LiteralField::create(
+				'PCIntro',
+				_t(
+					'ProductCategory.PCIntro',
+					'<p>Categories must be created in your
                         <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">
                             FoxyCart Product Categories
                         </a>, and also manually created in FoxyStripe.
                     </p>'
-                )
-            ),
-            TextField::create('Code')
-                ->setTitle(_t('ProductCategory.Code', 'FoxyCart Category Code'))
-                ->setDescription(_t('ProductCategory.CodeDescription', 'copy/paste from FoxyCart')),
-            TextField::create('Title')
-                ->setTitle(_t('ProductCategory.Title', 'FoxyCart Category Description'))
-                ->setDescription(_t('ProductCategory.TitleDescription', 'copy/paste from FoxyCart'))
-        );
-
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
+				)
+			),
+			TextField::create('Code')
+				->setTitle(_t('ProductCategory.Code', 'FoxyCart Category Code'))
+				->setDescription(_t('ProductCategory.CodeDescription', 'copy/paste from FoxyCart')),
+			TextField::create('Title')
+				->setTitle(_t('ProductCategory.Title', 'FoxyCart Category Description'))
+				->setDescription(_t('ProductCategory.TitleDescription', 'copy/paste from FoxyCart'))
+		);
+
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
 	}
 
 	public function requireDefaultRecords() {

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 		$allCats = DataObject::get('ProductCategory');
-		if(!$allCats->count()){
+		if (!$allCats->count()) {
 			$cat = new ProductCategory();
 			$cat->Title = 'Default';
 			$cat->Code = 'DEFAULT';

code/pages/OrderHistoryPage.php

Indentation +33 added lines, -33 removed lines

@@ -7,9 +7,9 @@ 
 
 class OrderHistoryPage extends Page {
 
-    private static $singular_name = 'Order History Page';
-    private static $plural_name = 'Order History Pages';
-    private static $description = 'Show a customers past orders. Requires authentication';
+	private static $singular_name = 'Order History Page';
+	private static $plural_name = 'Order History Pages';
+	private static $description = 'Show a customers past orders. Requires authentication';
 
 	public function getCMSFields(){
 		$fields = parent::getCMSFields();
@@ -20,43 +20,43 @@ 
 		return $fields;
 	}
 
-    // return all current Member's Orders
-    public function getOrders($limit = 10) {
-        if ($Member = Member::currentUser()) {
-            $Orders = $Member->Orders()->sort('TransactionDate', 'DESC');
+	// return all current Member's Orders
+	public function getOrders($limit = 10) {
+		if ($Member = Member::currentUser()) {
+			$Orders = $Member->Orders()->sort('TransactionDate', 'DESC');
 
-            $list = new PaginatedList($Orders, Controller::curr()->request);
-            $list->setPageLength($limit);
-            return $list;
-        }
-        return false;
-    }
+			$list = new PaginatedList($Orders, Controller::curr()->request);
+			$list->setPageLength($limit);
+			return $list;
+		}
+		return false;
+	}
 
 }
 
 class OrderHistoryPage_Controller extends Page_Controller {
 	
 	private static $allowed_actions = array(
-        'index'
-    );
-
-    public function checkMember() {
-        if(Member::currentUser()) {
-            return true;
-        } else {
-            return Security::permissionFailure ($this, _t (
-                'AccountPage.CANNOTCONFIRMLOGGEDIN',
-                'Please login to view this page.'
-            ));
-        }
-    }
-
-    public function Index() {
-
-        $this->checkMember();
-        return array();
-
-    }
+		'index'
+	);
+
+	public function checkMember() {
+		if(Member::currentUser()) {
+			return true;
+		} else {
+			return Security::permissionFailure ($this, _t (
+				'AccountPage.CANNOTCONFIRMLOGGEDIN',
+				'Please login to view this page.'
+			));
+		}
+	}
+
+	public function Index() {
+
+		$this->checkMember();
+		return array();
+
+	}
 
 
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
     private static $plural_name = 'Order History Pages';
     private static $description = 'Show a customers past orders. Requires authentication';
 
-	public function getCMSFields(){
+	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 
@@ -41,10 +41,10 @@ 
     );
 
     public function checkMember() {
-        if(Member::currentUser()) {
+        if (Member::currentUser()) {
             return true;
-        } else {
-            return Security::permissionFailure ($this, _t (
+        }else {
+            return Security::permissionFailure($this, _t(
                 'AccountPage.CANNOTCONFIRMLOGGEDIN',
                 'Please login to view this page.'
             ));

code/pages/ProductPage.php

Indentation +94 added lines, -94 removed lines

@@ -8,8 +8,8 @@ 
 class ProductPage extends Page implements PermissionProvider {
 
 	private static $allowed_children = 'none';
-    private static $default_parent = 'ProductHolder';
-    private static $can_be_root = false;
+	private static $default_parent = 'ProductHolder';
+	private static $can_be_root = false;
 
 	private static $db = array(
 		'Price' => 'Currency',
@@ -29,72 +29,72 @@ 
 	private static $has_many = array(
 		'ProductImages' => 'ProductImage',
 		'ProductOptions' => 'OptionItem',
-        'OrderDetails' => 'OrderDetail',
+		'OrderDetails' => 'OrderDetail',
 		'ProductDiscountTiers' => 'ProductDiscountTier'
 	);
 
-    private static $belongs_many_many = array(
+	private static $belongs_many_many = array(
 		'ProductHolders' => 'ProductHolder'
-    );
+	);
 
-    private static $singular_name = 'Product';
-    private static $plural_name = 'Products';
-    private static $description = 'A product that can be added to the shopping cart';
+	private static $singular_name = 'Product';
+	private static $plural_name = 'Products';
+	private static $description = 'A product that can be added to the shopping cart';
 
-    private static $indexes = array(
-        'Code' => true // make unique
-    );
+	private static $indexes = array(
+		'Code' => true // make unique
+	);
 
 	private static $defaults = array(
 		'ShowInMenus' => false,
 		'Available' => true,
-        'Weight' => '1.0'
+		'Weight' => '1.0'
+	);
+
+	private static $summary_fields = array(
+		'Title',
+		'Code',
+		'Price.Nice',
+		'Category.Title'
 	);
 
-    private static $summary_fields = array(
-        'Title',
-        'Code',
-        'Price.Nice',
-        'Category.Title'
-    );
-
-    private static $searchable_fields = array(
-        'Title',
-        'Code',
-        'Featured',
-        'Available',
-        'Category.ID'
-    );
-
-    function fieldLabels($includerelations = true) {
-        $labels = parent::fieldLabels();
-
-        $labels['Title'] = _t('ProductPage.TitleLabel', 'Name');
-        $labels['Code'] = _t('ProductPage.CodeLabel', "Code");
-        $labels['Price.Nice'] = _t('ProductPage.PriceLabel', 'Price');
-        $labels['Featured.Nice'] = _t('ProductPage.NiceLabel', 'Featured');
-        $labels['Available.Nice'] = _t('ProductPage.AvailableLabel', 'Available');
-        $labels['Category.ID'] = _t('ProductPage.IDLabel', 'Category');
-        $labels['Category.Title'] = _t('ProductPage.CategoryTitleLabel', 'Category');
-
-        return $labels;
-    }
+	private static $searchable_fields = array(
+		'Title',
+		'Code',
+		'Featured',
+		'Available',
+		'Category.ID'
+	);
+
+	function fieldLabels($includerelations = true) {
+		$labels = parent::fieldLabels();
+
+		$labels['Title'] = _t('ProductPage.TitleLabel', 'Name');
+		$labels['Code'] = _t('ProductPage.CodeLabel', "Code");
+		$labels['Price.Nice'] = _t('ProductPage.PriceLabel', 'Price');
+		$labels['Featured.Nice'] = _t('ProductPage.NiceLabel', 'Featured');
+		$labels['Available.Nice'] = _t('ProductPage.AvailableLabel', 'Available');
+		$labels['Category.ID'] = _t('ProductPage.IDLabel', 'Category');
+		$labels['Category.Title'] = _t('ProductPage.CategoryTitleLabel', 'Category');
+
+		return $labels;
+	}
 
 	public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
-        // allow extensions of ProductPage to override the PreviewImage field description
+		// allow extensions of ProductPage to override the PreviewImage field description
 		$previewDescription = ($this->stat('customPreviewDescription')) ? $this->stat('customPreviewDescription') : _t('ProductPage.PreviewImageDescription', 'Image used throughout site to represent this product');
 
 		// Cateogry Dropdown field w/ add new
 		$source = function(){
-		    return ProductCategory::get()->map()->toArray();
+			return ProductCategory::get()->map()->toArray();
 		};
 		$catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
-            ->setEmptyString('')
-            ->setDescription(_t(
-                'ProductPage.CategoryDescription',
-                'Required, must also exist in
+			->setEmptyString('')
+			->setDescription(_t(
+				'ProductPage.CategoryDescription',
+				'Required, must also exist in
                     <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">
                         FoxyCart Categories
                     </a>.
@@ -102,7 +102,7 @@ 
                         <a href="admin/settings">
                             Settings > FoxyStripe > Categories
                         </a>'
-            ));
+			));
 		if (class_exists('QuickAddNewExtension')) $catField->useAddNew('ProductCategory', $source);
 
 		// Product Images gridfield
@@ -113,11 +113,11 @@ 
 			$config->getComponentByType('GridFieldBulkUpload')->setUfConfig('folderName', 'Uploads/ProductImages');
 		}
 		$prodImagesField = GridField::create(
-            'ProductImages',
-            _t('ProductPage.ProductImages', 'Images'),
-            $this->ProductImages(),
-            $config
-        );
+			'ProductImages',
+			_t('ProductPage.ProductImages', 'Images'),
+			$this->ProductImages(),
+			$config
+		);
 
 		// Product Options field
 		$config = GridFieldConfig_RelationEditor::create();
@@ -130,47 +130,47 @@ 
 		}
 		$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$prodOptField = GridField::create(
-            'ProductOptions',
-            _t('ProductPage.ProductOptions', 'Options'),
-            $products,
-            $config
-        );
+			'ProductOptions',
+			_t('ProductPage.ProductOptions', 'Options'),
+			$products,
+			$config
+		);
 
 		// Details tab
 		$fields->addFieldsToTab('Root.Details', array(
 			HeaderField::create('DetailHD', 'Product Details', 2),
 			CheckboxField::create('Available')
 				->setTitle(_t('ProductPage.Available', 'Available for purchase'))
-                ->setDescription(_t(
-                    'ProductPage.AvailableDescription',
-                    'If unchecked, will remove "Add to Cart" form and instead display "Currently unavailable"'
-                )),
-            TextField::create('Code')
-                ->setTitle(_t('ProductPage.Code', 'Product Code'))
-                ->setDescription(_t(
-                    'ProductPage.CodeDescription',
-                    'Required, must be unique. Product identifier used by FoxyCart in transactions'
-                )),
-            $catField,
-            CurrencyField::create('Price')
-                ->setTitle(_t('ProductPage.Price', 'Price'))
-                ->setDescription(_t(
-                    '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'
-                )),
+				->setDescription(_t(
+					'ProductPage.AvailableDescription',
+					'If unchecked, will remove "Add to Cart" form and instead display "Currently unavailable"'
+				)),
+			TextField::create('Code')
+				->setTitle(_t('ProductPage.Code', 'Product Code'))
+				->setDescription(_t(
+					'ProductPage.CodeDescription',
+					'Required, must be unique. Product identifier used by FoxyCart in transactions'
+				)),
+			$catField,
+			CurrencyField::create('Price')
+				->setTitle(_t('ProductPage.Price', 'Price'))
+				->setDescription(_t(
+					'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'
+				)),
 			CheckboxField::create('Featured')
 				->setTitle(_t('ProductPage.Featured', 'Featured Product')),
-            TextField::create('ReceiptTitle')
-                ->setTitle(_t('ProductPage.ReceiptTitle', 'Product Title for Receipt'))
-                ->setDescription(_t(
-                        'ProductPage.ReceiptTitleDescription', 'Optional'
-                ))
+			TextField::create('ReceiptTitle')
+				->setTitle(_t('ProductPage.ReceiptTitle', 'Product Title for Receipt'))
+				->setDescription(_t(
+						'ProductPage.ReceiptTitleDescription', 'Optional'
+				))
 		));
 
 		// Images tab
@@ -184,19 +184,19 @@ 
 			HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'. 'Product Image Gallery'), 2),
 			$prodImagesField
 				->setDescription(_t(
-                        'ProductPage.ProductImagesDescription',
-                        'Additional Product Images, shown in gallery on Product page'
-                ))
+						'ProductPage.ProductImagesDescription',
+						'Additional Product Images, shown in gallery on Product page'
+				))
 		));
 
 		// Options Tab
 		$fields->addFieldsToTab('Root.Options', array(
 			HeaderField::create('OptionsHD', _t('ProductPage.OptionsHD', 'Product Options'), 2),
 			LiteralField::create('OptionsDescrip', _t(
-                'Page.OptionsDescrip',
-                '<p>Product Options allow products to be customized by attributes such as size or color.
+				'Page.OptionsDescrip',
+				'<p>Product Options allow products to be customized by attributes such as size or color.
                     Options can also modify the product\'s price, weight or code.</p>'
-            )),
+			)),
 			$prodOptField
 		));
 
@@ -214,9 +214,9 @@ 
 
 		if(FoxyCart::store_name_warning()!==null){
 			$fields->addFieldToTab('Root.Main', LiteralField::create("StoreSubDomainHeaderWarning", _t(
-                'ProductPage.StoreSubDomainHeaderWarning',
-                "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
-            )), 'Title');
+				'ProductPage.StoreSubDomainHeaderWarning',
+				"<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
+			)), 'Title');
 		}
 
 		// allows CMS fields to be extended

Spacing +38 added lines, -39 removed lines

@@ -87,7 +87,7 @@ 
 		$previewDescription = ($this->stat('customPreviewDescription')) ? $this->stat('customPreviewDescription') : _t('ProductPage.PreviewImageDescription', 'Image used throughout site to represent this product');
 
 		// Cateogry Dropdown field w/ add new
-		$source = function(){
+		$source = function() {
 		    return ProductCategory::get()->map()->toArray();
 		};
 		$catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -122,10 +122,10 @@ 
 		// Product Options field
 		$config = GridFieldConfig_RelationEditor::create();
 		if (class_exists('GridFieldBulkManager')) $config->addComponent(new GridFieldBulkManager());
-		if (class_exists('GridFieldSortableRows')){
+		if (class_exists('GridFieldSortableRows')) {
 			$config->addComponent(new GridFieldSortableRows('SortOrder'));
 			$products = $this->ProductOptions()->sort('SortOrder');
-		}else{
+		}else {
 			$products = $this->ProductOptions();
 		}
 		$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -181,7 +181,7 @@ 
 				->setFolderName('Uploads/Products')
 				->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
 				->setAllowedMaxFileNumber(1),
-			HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'. 'Product Image Gallery'), 2),
+			HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'.'Product Image Gallery'), 2),
 			$prodImagesField
 				->setDescription(_t(
                         'ProductPage.ProductImagesDescription',
@@ -200,11 +200,11 @@ 
 			$prodOptField
 		));
 
-		if(!$this->DiscountTitle && $this->ProductDiscountTiers()->exists()){
+		if (!$this->DiscountTitle && $this->ProductDiscountTiers()->exists()) {
 			$fields->addFieldTotab('Root.Discounts', new LiteralField("ProductDiscountHeaderWarning", "<p class=\"message warning\">A discount title is required for FoxyCart to properly parse the value. The discounts will not be applied until a title is entered.</p>"));
 		}
 
-		$fields->addFieldToTab('Root.Discounts', TextField::create('DiscountTitle')->setTitle(_t('Product.DiscountTitle','Discount Title')));
+		$fields->addFieldToTab('Root.Discounts', TextField::create('DiscountTitle')->setTitle(_t('Product.DiscountTitle', 'Discount Title')));
 		$discountsConfig = GridFieldConfig_RelationEditor::create();
 		$discountsConfig->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$discountsConfig->removeComponentsByType('GridFieldDeleteAction');
@@ -212,7 +212,7 @@ 
 		$discountGrid = GridField::create('ProductDiscountTiers', 'Product Discounts', $this->ProductDiscountTiers(), $discountsConfig);
 		$fields->addFieldToTab('Root.Discounts', $discountGrid);
 
-		if(FoxyCart::store_name_warning()!==null){
+		if (FoxyCart::store_name_warning() !== null) {
 			$fields->addFieldToTab('Root.Main', LiteralField::create("StoreSubDomainHeaderWarning", _t(
                 'ProductPage.StoreSubDomainHeaderWarning',
                 "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
@@ -225,25 +225,25 @@ 
 		return $fields;
 	}
 
-	public function onBeforeWrite(){
+	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if(!$this->CategoryID){
+		if (!$this->CategoryID) {
 			$default = ProductCategory::get()->filter(array('Code' => 'DEFAULT'))->first();
 			$this->CategoryID = $default->ID;
 		}
 
 		//update many_many lists when multi-group is on
-		if(SiteConfig::current_site_config()->MultiGroup){
+		if (SiteConfig::current_site_config()->MultiGroup) {
 			$holders = $this->ProductHolders();
 			$product = ProductPage::get()->byID($this->ID);
 			if (isset($product->ParentID)) {
 				$origParent = $product->ParentID;
-			} else {
+			}else {
 				$origParent = null;
 			}
 			$currentParent = $this->ParentID;
-			if($origParent!=$currentParent){
-				if($holders->find('ID', $origParent)){
+			if ($origParent != $currentParent) {
+				if ($holders->find('ID', $origParent)) {
 					$holders->removeByID($origParent);
 				}
 
@@ -258,7 +258,7 @@ 
 
 	}
 
-	public function onAfterWrite(){
+	public function onAfterWrite() {
 		parent::onAfterWrite();
 
 
@@ -266,17 +266,17 @@ 
 	}
 
 	public function onBeforeDelete() {
-		if(!$this->isPublished()) {
+		if (!$this->isPublished()) {
 
-			$delete = function($object){
+			$delete = function($object) {
 				$object->delete();
 			};
 
-			if($this->ProductOptions()) {
+			if ($this->ProductOptions()) {
 				$options = $this->getComponents('ProductOptions');
 				$options->each($delete);
 			}
-			if($this->ProductImages()) {
+			if ($this->ProductImages()) {
 				//delete product image dataobjects, not the images themselves.
 				$images = $this->getComponents('ProductImages');
 				$images->each($delete);
@@ -286,7 +286,7 @@ 
 		parent::onBeforeDelete();
 	}
 
-	public function validate(){
+	public function validate() {
 		$result = parent::validate();
 
 		/*if($this->ID>0){
@@ -308,17 +308,16 @@ 
 		return new RequiredFields(array('CategoryID', 'Price', 'Weight', 'Code'));
 	}
 
-	public static function getGeneratedValue($productCode = null, $optionName = null, $optionValue = null, $method = 'name', $output = false, $urlEncode = false){
-		$optionName = ($optionName !== null) ? preg_replace('/\s/','_', $optionName) : $optionName;
+	public static function getGeneratedValue($productCode = null, $optionName = null, $optionValue = null, $method = 'name', $output = false, $urlEncode = false) {
+		$optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
 		return (SiteConfig::current_site_config()->CartValidation)
-			? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode):
-			$optionValue;
+			? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) : $optionValue;
 	}
 
-	public function getDiscountFieldValue(){
+	public function getDiscountFieldValue() {
 		$tiers = $this->ProductDiscountTiers();
 		$bulkString = '';
-		foreach($tiers as $tier){
+		foreach ($tiers as $tier) {
 			$bulkString .= "|{$tier->Quantity}-{$tier->Percentage}";
 		}
 		return "{$this->Title}{allunits{$bulkString}}";
@@ -340,7 +339,7 @@ 
 		return Permission::check('Product_CANCRUD');
 	}
 
-	public function canPublish($member = null){
+	public function canPublish($member = null) {
 		return Permission::check('Product_CANCRUD');
 	}
 
@@ -358,10 +357,10 @@ 
 		'PurchaseForm'
 	);
 
-	public function init(){
+	public function init() {
 		parent::init();
 		Requirements::javascript("framework/thirdparty/jquery/jquery.js");
-		if($this->data()->Available && $this->ProductOptions()->exists()){
+		if ($this->data()->Available && $this->ProductOptions()->exists()) {
 			Requirements::javascript("foxystripe/javascript/outOfStock.min.js");
 			Requirements::javascript("foxystripe/javascript/ProductOptions.min.js");
 		}
@@ -376,7 +375,7 @@ 
 
 		$config = SiteConfig::current_site_config();
 
-		$assignAvailable = function($self){
+		$assignAvailable = function($self) {
 			$self->Available = ($self->getAvailability()) ? true : false;
 		};
 
@@ -386,12 +385,12 @@ 
 		$hiddenTitle = ($data->ReceiptTitle) ? htmlspecialchars($data->ReceiptTitle) : htmlspecialchars($data->Title);
 		$code = $data->Code;
 
-		if($data->Available) {
+		if ($data->Available) {
 			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'name', $hiddenTitle))->setValue($hiddenTitle));
 			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'category', $data->Category()->Code))->setValue($data->Category()->Code));
 			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'code', $data->Code))->setValue($data->Code));
 			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'product_id', $data->ID))->setValue($data->ID));
-			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'price', $data->Price))->setValue($data->Price));//can't override id
+			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'price', $data->Price))->setValue($data->Price)); //can't override id
 			$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'weight', $data->Weight))->setValue($data->Weight));
 			if ($this->DiscountTitle && $this->ProductDiscountTiers()->exists()) {
 				$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'discount_quantity_percentage', $data->getDiscountFieldValue()))->setValue($data->getDiscountFieldValue()));
@@ -407,16 +406,16 @@ 
 
 			$optionsSet = CompositeField::create();
 
-			foreach($groupedBy as $id => $set){
+			foreach ($groupedBy as $id => $set) {
 				$group = OptionGroup::get()->byID($id);
 				$title = $group->Title;
-				$name = preg_replace('/\s/','_', $title);
+				$name = preg_replace('/\s/', '_', $title);
 				$set->each($assignAvailable);
 				$disabled = array();
 				$fullOptions = array();
-				foreach($set as $item){
+				foreach ($set as $item) {
 					$fullOptions[ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value')] = $item->getGeneratedTitle();
-					if(!$item->Availability) array_push($disabled, ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value'));
+					if (!$item->Availability) array_push($disabled, ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value'));
 				}
 				$optionsSet->push(
 					$dropdown = DropdownField::create($name, $title, $fullOptions)->setTitle($title)
@@ -438,7 +437,7 @@ 
 
 			$fields->push(DropdownField::create('quantity', 'Quantity', $quantity));
 
-			$fields->push(HeaderField::create('submitPrice', '$' . $data->Price, 4));
+			$fields->push(HeaderField::create('submitPrice', '$'.$data->Price, 4));
 
 
 			$actions = FieldList::create(
@@ -448,17 +447,17 @@ 
 				)
 			);
 			$submit->setAttribute('name', ProductPage::getGeneratedValue($code, 'Submit', _t('ProductForm.AddToCart', 'Add to Cart')));
-			if(!$config->StoreName || $config->StoreName == '' || !isset($config->StoreName)){
+			if (!$config->StoreName || $config->StoreName == '' || !isset($config->StoreName)) {
 				$submit->setAttribute('Disabled', true);
 			}
 			$this->extend('updatePurchaseFormFields', $fields);
-		}else{
+		}else {
 			$fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock'), 4);
 			$actions = FieldList::create();
 		}
 
 		$form = Form::create($this, 'PurchaseForm', $fields, $actions);
-		$form->setAttribute('action',FoxyCart::FormActionURL());
+		$form->setAttribute('action', FoxyCart::FormActionURL());
 		$form->disableSecurityToken();
 
 		$this->extend('updatePurchaseForm', $form);

Braces +17 added lines, -7 removed lines

@@ -103,11 +103,15 @@ 
                             Settings > FoxyStripe > Categories
                         </a>'
             ));
-		if (class_exists('QuickAddNewExtension')) $catField->useAddNew('ProductCategory', $source);
+		if (class_exists('QuickAddNewExtension')) {
+			$catField->useAddNew('ProductCategory', $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');
@@ -121,11 +125,13 @@ 
 
 		// Product Options field
 		$config = GridFieldConfig_RelationEditor::create();
-		if (class_exists('GridFieldBulkManager')) $config->addComponent(new GridFieldBulkManager());
+		if (class_exists('GridFieldBulkManager')) {
+			$config->addComponent(new GridFieldBulkManager());
+		}
 		if (class_exists('GridFieldSortableRows')){
 			$config->addComponent(new GridFieldSortableRows('SortOrder'));
 			$products = $this->ProductOptions()->sort('SortOrder');
-		}else{
+		} else{
 			$products = $this->ProductOptions();
 		}
 		$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -396,10 +402,12 @@ 
 			if ($this->DiscountTitle && $this->ProductDiscountTiers()->exists()) {
 				$fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'discount_quantity_percentage', $data->getDiscountFieldValue()))->setValue($data->getDiscountFieldValue()));
 			}
-			if ($this->PreviewImage()->Exists()) $fields->push(
+			if ($this->PreviewImage()->Exists()) {
+				$fields->push(
 				HiddenField::create(ProductPage::getGeneratedValue($code, 'image', $data->PreviewImage()->PaddedImage(80, 80)->absoluteURL))
 					->setValue($data->PreviewImage()->PaddedImage(80, 80)->absoluteURL)
 			);
+			}
 
 			$options = $data->ProductOptions();
 			$groupedOptions = new GroupedList($options);
@@ -416,7 +424,9 @@ 
 				$fullOptions = array();
 				foreach($set as $item){
 					$fullOptions[ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value')] = $item->getGeneratedTitle();
-					if(!$item->Availability) array_push($disabled, ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value'));
+					if(!$item->Availability) {
+						array_push($disabled, ProductPage::getGeneratedValue($data->Code, $group->Title, $item->getGeneratedValue(), 'value'));
+					}
 				}
 				$optionsSet->push(
 					$dropdown = DropdownField::create($name, $title, $fullOptions)->setTitle($title)
@@ -452,7 +462,7 @@ 
 				$submit->setAttribute('Disabled', true);
 			}
 			$this->extend('updatePurchaseFormFields', $fields);
-		}else{
+		} else{
 			$fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock'), 4);
 			$actions = FieldList::create();
 		}

code/extensions/FoxyStripeSiteConfig.php

Indentation +71 added lines, -71 removed lines

@@ -11,24 +11,24 @@ 
 		'MaxQuantity' => 'Int'
 	);
 
-    // Set Default values
-    private static $defaults = array(
-        'ProductLimit' => 10
-    );
+	// Set Default values
+	private static $defaults = array(
+		'ProductLimit' => 10
+	);
 
 	public function updateCMSFields(FieldList $fields){
 
-        // set TabSet names to avoid spaces from camel case
-        $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
+		// set TabSet names to avoid spaces from camel case
+		$fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
 
-        // settings tab
-        $fields->addFieldsToTab('Root.FoxyStripe.Settings', array(
-            // Store Details
+		// 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',
-                '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">FoxyCart store settings</a>.'
-            )),
+				'<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')),
@@ -36,7 +36,7 @@ 
 			// Advanced Settings
 			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
 			LiteralField::create('AdvancedIntro', _t(
-                'FoxyStripeSiteConfig.AdvancedIntro',
+				'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())
@@ -44,108 +44,108 @@ 
 			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.'
-            )),
+					'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'))
-        ));
+		));
 
-        // configuration warning
+		// configuration warning
 		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');
+				"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
+		// 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(
-                    'FoxyStripeSiteConfig.MultiGroupDescription',
-                    'Allows products to be shown in multiple Product Groups'
-                )),
+					'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(
-                    'FoxyStripeSiteConfig.ProductLimitDescription',
-                    'Number of Products to show per page on a Product Group'
-                )),
+					'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(
-                    'FoxyStripeSiteConfig.MaxQuantityDescription',
-                    'Sets max quantity for product form dropdown (add to cart form - default 10)'
-                ))
+					'FoxyStripeSiteConfig.MaxQuantityDescription',
+					'Sets max quantity for product form dropdown (add to cart form - default 10)'
+				))
 		));
 
-        // categories tab
+		// categories tab
 		$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>'
-            )),
+				'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(
-                'ProductCategory',
-                _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
-                ProductCategory::get(),
-                GridFieldConfig_RecordEditor::create()
-            )
+				'ProductCategory',
+				_t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
+				ProductCategory::get(),
+				GridFieldConfig_RecordEditor::create()
+			)
 		));
 
-        // option groups tab
+		// option groups tab
 		$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>'
-            )),
+				'FoxyStripeSiteConfig.OptionGroupsDescrip',
+				'<p>Product Option Groups allow you to name a set of product options.</p>'
+			)),
 			GridField::create(
-                'OptionGroup',
-                _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
-                OptionGroup::get(),
-                GridFieldConfig_RecordEditor::create()
-            )
+				'OptionGroup',
+				_t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
+				OptionGroup::get(),
+				GridFieldConfig_RecordEditor::create()
+			)
 		));
 
 	}
 
-    private static function getSSOLink() {
-        return Director::absoluteBaseURL()."foxystripe/sso/";
-    }
+	private static function getSSOLink() {
+		return Director::absoluteBaseURL()."foxystripe/sso/";
+	}
 
-    private static function getDataFeedLink() {
-        return Director::absoluteBaseURL()."foxystripe/";
-    }
+	private static function getDataFeedLink() {
+		return Director::absoluteBaseURL()."foxystripe/";
+	}
 
-    // generate key on install
-    public function requireDefaultRecords() {
+	// generate key on install
+	public function requireDefaultRecords() {
 
-        parent::requireDefaultRecords();
+		parent::requireDefaultRecords();
 
-        $siteConfig = SiteConfig::current_site_config();
+		$siteConfig = SiteConfig::current_site_config();
 
-        if(!$siteConfig->StoreKey) {
-            $key = FoxyCart::setStoreKey();
-            while(!ctype_alnum($key)){
-                $key = FoxyCart::setStoreKey();
-            }
-            $siteConfig->StoreKey = $key;
-            $siteConfig->write();
-            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key " . $key, 'created');
-        }
-    }
+		if(!$siteConfig->StoreKey) {
+			$key = FoxyCart::setStoreKey();
+			while(!ctype_alnum($key)){
+				$key = FoxyCart::setStoreKey();
+			}
+			$siteConfig->StoreKey = $key;
+			$siteConfig->write();
+			DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key " . $key, 'created');
+		}
+	}
 
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class FoxyStripeSiteConfig extends DataExtension{
+class FoxyStripeSiteConfig extends DataExtension {
 
 	private static $db = array(
 		'StoreName' => 'Varchar(255)',
@@ -16,7 +16,7 @@ 
         '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'));
@@ -55,7 +55,7 @@ 
         ));
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
+		if (FoxyCart::store_name_warning() !== null) {
 			$fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
@@ -137,14 +137,14 @@ 
 
         $siteConfig = SiteConfig::current_site_config();
 
-        if(!$siteConfig->StoreKey) {
+        if (!$siteConfig->StoreKey) {
             $key = FoxyCart::setStoreKey();
-            while(!ctype_alnum($key)){
+            while (!ctype_alnum($key)) {
                 $key = FoxyCart::setStoreKey();
             }
             $siteConfig->StoreKey = $key;
             $siteConfig->write();
-            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key " . $key, 'created');
+            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key ".$key, 'created');
         }
     }
 

code/extensions/FoxyStripePageExtension.php

Indentation +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@
 
 class FoxyStripePageExtension extends DataExtension {
 
-    // get FoxyCart Store Name for JS call
-    public function getCartScript() {
-        return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
-    }
+	// get FoxyCart Store Name for JS call
+	public function getCartScript() {
+		return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
+	}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
     // get FoxyCart Store Name for JS call
     public function getCartScript() {
-        return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
+        return '<script src="https://cdn.foxycart.com/'.FoxyCart::getFoxyCartStoreName().'/loader.js" async defer></script>';
     }
 
 }
\ No newline at end of file

code/extensions/CustomerExtension.php

Indentation +22 added lines, -22 removed lines

@@ -2,35 +2,35 @@
 
 class CustomerExtension extends DataExtension{
 
-    private static $db = array(
-        'Customer_ID' => 'Int',
-        'MinifraudScore' => 'Varchar'
-    );
+	private static $db = array(
+		'Customer_ID' => 'Int',
+		'MinifraudScore' => 'Varchar'
+	);
 
-    private static $has_many = array(
-        'Orders' => 'Order',
-        'OrderAddresses' => 'OrderAddress'
-    );
+	private static $has_many = array(
+		'Orders' => 'Order',
+		'OrderAddresses' => 'OrderAddress'
+	);
 
-    private static $indexes = array(
-        'Customer_ID' => true // make unique
-    );
+	private static $indexes = array(
+		'Customer_ID' => true // make unique
+	);
 
-    public function onBeforeWrite() {
-        parent::onBeforeWrite();
+	public function onBeforeWrite() {
+		parent::onBeforeWrite();
 
-        // if Member data was imported from FoxyCart, PasswordEncryption will be set to 'none'.
-        // Change to sh1_v2.4 to ensure SilverStripe is using the same hash as FoxyCart API 1.1
-        $this->owner->PasswordEncryption = 'sha1_v2.4';
+		// if Member data was imported from FoxyCart, PasswordEncryption will be set to 'none'.
+		// Change to sh1_v2.4 to ensure SilverStripe is using the same hash as FoxyCart API 1.1
+		$this->owner->PasswordEncryption = 'sha1_v2.4';
 
-        // Send updated customer data to Foxy Cart via API
-        $response = FoxyCart::putCustomer($this->owner);
+		// Send updated customer data to Foxy Cart via API
+		$response = FoxyCart::putCustomer($this->owner);
 
-        // Grab customer_id record from FoxyCart response, store in Member
+		// Grab customer_id record from FoxyCart response, store in Member
 		if($response){
-        	$foxyResponse = new SimpleXMLElement($response);
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+			$foxyResponse = new SimpleXMLElement($response);
+			$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
 		}
-    }
+	}
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class CustomerExtension extends DataExtension{
+class CustomerExtension extends DataExtension {
 
     private static $db = array(
         'Customer_ID' => 'Int',
@@ -27,9 +27,9 @@ 
         $response = FoxyCart::putCustomer($this->owner);
 
         // Grab customer_id record from FoxyCart response, store in Member
-		if($response){
+		if ($response) {
         	$foxyResponse = new SimpleXMLElement($response);
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+        	$this->owner->Customer_ID = (int)$foxyResponse->customer_id;
 		}
     }