CHANGE method parameter rearranged so the parameter with default valu…

…es are the last
plentymarkets · Feb 17, 2020 · 712beb9 · 712beb9
1 parent f37d1ed
commit 712beb9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/Methods/InvoicePaymentMethod.php b/src/Methods/InvoicePaymentMethod.php
@@ -93,12 +93,12 @@ public function isActive( BasketRepositoryContract $basketRepositoryContract):bo
 
 
         return $helper->respectsAllLimitations(
-            pluginApp(SettingsHelper::class, [$this->settings, $this->systemService->getPlentyId()]), 
-            $isGuest, 
-            $this->checkout->getCustomerInvoiceAddressId(), 
-            $this->checkout->getCustomerShippingAddressId(),
+            pluginApp(SettingsHelper::class, [$this->settings, $this->systemService->getPlentyId()]),
+            $isGuest,
+            $amount,
             $this->checkout->getShippingCountryId(),
-            $amount, 
+            $this->checkout->getCustomerInvoiceAddressId(),
+            $this->checkout->getCustomerShippingAddressId(),
             $contact
         );
     }
@@ -223,12 +223,12 @@ public function isSwitchableTo(int $orderId = null):bool
                 $contact = $order->contactReceiver;
 
                 return $helper->respectsAllLimitations(
-                    pluginApp(SettingsHelper::class, [$this->settings, $order->plentyId]), 
-                    $contact === null, 
-                    $order->billingAddress->id, 
-                    $order->deliveryAddress->id,
+                    pluginApp(SettingsHelper::class, [$this->settings, $order->plentyId]),
+                    $contact === null,
+                    $order->amount,
                     $order->deliveryAddress->countryId,
-                    $order->amount, 
+                    $order->billingAddress->id,
+                    $order->deliveryAddress->id,
                     $contact
                 );
             } catch(\Exception $e) {
@@ -255,12 +255,12 @@ public function isSwitchableTo(int $orderId = null):bool
             $amount->invoiceTotal = $basket->basketAmount;
 
             return $helper->respectsAllLimitations(
-                pluginApp(SettingsHelper::class, [$this->settings, $this->systemService->getPlentyId()]), 
-                $isGuest, 
-                $this->checkout->getCustomerInvoiceAddressId(), 
-                $this->checkout->getCustomerShippingAddressId(),
+                pluginApp(SettingsHelper::class, [$this->settings, $this->systemService->getPlentyId()]),
+                $isGuest,
+                $amount,
                 $this->checkout->getShippingCountryId(),
-                $amount, 
+                $this->checkout->getCustomerInvoiceAddressId(),
+                $this->checkout->getCustomerShippingAddressId(),
                 $contact
             );
         }

diff --git a/src/Services/InvoiceLimitationsService.php b/src/Services/InvoiceLimitationsService.php
@@ -22,21 +22,21 @@ class InvoiceLimitationsService
      * 
      * @param SettingsHelper $settingsHelper    The setting helper 
      * @param bool           $isGuest           Whether or not the current customer is a guest or not
+     * @param OrderAmount    $amount            The total amount
+     * @param int            $shippingCountryId The ID of the shipping country
      * @param int            $billingAddressId  The ID of the billing address
      * @param int            $deliveryAddressId The ID of the delivery address
-     * @param int            $shippingCountryId The ID of the shipping country
-     * @param OrderAmount    $amount            The total amount
      * @param Contact|null   $contact           The contact instance, if customer is not a quest
      * 
      * @return bool
      */
     public function respectsAllLimitations(
         SettingsHelper $settingsHelper,
         bool $isGuest,
+        OrderAmount $amount,
+        int $shippingCountryId,
         int $billingAddressId = null,
         int $deliveryAddressId = null,
-        int $shippingCountryId,
-        OrderAmount $amount,
         Contact $contact = null
     ): bool
     {