dynamic / foxystripe

src/Controller/OrderHistoryPageController.php

Spacing +1 added lines, -1 removed lines

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

src/Model/FoxyStripeClient.php

Spacing +1 added lines, -1 removed lines

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

src/Page/ProductHolder.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 
         if ($config->MultiGroup) {
             $entries = $this->Products()->sort('SortOrder');
-        } else {
+        }else {
             $filter = '"ParentID" = '.$this->ID;
 
             // Build a list of all IDs for ProductGroups that are children

src/Model/foxycart.cart_validation.php

Indentation +12 added lines, -12 removed lines

@@ -329,10 +329,10 @@ 
                                 .'$1', $input);
                         }
                         self::$log[] = '<strong>INPUT:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                           '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
-                           '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
-                           '</strong><br />Initial input: '.htmlspecialchars($input).
-                           '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
+                            '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$name[2]).
+                            '</strong> :: Value: <strong>'.htmlspecialchars($value[2]).
+                            '</strong><br />Initial input: '.htmlspecialchars($input).
+                            '<br />Signed: <span style="color:#060;">'.htmlspecialchars($input_signed).'</span>';
                         $form = str_replace($input, $input_signed, $form);
                     }
                 }
@@ -373,10 +373,10 @@ 
                         );
                         $form_part_signed = str_replace($option[0], $option_signed, $form_part_signed);
                         self::$log[] = '<strong>OPTION:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                           '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
-                           '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
-                           '</strong><br />Initial option: '.htmlspecialchars($option[0]).
-                           '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
+                            '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$list[2]).
+                            '</strong> :: Value: <strong>'.htmlspecialchars($option[2]).
+                            '</strong><br />Initial option: '.htmlspecialchars($option[0]).
+                            '<br />Signed: <span style="color:#060;">'.htmlspecialchars($option_signed).'</span>';
                     }
                     $form = str_replace($list[0], $form_part_signed, $form);
                 }
@@ -407,10 +407,10 @@ 
                     );
                     $form = str_replace($textarea[0], $textarea_signed, $form);
                     self::$log[] = '<strong>TEXTAREA:</strong> Code: <strong>'.htmlspecialchars($prefix.$code).
-                       '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
-                       '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
-                       '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
-                       '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
+                        '</strong> :: Name: <strong>'.htmlspecialchars($prefix.$textarea[2]).
+                        '</strong> :: Value: <strong>'.htmlspecialchars($textarea[3]).
+                        '</strong><br />Initial textarea: '.htmlspecialchars($textarea[0]).
+                        '<br />Signed: <span style="color:#060;">'.htmlspecialchars($textarea_signed).'</span>';
                 }
                 self::$log[] = '<strong>FORM after TEXTAREAS:</strong> <pre>'.htmlspecialchars($form).'</pre>';
 

Spacing +5 added lines, -5 removed lines

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

tests/ProductPageTest.php

Spacing +11 added lines, -11 removed lines

@@ -215,7 +215,7 @@ 
 
     public function testProductDraftOptionDeletion()
     {
-        self::$use_draft_site = false;//make sure we can publish
+        self::$use_draft_site = false; //make sure we can publish
 
         $this->logInWithPermission('ADMIN');
 
@@ -223,7 +223,7 @@ 
         //build holder page, ProductPage can't be on root level
         $holder->doPublish();
 
-        $product = $this->objFromFixture(ProductPage::class, 'product1');//build product page
+        $product = $this->objFromFixture(ProductPage::class, 'product1'); //build product page
         $product->doPublish();
 
         $productID = $product->ID;
@@ -231,29 +231,29 @@ 
         $optionGroup = $this->objFromFixture(OptionGroup::class, 'size');
         //build the group for the options
         $optionGroup->write();
-        $option = $this->objFromFixture(OptionItem::class, 'small');//build first option
+        $option = $this->objFromFixture(OptionItem::class, 'small'); //build first option
         $option->write();
-        $option2 = $this->objFromFixture(OptionItem::class, 'large');//build second option
+        $option2 = $this->objFromFixture(OptionItem::class, 'large'); //build second option
         $option2->write();
 
-        $this->assertTrue($product->isPublished());//check that product is published
+        $this->assertTrue($product->isPublished()); //check that product is published
 
-        $product->deleteFromStage('Stage');//remove product from draft site
+        $product->deleteFromStage('Stage'); //remove product from draft site
 
-        $this->assertTrue($product->isPublished());//check product is still published
+        $this->assertTrue($product->isPublished()); //check product is still published
 
         $testOption = $this->objFromFixture(OptionItem::class, 'large');
 
         $this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));
         //make sure the first option still exists
 
