@@ -43,8 +43,7 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -74,8 +73,7 @@ discard block |
||
| 74 | 73 | // if FoxyCart order id, then parse order |
| 75 | 74 | if (isset($transaction->id)) { |
| 76 | 75 | ($order = Order::get()->filter('Order_ID', (int)$transaction->id)->First()) ? |
| 77 | - $order = Order::get()->filter('Order_ID', (int)$transaction->id)->First() : |
|
| 78 | - $order = Order::create(); |
|
| 76 | + $order = Order::get()->filter('Order_ID', (int)$transaction->id)->First() : $order = Order::create(); |
|
| 79 | 77 | |
| 80 | 78 | // save base order info |
| 81 | 79 | $order->Order_ID = (int)$transaction->id; |
@@ -134,7 +132,7 @@ discard block |
||
| 134 | 132 | /* todo: make sure local password is updated if changed on FoxyCart |
| 135 | 133 | $this->updatePasswordFromData($customer, $order); |
| 136 | 134 | */ |
| 137 | - } else { |
|
| 135 | + }else { |
|
| 138 | 136 | // create new Member, set password info from FoxyCart |
| 139 | 137 | $customer = Member::create(); |
| 140 | 138 | $customer->Customer_ID = (int)$order->customer_id; |
@@ -161,8 +159,8 @@ discard block |
||
| 161 | 159 | Security::config()->update('password_encryption_algorithm', 'none'); |
| 162 | 160 | |
| 163 | 161 | $customer->PasswordEncryption = $this->getEncryption($order->customer_password_hash_type); |
| 164 | - $customer->Password = (string) $order->customer_password; |
|
| 165 | - $customer->Salt = (string) $order->customer_password_salt; |
|
| 162 | + $customer->Password = (string)$order->customer_password; |
|
| 163 | + $customer->Salt = (string)$order->customer_password_salt; |
|
| 166 | 164 | |
| 167 | 165 | Security::config()->update('password_encryption_algorithm', $password_encryption_algorithm); |
| 168 | 166 | } |
@@ -253,7 +251,7 @@ discard block |
||
| 253 | 251 | } |
| 254 | 252 | |
| 255 | 253 | return ProductPage::get() |
| 256 | - ->filter('ID', (int) $productOptions->product_option_value) |
|
| 254 | + ->filter('ID', (int)$productOptions->product_option_value) |
|
| 257 | 255 | ->First(); |
| 258 | 256 | } |
| 259 | 257 | } |
@@ -303,18 +301,18 @@ discard block |
||
| 303 | 301 | // to do: consider a login/registration form here if not logged in |
| 304 | 302 | if ($Member = Security::getCurrentUser()) { |
| 305 | 303 | $Member = Security::getCurrentUser(); |
| 306 | - } else { |
|
| 304 | + }else { |
|
| 307 | 305 | $Member = new Member(); |
| 308 | 306 | $Member->Customer_ID = 0; |
| 309 | 307 | } |
| 310 | 308 | |
| 311 | - $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey()); |
|
| 309 | + $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey()); |
|
| 312 | 310 | |
| 313 | 311 | $config = FoxyStripeSetting::current_foxystripe_setting(); |
| 314 | 312 | if ($config->CustomSSL) { |
| 315 | 313 | $link = FoxyCart::getFoxyCartStoreName(); |
| 316 | - } else { |
|
| 317 | - $link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com'; |
|
| 314 | + }else { |
|
| 315 | + $link = FoxyCart::getFoxyCartStoreName().'.foxycart.com'; |
|
| 318 | 316 | } |
| 319 | 317 | |
| 320 | 318 | $redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid. |