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/form/FoxyStripeDropdownField.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
  * @package forms
  * @subpackage fields-basic
  */
-class FoxyStripeDropdownField extends DropdownField{
+class FoxyStripeDropdownField extends DropdownField {
 
 	/**
 	 * Mark certain elements as disabled,
@@ -56,12 +56,12 @@ 
 	 *
 	 * @param array $items Collection of array keys, as defined in the $source array
 	 */
-	public function setDisabledItems($items){
+	public function setDisabledItems($items) {
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
+		if (is_array($items) && !empty($items)) {
+			foreach ($items as $item) {
 				array_push($updated, ProductPage::getGeneratedValue($code, $this->getName(), $item, 'value'));
 			}
 		}
@@ -76,8 +76,8 @@ 
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
+		if (is_array($source) && !empty($source)) {
+			foreach ($source as $key => $val) {
 				$updated[ProductPage::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
 			}
 		}

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

tests/StoreSettingsTest.php

Indentation +15 added lines, -15 removed lines

@@ -2,30 +2,30 @@
 
 class StoreSettingsTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$siteConf = SiteConfig::current_site_config();
-		$siteConf->StoreName = 'foxystripe';
+        $siteConf = SiteConfig::current_site_config();
+        $siteConf->StoreName = 'foxystripe';
         $siteConf->requireDefaultRecords();
-		$siteConf->write();
-	}
+        $siteConf->write();
+    }
 
-	function testStoreKey(){
-		$pref = FoxyCart::getKeyPrefix();
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreKey(){
+        $pref = FoxyCart::getKeyPrefix();
+        $siteConf = SiteConfig::current_site_config();
 
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
-	}
+    }
 
-	function testStoreName(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreName(){
+        $siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
-	}
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class StoreSettingsTest extends FS_Test{
+class StoreSettingsTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$siteConf = SiteConfig::current_site_config();
@@ -13,7 +13,7 @@ 
 		$siteConf->write();
 	}
 
-	function testStoreKey(){
+	function testStoreKey() {
 		$pref = FoxyCart::getKeyPrefix();
 		$siteConf = SiteConfig::current_site_config();
 
@@ -22,7 +22,7 @@ 
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
 	}
 
-	function testStoreName(){
+	function testStoreName() {
 		$siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');

tests/ProductDiscountTierTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class ProductDiscountTierTest extends FS_Test{
+class ProductDiscountTierTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$productHolder = ProductHolder::create();
@@ -16,7 +16,7 @@ 
 		$product->write();
 	}
 
-	public function testProductDiscountTierCreation(){
+	public function testProductDiscountTierCreation() {
 		$this->logInWithPermission('Product_CANCRUD');
 
 		$discount = ProductPage::get()->first();
@@ -34,7 +34,7 @@ 
 		$this->logOut();
 	}
 
-	public function testProductDiscountTierEdit(){
+	public function testProductDiscountTierEdit() {
 		$this->logInWithPermission('ADMIN');
 
 		$discount = ProductPage::get()->first();
@@ -57,7 +57,7 @@ 
 		$this->logOut();
 	}
 
-	public function testProductDiscountTierDeletion(){
+	public function testProductDiscountTierDeletion() {
 		$this->logInWithPermission('ADMIN');
 
 		$discount = ProductPage::get()->first();

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

code/form/FoxyStripePurchaseForm.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     private $product;
 
     /**
-     * @param $siteConfig
+     * @param SiteConfig|null $siteConfig
      * @return $this
      */
     public function setSiteConfig($siteConfig)

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'product_id',
                 $this->product->ID))->setValue($this->product->ID));
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'price',
-                $this->product->Price))->setValue($this->product->Price));//can't override id
+                $this->product->Price))->setValue($this->product->Price)); //can't override id
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'weight',
                 $this->product->Weight))->setValue($this->product->Weight));
             if ($this->DiscountTitle && $this->ProductDiscountTiers()->exists()) {
@@ -151,11 +151,11 @@ 
 
             $fields->push(DropdownField::create('quantity', 'Quantity', $quantity));
 
-            $fields->push(HeaderField::create('submitPrice', '$' . $this->product->Price, 4));
+            $fields->push(HeaderField::create('submitPrice', '$'.$this->product->Price, 4));
 
 
             $this->extend('updatePurchaseFormFields', $fields);
-        } else {
+        }else {
             $fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock'), 4);
         }
 
@@ -192,7 +192,7 @@ 
     protected function getProductOptionSet()
     {
 
-        $assignAvailable = function ($self) {
+        $assignAvailable = function($self) {
             $this->extend('updateFoxyStripePurchaseForm', $form);
             $self->Available = ($self->getAvailability()) ? true : false;
         };

code/pages/ProductHolder.php

Braces +3 added lines, -1 removed lines

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

code/objects/Order.php

Spacing +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 
     public function getReceiptLink()
     {
-        $obj= HTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+        $obj = HTMLVarchar::create();
+        $obj->setValue('<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>');
         return $obj;
     }
 

tests/FoxyStripeProductTest.php

Braces +6 added lines, -2 removed lines

@@ -55,14 +55,18 @@
 
         $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = ' . $productID);
         $versionsPostPublish = array();
-        foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        foreach ($versions as $versionRow) {
+            $versionsPostPublish[] = $versionRow;
+        }
 
         $product2->delete();
         $this->assertTrue(!$product2->isPublished());
 
         $versions = DB::query('Select * FROM "FoxyStripeProduct_versions" WHERE "RecordID" = ' . $productID);
         $versionsPostDelete = array();
-        foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        foreach ($versions as $versionRow) {
+            $versionsPostDelete[] = $versionRow;
+        }
 
         $this->assertEquals($versionsPostPublish, $versionsPostDelete);
 

Spacing +2 added lines, -2 removed lines

@@ -53,14 +53,14 @@
         $product2->doPublish();
         $this->assertTrue($product2->isPublished());
 
-        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = ' . $productID);
+        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = '.$productID);
         $versionsPostPublish = array();
         foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
         $product2->delete();
         $this->assertTrue(!$product2->isPublished());
 
-        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = ' . $productID);
+        $versions = DB::query('Select * FROM "ShippableProduct_versions" WHERE "RecordID" = '.$productID);
         $versionsPostDelete = array();
         foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 

code/objects/products/FoxyStripeProduct.php

Spacing +6 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
             '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())
@@ -135,7 +135,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -191,7 +191,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',
@@ -252,7 +252,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -333,14 +333,13 @@ 
     ) {
         $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;
     }
 
     // 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>';
     }
 
     public function getDiscountFieldValue()

Braces +6 added lines, -2 removed lines

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