Merge pull request #123 from lsimeonov/fix/extend-extension-attributes

Keep existing extension attributes when extending shipping payload request

CHANGELOG.md

@@ -6,9 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### [Unreleased]
 
+### [3.0.6] - 2021-07-01
+
 #### Added
 - Add an ability to pass the Store ID during track event
 
+#### Fixed
+- Keep existing extension attributes when extending shipping payload request
+
 ### [3.0.5] - 2021-06-08
 
 #### Added
@@ -104,7 +109,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CSP now uses report-only mode
 
 
-[Unreleased]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.5...HEAD
+[Unreleased]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.6...HEAD
+[3.0.6]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.5...3.0.6
 [3.0.5]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.4...3.0.5
 [3.0.4]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.2...3.0.3

composer.json

@@ -2,7 +2,7 @@
     "name": "klaviyo/magento2-extension",
     "description": "Klaviyo extension for Magento 2. Allows pushing newsletters to Klaviyo's platform and more.",
     "type": "magento2-module",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "autoload": {
         "files": [
             "registration.php"

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Klaviyo_Reclaim" setup_version="3.0.5" schema_version="3.0.5">
+  <module name="Klaviyo_Reclaim" setup_version="3.0.6" schema_version="3.0.6">
       <sequence>
           <module name="Magento_Customer"/>
           <module name="Magento_Checkout"/>

view/frontend/requirejs-config.js

@@ -2,7 +2,13 @@ var config = {
     map: {
         '*': {
             KlaviyoCustomerData: 'Klaviyo_Reclaim/js/customer',
-            'Magento_Checkout/js/model/shipping-save-processor/default': 'Klaviyo_Reclaim/js/model/shipping-save-processor/default'
+        }
+    },
+    config: {
+        mixins: {
+            'Magento_Checkout/js/model/shipping-save-processor/payload-extender': {
+                'Klaviyo_Reclaim/js/mixin/shipping-payload-extender-mixin': true
+            },
         }
     }
 };

view/frontend/web/js/mixin/shipping-payload-extender-mixin.js

@@ -0,0 +1,22 @@
+define([
+    'mage/utils/wrapper',
+    'Klaviyo_Reclaim/js/model/shipping-payload/assigner'
+], function (wrapper, assignData) {
+    'use strict';
+
+    /**
+     * This file works on Magento >= 2.2.2 only.
+     *
+     * @param  {Object} target
+     * @return {Object}
+     */
+    return function (target) {
+        return wrapper.wrap(target, function (parentFunction, payload) {
+            parentFunction(payload);
+
+            assignData(payload.addressInformation);
+
+            return payload;
+        });
+    };
+});

view/frontend/web/js/model/shipping-payload/assigner.js

@@ -0,0 +1,19 @@
+define([
+    'jquery',
+    'underscore',
+], function ($,_, registry) {
+    'use strict';
+
+    return function (container) {
+        var kl_sms_consent = $('[name="custom_attributes[kl_sms_consent]"]').is(':checked');
+        var kl_email_consent = $('[name="custom_attributes[kl_email_consent]"]').is(':checked');
+
+        container.extension_attributes = _.extend(
+            container.extension_attributes || {},
+            {
+                kl_sms_consent: kl_sms_consent,
+                kl_email_consent: kl_email_consent
+            }
+        );
+    };
+});