dynamic / foxystripe

src/Form/QuantityField.php

Indentation +46 added lines, -46 removed lines

@@ -15,60 +15,60 @@
  */
 class QuantityField extends NumericField
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'newvalue',
-    ];
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = [
+		'newvalue',
+	];
 
-    /**
-     * @param array $properties
-     * @return string
-     */
-    public function Field($properties = [])
-    {
-        //Requirements::javascript('dynamic/foxystripe: javascript/quantity.js');
-        //Requirements::css('dynamic/foxystripe: client/dist/css/quantityfield.css');
+	/**
+	 * @param array $properties
+	 * @return string
+	 */
+	public function Field($properties = [])
+	{
+		//Requirements::javascript('dynamic/foxystripe: javascript/quantity.js');
+		//Requirements::css('dynamic/foxystripe: client/dist/css/quantityfield.css');
 
 
-        $this->setAttribute('data-link', $this->Link('newvalue'));
-        $this->setAttribute('data-code', $this->getProduct()->Code);
-        $this->setAttribute('data-id', $this->getProduct()->ID);
+		$this->setAttribute('data-link', $this->Link('newvalue'));
+		$this->setAttribute('data-code', $this->getProduct()->Code);
+		$this->setAttribute('data-id', $this->getProduct()->ID);
 
-        return parent::Field($properties);
-    }
+		return parent::Field($properties);
+	}
 
-    /**
-     * @return ProductPage
-     */
-    public function getProduct()
-    {
-        return $this->getForm()->getProduct();
-    }
+	/**
+	 * @return ProductPage
+	 */
+	public function getProduct()
+	{
+		return $this->getForm()->getProduct();
+	}
 
-    /**
-     * @param SS_HTTPRequest $request
-     * @return bool|string
-     */
-    public function newvalue(HTTPRequest $request)
-    {
-        if (!$value = $request->getVar('value')) {
-            return '';
-        }
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return bool|string
+	 */
+	public function newvalue(HTTPRequest $request)
+	{
+		if (!$value = $request->getVar('value')) {
+			return '';
+		}
 
-        if (!$code = $request->getVar('code')) {
-            return '';
-        }
+		if (!$code = $request->getVar('code')) {
+			return '';
+		}
 
-        $this->extend('updateQuantity', $value);
+		$this->extend('updateQuantity', $value);
 
-        $data = array(
-            'quantity' => $value,
-            'quantityGenerated' => ProductPage::getGeneratedValue($code, 'quantity', $value, 'value'),
-        );
+		$data = array(
+			'quantity' => $value,
+			'quantityGenerated' => ProductPage::getGeneratedValue($code, 'quantity', $value, 'value'),
+		);
 
-        $this->extend('updateData', $data);
-        return json_encode($data);
-    }
+		$this->extend('updateData', $data);
+		return json_encode($data);
+	}
 }

src/Controller/FoxyStripeController.php

Indentation +313 added lines, -313 removed lines

