Completed
Pull Request — master (#403)
by Nic
42:32 queued 27:37
created
src/Controller/FoxyStripeController.php 1 patch
Spacing   +9 added lines, -10 removed lines patch added patch discarded remove patch
@@ -45,8 +45,7 @@  discard block
 block discarded – undo
45 45
         // handle POST from FoxyCart API transaction
46 46
         if ((isset($_POST['FoxyData']) or isset($_POST['FoxySubscriptionData']))) {
47 47
             $FoxyData_encrypted = (isset($_POST['FoxyData'])) ?
48
-                urldecode($_POST['FoxyData']) :
49
-                urldecode($_POST['FoxySubscriptionData']);
48
+                urldecode($_POST['FoxyData']) : urldecode($_POST['FoxySubscriptionData']);
50 49
             $FoxyData_decrypted = \rc4crypt::decrypt(FoxyCart::getStoreKey(), $FoxyData_encrypted);
51 50
 
52 51
             // parse the response and save the order
@@ -56,7 +55,7 @@  discard block
 block discarded – undo
56 55
             $this->extend('addIntegrations', $FoxyData_encrypted);
57 56
 
58 57
             return 'foxy';
59
-        } else {
58
+        }else {
60 59
             return 'No FoxyData or FoxySubscriptionData received.';
61 60
         }
62 61
     }
@@ -149,7 +148,7 @@  discard block
 block discarded – undo
149 148
                 /* todo: make sure local password is updated if changed on FoxyCart
150 149
                 $this->updatePasswordFromData($customer, $order);
151 150
                 */
152
-            } else {
151
+            }else {
153 152
                 // create new Member, set password info from FoxyCart
154 153
                 $customer = Member::create();
155 154
                 $customer->Customer_ID = (int)$order->customer_id;
@@ -322,22 +321,22 @@  discard block
 block discarded – undo
322 321
         // to do: consider a login/registration form here if not logged in
323 322
         if ($Member = Security::getCurrentUser()) {
324 323
             $Member = Security::getCurrentUser();
325
-        } else {
324
+        }else {
326 325
             $Member = new Member();
327 326
             $Member->Customer_ID = 0;
328 327
         }
329 328
 
330
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
329
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
331 330
 
332 331
         $config = FoxyStripeSetting::current_foxystripe_setting();
333 332
         if ($config->CustomSSL) {
334 333
             $link = FoxyCart::getFoxyCartStoreName();
335
-        } else {
336
-            $link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com';
334
+        }else {
335
+            $link = FoxyCart::getFoxyCartStoreName().'.foxycart.com';
337 336
         }
338 337
 
339
-        $redirect_complete = 'https://' . $link . '/checkout?fc_auth_token=' . $auth_token . '&fcsid=' . $fcsid .
340
-            '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
338
+        $redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid.
339
+            '&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
341 340
 
342 341
         $this->redirect($redirect_complete);
343 342
     }
Please login to merge, or discard this patch.
src/Model/Order.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
             $this->parseOrderDetails($response);
212 212
 
213 213
             return true;
214
-        } else {
214
+        }else {
215 215
             return false;
216 216
         }
217 217
     }
@@ -223,14 +223,14 @@  discard block
 block discarded – undo
