Completed
Push — master ( cfffae...fa5fd4 )
by Nic
05:44
created
src/Controller/FoxyStripeController.php 1 patch
Spacing   +11 added lines, -12 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
         // handle POST from FoxyCart API transaction
44 44
         if ((isset($_POST['FoxyData']) or isset($_POST['FoxySubscriptionData']))) {
45 45
             $FoxyData_encrypted = (isset($_POST['FoxyData'])) ?
46
-                urldecode($_POST['FoxyData']) :
47
-                urldecode($_POST['FoxySubscriptionData']);
46
+                urldecode($_POST['FoxyData']) : urldecode($_POST['FoxySubscriptionData']);
48 47
             $FoxyData_decrypted = \rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
49 48
 
50 49
             // parse the response and save the order
@@ -54,7 +53,7 @@  discard block
 block discarded – undo
54 53
             $this->extend('addIntegrations', $FoxyData_encrypted);
55 54
 
56 55
             return 'foxy';
57
-        } else {
56
+        }else {
58 57
             return 'No FoxyData or FoxySubscriptionData received.';
59 58
         }
60 59
     }
@@ -137,7 +136,7 @@  discard block
 block discarded – undo
137 136
                 /* todo: make sure local password is updated if changed on FoxyCart
138 137
                 $this->updatePasswordFromData($customer, $order);
139 138
                 */
140
-            } else {
139
+            }else {
141 140
                 // create new Member, set password info from FoxyCart
142 141
                 $customer = Member::create();
143 142
                 $customer->Customer_ID = (int)$order->customer_id;
@@ -164,11 +163,11 @@  discard block
 block discarded – undo
164 163
         Security::config()->update('password_encryption_algorithm', 'none');
165 164
 
166 165
         $customer->PasswordEncryption = 'none';
167
-        $customer->Password = (string) $order->customer_password;
166
+        $customer->Password = (string)$order->customer_password;
168 167
         $customer->write();
169 168
 
170
-        $customer->PasswordEncryption = $this->getEncryption((string) $order->customer_password_hash_type);
171
-        $customer->Salt = (string) $order->customer_password_salt;
169
+        $customer->PasswordEncryption = $this->getEncryption((string)$order->customer_password_hash_type);
170
+        $customer->Salt = (string)$order->customer_password_salt;
172 171
 
173 172
         Security::config()->update('password_encryption_algorithm', $password_encryption_algorithm);
174 173
     }
@@ -259,7 +258,7 @@  discard block
 block discarded – undo
259 258
             }
260 259
 
261 260
             return ProductPage::get()
262
-                ->filter('ID', (int) $productOptions->product_option_value)
261
+                ->filter('ID', (int)$productOptions->product_option_value)
263 262
                 ->First();
264 263
         }
265 264
     }
@@ -309,18 +308,18 @@  discard block
 block discarded – undo
309 308
         // to do: consider a login/registration form here if not logged in
310 309
         if ($Member = Security::getCurrentUser()) {
311 310
             $Member = Security::getCurrentUser();
312
-        } else {
311
+        }else {
313 312
             $Member = new Member();
314 313
             $Member->Customer_ID = 0;
315 314
         }
316 315
 
317
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
316
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
318 317
 
319 318
         $config = FoxyStripeSetting::current_foxystripe_setting();
320 319
         if ($config->CustomSSL) {
321 320
             $link = FoxyCart::getFoxyCartStoreName();
322
-        } else {
323
-            $link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com';
321
+        }else {
322
+            $link = FoxyCart::getFoxyCartStoreName().'.foxycart.com';
324 323
         }
325 324
 
326 325
         $redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid.