@@ -13,319 +13,319 @@
 
 class FoxyStripeController extends \PageController
 {
-    /**
-     *
-     */
-    const URLSEGMENT = 'foxystripe';
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'index',
-        'sso',
-    );
-
-    /**
-     * @return string
-     */
-    public function getURLSegment()
-    {
-        return self::URLSEGMENT;
-    }
-
-    /**
-     * @return string
-     *
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function index()
-    {
-        // handle POST from FoxyCart API transaction
-        if ((isset($_POST['FoxyData']) or isset($_POST['FoxySubscriptionData']))) {
-            $FoxyData_encrypted = (isset($_POST['FoxyData'])) ?
-                urldecode($_POST['FoxyData']) :
-                urldecode($_POST['FoxySubscriptionData']);
-            $FoxyData_decrypted = \rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
-
-            // parse the response and save the order
-            self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
-
-            // extend to allow for additional integrations with Datafeed
-            $this->extend('addIntegrations', $FoxyData_encrypted);
-
-            return 'foxy';
-        } else {
-            return 'No FoxyData or FoxySubscriptionData received.';
-        }
-    }
-
-    /**
-     * @param $encrypted
-     * @param $decrypted
-     *
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function handleDataFeed($encrypted, $decrypted)
-    {
-        $orders = new \SimpleXMLElement($decrypted);
-
-        // loop over each transaction to find FoxyCart Order ID
-        foreach ($orders->transactions->transaction as $transaction) {
-            // if FoxyCart order id, then parse order
-            if (isset($transaction->id)) {
-                $order = Order::get()->filter('Order_ID', (int)$transaction->id)->First();
-                if (!$order) {
-                    $order = Order::create();
-                }
-
-                // save base order info
-                $order->Order_ID = (int)$transaction->id;
-                $order->Response = urlencode($encrypted);
-                // first write needed otherwise it creates a duplicates
-                $order->write();
-                $this->parseOrder($orders, $order);
-                $order->write();
-            }
-        }
-    }
-
-    /**
-     * @param array $transactions
-     * @param Order $order
-     */
-    public function parseOrder($transactions, $order)
-    {
-        $this->parseOrderInfo($transactions, $order);
-        $this->parseOrderCustomer($transactions, $order);
-        $this->parseOrderDetails($transactions, $order);
-    }
-
-    /**
-     * @param array $orders
-     * @param Order $transaction
-     */
-    public function parseOrderInfo($orders, $transaction)
-    {
-        foreach ($orders->transactions->transaction as $order) {
-            // Record transaction data from FoxyCart Datafeed:
-            $transaction->Store_ID = (int)$order->store_id;
-            $transaction->TransactionDate = (string)$order->transaction_date;
-            $transaction->ProductTotal = (float)$order->product_total;
-            $transaction->TaxTotal = (float)$order->tax_total;
-            $transaction->ShippingTotal = (float)$order->shipping_total;
-            $transaction->OrderTotal = (float)$order->order_total;
-            $transaction->ReceiptURL = (string)$order->receipt_url;
-            $transaction->OrderStatus = (string)$order->status;
-        }
-    }
-
-    /**
-     * @param array $orders
-     * @param Order $transaction
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function parseOrderCustomer($orders, $transaction)
-    {
-        foreach ($orders->transactions->transaction as $order) {
-            if (!isset($order->customer_email) || $order->is_anonymous != 0) {
-                continue;
-            }
-
-            // if Customer is existing member, associate with current order
-            if (Member::get()->filter('Email', $order->customer_email)->First()) {
-                $customer = Member::get()->filter('Email', $order->customer_email)->First();
-                /* todo: make sure local password is updated if changed on FoxyCart
+	/**
+	 *
+	 */
+	const URLSEGMENT = 'foxystripe';
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'index',
+		'sso',
+	);
+
+	/**
+	 * @return string
+	 */
+	public function getURLSegment()
+	{
+		return self::URLSEGMENT;
+	}
+
+	/**
+	 * @return string
+	 *
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function index()
+	{
+		// handle POST from FoxyCart API transaction
+		if ((isset($_POST['FoxyData']) or isset($_POST['FoxySubscriptionData']))) {
+			$FoxyData_encrypted = (isset($_POST['FoxyData'])) ?
+				urldecode($_POST['FoxyData']) :
+				urldecode($_POST['FoxySubscriptionData']);
+			$FoxyData_decrypted = \rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
+
+			// parse the response and save the order
+			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
+
+			// extend to allow for additional integrations with Datafeed
+			$this->extend('addIntegrations', $FoxyData_encrypted);
+
+			return 'foxy';
+		} else {
+			return 'No FoxyData or FoxySubscriptionData received.';
+		}
+	}
+
+	/**
+	 * @param $encrypted
+	 * @param $decrypted
+	 *
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function handleDataFeed($encrypted, $decrypted)
+	{
+		$orders = new \SimpleXMLElement($decrypted);
+
+		// loop over each transaction to find FoxyCart Order ID
+		foreach ($orders->transactions->transaction as $transaction) {
+			// if FoxyCart order id, then parse order
+			if (isset($transaction->id)) {
+				$order = Order::get()->filter('Order_ID', (int)$transaction->id)->First();
+				if (!$order) {
+					$order = Order::create();
+				}
+
+				// save base order info
+				$order->Order_ID = (int)$transaction->id;
+				$order->Response = urlencode($encrypted);
+				// first write needed otherwise it creates a duplicates
+				$order->write();
+				$this->parseOrder($orders, $order);
+				$order->write();
+			}
+		}
+	}
+
+	/**
+	 * @param array $transactions
+	 * @param Order $order
+	 */
+	public function parseOrder($transactions, $order)
+	{
+		$this->parseOrderInfo($transactions, $order);
+		$this->parseOrderCustomer($transactions, $order);
+		$this->parseOrderDetails($transactions, $order);
+	}
+
+	/**
+	 * @param array $orders
+	 * @param Order $transaction
+	 */
+	public function parseOrderInfo($orders, $transaction)
+	{
+		foreach ($orders->transactions->transaction as $order) {
+			// Record transaction data from FoxyCart Datafeed:
+			$transaction->Store_ID = (int)$order->store_id;
+			$transaction->TransactionDate = (string)$order->transaction_date;
+			$transaction->ProductTotal = (float)$order->product_total;
+			$transaction->TaxTotal = (float)$order->tax_total;
+			$transaction->ShippingTotal = (float)$order->shipping_total;
+			$transaction->OrderTotal = (float)$order->order_total;
+			$transaction->ReceiptURL = (string)$order->receipt_url;
+			$transaction->OrderStatus = (string)$order->status;
+		}
+	}
+
+	/**
+	 * @param array $orders
+	 * @param Order $transaction
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function parseOrderCustomer($orders, $transaction)
+	{
+		foreach ($orders->transactions->transaction as $order) {
+			if (!isset($order->customer_email) || $order->is_anonymous != 0) {
+				continue;
+			}
+
+			// if Customer is existing member, associate with current order
+			if (Member::get()->filter('Email', $order->customer_email)->First()) {
+				$customer = Member::get()->filter('Email', $order->customer_email)->First();
+				/* todo: make sure local password is updated if changed on FoxyCart
                 $this->updatePasswordFromData($customer, $order);
                 */
