Merge pull request #221 from Nosto/release/3.3.0

Release 3.3.0

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to Semantic Versioning(http://semver.org/).
 
+## 3.3.0
+- Add marketing permission for customer tagging and for buyer 
+- Fix the compatibility issue with some third-party plugins which update catalog without setting employee to prestashop context
+
 ## 3.2.4
 - Fix the bug that could not add product to cart without nosto account 
 

classes/models/NostoCustomer.php

@@ -39,6 +39,7 @@ public static function loadData(Customer $customer)
         $nostoCustomer->setFirstName($customer->firstname);
         $nostoCustomer->setLastName($customer->lastname);
         $nostoCustomer->setEmail($customer->email);
+        $nostoCustomer->setMarketingPermission($customer->newsletter);
         try {
             $nostoCustomer->populateCustomerReference($customer);
         } catch (Exception $e) {

classes/models/order/NostoOrderBuyer.php

@@ -40,6 +40,7 @@ public static function loadData(Customer $customer, Order $order)
         $nostoBuyer->setFirstName($customer->firstname);
         $nostoBuyer->setLastName($customer->lastname);
         $nostoBuyer->setEmail($customer->email);
+        $nostoBuyer->setMarketingPermission($customer->newsletter);
 
         $billingAddressId = $order->id_address_invoice;
         $addresses = $customer->getAddresses($order->id_lang);

classes/services/NostoProductService.php

@@ -189,9 +189,23 @@ public function upsert($params)
             if ($object instanceof Product) {
                 //run over all the nosto account
                 $nostoProductService = $this;
-                NostoHelperContext::runWithEachNostoAccount(function () use ($object, $nostoProductService) {
-                    $nostoProductService->updateProduct($object);
-                });
+                // We need to forge the employee in order to get a price for a product
+                $employeeId = false; //@codingStandardsIgnoreLine
+                if (!is_object(Context::getContext()->employee) && !is_object(Context::getContext()->cart)) {
+                    //if employee is null and cart is null, new Product() kills the process.
+                    $employeeId = 0;
+                }
+                NostoHelperContext::runInContext(
+                    function () use ($object, $nostoProductService) {
+                        NostoHelperContext::runWithEachNostoAccount(function () use ($object, $nostoProductService) {
+                            $nostoProductService->updateProduct($object);
+                        });
+                    },
+                    false,
+                    false,
+                    false,
+                    $employeeId
+                );
             }
         }
     }

composer.json

@@ -2,7 +2,7 @@
   "name": "nosto/nostotagging",
   "description": "Nosto Module for Prestashop",
   "require": {
-    "nosto/php-sdk": "3.2.1"
+    "nosto/php-sdk": "3.3.1"
   },
   "require-dev": {
     "phing/phing": "2.*",

nostotagging.php

@@ -56,7 +56,7 @@ class NostoTagging extends Module
      *
      * @var string
      */
-    const PLUGIN_VERSION = '3.2.4';
+    const PLUGIN_VERSION = '3.3.0';
 
     /**
      * Internal name of the Nosto plug-in