Merge branch 'develop' into github/master

binshops · Jul 3, 2022 · aef4556 · aef4556
2 parents ca45557 + 0635f42
commit aef4556
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 0 deletions.
diff --git a/classes/APIRoutes.php b/classes/APIRoutes.php
@@ -266,6 +266,15 @@ public static final function getRoutes(): array
                     'module' => 'binshopsrest'
                 ]
             ],
+            'module-binshopsrest-ps_cashondelivery' => [
+                'rule' => 'rest/ps_cashondelivery',
+                'keywords' => [],
+                'controller' => 'ps_cashondelivery',
+                'params' => [
+                    'fc' => 'module',
+                    'module' => 'binshopsrest'
+                ]
+            ],
             'module-binshopsrest-wishlist' => [
                 'rule' => 'rest/wishlist',
                 'keywords' => [],

diff --git a/controllers/front/ps_cashondelivery.php b/controllers/front/ps_cashondelivery.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * BINSHOPS
+ *
+ * @author BINSHOPS
+ * @copyright BINSHOPS
+ *
+ */
+
+require_once dirname(__FILE__) . '/../AbstractPaymentRESTController.php';
+
+class BinshopsrestPs_cashondeliveryModuleFrontController extends AbstractPaymentRESTController
+{
+    protected function processRESTPayment()
+    {
+        $cart = $this->context->cart;
+
+        // Check that this payment option is still available in case the customer changed his address just before the end of the checkout process
+        $authorized = false;
+        foreach (Module::getPaymentModules() as $module) {
+            if ($module['name'] == 'ps_cashondelivery') {
+                $authorized = true;
+                break;
+            }
+        }
+
+        if (!$authorized) {
+            $this->ajaxRender(json_encode([
+                'success' => false,
+                'code' => 302,
+                'message' => $this->trans('This payment method is not available', [], 'Modules.Binshopsrest.Payment')
+            ]));
+            die;
+        }
+
+        $customer = new Customer($cart->id_customer);
+
+        if (!Validate::isLoadedObject($customer)) {
+            $this->ajaxRender(json_encode([
+                'success' => false,
+                'code' => 301,
+                'message' => $this->trans('payment processing failed', [], 'Modules.Binshopsrest.Payment')
+            ]));
+            die;
+        }
+
+        $currency = $this->context->currency;
+        $total = (float) $cart->getOrderTotal(true, Cart::BOTH);
+
+        $mailVars = [
+            '{check_name}' => Configuration::get('CHEQUE_NAME'),
+            '{check_address}' => Configuration::get('CHEQUE_ADDRESS'),
+            '{check_address_html}' => str_replace("\n", '<br />', Configuration::get('CHEQUE_ADDRESS')), ];
+
+        $ps_cashondelivery = Module::getInstanceByName('ps_cashondelivery');
+
+        $ps_cashondelivery->validateOrder(
+            (int) $cart->id,
+            (int) Configuration::getGlobalValue(Ps_Cashondelivery::CONFIG_OS_CASH_ON_DELIVERY),
+            $total,
+            $ps_cashondelivery->displayName,
+            null,
+            $mailVars,
+            (int) $currency->id,
+            false,
+            $customer->secure_key
+        );
+    }
+}