Please login to merge, or discard this patch.
src/Controller/DataTestController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     {
36 36
         $rules = Director::config()->get('rules');
37 37
         $rule = array_search(FoxyStripeController::class, $rules);
38
-        $myURL = Director::absoluteBaseURL() . explode('//', $rule)[0];
38
+        $myURL = Director::absoluteBaseURL().explode('//', $rule)[0];
39 39
         $myKey = FoxyCart::getStoreKey();
40 40
 
41 41
         $this->updateConfig();
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             $email = $emails[count($emails) - 1];
123 123
             return preg_replace_callback(
124 124
                 "|(\d+)|",
125
-                function ($mathces) {
125
+                function($mathces) {
126 126
                     return ++$mathces[1];
127 127
                 },
128 128
                 $email
Please login to merge, or discard this patch.
src/Page/ProductHolder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
      */
70 70
     public function getCMSFields()
71 71
     {
72
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
72
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
73 73
             if (FoxyStripeSetting::current_foxystripe_setting()->MultiGroup) {
74 74
                 $config = GridFieldConfig_RelationEditor::create();
75 75
                 $config->addComponent(new GridFieldOrderableRows('SortOrder'));
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 
151 151
         if ($config->MultiGroup) {
152 152
             $entries = $this->Products()->sort('SortOrder');
153
-        } else {
154
-            $filter = '"ParentID" = ' . $this->ID;
153
+        }else {
154
+            $filter = '"ParentID" = '.$this->ID;
155 155
 
156 156
             // Build a list of all IDs for ProductGroups that are children
157 157
             $holderIDs = $this->ProductGroupIDs();
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                 if ($filter) {
163 163
                     $filter .= ' OR ';
164 164
                 }
165
-                $filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ')';
165
+                $filter .= '"ParentID" IN ('.implode(',', $holderIDs).')';
166 166
             }
167 167
 
168 168
             $order = '"SiteTree"."Title" ASC';
Please login to merge, or discard this patch.
src/Form/FoxyStripePurchaseForm.php 1 patch
Spacing   +7 added lines, -10 removed lines patch added patch discarded remove patch
@@ -117,12 +117,10 @@  discard block
 block discarded – undo
117 117
         $this->setSiteConfig($siteConfig);
118 118
 
119 119
         $fields = ($fields != null && $fields->exists()) ?
120
-            $this->getProductFields($fields) :
121
-            $this->getProductFields(FieldList::create());
120
+            $this->getProductFields($fields) : $this->getProductFields(FieldList::create());
122 121
 
123 122
         $actions = ($actions != null && $actions->exists()) ?
124
-            $this->getProductActions($actions) :
125
-            $this->getProductActions(FieldList::create());
123
+            $this->getProductActions($actions) : $this->getProductActions(FieldList::create());
126 124
         $validator = (!empty($validator) || $validator != null) ? $validator : RequiredFields::create();
127 125
 
128 126
         parent::__construct($controller, $name, $fields, $actions, $validator);
@@ -131,7 +129,7 @@  discard block
 block discarded – undo
131 129
         $this->setAttribute('action', FoxyCart::FormActionURL());
132 130
         $this->disableSecurityToken();
133 131
 
134
-        $this->setHTMLID($this->getTemplateHelper()->generateFormID($this) . "_{$product->ID}");
132
+        $this->setHTMLID($this->getTemplateHelper()->generateFormID($this)."_{$product->ID}");
135 133
     }
136 134
 
137 135
     /**
@@ -143,8 +141,7 @@  discard block
 block discarded – undo
143 141
     {
144 142
         //Requirements::javascript('dynamic/foxystripe: client/dist/javascript/scripts.min.js');
145 143
         $hiddenTitle = ($this->product->ReceiptTitle) ?
146
-            htmlspecialchars($this->product->ReceiptTitle) :
147
-            htmlspecialchars($this->product->Title);
144
+            htmlspecialchars($this->product->ReceiptTitle) : htmlspecialchars($this->product->Title);
148 145
         $code = $this->product->Code;
149 146
 
150 147
         if ($this->getProduct()->getIsAvailable()) {
@@ -178,7 +175,7 @@  discard block
 block discarded – undo
178 175
                     ->setValue(
179 176
                         ProductPage::getGeneratedValue($code, 'price', $this->product->Price, 'value')
180 177
                     )
181
-            );//can't override id
178
+            ); //can't override id
182 179
             if ($this->product->Weight > 0) {
183 180
                 $fields->push(
184 181
                     HiddenField::create('weight')
@@ -221,7 +218,7 @@  discard block
 block discarded – undo
221 218
             );
222 219
 
223 220
             $fields->push(
224
-                HeaderField::create('submitPrice', '$' . $this->product->Price, 4)
221
+                HeaderField::create('submitPrice', '$'.$this->product->Price, 4)
225 222
                     ->addExtraClass('submit-price')
226 223
             );
227 224
             $fields->push(
@@ -234,7 +231,7 @@  discard block
 block discarded – undo
234 231
             }
235 232
 
236 233
             $this->extend('updatePurchaseFormFields', $fields);
237
-        } else {
234
+        }else {
238 235
             $fields->push(HeaderField::create('unavailableText', 'Currently Out of Stock', 4));
239 236
         }
240 237
 
Please login to merge, or discard this patch.
src/Model/FoxyCart.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             if ($config->RemoteDomain) {
76 76
                 return $config->RemoteDomain;
77 77
             }
78
-        } else {
78
+        }else {
79 79
             if ($config->StoreName) {
80 80
                 return $config->StoreName;
81 81
             }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         $config = FoxyStripeSetting::current_foxystripe_setting();
94 94
         if ($config->CustomSSL) {
95 95
             return sprintf('https://%s/cart', self::getFoxyCartStoreName());
96
-        } else {
96
+        }else {
97 97
             return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
98 98
         }
99 99
     }
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
             $config = FoxyStripeSetting::current_foxystripe_setting();
114 114
             if ($config->CustomSSL) {
115 115
                 $foxy_domain = self::getFoxyCartStoreName();
116
-            } else {
116
+            }else {
117 117
                 $foxy_domain = self::getFoxyCartStoreName().'.foxycart.com';
118 118
             }
119 119
 
Please login to merge, or discard this patch.