-            } else {
-                // create new Member, set password info from FoxyCart
-                $customer = Member::create();
-                $customer->Customer_ID = (int)$order->customer_id;
-                $customer->FirstName = (string)$order->customer_first_name;
-                $customer->Surname = (string)$order->customer_last_name;
-                $customer->Email = (string)$order->customer_email;
-                $this->updatePasswordFromData($customer, $order);
-            }
-            $customer->write();
-            // set Order MemberID
-            $transaction->MemberID = $customer->ID;
-        }
-    }
-
-    /**
-     * Updates a customer's password. Sets password encryption to 'none' to avoid encryting it again.
-     *
-     * @param Member $customer
-     * @param $order
-     */
-    public function updatePasswordFromData($customer, $order)
-    {
-        $password_encryption_algorithm = Security::config()->get('password_encryption_algorithm');
-        Security::config()->update('password_encryption_algorithm', 'none');
-
-        $customer->PasswordEncryption = 'none';
-        $customer->Password = (string) $order->customer_password;
-        $customer->write();
-
-        $customer->PasswordEncryption = $this->getEncryption((string) $order->customer_password_hash_type);
-        $customer->Salt = (string) $order->customer_password_salt;
-
-        Security::config()->update('password_encryption_algorithm', $password_encryption_algorithm);
-    }
-
-    /**
-     * @param string $hashType
-     * @return string
-     */
-    private function getEncryption($hashType)
-    {
-        // TODO - update this with new/correct types
-        switch (true) {
-            case stristr($hashType, 'sha1'):
-                return 'sha1_v2.4';
-            case stristr($hashType, 'sha256'):
-                return 'sha256';
-            case stristr($hashType, 'md5'):
-                return 'md5';
-            case stristr($hashType, 'bcrypt'):
-                return 'bcrypt';
-            default:
-                return 'none';
-        }
-    }
-
-    /**
-     * @param array $orders
-     * @param Order $transaction
-     */
-    public function parseOrderDetails($orders, $transaction)
-    {
-        // remove previous OrderDetails so we don't end up with duplicates
-        foreach ($transaction->Details() as $detail) {
-            $detail->delete();
-        }
-
-        foreach ($orders->transactions->transaction as $order) {
-            // Associate ProductPages, Options, Quanity with Order
-            foreach ($order->transaction_details->transaction_detail as $product) {
-                $this->orderDetailFromProduct($product, $transaction);
-            }
-        }
-    }
-
-    /**
-     * @param $product
-     * @param $transaction
-     */
-    public function orderDetailFromProduct($product, $transaction)
-    {
-        $OrderDetail = OrderDetail::create();
-        $OrderDetail->Quantity = (int)$product->product_quantity;
-        $OrderDetail->Price = (float)$product->product_price;
-        // Find product via product_id custom variable
-
-        foreach ($this->getTransactionOptions($product) as $productID) {
-            $productPage = $this->getProductPage($product);
-            $this->modifyOrderDetailPrice($productPage, $OrderDetail, $product);
-            // associate with this order
-            $OrderDetail->OrderID = $transaction->ID;
-            // extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
-            $this->extend('handleOrderItem', $decrypted, $product, $OrderDetail);
-            // write
-            $OrderDetail->write();
-        }
-    }
-
-    /**
-     * @param $product
-     * @return \Generator
-     */
-    public function getTransactionOptions($product)
-    {
-        foreach ($product->transaction_detail_options->transaction_detail_option as $productOption) {
-            yield $productOption;
-        }
-    }
-
-    /**
-     * @param $product
-     * @return bool|ProductPage
-     */
-    public function getProductPage($product)
-    {
-        foreach ($this->getTransactionOptions($product) as $productOptions) {
-            if ($productOptions->product_option_name != 'product_id') {
-                continue;
-            }
-
-            return ProductPage::get()
-                ->filter('ID', (int) $productOptions->product_option_value)
-                ->First();
-        }
-    }
-
-    /**
-     * @param bool|ProductPage $OrderProduct
-     * @param OrderDetail $OrderDetail
-     */
-    public function modifyOrderDetailPrice($OrderProduct, $OrderDetail, $product)
-    {
-        if (!$OrderProduct) {
-            return;
-        }
-
-        $OrderDetail->ProductID = $OrderProduct->ID;
-
-        foreach ($this->getTransactionOptions($product) as $option) {
-            $OptionItem = OptionItem::get()->filter(array(
-                'ProductID' => (string)$OrderProduct->ID,
-                'Title' => (string)$option->product_option_value
-            ))->First();
-
-            if (!$OptionItem) {
-                continue;
-            }
-
-            $OrderDetail->OptionItems()->add($OptionItem);
-            // modify product price
-            if ($priceMod = $option->price_mod) {
-                $OrderDetail->Price += $priceMod;
-            }
-        }
-    }
-
-    /**
-     * Single Sign on integration with FoxyCart.
-     */
-    public function sso()
-    {
-
-        // GET variables from FoxyCart Request
-        $fcsid = $this->request->getVar('fcsid');
-        $timestampNew = strtotime('+30 days');
-
-        // get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
-        // fake user will redirect to FC checkout, ask customer to log in
-        // to do: consider a login/registration form here if not logged in
-        if ($Member = Security::getCurrentUser()) {
-            $Member = Security::getCurrentUser();
-        } else {
-            $Member = new Member();
-            $Member->Customer_ID = 0;
-        }
-
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
-
-        $config = FoxyStripeSetting::current_foxystripe_setting();
-        if ($config->CustomSSL) {
-            $link = FoxyCart::getFoxyCartStoreName();
-        } else {
-            $link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com';
-        }
-
-        $redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid.
-            '&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
-
-        $this->redirect($redirect_complete);
-    }
+			} else {
+				// create new Member, set password info from FoxyCart
+				$customer = Member::create();
+				$customer->Customer_ID = (int)$order->customer_id;
+				$customer->FirstName = (string)$order->customer_first_name;
+				$customer->Surname = (string)$order->customer_last_name;
+				$customer->Email = (string)$order->customer_email;
+				$this->updatePasswordFromData($customer, $order);
+			}
+			$customer->write();
+			// set Order MemberID
+			$transaction->MemberID = $customer->ID;
+		}
+	}
+
+	/**
+	 * Updates a customer's password. Sets password encryption to 'none' to avoid encryting it again.
+	 *
+	 * @param Member $customer
+	 * @param $order
+	 */
+	public function updatePasswordFromData($customer, $order)
+	{
+		$password_encryption_algorithm = Security::config()->get('password_encryption_algorithm');
+		Security::config()->update('password_encryption_algorithm', 'none');
+
+		$customer->PasswordEncryption = 'none';
+		$customer->Password = (string) $order->customer_password;
+		$customer->write();
+
+		$customer->PasswordEncryption = $this->getEncryption((string) $order->customer_password_hash_type);
+		$customer->Salt = (string) $order->customer_password_salt;
+
+		Security::config()->update('password_encryption_algorithm', $password_encryption_algorithm);
+	}
+
+	/**
+	 * @param string $hashType
+	 * @return string
+	 */
+	private function getEncryption($hashType)
+	{
+		// TODO - update this with new/correct types
+		switch (true) {
+			case stristr($hashType, 'sha1'):
+				return 'sha1_v2.4';
+			case stristr($hashType, 'sha256'):
+				return 'sha256';
+			case stristr($hashType, 'md5'):
+				return 'md5';
+			case stristr($hashType, 'bcrypt'):
+				return 'bcrypt';
+			default:
+				return 'none';
+		}
+	}
+
+	/**
+	 * @param array $orders
+	 * @param Order $transaction
+	 */
+	public function parseOrderDetails($orders, $transaction)
+	{
+		// remove previous OrderDetails so we don't end up with duplicates
+		foreach ($transaction->Details() as $detail) {
+			$detail->delete();
+		}
+
+		foreach ($orders->transactions->transaction as $order) {
+			// Associate ProductPages, Options, Quanity with Order
+			foreach ($order->transaction_details->transaction_detail as $product) {
+				$this->orderDetailFromProduct($product, $transaction);
+			}
+		}
+	}
+
+	/**
+	 * @param $product
+	 * @param $transaction
+	 */
+	public function orderDetailFromProduct($product, $transaction)
+	{
+		$OrderDetail = OrderDetail::create();
+		$OrderDetail->Quantity = (int)$product->product_quantity;
+		$OrderDetail->Price = (float)$product->product_price;
+		// Find product via product_id custom variable
+
+		foreach ($this->getTransactionOptions($product) as $productID) {
+			$productPage = $this->getProductPage($product);
+			$this->modifyOrderDetailPrice($productPage, $OrderDetail, $product);
+			// associate with this order
+			$OrderDetail->OrderID = $transaction->ID;
+			// extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
+			$this->extend('handleOrderItem', $decrypted, $product, $OrderDetail);
+			// write
+			$OrderDetail->write();
+		}
+	}
+
+	/**
+	 * @param $product
+	 * @return \Generator
+	 */
+	public function getTransactionOptions($product)
+	{
+		foreach ($product->transaction_detail_options->transaction_detail_option as $productOption) {
+			yield $productOption;
+		}
+	}
+
+	/**
+	 * @param $product
+	 * @return bool|ProductPage
+	 */
+	public function getProductPage($product)
+	{
+		foreach ($this->getTransactionOptions($product) as $productOptions) {
+			if ($productOptions->product_option_name != 'product_id') {
+				continue;
+			}
+
+			return ProductPage::get()
+				->filter('ID', (int) $productOptions->product_option_value)
+				->First();
+		}
+	}
+
+	/**
+	 * @param bool|ProductPage $OrderProduct
+	 * @param OrderDetail $OrderDetail
+	 */
+	public function modifyOrderDetailPrice($OrderProduct, $OrderDetail, $product)
+	{
+		if (!$OrderProduct) {
+			return;
+		}
+
+		$OrderDetail->ProductID = $OrderProduct->ID;
+
+		foreach ($this->getTransactionOptions($product) as $option) {
+			$OptionItem = OptionItem::get()->filter(array(
+				'ProductID' => (string)$OrderProduct->ID,
+				'Title' => (string)$option->product_option_value
+			))->First();
+
+			if (!$OptionItem) {
+				continue;
+			}
+
+			$OrderDetail->OptionItems()->add($OptionItem);
+			// modify product price
+			if ($priceMod = $option->price_mod) {
+				$OrderDetail->Price += $priceMod;
+			}
+		}
+	}
+
+	/**
+	 * Single Sign on integration with FoxyCart.
+	 */
+	public function sso()
+	{
+
+		// GET variables from FoxyCart Request
+		$fcsid = $this->request->getVar('fcsid');
+		$timestampNew = strtotime('+30 days');
+
+		// get current member if logged in. If not, create a 'fake' user with Customer_ID = 0
+		// fake user will redirect to FC checkout, ask customer to log in
+		// to do: consider a login/registration form here if not logged in
+		if ($Member = Security::getCurrentUser()) {
+			$Member = Security::getCurrentUser();
+		} else {
+			$Member = new Member();
+			$Member->Customer_ID = 0;
+		}
+
+		$auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
+
+		$config = FoxyStripeSetting::current_foxystripe_setting();
+		if ($config->CustomSSL) {
+			$link = FoxyCart::getFoxyCartStoreName();
+		} else {
+			$link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com';
+		}
+
+		$redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid.
+			'&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
+
+		$this->redirect($redirect_complete);
+	}
 }