223 223
     {
224 224
         foreach ($response->transactions->transaction as $transaction) {
225 225
             // Record transaction data from FoxyCart Datafeed:
226
-            $this->Store_ID = (int) $transaction->store_id;
227
-            $this->TransactionDate = (string) $transaction->transaction_date;
228
-            $this->ProductTotal = (float) $transaction->product_total;
229
-            $this->TaxTotal = (float) $transaction->tax_total;
230
-            $this->ShippingTotal = (float) $transaction->shipping_total;
231
-            $this->OrderTotal = (float) $transaction->order_total;
232
-            $this->ReceiptURL = (string) $transaction->receipt_url;
233
-            $this->OrderStatus = (string) $transaction->status;
226
+            $this->Store_ID = (int)$transaction->store_id;
227
+            $this->TransactionDate = (string)$transaction->transaction_date;
228
+            $this->ProductTotal = (float)$transaction->product_total;
229
+            $this->TaxTotal = (float)$transaction->tax_total;
230
+            $this->ShippingTotal = (float)$transaction->shipping_total;
231
+            $this->OrderTotal = (float)$transaction->order_total;
232
+            $this->ReceiptURL = (string)$transaction->receipt_url;
233
+            $this->OrderStatus = (string)$transaction->status;
234 234
 
235 235
             $this->extend('handleOrderInfo', $this, $response);
236 236
         }
@@ -249,18 +249,18 @@  discard block
 block discarded – undo
249 249
                 if (Member::get()->filter('Email', $transaction->customer_email)->First()) {
250 250
                     $customer = Member::get()->filter('Email', $transaction->customer_email)->First();
251 251
                     // if new customer, create account with data from FoxyCart
252
-                } else {
252
+                }else {
253 253
                     // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
254 254
                     Config::modify()->set(Security::class, 'password_encryption_algorithm', 'none');
255 255
 
256 256
                     // create new Member, set password info from FoxyCart
257 257
                     $customer = Member::create();
258
-                    $customer->Customer_ID = (int) $transaction->customer_id;
259
-                    $customer->FirstName = (string) $transaction->customer_first_name;
260
-                    $customer->Surname = (string) $transaction->customer_last_name;
261
-                    $customer->Email = (string) $transaction->customer_email;
262
-                    $customer->Password = (string) $transaction->customer_password;
263
-                    $customer->Salt = (string) $transaction->customer_password_salt;
258
+                    $customer->Customer_ID = (int)$transaction->customer_id;
259
+                    $customer->FirstName = (string)$transaction->customer_first_name;
260
+                    $customer->Surname = (string)$transaction->customer_last_name;
261
+                    $customer->Email = (string)$transaction->customer_email;
262
+                    $customer->Password = (string)$transaction->customer_password;
263
+                    $customer->Salt = (string)$transaction->customer_password_salt;
264 264
                     $customer->PasswordEncryption = 'none';
265 265
 
266 266
                     // record member record
@@ -297,11 +297,11 @@  discard block
 block discarded – undo
297 297
             foreach ($transaction->transaction_details->transaction_detail as $detail) {
298 298
                 $OrderDetail = OrderDetail::create();
299 299
 
300
-                $OrderDetail->Quantity = (int) $detail->product_quantity;
301
-                $OrderDetail->ProductName = (string) $detail->product_name;
302
-                $OrderDetail->ProductCode = (string) $detail->product_code;
303
-                $OrderDetail->ProductImage = (string) $detail->image;
304
-                $OrderDetail->ProductCategory = (string) $detail->category_code;
300
+                $OrderDetail->Quantity = (int)$detail->product_quantity;
301
+                $OrderDetail->ProductName = (string)$detail->product_name;
302
+                $OrderDetail->ProductCode = (string)$detail->product_code;
303
+                $OrderDetail->ProductImage = (string)$detail->image;
304
+                $OrderDetail->ProductCategory = (string)$detail->category_code;
305 305
                 $priceModifier = 0;
306 306
 
307 307
                 // parse OrderOptions
@@ -309,14 +309,14 @@  discard block
 block discarded – undo
309 309
                     // Find product via product_id custom variable
310 310
                     if ($option->product_option_name == 'product_id') {
311 311
                         // if product is found, set relation to OrderDetail
312
-                        $OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
312
+                        $OrderProduct = ProductPage::get()->byID((int)$option->product_option_value);
313 313
                         if ($OrderProduct) {
314 314
                             $OrderDetail->ProductID = $OrderProduct->ID;
315 315
                         }
316
-                    } else {
316
+                    }else {
317 317
                         $OrderOption = OrderOption::create();
318
-                        $OrderOption->Name = (string) $option->product_option_name;
319
-                        $OrderOption->Value = (string) $option->product_option_value;
318
+                        $OrderOption->Name = (string)$option->product_option_name;
319
+                        $OrderOption->Value = (string)$option->product_option_value;
320 320
                         $OrderOption->write();
321 321
                         $OrderDetail->OrderOptions()->add($OrderOption);
322 322
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
                     }
325 325
                 }
326 326
 
327
-                $OrderDetail->Price = (float) $detail->product_price + (float) $priceModifier;
327
+                $OrderDetail->Price = (float)$detail->product_price + (float)$priceModifier;
328 328
 
329 329
                 // extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
330 330
                 $this->extend('handleOrderItem', $this, $response, $OrderDetail);
Please login to merge, or discard this patch.