Merge branch 'develop'

Author: samberrry

classes/APIRoutes.php

@@ -284,6 +284,15 @@ public static final function getRoutes(): array
                     'module' => 'binshopsrest'
                 ]
             ],
+            'module-binshopsrest-emailsubscription' => [
+                'rule' => 'rest/emailsubscription',
+                'keywords' => [],
+                'controller' => 'emailsubscription',
+                'params' => [
+                    'fc' => 'module',
+                    'module' => 'binshopsrest'
+                ]
+            ],
         ];
     }
 }

controllers/front/categoryproducts.php

@@ -103,6 +103,13 @@ protected function processGetRequest()
             'facets' => $facets
         ];
 
+        if (Tools::getValue('with_category_tree')){
+            $this->context->cookie->last_visited_category = $id_category;
+            $categoryTreeModule = Module::getInstanceByName('ps_categorytree');
+            $categoryTreeVariables = $categoryTreeModule->getWidgetVariables();
+            $psdata['categories'] = $categoryTreeVariables['categories'];
+        }
+
         $this->ajaxRender(json_encode([
             'code' => 200,
             'success' => true,

controllers/front/emailsubscription.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * BINSHOPS
+ *
+ * @author BINSHOPS
+ * @copyright BINSHOPS
+ * @license   http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ * Best In Shops eCommerce Solutions Inc.
+ *
+ */
+
+require_once dirname(__FILE__) . '/../AbstractRESTController.php';
+
+class BinshopsrestEmailsubscriptionModuleFrontController extends AbstractRESTController
+{
+
+    protected function processGetRequest()
+    {
+        $conditions = Configuration::get('NW_CONDITIONS', $this->context->language->id);
+
+        $this->ajaxRender(json_encode([
+            'success' => true,
+            'code' => 200,
+            'psdata' => $conditions,
+            'message' => 'success'
+        ]));
+        die;
+    }
+
+    protected function processPostRequest()
+    {
+        $ps_emailsubscription = Module::getInstanceByName('ps_emailsubscription');
+        $email = Tools::getValue('email', '');
+
+        if ($ps_emailsubscription->isNewsletterRegistered($email) === 1 || $ps_emailsubscription->isNewsletterRegistered($email) === 2){
+            $this->ajaxRender(json_encode([
+                'success' => false,
+                'code' => 301,
+                'message' => 'This email is already registered'
+            ]));
+            die;
+        }
+
+        if ($this->registerGuest($email)) {
+            $this->ajaxRender(json_encode([
+                'success' => true,
+                'code' => 200,
+                'message' => 'success'
+            ]));
+            die;
+
+        } elseif ($ps_emailsubscription->valid) {
+            $this->ajaxRender(json_encode([
+                'success' => false,
+                'code' => 300,
+                'message' => 'failure'
+            ]));
+            die;
+        }
+    }
+
+    protected function processPutRequest()
+    {
+        $this->ajaxRender(json_encode([
+            'success' => true,
+            'message' => 'put not supported on this path'
+        ]));
+        die;
+    }
+
+    protected function processDeleteRequest()
+    {
+        $this->ajaxRender(json_encode([
+            'success' => true,
+            'message' => 'delete not supported on this path'
+        ]));
+        die;
+    }
+
+    protected function registerGuest($email, $active = true)
+    {
+        $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'emailsubscription (id_shop, id_shop_group, email, newsletter_date_add, ip_registration_newsletter, http_referer, active, id_lang)
+                VALUES
+                (' . $this->context->shop->id . ',
+                ' . $this->context->shop->id_shop_group . ',
+                \'' . pSQL($email) . '\',
+                NOW(),
+                \'' . pSQL(Tools::getRemoteAddr()) . '\',
+                (
+                    SELECT c.http_referer
+                    FROM ' . _DB_PREFIX_ . 'connections c
+                    WHERE c.id_guest = ' . (int) $this->context->customer->id . '
+                    ORDER BY c.date_add DESC LIMIT 1
+                ),
+                ' . (int) $active . ',
+                ' . $this->context->language->id . '
+                )';
+
+        return Db::getInstance()->execute($sql);
+    }
+}