src/Controller/DonationProductController.php

Indentation +73 added lines, -73 removed lines

@@ -17,77 +17,77 @@
  */
 class DonationProductController extends ProductPageController
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'PurchaseForm',
-        'updatevalue',
-    ];
-
-    /**
-     *
-     */
-    public function init()
-    {
-        parent::init();
-        //Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-    }
-
-    /**
-     * @return FoxyStripePurchaseForm
-     */
-    public function PurchaseForm()
-    {
-        $form = parent::PurchaseForm();
-
-        $fields = $form->Fields();
-
-        $fields->dataFieldByName('price')
-            ->setAttribute('id', 'price');
-
-        $fields->insertAfter('price', $currencyField = CurrencyField::create('x:visiblePrice', 'Amount'));
-
-        $currencyField->setAttribute('id', 'visiblePrice');
-
-        $fields->removeByName([
-            'x:visibleQuantity',
-            ProductPage::getGeneratedValue($this->Code, 'weight', $this->Weight),
-        ]);
-
-        if (FoxyStripeSetting::current_foxystripe_setting()->CartValidation) {
-            Requirements::javascript("silverstripe/userforms:client/dist/js/jquery-validation/jquery.validate.min.js");
-            Requirements::javascriptTemplate('_resources/vendor/dynamic/foxystripe/javascript/donationProduct.js', [
-                'Trigger' => (string)$currencyField->getAttribute('id'),
-                'UpdateURL' => Director::absoluteURL($this->Link('updatevalue')),
-            ]);
-        }
-
-        $form->setAttribute('data-updateurl', $this->Link('updatevalue'));
-
-        return $form;
-    }
-
-    /**
-     * create new encrypted price value based on user input.
-     *
-     * @param $request
-     *
-     * @return string|\SilverStripe\Control\HTTPResponse
-     */
-    public function updatevalue(\SilverStripe\Control\HTTPRequest $request)
-    {
-        if ($request->getVar('Price') && FoxyStripeSetting::current_foxystripe_setting()->CartValidation) {
-            $price = $request->getVar('Price');
-            $signedPrice = \FoxyCart_Helper::fc_hash_value($this->Code, 'price', $price, 'value', false);
-            $json = json_encode(['Price' => $signedPrice]);
-
-            $this->response->setBody($json);
-            $this->response->addHeader('Content-Type', 'application/json');
-
-            return $this->response;
-        }
-
-        return 'false';
-    }
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = [
+		'PurchaseForm',
+		'updatevalue',
+	];
+
+	/**
+	 *
+	 */
+	public function init()
+	{
+		parent::init();
+		//Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+	}
+
+	/**
+	 * @return FoxyStripePurchaseForm
+	 */
+	public function PurchaseForm()
+	{
+		$form = parent::PurchaseForm();
+
+		$fields = $form->Fields();
+
+		$fields->dataFieldByName('price')
+			->setAttribute('id', 'price');
+
+		$fields->insertAfter('price', $currencyField = CurrencyField::create('x:visiblePrice', 'Amount'));
+
+		$currencyField->setAttribute('id', 'visiblePrice');
+
+		$fields->removeByName([
+			'x:visibleQuantity',
+			ProductPage::getGeneratedValue($this->Code, 'weight', $this->Weight),
+		]);
+
+		if (FoxyStripeSetting::current_foxystripe_setting()->CartValidation) {
+			Requirements::javascript("silverstripe/userforms:client/dist/js/jquery-validation/jquery.validate.min.js");
+			Requirements::javascriptTemplate('_resources/vendor/dynamic/foxystripe/javascript/donationProduct.js', [
+				'Trigger' => (string)$currencyField->getAttribute('id'),
+				'UpdateURL' => Director::absoluteURL($this->Link('updatevalue')),
+			]);
+		}
+
+		$form->setAttribute('data-updateurl', $this->Link('updatevalue'));
+
+		return $form;
+	}
+
+	/**
+	 * create new encrypted price value based on user input.
+	 *
+	 * @param $request
+	 *
+	 * @return string|\SilverStripe\Control\HTTPResponse
+	 */
+	public function updatevalue(\SilverStripe\Control\HTTPRequest $request)
+	{
+		if ($request->getVar('Price') && FoxyStripeSetting::current_foxystripe_setting()->CartValidation) {
+			$price = $request->getVar('Price');
+			$signedPrice = \FoxyCart_Helper::fc_hash_value($this->Code, 'price', $price, 'value', false);
+			$json = json_encode(['Price' => $signedPrice]);
+
+			$this->response->setBody($json);
+			$this->response->addHeader('Content-Type', 'application/json');
+
+			return $this->response;
+		}
+
+		return 'false';
+	}
 }

src/Controller/DataTestController.php

Indentation +154 added lines, -154 removed lines

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

src/Controller/OrderHistoryPageController.php

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/Controller/ProductPageController.php

Indentation +25 added lines, -25 removed lines

@@ -13,41 +13,41 @@
  */
 class ProductPageController extends \PageController
 {
-    private static $allowed_actions = array(
-        'PurchaseForm',
-    );
-
-    public function init()
-    {
-        parent::init();
-        Requirements::javascript('silverstripe/admin: thirdparty/jquery/jquery.js');
-        if ($this->data()->Available && $this->ProductOptions()->exists()) {
-            $formName = $this->PurchaseForm()->FormName();
-            /*Requirements::javascriptTemplate(
+	private static $allowed_actions = array(
+		'PurchaseForm',
+	);
+
+	public function init()
+	{
+		parent::init();
+		Requirements::javascript('silverstripe/admin: thirdparty/jquery/jquery.js');
+		if ($this->data()->Available && $this->ProductOptions()->exists()) {
+			$formName = $this->PurchaseForm()->FormName();
+			/*Requirements::javascriptTemplate(
                 'dynamic/foxystripe: javascript/out_of_stock.js',
                 [
                     'FormName' => $formName,
                 ],
                 'foxystripe.out_of_stock'
             );*/
-            Requirements::javascript('dynamic/foxystripe: javascript/product_options.js');
-        }
+			Requirements::javascript('dynamic/foxystripe: javascript/product_options.js');
+		}
 
-        Requirements::customScript(<<<JS
+		Requirements::customScript(<<<JS
 		var productID = {$this->data()->ID};
 JS
-        );
-    }
+		);
+	}
 
