dynamic / foxystripe

code/extensions/CustomerExtension.php

Spacing +3 added lines, -3 removed lines

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

code/form/FoxyStripeDropdownField.php

Spacing +6 added lines, -6 removed lines

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

code/controllers/FoxyStripe_Controller.php

Spacing +13 added lines, -15 removed lines

@@ -17,9 +17,8 @@ 
 	    // 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);
+                urldecode($_POST["FoxyData"]) : urldecode($_POST["FoxySubscriptionData"]);
+			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
 			self::handleDataFeed($FoxyData_encrypted, $FoxyData_decrypted);
 			
 			// extend to allow for additional integrations with Datafeed
@@ -27,14 +26,14 @@ 
 			
 			return 'foxy';
 			
-		} else {
+		}else {
 			
 			return "No FoxyData or FoxySubscriptionData received.";
 			
 		}
 	}
 
-    public function handleDataFeed($encrypted, $decrypted){
+    public function handleDataFeed($encrypted, $decrypted) {
         //handle encrypted & decrypted data
         $orders = new SimpleXMLElement($decrypted);
 
@@ -43,12 +42,11 @@ 
 
             if (isset($order->id)) {
                 ($transaction = Order::get()->filter('Order_ID', $order->id)->First()) ?
-                    $transaction :
-                    $transaction = Order::create();
+                    $transaction : $transaction = Order::create();
             }
 
             // save base order info
-            $transaction->Order_ID = (int) $order->id;
+            $transaction->Order_ID = (int)$order->id;
             $transaction->Response = $decrypted;
 
             // record transaction as order
@@ -103,11 +101,11 @@ 
             if (isset($order->customer_email) && $order->is_anonymous == 0) {
 
                 // if Customer is existing member, associate with current order
-                if(Member::get()->filter('Email', $order->customer_email)->First()) {
+                if (Member::get()->filter('Email', $order->customer_email)->First()) {
 
                     $customer = Member::get()->filter('Email', $order->customer_email)->First();
 
-                } else {
+                }else {
 
                     // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
                     Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
@@ -213,17 +211,17 @@ 
         // 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 = Member::currentUser()) {
+        if ($Member = Member::currentUser()) {
             $Member = Member::currentUser();
-        } else {
+        }else {
             $Member = new Member();
             $Member->Customer_ID = 0;
         }
 
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
 
-        $redirect_complete = 'https://' . FoxyCart::getFoxyCartStoreName() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
-            '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
+        $redirect_complete = 'https://'.FoxyCart::getFoxyCartStoreName().'.foxycart.com/checkout?fc_auth_token='.$auth_token.
+            '&fcsid='.$fcsid.'&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
 	
 	    $this->redirect($redirect_complete);
 

tests/StoreSettingsTest.php

Spacing +4 added lines, -4 removed lines

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

tests/ProductDiscountTierTest.php

Spacing +5 added lines, -5 removed lines

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

tests/FS_Test.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-class FS_Test extends FunctionalTest{
+class FS_Test extends FunctionalTest {
 
     protected static $fixture_file = 'foxystripe/tests/FoxyStripeTest.yml';
     protected static $disable_themes = true;
     protected static $use_draft_site = false;
 
-    public function setUp(){
+    public function setUp() {
         parent::setUp();
 
         ini_set('display_errors', 1);
@@ -14,10 +14,10 @@ 
         error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
     }
 
-    public function logOut(){
+    public function logOut() {
         $this->session()->clear('loggedInAs');
     }
 
-    public function testProductPage(){}
+    public function testProductPage() {}
 
 }

tests/ProductPageTest.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 
 		$groupForItem = OptionGroup::create();
 		$groupForItem->Title = 'Sample-Group';
@@ -15,7 +15,7 @@ 
 		$productHolder->write();
 	}
 
-	function testProductCreation(){
+	function testProductCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture('ProductCategory', 'default');
@@ -28,7 +28,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$product2 = $this->objFromFixture('ProductPage', 'product2');
@@ -38,22 +38,22 @@ 
 		$product2->doPublish();
 		$this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
 		$product2->delete();
 		$this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
 	}
 
-	function testProductTitleLeadingWhiteSpace(){
+	function testProductTitleLeadingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -65,7 +65,7 @@ 
 
 	}
 
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -77,7 +77,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'apparel');
@@ -90,7 +90,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'default');
@@ -116,11 +116,11 @@ 
 
 		$category2->delete();
 
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
+		$this->assertFalse(in_array($category2ID, ProductCategory::get()->column('ID')));
 
 	}
 
-	function testOptionGroupCreation(){
+	function testOptionGroupCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$group = $this->objFromFixture('OptionGroup', 'size');
@@ -130,7 +130,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture('OptionGroup', 'color');
@@ -149,7 +149,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
@@ -164,13 +164,13 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$optionGroup = (OptionGroup::get()->first())
 			? OptionGroup::get()->first()
 			: OptionGroup::create();
-		if($optionGroup->ID == 0){
+		if ($optionGroup->ID == 0) {
 			$optionGroup->Title = 'Size';
 			$optionGroup->write();
 		}

code/form/FoxyStripePurchaseForm.php

Spacing +4 added lines, -4 removed lines

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

code/objects/FoxyStripeProduct.php

Spacing +6 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
             'Image used throughout site to represent this product');
 
         // Cateogry Dropdown field w/ add new
-        $source = function () {
+        $source = function() {
             return ProductCategory::get()->map()->toArray();
         };
         $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -135,7 +135,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -191,7 +191,7 @@ 
                 ->setFolderName('Uploads/Products')
                 ->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
                 ->setAllowedMaxFileNumber(1),
-            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD' . 'Product Image Gallery'), 2),
+            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'.'Product Image Gallery'), 2),
             $prodImagesField
                 ->setDescription(_t(
                     'ProductPage.ProductImagesDescription',
@@ -252,7 +252,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -333,14 +333,13 @@ 
     ) {
         $optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
         return (SiteConfig::current_site_config()->CartValidation)
-            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) :
-            $optionValue;
+            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) : $optionValue;
     }
 
     // get FoxyCart Store Name for JS call
     public function getCartScript()
     {
-        return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
+        return '<script src="https://cdn.foxycart.com/'.FoxyCart::getFoxyCartStoreName().'/loader.js" async defer></script>';
     }
 
     public function getDiscountFieldValue()