Completed
Pull Request — master (#373)
by Nic
12:09
created
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/Form/FoxyStripePurchaseForm.php 1 patch
Spacing   +8 added lines, -11 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->product->Available) {
@@ -172,7 +169,7 @@  discard block
 block discarded – undo
172 169
                 $code,
173 170
                 'price',
174 171
                 $this->product->Price
175
-            ))->setValue($this->product->Price));//can't override id
172
+            ))->setValue($this->product->Price)); //can't override id
176 173
             if ($this->product->Weight > 0) {
177 174
                 $fields->push(HiddenField::create(ProductPage::getGeneratedValue(
178 175
                     $code,
@@ -214,7 +211,7 @@  discard block
 block discarded – undo
214 211
             );
215 212
 
216 213
             $fields->push(
217
-                HeaderField::create('submitPrice', '$' . $this->product->Price, 4)
214
+                HeaderField::create('submitPrice', '$'.$this->product->Price, 4)
218 215
                     ->addExtraClass('submit-price')
219 216
             );
220 217
             $fields->push(
@@ -223,7 +220,7 @@  discard block
 block discarded – undo
223 220
             );
224 221
 
225 222
             $this->extend('updatePurchaseFormFields', $fields);
226
-        } else {
223
+        }else {
227 224
             $fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock', 4));
228 225
         }
229 226
 
@@ -269,7 +266,7 @@  discard block
 block discarded – undo
269 266
      */
270 267
     protected function getProductOptionSet()
271 268
     {
272
-        $assignAvailable = function ($self) {
269
+        $assignAvailable = function($self) {
273 270
             /** @var OptionItem $self */
274 271
             $this->extend('updateFoxyStripePurchaseForm', $form);
275 272
             $self->Available = ($self->getAvailability()) ? true : false;
Please login to merge, or discard this patch.
src/Model/FoxyStripeClient.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
                 }
152 152
             }
153 153
             if (count($errors)) {
154
-                Injector::inst()->get(LoggerInterface::class)->error('setCurrentStore errors - ' . json_encode($errors));
154
+                Injector::inst()->get(LoggerInterface::class)->error('setCurrentStore errors - '.json_encode($errors));
155 155
             }
156 156
         }
157 157
     }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
         $errors = array_merge($errors, $client->getErrors($result));
190 190
         if (count($errors)) {
191
-            Injector::inst()->get(LoggerInterface::class)->error('updateStore errors - ' . json_encode($errors));
191
+            Injector::inst()->get(LoggerInterface::class)->error('updateStore errors - '.json_encode($errors));
192 192
         }
193 193
     }
194 194
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
             $errors = array_merge($errors, $client->getErrors($result));
219 219
             if (count($errors)) {
220 220
                 Injector::inst()
221
-                    ->get(LoggerInterface::class)->error('setItemCategoriesURL errors - ' . json_encode($errors));
221
+                    ->get(LoggerInterface::class)->error('setItemCategoriesURL errors - '.json_encode($errors));
222 222
             }
223 223
         }
224 224
     }
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             $errors = array_merge($errors, $client->getErrors($result));
248 248
             if (count($errors)) {
249 249
                 Injector::inst()
250
-                    ->get(LoggerInterface::class)->error('setItemCategories errors - ' . json_encode($errors));
250
+                    ->get(LoggerInterface::class)->error('setItemCategories errors - '.json_encode($errors));
251 251
             }
252 252
         }
253 253
     }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                 }
276 276
                 $errors = array_merge($errors, $client->getErrors($result));
277 277
                 if (count($errors)) {
278
-                    Injector::inst()->get(LoggerInterface::class)->error('getCategory errors - ' . json_encode($errors));
278
+                    Injector::inst()->get(LoggerInterface::class)->error('getCategory errors - '.json_encode($errors));
279 279
                 }
280 280
             }
281 281
         }
@@ -296,12 +296,12 @@  discard block
 block discarded – undo
