dynamic / foxystripe

src/Controller/DataTestController.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
     {
         $rules = Director::config()->get('rules');
         $rule = array_search(FoxyStripeController::class, $rules);
-        $myURL = Director::absoluteBaseURL() . explode('//', $rule)[0];
+        $myURL = Director::absoluteBaseURL().explode('//', $rule)[0];
         $myKey = FoxyCart::getStoreKey();
 
         $this->updateConfig();
@@ -122,7 +122,7 @@ 
             $email = $emails[count($emails) - 1];
             return preg_replace_callback(
                 "|(\d+)|",
-                function ($mathces) {
+                function($mathces) {
                     return ++$mathces[1];
                 },
                 $email

Indentation +154 added lines, -154 removed lines

@@ -20,158 +20,158 @@
 class DataTestController extends Controller
 {
 
-    /**
-     * @var array
-     */
-    private static $data = [
-        "TransactionDate" => "now",
-        "OrderID" => "auto",
-        "Email" => "auto",
-        "Password" => "password",
-        "OrderDetails" => [],
-    ];
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function index()
-    {
-        $rules = Director::config()->get('rules');
-        $rule = array_search(FoxyStripeController::class, $rules);
-        $myURL = Director::absoluteBaseURL() . explode('//', $rule)[0];
-        $myKey = FoxyCart::getStoreKey();
-
-        $this->updateConfig();
-        $config = static::config()->get('data');
-        $config['OrderDetails'] = ArrayList::create($config['OrderDetails']);
-        $xml = $this->renderWith('TestData', $config);
-        $XMLOutput = $xml->RAW();
-
-        $XMLOutput_encrypted = \rc4crypt::encrypt($myKey, $XMLOutput);
-        $XMLOutput_encrypted = urlencode($XMLOutput_encrypted);
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $myURL);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, array("FoxyData" => $XMLOutput_encrypted));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-
-        $response = curl_exec($ch);
-        $responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-
-        $configString = print_r(static::config()->get('data'), true);
-        /** @var DebugView $view */
-        $view = Injector::inst()->create(DebugView::class);
-        echo $view->renderHeader();
-        echo '<div class="info">';
-        echo "<h2>Config:</h2><pre>$configString</pre>";
-        if ($this->getRequest()->getVar('data')) {
-            echo "<h2>Data:</h2><pre>{$xml->HTML()}</pre>";
-        }
-        echo "<h2>Response:</h2><pre>$response</pre>";
-        echo '<p></p>';
-        echo '</div>';
-        echo $view->renderFooter();
-    }
-
-    /**
-     *
-     */
-    private function updateConfig()
-    {
-        $data = static::config()->get('data');
-        $transactionDate = $data['TransactionDate'];
-        static::config()->merge('data', [
-            'TransactionDate' => strtotime($transactionDate),
-        ]);
-
-        $order_id = $data['OrderID'];
-        if ($order_id === 'auto' || $order_id < 1) {
-            $lastOrderID = Order::get()->sort('Order_ID')->last()->Order_ID;
-            static::config()->merge('data', [
-                'OrderID' => $lastOrderID + 1,
-            ]);
-        }
-
-        $email = $data['Email'];
-        if ($email === 'auto') {
-            static::config()->merge('data', [
-                'Email' => $this->generateEmail(),
-            ]);
-        }
-
-        $orderDetails = $data['OrderDetails'];
-        if (count($orderDetails) === 0) {
-            static::config()->merge('data', [
-                'OrderDetails' => [
-                    $this->generateOrderDetail()
-                ],
-            ]);
-        }
-
-        if (!array_key_exists('Salt', $data)) {
-            static::config()->merge('data', [
-                'Salt' => 'faGgWXUTdZ7i42lpA6cljzKeGBeUwShBSNHECwsJmt',
-            ]);
-        }
-
-        if (!array_key_exists('HashType', $data)) {
-            static::config()->merge('data', [
-                'HashType' => 'sha1_v2.4',
-            ]);
-        }
-
-        $data = static::config()->get('data');
-        if (!array_key_exists('HashedPassword', $data)) {
-            $encryptor = PasswordEncryptor::create_for_algorithm($data['HashType']);
-            static::config()->merge('data', [
-                'HashedPassword' => $encryptor->encrypt($data['Password'], $data['Salt']),
-            ]);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    private function generateEmail()
-    {
-        $emails = Member::get()->filter([
-            'Email:EndsWith' => '@example.com',
-        ])->column('Email');
-
-        if ($emails && count($emails)) {
-            $email = $emails[count($emails) - 1];
-            return preg_replace_callback(
-                "|(\d+)|",
-                function ($mathces) {
-                    return ++$mathces[1];
-                },
-                $email
-            );
-        }
-        return 'example0@example.com';
-    }
-
-    /**
-     * @return array
-     */
-    private function generateOrderDetail()
-    {
-        return [
-            'Title' => 'foo',
-            'Price' => 20.00,
-            'Quantity' => 1,
-            'Weight' => 0.1,
-            'DeliveryType' => 'shipped',
-            'CategoryDescription' => 'Default cateogry',
-            'CategoryCode' => 'DEFAULT',
-            'Options' => [
-                'Name' => 'color',
-                'OptionValue' => 'blue',
-                'PriceMod' => '',
-                'WeightMod' => '',
-            ],
-        ];
-    }
+	/**
+	 * @var array
+	 */
+	private static $data = [
+		"TransactionDate" => "now",
+		"OrderID" => "auto",
+		"Email" => "auto",
+		"Password" => "password",
+		"OrderDetails" => [],
+	];
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function index()
+	{
+		$rules = Director::config()->get('rules');
+		$rule = array_search(FoxyStripeController::class, $rules);
+		$myURL = Director::absoluteBaseURL() . explode('//', $rule)[0];
+		$myKey = FoxyCart::getStoreKey();
+
+		$this->updateConfig();
+		$config = static::config()->get('data');
+		$config['OrderDetails'] = ArrayList::create($config['OrderDetails']);
+		$xml = $this->renderWith('TestData', $config);
+		$XMLOutput = $xml->RAW();
+
+		$XMLOutput_encrypted = \rc4crypt::encrypt($myKey, $XMLOutput);
+		$XMLOutput_encrypted = urlencode($XMLOutput_encrypted);
+
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $myURL);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, array("FoxyData" => $XMLOutput_encrypted));
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+		$response = curl_exec($ch);
+		$responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
+
+		$configString = print_r(static::config()->get('data'), true);
+		/** @var DebugView $view */
+		$view = Injector::inst()->create(DebugView::class);
+		echo $view->renderHeader();
+		echo '<div class="info">';
+		echo "<h2>Config:</h2><pre>$configString</pre>";
+		if ($this->getRequest()->getVar('data')) {
+			echo "<h2>Data:</h2><pre>{$xml->HTML()}</pre>";
+		}
+		echo "<h2>Response:</h2><pre>$response</pre>";
+		echo '<p></p>';
+		echo '</div>';
+		echo $view->renderFooter();
+	}
+
+	/**
+	 *
+	 */
+	private function updateConfig()
+	{
+		$data = static::config()->get('data');
+		$transactionDate = $data['TransactionDate'];
+		static::config()->merge('data', [
+			'TransactionDate' => strtotime($transactionDate),
+		]);
+
+		$order_id = $data['OrderID'];
+		if ($order_id === 'auto' || $order_id < 1) {
+			$lastOrderID = Order::get()->sort('Order_ID')->last()->Order_ID;
+			static::config()->merge('data', [
+				'OrderID' => $lastOrderID + 1,
+			]);
+		}
+
+		$email = $data['Email'];
+		if ($email === 'auto') {
+			static::config()->merge('data', [
+				'Email' => $this->generateEmail(),
+			]);
+		}
+
+		$orderDetails = $data['OrderDetails'];
+		if (count($orderDetails) === 0) {
+			static::config()->merge('data', [
+				'OrderDetails' => [
+					$this->generateOrderDetail()
+				],
+			]);
+		}
+
+		if (!array_key_exists('Salt', $data)) {
+			static::config()->merge('data', [
+				'Salt' => 'faGgWXUTdZ7i42lpA6cljzKeGBeUwShBSNHECwsJmt',
+			]);
+		}
+
+		if (!array_key_exists('HashType', $data)) {
+			static::config()->merge('data', [
+				'HashType' => 'sha1_v2.4',
+			]);
+		}
+
+		$data = static::config()->get('data');
+		if (!array_key_exists('HashedPassword', $data)) {
+			$encryptor = PasswordEncryptor::create_for_algorithm($data['HashType']);
+			static::config()->merge('data', [
+				'HashedPassword' => $encryptor->encrypt($data['Password'], $data['Salt']),
+			]);
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	private function generateEmail()
+	{
+		$emails = Member::get()->filter([
+			'Email:EndsWith' => '@example.com',
+		])->column('Email');
+
+		if ($emails && count($emails)) {
+			$email = $emails[count($emails) - 1];
+			return preg_replace_callback(
+				"|(\d+)|",
+				function ($mathces) {
+					return ++$mathces[1];
+				},
+				$email
+			);
+		}
+		return 'example0@example.com';
+	}
+
+	/**
+	 * @return array
+	 */
+	private function generateOrderDetail()
+	{
+		return [
+			'Title' => 'foo',
+			'Price' => 20.00,
+			'Quantity' => 1,
+			'Weight' => 0.1,
+			'DeliveryType' => 'shipped',
+			'CategoryDescription' => 'Default cateogry',
+			'CategoryCode' => 'DEFAULT',
+			'Options' => [
+				'Name' => 'color',
+				'OptionValue' => 'blue',
+				'PriceMod' => '',
+				'WeightMod' => '',
+			],
+		];
+	}
 }

src/Page/ProductHolder.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
                 $config = GridFieldConfig_RelationEditor::create();
                 $config->addComponent(new GridFieldOrderableRows('SortOrder'));
@@ -150,8 +150,8 @@ 
 
         if ($config->MultiGroup) {
             $entries = $this->Products()->sort('SortOrder');
-        } else {
-            $filter = '"ParentID" = ' . $this->ID;
+        }else {
+            $filter = '"ParentID" = '.$this->ID;
 
             // Build a list of all IDs for ProductGroups that are children
             $holderIDs = $this->ProductGroupIDs();
@@ -162,7 +162,7 @@ 
                 if ($filter) {
                     $filter .= ' OR ';
                 }
-                $filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ')';
+                $filter .= '"ParentID" IN ('.implode(',', $holderIDs).')';
             }
 
             $order = '"SiteTree"."Title" ASC';

Indentation +151 added lines, -151 removed lines

@@ -18,161 +18,161 @@
  */
 class ProductHolder extends \Page
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Product Group';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Product Groups';
-
-    /**
-     * @var string
-     */
-    private static $description = 'Display a list of related products';
-
-    /**
-     * @var array
-     */
-    private static $many_many = [
-        'Products' => ProductPage::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $many_many_extraFields = [
-        'Products' => [
-            'SortOrder' => 'Int',
-        ],
-    ];
-
-    /**
-     * @var array
-     */
-    /*
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Product Group';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Product Groups';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'Display a list of related products';
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = [
+		'Products' => ProductPage::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $many_many_extraFields = [
+		'Products' => [
+			'SortOrder' => 'Int',
+		],
+	];
+
+	/**
+	 * @var array
+	 */
+	/*
     private static $allowed_children = [
         ProductHolder::class,
         ProductPage::class,
     ];
     */
 
-    /**
-     * @var string
-     */
-    private static $table_name = 'ProductHolder';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
-                $config = GridFieldConfig_RelationEditor::create();
-                $config->addComponent(new GridFieldOrderableRows('SortOrder'));
-                $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-                $config->addComponent(new GridFieldAddExistingSearchButton());
-
-                $fields->addFieldToTab(
-                    'Root.Products',
-                    GridField::create(
-                        'Products',
-                        _t('ProductHolder.Products', 'Products'),
-                        $this->Products(),
-                        $config
-                    )
-                );
-            }
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @return DataList
-     */
-    public function Products()
-    {
-        return $this->getManyManyComponents('Products')->sort('SortOrder');
-    }
-
-    /**
-     * loadDescendantProductGroupIDListInto function.
-     *
-     * @param mixed &$idList
-     */
-    public function loadDescendantProductGroupIDListInto(&$idList)
-    {
-        if ($children = $this->AllChildren()) {
-            foreach ($children as $child) {
-                if (in_array($child->ID, $idList)) {
-                    continue;
-                }
-
-                if ($child instanceof self) {
-                    $idList[] = $child->ID;
-                    $child->loadDescendantProductGroupIDListInto($idList);
-                }
-            }
-        }
-    }
-
-    /**
-     * ProductGroupIDs function.
-     *
-     * @return array
-     */
-    public function ProductGroupIDs()
-    {
-        $holderIDs = [];
-        $this->loadDescendantProductGroupIDListInto($holderIDs);
-
-        return $holderIDs;
-    }
-
-    /**
-     * @param int $limit
-     *
-     * @return PaginatedList
-     *
-     * @throws \Exception
-     */
-    public function ProductList($limit = 10)
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-
-        if ($config->ProductLimit > 0) {
-            $limit = $config->ProductLimit;
-        }
-
-        if ($config->MultiGroup) {
-            $entries = $this->Products()->sort('SortOrder');
-        } else {
-            $filter = '"ParentID" = ' . $this->ID;
-
-            // Build a list of all IDs for ProductGroups that are children
-            $holderIDs = $this->ProductGroupIDs();
-
-            // If no ProductHolders, no ProductPages. So return false
-            if ($holderIDs) {
-                // Otherwise, do the actual query
-                if ($filter) {
-                    $filter .= ' OR ';
-                }
-                $filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ')';
-            }
-
-            $order = '"SiteTree"."Title" ASC';
-
-            $entries = ProductPage::get()->where($filter);
-        }
-
-        $list = new PaginatedList($entries, Controller::curr()->getRequest());
-        $list->setPageLength($limit);
-
-        return $list;
-    }
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'ProductHolder';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
+				$config = GridFieldConfig_RelationEditor::create();
+				$config->addComponent(new GridFieldOrderableRows('SortOrder'));
+				$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+				$config->addComponent(new GridFieldAddExistingSearchButton());
+
+				$fields->addFieldToTab(
+					'Root.Products',
+					GridField::create(
+						'Products',
+						_t('ProductHolder.Products', 'Products'),
+						$this->Products(),
+						$config
+					)
+				);
+			}
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public function Products()
+	{
+		return $this->getManyManyComponents('Products')->sort('SortOrder');
+	}
+
+	/**
+	 * loadDescendantProductGroupIDListInto function.
+	 *
+	 * @param mixed &$idList
+	 */
+	public function loadDescendantProductGroupIDListInto(&$idList)
+	{
+		if ($children = $this->AllChildren()) {
+			foreach ($children as $child) {
+				if (in_array($child->ID, $idList)) {
+					continue;
+				}
+
+				if ($child instanceof self) {
+					$idList[] = $child->ID;
+					$child->loadDescendantProductGroupIDListInto($idList);
+				}
+			}
+		}
+	}
+
+	/**
+	 * ProductGroupIDs function.
+	 *
+	 * @return array
+	 */
+	public function ProductGroupIDs()
+	{
+		$holderIDs = [];
+		$this->loadDescendantProductGroupIDListInto($holderIDs);
+
+		return $holderIDs;
+	}
+
+	/**
+	 * @param int $limit
+	 *
+	 * @return PaginatedList
+	 *
+	 * @throws \Exception
+	 */
+	public function ProductList($limit = 10)
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+
+		if ($config->ProductLimit > 0) {
+			$limit = $config->ProductLimit;
+		}
+
+		if ($config->MultiGroup) {
+			$entries = $this->Products()->sort('SortOrder');
+		} else {
+			$filter = '"ParentID" = ' . $this->ID;
+
+			// Build a list of all IDs for ProductGroups that are children
+			$holderIDs = $this->ProductGroupIDs();
+
+			// If no ProductHolders, no ProductPages. So return false
+			if ($holderIDs) {
+				// Otherwise, do the actual query
+				if ($filter) {
+					$filter .= ' OR ';
+				}
+				$filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ')';
+			}
+
+			$order = '"SiteTree"."Title" ASC';
+
+			$entries = ProductPage::get()->where($filter);
+		}
+
+		$list = new PaginatedList($entries, Controller::curr()->getRequest());
+		$list->setPageLength($limit);
+
+		return $list;
+	}
 }