-        $product->doRestoreToStage();//restore page to draft site
-        $product->doUnpublish();//unpublish page
-        $product->deleteFromStage('Stage');//remove product from draft site
+        $product->doRestoreToStage(); //restore page to draft site
+        $product->doUnpublish(); //unpublish page
+        $product->deleteFromStage('Stage'); //remove product from draft site
 
         $checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();
         //query same option as above
 
-        $this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
+        $this->assertEquals($checkDeleted->ID, 0); //check that the ID is 0 (empty object/non-existent)
     }
 }

src/Admin/FoxyStripeAdmin.php

Spacing +3 added lines, -3 removed lines

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

src/Model/Order.php

Spacing +26 added lines, -26 removed lines

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

src/Form/FoxyStripePurchaseForm.php

Spacing +6 added lines, -9 removed lines

@@ -113,12 +113,10 @@ 
         $this->setSiteConfig($siteConfig);
 
         $fields = ($fields != null && $fields->exists()) ?
-            $this->getProductFields($fields) :
-            $this->getProductFields(FieldList::create());
+            $this->getProductFields($fields) : $this->getProductFields(FieldList::create());
 
         $actions = ($actions != null && $actions->exists()) ?
-            $this->getProductActions($actions) :
-            $this->getProductActions(FieldList::create());
+            $this->getProductActions($actions) : $this->getProductActions(FieldList::create());
         $validator = (!empty($validator) || $validator != null) ? $validator : RequiredFields::create();
 
         parent::__construct($controller, $name, $fields, $actions, $validator);
@@ -136,8 +134,7 @@ 
     protected function getProductFields(FieldList $fields)
     {
         $hiddenTitle = ($this->product->ReceiptTitle) ?
-            htmlspecialchars($this->product->ReceiptTitle) :
-            htmlspecialchars($this->product->Title);
+            htmlspecialchars($this->product->ReceiptTitle) : htmlspecialchars($this->product->Title);
         $code = $this->product->Code;
 
         if ($this->product->Available) {
@@ -165,7 +162,7 @@ 
                 $code,
                 'price',
                 $this->product->Price
-            ))->setValue($this->product->Price));//can't override id
+            ))->setValue($this->product->Price)); //can't override id
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue(
                 $code,
                 'weight',
@@ -208,7 +205,7 @@ 
                 ->addExtraClass('hidden unavailable-text'));
 
             $this->extend('updatePurchaseFormFields', $fields);
-        } else {
+        }else {
             $fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock', 4));
         }
 
@@ -254,7 +251,7 @@ 
      */
     protected function getProductOptionSet()
     {
-        $assignAvailable = function ($self) {
+        $assignAvailable = function($self) {
             /** @var OptionItem $self */
             $this->extend('updateFoxyStripePurchaseForm', $form);
             $self->Available = ($self->getAvailability()) ? true : false;

src/Controller/FoxyStripeController.php

Spacing +6 added lines, -8 removed lines

@@ -40,8 +40,7 @@ 
         // 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']);
+                urldecode($_POST['FoxyData']) : urldecode($_POST['FoxySubscriptionData']);
             $FoxyData_decrypted = \rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
 
             // parse the response and save the order
@@ -51,7 +50,7 @@ 
             $this->extend('addIntegrations', $FoxyData_encrypted);
 
             return 'foxy';
-        } else {
+        }else {
             return 'No FoxyData or FoxySubscriptionData received.';
         }
     }
@@ -70,12 +69,11 @@ 
         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()) ?
-                    $order = Order::get()->filter('Order_ID', (int) $transaction->id)->First() :
-                    $order = Order::create();
+                ($order = Order::get()->filter('Order_ID', (int)$transaction->id)->First()) ?
+                    $order = Order::get()->filter('Order_ID', (int)$transaction->id)->First() : $order = Order::create();
 
                 // save base order info
-                $order->Order_ID = (int) $transaction->id;
+                $order->Order_ID = (int)$transaction->id;
                 $order->Response = urlencode($encrypted);
                 $order->write();
             }
@@ -97,7 +95,7 @@ 
         // to do: consider a login/registration form here if not logged in
         if ($Member = Security::getCurrentUser()) {
             $Member = Security::getCurrentUser();
-        } else {
+        }else {
             $Member = new Member();
             $Member->Customer_ID = 0;
         }