wait #6453 @0:20

diff --git a/app/Fluidbook/Compiler/Cart.php b/app/Fluidbook/Compiler/Cart.php
index 77794c6b6f97852eefdf2a5879f5867898176a45..5d3c14f393eb76b3edd8be01561b2f00ab92fb1b 100644 (file)
--- a/app/Fluidbook/Compiler/Cart.php
+++ b/app/Fluidbook/Compiler/Cart.php
@@ -515,7 +515,7 @@ trait Cart
                 $referencesFile = $this->wdir . '/commerce/' . $this->config->product_zoom_references;
             }
             if (file_exists($referencesFile) || Url::isDistant($referencesFile)) {
-                $this->config->product_zoom_references = ExcelToArray::excelToArrayKeyValMulti($referencesFile, 'Excel2007', true);
+                $this->config->product_zoom_references = ExcelToArray::excelToArrayKeyValMulti($referencesFile, null, true);
             }
         }
 
@@ -532,7 +532,7 @@ trait Cart
                     if ($this->config->basketManager == "ZoomProductLink") {
                         $function = 'excelToArrayKeyVal';
                     } else {
-                        $function = 'excelToArray';
+                        $function = 'excelToArrayRaw';
                     }
                     $this->config->basketReferences = ExcelToArray::$function($referencesFile);
                     if ($this->fluidbookSettings->customLinkClass == 'AtlanticDownloadLink') {

diff --git a/package-lock.json b/package-lock.json
index 7114deb301c5d2edb56e0bd64991b65f86325b74..750ce7f3dee36407120e6377c0bbe796e0f9dc1a 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -11055,7 +11055,7 @@
         "node_modules/webpack-sources": {
             "version": "1.4.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-            "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+            "integrity": "sha512-lgTS3XhvlCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
             "dev": true,
             "dependencies": {
                 "source-list-map": "^2.0.0",