src/Form/FoxyStripePurchaseForm.php

Spacing +7 added lines, -10 removed lines

@@ -117,12 +117,10 @@ 
         $this->setSiteConfig($siteConfig);
 
         $fields = ($fields != null && $fields->exists()) ?
-            $this->getProductFields($fields) :
-            $this->getProductFields(FieldList::create());
+            $this->getProductFields($fields) : $this->getProductFields(FieldList::create());
 
         $actions = ($actions != null && $actions->exists()) ?
-            $this->getProductActions($actions) :
-            $this->getProductActions(FieldList::create());
+            $this->getProductActions($actions) : $this->getProductActions(FieldList::create());
         $validator = (!empty($validator) || $validator != null) ? $validator : RequiredFields::create();
 
         parent::__construct($controller, $name, $fields, $actions, $validator);
@@ -131,7 +129,7 @@ 
         $this->setAttribute('action', FoxyCart::FormActionURL());
         $this->disableSecurityToken();
 
-        $this->setHTMLID($this->getTemplateHelper()->generateFormID($this) . "_{$product->ID}");
+        $this->setHTMLID($this->getTemplateHelper()->generateFormID($this)."_{$product->ID}");
     }
 
     /**
@@ -143,8 +141,7 @@ 
     {
         //Requirements::javascript('dynamic/foxystripe: client/dist/javascript/scripts.min.js');
         $hiddenTitle = ($this->product->ReceiptTitle) ?
-            htmlspecialchars($this->product->ReceiptTitle) :
-            htmlspecialchars($this->product->Title);
+            htmlspecialchars($this->product->ReceiptTitle) : htmlspecialchars($this->product->Title);
         $code = $this->product->Code;
 
         if ($this->getProduct()->getIsAvailable()) {
@@ -178,7 +175,7 @@ 
                     ->setValue(
                         ProductPage::getGeneratedValue($code, 'price', $this->product->Price, 'value')
                     )
-            );//can't override id
+            ); //can't override id
             if ($this->product->Weight > 0) {
                 $fields->push(
                     HiddenField::create('weight')
@@ -221,7 +218,7 @@ 
             );
 
             $fields->push(
-                HeaderField::create('submitPrice', '$' . $this->product->Price, 4)
+                HeaderField::create('submitPrice', '$'.$this->product->Price, 4)
                     ->addExtraClass('submit-price')
             );
             $fields->push(
@@ -234,7 +231,7 @@ 
             }
 
             $this->extend('updatePurchaseFormFields', $fields);
-        } else {
+        }else {
             $fields->push(HeaderField::create('unavailableText', 'Currently Out of Stock', 4));
         }
 

Indentation +295 added lines, -295 removed lines

@@ -31,299 +31,299 @@
  */
 class FoxyStripePurchaseForm extends Form
 {
-    /**
-     * @var
-     */
-    protected $site_config;
-
-    /**
-     * @var
-     */
-    private $product;
-
-    /**
-     * @param $siteConfig
-     *
-     * @return $this
-     */
-    public function setSiteConfig($siteConfig)
-    {
-        $siteConfig = $siteConfig === null ? FoxyStripeSetting::current_foxystripe_setting() : $siteConfig;
-        if ($siteConfig instanceof FoxyStripeSetting) {
-            $this->site_config = $siteConfig;
-
-            return $this;
-        }
-        throw new \InvalidArgumentException('$siteConfig needs to be an instance of FoxyStripeSetting.');
-    }
-
-    /**
-     * @return FoxyStripeSetting
-     */
-    public function getSiteConfig()
-    {
-        if (!$this->site_config) {
-            $this->setSiteConfig(FoxyStripeSetting::current_foxystripe_setting());
-        }
-
-        return $this->site_config;
-    }
-
-    /**
-     * @param $product
-     *
-     * @return $this
-     */
-    public function setProduct($product)
-    {
-        if ($product instanceof ProductPage) {
-            $this->product = $product;
-
-            return $this;
-        }
-        throw new \InvalidArgumentException('$product needs to be an instance of ProductPage.');
-    }
-
-    /**
-     * @return ProductPage
-     */
-    public function getProduct()
-    {
-        return $this->product;
-    }
-
-    /**
-     * FoxyStripePurchaseForm constructor.
-     *
-     * @param ContentController $controller
-     * @param string $name
-     * @param FieldList|null $fields
-     * @param FieldList|null $actions
-     * @param null $validator
-     * @param null $product
-     * @param null $siteConfig
-     *
-     */
-    public function __construct(
-        $controller,
-        $name,
-        FieldList $fields = null,
-        FieldList $actions = null,
-        $validator = null,
-        $product = null,
-        $siteConfig = null
-    ) {
-        $this->setProduct($product);
-        $this->setSiteConfig($siteConfig);
-
-        $fields = ($fields != null && $fields->exists()) ?
-            $this->getProductFields($fields) :
-            $this->getProductFields(FieldList::create());
-
-        $actions = ($actions != null && $actions->exists()) ?
-            $this->getProductActions($actions) :
-            $this->getProductActions(FieldList::create());
-        $validator = (!empty($validator) || $validator != null) ? $validator : RequiredFields::create();
-
-        parent::__construct($controller, $name, $fields, $actions, $validator);
-
-        //have to call after parent::__construct()
-        $this->setAttribute('action', FoxyCart::FormActionURL());
-        $this->disableSecurityToken();
-
-        $this->setHTMLID($this->getTemplateHelper()->generateFormID($this) . "_{$product->ID}");
-    }
-
-    /**
-     * @param FieldList $fields
-     *
-     * @return FieldList
-     */
-    protected function getProductFields(FieldList $fields)
-    {
-        //Requirements::javascript('dynamic/foxystripe: client/dist/javascript/scripts.min.js');
-        $hiddenTitle = ($this->product->ReceiptTitle) ?
-            htmlspecialchars($this->product->ReceiptTitle) :
-            htmlspecialchars($this->product->Title);
-        $code = $this->product->Code;
-
-        if ($this->getProduct()->getIsAvailable()) {
-            $fields->push(
-                HiddenField::create('name')
-                    ->setValue(
-                        ProductPage::getGeneratedValue($code, 'name', $hiddenTitle, 'value')
-                    )
-            );
-            $fields->push(
-                HiddenField::create('category')
-                    ->setValue(
-                        ProductPage::getGeneratedValue($code, 'category', $this->product->Category()->Code, 'value')
-                    )
-            );
-            $fields->push(
-                HiddenField::create('code')
-                    ->setValue(
-                        ProductPage::getGeneratedValue($code, 'code', $this->product->Code, 'value')
-                    )
-            );
-            $fields->push(
-                HiddenField::create(
-                    'product_id'
-                )->setValue(
-                    ProductPage::getGeneratedValue($code, 'product_id', $this->product->ID, 'value')
-                )
-            );
-            $fields->push(
-                HiddenField::create('price')
-                    ->setValue(
-                        ProductPage::getGeneratedValue($code, 'price', $this->product->Price, 'value')
-                    )
-            );//can't override id
-            if ($this->product->Weight > 0) {
-                $fields->push(
-                    HiddenField::create('weight')
-                        ->setValue(
-                            ProductPage::getGeneratedValue($code, 'weight', $this->product->Weight, 'value')
-                        )
-                );
-            }
-
-            $image = null;
-            if ($this->product->Image() || ProductPage::has_extension(ProductPageLegacy::class)) {
-                if ($this->product->Image()) {
-                    $image = $this->product->Image()->Pad(80, 80)->absoluteURL;
-                } elseif (ProductPage::has_extension(ProductPageLegacy::class) &&
-                    $this->product->PreviewImage()->exists()) {
-                    $image = $this->product->PreviewImage()->Pad(80, 80)->absoluteURL;
-                }
-
-                if ($image) {
-                    $fields->push(
-                        HiddenField::create('image')
-                            ->setValue(
-                                ProductPage::getGeneratedValue($code, 'image', $image, 'value')
-                            )
-                    );
-                }
-            }
-
-            $optionsSet = $this->getProductOptionSet();
-            $fields->push($optionsSet);
-
-            $quantityMax = ($this->site_config->MaxQuantity) ? $this->site_config->MaxQuantity : 10;
-
-            $fields->push(QuantityField::create('x:visibleQuantity')->setTitle('Quantity')->setValue(1));
-            $fields->push(
-                HiddenField::create('quantity')
-                    ->setValue(
-                        ProductPage::getGeneratedValue($code, 'quantity', 1, 'value')
-                    )
-            );
-
-            $fields->push(
-                HeaderField::create('submitPrice', '$' . $this->product->Price, 4)
-                    ->addExtraClass('submit-price')
-            );
-            $fields->push(
-                $unavailable = HeaderField::create('unavailableText', 'Selection unavailable', 4)
-                    ->addExtraClass('unavailable-text')
-            );
-
-            if (!empty(trim($this->getSiteConfig()->StoreName)) && $this->getProduct()->getIsAvailable()) {
-                $unavailable->addExtraClass('hidden');
-            }
-
-            $this->extend('updatePurchaseFormFields', $fields);
-        } else {
-            $fields->push(HeaderField::create('unavailableText', 'Currently Out of Stock', 4));
-        }
-
-        $this->extend('updateFoxyStripePurchaseFormFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @param FieldList $actions
-     *
-     * @return FieldList
-     */
-    protected function getProductActions(FieldList $actions)
-    {
-        if (!empty(trim($this->getSiteConfig()->StoreName)) && $this->getProduct()->getIsAvailable()) {
-            $actions->push(
-                $submit = FormAction::create(
-                    'x:submit',
-                    _t('ProductForm.AddToCart', 'Add to Cart')
-                )->addExtraClass('fs-add-to-cart-button')
-            );
-        }
-
-        $this->extend('updateFoxyStripePurchaseFormActions', $actions);
-
-        return $actions;
-    }
-
-    /**
-     * @return CompositeField
-     */
-    protected function getProductOptionSet()
-    {
-        $options = $this->product->ProductOptions();
-        $groupedOptions = new GroupedList($options);
-        $groupedBy = $groupedOptions->groupBy('ProductOptionGroupID');
-
-        /** @var CompositeField $optionsSet */
-        $optionsSet = CompositeField::create();
-
-        /** @var DataList $set */
-        foreach ($groupedBy as $id => $set) {
-            $group = OptionGroup::get()->byID($id);
-            $title = $group->Title;
-            $fieldName = preg_replace('/\s/', '_', $title);
-            $disabled = [];
-            $fullOptions = [];
-
-            foreach ($set as $item) {
-                $item = $this->setAvailability($item);
-
-                $name = ProductPage::getGeneratedValue(
-                    $this->product->Code,
-                    $group->Title,
-                    $item->getGeneratedValue(),
-                    'value'
-                );
-
-                $fullOptions[$name] = $item->getGeneratedTitle();
-                if (!$item->Availability) {
-                    array_push($disabled, $name);
-                }
-            }
-
-            $optionsSet->push(
-                $dropdown = DropdownField::create($fieldName, $title, $fullOptions)->setTitle($title)
-            );
-
-            if (!empty($disabled)) {
-                $dropdown->setDisabledItems($disabled);
-            }
-
-            $dropdown->addExtraClass("product-options");
-        }
-
-        $optionsSet->addExtraClass('foxycartOptionsContainer');
-
-        return $optionsSet;
-    }
-
-    /**
-     * @param OptionItem $option
-     * @return OptionItem
-     */
-    protected function setAvailability(OptionItem $option)
-    {
-        $option->Available = ($option->getAvailability()) ? true : false;
-
-        return $option;
-    }
+	/**
+	 * @var
+	 */
+	protected $site_config;
+
+	/**
+	 * @var
+	 */
+	private $product;
+
+	/**
+	 * @param $siteConfig
+	 *
+	 * @return $this
+	 */
+	public function setSiteConfig($siteConfig)
+	{
+		$siteConfig = $siteConfig === null ? FoxyStripeSetting::current_foxystripe_setting() : $siteConfig;
+		if ($siteConfig instanceof FoxyStripeSetting) {
+			$this->site_config = $siteConfig;
+
+			return $this;
+		}
+		throw new \InvalidArgumentException('$siteConfig needs to be an instance of FoxyStripeSetting.');
+	}
+
+	/**
+	 * @return FoxyStripeSetting
+	 */
+	public function getSiteConfig()
+	{
+		if (!$this->site_config) {
+			$this->setSiteConfig(FoxyStripeSetting::current_foxystripe_setting());
+		}
+
+		return $this->site_config;
+	}
+
+	/**
+	 * @param $product
+	 *
+	 * @return $this
+	 */
+	public function setProduct($product)
+	{
+		if ($product instanceof ProductPage) {
+			$this->product = $product;
+
+			return $this;
+		}
+		throw new \InvalidArgumentException('$product needs to be an instance of ProductPage.');
+	}
+
+	/**
+	 * @return ProductPage
+	 */
+	public function getProduct()
+	{
+		return $this->product;
+	}
+
+	/**
+	 * FoxyStripePurchaseForm constructor.
+	 *
+	 * @param ContentController $controller
+	 * @param string $name
+	 * @param FieldList|null $fields
+	 * @param FieldList|null $actions
+	 * @param null $validator
+	 * @param null $product
+	 * @param null $siteConfig
+	 *
+	 */
+	public function __construct(
+		$controller,
+		$name,
+		FieldList $fields = null,
+		FieldList $actions = null,
+		$validator = null,
+		$product = null,
+		$siteConfig = null
+	) {
+		$this->setProduct($product);
+		$this->setSiteConfig($siteConfig);
+
+		$fields = ($fields != null && $fields->exists()) ?
+			$this->getProductFields($fields) :
+			$this->getProductFields(FieldList::create());
+
+		$actions = ($actions != null && $actions->exists()) ?
+			$this->getProductActions($actions) :
+			$this->getProductActions(FieldList::create());
+		$validator = (!empty($validator) || $validator != null) ? $validator : RequiredFields::create();
+
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+
+		//have to call after parent::__construct()
+		$this->setAttribute('action', FoxyCart::FormActionURL());
+		$this->disableSecurityToken();
+
+		$this->setHTMLID($this->getTemplateHelper()->generateFormID($this) . "_{$product->ID}");
+	}
+
+	/**
+	 * @param FieldList $fields
+	 *
+	 * @return FieldList
+	 */
+	protected function getProductFields(FieldList $fields)
+	{
+		//Requirements::javascript('dynamic/foxystripe: client/dist/javascript/scripts.min.js');
+		$hiddenTitle = ($this->product->ReceiptTitle) ?
+			htmlspecialchars($this->product->ReceiptTitle) :
+			htmlspecialchars($this->product->Title);
+		$code = $this->product->Code;
+
+		if ($this->getProduct()->getIsAvailable()) {
+			$fields->push(
+				HiddenField::create('name')
+					->setValue(
+						ProductPage::getGeneratedValue($code, 'name', $hiddenTitle, 'value')
+					)
+			);
+			$fields->push(
+				HiddenField::create('category')
+					->setValue(
+						ProductPage::getGeneratedValue($code, 'category', $this->product->Category()->Code, 'value')
+					)
+			);
+			$fields->push(
+				HiddenField::create('code')
+					->setValue(
+						ProductPage::getGeneratedValue($code, 'code', $this->product->Code, 'value')
+					)
+			);
+			$fields->push(
+				HiddenField::create(
+					'product_id'
+				)->setValue(
+					ProductPage::getGeneratedValue($code, 'product_id', $this->product->ID, 'value')
+				)
+			);
+			$fields->push(
+				HiddenField::create('price')
+					->setValue(
+						ProductPage::getGeneratedValue($code, 'price', $this->product->Price, 'value')
+					)
+			);//can't override id
+			if ($this->product->Weight > 0) {
+				$fields->push(
+					HiddenField::create('weight')
+						->setValue(
+							ProductPage::getGeneratedValue($code, 'weight', $this->product->Weight, 'value')
+						)
+				);
+			}
+
+			$image = null;
+			if ($this->product->Image() || ProductPage::has_extension(ProductPageLegacy::class)) {
+				if ($this->product->Image()) {
+					$image = $this->product->Image()->Pad(80, 80)->absoluteURL;
+				} elseif (ProductPage::has_extension(ProductPageLegacy::class) &&
+					$this->product->PreviewImage()->exists()) {
+					$image = $this->product->PreviewImage()->Pad(80, 80)->absoluteURL;
+				}
+
+				if ($image) {
+					$fields->push(
+						HiddenField::create('image')
+							->setValue(
+								ProductPage::getGeneratedValue($code, 'image', $image, 'value')
+							)
+					);
+				}
+			}
+
+			$optionsSet = $this->getProductOptionSet();
+			$fields->push($optionsSet);
+
+			$quantityMax = ($this->site_config->MaxQuantity) ? $this->site_config->MaxQuantity : 10;
+
+			$fields->push(QuantityField::create('x:visibleQuantity')->setTitle('Quantity')->setValue(1));
+			$fields->push(
+				HiddenField::create('quantity')
+					->setValue(
+						ProductPage::getGeneratedValue($code, 'quantity', 1, 'value')
+					)
+			);
+
+			$fields->push(
+				HeaderField::create('submitPrice', '$' . $this->product->Price, 4)
+					->addExtraClass('submit-price')
+			);
+			$fields->push(
+				$unavailable = HeaderField::create('unavailableText', 'Selection unavailable', 4)
+					->addExtraClass('unavailable-text')
+			);
+
+			if (!empty(trim($this->getSiteConfig()->StoreName)) && $this->getProduct()->getIsAvailable()) {
+				$unavailable->addExtraClass('hidden');
+			}
+
+			$this->extend('updatePurchaseFormFields', $fields);
+		} else {
+			$fields->push(HeaderField::create('unavailableText', 'Currently Out of Stock', 4));
+		}
+
+		$this->extend('updateFoxyStripePurchaseFormFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @param FieldList $actions
+	 *
+	 * @return FieldList
+	 */
+	protected function getProductActions(FieldList $actions)
+	{
+		if (!empty(trim($this->getSiteConfig()->StoreName)) && $this->getProduct()->getIsAvailable()) {
+			$actions->push(
+				$submit = FormAction::create(
+					'x:submit',
+					_t('ProductForm.AddToCart', 'Add to Cart')
+				)->addExtraClass('fs-add-to-cart-button')
+			);
+		}
+
+		$this->extend('updateFoxyStripePurchaseFormActions', $actions);
+
+		return $actions;
+	}
+
+	/**
+	 * @return CompositeField
+	 */
+	protected function getProductOptionSet()
+	{
+		$options = $this->product->ProductOptions();
+		$groupedOptions = new GroupedList($options);
+		$groupedBy = $groupedOptions->groupBy('ProductOptionGroupID');
+
+		/** @var CompositeField $optionsSet */
+		$optionsSet = CompositeField::create();
+
+		/** @var DataList $set */
+		foreach ($groupedBy as $id => $set) {
+			$group = OptionGroup::get()->byID($id);
+			$title = $group->Title;
+			$fieldName = preg_replace('/\s/', '_', $title);
+			$disabled = [];
+			$fullOptions = [];
+
+			foreach ($set as $item) {
+				$item = $this->setAvailability($item);
+
+				$name = ProductPage::getGeneratedValue(
+					$this->product->Code,
+					$group->Title,
+					$item->getGeneratedValue(),
+					'value'
+				);
+
+				$fullOptions[$name] = $item->getGeneratedTitle();
+				if (!$item->Availability) {
+					array_push($disabled, $name);
+				}
+			}
+
+			$optionsSet->push(
+				$dropdown = DropdownField::create($fieldName, $title, $fullOptions)->setTitle($title)
+			);
+
+			if (!empty($disabled)) {
+				$dropdown->setDisabledItems($disabled);
+			}
+
+			$dropdown->addExtraClass("product-options");
+		}
+
+		$optionsSet->addExtraClass('foxycartOptionsContainer');
+
+		return $optionsSet;
+	}
+
+	/**
+	 * @param OptionItem $option
+	 * @return OptionItem
+	 */
+	protected function setAvailability(OptionItem $option)
+	{
+		$option->Available = ($option->getAvailability()) ? true : false;
+
+		return $option;
+	}
 }

src/Model/FoxyCart.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
             if ($config->RemoteDomain) {
                 return $config->RemoteDomain;
             }
-        } else {
+        }else {
             if ($config->StoreName) {
                 return $config->StoreName;
             }
@@ -93,7 +93,7 @@ 
         $config = FoxyStripeSetting::current_foxystripe_setting();
         if ($config->CustomSSL) {
             return sprintf('https://%s/cart', self::getFoxyCartStoreName());
-        } else {
+        }else {
             return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
         }
     }
@@ -113,7 +113,7 @@ 
             $config = FoxyStripeSetting::current_foxystripe_setting();
             if ($config->CustomSSL) {
                 $foxy_domain = self::getFoxyCartStoreName();
-            } else {
+            }else {
                 $foxy_domain = self::getFoxyCartStoreName().'.foxycart.com';
             }
 

Indentation +188 added lines, -188 removed lines

@@ -12,193 +12,193 @@
  */
 class FoxyCart
 {
-    /**
-     * @var string
-     */
-    private static $keyPrefix = 'dYnm1c';
-
-    /**
-     * @param int $length
-     * @param int $count
-     *
-     * @return string
-     */
-    public static function setStoreKey($length = 54, $count = 0)
-    {
-        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
-        $strLength = strlen($charset);
-        $str = '';
-        while ($count < $length) {
-            $str .= $charset[mt_rand(0, $strLength - 1)];
-            ++$count;
-        }
-
-        return self::getKeyPrefix().substr(base64_encode($str), 0, $length);
-    }
-
-    /**
-     * @return mixed|null
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function getStoreKey()
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        if ($config->StoreKey) {
-            return $config->StoreKey;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return null|string
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function store_name_warning()
-    {
-        $warning = null;
-        if (self::getFoxyCartStoreName() === null) {
-            $warning = 'Must define FoxyCart Store Name or Store Remote Domain in your site settings in the cms';
-        }
-
-        return $warning;
-    }
-
-    /**
-     * @return mixed|null
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function getFoxyCartStoreName()
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        if ($config->CustomSSL) {
-            if ($config->RemoteDomain) {
-                return $config->RemoteDomain;
-            }
-        } else {
-            if ($config->StoreName) {
-                return $config->StoreName;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @return string
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function FormActionURL()
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        if ($config->CustomSSL) {
-            return sprintf('https://%s/cart', self::getFoxyCartStoreName());
-        } else {
-            return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
-        }
-    }
-
-    /**
-     * FoxyCart API v1.1 functions.
-     */
-
-    /**
-     * @param array $foxyData
-     * @return string
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    private static function getAPIRequest($foxyData = array())
-    {
-        if (self::getStoreKey() && self::getFoxyCartStoreName()) {
-            $config = FoxyStripeSetting::current_foxystripe_setting();
-            if ($config->CustomSSL) {
-                $foxy_domain = self::getFoxyCartStoreName();
-            } else {
-                $foxy_domain = self::getFoxyCartStoreName().'.foxycart.com';
-            }
-
-            $foxyData['api_token'] = self::getStoreKey();
-
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, 'https://'.$foxy_domain.'/api');
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 15);
-            // If you get SSL errors, you can uncomment the following, or ask your host to add the appropriate CA bundle
-            // curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            $response = trim(curl_exec($ch));
-
-            // The following if block will print any CURL errors you might have
-            if ($response == false) {
-                //trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
-                Injector::inst()->get(LoggerInterface::class)->error('Could not connect to FoxyCart API');
-            }
-            curl_close($ch);
-
-            return $response;
-        }
-        return false;
-    }
-
-    /**
-     * @param null $Member
-     * @return string
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function getCustomer(Member $Member = null)
-    {
-
-        // throw error if no $Member Object
-        if (!isset($Member)) {
-            trigger_error('No Member set', E_USER_ERROR);
-        }
-
-        // grab customer record from API
-
-        $foxyData = array();
-        $foxyData['api_action'] = 'customer_get';
-        if ($Member->Customer_ID) {
-            $foxyData['customer_id'] = $Member->Customer_ID;
-        }
-        $foxyData['customer_email'] = $Member->Email;
-
-        return self::getAPIRequest($foxyData);
-    }
-
-    /**
-     * @param null $Member
-     * @return string
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function putCustomer(Member $Member = null)
-    {
-        // throw error if no $Member Object
-        if ($Member === null) {
+	/**
+	 * @var string
+	 */
+	private static $keyPrefix = 'dYnm1c';
+
+	/**
+	 * @param int $length
+	 * @param int $count
+	 *
+	 * @return string
+	 */
+	public static function setStoreKey($length = 54, $count = 0)
+	{
+		$charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
+		$strLength = strlen($charset);
+		$str = '';
+		while ($count < $length) {
+			$str .= $charset[mt_rand(0, $strLength - 1)];
+			++$count;
+		}
+
+		return self::getKeyPrefix().substr(base64_encode($str), 0, $length);
+	}
+
+	/**
+	 * @return mixed|null
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function getStoreKey()
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		if ($config->StoreKey) {
+			return $config->StoreKey;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return null|string
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function store_name_warning()
+	{
+		$warning = null;
+		if (self::getFoxyCartStoreName() === null) {
+			$warning = 'Must define FoxyCart Store Name or Store Remote Domain in your site settings in the cms';
+		}
+
+		return $warning;
+	}
+
+	/**
+	 * @return mixed|null
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function getFoxyCartStoreName()
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		if ($config->CustomSSL) {
+			if ($config->RemoteDomain) {
+				return $config->RemoteDomain;
+			}
+		} else {
+			if ($config->StoreName) {
+				return $config->StoreName;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return string
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function FormActionURL()
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		if ($config->CustomSSL) {
+			return sprintf('https://%s/cart', self::getFoxyCartStoreName());
+		} else {
+			return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
+		}
+	}
+
+	/**
+	 * FoxyCart API v1.1 functions.
+	 */
+
+	/**
+	 * @param array $foxyData
+	 * @return string
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	private static function getAPIRequest($foxyData = array())
+	{
+		if (self::getStoreKey() && self::getFoxyCartStoreName()) {
+			$config = FoxyStripeSetting::current_foxystripe_setting();
+			if ($config->CustomSSL) {
+				$foxy_domain = self::getFoxyCartStoreName();
+			} else {
+				$foxy_domain = self::getFoxyCartStoreName().'.foxycart.com';
+			}
+
+			$foxyData['api_token'] = self::getStoreKey();
+
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_URL, 'https://'.$foxy_domain.'/api');
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+			// If you get SSL errors, you can uncomment the following, or ask your host to add the appropriate CA bundle
+			// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			$response = trim(curl_exec($ch));
+
+			// The following if block will print any CURL errors you might have
+			if ($response == false) {
+				//trigger_error("Could not connect to FoxyCart API", E_USER_ERROR);
+				Injector::inst()->get(LoggerInterface::class)->error('Could not connect to FoxyCart API');
+			}
+			curl_close($ch);
+
+			return $response;
+		}
+		return false;
+	}
+
+	/**
+	 * @param null $Member
+	 * @return string
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function getCustomer(Member $Member = null)
+	{
+
+		// throw error if no $Member Object
+		if (!isset($Member)) {
+			trigger_error('No Member set', E_USER_ERROR);
+		}
+
+		// grab customer record from API
+
+		$foxyData = array();
+		$foxyData['api_action'] = 'customer_get';
+		if ($Member->Customer_ID) {
+			$foxyData['customer_id'] = $Member->Customer_ID;
+		}
+		$foxyData['customer_email'] = $Member->Email;
+
+		return self::getAPIRequest($foxyData);
+	}
+
+	/**
+	 * @param null $Member
+	 * @return string
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function putCustomer(Member $Member = null)
+	{
+		// throw error if no $Member Object
+		if ($Member === null) {
 //trigger_error('No Member set', E_USER_ERROR);
-            return false;
-        }
-        // send updated customer record from API
-        $foxyData = array();
-        $foxyData['api_action'] = 'customer_save';
-        // customer_id will be 0 if created in SilverStripe.
-        if ($Member->Customer_ID) {
-            $foxyData['customer_id'] = $Member->Customer_ID;
-        }
-        $foxyData['customer_email'] = $Member->Email;
-        $foxyData['customer_password_hash'] = $Member->Password;
-        $foxyData['customer_password_salt'] = $Member->Salt;
-        $foxyData['customer_first_name'] = $Member->FirstName;
-        $foxyData['customer_last_name'] = $Member->Surname;
-
-        return self::getAPIRequest($foxyData);
-    }
-
-    /**
-     * @return string
-     */
-    public static function getKeyPrefix()
-    {
-        return self::$keyPrefix;
-    }
+			return false;
+		}
+		// send updated customer record from API
+		$foxyData = array();
+		$foxyData['api_action'] = 'customer_save';
+		// customer_id will be 0 if created in SilverStripe.
+		if ($Member->Customer_ID) {
+			$foxyData['customer_id'] = $Member->Customer_ID;
+		}
+		$foxyData['customer_email'] = $Member->Email;
+		$foxyData['customer_password_hash'] = $Member->Password;
+		$foxyData['customer_password_salt'] = $Member->Salt;
+		$foxyData['customer_first_name'] = $Member->FirstName;
+		$foxyData['customer_last_name'] = $Member->Surname;
+
+		return self::getAPIRequest($foxyData);
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getKeyPrefix()
+	{
+		return self::$keyPrefix;
+	}
 }

src/Model/OptionGroup.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName('Options');
 
             $fields->addFieldToTab(

Indentation +175 added lines, -175 removed lines

@@ -19,179 +19,179 @@
  */
 class OptionGroup extends DataObject
 {
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Title' => 'Varchar(100)',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_many = array(
-        'Options' => OptionItem::class,
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Product Option Group';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Product Option Groups';
-
-    /**
-     * @var string
-     */
-    private static $description = 'Groups of product options, e.g. size, color, etc';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'OptionGroup';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Options');
-
-            $fields->addFieldToTab(
-                'Root.Options',
-                HeaderField::create('OptionsHeader', 'Options can be added on Product Pages.', 3)
-            );
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function requireDefaultRecords()
-    {
-        parent::requireDefaultRecords();
-        // create a catch-all group
-        if (!self::get()->filter(array('Title' => 'Options'))->first()) {
-            $do = new self();
-            $do->Title = 'Options';
-            $do->write();
-        }
-        if (!self::get()->filter(array('Title' => 'Size'))->first()) {
-            $do = new self();
-            $do->Title = 'Size';
-            $do->write();
-        }
-        if (!self::get()->filter(array('Title' => 'Color'))->first()) {
-            $do = new self();
-            $do->Title = 'Color';
-            $do->write();
-        }
-        if (!self::get()->filter(array('Title' => 'Type'))->first()) {
-            $do = new self();
-            $do->Title = 'Type';
-            $do->write();
-        }
-    }
-
-    /**
-     * @return RequiredFields
-     */
-    public function getCMSValidator()
-    {
-        return new RequiredFields(array('Title'));
-    }
-
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        $title = $this->Title;
-        $firstChar = substr($title, 0, 1);
-        if (preg_match('/[^a-zA-Z]/', $firstChar)) {
-            $result->addError('The first character of the Title can only be a letter', 'bad');
-        }
-        if (preg_match('/[^a-zA-Z]\s/', $title)) {
-            $result->addError('Please only use letters, numbers and spaces in the title', 'bad');
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    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)) {
-            if ($noneGroup = self::get()->filter(array('Title' => 'Options'))->first()) {
-                /** @var OptionItem $item */
-                foreach ($items as $item) {
-                    $item->ProductOptionGroupID = $noneGroup->ID;
-                    $item->write();
-                }
-            }
-        }
-    }
-
-    /**
-     * @param bool $member
-     *
-     * @return bool
-     */
-    public function canView($member = null)
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        switch ($this->Title) {
-            case 'Options':
-                return false;
-                break;
-            default:
-                return Permission::check('Product_CANCRUD', 'any', $member);
-                break;
-        }
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-        return $this->canEdit($member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Title' => 'Varchar(100)',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_many = array(
+		'Options' => OptionItem::class,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Product Option Group';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Product Option Groups';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'Groups of product options, e.g. size, color, etc';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'OptionGroup';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Options');
+
+			$fields->addFieldToTab(
+				'Root.Options',
+				HeaderField::create('OptionsHeader', 'Options can be added on Product Pages.', 3)
+			);
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function requireDefaultRecords()
+	{
+		parent::requireDefaultRecords();
+		// create a catch-all group
+		if (!self::get()->filter(array('Title' => 'Options'))->first()) {
+			$do = new self();
+			$do->Title = 'Options';
+			$do->write();
+		}
+		if (!self::get()->filter(array('Title' => 'Size'))->first()) {
+			$do = new self();
+			$do->Title = 'Size';
+			$do->write();
+		}
+		if (!self::get()->filter(array('Title' => 'Color'))->first()) {
+			$do = new self();
+			$do->Title = 'Color';
+			$do->write();
+		}
+		if (!self::get()->filter(array('Title' => 'Type'))->first()) {
+			$do = new self();
+			$do->Title = 'Type';
+			$do->write();
+		}
+	}
+
+	/**
+	 * @return RequiredFields
+	 */
+	public function getCMSValidator()
+	{
+		return new RequiredFields(array('Title'));
+	}
+
+	/**
+	 * @return ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		$title = $this->Title;
+		$firstChar = substr($title, 0, 1);
+		if (preg_match('/[^a-zA-Z]/', $firstChar)) {
+			$result->addError('The first character of the Title can only be a letter', 'bad');
+		}
+		if (preg_match('/[^a-zA-Z]\s/', $title)) {
+			$result->addError('Please only use letters, numbers and spaces in the title', 'bad');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	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)) {
+			if ($noneGroup = self::get()->filter(array('Title' => 'Options'))->first()) {
+				/** @var OptionItem $item */
+				foreach ($items as $item) {
+					$item->ProductOptionGroupID = $noneGroup->ID;
+					$item->write();
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param bool $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = null)
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		switch ($this->Title) {
+			case 'Options':
+				return false;
+				break;
+			default:
+				return Permission::check('Product_CANCRUD', 'any', $member);
+				break;
+		}
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+		return $this->canEdit($member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
 }

src/Model/OptionItem.php

Spacing +6 added lines, -7 removed lines

@@ -218,7 +218,7 @@ 
                 )->setEmptyString('')
                     ->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?')),
             ]);