-    /**
-     * @return FoxyStripePurchaseForm
-     */
-    public function PurchaseForm()
-    {
-        $form = FoxyStripePurchaseForm::create($this, __FUNCTION__, null, null, null, $this->data());
+	/**
+	 * @return FoxyStripePurchaseForm
+	 */
+	public function PurchaseForm()
+	{
+		$form = FoxyStripePurchaseForm::create($this, __FUNCTION__, null, null, null, $this->data());
 
-        $this->extend('updateFoxyStripePurchaseForm', $form);
+		$this->extend('updateFoxyStripePurchaseForm', $form);
 
-        return $form;
-    }
+		return $form;
+	}
 }

src/Admin/FoxyStripeAdmin.php

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/Admin/OrderAdmin.php

Indentation +45 added lines, -45 removed lines

@@ -10,49 +10,49 @@
 
 class OrderAdmin extends ModelAdmin
 {
-    /**
-     * @var array
-     */
-    private static $managed_models = array(
-        Order::class,
-    );
-
-    /**
-     * @var string
-     */
-    private static $url_segment = 'orders';
-
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Orders';
-
-    /**
-     * @var int
-     */
-    private static $menu_priority = 4;
-
-    /**
-     * @param null $id
-     * @param null $fields
-     *
-     * @return \SilverStripe\Forms\Form
-     */
-    public function getEditForm($id = null, $fields = null)
-    {
-        $form = parent::getEditForm($id, $fields);
-
-        $gridFieldName = $this->sanitiseClassName($this->modelClass);
-        /** @var GridField $gridField */
-        $gridField = $form->Fields()->fieldByName($gridFieldName);
-
-        // GridField configuration
-        /** @var GridFieldConfig $config */
-        $config = $gridField->getConfig();
-
-        // remove edit icon
-        $config->removeComponentsByType(GridFieldEditButton::class);
-
-        return $form;
-    }
+	/**
+	 * @var array
+	 */
+	private static $managed_models = array(
+		Order::class,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'orders';
+
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Orders';
+
+	/**
+	 * @var int
+	 */
+	private static $menu_priority = 4;
+
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 *
+	 * @return \SilverStripe\Forms\Form
+	 */
+	public function getEditForm($id = null, $fields = null)
+	{
+		$form = parent::getEditForm($id, $fields);
+
+		$gridFieldName = $this->sanitiseClassName($this->modelClass);
+		/** @var GridField $gridField */
+		$gridField = $form->Fields()->fieldByName($gridFieldName);
+
+		// GridField configuration
+		/** @var GridFieldConfig $config */
+		$config = $gridField->getConfig();
+
+		// remove edit icon
+		$config->removeComponentsByType(GridFieldEditButton::class);
+
+		return $form;
+	}
 }

src/Model/ProductCategory.php

Indentation +328 added lines, -328 removed lines

@@ -35,335 +35,335 @@
  */
 class ProductCategory extends DataObject
 {
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Title' => 'Varchar(255)',
-        'Code' => 'Varchar(50)',
-        'DeliveryType' => 'Varchar(50)',
-        'MaxDownloads' => 'Int',
-        'MaxDownloadsTime' => 'Int',
-        'DefaultWeight' => 'Float',
-        'DefaultWeightUnit' => 'Enum("LBS, KBS", "LBS")',
-        'DefaultLengthUnit' => 'Enum("in, cm", "in")',
-        'ShippingFlatRate' => 'Currency',
-        'ShippingFlatRateType' => 'Varchar(50)',
-        'HandlingFeeType' => 'Varchar(50)',
-        'HandlingFee' => 'Currency',
-        'HandlingFeePercentage' => 'Decimal',
-        'HandlingFeeMinimum' => 'Currency',
-        'DiscountType' => 'Varchar(50)',
-        'DiscountName' => 'Varchar(50)',
-        'DiscountDetails' => 'Varchar(200)',
-        'CustomsValue' => 'Currency',
-    ];
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'FoxyCart Category';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'FoxyCart Categories';
-
-    /**
-     * @var string
-     */
-    private static $description = 'Set the FoxyCart Category on a Product';
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = [
-        'Title' => 'Name',
-        'Code' => 'Code',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $indexes = [
-        'Code' => [
-            'type' => 'unique',
-            'columns' => ['Code'],
-        ],
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'ProductCategory';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        if ($this->ID) {
-            if ($this->Title == 'Default') {
-                $fields->replaceField(
-                    'Title',
-                    ReadonlyField::create('Title')
-                );
-            }
-
-            $fields->replaceField(
-                'Code',
-                ReadonlyField::create('Code')
-            );
-        }
-
-        $fields->insertBefore(HeaderField::create('DeliveryHD', 'Delivery Options', 3), 'DeliveryType');
-
-        $fields->replaceField(
-            'DeliveryType',
-            OptionsetField::create('DeliveryType', 'Delivery Type', $this->getShippingOptions())
-        );
-
-        $fields->dataFieldByName('MaxDownloads')
-            ->displayIf('DeliveryType')->isEqualTo('downloaded');
-
-        $fields->dataFieldByName('MaxDownloadsTime')
-            ->displayIf('DeliveryType')->isEqualTo('downloaded');
-
-        $fields->dataFieldByName('DefaultWeight')
-            ->displayIf('DeliveryType')->isEqualTo('shipped');
-
-        $fields->dataFieldByName('DefaultWeightUnit')
-            ->displayIf('DeliveryType')->isEqualTo('shipped');
-
-        $fields->dataFieldByName('DefaultLengthUnit')
-            ->displayIf('DeliveryType')->isEqualTo('shipped');
-
-        $fields->dataFieldByName('ShippingFlatRate')
-            ->displayIf('DeliveryType')->isEqualTo('flat_rate');
-
-        $fields->replaceField(
-            'ShippingFlatRateType',
-            DropdownField::create('ShippingFlatRateType', 'Flat Rate Type', $this->getShippingFlatRateTypes())
-                ->setEmptyString('')
-                ->displayIf('DeliveryType')->isEqualTo('flat_rate')->end()
-        );
-
-        $fields->insertBefore(HeaderField::create('HandlingHD', 'Handling Fees and Discounts', 3), 'HandlingFeeType');
-
-        $fields->replaceField(
-            'HandlingFeeType',
-            DropdownField::create('HandlingFeeType', 'Handling Fee Type', $this->getHandlingFeeTypes())
-                ->setEmptyString('')
-                ->setDescription('This determines what type of Handling Fee you would like to use.')
-        );
-
-        $fields->dataFieldByName('HandlingFee')
-            ->displayIf('HandlingFeeType')->isNotEqualTo('');
-
-        $fields->dataFieldByName('HandlingFeeMinimum')
-            ->displayIf('HandlingFeeType')->isEqualTo('flat_percent_with_minimum');
-
-        $fields->dataFieldByName('HandlingFeePercentage')
-            ->displayIf('HandlingFeeType')->isEqualTo('flat_percent_with_minimum')
-            ->orIf('HandlingFeeType')->isEqualTo('flat_percent');
-
-        $fields->replaceField(
-            'DiscountType',
-            DropdownField::create('DiscountType', 'Discount Type', $this->getDiscountTypes())
-                ->setEmptyString('')
-                ->setDescription('This determines what type of per category discount you would like to use, if any.')
-        );
-
-        $fields->dataFieldByName('DiscountName')
-            ->displayIf('DiscountType')->isNotEqualTo('');
-
-        $fields->dataFieldByName('DiscountDetails')
-            ->displayIf('DiscountType')->isNotEqualTo('');
-
-        $fields->dataFieldByName('CustomsValue')
-            ->setDescription('Enter a dollar amount here for the declared customs value for international 
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Title' => 'Varchar(255)',
+		'Code' => 'Varchar(50)',
+		'DeliveryType' => 'Varchar(50)',
+		'MaxDownloads' => 'Int',
+		'MaxDownloadsTime' => 'Int',
+		'DefaultWeight' => 'Float',
+		'DefaultWeightUnit' => 'Enum("LBS, KBS", "LBS")',
+		'DefaultLengthUnit' => 'Enum("in, cm", "in")',
+		'ShippingFlatRate' => 'Currency',
+		'ShippingFlatRateType' => 'Varchar(50)',
+		'HandlingFeeType' => 'Varchar(50)',
+		'HandlingFee' => 'Currency',
+		'HandlingFeePercentage' => 'Decimal',
+		'HandlingFeeMinimum' => 'Currency',
+		'DiscountType' => 'Varchar(50)',
+		'DiscountName' => 'Varchar(50)',
+		'DiscountDetails' => 'Varchar(200)',
+		'CustomsValue' => 'Currency',
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'FoxyCart Category';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'FoxyCart Categories';
+
+	/**
+	 * @var string
+	 */
+	private static $description = 'Set the FoxyCart Category on a Product';
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'Title' => 'Name',
+		'Code' => 'Code',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $indexes = [
+		'Code' => [
+			'type' => 'unique',
+			'columns' => ['Code'],
+		],
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'ProductCategory';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		if ($this->ID) {
+			if ($this->Title == 'Default') {
+				$fields->replaceField(
+					'Title',
+					ReadonlyField::create('Title')
+				);
+			}
+
+			$fields->replaceField(
+				'Code',
+				ReadonlyField::create('Code')
+			);
+		}
+
+		$fields->insertBefore(HeaderField::create('DeliveryHD', 'Delivery Options', 3), 'DeliveryType');
+
+		$fields->replaceField(
+			'DeliveryType',
+			OptionsetField::create('DeliveryType', 'Delivery Type', $this->getShippingOptions())
+		);
+
+		$fields->dataFieldByName('MaxDownloads')
+			->displayIf('DeliveryType')->isEqualTo('downloaded');
+
+		$fields->dataFieldByName('MaxDownloadsTime')
+			->displayIf('DeliveryType')->isEqualTo('downloaded');
+
+		$fields->dataFieldByName('DefaultWeight')
+			->displayIf('DeliveryType')->isEqualTo('shipped');
+
+		$fields->dataFieldByName('DefaultWeightUnit')
+			->displayIf('DeliveryType')->isEqualTo('shipped');
+
+		$fields->dataFieldByName('DefaultLengthUnit')
+			->displayIf('DeliveryType')->isEqualTo('shipped');
+
+		$fields->dataFieldByName('ShippingFlatRate')
+			->displayIf('DeliveryType')->isEqualTo('flat_rate');
+
+		$fields->replaceField(
+			'ShippingFlatRateType',
+			DropdownField::create('ShippingFlatRateType', 'Flat Rate Type', $this->getShippingFlatRateTypes())
+				->setEmptyString('')
+				->displayIf('DeliveryType')->isEqualTo('flat_rate')->end()
+		);
+
+		$fields->insertBefore(HeaderField::create('HandlingHD', 'Handling Fees and Discounts', 3), 'HandlingFeeType');
+
+		$fields->replaceField(
+			'HandlingFeeType',
+			DropdownField::create('HandlingFeeType', 'Handling Fee Type', $this->getHandlingFeeTypes())
+				->setEmptyString('')
+				->setDescription('This determines what type of Handling Fee you would like to use.')
+		);
+
+		$fields->dataFieldByName('HandlingFee')
+			->displayIf('HandlingFeeType')->isNotEqualTo('');
+
+		$fields->dataFieldByName('HandlingFeeMinimum')
+			->displayIf('HandlingFeeType')->isEqualTo('flat_percent_with_minimum');
+
+		$fields->dataFieldByName('HandlingFeePercentage')
+			->displayIf('HandlingFeeType')->isEqualTo('flat_percent_with_minimum')
+			->orIf('HandlingFeeType')->isEqualTo('flat_percent');
+
+		$fields->replaceField(
+			'DiscountType',
+			DropdownField::create('DiscountType', 'Discount Type', $this->getDiscountTypes())
+				->setEmptyString('')
+				->setDescription('This determines what type of per category discount you would like to use, if any.')
+		);
+
+		$fields->dataFieldByName('DiscountName')
+			->displayIf('DiscountType')->isNotEqualTo('');
+
+		$fields->dataFieldByName('DiscountDetails')
+			->displayIf('DiscountType')->isNotEqualTo('');
+
+		$fields->dataFieldByName('CustomsValue')
+			->setDescription('Enter a dollar amount here for the declared customs value for international 
             shipments. If you leave this blank, the sale price of the item will be used.');
 
-        return $fields;
-    }
-
-    /**
-     * @return \SilverStripe\ORM\ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        if (ProductCategory::get()->filter('Code', $this->Code)->exclude('ID', $this->ID)->first()) {
-            $result->addError('Code must be unique for each category.');
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function requireDefaultRecords()
-    {
-        parent::requireDefaultRecords();
-        $allCats = self::get();
-        if (!$allCats->count()) {
-            $cat = new self();
-            $cat->Title = 'Default';
-            $cat->Code = 'DEFAULT';
-            $cat->write();
-        }
-    }
-
-    /**
-     * @param bool $member
-     *
-     * @return bool
-     */
-    public function canView($member = false)
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     *
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-
-        //don't allow deletion of DEFAULT category
-        return ($this->Code == 'DEFAULT') ? false : Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     *
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Product_CANCRUD', 'any', $member);
-    }
-
-    /**
-     * @return array
-     */
-    public function getShippingOptions()
-    {
-        return [
-            'shipped' => 'Shipped using live shipping rates',
-            'downloaded' => 'Downloaded by the customer',
-            'flat_rate' => 'Shipped using a flat rate fee',
-            'pickup' => 'Picked up by the customer',
-            'notshipped' => 'No Shipping',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getShippingFlatRateTypes()
-    {
-        return [
-            'per_order' => 'Charge per order',
-            'per_item' => 'Charge per item',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getHandlingFeeTypes()
-    {
-        return [
-            'flat_per_order' => 'Flat fee per order with products in this category',
-            'flat_per_item' => 'Flat fee per product in this category',
-            'flat_percent' => 'Flat fee per shipment + % of price for products in this category',
-            'flat_percent_with_minimum' => 'Flat fee per shipment OR % of order total with products in this category. 
+		return $fields;
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		if (ProductCategory::get()->filter('Code', $this->Code)->exclude('ID', $this->ID)->first()) {
+			$result->addError('Code must be unique for each category.');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function requireDefaultRecords()
+	{
+		parent::requireDefaultRecords();
+		$allCats = self::get();
+		if (!$allCats->count()) {
+			$cat = new self();
+			$cat->Title = 'Default';
+			$cat->Code = 'DEFAULT';
+			$cat->write();
+		}
+	}
+
+	/**
+	 * @param bool $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = false)
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+
+		//don't allow deletion of DEFAULT category
+		return ($this->Code == 'DEFAULT') ? false : Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 *
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Product_CANCRUD', 'any', $member);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getShippingOptions()
+	{
+		return [
+			'shipped' => 'Shipped using live shipping rates',
+			'downloaded' => 'Downloaded by the customer',
+			'flat_rate' => 'Shipped using a flat rate fee',
+			'pickup' => 'Picked up by the customer',
+			'notshipped' => 'No Shipping',
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getShippingFlatRateTypes()
+	{
+		return [
+			'per_order' => 'Charge per order',
+			'per_item' => 'Charge per item',
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getHandlingFeeTypes()
+	{
+		return [
+			'flat_per_order' => 'Flat fee per order with products in this category',
+			'flat_per_item' => 'Flat fee per product in this category',
+			'flat_percent' => 'Flat fee per shipment + % of price for products in this category',
+			'flat_percent_with_minimum' => 'Flat fee per shipment OR % of order total with products in this category. 
                 Whichever is greater.',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getDiscountTypes()
-    {
-        return [
-            'quantity_amount' => 'Discount by an amount based on the quantity',
-            'quantity_percentage' => 'Discount by a percentage based on the quantity',
-            'price_amount' => 'Discount by an amount based on the price in this category',
-            'price_percentage' => 'Discount by a percentage based on the price in this category',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getDataMap()
-    {
-        return [
-            'name' => $this->Title,
-            'code' => $this->Code,
-            'item_delivery_type' => $this->DeliveryType,
-            'max_downloads_per_customer' => $this->MaxDownloads,
-            'max_downloads_time_period' => $this->MaxDownloadsTime,
-            'customs_value' => $this->CustomsValue,
-            'default_weight' => $this->DefaultWeight,
-            'default_weight_unit' => $this->DefaultWeightUnit,
-            'default_length_unit' => $this->DefautlLengthUnit,
-            'shipping_flat_rate' => $this->ShippingFlatRate,
-            'shipping_flat_rate_type' => $this->ShippingFlatRateType,
-            'handling_fee_type' => $this->HandlingFeeType,
-            'handling_fee' => $this->HandlingFee,
-            'handling_fee_minimum' => $this->HandlingFeeMinimum,
-            'handling_fee_percentage' => $this->HandlingFeePercentage,
-            'discount_type' => $this->DiscountType,
-            'discount_name' => $this->DiscountName,
-            'discount_details' => $this->DiscountDetails,
-        ];
-    }
-
-    /**
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function onAfterWrite()
-    {
-        parent::onAfterWrite();
-
-        if ($this->isChanged()) {
-            if ($fc = new FoxyStripeClient()) {
-                $fc->putCategory($this->getDataMap());
-            }
-        }
-    }
-
-    /**
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     */
-    public function onAfterDelete()
-    {
-        parent::onAfterDelete();
-
-        if ($fc = new FoxyStripeClient()) {
-            $fc->deleteCategory($this->getDataMap());
-        }
-    }
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDiscountTypes()
+	{
+		return [
+			'quantity_amount' => 'Discount by an amount based on the quantity',
+			'quantity_percentage' => 'Discount by a percentage based on the quantity',
+			'price_amount' => 'Discount by an amount based on the price in this category',
+			'price_percentage' => 'Discount by a percentage based on the price in this category',
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDataMap()
+	{
+		return [
+			'name' => $this->Title,
+			'code' => $this->Code,
+			'item_delivery_type' => $this->DeliveryType,
+			'max_downloads_per_customer' => $this->MaxDownloads,
+			'max_downloads_time_period' => $this->MaxDownloadsTime,
+			'customs_value' => $this->CustomsValue,
+			'default_weight' => $this->DefaultWeight,
+			'default_weight_unit' => $this->DefaultWeightUnit,
+			'default_length_unit' => $this->DefautlLengthUnit,
+			'shipping_flat_rate' => $this->ShippingFlatRate,
+			'shipping_flat_rate_type' => $this->ShippingFlatRateType,
+			'handling_fee_type' => $this->HandlingFeeType,
+			'handling_fee' => $this->HandlingFee,
+			'handling_fee_minimum' => $this->HandlingFeeMinimum,
+			'handling_fee_percentage' => $this->HandlingFeePercentage,
+			'discount_type' => $this->DiscountType,
+			'discount_name' => $this->DiscountName,
+			'discount_details' => $this->DiscountDetails,
+		];
+	}
+
+	/**
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function onAfterWrite()
+	{
+		parent::onAfterWrite();
+
+		if ($this->isChanged()) {
+			if ($fc = new FoxyStripeClient()) {
+				$fc->putCategory($this->getDataMap());
+			}
+		}
+	}
+
+	/**
+	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 */
+	public function onAfterDelete()
+	{
+		parent::onAfterDelete();
+
+		if ($fc = new FoxyStripeClient()) {
+			$fc->deleteCategory($this->getDataMap());
+		}
+	}
 }