Update to 1.2.3

Author: RaphaelBronsveld

README.md

@@ -4,7 +4,7 @@ Flowbox integration for Magento2
 
 Facts
 -----
-- version: 1.2.2
+- version: 1.2.3
 - extension key: Itonomy_Flowbox
 
 Description

composer.json

@@ -2,7 +2,7 @@
     "name": "itonomy/module-flowbox",
     "description": "Flowbox for Magento2",
     "type": "magento2-module",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": [
         "MIT"
     ],

composer.json.marketplace

@@ -2,7 +2,7 @@
     "name": "itonomy/module-flowbox",
     "description": "Flowbox for Magento2",
     "type": "magento2-module",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": [
         "MIT"
     ],

src/Block/Checkout/Onepage/Success.php

@@ -30,7 +30,7 @@ public function __construct(
         parent::__construct($context, $encryptor, $data);
         $this->checkoutSession = $checkoutSession;
     }
-    
+
     /**
      * @inheritDoc
      */
@@ -50,7 +50,7 @@ function ($item) {
                             'quantity' => (int) $item->getQtyOrdered()
                         ];
                     },
-                    $order->getItems()
+                    $this->getAllVisibleItems($order)
                 ),
             ]);
         } catch (\Exception $e) {
@@ -64,4 +64,20 @@ function ($item) {
             $this->_logger->error($errorMessage, ['exception' => $e]);
         }
     }
-}
+    /**
+     * Retrieves visible products of the order, omitting its children (yes, this is different than Magento's method)
+     * @param Magento\Sales\Model\Order $order
+     *
+     * @return array
+     */
+    protected function getAllVisibleItems($order)
+    {
+        $items = [];
+        foreach ($order->getItems() as $item) {
+            if (!$item->isDeleted() && !$item->getParentItem()) {
+                $items[] = $item;
+            }
+        }
+        return $items;
+    }
+}

src/etc/config.xml

@@ -14,5 +14,13 @@
                 <debug_javascript>0</debug_javascript>
             </general>
         </itonomy_flowbox>
+        <dev>
+            <js>
+                <minify_exclude>
+                    <flowbox>https://connect.getflowbox.com/flowbox.js</flowbox>
+                    <flowbox_checkout>https://connect.getflowbox.com/bzfy-checkout.js</flowbox_checkout>
+                </minify_exclude>
+            </js>
+        </dev>
     </default>
 </config>

src/etc/csp_whitelist.xml

@@ -13,6 +13,7 @@
                 <value id="amazon-aws" type="host">https://*.amazonaws.com</value>
                 <value id="flowbox-cdn" type="host">https://cdn.flbx.io</value>
                 <value id="flowbox" type="host">https://connect.getflowbox.com</value>
+                <value id="flowbox-insecure" type="host">http://connect.getflowbox.com</value>
             </values>
         </policy>
         <policy id="img-src">
@@ -24,7 +25,8 @@
             <values>
                 <value id="flowbox-cdn" type="host">https://cdn.flbx.io</value>
                 <value id="flowbox" type="host">https://connect.getflowbox.com</value>
+                <value id="flowbox-insecure" type="host">http://connect.getflowbox.com</value>
             </values>
         </policy>
     </policies>
-</csp_whitelist>
+</csp_whitelist>

src/etc/module.xml

@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Itonomy_Flowbox" setup_version="1.2.2">
+    <module name="Itonomy_Flowbox" setup_version="1.2.3">
         <sequence>
         </sequence>
     </module>

src/view/frontend/templates/checkout/success.phtml

@@ -16,7 +16,7 @@
                     "components": {
                         "flowbox-checkout": {
                             "component": "Itonomy_Flowbox/js/checkout",
-                            "config": <?= $block->escapeJs($block->getJsConfig()) ?>,
+                            "config": <?= /* @escapeNotVerified */ $block->getJsConfig() ?>,
                             "dataScope": "flowbox"
                         }
                     }