-        } else {
+        }else {
             $fields->addFieldsToTab(
                 'Root.Modifiers',
                 [
@@ -232,7 +232,7 @@ 
         }
 
         // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
+        $groups = function() {
             return OptionGroup::get()->map()->toArray();
         };
         $groupFields = singleton(OptionGroup::class)->getCMSFields();
@@ -339,9 +339,9 @@ 
      */
     public function getGeneratedValue()
     {
-        $modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
         $modPriceWithSymbol = self::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
-        $modWeight = ($this->WeightModifier) ? (string) $this->WeightModifier : '0';
+        $modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
         $modWeight = self::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
         $modCode = self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
 
@@ -353,14 +353,13 @@ 
      */
     public function getGeneratedTitle()
     {
-        $modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
+        $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
         $title = $this->Title;
         $title .= ($this->PriceModifier != 0) ?
             ': ('.self::getOptionModifierActionSymbol(
                 $this->PriceModifierAction,
                 $returnWithOnlyPlusMinus = true
-            ).'$'.$modPrice.')' :
-            '';
+            ).'$'.$modPrice.')' : '';
 
         return $title;
     }

Indentation +387 added lines, -387 removed lines

@@ -40,393 +40,393 @@
  */
 class OptionItem extends DataObject
 {
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Title' => 'Text',
-        'WeightModifier' => 'Decimal',
-        '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',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Product' => ProductPage::class,
-        'ProductOptionGroup' => OptionGroup::class,
-    );
-
-    /**
-     * @var array
-     */
-    private static $belongs_many_many = array(
-        'OrderDetails' => OrderDetail::class,
-    );
-
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'Available' => true,
-    );
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = array(
-        'Title' => 'Title',
-        'ProductOptionGroup.Title' => 'Group',
-        'IsAvailable' => 'Available',
-    );
-
-    /**
-     * @var array
-     */
-    private static $searchable_fields = [
-        'Title' => [
-            'title' => 'Title',
-        ],
-        'ProductOptionGroup.Title' => [
-            'title' => 'Group',
-        ],
-    ];
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'SortOrder';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'OptionItem';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName([
-            'OrderDetails',
-            'SortOrder',
-            'ProductID',
-            'WeightModifier',
-            'CodeModifier',
-            'PriceModifier',
-            'WeightModifierAction',
-            'CodeModifierAction',
-            'PriceModifierAction',
-        ]);
-
-        if ($this->ProductID) {
-            $product = ProductPage::get()->byID($this->ProductID);
-
-            $parentPrice = $product->obj('Price')->Nice();
-            $parentWeight = $product->Weight;
-            $parentCode = $product->Code;
-
-            $fields->addFieldsToTab('Root.Modifiers', [
-                HeaderField::create('ModifyHD', _t(
-                    'OptionItem.ModifyHD',
-                    'Product Option Modifiers'
-                ), 2),
-
-                // Weight Modifier Fields
-                HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
-                TextField::create('WeightModifier')
-                    ->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
-                DropdownField::create(
-                    'WeightModifierAction',
-                    _t('OptionItem.WeightModifierAction', 'Weight Modification'),
-                    [
-                        'Add' => _t(
-                            'OptionItem.WeightAdd',
-                            'Add to Base Weight ({weight})',
-                            'Add to weight',
-                            ['weight' => $parentWeight]
-                        ),
-                        'Subtract' => _t(
-                            'OptionItem.WeightSubtract',
-                            'Subtract from Base Weight ({weight})',
-                            'Subtract from weight',
-                            ['weight' => $parentWeight]
-                        ),
-                        'Set' => _t('OptionItem.WeightSet', 'Set as a new 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')
-                    ->setTitle(_t('OptionItem.PriceModifier', 'Price')),
-                DropdownField::create(
-                    'PriceModifierAction',
-                    _t('OptionItem.PriceModifierAction', 'Price Modification'),
-                    [
-                        'Add' => _t(
-                            'OptionItem.PriceAdd',
-                            'Add to Base Price ({price})',
-                            'Add to price',
-                            ['price' => $parentPrice]
-                        ),
-                        'Subtract' => _t(
-                            'OptionItem.PriceSubtract',
-                            'Subtract from Base Price ({price})',
-                            'Subtract from price',
-                            ['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')
-                    ->setTitle(_t('OptionItem.CodeModifier', 'Code')),
-                DropdownField::create(
-                    'CodeModifierAction',
-                    _t('OptionItem.CodeModifierAction', 'Code Modification'),
-                    [
-                        'Add' => _t(
-                            'OptionItem.CodeAdd',
-                            'Add to Base Code ({code})',
-                            'Add to code',
-                            ['code' => $parentCode]
-                        ),
-                        'Subtract' => _t(
-                            'OptionItem.CodeSubtract',
-                            'Subtract from Base Code ({code})',
-                            'Subtract from code',
-                            ['code' => $parentCode]
-                        ),
-                        'Set' => _t('OptionItem.CodeSet', 'Set as a new Code'),
-                    ]
-                )->setEmptyString('')
-                    ->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?')),
-            ]);
-        } else {
-            $fields->addFieldsToTab(
-                'Root.Modifiers',
-                [
-                    HeaderField::create(
-                        'ModifyHeader',
-                        'Modifiers can be set when on a Product Page',
-                        3
-                    ),
-                ]
-            );
-        }
-
-        // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
-            return OptionGroup::get()->map()->toArray();
-        };
-        $groupFields = singleton(OptionGroup::class)->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">
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Title' => 'Text',
+		'WeightModifier' => 'Decimal',
+		'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',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Product' => ProductPage::class,
+		'ProductOptionGroup' => OptionGroup::class,
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $belongs_many_many = array(
+		'OrderDetails' => OrderDetail::class,
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'Available' => true,
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = array(
+		'Title' => 'Title',
+		'ProductOptionGroup.Title' => 'Group',
+		'IsAvailable' => 'Available',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'Title' => [
+			'title' => 'Title',
+		],
+		'ProductOptionGroup.Title' => [
+			'title' => 'Group',
+		],
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'SortOrder';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'OptionItem';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName([
+			'OrderDetails',
+			'SortOrder',
+			'ProductID',
+			'WeightModifier',
+			'CodeModifier',
+			'PriceModifier',
+			'WeightModifierAction',
+			'CodeModifierAction',
+			'PriceModifierAction',
+		]);
+
+		if ($this->ProductID) {
+			$product = ProductPage::get()->byID($this->ProductID);
+
+			$parentPrice = $product->obj('Price')->Nice();
+			$parentWeight = $product->Weight;
+			$parentCode = $product->Code;
+
+			$fields->addFieldsToTab('Root.Modifiers', [
+				HeaderField::create('ModifyHD', _t(
+					'OptionItem.ModifyHD',
+					'Product Option Modifiers'
+				), 2),
+
+				// Weight Modifier Fields
+				HeaderField::create('WeightHD', _t('OptionItem.WeightHD', 'Modify Weight'), 3),
+				TextField::create('WeightModifier')
+					->setTitle(_t('OptionItem.WeightModifier', 'Weight')),
+				DropdownField::create(
+					'WeightModifierAction',
+					_t('OptionItem.WeightModifierAction', 'Weight Modification'),
+					[
+						'Add' => _t(
+							'OptionItem.WeightAdd',
+							'Add to Base Weight ({weight})',
+							'Add to weight',
+							['weight' => $parentWeight]
+						),
+						'Subtract' => _t(
+							'OptionItem.WeightSubtract',
+							'Subtract from Base Weight ({weight})',
+							'Subtract from weight',
+							['weight' => $parentWeight]
+						),
+						'Set' => _t('OptionItem.WeightSet', 'Set as a new 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')
+					->setTitle(_t('OptionItem.PriceModifier', 'Price')),
+				DropdownField::create(
+					'PriceModifierAction',
+					_t('OptionItem.PriceModifierAction', 'Price Modification'),
+					[
+						'Add' => _t(
+							'OptionItem.PriceAdd',
+							'Add to Base Price ({price})',
+							'Add to price',
+							['price' => $parentPrice]
+						),
+						'Subtract' => _t(
+							'OptionItem.PriceSubtract',
+							'Subtract from Base Price ({price})',
+							'Subtract from price',
+							['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')
+					->setTitle(_t('OptionItem.CodeModifier', 'Code')),
+				DropdownField::create(
+					'CodeModifierAction',
+					_t('OptionItem.CodeModifierAction', 'Code Modification'),
+					[
+						'Add' => _t(
+							'OptionItem.CodeAdd',
+							'Add to Base Code ({code})',
+							'Add to code',
+							['code' => $parentCode]
+						),
+						'Subtract' => _t(
+							'OptionItem.CodeSubtract',
+							'Subtract from Base Code ({code})',
+							'Subtract from code',
+							['code' => $parentCode]
+						),
+						'Set' => _t('OptionItem.CodeSet', 'Set as a new Code'),
+					]
+				)->setEmptyString('')
+					->setDescription(_t('OptionItem.CodeDescription', 'Does code modify or replace base code?')),
+			]);
+		} else {
+			$fields->addFieldsToTab(
+				'Root.Modifiers',
+				[
+					HeaderField::create(
+						'ModifyHeader',
+						'Modifiers can be set when on a Product Page',
+						3
+					),
+				]
+			);
+		}
+
+		// ProductOptionGroup Dropdown field w/ add new
+		$groups = function () {
+			return OptionGroup::get()->map()->toArray();
+		};
+		$groupFields = singleton(OptionGroup::class)->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);
-        }
-
-        $fields->addFieldsToTab('Root.Main', array(
-            TextField::create('Title')
-                ->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'
-                )),
-            $groupField,
-        ));
-
-        return $fields;
-    }
-
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        if ($this->ProductOptionGroupID == 0) {
-            $result->addError('Must set a Group prior to saving');
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param $oma
-     * @param bool $returnWithOnlyPlusMinus
-     *
-     * @return string
-     */
-    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false)
-    {
-        switch ($oma) {
-            case 'Subtract':
-                $symbol = '-';
-                break;
-            case 'Set':
-                $symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
-                break;
-            default:
-                $symbol = '+';
-        }
-
-        return $symbol;
-    }
-
-    /**
-     * @return string
-     */
-    public function getWeightModifierWithSymbol()
-    {
-        return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPriceModifierWithSymbol()
-    {
-        return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCodeModifierWithSymbol()
-    {
-        return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getProductOptionGroupTitle()
-    {
-        return $this->ProductOptionGroup()->Title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getGeneratedValue()
-    {
-        $modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
-        $modPriceWithSymbol = self::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
-        $modWeight = ($this->WeightModifier) ? (string) $this->WeightModifier : '0';
-        $modWeight = self::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
-        $modCode = self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
-
-        return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function getGeneratedTitle()
-    {
-        $modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
-        $title = $this->Title;
-        $title .= ($this->PriceModifier != 0) ?
-            ': ('.self::getOptionModifierActionSymbol(
-                $this->PriceModifierAction,
-                $returnWithOnlyPlusMinus = true
-            ).'$'.$modPrice.')' :
-            '';
-
-        return $title;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getAvailability()
-    {
-        $available = ($this->Available == 1) ? true : false;
-
-        $this->extend('updateOptionAvailability', $available);
-
-        return $available;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIsAvailable()
-    {
-        if ($this->getAvailability()) {
-            return 'yes';
-        }
-
-        return 'no';
-    }
-
-    /**
-     * @param bool $member
-     *
-     * @return bool
-     */
-    public function canView($member = false)
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        return Permission::check('Product_CANCRUD');
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-        return Permission::check('Product_CANCRUD');
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Product_CANCRUD');
-    }
+			));
+		if (class_exists('QuickAddNewExtension')) {
+			$groupField->useAddNew('OptionGroup', $groups, $groupFields);
+		}
+
+		$fields->addFieldsToTab('Root.Main', array(
+			TextField::create('Title')
+				->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'
+				)),
+			$groupField,
+		));
+
+		return $fields;
+	}
+
+	/**
+	 * @return ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		if ($this->ProductOptionGroupID == 0) {
+			$result->addError('Must set a Group prior to saving');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param $oma
+	 * @param bool $returnWithOnlyPlusMinus
+	 *
+	 * @return string
+	 */
+	public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false)
+	{
+		switch ($oma) {
+			case 'Subtract':
+				$symbol = '-';
+				break;
+			case 'Set':
+				$symbol = ($returnWithOnlyPlusMinus) ? '' : ':';
+				break;
+			default:
+				$symbol = '+';
+		}
+
+		return $symbol;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWeightModifierWithSymbol()
+	{
+		return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPriceModifierWithSymbol()
+	{
+		return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCodeModifierWithSymbol()
+	{
+		return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getProductOptionGroupTitle()
+	{
+		return $this->ProductOptionGroup()->Title;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getGeneratedValue()
+	{
+		$modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
+		$modPriceWithSymbol = self::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
+		$modWeight = ($this->WeightModifier) ? (string) $this->WeightModifier : '0';
+		$modWeight = self::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
+		$modCode = self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+
+		return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function getGeneratedTitle()
+	{
+		$modPrice = ($this->PriceModifier) ? (string) $this->PriceModifier : '0';
+		$title = $this->Title;
+		$title .= ($this->PriceModifier != 0) ?
+			': ('.self::getOptionModifierActionSymbol(
+				$this->PriceModifierAction,
+				$returnWithOnlyPlusMinus = true
+			).'$'.$modPrice.')' :
+			'';
+
+		return $title;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getAvailability()
+	{
+		$available = ($this->Available == 1) ? true : false;
+
+		$this->extend('updateOptionAvailability', $available);
+
+		return $available;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIsAvailable()
+	{
+		if ($this->getAvailability()) {
+			return 'yes';
+		}
+
+		return 'no';
+	}
+
+	/**
+	 * @param bool $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = false)
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		return Permission::check('Product_CANCRUD');
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+		return Permission::check('Product_CANCRUD');
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Product_CANCRUD');
+	}
 }

src/ORM/CustomerExtension.php

Indentation +39 added lines, -39 removed lines

@@ -16,49 +16,49 @@
  */
 class CustomerExtension extends DataExtension
 {
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Customer_ID' => 'Int',
-    ];
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Customer_ID' => 'Int',
+	];
 
-    /**
-     * @var array
-     */
-    private static $has_many = [
-        'Orders' => Order::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $has_many = [
+		'Orders' => Order::class,
+	];
 
-    /**
-     * @var array
-     */
-    private static $indexes = [
-        'Customer_ID' => true, // make unique
-    ];
+	/**
+	 * @var array
+	 */
+	private static $indexes = [
+		'Customer_ID' => true, // make unique
+	];
 
-    /**
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
+	/**
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	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
-        if (!$this->owner->PasswordEncryption && (
-                $this->owner->PasswordEncryption == null || $this->owner->PasswordEncryption == 'none'
-            )) {
-            $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
+		if (!$this->owner->PasswordEncryption && (
+				$this->owner->PasswordEncryption == null || $this->owner->PasswordEncryption == 'none'
+			)) {
+			$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
-        if ($response) {
-            $foxyResponse = new \SimpleXMLElement($response);
-            $this->owner->Customer_ID = (int)$foxyResponse->customer_id;
-        }
-    }
+		// Grab customer_id record from FoxyCart response, store in Member
+		if ($response) {
+			$foxyResponse = new \SimpleXMLElement($response);
+			$this->owner->Customer_ID = (int)$foxyResponse->customer_id;
+		}
+	}
 }

src/ORM/FoxyStripeProductFormFieldExtension.php

Indentation +14 added lines, -14 removed lines

@@ -11,18 +11,18 @@
  */
 class FoxyStripeProductFormFieldExtension extends DataExtension
 {
-    /**
-     * @param $attributes
-     */
-    public function updateAttributes(&$attributes)
-    {
-        if (Controller::curr() instanceof ContentController &&
-            Controller::curr()->data()->Classname == 'DonationProduct'
-        ) {
-            if (preg_match('/^(product_id)/', $this->owner->getName())) {
-                $attributes['h:name'] = $attributes['name'];
-                unset($attributes['name']);
-            }
-        }
-    }
+	/**
+	 * @param $attributes
+	 */
+	public function updateAttributes(&$attributes)
+	{
+		if (Controller::curr() instanceof ContentController &&
+			Controller::curr()->data()->Classname == 'DonationProduct'
+		) {
+			if (preg_match('/^(product_id)/', $this->owner->getName())) {
+				$attributes['h:name'] = $attributes['name'];
+				unset($attributes['name']);
+			}
+		}
+	}
 }

src/Page/DonationProduct.php

Indentation +39 added lines, -39 removed lines

@@ -6,43 +6,43 @@
 
 class DonationProduct extends ProductPage
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Donation';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Donations';
-
-    /**
-     * @var array
-     */
-    //private static $allowed_children = [];
-
-    /**
-     * @var bool
-     */
-    private static $can_be_root = true;
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'DonationProduct';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName([
-            'Weight',
-            'Price',
-        ]);
-
-        return $fields;
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Donation';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Donations';
+
+	/**
+	 * @var array
+	 */
+	//private static $allowed_children = [];
+
+	/**
+	 * @var bool
+	 */
+	private static $can_be_root = true;
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'DonationProduct';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName([
+			'Weight',
+			'Price',
+		]);
+
+		return $fields;
+	}
 }