296 296
         if ($client) {
297 297
             if ($category = $this->getCategory($data['code'])) {
298 298
                 $result = $client->patch($category, $data);
299
-            } else {
299
+            }else {
300 300
                 $result = $client->post($this->getItemCategoriesURL(), $data);
301 301
             }
302 302
             $errors = array_merge($errors, $client->getErrors($result));
303 303
             if (count($errors)) {
304
-                Injector::inst()->get(LoggerInterface::class)->error('putCategory errors - ' . json_encode($errors));
304
+                Injector::inst()->get(LoggerInterface::class)->error('putCategory errors - '.json_encode($errors));
305 305
             }
306 306
         }
307 307
     }
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
             $errors = array_merge($errors, $client->getErrors($result));
323 323
             if (count($errors)) {
324
-                Injector::inst()->get(LoggerInterface::class)->error('deleteCategory errors - ' . json_encode($errors));
324
+                Injector::inst()->get(LoggerInterface::class)->error('deleteCategory errors - '.json_encode($errors));
325 325
             }
326 326
         }
327 327
     }
Please login to merge, or discard this patch.
src/API/Client/CustomerClient.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 
100 100
         if (!$this->getCustomer()->Customer_ID) {
101 101
             $response = $client->post($this->getNewCustomerAPIURI(), $this->getSendData());
102
-        } else {
102
+        }else {
103 103
             $response = $client->patch($this->getAPIURI(true), $this->getSendData());
104 104
         }
105 105
 
Please login to merge, or discard this patch.
src/Controller/FoxyStripeController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -142,17 +142,17 @@
 block discarded – undo
142 142
             $Member->Customer_ID = 0;
143 143
         }
144 144
 
145
-        $auth_token = sha1($Member->Customer_ID . '|' . $timestampNew . '|' . FoxyCart::getStoreKey());
145
+        $auth_token = sha1($Member->Customer_ID.'|'.$timestampNew.'|'.FoxyCart::getStoreKey());
146 146
 
147 147
         $config = FoxyStripeSetting::current_foxystripe_setting();
148 148
         if ($config->CustomSSL) {
149 149
             $link = FoxyCart::getFoxyCartStoreName();
150
-        } else {
151
-            $link = FoxyCart::getFoxyCartStoreName() . '.foxycart.com';
150
+        }else {
151
+            $link = FoxyCart::getFoxyCartStoreName().'.foxycart.com';
152 152
         }
153 153
 
154
-        $redirect_complete = 'https://' . $link . '/checkout?fc_auth_token=' . $auth_token . '&fcsid=' . $fcsid .
155
-            '&fc_customer_id=' . $Member->Customer_ID . '&timestamp=' . $timestampNew;
154
+        $redirect_complete = 'https://'.$link.'/checkout?fc_auth_token='.$auth_token.'&fcsid='.$fcsid.
155
+            '&fc_customer_id='.$Member->Customer_ID.'&timestamp='.$timestampNew;
156 156
 
157 157
         $this->redirect($redirect_complete);
158 158
     }
Please login to merge, or discard this patch.
src/Model/Order.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
     {
176 176
         $obj = DBHTMLVarchar::create();
177 177
         $obj->setValue(
178
-            '<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>'
178
+            '<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>'
179 179
         );
180 180
 
181 181
         return $obj;
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
     {
211 211
         if ($this->Response) {
212 212
             $this->transaction = Transaction::create($this->Order_ID, $this->Response);
213
-        } else {
213
+        }else {
214 214
             $this->transaction = false;
215 215
         }
216 216
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                     if ($OrderProduct) {
330 330
                         $OrderDetail->ProductID = $OrderProduct->ID;
331 331
                     }
332
-                } else {
332
+                }else {
333 333
                     $OrderOption = OrderOption::create();
334 334
                     $OrderOption->Name = (string)$option->product_option_name;
335 335
                     $OrderOption->Value = (string)$option->product_option_value;
Please login to merge, or discard this patch.