dynamic / foxystripe

tests/FoxyStripeProductTest.php

Spacing +2 added lines, -2 removed lines

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

code/model/FoxyCart.php

Spacing +6 added lines, -6 removed lines

@@ -19,14 +19,14 @@ 
      */
     public static function setStoreKey($length = 54, $count = 0)
     {
-        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' . strtotime('now');
+        $charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.strtotime('now');
         $strLength = strlen($charset);
         $str = '';
         while ($count < $length) {
             $str .= $charset[mt_rand(0, $strLength - 1)];
             $count++;
         }
-        return static::get_key_prefix() . substr(base64_encode($str), 0, $length);
+        return static::get_key_prefix().substr(base64_encode($str), 0, $length);
     }
 
     /**
@@ -82,11 +82,11 @@ 
     private static function getAPIRequest($foxyData = array())
     {
 
-        $foxy_domain = static::get_foxy_cart_store_name() . '.foxycart.com';
+        $foxy_domain = static::get_foxy_cart_store_name().'.foxycart.com';
         $foxyData["api_token"] = FoxyCart::get_store_key();
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
+        curl_setopt($ch, CURLOPT_URL, "https://".$foxy_domain."/api");
         curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
@@ -95,7 +95,7 @@ 
 
         // The following if block will print any CURL errors you might have
         if ($response == false) {
-            SS_Log::log("Could not connect to FoxyCart API: " . $response, SS_Log::ERR);
+            SS_Log::log("Could not connect to FoxyCart API: ".$response, SS_Log::ERR);
         }
         curl_close($ch);
 
@@ -130,7 +130,7 @@ 
     public static function putCustomer(Member $Member = null)
     {
         // throw error if no $Member Object
-        if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
+        if (!isset($Member)); //trigger_error('No Member set', E_USER_ERROR);
 
         // send updated customer record from API
         $foxyData = array();

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::get_store_key(),$FoxyData_encrypted);
+                urldecode($_POST["FoxyData"]) : urldecode($_POST["FoxySubscriptionData"]);
+			$FoxyData_decrypted = rc4crypt::decrypt(FoxyCart::get_store_key(), $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::get_store_key());
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::get_store_key());
 
-        $redirect_complete = 'https://' . FoxyCart::get_foxy_cart_store_name() . '.foxycart.com/checkout?fc_auth_token=' . $auth_token .
-            '&fcsid=' . $fcsid . '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
+        $redirect_complete = 'https://'.FoxyCart::get_foxy_cart_store_name().'.foxycart.com/checkout?fc_auth_token='.$auth_token.
+            '&fcsid='.$fcsid.'&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
 	
 	    $this->redirect($redirect_complete);
 

code/objects/products/FoxyStripeProduct.php

Spacing +5 added lines, -6 removed lines

@@ -122,7 +122,7 @@ 
         $previewDescription = ($this->stat('customPreviewDescription')) ? $this->stat('customPreviewDescription') : _t('ProductPage.PreviewImageDescription', 'Image used throughout site to represent this product');
 
         // Cateogry Dropdown field w/ add new
-        $source = function () {
+        $source = function() {
             return FoxyCartProductCategory::get()->map()->toArray();
         };
         $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -159,7 +159,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -215,7 +215,7 @@ 
                 ->setFolderName('Uploads/Products')
                 ->setAllowedExtensions(['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',
@@ -273,7 +273,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -348,8 +348,7 @@ 
     {
         $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;
     }
 
     /**

code/objects/OptionItem.php

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
         $parentCode = $product->Code;
 
         // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
+        $groups = function() {
             return OptionGroup::get()->map()->toArray();
         };
         $groupFields = singleton('OptionGroup')->getCMSFields();
@@ -198,17 +198,17 @@ 
 
     public function getWeightModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->WeightModifierAction) . $this->WeightModifier;
+        return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
     }
 
     public function getPriceModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->PriceModifierAction) . $this->PriceModifier;
+        return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
     }
 
     public function getCodeModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->CodeModifierAction) . $this->CodeModifier;
+        return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
     }
 
     public function getProductOptionGroupTitle()
@@ -219,18 +219,18 @@ 
     public function getGeneratedValue()
     {
         $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction) . $modPrice;
+        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
         $modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
-        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction) . $modWeight;
-        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction) . $this->CodeModifier;
-        return $this->Title . '{p' . $modPriceWithSymbol . '|w' . $modWeight . '|c' . $modCode . '}';
+        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
+        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+        return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
     }
 
     public function getGeneratedTitle()
     {
         $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
         $title = $this->Title;
-        $title .= ($this->PriceModifier != 0) ? ': (' . OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus = true) . '$' . $modPrice . ')' : '';
+        $title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus = true).'$'.$modPrice.')' : '';
         return $title;
     }