dynamic / foxystripe

thirdparty/rc4crypt.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	static function encrypt ($pwd, $data, $ispwdHex = 0)
+	static function encrypt($pwd, $data, $ispwdHex = 0)
 	{
 		if ($ispwdHex)
 			$pwd = @pack('H*', $pwd); // valid input, please!
@@ -80,7 +80,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	static function decrypt ($pwd, $data, $ispwdHex = 0)
+	static function decrypt($pwd, $data, $ispwdHex = 0)
 	{
 		return self::encrypt($pwd, $data, $ispwdHex);
 	}

Braces +4 added lines, -2 removed lines

@@ -37,8 +37,10 @@
 	 */
 	static function encrypt ($pwd, $data, $ispwdHex = 0)
 	{
-		if ($ispwdHex)
-			$pwd = @pack('H*', $pwd); // valid input, please!
+		if ($ispwdHex) {
+					$pwd = @pack('H*', $pwd);
+		}
+		// valid input, please!
  
 		$key[] = '';
 		$box[] = '';

src/Controller/OrderHistoryPageController.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     {
         if (Security::getCurrentUser()) {
             return true;
-        } else {
+        }else {
             return Security::permissionFailure($this, _t(
                 'AccountPage.CANNOTCONFIRMLOGGEDIN',
                 'Please login to view this page.'

Indentation +28 added lines, -28 removed lines

@@ -12,35 +12,35 @@
  */
 class OrderHistoryPageController extends \PageController
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'index',
-    );
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'index',
+	);
 
-    /**
-     * @return bool|\SilverStripe\Control\HTTPResponse
-     */
-    public function checkMember()
-    {
-        if (Security::getCurrentUser()) {
-            return true;
-        } else {
-            return Security::permissionFailure($this, _t(
-                'AccountPage.CANNOTCONFIRMLOGGEDIN',
-                'Please login to view this page.'
-            ));
-        }
-    }
+	/**
+	 * @return bool|\SilverStripe\Control\HTTPResponse
+	 */
+	public function checkMember()
+	{
+		if (Security::getCurrentUser()) {
+			return true;
+		} else {
+			return Security::permissionFailure($this, _t(
+				'AccountPage.CANNOTCONFIRMLOGGEDIN',
+				'Please login to view this page.'
+			));
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function Index()
-    {
-        $this->checkMember();
+	/**
+	 * @return array
+	 */
+	public function Index()
+	{
+		$this->checkMember();
 
-        return array();
-    }
+		return array();
+	}
 }

src/Model/FoxyStripeClient.php

Spacing +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
         if ($client) {
             if ($category = $this->getCategory($data['code'])) {
                 $result = $client->patch($category, $data);
-            } else {
+            }else {
                 $result = $client->post($this->getItemCategoriesURL(), $data);
             }
             $errors = array_merge($errors, $client->getErrors($result));

Indentation +291 added lines, -291 removed lines

@@ -9,300 +9,300 @@
 
 class FoxyStripeClient
 {
-    /**
-     * @var string
-     */
-    private static $table_name = 'FS_FoxyStripeClient';
-
-    /**
-     * @var
-     */
-    private $client;
-
-    /**
-     * @var
-     */
-    private $current_store;
-
-    /**
-     * @var
-     */
-    private $item_categories_url;
-
-    /**
-     * @var
-     */
-    private $item_categories;
-
-    /**
-     * FoxyStripeClient constructor.
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function __construct()
-    {
-        $config = array(
-            'use_sandbox' => false,
-        );
-
-        if ($setting = FoxyStripeSetting::current_foxystripe_setting()) {
-            $config['client_id'] = $setting->client_id;
-            $config['client_secret'] = $setting->client_secret;
-            $config['refresh_token'] = $setting->refresh_token;
-            $config['access_token'] = $setting->access_token;
-        }
-
-        $guzzle_config = array(
-            'defaults' => array(
-                'debug' => false,
-                'exceptions' => false,
-            ),
-        );
-
-        /*
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'FS_FoxyStripeClient';
+
+	/**
+	 * @var
+	 */
+	private $client;
+
+	/**
+	 * @var
+	 */
+	private $current_store;
+
+	/**
+	 * @var
+	 */
+	private $item_categories_url;
+
+	/**
+	 * @var
+	 */
+	private $item_categories;
+
+	/**
+	 * FoxyStripeClient constructor.
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function __construct()
+	{
+		$config = array(
+			'use_sandbox' => false,
+		);
+
+		if ($setting = FoxyStripeSetting::current_foxystripe_setting()) {
+			$config['client_id'] = $setting->client_id;
+			$config['client_secret'] = $setting->client_secret;
+			$config['refresh_token'] = $setting->refresh_token;
+			$config['access_token'] = $setting->access_token;
+		}
+
+		$guzzle_config = array(
+			'defaults' => array(
+				'debug' => false,
+				'exceptions' => false,
+			),
+		);
+
+		/*
          * Set up our Guzzle Client
          */
-        $guzzle = new Client($guzzle_config);
-        //CacheSubscriber::attach($guzzle); // todo add caching middleware guzzle-cache-middleware
+		$guzzle = new Client($guzzle_config);
+		//CacheSubscriber::attach($guzzle); // todo add caching middleware guzzle-cache-middleware
 
-        /*
+		/*
          * Get our FoxyClient
          */
-        $fc = new FoxyClient($guzzle, $config);
-
-        $this->setClient($fc);
-        $this->setCurrentStore();
-        $this->setItemCategoriesURL();
-        $this->setItemCategories();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    /**
-     * @param $client
-     *
-     * @return $this
-     */
-    public function setClient($client)
-    {
-        $this->client = $client;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function is_valid()
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        return $config->EnableAPI &&
-            $config->client_id &&
-            $config->client_secret &&
-            $config->refresh_token &&
-            $config->access_token;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCurrentStore()
-    {
-        return $this->current_store;
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function setCurrentStore()
-    {
-        $client = $this->getClient();
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-
-        $errors = array();
-        $data = array(
-            'store_domain' => $config->StoreName,
-        );
-
-        if ($client && $result = $client->get()) {
-            $errors = array_merge($errors, $client->getErrors($result));
-            if ($reporting_uri = $client->getLink('fx:reporting')) {
-                $errors = array_merge($errors, $client->getErrors($reporting_uri));
-                if ($result = $client->get($reporting_uri)) {
-                    $errors = array_merge($errors, $client->getErrors($result));
-                    if ($store_exists_uri = $client->getLink('fx:reporting_store_domain_exists')) {
-                        $errors = array_merge($errors, $client->getErrors($store_exists_uri));
-                        if ($result = $client->get($store_exists_uri, $data)) {
-                            $errors = array_merge($errors, $client->getErrors($result));
-                            if ($store = $client->getLink('fx:store')) {
-                                $errors = array_merge($errors, $client->getErrors($store));
-                                $this->current_store = $store;
-                            }
-                        }
-                    }
-                }
-            }
-            if (count($errors)) {
-                Injector::inst()->get(LoggerInterface::class)->error('setCurrentStore errors - '.json_encode($errors));
-            }
-        }
-    }
-
-    /**
-     * @param array $data
-     *
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function updateStore($data = [])
-    {
-        $client = $this->getClient();
-        $errors = [];
-
-        $result = $client->patch($this->getCurrentStore(), $data);
-
-        $errors = array_merge($errors, $client->getErrors($result));
-        if (count($errors)) {
-            Injector::inst()->get(LoggerInterface::class)->error('updateStore errors - '.json_encode($errors));
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemCategoriesURL()
-    {
-        return $this->item_categories_url;
-    }
-
-    /**
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function setItemCategoriesURL()
-    {
-        $client = $this->getClient();
-        $errors = [];
-
-        if ($client) {
-            $result = $client->get($this->getCurrentStore());
-
-            if (isset($result['_links']['fx:item_categories']['href'])) {
-                $this->item_categories_url = $result['_links']['fx:item_categories']['href'];
-            }
-
-            $errors = array_merge($errors, $client->getErrors($result));
-            if (count($errors)) {
-                Injector::inst()
-                    ->get(LoggerInterface::class)->error('setItemCategoriesURL errors - '.json_encode($errors));
-            }
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemCategories()
-    {
-        return $this->item_categories;
-    }
-
-    /**
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function setItemCategories()
-    {
-        $client = $this->getClient();
-        $errors = [];
-
-        if ($client) {
-            $result = $client->get($this->getItemCategoriesURL());
-
-            $this->item_categories = $result;
-
-            $errors = array_merge($errors, $client->getErrors($result));
-            if (count($errors)) {
-                Injector::inst()
-                    ->get(LoggerInterface::class)->error('setItemCategories errors - '.json_encode($errors));
-            }
-        }
-    }
-
-    /**
-     * @param $code
-     *
-     * @return bool
-     *
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function getCategory($code)
-    {
-        if ($categoriesURL = $this->getItemCategoriesURL()) {
-            $client = $this->getClient();
-            $errors = [];
-            $data = [
-                'code' => $code,
-            ];
-            if ($result = $client->get($categoriesURL, $data)) {
-                if (count($result['_embedded']['fx:item_categories']) > 0) {
-                    $category = $result['_embedded']['fx:item_categories'][0]['_links']['self']['href'];
-
-                    return $category;
-                }
-                $errors = array_merge($errors, $client->getErrors($result));
-                if (count($errors)) {
-                    Injector::inst()->get(LoggerInterface::class)->error('getCategory errors - '.json_encode($errors));
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param array $data
-     *
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function putCategory($data = [])
-    {
-        $client = $this->getClient();
-        $errors = [];
-
-        if ($client) {
-            if ($category = $this->getCategory($data['code'])) {
-                $result = $client->patch($category, $data);
-            } else {
-                $result = $client->post($this->getItemCategoriesURL(), $data);
-            }
-            $errors = array_merge($errors, $client->getErrors($result));
-            if (count($errors)) {
-                Injector::inst()->get(LoggerInterface::class)->error('putCategory errors - '.json_encode($errors));
-            }
-        }
-    }
-
-    /**
-     * @param array $data
-     *
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function deleteCategory($data = [])
-    {
-        $client = $this->getClient();
-        $errors = [];
-
-        if ($category = $this->getCategory($data['code'])) {
-            $result = $client->delete($category);
-
-            $errors = array_merge($errors, $client->getErrors($result));
-            if (count($errors)) {
-                Injector::inst()->get(LoggerInterface::class)->error('deleteCategory errors - '.json_encode($errors));
-            }
-        }
-    }
+		$fc = new FoxyClient($guzzle, $config);
+
+		$this->setClient($fc);
+		$this->setCurrentStore();
+		$this->setItemCategoriesURL();
+		$this->setItemCategories();
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getClient()
+	{
+		return $this->client;
+	}
+
+	/**
+	 * @param $client
+	 *
+	 * @return $this
+	 */
+	public function setClient($client)
+	{
+		$this->client = $client;
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function is_valid()
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		return $config->EnableAPI &&
+			$config->client_id &&
+			$config->client_secret &&
+			$config->refresh_token &&
+			$config->access_token;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCurrentStore()
+	{
+		return $this->current_store;
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function setCurrentStore()
+	{
+		$client = $this->getClient();
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+
+		$errors = array();
+		$data = array(
+			'store_domain' => $config->StoreName,
+		);
+
+		if ($client && $result = $client->get()) {
+			$errors = array_merge($errors, $client->getErrors($result));
+			if ($reporting_uri = $client->getLink('fx:reporting')) {
+				$errors = array_merge($errors, $client->getErrors($reporting_uri));
+				if ($result = $client->get($reporting_uri)) {
+					$errors = array_merge($errors, $client->getErrors($result));
+					if ($store_exists_uri = $client->getLink('fx:reporting_store_domain_exists')) {
+						$errors = array_merge($errors, $client->getErrors($store_exists_uri));
+						if ($result = $client->get($store_exists_uri, $data)) {
+							$errors = array_merge($errors, $client->getErrors($result));
+							if ($store = $client->getLink('fx:store')) {
+								$errors = array_merge($errors, $client->getErrors($store));
+								$this->current_store = $store;
+							}
+						}
+					}
+				}
+			}
+			if (count($errors)) {
+				Injector::inst()->get(LoggerInterface::class)->error('setCurrentStore errors - '.json_encode($errors));
+			}
+		}
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function updateStore($data = [])
+	{
+		$client = $this->getClient();
+		$errors = [];
+
+		$result = $client->patch($this->getCurrentStore(), $data);
+
+		$errors = array_merge($errors, $client->getErrors($result));
+		if (count($errors)) {
+			Injector::inst()->get(LoggerInterface::class)->error('updateStore errors - '.json_encode($errors));
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemCategoriesURL()
+	{
+		return $this->item_categories_url;
+	}
+
+	/**
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function setItemCategoriesURL()
+	{
+		$client = $this->getClient();
+		$errors = [];
+
+		if ($client) {
+			$result = $client->get($this->getCurrentStore());
+
+			if (isset($result['_links']['fx:item_categories']['href'])) {
+				$this->item_categories_url = $result['_links']['fx:item_categories']['href'];
+			}
+
+			$errors = array_merge($errors, $client->getErrors($result));
+			if (count($errors)) {
+				Injector::inst()
+					->get(LoggerInterface::class)->error('setItemCategoriesURL errors - '.json_encode($errors));
+			}
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemCategories()
+	{
+		return $this->item_categories;
+	}
+
+	/**
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function setItemCategories()
+	{
+		$client = $this->getClient();
+		$errors = [];
+
+		if ($client) {
+			$result = $client->get($this->getItemCategoriesURL());
+
+			$this->item_categories = $result;
+
+			$errors = array_merge($errors, $client->getErrors($result));
+			if (count($errors)) {
+				Injector::inst()
+					->get(LoggerInterface::class)->error('setItemCategories errors - '.json_encode($errors));
+			}
+		}
+	}
+
+	/**
+	 * @param $code
+	 *
+	 * @return bool
+	 *
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function getCategory($code)
+	{
+		if ($categoriesURL = $this->getItemCategoriesURL()) {
+			$client = $this->getClient();
+			$errors = [];
+			$data = [
+				'code' => $code,
+			];
+			if ($result = $client->get($categoriesURL, $data)) {
+				if (count($result['_embedded']['fx:item_categories']) > 0) {
+					$category = $result['_embedded']['fx:item_categories'][0]['_links']['self']['href'];
+
+					return $category;
+				}
+				$errors = array_merge($errors, $client->getErrors($result));
+				if (count($errors)) {
+					Injector::inst()->get(LoggerInterface::class)->error('getCategory errors - '.json_encode($errors));
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function putCategory($data = [])
+	{
+		$client = $this->getClient();
+		$errors = [];
+
+		if ($client) {
+			if ($category = $this->getCategory($data['code'])) {
+				$result = $client->patch($category, $data);
+			} else {
+				$result = $client->post($this->getItemCategoriesURL(), $data);
+			}
+			$errors = array_merge($errors, $client->getErrors($result));
+			if (count($errors)) {
+				Injector::inst()->get(LoggerInterface::class)->error('putCategory errors - '.json_encode($errors));
+			}
+		}
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function deleteCategory($data = [])
+	{
+		$client = $this->getClient();
+		$errors = [];
+
+		if ($category = $this->getCategory($data['code'])) {
+			$result = $client->delete($category);
+
+			$errors = array_merge($errors, $client->getErrors($result));
+			if (count($errors)) {
+				Injector::inst()->get(LoggerInterface::class)->error('deleteCategory errors - '.json_encode($errors));
+			}
+		}
+	}
 }

src/Model/foxycart.cart_validation.php

Spacing +5 added lines, -5 removed lines

@@ -159,7 +159,7 @@ 
 
         if ($output) {
             echo self::$cart_url.'?'.$qs;
-        } else {
+        }else {
             return self::$cart_url.'?'.$qs;
         }
     }
@@ -183,18 +183,18 @@ 
         if ($option_value == '--OPEN--') {
             $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
             $value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
-        } else {
+        }else {
             $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
             if ($method == 'name') {
                 $value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
-            } else {
+            }else {
                 $value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
             }
         }
 
         if ($output) {
             echo $value;
-        } else {
+        }else {
             return $value;
         }
     }
@@ -322,7 +322,7 @@ 
                                 .preg_quote($value[2]).'\1%', '${1}'
                                 .self::fc_hash_value($code, $name[2], $value[2], 'value', false)
                                 .'$1', $input);
-                        } else {
+                        }else {
                             $input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2])
                                 .'\1%', '${1}'.$prefix
                                 .self::fc_hash_value($code, $name[2], $value[2], 'name', false)

Indentation +417 added lines, -417 removed lines

@@ -21,12 +21,12 @@ 
  */
 class FoxyCart_Helper
 {
-    /**
-     * API Key (Secret).
-     *
-     * @var string
-     **/
-    private static $secret;
+	/**
+	 * API Key (Secret).
+	 *
+	 * @var string
+	 **/
+	private static $secret;
 
 /**
  * Cart URL.
@@ -34,416 +34,416 @@ 
  * @var string
  *             Notes: Could be 'https://yourdomain.foxycart.com/cart' or 'https://secure.yourdomain.com/cart'
  **/
-    // protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
-    protected static $cart_url;
-
-    public static function setCartURL($storeName = null)
-    {
-        self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
-    }
-
-    public static function setSecret($secret = null)
-    {
-        self::$secret = $secret;
-    }
-
-    public function __construct()
-    {
-        self::setCartURL(FoxyCart::getFoxyCartStoreName());
-        self::setSecret(FoxyCart::getStoreKey());
-    }
-
-    public static function getSecret()
-    {
-        return FoxyCart::getStoreKey();
-    }
-
-    /**
-     * Cart Excludes.
-     *
-     * Arrays of values and prefixes that should be ignored when signing links and forms.
-     *
-     * @var array
-     */
-    protected static $cart_excludes = array(
-        // Cart values
-        'cart', 'fcsid', 'empty', 'coupon', 'output', 'sub_token', 'redirect', 'callback', '_',
-        // Checkout pre-population values
-        'customer_email', 'customer_first_name', 'customer_last_name', 'customer_address1', 'customer_address2',
-        'customer_city', 'customer_state', 'customer_postal_code', 'customer_country', 'customer_phone',
-        'customer_company', 'shipping_first_name', 'shipping_last_name', 'shipping_address1', 'shipping_address2',
-        'shipping_city', 'shipping_state', 'shipping_postal_code', 'shipping_country', 'shipping_phone',
-        'shipping_company',
-    );
-    protected static $cart_excludes_prefixes = array(
-        'h:', 'x:', '__',
-    );
-
-    /**
-     * Debugging.
-     *
-     * Set to $debug to TRUE to enable debug logging.
-     */
-    protected static $debug = false;
-    protected static $log = array();
-
-    /**
-     * "Link Method": Generate HMAC SHA256 for GET Query Strings.
-     *
-     * Notes: Can't parse_str because PHP doesn't support non-alphanumeric characters as array keys.
-     *
-     * @return string
-     **/
-    public static function fc_hash_querystring($qs, $output = true)
-    {
-        self::$log[] = '<strong>Signing link</strong> with data: '
-            .htmlspecialchars(substr($qs, 0, 150)).'...';
-        $fail = self::$cart_url.'?'.$qs;
-
-        // If the link appears to be hashed already, don't bother
-        if (strpos($qs, '||')) {
-            self::$log[] = '<strong>Link appears to be signed already</strong>: '.htmlspecialchars($code[0]);
-
-            return $fail;
-        }
-
-        // Stick an ampersand on the beginning of the querystring to make matching the first element a little easier
-        $qs = '&'.urldecode($qs);
-
-        // Get all the prefixes, codes, and name=value pairs
-        preg_match_all(
-            '%(?P<amp>&(?:amp;)?)(?P<prefix>[a-z0-9]{1,3}:)?(?P<name>[^=]+)=(?P<value>[^&]+)%',
-            $qs,
-            $pairs,
-            PREG_SET_ORDER
-        );
-        self::$log[] = 'Found the following pairs to sign:<pre>'.htmlspecialchars(print_r($pairs, true)).'</pre>';
-
-        // Get all the "code" values, set the matches in $codes
-        $codes = array();
-        foreach ($pairs as $pair) {
-            if ($pair['name'] == 'code') {
-                $codes[$pair['prefix']] = $pair['value'];
-            }
-        }
-        if (!count($codes)) {
-            self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
-
-            return $fail;
-        }
-        self::$log[] = '<strong style="color:orange;">CODES found:</strong> '
-            .htmlspecialchars(print_r($codes, true));
-
-        // Sign the name/value pairs
-        foreach ($pairs as $pair) {
-            // Skip the cart excludes
-            if (in_array($pair['name'], self::$cart_excludes)
-                || in_array($pair['prefix'], self::$cart_excludes_prefixes)) {
-                self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'
-                    .$pair['prefix'].$pair['name'].'" = '.$pair['value'];
-                continue;
-            }
-
-            // Continue to sign the value and replace the name=value in the querystring with name=value||hash
-            $value = self::fc_hash_value(
-                $codes[$pair['prefix']],
-                $pair['name'],
-                $pair['value'],
-                'value',
-                false,
-                'urlencode'
-            );
-            $replacement = $pair['amp'].$pair['prefix'].urlencode($pair['name']).'='.$value;
-            $qs = str_replace($pair[0], $replacement, $qs);
-            self::$log[] = 'Signed <strong>'.$pair['name'].'</strong> = <strong>'.$pair['value'].'</strong> with '
-                .$replacement.'.<br />Replacing: '.$pair[0].'<br />With... '.$replacement;
-        }
-        $qs = ltrim($qs, '&'); // Get rid of that leading ampersand we added earlier
-
-        if ($output) {
-            echo self::$cart_url.'?'.$qs;
-        } else {
-            return self::$cart_url.'?'.$qs;
-        }
-    }
-
-    /**
-     * "Form Method": Generate HMAC SHA256 for form elements or individual <input />s.
-     *
-     * @return string
-     **/
-    public static function fc_hash_value(
-        $product_code,
-        $option_name,
-        $option_value = '',
-        $method = 'name',
-        $output = true,
-        $urlencode = false
-    ) {
-        if (!$product_code || !$option_name) {
-            return false;
-        }
-        if ($option_value == '--OPEN--') {
-            $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
-            $value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
-        } else {
-            $hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
-            if ($method == 'name') {
-                $value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
-            } else {
-                $value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
-            }
-        }
-
-        if ($output) {
-            echo $value;
-        } else {
-            return $value;
-        }
-    }
-
-    /**
-     * Raw HTML Signing: Sign all links and form elements in a block of HTML.
-     *
-     * Accepts a string of HTML and signs all links and forms.
-     * Requires link 'href' and form 'action' attributes to use 'https' and not 'http'.
-     * Requires a 'code' to be set in every form.
-     *
-     * @return string
-     **/
-    public static function fc_hash_html($html)
-    {
-        // Initialize some counting
-        $count['temp'] = 0; // temp counter
-        $count['links'] = 0;
-        $count['forms'] = 0;
-        $count['inputs'] = 0;
-        $count['lists'] = 0;
-        $count['textareas'] = 0;
-
-        // Find and sign all the links
-        preg_match_all(
-            '%<a .*?href=[\'"]'.preg_quote(self::$cart_url).'(?:\.php)?\?(.+?)[\'"].*?>%i',
-            $html,
-            $querystrings
-        );
-        // print_r($querystrings);
-        foreach ($querystrings[1] as $querystring) {
-            // If it's already signed, skip it.
-            if (preg_match('%&(?:amp;)?hash=%i', $querystring)) {
-                continue;
-            }
-            $pattern = '%(href=[\'"])'.preg_quote(self::$cart_url, '%').'(?:\.php)?\?'
-                .preg_quote($querystring, '%').'([\'"])%i';
-            $signed = self::fc_hash_querystring($querystring, false);
-            $html = preg_replace($pattern, '$1'.$signed.'$2', $html, -1, $count['temp']);
-            $count['links'] += $count['temp'];
-        }
-        unset($querystrings);
-
-        // Find and sign all form values
-        preg_match_all(
-            '%<form [^>]*?action=[\'"]'.preg_quote(self::$cart_url).'?[\'"].*?>(.+?)</form>%is',
-            $html,
-            $forms
-        );
-        foreach ($forms[1] as $form) {
-            ++$count['forms'];
-            self::$log[] = '<strong>Signing form</strong> with data: '.htmlspecialchars(substr(
-                $form,
-                0,
-                150
-            )).'...';
-
-            // Store the original form so we can replace it when we're done
-            $form_original = $form;
-
-            // Check for the "code" input, set the matches in $codes
-            if (!preg_match_all(
-                '%<[^>]*?name=([\'"])([0-9]{1,3}:)?code\1[^>]*?>%i',
-                $form,
-                $codes,
-                PREG_SET_ORDER
-            )) {
-                self::$log[] = '<strong style="color:#600;">No code found</strong> for the above form.';
-                continue;
-            }
-            // For each code found, sign the appropriate inputs
-            foreach ($codes as $code) {
-                // If the form appears to be hashed already, don't bother
-                if (strpos($code[0], '||')) {
-                    self::$log[] = '<strong>Form appears to be signed already</strong>: '.htmlspecialchars($code[0]);
-                    continue;
-                }
-                // Get the code and the prefix
-                $prefix = (isset($code[2])) ? $code[2] : '';
-                preg_match('%<[^>]*?value=([\'"])(.+?)\1[^>]*?>%i', $code[0], $code);
-                $code = trim($code[2]);
-                self::$log[] = '<strong>Prefix for '.htmlspecialchars($code).'</strong>: '.htmlspecialchars($prefix);
-                if (!$code) { // If the code is empty, skip this form or specific prefixed elements
-                    continue;
-                }
-
-                // Sign all <input /> elements with matching prefix
-                preg_match_all(
-                    '%<input [^>]*?name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(?:.+?)\1[^>]*>%i',
-                    $form,
-                    $inputs
-                );
-                foreach ($inputs[0] as $input) {
-                    ++$count['inputs'];
-                    // Test to make sure both name and value attributes are found
-                    if (preg_match(
-                        '%name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1%i',
-                        $input,
-                        $name
-                    ) > 0) {
-                        preg_match('%value=([\'"])(.*?)\1%i', $input, $value);
-                        $value = (count($value) > 0) ? $value : array('', '', '');
-                        preg_match('%type=([\'"])(.*?)\1%i', $input, $type);
-                        $type = (count($type) > 0) ? $type : array('', '', '');
-                        // Skip the cart excludes
-                        if (in_array(
-                            $prefix.$name[2],
-                            self::$cart_excludes
-                        ) || in_array(substr(
-                            $prefix.$name[2],
-                            0,
-                            2
-                        ), self::$cart_excludes_prefixes)) {
-                            self::$log[] = '<strong style="color:purple;">Skipping</strong> 
+	// protected static $cart_url = 'https://yourdomain.foxycart.com/cart';
+	protected static $cart_url;
+
+	public static function setCartURL($storeName = null)
+	{
+		self::$cart_url = 'https://'.$storeName.'.faxycart.com/cart';
+	}
+
+	public static function setSecret($secret = null)
+	{
+		self::$secret = $secret;
+	}
+
+	public function __construct()
+	{
+		self::setCartURL(FoxyCart::getFoxyCartStoreName());
+		self::setSecret(FoxyCart::getStoreKey());
+	}
+
+	public static function getSecret()
+	{
+		return FoxyCart::getStoreKey();
+	}
+
+	/**
+	 * Cart Excludes.
+	 *
+	 * Arrays of values and prefixes that should be ignored when signing links and forms.
+	 *
+	 * @var array
+	 */
+	protected static $cart_excludes = array(
+		// Cart values
+		'cart', 'fcsid', 'empty', 'coupon', 'output', 'sub_token', 'redirect', 'callback', '_',
+		// Checkout pre-population values
+		'customer_email', 'customer_first_name', 'customer_last_name', 'customer_address1', 'customer_address2',
+		'customer_city', 'customer_state', 'customer_postal_code', 'customer_country', 'customer_phone',
+		'customer_company', 'shipping_first_name', 'shipping_last_name', 'shipping_address1', 'shipping_address2',
+		'shipping_city', 'shipping_state', 'shipping_postal_code', 'shipping_country', 'shipping_phone',
+		'shipping_company',
+	);
+	protected static $cart_excludes_prefixes = array(
+		'h:', 'x:', '__',
+	);
+
+	/**
+	 * Debugging.
+	 *
+	 * Set to $debug to TRUE to enable debug logging.
+	 */
+	protected static $debug = false;
+	protected static $log = array();
+
+	/**
+	 * "Link Method": Generate HMAC SHA256 for GET Query Strings.
+	 *
+	 * Notes: Can't parse_str because PHP doesn't support non-alphanumeric characters as array keys.
+	 *
+	 * @return string
+	 **/
+	public static function fc_hash_querystring($qs, $output = true)
+	{
+		self::$log[] = '<strong>Signing link</strong> with data: '
+			.htmlspecialchars(substr($qs, 0, 150)).'...';
+		$fail = self::$cart_url.'?'.$qs;
+
+		// If the link appears to be hashed already, don't bother
+		if (strpos($qs, '||')) {
+			self::$log[] = '<strong>Link appears to be signed already</strong>: '.htmlspecialchars($code[0]);
+
+			return $fail;
+		}
+
+		// Stick an ampersand on the beginning of the querystring to make matching the first element a little easier
+		$qs = '&'.urldecode($qs);
+
+		// Get all the prefixes, codes, and name=value pairs
+		preg_match_all(
+			'%(?P<amp>&(?:amp;)?)(?P<prefix>[a-z0-9]{1,3}:)?(?P<name>[^=]+)=(?P<value>[^&]+)%',
+			$qs,
+			$pairs,
+			PREG_SET_ORDER
+		);
+		self::$log[] = 'Found the following pairs to sign:<pre>'.htmlspecialchars(print_r($pairs, true)).'</pre>';
+
+		// Get all the "code" values, set the matches in $codes
+		$codes = array();
+		foreach ($pairs as $pair) {
+			if ($pair['name'] == 'code') {
+				$codes[$pair['prefix']] = $pair['value'];
+			}
+		}
+		if (!count($codes)) {
+			self::$log[] = '<strong style="color:#600;">No code found</strong> for the above link.';
+
+			return $fail;
+		}
+		self::$log[] = '<strong style="color:orange;">CODES found:</strong> '
+			.htmlspecialchars(print_r($codes, true));
+
+		// Sign the name/value pairs
+		foreach ($pairs as $pair) {
+			// Skip the cart excludes
+			if (in_array($pair['name'], self::$cart_excludes)
+				|| in_array($pair['prefix'], self::$cart_excludes_prefixes)) {
+				self::$log[] = '<strong style="color:purple;">Skipping</strong> the reserved parameter or prefix "'
+					.$pair['prefix'].$pair['name'].'" = '.$pair['value'];
+				continue;
+			}
+
+			// Continue to sign the value and replace the name=value in the querystring with name=value||hash
+			$value = self::fc_hash_value(
+				$codes[$pair['prefix']],
+				$pair['name'],
+				$pair['value'],
+				'value',
+				false,
+				'urlencode'
+			);
+			$replacement = $pair['amp'].$pair['prefix'].urlencode($pair['name']).'='.$value;
+			$qs = str_replace($pair[0], $replacement, $qs);
+			self::$log[] = 'Signed <strong>'.$pair['name'].'</strong> = <strong>'.$pair['value'].'</strong> with '
+				.$replacement.'.<br />Replacing: '.$pair[0].'<br />With... '.$replacement;
+		}
+		$qs = ltrim($qs, '&'); // Get rid of that leading ampersand we added earlier
+
+		if ($output) {
+			echo self::$cart_url.'?'.$qs;
+		} else {
+			return self::$cart_url.'?'.$qs;
+		}
+	}
+
+	/**
+	 * "Form Method": Generate HMAC SHA256 for form elements or individual <input />s.
+	 *
+	 * @return string
+	 **/
+	public static function fc_hash_value(
+		$product_code,
+		$option_name,
+		$option_value = '',
+		$method = 'name',
+		$output = true,
+		$urlencode = false
+	) {
+		if (!$product_code || !$option_name) {
+			return false;
+		}
+		if ($option_value == '--OPEN--') {
+			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
+			$value = ($urlencode) ? urlencode($option_name).'||'.$hash.'||open' : $option_name.'||'.$hash.'||open';
+		} else {
+			$hash = hash_hmac('sha256', $product_code.$option_name.$option_value, self::getSecret());
+			if ($method == 'name') {
+				$value = ($urlencode) ? urlencode($option_name).'||'.$hash : $option_name.'||'.$hash;
+			} else {
+				$value = ($urlencode) ? urlencode($option_value).'||'.$hash : $option_value.'||'.$hash;
+			}
+		}
+
+		if ($output) {
+			echo $value;
+		} else {
+			return $value;
+		}
+	}
+
+	/**
+	 * Raw HTML Signing: Sign all links and form elements in a block of HTML.
+	 *
+	 * Accepts a string of HTML and signs all links and forms.
+	 * Requires link 'href' and form 'action' attributes to use 'https' and not 'http'.
+	 * Requires a 'code' to be set in every form.
+	 *
+	 * @return string
+	 **/
+	public static function fc_hash_html($html)
+	{
+		// Initialize some counting
+		$count['temp'] = 0; // temp counter
+		$count['links'] = 0;
+		$count['forms'] = 0;
+		$count['inputs'] = 0;
+		$count['lists'] = 0;
+		$count['textareas'] = 0;
+
+		// Find and sign all the links
+		preg_match_all(
+			'%<a .*?href=[\'"]'.preg_quote(self::$cart_url).'(?:\.php)?\?(.+?)[\'"].*?>%i',
+			$html,
+			$querystrings
+		);
+		// print_r($querystrings);
+		foreach ($querystrings[1] as $querystring) {
+			// If it's already signed, skip it.
+			if (preg_match('%&(?:amp;)?hash=%i', $querystring)) {
+				continue;
+			}
+			$pattern = '%(href=[\'"])'.preg_quote(self::$cart_url, '%').'(?:\.php)?\?'
+				.preg_quote($querystring, '%').'([\'"])%i';
+			$signed = self::fc_hash_querystring($querystring, false);
+			$html = preg_replace($pattern, '$1'.$signed.'$2', $html, -1, $count['temp']);
+			$count['links'] += $count['temp'];
+		}
+		unset($querystrings);
+
+		// Find and sign all form values
+		preg_match_all(
+			'%<form [^>]*?action=[\'"]'.preg_quote(self::$cart_url).'?[\'"].*?>(.+?)</form>%is',
+			$html,
+			$forms
+		);
+		foreach ($forms[1] as $form) {
+			++$count['forms'];
+			self::$log[] = '<strong>Signing form</strong> with data: '.htmlspecialchars(substr(
+				$form,
+				0,
+				150
+			)).'...';
+
+			// Store the original form so we can replace it when we're done
+			$form_original = $form;
+
+			// Check for the "code" input, set the matches in $codes
+			if (!preg_match_all(
+				'%<[^>]*?name=([\'"])([0-9]{1,3}:)?code\1[^>]*?>%i',
+				$form,
+				$codes,
+				PREG_SET_ORDER
+			)) {
+				self::$log[] = '<strong style="color:#600;">No code found</strong> for the above form.';
+				continue;
+			}
+			// For each code found, sign the appropriate inputs
+			foreach ($codes as $code) {
+				// If the form appears to be hashed already, don't bother
+				if (strpos($code[0], '||')) {
+					self::$log[] = '<strong>Form appears to be signed already</strong>: '.htmlspecialchars($code[0]);
+					continue;
+				}
+				// Get the code and the prefix
+				$prefix = (isset($code[2])) ? $code[2] : '';
+				preg_match('%<[^>]*?value=([\'"])(.+?)\1[^>]*?>%i', $code[0], $code);
+				$code = trim($code[2]);
+				self::$log[] = '<strong>Prefix for '.htmlspecialchars($code).'</strong>: '.htmlspecialchars($prefix);
+				if (!$code) { // If the code is empty, skip this form or specific prefixed elements
+					continue;
+				}
+
+				// Sign all <input /> elements with matching prefix
+				preg_match_all(
+					'%<input [^>]*?name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(?:.+?)\1[^>]*>%i',
+					$form,
+					$inputs
+				);
+				foreach ($inputs[0] as $input) {
+					++$count['inputs'];
+					// Test to make sure both name and value attributes are found
+					if (preg_match(
+						'%name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1%i',
+						$input,
+						$name
+					) > 0) {
+						preg_match('%value=([\'"])(.*?)\1%i', $input, $value);
+						$value = (count($value) > 0) ? $value : array('', '', '');
+						preg_match('%type=([\'"])(.*?)\1%i', $input, $type);
+						$type = (count($type) > 0) ? $type : array('', '', '');
+						// Skip the cart excludes
+						if (in_array(
+							$prefix.$name[2],
+							self::$cart_excludes
+						) || in_array(substr(
+							$prefix.$name[2],
+							0,
+							2
+						), self::$cart_excludes_prefixes)) {
+							self::$log[] = '<strong style="color:purple;">Skipping</strong> 
                                 the reserved parameter or prefix "'.$prefix.$name[2].'" = '.$value[2];
-                            continue;
-                        }
-                        self::$log[] = '<strong>INPUT['.$type[2].']:</strong> Name: <strong>'
-                            .$prefix.htmlspecialchars(preg_quote($name[2])).'</strong>';
-                        self::$log[] = '<strong>Replacement Pattern:</strong> ([\'"])'
-                            .$prefix.preg_quote($name[2]).'\1';
-                        $value[2] = ($value[2] == '') ? '--OPEN--' : $value[2];
-                        if ($type[2] == 'radio') {
-                            $input_signed = preg_replace('%([\'"])'
-                                .preg_quote($value[2]).'\1%', '${1}'
-                                .self::fc_hash_value($code, $name[2], $value[2], 'value', false)
-                                .'$1', $input);
-                        } else {
-                            $input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2])
-                                .'\1%', '${1}'.$prefix
-                                .self::fc_hash_value($code, $name[2], $value[2], 'name', false)
-                                .'$1', $input);
-                        }
-                        self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                           '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
-                           '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
-                           '</strong><br />Initial input: '.htmlspecialchars($input).
-                           '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
-                        $form = str_replace($input, $input_signed, $form);
-                    }
-                }
-                self::$log[] = '<strong>FORM after INPUTS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-                // Sign all <option /> elements
-                preg_match_all(
-                    '%<select [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.+?)</select>%is',
-                    $form,
-                    $lists,
-                    PREG_SET_ORDER
-                );
-                foreach ($lists as $list) {
-                    ++$count['lists'];
-                    preg_match_all(
-                        '%<option [^>]*value=([\'"])(.+?)\1[^>]*>(?:.*?)</option>%i',
-                        $list[0],
-                        $options,
-                        PREG_SET_ORDER
-                    );
-                    self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true))
-                        .'</pre>';
-                    unset($form_part_signed);
-                    foreach ($options as $option) {
-                        if (!isset($form_part_signed)) {
-                            $form_part_signed = $list[0];
-                        }
-                        $option_signed = preg_replace(
-                            '%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
-                            $option[1].self::fc_hash_value(
-                                $code,
-                                $list[2],
-                                $option[2],
-                                'value',
-                                false
-                            ).$option[1],
-                            $option[0]
-                        );
-                        $form_part_signed = str_replace($option[0], $option_signed, $form_part_signed);
-                        self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                           '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
-                           '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
-                           '</strong><br />Initial option: '.htmlspecialchars($option[0]).
-                           '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
-                    }
-                    $form = str_replace($list[0], $form_part_signed, $form);
-                }
-                self::$log[] = '<strong>FORM after OPTIONS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-                // Sign all <textarea /> elements
-                preg_match_all(
-                    '%<textarea [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.*?)</textarea>%is',
-                    $form,
-                    $textareas,
-                    PREG_SET_ORDER
-                );
-                // echo "\n\nTextareas: ".print_r($textareas, true);
-                foreach ($textareas as $textarea) {
-                    ++$count['textareas'];
-                    // Tackle implied "--OPEN--" first, if textarea is empty
-                    $textarea[3] = ($textarea[3] == '') ? '--OPEN--' : $textarea[3];
-                    $textarea_signed = preg_replace(
-                        '%([\'"])'.preg_quote($prefix.$textarea[2]).'\1%',
-                        '$1'.self::fc_hash_value(
-                            $code,
-                            $textarea[2],
-                            $textarea[3],
-                            'name',
-                            false
-                        ).'$1',
-                        $textarea[0]
-                    );
-                    $form = str_replace($textarea[0], $textarea_signed, $form);
-                    self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                       '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
-                       '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
-                       '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
-                       '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
-                }
-                self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
-
-                // Exclude all <button> elements
-                $form = preg_replace(
-                    '%<button ([^>]*)name=([\'"])(.*?)\1([^>]*>.*?</button>)%i',
-                    '<button $1name=$2x:$3$4',
-                    $form
-                );
-            }
-            // Replace the entire form
-            self::$log[] = '<strong>FORM after ALL:</strong> <pre>'.htmlspecialchars($form).'</pre>'
-                .'replacing <pre>'.htmlspecialchars($form_original).'</pre>';
-            $html = str_replace($form_original, $form, $html);
-            self::$log[] = '<strong>FORM end</strong><hr />';
-        }
-
-        // Return the signed output
-        $output = '';
-        if (self::$debug) {
-            self::$log['Summary'] = $count['links'].' links signed. '.$count['forms'].' forms signed. '
-                .$count['inputs'].' inputs signed. '.$count['lists'].' lists signed. '.$count['textareas']
-                .' textareas signed.';
-            $output .= '<h3>FoxyCart HMAC Debugging:</h3><ul>';
-            foreach (self::$log as $name => $value) {
-                $output .= '<li><strong>'.$name.':</strong> '.$value.'</li>';
-            }
-            $output .= '</ul><hr />';
-        }
-
-        return $output.$html;
-    }
+							continue;
+						}
+						self::$log[] = '<strong>INPUT['.$type[2].']:</strong> Name: <strong>'
+							.$prefix.htmlspecialchars(preg_quote($name[2])).'</strong>';
+						self::$log[] = '<strong>Replacement Pattern:</strong> ([\'"])'
+							.$prefix.preg_quote($name[2]).'\1';
+						$value[2] = ($value[2] == '') ? '--OPEN--' : $value[2];
+						if ($type[2] == 'radio') {
+							$input_signed = preg_replace('%([\'"])'
+								.preg_quote($value[2]).'\1%', '${1}'
+								.self::fc_hash_value($code, $name[2], $value[2], 'value', false)
+								.'$1', $input);
+						} else {
+							$input_signed = preg_replace('%([\'"])'.$prefix.preg_quote($name[2])
+								.'\1%', '${1}'.$prefix
+								.self::fc_hash_value($code, $name[2], $value[2], 'name', false)
+								.'$1', $input);
+						}
+						self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+						   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
+						   '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
+						   '</strong><br />Initial input: '.htmlspecialchars($input).
+						   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
+						$form = str_replace($input, $input_signed, $form);
+					}
+				}
+				self::$log[] = '<strong>FORM after INPUTS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+				// Sign all <option /> elements
+				preg_match_all(
+					'%<select [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.+?)</select>%is',
+					$form,
+					$lists,
+					PREG_SET_ORDER
+				);
+				foreach ($lists as $list) {
+					++$count['lists'];
+					preg_match_all(
+						'%<option [^>]*value=([\'"])(.+?)\1[^>]*>(?:.*?)</option>%i',
+						$list[0],
+						$options,
+						PREG_SET_ORDER
+					);
+					self::$log[] = '<strong>Options:</strong> <pre>'.htmlspecialchars(print_r($options, true))
+						.'</pre>';
+					unset($form_part_signed);
+					foreach ($options as $option) {
+						if (!isset($form_part_signed)) {
+							$form_part_signed = $list[0];
+						}
+						$option_signed = preg_replace(
+							'%'.preg_quote($option[1]).preg_quote($option[2]).preg_quote($option[1]).'%',
+							$option[1].self::fc_hash_value(
+								$code,
+								$list[2],
+								$option[2],
+								'value',
+								false
+							).$option[1],
+							$option[0]
+						);
+						$form_part_signed = str_replace($option[0], $option_signed, $form_part_signed);
+						self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+						   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
+						   '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
+						   '</strong><br />Initial option: '.htmlspecialchars($option[0]).
+						   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
+					}
+					$form = str_replace($list[0], $form_part_signed, $form);
+				}
+				self::$log[] = '<strong>FORM after OPTIONS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+				// Sign all <textarea /> elements
+				preg_match_all(
+					'%<textarea [^>]*name=([\'"])'.preg_quote($prefix).'(?![0-9]{1,3})(.+?)\1[^>]*>(.*?)</textarea>%is',
+					$form,
+					$textareas,
+					PREG_SET_ORDER
+				);
+				// echo "\n\nTextareas: ".print_r($textareas, true);
+				foreach ($textareas as $textarea) {
+					++$count['textareas'];
+					// Tackle implied "--OPEN--" first, if textarea is empty
+					$textarea[3] = ($textarea[3] == '') ? '--OPEN--' : $textarea[3];
+					$textarea_signed = preg_replace(
+						'%([\'"])'.preg_quote($prefix.$textarea[2]).'\1%',
+						'$1'.self::fc_hash_value(
+							$code,
+							$textarea[2],
+							$textarea[3],
+							'name',
+							false
+						).'$1',
+						$textarea[0]
+					);
+					$form = str_replace($textarea[0], $textarea_signed, $form);
+					self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
+					   '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
+					   '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
+					   '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
+					   '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
+				}
+				self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
+
+				// Exclude all <button> elements
+				$form = preg_replace(
+					'%<button ([^>]*)name=([\'"])(.*?)\1([^>]*>.*?</button>)%i',
+					'<button $1name=$2x:$3$4',
+					$form
+				);
+			}
+			// Replace the entire form
+			self::$log[] = '<strong>FORM after ALL:</strong> <pre>'.htmlspecialchars($form).'</pre>'
+				.'replacing <pre>'.htmlspecialchars($form_original).'</pre>';
+			$html = str_replace($form_original, $form, $html);
+			self::$log[] = '<strong>FORM end</strong><hr />';
+		}
+
+		// Return the signed output
+		$output = '';
+		if (self::$debug) {
+			self::$log['Summary'] = $count['links'].' links signed. '.$count['forms'].' forms signed. '
+				.$count['inputs'].' inputs signed. '.$count['lists'].' lists signed. '.$count['textareas']
+				.' textareas signed.';
+			$output .= '<h3>FoxyCart HMAC Debugging:</h3><ul>';
+			foreach (self::$log as $name => $value) {
+				$output .= '<li><strong>'.$name.':</strong> '.$value.'</li>';
+			}
+			$output .= '</ul><hr />';
+		}
+
+		return $output.$html;
+	}
 }

src/Admin/FoxyStripeAdmin.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
         // Retrieve validator, if one has been setup (e.g. via data extensions).
         if ($config->hasMethod('getCMSValidator')) {
             $validator = $config->getCMSValidator();
-        } else {
+        }else {
             $validator = null;
         }
 
@@ -101,13 +101,13 @@ 
             $actions,
             $validator
         )->setHTMLID('Form_EditForm');
-        $form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
+        $form->setValidationResponseCallback(function(ValidationResult $errors) use ($negotiator, $form) {
             $request = $this->getRequest();
             if ($request->isAjax() && $negotiator) {
                 $result = $form->forTemplate();
 
                 return $negotiator->respond($request, array(
-                    'CurrentForm' => function () use ($result) {
+                    'CurrentForm' => function() use ($result) {
                         return $result;
                     },
                 ));

Indentation +159 added lines, -159 removed lines

@@ -18,163 +18,163 @@
 
 class FoxyStripeAdmin extends LeftAndMain
 {
-    /**
-     * @var string
-     */
-    private static $url_segment = 'foxystripe';
-
-    /**
-     * @var string
-     */
-    private static $url_rule = '/$Action/$ID/$OtherID';
-
-    /**
-     * @var int
-     */
-    private static $menu_priority = 4;
-
-    /**
-     * @var string
-     */
-    private static $menu_title = 'FoxyStripe';
-
-    /**
-     * @var string
-     */
-    private static $menu_icon_class = 'font-icon-cog';
-
-    /**
-     * @var string
-     */
-    private static $tree_class = FoxyStripeSetting::class;
-
-    /**
-     * @var array
-     */
-    private static $required_permission_codes = ['EDIT_GLOBAL_PERMISSION'];
-
-    /**
-     * Initialises the {@link FoxyStripeSetting} controller.
-     */
-    public function init()
-    {
-        parent::init();
-
-        Requirements::javascript('silverstripe/cms: client/dist/js/bundle.js');
-    }
-
-    /**
-     * @param null $id
-     * @param null $fields
-     *
-     * @return $this|Form
-     */
-    public function getEditForm($id = null, $fields = null)
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        $fields = $config->getCMSFields();
-
-        // Tell the CMS what URL the preview should show
-        $home = Director::absoluteBaseURL();
-        $fields->push(new HiddenField('PreviewURL', 'Preview URL', $home));
-
-        // Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load
-        $fields->push($navField = new LiteralField(
-            'SilverStripeNavigator',
-            $this->getSilverStripeNavigator()
-        ));
-        $navField->setAllowHTML(true);
-
-        // Retrieve validator, if one has been setup (e.g. via data extensions).
-        if ($config->hasMethod('getCMSValidator')) {
-            $validator = $config->getCMSValidator();
-        } else {
-            $validator = null;
-        }
-
-        $actions = $config->getCMSActions();
-        $negotiator = $this->getResponseNegotiator();
-        $form = Form::create(
-            $this,
-            'EditForm',
-            $fields,
-            $actions,
-            $validator
-        )->setHTMLID('Form_EditForm');
-        $form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
-            $request = $this->getRequest();
-            if ($request->isAjax() && $negotiator) {
-                $result = $form->forTemplate();
-
-                return $negotiator->respond($request, array(
-                    'CurrentForm' => function () use ($result) {
-                        return $result;
-                    },
-                ));
-            }
-            return null;
-        });
-        $form->addExtraClass('flexbox-area-grow fill-height cms-content cms-edit-form');
-        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
-
-        if ($form->Fields()->hasTabSet()) {
-            $form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
-        }
-        $form->setHTMLID('Form_EditForm');
-        $form->loadDataFrom($config);
-        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-
-        // Use <button> to allow full jQuery UI styling
-        $actions = $actions->dataFields();
-        if ($actions) {
-            /** @var FormAction $action */
-            foreach ($actions as $action) {
-                $action->setUseButtonTag(true);
-            }
-        }
-
-        $this->extend('updateEditForm', $form);
-
-        return $form;
-    }
-
-    /**
-     * Save the current sites {@link FoxyStripeSetting} into the database.
-     *
-     * @param $data
-     * @param $form
-     *
-     * @return \SilverStripe\Control\HTTPResponse
-     * @throws \SilverStripe\Control\HTTPResponse_Exception
-     */
-    public function save_foxystripe_setting($data, $form)
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        $form->saveInto($config);
-        try {
-            $config->write();
-        } catch (ValidationException $ex) {
-            $form->sessionMessage($ex->getResult()->message(), 'bad');
-
-            return $this->getResponseNegotiator()->respond($this->request);
-        }
-        $this->response->addHeader('X-Status', rawurlencode(_t('SilverStripe\\Admin\\LeftAndMain.SAVEDUP', 'Saved.')));
-
-        return $form->forTemplate();
-    }
-
-    /**
-     * @param bool $unlinked
-     *
-     * @return ArrayList
-     */
-    public function Breadcrumbs($unlinked = false)
-    {
-        return new ArrayList(array(
-            new ArrayData(array(
-                'Title' => static::menu_title(),
-                'Link' => $this->Link(),
-            )),
-        ));
-    }
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'foxystripe';
+
+	/**
+	 * @var string
+	 */
+	private static $url_rule = '/$Action/$ID/$OtherID';
+
+	/**
+	 * @var int
+	 */
+	private static $menu_priority = 4;
+
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'FoxyStripe';
+
+	/**
+	 * @var string
+	 */
+	private static $menu_icon_class = 'font-icon-cog';
+
+	/**
+	 * @var string
+	 */
+	private static $tree_class = FoxyStripeSetting::class;
+
+	/**
+	 * @var array
+	 */
+	private static $required_permission_codes = ['EDIT_GLOBAL_PERMISSION'];
+
+	/**
+	 * Initialises the {@link FoxyStripeSetting} controller.
+	 */
+	public function init()
+	{
+		parent::init();
+
+		Requirements::javascript('silverstripe/cms: client/dist/js/bundle.js');
+	}
+
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 *
+	 * @return $this|Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		$fields = $config->getCMSFields();
+
+		// Tell the CMS what URL the preview should show
+		$home = Director::absoluteBaseURL();
+		$fields->push(new HiddenField('PreviewURL', 'Preview URL', $home));
+
+		// Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load
+		$fields->push($navField = new LiteralField(
+			'SilverStripeNavigator',
+			$this->getSilverStripeNavigator()
+		));
+		$navField->setAllowHTML(true);
+
+		// Retrieve validator, if one has been setup (e.g. via data extensions).
+		if ($config->hasMethod('getCMSValidator')) {
+			$validator = $config->getCMSValidator();
+		} else {
+			$validator = null;
+		}
+
+		$actions = $config->getCMSActions();
+		$negotiator = $this->getResponseNegotiator();
+		$form = Form::create(
+			$this,
+			'EditForm',
+			$fields,
+			$actions,
+			$validator
+		)->setHTMLID('Form_EditForm');
+		$form->setValidationResponseCallback(function (ValidationResult $errors) use ($negotiator, $form) {
+			$request = $this->getRequest();
+			if ($request->isAjax() && $negotiator) {
+				$result = $form->forTemplate();
+
+				return $negotiator->respond($request, array(
+					'CurrentForm' => function () use ($result) {
+						return $result;
+					},
+				));
+			}
+			return null;
+		});
+		$form->addExtraClass('flexbox-area-grow fill-height cms-content cms-edit-form');
+		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
+
+		if ($form->Fields()->hasTabSet()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
+		}
+		$form->setHTMLID('Form_EditForm');
+		$form->loadDataFrom($config);
+		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+
+		// Use <button> to allow full jQuery UI styling
+		$actions = $actions->dataFields();
+		if ($actions) {
+			/** @var FormAction $action */
+			foreach ($actions as $action) {
+				$action->setUseButtonTag(true);
+			}
+		}
+
+		$this->extend('updateEditForm', $form);
+
+		return $form;
+	}
+
+	/**
+	 * Save the current sites {@link FoxyStripeSetting} into the database.
+	 *
+	 * @param $data
+	 * @param $form
+	 *
+	 * @return \SilverStripe\Control\HTTPResponse
+	 * @throws \SilverStripe\Control\HTTPResponse_Exception
+	 */
+	public function save_foxystripe_setting($data, $form)
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		$form->saveInto($config);
+		try {
+			$config->write();
+		} catch (ValidationException $ex) {
+			$form->sessionMessage($ex->getResult()->message(), 'bad');
+
+			return $this->getResponseNegotiator()->respond($this->request);
+		}
+		$this->response->addHeader('X-Status', rawurlencode(_t('SilverStripe\\Admin\\LeftAndMain.SAVEDUP', 'Saved.')));
+
+		return $form->forTemplate();
+	}
+
+	/**
+	 * @param bool $unlinked
+	 *
+	 * @return ArrayList
+	 */
+	public function Breadcrumbs($unlinked = false)
+	{
+		return new ArrayList(array(
+			new ArrayData(array(
+				'Title' => static::menu_title(),
+				'Link' => $this->Link(),
+			)),
+		));
+	}
 }

src/Model/Order.php

Spacing +26 added lines, -26 removed lines

@@ -211,7 +211,7 @@ 
             $this->parseOrderDetails($response);
 
             return true;
-        } else {
+        }else {
             return false;
         }
     }
@@ -223,14 +223,14 @@ 
     {
         foreach ($response->transactions->transaction as $transaction) {
             // Record transaction data from FoxyCart Datafeed:
-            $this->Store_ID = (int) $transaction->store_id;
-            $this->TransactionDate = (string) $transaction->transaction_date;
-            $this->ProductTotal = (float) $transaction->product_total;
-            $this->TaxTotal = (float) $transaction->tax_total;
-            $this->ShippingTotal = (float) $transaction->shipping_total;
-            $this->OrderTotal = (float) $transaction->order_total;
-            $this->ReceiptURL = (string) $transaction->receipt_url;
-            $this->OrderStatus = (string) $transaction->status;
+            $this->Store_ID = (int)$transaction->store_id;
+            $this->TransactionDate = (string)$transaction->transaction_date;
+            $this->ProductTotal = (float)$transaction->product_total;
+            $this->TaxTotal = (float)$transaction->tax_total;
+            $this->ShippingTotal = (float)$transaction->shipping_total;
+            $this->OrderTotal = (float)$transaction->order_total;
+            $this->ReceiptURL = (string)$transaction->receipt_url;
+            $this->OrderStatus = (string)$transaction->status;
 
             $this->extend('handleOrderInfo', $order, $response);
         }
@@ -249,18 +249,18 @@ 
                 if (Member::get()->filter('Email', $transaction->customer_email)->First()) {
                     $customer = Member::get()->filter('Email', $transaction->customer_email)->First();
                     // if new customer, create account with data from FoxyCart
-                } else {
+                }else {
                     // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
                     Config::modify()->set(Security::class, 'password_encryption_algorithm', 'none');
 
                     // create new Member, set password info from FoxyCart
                     $customer = Member::create();
-                    $customer->Customer_ID = (int) $transaction->customer_id;
-                    $customer->FirstName = (string) $transaction->customer_first_name;
-                    $customer->Surname = (string) $transaction->customer_last_name;
-                    $customer->Email = (string) $transaction->customer_email;
-                    $customer->Password = (string) $transaction->customer_password;
-                    $customer->Salt = (string) $transaction->customer_password_salt;
+                    $customer->Customer_ID = (int)$transaction->customer_id;
+                    $customer->FirstName = (string)$transaction->customer_first_name;
+                    $customer->Surname = (string)$transaction->customer_last_name;
+                    $customer->Email = (string)$transaction->customer_email;
+                    $customer->Password = (string)$transaction->customer_password;
+                    $customer->Salt = (string)$transaction->customer_password_salt;
                     $customer->PasswordEncryption = 'none';
 
                     // record member record
@@ -297,11 +297,11 @@ 
             foreach ($transaction->transaction_details->transaction_detail as $detail) {
                 $OrderDetail = OrderDetail::create();
 
-                $OrderDetail->Quantity = (int) $detail->product_quantity;
-                $OrderDetail->ProductName = (string) $detail->product_name;
-                $OrderDetail->ProductCode = (string) $detail->product_code;
-                $OrderDetail->ProductImage = (string) $detail->image;
-                $OrderDetail->ProductCategory = (string) $detail->category_code;
+                $OrderDetail->Quantity = (int)$detail->product_quantity;
+                $OrderDetail->ProductName = (string)$detail->product_name;
+                $OrderDetail->ProductCode = (string)$detail->product_code;
+                $OrderDetail->ProductImage = (string)$detail->image;
+                $OrderDetail->ProductCategory = (string)$detail->category_code;
                 $priceModifier = 0;
 
                 // parse OrderOptions
@@ -309,14 +309,14 @@ 
                     // Find product via product_id custom variable
                     if ($option->product_option_name == 'product_id') {
                         // if product is found, set relation to OrderDetail
-                        $OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
+                        $OrderProduct = ProductPage::get()->byID((int)$option->product_option_value);
                         if ($OrderProduct) {
                             $OrderDetail->ProductID = $OrderProduct->ID;
                         }
-                    } else {
+                    }else {
                         $OrderOption = OrderOption::create();
-                        $OrderOption->Name = (string) $option->product_option_name;
-                        $OrderOption->Value = (string) $option->product_option_value;
+                        $OrderOption->Name = (string)$option->product_option_name;
+                        $OrderOption->Value = (string)$option->product_option_value;
                         $OrderOption->write();
                         $OrderDetail->OrderOptions()->add($OrderOption);
 
@@ -324,7 +324,7 @@ 
                     }
                 }
 
-                $OrderDetail->Price = (float) $detail->product_price + (float) $priceModifier;
+                $OrderDetail->Price = (float)$detail->product_price + (float)$priceModifier;
 
                 // extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
                 $this->extend('handleOrderItem', $order, $response, $OrderDetail);

Indentation +357 added lines, -357 removed lines

@@ -33,361 +33,361 @@
  */
 class Order extends DataObject implements PermissionProvider
 {
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Order_ID' => 'Int',
-        'TransactionDate' => 'DBDatetime',
-        'ProductTotal' => 'Currency',
-        'TaxTotal' => 'Currency',
-        'ShippingTotal' => 'Currency',
-        'OrderTotal' => 'Currency',
-        'ReceiptURL' => 'Varchar(255)',
-        'OrderStatus' => 'Varchar(255)',
-        'Response' => 'Text',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Member' => Member::class,
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_many = array(
-        'Details' => OrderDetail::class,
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Order';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Orders';
-
-    /**
-     * @var string
-     */
-    private static $description = 'Orders from FoxyCart Datafeed';
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'TransactionDate DESC, ID DESC';
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = array(
-        'Order_ID',
-        'TransactionDate.Nice',
-        'Member.Name',
-        'ProductTotal.Nice',
-        'ShippingTotal.Nice',
-        'TaxTotal.Nice',
-        'OrderTotal.Nice',
-        'ReceiptLink',
-    );
-
-    /**
-     * @var array
-     */
-    private static $searchable_fields = array(
-        'Order_ID',
-        'TransactionDate' => array(
-            'field' => DateField::class,
-            'filter' => 'PartialMatchFilter',
-        ),
-        'Member.ID',
-        'OrderTotal',
-        'Details.ProductID',
-    );
-
-    /**
-     * @var array
-     */
-    private static $casting = array(
-        'ReceiptLink' => 'HTMLVarchar',
-    );
-
-    /**
-     * @var array
-     */
-    private static $indexes = array(
-        'Order_ID' => true, // make unique
-    );
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Order';
-
-    /**
-     * @param bool $includerelations
-     *
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels();
-
-        $labels['Order_ID'] = _t('Order.Order_ID', 'Order ID#');
-        $labels['TransactionDate'] = _t('Order.TransactionDate', 'Date');
-        $labels['TransactionDate.NiceUS'] = _t('Order.TransactionDate', 'Date');
-        $labels['Member.Name'] = _t('Order.MemberName', 'Customer');
-        $labels['Member.ID'] = _t('Order.MemberName', 'Customer');
-        $labels['ProductTotal.Nice'] = _t('Order.ProductTotal', 'Sub Total');
-        $labels['TaxTotal.Nice'] = _t('Order.TaxTotal', 'Tax');
-        $labels['ShippingTotal.Nice'] = _t('Order.ShippingTotal', 'Shipping');
-        $labels['OrderTotal'] = _t('Order.OrderTotal', 'Total');
-        $labels['OrderTotal.Nice'] = _t('Order.OrderTotal', 'Total');
-        $labels['ReceiptLink'] = _t('Order.ReceiptLink', 'Invoice');
-        $labels['Details.ProductID'] = _t('Order.Details.ProductID', 'Product');
-
-        return $labels;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function ReceiptLink()
-    {
-        return $this->getReceiptLink();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getReceiptLink()
-    {
-        $obj = DBHTMLVarchar::create();
-        $obj->setValue(
-            '<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>'
-        );
-
-        return $obj;
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getDecryptedResponse()
-    {
-        $decrypted = urldecode($this->Response);
-        if (FoxyCart::getStoreKey()) {
-            return \rc4crypt::decrypt(FoxyCart::getStoreKey(), $decrypted);
-        }
-        return false;
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function onBeforeWrite()
-    {
-        $this->parseOrder();
-        parent::onBeforeWrite();
-    }
-
-    /**
-     * @return bool
-     *
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function parseOrder()
-    {
-        if ($this->getDecryptedResponse()) {
-            $response = new \SimpleXMLElement($this->getDecryptedResponse());
-
-            $this->parseOrderInfo($response);
-            $this->parseOrderCustomer($response);
-            $this->parseOrderDetails($response);
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param $response
-     */
-    public function parseOrderInfo($response)
-    {
-        foreach ($response->transactions->transaction as $transaction) {
-            // Record transaction data from FoxyCart Datafeed:
-            $this->Store_ID = (int) $transaction->store_id;
-            $this->TransactionDate = (string) $transaction->transaction_date;
-            $this->ProductTotal = (float) $transaction->product_total;
-            $this->TaxTotal = (float) $transaction->tax_total;
-            $this->ShippingTotal = (float) $transaction->shipping_total;
-            $this->OrderTotal = (float) $transaction->order_total;
-            $this->ReceiptURL = (string) $transaction->receipt_url;
-            $this->OrderStatus = (string) $transaction->status;
-
-            $this->extend('handleOrderInfo', $order, $response);
-        }
-    }
-
-    /**
-     * @param $response
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function parseOrderCustomer($response)
-    {
-        foreach ($response->transactions->transaction as $transaction) {
-            // if not a guest transaction in FoxyCart
-            if (isset($transaction->customer_email) && $transaction->is_anonymous == 0) {
-                // if Customer is existing member, associate with current order
-                if (Member::get()->filter('Email', $transaction->customer_email)->First()) {
-                    $customer = Member::get()->filter('Email', $transaction->customer_email)->First();
-                    // if new customer, create account with data from FoxyCart
-                } else {
-                    // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
-                    Config::modify()->set(Security::class, 'password_encryption_algorithm', 'none');
-
-                    // create new Member, set password info from FoxyCart
-                    $customer = Member::create();
-                    $customer->Customer_ID = (int) $transaction->customer_id;
-                    $customer->FirstName = (string) $transaction->customer_first_name;
-                    $customer->Surname = (string) $transaction->customer_last_name;
-                    $customer->Email = (string) $transaction->customer_email;
-                    $customer->Password = (string) $transaction->customer_password;
-                    $customer->Salt = (string) $transaction->customer_password_salt;
-                    $customer->PasswordEncryption = 'none';
-
-                    // record member record
-                    $customer->write();
-                }
-
-                // set Order MemberID
-                $this->MemberID = $customer->ID;
-
-                $this->extend('handleOrderCustomer', $order, $response, $customer);
-            }
-        }
-    }
-
-    /**
-     * @param $response
-     *
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function parseOrderDetails($response)
-    {
-
-        // remove previous OrderDetails and OrderOptions so we don't end up with duplicates
-        foreach ($this->Details() as $detail) {
-            /** @var OrderOption $orderOption */
-            foreach ($detail->OrderOptions() as $orderOption) {
-                $orderOption->delete();
-            }
-            $detail->delete();
-        }
-
-        foreach ($response->transactions->transaction as $transaction) {
-            // Associate ProductPages, Options, Quantity with Order
-            foreach ($transaction->transaction_details->transaction_detail as $detail) {
-                $OrderDetail = OrderDetail::create();
-
-                $OrderDetail->Quantity = (int) $detail->product_quantity;
-                $OrderDetail->ProductName = (string) $detail->product_name;
-                $OrderDetail->ProductCode = (string) $detail->product_code;
-                $OrderDetail->ProductImage = (string) $detail->image;
-                $OrderDetail->ProductCategory = (string) $detail->category_code;
-                $priceModifier = 0;
-
-                // parse OrderOptions
-                foreach ($detail->transaction_detail_options->transaction_detail_option as $option) {
-                    // Find product via product_id custom variable
-                    if ($option->product_option_name == 'product_id') {
-                        // if product is found, set relation to OrderDetail
-                        $OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
-                        if ($OrderProduct) {
-                            $OrderDetail->ProductID = $OrderProduct->ID;
-                        }
-                    } else {
-                        $OrderOption = OrderOption::create();
-                        $OrderOption->Name = (string) $option->product_option_name;
-                        $OrderOption->Value = (string) $option->product_option_value;
-                        $OrderOption->write();
-                        $OrderDetail->OrderOptions()->add($OrderOption);
-
-                        $priceModifier += $option->price_mod;
-                    }
-                }
-
-                $OrderDetail->Price = (float) $detail->product_price + (float) $priceModifier;
-
-                // extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
-                $this->extend('handleOrderItem', $order, $response, $OrderDetail);
-
-                // write
-                $OrderDetail->write();
-
-                // associate with this order
-                $this->Details()->add($OrderDetail);
-            }
-        }
-    }
-
-    /**
-     * @param bool $member
-     *
-     * @return bool|int
-     */
-    public function canView($member = null)
-    {
-        return Permission::check('Product_ORDERS', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool
-     */
-    public function canEdit($member = null)
-    {
-        return false;
-        //return Permission::check('Product_ORDERS', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool
-     */
-    public function canDelete($member = null)
-    {
-        return false;
-        //return Permission::check('Product_ORDERS', 'any', $member);
-    }
-
-    /**
-     * @param null  $member
-     * @param array $context
-     *
-     * @return bool
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return array(
-            'Product_ORDERS' => 'Allow user to manage Orders and related objects',
-        );
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Order_ID' => 'Int',
+		'TransactionDate' => 'DBDatetime',
+		'ProductTotal' => 'Currency',
+		'TaxTotal' => 'Currency',
+		'ShippingTotal' => 'Currency',
+		'OrderTotal' => 'Currency',
+		'ReceiptURL' => 'Varchar(255)',
+		'OrderStatus' => 'Varchar(255)',
+		'Response' => 'Text',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Member' => Member::class,
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_many = array(
+		'Details' => OrderDetail::class,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Order';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Orders';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'Orders from FoxyCart Datafeed';
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'TransactionDate DESC, ID DESC';
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = array(
+		'Order_ID',
+		'TransactionDate.Nice',
+		'Member.Name',
+		'ProductTotal.Nice',
+		'ShippingTotal.Nice',
+		'TaxTotal.Nice',
+		'OrderTotal.Nice',
+		'ReceiptLink',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $searchable_fields = array(
+		'Order_ID',
+		'TransactionDate' => array(
+			'field' => DateField::class,
+			'filter' => 'PartialMatchFilter',
+		),
+		'Member.ID',
+		'OrderTotal',
+		'Details.ProductID',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $casting = array(
+		'ReceiptLink' => 'HTMLVarchar',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $indexes = array(
+		'Order_ID' => true, // make unique
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Order';
+
+	/**
+	 * @param bool $includerelations
+	 *
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels();
+
+		$labels['Order_ID'] = _t('Order.Order_ID', 'Order ID#');
+		$labels['TransactionDate'] = _t('Order.TransactionDate', 'Date');
+		$labels['TransactionDate.NiceUS'] = _t('Order.TransactionDate', 'Date');
+		$labels['Member.Name'] = _t('Order.MemberName', 'Customer');
+		$labels['Member.ID'] = _t('Order.MemberName', 'Customer');
+		$labels['ProductTotal.Nice'] = _t('Order.ProductTotal', 'Sub Total');
+		$labels['TaxTotal.Nice'] = _t('Order.TaxTotal', 'Tax');
+		$labels['ShippingTotal.Nice'] = _t('Order.ShippingTotal', 'Shipping');
+		$labels['OrderTotal'] = _t('Order.OrderTotal', 'Total');
+		$labels['OrderTotal.Nice'] = _t('Order.OrderTotal', 'Total');
+		$labels['ReceiptLink'] = _t('Order.ReceiptLink', 'Invoice');
+		$labels['Details.ProductID'] = _t('Order.Details.ProductID', 'Product');
+
+		return $labels;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function ReceiptLink()
+	{
+		return $this->getReceiptLink();
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getReceiptLink()
+	{
+		$obj = DBHTMLVarchar::create();
+		$obj->setValue(
+			'<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>'
+		);
+
+		return $obj;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getDecryptedResponse()
+	{
+		$decrypted = urldecode($this->Response);
+		if (FoxyCart::getStoreKey()) {
+			return \rc4crypt::decrypt(FoxyCart::getStoreKey(), $decrypted);
+		}
+		return false;
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function onBeforeWrite()
+	{
+		$this->parseOrder();
+		parent::onBeforeWrite();
+	}
+
+	/**
+	 * @return bool
+	 *
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function parseOrder()
+	{
+		if ($this->getDecryptedResponse()) {
+			$response = new \SimpleXMLElement($this->getDecryptedResponse());
+
+			$this->parseOrderInfo($response);
+			$this->parseOrderCustomer($response);
+			$this->parseOrderDetails($response);
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param $response
+	 */
+	public function parseOrderInfo($response)
+	{
+		foreach ($response->transactions->transaction as $transaction) {
+			// Record transaction data from FoxyCart Datafeed:
+			$this->Store_ID = (int) $transaction->store_id;
+			$this->TransactionDate = (string) $transaction->transaction_date;
+			$this->ProductTotal = (float) $transaction->product_total;
+			$this->TaxTotal = (float) $transaction->tax_total;
+			$this->ShippingTotal = (float) $transaction->shipping_total;
+			$this->OrderTotal = (float) $transaction->order_total;
+			$this->ReceiptURL = (string) $transaction->receipt_url;
+			$this->OrderStatus = (string) $transaction->status;
+
+			$this->extend('handleOrderInfo', $order, $response);
+		}
+	}
+
+	/**
+	 * @param $response
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function parseOrderCustomer($response)
+	{
+		foreach ($response->transactions->transaction as $transaction) {
+			// if not a guest transaction in FoxyCart
+			if (isset($transaction->customer_email) && $transaction->is_anonymous == 0) {
+				// if Customer is existing member, associate with current order
+				if (Member::get()->filter('Email', $transaction->customer_email)->First()) {
+					$customer = Member::get()->filter('Email', $transaction->customer_email)->First();
+					// if new customer, create account with data from FoxyCart
+				} else {
+					// set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
+					Config::modify()->set(Security::class, 'password_encryption_algorithm', 'none');
+
+					// create new Member, set password info from FoxyCart
+					$customer = Member::create();
+					$customer->Customer_ID = (int) $transaction->customer_id;
+					$customer->FirstName = (string) $transaction->customer_first_name;
+					$customer->Surname = (string) $transaction->customer_last_name;
+					$customer->Email = (string) $transaction->customer_email;
+					$customer->Password = (string) $transaction->customer_password;
+					$customer->Salt = (string) $transaction->customer_password_salt;
+					$customer->PasswordEncryption = 'none';
+
+					// record member record
+					$customer->write();
+				}
+
+				// set Order MemberID
+				$this->MemberID = $customer->ID;
+
+				$this->extend('handleOrderCustomer', $order, $response, $customer);
+			}
+		}
+	}
+
+	/**
+	 * @param $response
+	 *
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function parseOrderDetails($response)
+	{
+
+		// remove previous OrderDetails and OrderOptions so we don't end up with duplicates
+		foreach ($this->Details() as $detail) {
+			/** @var OrderOption $orderOption */
+			foreach ($detail->OrderOptions() as $orderOption) {
+				$orderOption->delete();
+			}
+			$detail->delete();
+		}
+
+		foreach ($response->transactions->transaction as $transaction) {
+			// Associate ProductPages, Options, Quantity with Order
+			foreach ($transaction->transaction_details->transaction_detail as $detail) {
+				$OrderDetail = OrderDetail::create();
+
+				$OrderDetail->Quantity = (int) $detail->product_quantity;
+				$OrderDetail->ProductName = (string) $detail->product_name;
+				$OrderDetail->ProductCode = (string) $detail->product_code;
+				$OrderDetail->ProductImage = (string) $detail->image;
+				$OrderDetail->ProductCategory = (string) $detail->category_code;
+				$priceModifier = 0;
+
+				// parse OrderOptions
+				foreach ($detail->transaction_detail_options->transaction_detail_option as $option) {
+					// Find product via product_id custom variable
+					if ($option->product_option_name == 'product_id') {
+						// if product is found, set relation to OrderDetail
+						$OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
+						if ($OrderProduct) {
+							$OrderDetail->ProductID = $OrderProduct->ID;
+						}
+					} else {
+						$OrderOption = OrderOption::create();
+						$OrderOption->Name = (string) $option->product_option_name;
+						$OrderOption->Value = (string) $option->product_option_value;
+						$OrderOption->write();
+						$OrderDetail->OrderOptions()->add($OrderOption);
+
+						$priceModifier += $option->price_mod;
+					}
+				}
+
+				$OrderDetail->Price = (float) $detail->product_price + (float) $priceModifier;
+
+				// extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
+				$this->extend('handleOrderItem', $order, $response, $OrderDetail);
+
+				// write
+				$OrderDetail->write();
+
+				// associate with this order
+				$this->Details()->add($OrderDetail);
+			}
+		}
+	}
+
+	/**
+	 * @param bool $member
+	 *
+	 * @return bool|int
+	 */
+	public function canView($member = null)
+	{
+		return Permission::check('Product_ORDERS', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool
+	 */
+	public function canEdit($member = null)
+	{
+		return false;
+		//return Permission::check('Product_ORDERS', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool
+	 */
+	public function canDelete($member = null)
+	{
+		return false;
+		//return Permission::check('Product_ORDERS', 'any', $member);
+	}
+
+	/**
+	 * @param null  $member
+	 * @param array $context
+	 *
+	 * @return bool
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'Product_ORDERS' => 'Allow user to manage Orders and related objects',
+		);
+	}
 }

src/Model/FoxyStripeSetting.php

Spacing +4 added lines, -4 removed lines

@@ -332,7 +332,7 @@ 
                 FormAction::create('save_foxystripe_setting', _t('FoxyStripeSetting.SAVE', 'Save'))
                     ->addExtraClass('btn-primary font-icon-save')
             );
-        } else {
+        }else {
             $actions = FieldList::create();
         }
         $this->extend('updateCMSActions', $actions);
@@ -360,7 +360,7 @@ 
             }
             $config->StoreKey = $key;
             $config->write();
-            DB::alteration_message('Created FoxyCart Store Key ' . $key, 'created');
+            DB::alteration_message('Created FoxyCart Store Key '.$key, 'created');
         }
     }
 
@@ -462,7 +462,7 @@ 
      */
     private static function getSSOLink()
     {
-        return Director::absoluteBaseURL() . 'foxystripe/sso/';
+        return Director::absoluteBaseURL().'foxystripe/sso/';
     }
 
     /**
@@ -470,7 +470,7 @@ 
      */
     private static function getDataFeedLink()
     {
-        return Director::absoluteBaseURL() . 'foxystripe/';
+        return Director::absoluteBaseURL().'foxystripe/';
     }
 
     /**

Indentation +493 added lines, -493 removed lines

@@ -62,236 +62,236 @@ 
  */
 class FoxyStripeSetting extends DataObject implements PermissionProvider, TemplateGlobalProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'FoxyStripe Setting';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'FoxyStripe Settings';
-    /**
-     * @var string
-     */
-    private static $description = 'Update the settings for your store';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'StoreTitle' => 'Varchar(255)',
-        'StoreName' => 'Varchar(255)',
-        'CustomSSL' => 'Boolean',
-        'RemoteDomain' => 'Varchar(255)',
-        'StoreURL' => 'Varchar(255)',
-        'ReceiptURL' => 'Varchar(255)',
-        'StoreEmail' => 'Varchar(255)',
-        'FromEmail' => 'Varchar(255)',
-        'StorePostalCode' => 'Varchar(10)',
-        'StoreCountry' => 'Varchar(100)',
-        'StoreRegion' => 'Varchar(100)',
-        'StoreLocaleCode' => 'Varchar(10)',
-        'StoreLogoURL' => 'Varchar(255)',
-        'CheckoutType' => 'Varchar(50)',
-        'BccEmail' => 'Boolean',
-        'UseWebhook' => 'Boolean',
-        'StoreKey' => 'Varchar(60)',
-        'CartValidation' => 'Boolean',
-        'UseSingleSignOn' => 'Boolean',
-        'AllowMultiship' => 'Boolean',
-        'StoreTimezone' => 'Varchar(100)',
-        'MultiGroup' => 'Boolean',
-        'ProductLimit' => 'Int',
-        'MaxQuantity' => 'Int',
-        'EnableAPI' => 'Boolean',
-        'client_id' => 'Varchar(255)',
-        'client_secret' => 'Varchar(255)',
-        'access_token' => 'Varchar(255)',
-        'refresh_token' => 'Varchar(255)',
-        'EnableSidecart' => 'Boolean',
-    ];
-
-    // Set Default values
-    private static $defaults = [
-        'ProductLimit' => 10,
-        'EnableSidecart' => 1,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'FoxyStripeSetting';
-
-    /**
-     * Default permission to check for 'LoggedInUsers' to create or edit pages.
-     *
-     * @var array
-     * @config
-     */
-    private static $required_permission = ['CMS_ACCESS_CMSMain', 'CMS_ACCESS_LeftAndMain'];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = FieldList::create(
-            TabSet::create(
-                'Root',
-                $tabMain = Tab::create(
-                    'Main'
-                )
-            ),
-            HiddenField::create('ID')
-        );
-        $tabMain->setTitle('Settings');
-
-        // settings tab
-        $fields->addFieldsToTab('Root.Main', [
-            // Store Details
-            HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
-            LiteralField::create('DetailsIntro', _t(
-                'FoxyStripeSiteConfig.DetailsIntro',
-                '<p>Maps to data in your 
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'FoxyStripe Setting';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'FoxyStripe Settings';
+	/**
+	 * @var string
+	 */
+	private static $description = 'Update the settings for your store';
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'StoreTitle' => 'Varchar(255)',
+		'StoreName' => 'Varchar(255)',
+		'CustomSSL' => 'Boolean',
+		'RemoteDomain' => 'Varchar(255)',
+		'StoreURL' => 'Varchar(255)',
+		'ReceiptURL' => 'Varchar(255)',
+		'StoreEmail' => 'Varchar(255)',
+		'FromEmail' => 'Varchar(255)',
+		'StorePostalCode' => 'Varchar(10)',
+		'StoreCountry' => 'Varchar(100)',
+		'StoreRegion' => 'Varchar(100)',
+		'StoreLocaleCode' => 'Varchar(10)',
+		'StoreLogoURL' => 'Varchar(255)',
+		'CheckoutType' => 'Varchar(50)',
+		'BccEmail' => 'Boolean',
+		'UseWebhook' => 'Boolean',
+		'StoreKey' => 'Varchar(60)',
+		'CartValidation' => 'Boolean',
+		'UseSingleSignOn' => 'Boolean',
+		'AllowMultiship' => 'Boolean',
+		'StoreTimezone' => 'Varchar(100)',
+		'MultiGroup' => 'Boolean',
+		'ProductLimit' => 'Int',
+		'MaxQuantity' => 'Int',
+		'EnableAPI' => 'Boolean',
+		'client_id' => 'Varchar(255)',
+		'client_secret' => 'Varchar(255)',
+		'access_token' => 'Varchar(255)',
+		'refresh_token' => 'Varchar(255)',
+		'EnableSidecart' => 'Boolean',
+	];
+
+	// Set Default values
+	private static $defaults = [
+		'ProductLimit' => 10,
+		'EnableSidecart' => 1,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'FoxyStripeSetting';
+
+	/**
+	 * Default permission to check for 'LoggedInUsers' to create or edit pages.
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $required_permission = ['CMS_ACCESS_CMSMain', 'CMS_ACCESS_LeftAndMain'];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = FieldList::create(
+			TabSet::create(
+				'Root',
+				$tabMain = Tab::create(
+					'Main'
+				)
+			),
+			HiddenField::create('ID')
+		);
+		$tabMain->setTitle('Settings');
+
+		// settings tab
+		$fields->addFieldsToTab('Root.Main', [
+			// Store Details
+			HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
+			LiteralField::create('DetailsIntro', _t(
+				'FoxyStripeSiteConfig.DetailsIntro',
+				'<p>Maps to data in your 
                         <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">
                             FoxyCart store settings
                         </a>.'
-            )),
-            TextField::create('StoreTitle')
-                ->setTitle(_t('FoxyStripeSiteConfig.StoreTitle', 'Store Name'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.StoreTitleDescription',
-                    'The name of your store as you\'d like it displayed to your customers'
-                )),
-            CheckboxField::create('CustomSSL', 'Use custom SSL'),
-            TextField::create('RemoteDomain')
-                ->setTitle(_t('FoxyStripeSiteConfig.RemoteDomain', 'Store Remote Domain'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.RemoteDomainDescription',
-                    'custom subdomain for FoxyCart'
-                ))
-                ->displayIf('CustomSSL')->isChecked()->end(),
-            TextField::create('StoreName')
-                ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Domain'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.StoreNameDescription',
-                    'This is a unique FoxyCart subdomain for your cart, checkout, and receipt'
-                ))
-                ->hideIf('CustomSSL')->isChecked()->end(),
-            TextField::create('StoreURL')
-                ->setTitle(_t('FoxyStripeSiteConfig.StoreURL', 'Store URL'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.StoreURLDescription',
-                    'The URL of your online store'
-                )),
-            TextField::create('ReceiptURL')
-                ->setTitle(_t('FoxyStripeSiteConfig.ReceiptURL', 'Receipt URL'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.ReceiptURLDescription',
-                    'By default, FoxyCart sends customers back to the page referrer after completing a purchase. 
+			)),
+			TextField::create('StoreTitle')
+				->setTitle(_t('FoxyStripeSiteConfig.StoreTitle', 'Store Name'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.StoreTitleDescription',
+					'The name of your store as you\'d like it displayed to your customers'
+				)),
+			CheckboxField::create('CustomSSL', 'Use custom SSL'),
+			TextField::create('RemoteDomain')
+				->setTitle(_t('FoxyStripeSiteConfig.RemoteDomain', 'Store Remote Domain'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.RemoteDomainDescription',
+					'custom subdomain for FoxyCart'
+				))
+				->displayIf('CustomSSL')->isChecked()->end(),
+			TextField::create('StoreName')
+				->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Domain'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.StoreNameDescription',
+					'This is a unique FoxyCart subdomain for your cart, checkout, and receipt'
+				))
+				->hideIf('CustomSSL')->isChecked()->end(),
+			TextField::create('StoreURL')
+				->setTitle(_t('FoxyStripeSiteConfig.StoreURL', 'Store URL'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.StoreURLDescription',
+					'The URL of your online store'
+				)),
+			TextField::create('ReceiptURL')
+				->setTitle(_t('FoxyStripeSiteConfig.ReceiptURL', 'Receipt URL'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.ReceiptURLDescription',
+					'By default, FoxyCart sends customers back to the page referrer after completing a purchase. 
                             Instead, you can set a specific URL here.'
-                )),
-            TextField::create('StoreEmail')
-                ->setTitle(_t('FoxyStripeSiteConfig.StoreEmail', 'Store Email'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.StoreEmailDescription',
-                    'This is the email address of your store. By default, this will be the from address for your 
+				)),
+			TextField::create('StoreEmail')
+				->setTitle(_t('FoxyStripeSiteConfig.StoreEmail', 'Store Email'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.StoreEmailDescription',
+					'This is the email address of your store. By default, this will be the from address for your 
                             store receipts. '
-                )),
-            TextField::create('FromEmail')
-                ->setTitle(_t('FoxyStripeSiteConfig.FromEmail', 'From Email'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.FromEmailDescription',
-                    'Used for when you want to specify a different from email than your store\'s email address'
-                )),
-            TextField::create('StorePostalCode', 'Postal Code'),
-            CountryDropdownField::create('StoreCountry', 'Country'),
-            TextField::create('StoreRegion', 'State/Region'),
-            TextField::create('StoreLocaleCode', 'Locale Code')
-                ->setDescription('example: en_US'),
-            TextField::create('StoreTimezone', 'Store timezone'),
-            TextField::create('StoreLogoURL', 'Logo URL')
-                ->setAttribute('placeholder', 'http://'),
-        ]);
-
-        $fields->addFieldsToTab('Root.Advanced', [
-            HeaderField::create('AdvanceHeader', _t(
-                'FoxyStripeSiteConfig.AdvancedHeader',
-                'Advanced Settings'
-            ), 3),
-            LiteralField::create('AdvancedIntro', _t(
-                'FoxyStripeSiteConfig.AdvancedIntro',
-                '<p>Maps to data in your 
+				)),
+			TextField::create('FromEmail')
+				->setTitle(_t('FoxyStripeSiteConfig.FromEmail', 'From Email'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.FromEmailDescription',
+					'Used for when you want to specify a different from email than your store\'s email address'
+				)),
+			TextField::create('StorePostalCode', 'Postal Code'),
+			CountryDropdownField::create('StoreCountry', 'Country'),
+			TextField::create('StoreRegion', 'State/Region'),
+			TextField::create('StoreLocaleCode', 'Locale Code')
+				->setDescription('example: en_US'),
+			TextField::create('StoreTimezone', 'Store timezone'),
+			TextField::create('StoreLogoURL', 'Logo URL')
+				->setAttribute('placeholder', 'http://'),
+		]);
+
+		$fields->addFieldsToTab('Root.Advanced', [
+			HeaderField::create('AdvanceHeader', _t(
+				'FoxyStripeSiteConfig.AdvancedHeader',
+				'Advanced Settings'
+			), 3),
+			LiteralField::create('AdvancedIntro', _t(
+				'FoxyStripeSiteConfig.AdvancedIntro',
+				'<p>Maps to data in your 
                     <a href="https://admin.foxycart.com/admin.php?ThisAction=EditAdvancedFeatures" target="_blank">
                         FoxyCart advanced store settings
                     </a>.</p>'
-            )),
-            DropdownField::create('CheckoutType', 'Checkout Type', $this->getCheckoutTypes()),
-            CheckboxField::create('BccEmail', 'BCC Admin Email')
-                ->setDescription('bcc all receipts to store\'s email address'),
-            CheckboxField::create('UseWebhook', 'Use Webhook')
-                ->setDescription('record order history in CMS, allows customers to view their order history'),
-            ReadonlyField::create('WebhookURL', 'Webhook URL', self::getDataFeedLink()),
-            ReadonlyField::create('StoreKey', 'Webhook Key', self::getDataFeedLink()),
-            CheckboxField::create('CartValidation', 'Use cart validation'),
-            CheckboxField::create('UseSingleSignOn', 'Use single sign on')
-                ->setDescription('Sync user accounts between FoxyCart and your website'),
-            ReadonlyField::create('SingleSignOnURL', 'Single sign on URL', self::getSSOLink()),
-            CheckboxField::create('AllowMultiship', 'Allow multiple shipments per order'),
-        ]);
-
-        // configuration warning
-        if (FoxyCart::store_name_warning() !== null) {
-            $fields->insertBefore(LiteralField::create(
-                'StoreSubDomainHeaderWarning',
-                _t(
-                    'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
-                    '<p class="message error">Store Domain must be entered below
+			)),
+			DropdownField::create('CheckoutType', 'Checkout Type', $this->getCheckoutTypes()),
+			CheckboxField::create('BccEmail', 'BCC Admin Email')
+				->setDescription('bcc all receipts to store\'s email address'),
+			CheckboxField::create('UseWebhook', 'Use Webhook')
+				->setDescription('record order history in CMS, allows customers to view their order history'),
+			ReadonlyField::create('WebhookURL', 'Webhook URL', self::getDataFeedLink()),
+			ReadonlyField::create('StoreKey', 'Webhook Key', self::getDataFeedLink()),
+			CheckboxField::create('CartValidation', 'Use cart validation'),
+			CheckboxField::create('UseSingleSignOn', 'Use single sign on')
+				->setDescription('Sync user accounts between FoxyCart and your website'),
+			ReadonlyField::create('SingleSignOnURL', 'Single sign on URL', self::getSSOLink()),
+			CheckboxField::create('AllowMultiship', 'Allow multiple shipments per order'),
+		]);
+
+		// configuration warning
+		if (FoxyCart::store_name_warning() !== null) {
+			$fields->insertBefore(LiteralField::create(
+				'StoreSubDomainHeaderWarning',
+				_t(
+					'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
+					'<p class="message error">Store Domain must be entered below
                         </a></p>'
-                )
-            ), 'StoreDetails');
-        }
-
-        // products tab
-        $fields->addFieldsToTab('Root.Products', [
-            HeaderField::create('ProductHeader', _t(
-                'FoxyStripeSiteConfig.ProductHeader',
-                'Products'
-            ), 3),
-            CheckboxField::create('MultiGroup')
-                ->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.MultiGroupDescription',
-                    'Allows products to be shown in multiple Product Groups'
-                )),
-            HeaderField::create('ProductGroupHD', _t(
-                'FoxyStripeSiteConfig.ProductGroupHD',
-                'Product Groups'
-            ), 3),
-            NumericField::create('ProductLimit')
-                ->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.ProductLimitDescription',
-                    'Number of Products to show per page on a Product Group'
-                )),
-            HeaderField::create('ProductQuantityHD', _t(
-                'FoxyStripeSiteConfig.ProductQuantityHD',
-                'Product Form Max Quantity'
-            ), 3),
-            NumericField::create('MaxQuantity')
-                ->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
-                ->setDescription(_t(
-                    'FoxyStripeSiteConfig.MaxQuantityDescription',
-                    'Sets max quantity for product form dropdown (add to cart form - default 10)'
-                )),
-        ]);
-
-        // categories tab
-        $fields->addFieldsToTab('Root.Categories', [
-            HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
-            LiteralField::create('CategoryDescrip', _t(
-                'FoxyStripeSiteConfig.CategoryDescrip',
-                '<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be 
+				)
+			), 'StoreDetails');
+		}
+
+		// products tab
+		$fields->addFieldsToTab('Root.Products', [
+			HeaderField::create('ProductHeader', _t(
+				'FoxyStripeSiteConfig.ProductHeader',
+				'Products'
+			), 3),
+			CheckboxField::create('MultiGroup')
+				->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.MultiGroupDescription',
+					'Allows products to be shown in multiple Product Groups'
+				)),
+			HeaderField::create('ProductGroupHD', _t(
+				'FoxyStripeSiteConfig.ProductGroupHD',
+				'Product Groups'
+			), 3),
+			NumericField::create('ProductLimit')
+				->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.ProductLimitDescription',
+					'Number of Products to show per page on a Product Group'
+				)),
+			HeaderField::create('ProductQuantityHD', _t(
+				'FoxyStripeSiteConfig.ProductQuantityHD',
+				'Product Form Max Quantity'
+			), 3),
+			NumericField::create('MaxQuantity')
+				->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
+				->setDescription(_t(
+					'FoxyStripeSiteConfig.MaxQuantityDescription',
+					'Sets max quantity for product form dropdown (add to cart form - default 10)'
+				)),
+		]);
+
+		// categories tab
+		$fields->addFieldsToTab('Root.Categories', [
+			HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
+			LiteralField::create('CategoryDescrip', _t(
+				'FoxyStripeSiteConfig.CategoryDescrip',
+				'<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be 
                         accomplished by product options alone, including category specific coupon codes, 
                         shipping and handling fees, and email receipts. 
                         <a href="https://wiki.foxycart.com/v/2.0/categories" target="_blank">
@@ -300,262 +300,262 @@ 
                         <p>Categories you\'ve created in FoxyStripe must also be created in your 
                             <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" 
                                 target="_blank">FoxyCart Categories</a> admin panel.</p>'
-            )),
-            GridField::create(
-                'ProductCategory',
-                _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
-                ProductCategory::get(),
-                GridFieldConfig_RecordEditor::create()
-            ),
-        ]);
-
-        // option groups tab
-        $fields->addFieldsToTab('Root.Groups', [
-            HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
-            LiteralField::create('OptionGroupsDescrip', _t(
-                'FoxyStripeSiteConfig.OptionGroupsDescrip',
-                '<p>Product Option Groups allow you to name a set of product options.</p>'
-            )),
-            GridField::create(
-                'OptionGroup',
-                _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
-                OptionGroup::get(),
-                GridFieldConfig_RecordEditor::create()
-            ),
-        ]);
-
-        // api tab
-        if (Permission::check('ADMIN')) {
-            $fields->addFieldsToTab('Root.API', [
-                HeaderField::create('APIHD', 'FoxyCart API Settings', 3),
-                CheckboxField::create('EnableAPI', 'Enable FoxyCart API'),
-                TextField::create('client_id', 'FoxyCart Client ID'),
-                TextField::create('client_secret', 'FoxyCart Client Secret'),
-                TextField::create('access_token', 'FoxyCart Access Token'),
-                TextField::create('refresh_token', 'FoxyCart Refresh Token'),
-            ]);
-        }
-
-        $fields->addFieldsToTab('Root.Template', [
-            HeaderField::create('TemplateHD', _t('FoxyStripeSiteConfig.TemplateHD', 'Template Options'), 3),
-            CheckboxField::create('EnableSidecart')
-                ->setDescription('Turns on the Sidebar cart. Uncheck to use the full page cart.'),
-        ]);
-
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSActions()
-    {
-        if (Permission::check('ADMIN') || Permission::check('EDIT_FOXYSTRIPE_SETTING')) {
-            $actions = new FieldList(
-                FormAction::create('save_foxystripe_setting', _t('FoxyStripeSetting.SAVE', 'Save'))
-                    ->addExtraClass('btn-primary font-icon-save')
-            );
-        } else {
-            $actions = FieldList::create();
-        }
-        $this->extend('updateCMSActions', $actions);
-
-        return $actions;
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function requireDefaultRecords()
-    {
-        parent::requireDefaultRecords();
-        $config = self::current_foxystripe_setting();
-
-        if (!$config) {
-            self::make_foxystripe_setting();
-            DB::alteration_message('Added default FoxyStripe Setting', 'created');
-        }
-
-        if (!$config->StoreKey) {
-            $key = FoxyCart::setStoreKey();
-            while (!ctype_alnum($key)) {
-                $key = FoxyCart::setStoreKey();
-            }
-            $config->StoreKey = $key;
-            $config->write();
-            DB::alteration_message('Created FoxyCart Store Key ' . $key, 'created');
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function CMSEditLink()
-    {
-        return FoxyStripeAdmin::singleton()->Link();
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int|null
-     */
-    public function canEdit($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        $extended = $this->extendedCan('canEdit', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        return Permission::checkMember($member, 'EDIT_FOXYSTRIPE_SETTING');
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            'EDIT_FOXYSTRIPE_SETTING' => [
-                'name' => _t(
-                    'FoxyStripeSetting.EDIT_FOXYSTRIPE_SETTING',
-                    'Manage FoxyStripe settings'
-                ),
-                'category' => _t(
-                    'Permissions.PERMISSIONS_FOXYSTRIPE_SETTING',
-                    'FoxyStripe'
-                ),
-                'help' => _t(
-                    'FoxyStripeSetting.EDIT_PERMISSION_FOXYSTRIPE_SETTING',
-                    'Ability to edit the settings of a FoxyStripe Store.'
-                ),
-                'sort' => 400,
-            ],
-        ];
-    }
-
-    /**
-     * Get the current sites {@link GlobalSiteSetting}, and creates a new one
-     * through {@link make_global_config()} if none is found.
-     *
-     * @return FoxyStripeSetting|DataObject
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public static function current_foxystripe_setting()
-    {
-        if ($config = self::get()->first()) {
-            return $config;
-        }
-
-        return self::make_foxystripe_setting();
-    }
-
-    /**
-     * Create {@link GlobalSiteSetting} with defaults from language file.
-     *
-     * @return static
-     */
-    public static function make_foxystripe_setting()
-    {
-        $config = self::create();
-        try {
-            $config->write();
-        } catch (ValidationException $e) {
-        }
-
-        return $config;
-    }
-
-    /**
-     * Add $GlobalConfig to all SSViewers.
-     */
-    public static function get_template_global_variables()
-    {
-        return [
-            'FoxyStripe' => 'current_foxystripe_setting',
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    private static function getSSOLink()
-    {
-        return Director::absoluteBaseURL() . 'foxystripe/sso/';
-    }
-
-    /**
-     * @return string
-     */
-    private static function getDataFeedLink()
-    {
-        return Director::absoluteBaseURL() . 'foxystripe/';
-    }
-
-    /**
-     * @return array
-     */
-    public function getCheckoutTypes()
-    {
-        return [
-            'default_account' => 'Allow guest and customer accounts, default to account',
-            'default_guest' => 'Allow guest and customer accounts, default to guest',
-            'account_only' => 'Allow customer accounts only',
-            'guest_only' => 'Allow guests only',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getDataMap()
-    {
-        return [
-            'store_name' => $this->StoreTitle,
-            'store_domain' => $this->StoreName,
-            'store_url' => $this->StoreURL,
-            'receipt_continue_url' => $this->ReceiptURL,
-            'store_email' => $this->StoreEmail,
-            'from_email' => $this->FromEmail,
-            'postal_code' => $this->StorePostalCode,
-            'country' => $this->StoreCountry,
-            'region' => $this->StoreRegion,
-            'locale_code' => $this->StoreLocaleCode,
-            'logo_url' => $this->StoreLogoURL,
-            'checkout_type' => $this->CheckoutType,
-            'bcc_on_receipt_email' => $this->BccEmail,
-            'use_webhook' => $this->UseWebhook,
-            'webhook_url' => $this->getDataFeedLink(),
-            'webhook_key' => $this->StoreKey,
-            'use_cart_validation' => $this->CartValidation,
-            'use_single_sign_on' => $this->UseSingleSignOn,
-            'single_sign_on_url' => $this->getSSOLink(),
-            'customer_password_hash_type' => 'sha1_salted_suffix',
-            'customer_password_hash_config' => 40,
-            'features_multiship' => $this->AllowMultiship,
-            //'timezone' => $this->StoreTimezone,
-        ];
-    }
-
-    /**
-     * if StoreTitle is empty, grab values from FoxyCart.
-     *
-     * example of 2 way sync for future reference
-     *
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
-
-        if ($this->ID && !$this->StoreTitle && $this->access_token) {
-            /*
+			)),
+			GridField::create(
+				'ProductCategory',
+				_t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
+				ProductCategory::get(),
+				GridFieldConfig_RecordEditor::create()
+			),
+		]);
+
+		// option groups tab
+		$fields->addFieldsToTab('Root.Groups', [
+			HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
+			LiteralField::create('OptionGroupsDescrip', _t(
+				'FoxyStripeSiteConfig.OptionGroupsDescrip',
+				'<p>Product Option Groups allow you to name a set of product options.</p>'
+			)),
+			GridField::create(
+				'OptionGroup',
+				_t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
+				OptionGroup::get(),
+				GridFieldConfig_RecordEditor::create()
+			),
+		]);
+
+		// api tab
+		if (Permission::check('ADMIN')) {
+			$fields->addFieldsToTab('Root.API', [
+				HeaderField::create('APIHD', 'FoxyCart API Settings', 3),
+				CheckboxField::create('EnableAPI', 'Enable FoxyCart API'),
+				TextField::create('client_id', 'FoxyCart Client ID'),
+				TextField::create('client_secret', 'FoxyCart Client Secret'),
+				TextField::create('access_token', 'FoxyCart Access Token'),
+				TextField::create('refresh_token', 'FoxyCart Refresh Token'),
+			]);
+		}
+
+		$fields->addFieldsToTab('Root.Template', [
+			HeaderField::create('TemplateHD', _t('FoxyStripeSiteConfig.TemplateHD', 'Template Options'), 3),
+			CheckboxField::create('EnableSidecart')
+				->setDescription('Turns on the Sidebar cart. Uncheck to use the full page cart.'),
+		]);
+
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSActions()
+	{
+		if (Permission::check('ADMIN') || Permission::check('EDIT_FOXYSTRIPE_SETTING')) {
+			$actions = new FieldList(
+				FormAction::create('save_foxystripe_setting', _t('FoxyStripeSetting.SAVE', 'Save'))
+					->addExtraClass('btn-primary font-icon-save')
+			);
+		} else {
+			$actions = FieldList::create();
+		}
+		$this->extend('updateCMSActions', $actions);
+
+		return $actions;
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function requireDefaultRecords()
+	{
+		parent::requireDefaultRecords();
+		$config = self::current_foxystripe_setting();
+
+		if (!$config) {
+			self::make_foxystripe_setting();
+			DB::alteration_message('Added default FoxyStripe Setting', 'created');
+		}
+
+		if (!$config->StoreKey) {
+			$key = FoxyCart::setStoreKey();
+			while (!ctype_alnum($key)) {
+				$key = FoxyCart::setStoreKey();
+			}
+			$config->StoreKey = $key;
+			$config->write();
+			DB::alteration_message('Created FoxyCart Store Key ' . $key, 'created');
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function CMSEditLink()
+	{
+		return FoxyStripeAdmin::singleton()->Link();
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int|null
+	 */
+	public function canEdit($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		$extended = $this->extendedCan('canEdit', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		return Permission::checkMember($member, 'EDIT_FOXYSTRIPE_SETTING');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			'EDIT_FOXYSTRIPE_SETTING' => [
+				'name' => _t(
+					'FoxyStripeSetting.EDIT_FOXYSTRIPE_SETTING',
+					'Manage FoxyStripe settings'
+				),
+				'category' => _t(
+					'Permissions.PERMISSIONS_FOXYSTRIPE_SETTING',
+					'FoxyStripe'
+				),
+				'help' => _t(
+					'FoxyStripeSetting.EDIT_PERMISSION_FOXYSTRIPE_SETTING',
+					'Ability to edit the settings of a FoxyStripe Store.'
+				),
+				'sort' => 400,
+			],
+		];
+	}
+
+	/**
+	 * Get the current sites {@link GlobalSiteSetting}, and creates a new one
+	 * through {@link make_global_config()} if none is found.
+	 *
+	 * @return FoxyStripeSetting|DataObject
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public static function current_foxystripe_setting()
+	{
+		if ($config = self::get()->first()) {
+			return $config;
+		}
+
+		return self::make_foxystripe_setting();
+	}
+
+	/**
+	 * Create {@link GlobalSiteSetting} with defaults from language file.
+	 *
+	 * @return static
+	 */
+	public static function make_foxystripe_setting()
+	{
+		$config = self::create();
+		try {
+			$config->write();
+		} catch (ValidationException $e) {
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Add $GlobalConfig to all SSViewers.
+	 */
+	public static function get_template_global_variables()
+	{
+		return [
+			'FoxyStripe' => 'current_foxystripe_setting',
+		];
+	}
+
+	/**
+	 * @return string
+	 */
+	private static function getSSOLink()
+	{
+		return Director::absoluteBaseURL() . 'foxystripe/sso/';
+	}
+
+	/**
+	 * @return string
+	 */
+	private static function getDataFeedLink()
+	{
+		return Director::absoluteBaseURL() . 'foxystripe/';
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCheckoutTypes()
+	{
+		return [
+			'default_account' => 'Allow guest and customer accounts, default to account',
+			'default_guest' => 'Allow guest and customer accounts, default to guest',
+			'account_only' => 'Allow customer accounts only',
+			'guest_only' => 'Allow guests only',
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDataMap()
+	{
+		return [
+			'store_name' => $this->StoreTitle,
+			'store_domain' => $this->StoreName,
+			'store_url' => $this->StoreURL,
+			'receipt_continue_url' => $this->ReceiptURL,
+			'store_email' => $this->StoreEmail,
+			'from_email' => $this->FromEmail,
+			'postal_code' => $this->StorePostalCode,
+			'country' => $this->StoreCountry,
+			'region' => $this->StoreRegion,
+			'locale_code' => $this->StoreLocaleCode,
+			'logo_url' => $this->StoreLogoURL,
+			'checkout_type' => $this->CheckoutType,
+			'bcc_on_receipt_email' => $this->BccEmail,
+			'use_webhook' => $this->UseWebhook,
+			'webhook_url' => $this->getDataFeedLink(),
+			'webhook_key' => $this->StoreKey,
+			'use_cart_validation' => $this->CartValidation,
+			'use_single_sign_on' => $this->UseSingleSignOn,
+			'single_sign_on_url' => $this->getSSOLink(),
+			'customer_password_hash_type' => 'sha1_salted_suffix',
+			'customer_password_hash_config' => 40,
+			'features_multiship' => $this->AllowMultiship,
+			//'timezone' => $this->StoreTimezone,
+		];
+	}
+
+	/**
+	 * if StoreTitle is empty, grab values from FoxyCart.
+	 *
+	 * example of 2 way sync for future reference
+	 *
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
+
+		if ($this->ID && !$this->StoreTitle && $this->access_token) {
+			/*
             if ($fc = new FoxyStripeClient()) {
                 $client = $fc->getClient();
                 $errors = [];
@@ -570,20 +570,20 @@ 
                 }
             }
             */
-        }
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function onAfterWrite()
-    {
-        parent::onAfterWrite();
-
-        if (FoxyStripeClient::is_valid() && $this->isChanged()) {
-            if ($fc = new FoxyStripeClient()) {
-                $fc->updateStore($this->getDataMap());
-            }
-        }
-    }
+		}
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function onAfterWrite()
+	{
+		parent::onAfterWrite();
+
+		if (FoxyStripeClient::is_valid() && $this->isChanged()) {
+			if ($fc = new FoxyStripeClient()) {
+				$fc->updateStore($this->getDataMap());
+			}
+		}
+	}
 }

src/ORM/FoxyStripePageExtension.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         if ($config->EnableSidecart) {
             Requirements::javascript(
-                "https://cdn.foxycart.com/" . FoxyCart::getFoxyCartStoreName() . "/loader.js",
+                "https://cdn.foxycart.com/".FoxyCart::getFoxyCartStoreName()."/loader.js",
                 [
                     "async" => true,
                     "defer" => true,

Indentation +16 added lines, -16 removed lines

@@ -9,21 +9,21 @@
 
 class FoxyStripePageExtension extends Extension
 {
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function onAfterInit()
-    {
-        $config = FoxyStripeSetting::current_foxystripe_setting();
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function onAfterInit()
+	{
+		$config = FoxyStripeSetting::current_foxystripe_setting();
 
-        if ($config->EnableSidecart) {
-            Requirements::javascript(
-                "https://cdn.foxycart.com/" . FoxyCart::getFoxyCartStoreName() . "/loader.js",
-                [
-                    "async" => true,
-                    "defer" => true,
-                ]
-            );
-        }
-    }
+		if ($config->EnableSidecart) {
+			Requirements::javascript(
+				"https://cdn.foxycart.com/" . FoxyCart::getFoxyCartStoreName() . "/loader.js",
+				[
+					"async" => true,
+					"defer" => true,
+				]
+			);
+		}
+	}
 }

src/Page/ProductPage.php

Spacing +4 added lines, -5 removed lines

@@ -226,9 +226,9 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             // 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())
@@ -368,7 +368,7 @@ 
             $product = self::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -448,8 +448,7 @@ 
         $optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
 
         return (FoxyStripeSetting::current_foxystripe_setting()->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;
     }
 
     /**

Indentation +463 added lines, -463 removed lines

@@ -56,189 +56,189 @@ 
  */
 class ProductPage extends \Page implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $default_parent = ProductHolder::class;
-
-    /**
-     * @var bool
-     */
-    private static $can_be_root = false;
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Price' => 'Currency',
-        'Weight' => 'Decimal',
-        'Code' => 'Varchar(100)',
-        'ReceiptTitle' => 'HTMLVarchar(255)',
-        'Available' => 'Boolean',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Category' => ProductCategory::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $has_many = [
-        'ProductOptions' => OptionItem::class,
-        'OrderDetails' => OrderDetail::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $many_many = [
-        'Images' => Image::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $many_many_extraFields = [
-        'Images' => [
-            'SortOrder' => 'Int',
-        ],
-    ];
-
-    /**
-     * @var array
-     */
-    private static $owns = [
-        'Images',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $belongs_many_many = [
-        'ProductHolders' => ProductHolder::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Product';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Products';
-
-    /**
-     * @var string
-     */
-    private static $description = 'A product that can be added to the shopping cart';
-
-    /**
-     * @var array
-     */
-    private static $indexes = [
-        'Code' => [
-            'type' => 'unique',
-            'columns' => ['Code'],
-        ],
-    ];
-
-    /**
-     * @var array
-     */
-    private static $defaults = [
-        'ShowInMenus' => false,
-        'Available' => true,
-        'Weight' => '0.0',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = [
-        'Image.CMSThumbnail',
-        'Title',
-        'Code',
-        'Price.Nice',
-        'Category.Title',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $searchable_fields = [
-        'Title',
-        'Code',
-        'Available',
-        'Category.ID',
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'ProductPage';
-
-    /**
-     * Construct a new ProductPage.
-     *
-     * @param array|null $record Used internally for rehydrating an object from database content.
-     *                           Bypasses setters on this class, and hence should not be used
-     *                           for populating data on new records.
-     * @param boolean $isSingleton This this to true if this is a singleton() object, a stub for calling methods.
-     *                             Singletons don't have their defaults set.
-     * @param array $queryParams List of DataQuery params necessary to lazy load, or load related objects.
-     */
-    public function __construct($record = null, $isSingleton = false, $queryParams = [])
-    {
-        parent::__construct($record, $isSingleton, $queryParams);
-
-        if (Controller::has_curr()) {
-            if (Controller::curr() instanceof ContentController) {
-                Requirements::javascript('dynamic/foxystripe: javascript/quantity.js');
-                Requirements::css('dynamic/foxystripe: client/dist/css/quantityfield.css');
-            }
-        }
-    }
-
-    /**
-     * @param bool $includerelations
-     *
-     * @return array
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels();
-
-        $labels['Title'] = _t('ProductPage.TitleLabel', 'Name');
-        $labels['Code'] = _t('ProductPage.CodeLabel', 'Code');
-        $labels['Price.Nice'] = _t('ProductPage.PriceLabel', 'Price');
-        $labels['Available.Nice'] = _t('ProductPage.AvailableLabel', 'Available');
-        $labels['Category.ID'] = _t('ProductPage.IDLabel', 'Category');
-        $labels['Category.Title'] = _t('ProductPage.CategoryTitleLabel', 'Category');
-        $labels['Image.CMSThumbnail'] = _t('ProductPage.ImageLabel', 'Image');
-
-        return $labels;
-    }
-
-    /**
-     * @return \SilverStripe\Forms\FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Cateogry Dropdown field w/ add new
-            $source = function () {
-                return ProductCategory::get()->map()->toArray();
-            };
-            $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
-                ->setEmptyString('')
-                ->setDescription(_t(
-                    'ProductPage.CategoryDescription',
-                    'Required, must also exist in 
+	/**
+	 * @var string
+	 */
+	private static $default_parent = ProductHolder::class;
+
+	/**
+	 * @var bool
+	 */
+	private static $can_be_root = false;
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Price' => 'Currency',
+		'Weight' => 'Decimal',
+		'Code' => 'Varchar(100)',
+		'ReceiptTitle' => 'HTMLVarchar(255)',
+		'Available' => 'Boolean',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Category' => ProductCategory::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $has_many = [
+		'ProductOptions' => OptionItem::class,
+		'OrderDetails' => OrderDetail::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = [
+		'Images' => Image::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $many_many_extraFields = [
+		'Images' => [
+			'SortOrder' => 'Int',
+		],
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $owns = [
+		'Images',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $belongs_many_many = [
+		'ProductHolders' => ProductHolder::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Product';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Products';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'A product that can be added to the shopping cart';
+
+	/**
+	 * @var array
+	 */
+	private static $indexes = [
+		'Code' => [
+			'type' => 'unique',
+			'columns' => ['Code'],
+		],
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $defaults = [
+		'ShowInMenus' => false,
+		'Available' => true,
+		'Weight' => '0.0',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'Image.CMSThumbnail',
+		'Title',
+		'Code',
+		'Price.Nice',
+		'Category.Title',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'Title',
+		'Code',
+		'Available',
+		'Category.ID',
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'ProductPage';
+
+	/**
+	 * Construct a new ProductPage.
+	 *
+	 * @param array|null $record Used internally for rehydrating an object from database content.
+	 *                           Bypasses setters on this class, and hence should not be used
+	 *                           for populating data on new records.
+	 * @param boolean $isSingleton This this to true if this is a singleton() object, a stub for calling methods.
+	 *                             Singletons don't have their defaults set.
+	 * @param array $queryParams List of DataQuery params necessary to lazy load, or load related objects.
+	 */
+	public function __construct($record = null, $isSingleton = false, $queryParams = [])
+	{
+		parent::__construct($record, $isSingleton, $queryParams);
+
+		if (Controller::has_curr()) {
+			if (Controller::curr() instanceof ContentController) {
+				Requirements::javascript('dynamic/foxystripe: javascript/quantity.js');
+				Requirements::css('dynamic/foxystripe: client/dist/css/quantityfield.css');
+			}
+		}
+	}
+
+	/**
+	 * @param bool $includerelations
+	 *
+	 * @return array
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels();
+
+		$labels['Title'] = _t('ProductPage.TitleLabel', 'Name');
+		$labels['Code'] = _t('ProductPage.CodeLabel', 'Code');
+		$labels['Price.Nice'] = _t('ProductPage.PriceLabel', 'Price');
+		$labels['Available.Nice'] = _t('ProductPage.AvailableLabel', 'Available');
+		$labels['Category.ID'] = _t('ProductPage.IDLabel', 'Category');
+		$labels['Category.Title'] = _t('ProductPage.CategoryTitleLabel', 'Category');
+		$labels['Image.CMSThumbnail'] = _t('ProductPage.ImageLabel', 'Image');
+
+		return $labels;
+	}
+
+	/**
+	 * @return \SilverStripe\Forms\FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Cateogry Dropdown field w/ add new
+			$source = function () {
+				return ProductCategory::get()->map()->toArray();
+			};
+			$catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
+				->setEmptyString('')
+				->setDescription(_t(
+					'ProductPage.CategoryDescription',
+					'Required, must also exist in 
                     <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">
                         FoxyCart Categories
                     </a>.
@@ -246,119 +246,119 @@ 
                         <a href="admin/settings">
                             Settings > FoxyStripe > Categories
                         </a>'
-                ));
-            if (class_exists('QuickAddNewExtension')) {
-                $catField->useAddNew('ProductCategory', $source);
-            }
-
-            $fields->addFieldsToTab(
-                'Root.Main',
-                [
-                    TextField::create('Code')
-                        ->setTitle(_t('ProductPage.Code', 'Product Code'))
-                        ->setDescription(_t(
-                            'ProductPage.CodeDescription',
-                            'Required, must be unique. Product identifier used by FoxyCart in transactions'
-                        )),
-                    CurrencyField::create('Price')
-                        ->setTitle(_t('ProductPage.Price', 'Price'))
-                        ->setDescription(_t(
-                            'ProductPage.PriceDescription',
-                            'Base price for this product. Can be modified using Product Options'
-                        )),
-                    NumericField::create('Weight')
-                        ->setTitle(_t('ProductPage.Weight', 'Weight'))
-                        ->setDescription(_t(
-                            'ProductPage.WeightDescription',
-                            'Base weight for this product in lbs. Can be modified using Product Options'
-                        ))
-                        ->setScale(2),
-                    $catField,
-                ],
-                'Content'
-            );
-
-            // Product Options field
-            $config = GridFieldConfig_RelationEditor::create();
-            $config->addComponent(new GridFieldOrderableRows('SortOrder'));
-            $products = $this->ProductOptions()->sort('SortOrder');
-            $config->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $prodOptField = GridField::create(
-                'ProductOptions',
-                _t('ProductPage.ProductOptions', 'Options'),
-                $products,
-                $config
-            );
-
-            // Details tab
-            $fields->addFieldsToTab('Root.Details', [
-                CheckboxField::create('Available')
-                    ->setTitle(_t('ProductPage.Available', 'Available for purchase'))
-                    ->setDescription(_t(
-                        'ProductPage.AvailableDescription',
-                        'If unchecked, will remove "Add to Cart" form and instead display "Currently unavailable"'
-                    )),
-                TextField::create('ReceiptTitle')
-                    ->setTitle(_t('ProductPage.ReceiptTitle', 'Product Title for Receipt'))
-                    ->setDescription(_t(
-                        'ProductPage.ReceiptTitleDescription',
-                        'Optional'
-                    )),
-            ]);
-
-            // Options Tab
-            $fields->addFieldsToTab('Root.Options', [
-                $prodOptField
-                    ->setDescription(_t(
-                        'Page.OptionsDescrip',
-                        '<p>Product Options allow products to be customized by attributes such as size or color.
+				));
+			if (class_exists('QuickAddNewExtension')) {
+				$catField->useAddNew('ProductCategory', $source);
+			}
+
+			$fields->addFieldsToTab(
+				'Root.Main',
+				[
+					TextField::create('Code')
+						->setTitle(_t('ProductPage.Code', 'Product Code'))
+						->setDescription(_t(
+							'ProductPage.CodeDescription',
+							'Required, must be unique. Product identifier used by FoxyCart in transactions'
+						)),
+					CurrencyField::create('Price')
+						->setTitle(_t('ProductPage.Price', 'Price'))
+						->setDescription(_t(
+							'ProductPage.PriceDescription',
+							'Base price for this product. Can be modified using Product Options'
+						)),
+					NumericField::create('Weight')
+						->setTitle(_t('ProductPage.Weight', 'Weight'))
+						->setDescription(_t(
+							'ProductPage.WeightDescription',
+							'Base weight for this product in lbs. Can be modified using Product Options'
+						))
+						->setScale(2),
+					$catField,
+				],
+				'Content'
+			);
+
+			// Product Options field
+			$config = GridFieldConfig_RelationEditor::create();
+			$config->addComponent(new GridFieldOrderableRows('SortOrder'));
+			$products = $this->ProductOptions()->sort('SortOrder');
+			$config->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$prodOptField = GridField::create(
+				'ProductOptions',
+				_t('ProductPage.ProductOptions', 'Options'),
+				$products,
+				$config
+			);
+
+			// Details tab
+			$fields->addFieldsToTab('Root.Details', [
+				CheckboxField::create('Available')
+					->setTitle(_t('ProductPage.Available', 'Available for purchase'))
+					->setDescription(_t(
+						'ProductPage.AvailableDescription',
+						'If unchecked, will remove "Add to Cart" form and instead display "Currently unavailable"'
+					)),
+				TextField::create('ReceiptTitle')
+					->setTitle(_t('ProductPage.ReceiptTitle', 'Product Title for Receipt'))
+					->setDescription(_t(
+						'ProductPage.ReceiptTitleDescription',
+						'Optional'
+					)),
+			]);
+
+			// Options Tab
+			$fields->addFieldsToTab('Root.Options', [
+				$prodOptField
+					->setDescription(_t(
+						'Page.OptionsDescrip',
+						'<p>Product Options allow products to be customized by attributes such as size or color.
                     Options can also modify the product\'s price, weight or code.<br></p>'
-                    )),
-            ]);
-
-            // Images tab
-            $images = SortableUploadField::create('Images')
-                ->setSortColumn('SortOrder')
-                ->setIsMultiUpload(true)
-                ->setAllowedFileCategories('image')
-                ->setFolderName('Uploads/Products/Images');
-
-            $fields->addFieldsToTab('Root.Images', [
-                $images,
-            ]);
-
-            if (FoxyCart::store_name_warning() !== null) {
-                $fields->addFieldToTab('Root.Main', LiteralField::create('StoreSubDomainHeaderWarning', _t(
-                    'ProductPage.StoreSubDomainHeaderWarning',
-                    '<p class="message error">Store sub-domain must be entered in the 
+					)),
+			]);
+
+			// Images tab
+			$images = SortableUploadField::create('Images')
+				->setSortColumn('SortOrder')
+				->setIsMultiUpload(true)
+				->setAllowedFileCategories('image')
+				->setFolderName('Uploads/Products/Images');
+
+			$fields->addFieldsToTab('Root.Images', [
+				$images,
+			]);
+
+			if (FoxyCart::store_name_warning() !== null) {
+				$fields->addFieldToTab('Root.Main', LiteralField::create('StoreSubDomainHeaderWarning', _t(
+					'ProductPage.StoreSubDomainHeaderWarning',
+					'<p class="message error">Store sub-domain must be entered in the 
                         <a href="/admin/settings/">site settings</a></p>'
-                )), 'Title');
-            }
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @return RequiredFields
-     */
-    public function getCMSValidator()
-    {
-        return new RequiredFields(['CategoryID', 'Price', 'Weight', 'Code']);
-    }
-
-    /**
-     * @return \SilverStripe\ORM\ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        if (ProductPage::get()->filter('Code', $this->Code)->exclude('ID', $this->ID)->first()) {
-            $result->addError('Code must be unique for each product.');
-        }
-
-        /*if($this->ID>0){
+				)), 'Title');
+			}
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @return RequiredFields
+	 */
+	public function getCMSValidator()
+	{
+		return new RequiredFields(['CategoryID', 'Price', 'Weight', 'Code']);
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		if (ProductPage::get()->filter('Code', $this->Code)->exclude('ID', $this->ID)->first()) {
+			$result->addError('Code must be unique for each product.');
+		}
+
+		/*if($this->ID>0){
             if ($this->Price <= 0) {
                 $result->addError('Price must be a positive value');
             }
@@ -370,173 +370,173 @@ 
             }
         }*/
 
-        return $result;
-    }
-
-    /**
-     * @return \SilverStripe\ORM\ManyManyList
-     */
-    public function getSortedImages()
-    {
-        return $this->Images()->Sort('SortOrder');
-    }
-
-    /**
-     * @return \SilverStripe\ORM\ManyManyList
-     */
-    public function SortedImages()
-    {
-        return $this->getSortedImages();
-    }
-
-    /**
-     * @return Image|bool
-     */
-    public function getImage()
-    {
-        if ($this->getSortedImages()->count() > 0) {
-            return $this->getSortedImages()->first();
-        }
-
-        return false;
-    }
-
-    /**
-     * @return Image|bool
-     */
-    public function Image()
-    {
-        return $this->getImage();
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
-        if (!$this->CategoryID) {
-            $default = ProductCategory::get()->filter(['Code' => 'DEFAULT'])->first();
-            $this->CategoryID = $default->ID;
-        }
-
-        //update many_many lists when multi-group is on
-        if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
-            $holders = $this->ProductHolders();
-            $product = self::get()->byID($this->ID);
-            if (isset($product->ParentID)) {
-                $origParent = $product->ParentID;
-            } else {
-                $origParent = null;
-            }
-            $currentParent = $this->ParentID;
-            if ($origParent != $currentParent) {
-                if ($holders->find('ID', $origParent)) {
-                    $holders->removeByID($origParent);
-                }
-            }
-            $holders->add($currentParent);
-        }
-
-        $this->Title = trim($this->Title);
-        $this->Code = trim($this->Code);
-        $this->ReceiptTitle = trim($this->ReceiptTitle);
-    }
-
-    public function onAfterWrite()
-    {
-        parent::onAfterWrite();
-    }
-
-    public function onBeforeDelete()
-    {
-        if ($this->Status != 'Published') {
-            if ($this->ProductOptions()) {
-                $options = $this->getComponents('ProductOptions');
-                foreach ($options as $option) {
-                    $option->delete();
-                }
-            }
-        }
-        parent::onBeforeDelete();
-    }
-
-    /**
-     * @param null $productCode
-     * @param null $optionName
-     * @param null $optionValue
-     * @param string $method
-     * @param bool $output
-     * @param bool $urlEncode
-     *
-     * @return null|string
-     */
-    public static function getGeneratedValue(
-        $productCode = null,
-        $optionName = null,
-        $optionValue = null,
-        $method = 'name',
-        $output = false,
-        $urlEncode = false
-    ) {
-        $optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
-
-        return (FoxyStripeSetting::current_foxystripe_setting()->CartValidation)
-            ? \FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) :
-            $optionValue;
-    }
-
-    /**
-     * @param Member $member
-     *
-     * @return bool
-     */
-    public function canEdit($member = null)
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    public function canDelete($member = null)
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    public function canPublish($member = null)
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    public function providePermissions()
-    {
-        return [
-            'Product_CANCRUD' => 'Allow user to manage Products and related objects',
-        ];
-    }
-
-    /**
-     * @return bool
-     */
-    public function getIsAvailable()
-    {
-        if (!$this->Available) {
-            return false;
-        }
-
-        if (!$this->ProductOptions()->exists()) {
-            return true;
-        }
-
-        foreach ($this->ProductOptions() as $option) {
-            if ($option->Available) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+		return $result;
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\ManyManyList
+	 */
+	public function getSortedImages()
+	{
+		return $this->Images()->Sort('SortOrder');
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\ManyManyList
+	 */
+	public function SortedImages()
+	{
+		return $this->getSortedImages();
+	}
+
+	/**
+	 * @return Image|bool
+	 */
+	public function getImage()
+	{
+		if ($this->getSortedImages()->count() > 0) {
+			return $this->getSortedImages()->first();
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return Image|bool
+	 */
+	public function Image()
+	{
+		return $this->getImage();
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
+		if (!$this->CategoryID) {
+			$default = ProductCategory::get()->filter(['Code' => 'DEFAULT'])->first();
+			$this->CategoryID = $default->ID;
+		}
+
+		//update many_many lists when multi-group is on
+		if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
+			$holders = $this->ProductHolders();
+			$product = self::get()->byID($this->ID);
+			if (isset($product->ParentID)) {
+				$origParent = $product->ParentID;
+			} else {
+				$origParent = null;
+			}
+			$currentParent = $this->ParentID;
+			if ($origParent != $currentParent) {
+				if ($holders->find('ID', $origParent)) {
+					$holders->removeByID($origParent);
+				}
+			}
+			$holders->add($currentParent);
+		}
+
+		$this->Title = trim($this->Title);
+		$this->Code = trim($this->Code);
+		$this->ReceiptTitle = trim($this->ReceiptTitle);
+	}
+
+	public function onAfterWrite()
+	{
+		parent::onAfterWrite();
+	}
+
+	public function onBeforeDelete()
+	{
+		if ($this->Status != 'Published') {
+			if ($this->ProductOptions()) {
+				$options = $this->getComponents('ProductOptions');
+				foreach ($options as $option) {
+					$option->delete();
+				}
+			}
+		}
+		parent::onBeforeDelete();
+	}
+
+	/**
+	 * @param null $productCode
+	 * @param null $optionName
+	 * @param null $optionValue
+	 * @param string $method
+	 * @param bool $output
+	 * @param bool $urlEncode
+	 *
+	 * @return null|string
+	 */
+	public static function getGeneratedValue(
+		$productCode = null,
+		$optionName = null,
+		$optionValue = null,
+		$method = 'name',
+		$output = false,
+		$urlEncode = false
+	) {
+		$optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
+
+		return (FoxyStripeSetting::current_foxystripe_setting()->CartValidation)
+			? \FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) :
+			$optionValue;
+	}
+
+	/**
+	 * @param Member $member
+	 *
+	 * @return bool
+	 */
+	public function canEdit($member = null)
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	public function canDelete($member = null)
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	public function canPublish($member = null)
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	public function providePermissions()
+	{
+		return [
+			'Product_CANCRUD' => 'Allow user to manage Products and related objects',
+		];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getIsAvailable()
+	{
+		if (!$this->Available) {
+			return false;
+		}
+
+		if (!$this->ProductOptions()->exists()) {
+			return true;
+		}
+
+		foreach ($this->ProductOptions() as $option) {
+			if ($option->Available) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }