wickes-css2 2.94.0-develop.2 → 2.94.0-develop.21

package/src/js/page/quiz.js

@@ -4,7 +4,7 @@ import {
   isValidInputTextField,
   updateStylingError
 } from "./utils/validation";
-import {isTouchDevice, isApp} from "./utils/helpers";
+import {isTouchDevice} from "./utils/helpers";
 
 var Wick = window.Wick || {};
 Wick.Quiz = {
@@ -209,9 +209,25 @@ Wick.Quiz = {
       };
 
       html2pdf()
-        .set(options)
-        .from(selector)
-        .save();
+          .set(options)
+          .from(selector)
+          .output('datauristring')
+          .then(function (pdfAsDataUri) {
+
+            const postMessage = {
+              event: 'matchMakertoolResultBase64',
+              data: {
+                filename: options.filename,
+                file: pdfAsDataUri
+              }
+            };
+
+            if (window.ReactNativeWebView && window.ReactNativeWebView.postMessage) {
+              window.ReactNativeWebView.postMessage(JSON.stringify(postMessage));
+            } else {
+              console.warn('ReactNativeWebView not available');
+            }
+          }).save();
     }).catch(error => console.error("Error converting SVGs:", error));
   },
 
@@ -251,12 +267,6 @@ Wick.Quiz = {
     };
   },
 
-  disablePrintButtonOnMobileApp: function() {
-    if (isApp()) {
-      Wick.Quiz.disableButton(Wick.Quiz.el.btnPrintResultQuiz);
-    }
-  },
-
   handlePrintOrPDFInteraction: function (event) {
     event.preventDefault();
 
@@ -284,7 +294,6 @@ Wick.Quiz = {
       debouncedHandleInteraction(event);
     });
 
-    Wick.Quiz.disablePrintButtonOnMobileApp();
   }
 };
 

package/src/layouts/basket-new.hbs

@@ -38,7 +38,7 @@
       {{#block "prefooter"}}{{/block}}
     </main>
     {{#block "footer"}}
-      {{> footer-checkout-v2 }}
+      {{> footer-checkout-v2}}
     {{/block}}
     {{#block "foot"}}
       {{> scripts }}

package/src/layouts/checkout-new.hbs

@@ -42,6 +42,7 @@
     {{/block}}
     {{#block "foot"}}
       {{> scripts }}
+      <script src="./js/checkout.min.js"></script>
     {{/block}}
   </body>
 </html>

package/src/page_checkout_confirmation-new-marketing-consent-error.html

@@ -61,8 +61,6 @@
     </div>
   </div>
 
-  {{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
     <button class="btn btn-action">Continue to Payment Details</button>
   </div>

package/src/page_checkout_delivery-address-customer-journey.html

@@ -36,8 +36,6 @@
     </div>
   </div>
 
-{{> checkout_voucher_large  title="Voucher Code" id="0"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Delivery Details</button>
   </div>
@@ -47,7 +45,6 @@
 {{#content "foot" mode="append"}}
   <script defer src="./js/page/checkout-confirmation-new.js"></script>
   <script defer src="./js/page/select-address.js"></script>
-  <script src="./js/checkout.min.js"></script>
 
   {{#extend "modal" classMod="edit-delivery-address" id="modalDeliveryEdit" title="Edit delivery address" fullWidth=true}}
     {{#content "body"}}
@@ -67,5 +64,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery-address-v2.html

@@ -32,9 +32,6 @@
     </div>
   </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code" id="0"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Delivery Details</button>
   </div>
@@ -43,6 +40,5 @@
 
 {{#content "foot" mode="append"}}
 <script defer src="./js/page/checkout-confirmation-new.js"></script>
-<script src="./js/checkout.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_checkout_delivery-details-v2-asm.html

@@ -1,4 +1,4 @@
-{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Delivery details" isAsideSticky="true"}}
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
 {{> steps active-step-index="2" }}
 {{/content}}
@@ -117,8 +117,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -146,5 +144,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery-details-v2-calendar-message.html

@@ -120,8 +120,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -131,7 +129,6 @@
 {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-confirmation-new.js"></script>
     <script defer src="./js/page/select-address.js"></script>
-    <script src="./js/checkout.min.js"></script>
 
     {{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}
         {{#content "body"}}

package/src/page_checkout_delivery-details-v2-oos.html

@@ -144,8 +144,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -155,7 +153,6 @@
 {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-confirmation-new.js"></script>
     <script defer src="./js/page/select-address.js"></script>
-    <script src="./js/checkout.min.js"></script>
 
 
     {{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}

package/src/page_checkout_delivery-details-v2-wisdom-not-available.html

@@ -126,9 +126,6 @@
         </button>
     </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -160,5 +157,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery-details-v2-wisdom.html

@@ -123,9 +123,6 @@
         </button>
     </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -157,5 +154,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery-details-with-loader-v2.html

@@ -119,8 +119,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -130,7 +128,6 @@
 {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-confirmation-new.js"></script>
     <script defer src="./js/page/select-address.js"></script>
-    <script src="./js/checkout.min.js"></script>
 
     {{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}
         {{#content "body"}}

package/src/page_checkout_delivery-details_guest-new.html

@@ -117,8 +117,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -127,7 +125,6 @@
 
 {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-confirmation-new.js"></script>
-    <script src="./js/checkout.min.js"></script>
 
   {{#extend "modal" classMod="edit-delivery-address" id="modalDeliveryEdit" title="Edit delivery address" fullWidth=true}}
   {{#content "body"}}
@@ -147,5 +144,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery_address-asm-new.html

@@ -24,8 +24,6 @@
     </div>
   </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Delivery Details</button>
   </div>
@@ -35,7 +33,6 @@
 {{#content "foot" mode="append"}}
   <script defer src="./js/page/checkout-confirmation-new.js"></script>
   <script defer src="./js/page/select-address.js"></script>
-  <script src="./js/checkout.min.js"></script>
 
   {{#extend "modal" classMod="edit-delivery-address" id="modalDeliveryEdit" title="Edit delivery address" fullWidth=true}}
     {{#content "body"}}
@@ -51,4 +48,3 @@
 
 {{/content}}
 {{/extend}}
-

package/src/page_checkout_next-day-delivery-details.html

@@ -126,9 +126,6 @@
   </button>
 </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code"}}
-
 <div class="continue-btn">
   <button class="btn btn-action">Continue to Payment Details</button>
 </div>
@@ -138,7 +135,6 @@
 {{#content "foot" mode="append"}}
 <script defer src="./js/page/checkout-confirmation-new.js"></script>
 <script defer src="./js/page/select-address.js"></script>
-<script src="./js/checkout.min.js"></script>
 
 {{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}
 {{#content "body"}}
@@ -157,5 +153,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_payment-details-v2.html

@@ -1,4 +1,4 @@
-{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details" isAsideSticky="true" clearPayIcon=true}}
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Payment details" isAsideSticky="true" clearPayIcon=true}}
 {{#content "steps"}}
 {{> steps-three-steps active-step-index="2"}}
 {{/content}}

package/src/page_checkout_payment-details_guest-with-checkout-journey.html

@@ -61,8 +61,6 @@
         </div>
     </div>
 
-    {{> checkout_voucher_large  title="Voucher Code"}}
-
     <div class="continue-btn">
         <button class="btn btn-action">Continue to Payment Details</button>
     </div>

package/src/page_checkout_payment-details_login-with-checkout-journey.html

@@ -61,8 +61,6 @@
         </div>
     </div>
 
-    {{> checkout_voucher_large  title="Voucher Code"}}
-
     <div class="continue-btn">
         <button class="btn btn-action">Continue to Payment Details</button>
     </div>

package/src/page_checkout_payment-details_with-card-loader.html

@@ -0,0 +1,56 @@
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details" isAsideSticky="true"}}
+{{#content "steps"}}
+{{> steps-three-steps active-step-index="3" }}
+{{/content}}
+
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
+<link type="text/css" rel="stylesheet" href="./css/pages/page_checkout_delivery-new.css">
+<link type="text/css" rel="stylesheet" href="./css/components/payment-details-BPS-form.css">
+<link type="text/css" rel="stylesheet" href="./css/components/checkout-payment-details-v2.css">
+{{/content}}
+
+{{#content "aside"}}
+{{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true}}
+{{/content}}
+
+
+{{#content "main"}}
+<div class="delivery-block">
+    <h3 class="delivery-block__heading">Delivery Information</h3>
+    <div class="delivery-block__wrapper">
+        {{#with checkoutOrder.deliveryPayments.[0]}}
+        <div class="checkout-order">
+            {{> checkout-order-block}}
+        </div>
+        {{/with}}
+    </div>
+</div>
+
+<div class="click-collect-block">
+    <h3 class="click-collect-block__heading">Click & Collect</h3>
+    <div class="click-collect-block__wrapper">
+        {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
+        <div class="checkout-order">
+            {{> checkout-order-block}}
+        </div>
+        {{/with}}
+    </div>
+</div>
+
+<div class="billing-payment-block">
+    <h3 class="billing-payment-block__heading">Billing & Payment</h3>
+    <div class="billing-payment-block__wrapper">
+        {{> checkout-payment-details-v2 }}
+    </div>
+</div>
+
+{{/content}}
+
+{{#content "foot" mode="append"}}
+<script defer src="./js/page/checkout-confirmation-new.js"></script>
+<script defer src="./js/page/checkout-payment-details.js"></script>
+{{> checkout-terms-and-conditions-modal }}
+{{> payment-loader }}
+{{/content}}
+{{/extend}}

package/src/page_checkout_rapid-delivery-details.html

@@ -128,9 +128,6 @@
         </button>
     </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -140,7 +137,6 @@
 {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-confirmation-new.js"></script>
     <script defer src="./js/page/select-address.js"></script>
-    <script src="./js/checkout.min.js"></script>
 
     {{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}
         {{#content "body"}}
@@ -159,5 +155,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_default-store-page-empty.html

@@ -0,0 +1,48 @@
+{{#extend "my-account-v2" dataBreadcrumbs=default-store.breadcrumbs pageClass="page_my-account_new" title="Default Store Page" pageMyAcc=true myAccV2=true isLoggedIn=true mainClass="default-store"}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/page_default-store.css">
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+          menu=default-store.menu
+          active-index=6
+          page-name=default-store.menu.[6].title
+          }}
+    </div>
+  </div>
+</div>
+
+<div class="container default-store__wrap">
+  <div class="row">
+    <div class="col-12 d-md-none">
+      <h1 class="default-store__title">{{default-store.title}}</h1>
+    </div>
+    <div class="col-12 col-md-6 default-store__search">
+      <div class="default-store__header">
+        <h1 class="default-store__title d-none d-md-block">{{default-store.title}}</h1>
+        <p class="default-store__subtitle">{{default-store.subtitle}}</p>
+      </div>
+      {{> default-store/store-form
+          default-store.searchField
+      }}
+      {{> default-store/store-unavailable
+          default-store.unavailable
+      }}
+      {{> default-store/list-of-store
+          style="display: none;"
+      }}
+    </div>
+    <div class="col-12 col-md-6">
+    </div>
+  </div>
+</div>
+
+{{/content}}
+{{#content "foot" mode="append"}}
+<script defer src="./js/my-account.min.js"></script>
+<script defer src="./js/default-store.min.js"></script>
+{{/content}}
+{{/extend}}

package/src/page_default-store-page.html

@@ -0,0 +1,55 @@
+{{#extend "my-account-v2" dataBreadcrumbs=default-store.breadcrumbs pageClass="page_my-account_new" title="Default Store Page" pageMyAcc=true myAccV2=true isLoggedIn=true mainClass="default-store"}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/page_default-store.css">
+{{/content}}
+{{#content "notification"}}
+  <div class="globalMessages">
+    <div class="container">
+      {{> notifications notification-page.success withCloseBtn="true"}}
+    </div>
+  </div>
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+      menu=default-store.menu
+      active-index=6
+      page-name=default-store.menu.[6].title
+      }}
+    </div>
+  </div>
+</div>
+
+<div class="container default-store__wrap">
+  <div class="row">
+    <div class="col-12 d-md-none">
+      <h1 class="default-store__title">{{default-store.title}}</h1>
+    </div>
+    <div class="col-12 col-md-6 default-store__search">
+      <div class="default-store__header">
+        <h1 class="default-store__title d-none d-md-block">{{default-store.title}}</h1>
+        <p class="default-store__subtitle default-store__subtitle--change">{{default-store.subtitleChange}}</p>
+      </div>
+      {{> default-store/store-form
+          default-store.searchField
+      }}
+      {{> default-store/list-of-store
+          style="display: none;"
+      }}
+    </div>
+    <div class="col-12 col-md-6">
+      {{> default-store/current-store
+          default-store.currentStore
+      }}
+    </div>
+  </div>
+</div>
+
+{{/content}}
+{{#content "foot" mode="append"}}
+<script defer src="./js/my-account.min.js"></script>
+<script defer src="./js/default-store.min.js"></script>
+{{/content}}
+{{/extend}}

package/src/page_klarna_payment-details_with-klarna.html

@@ -1,4 +1,4 @@
-{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details with Klarna" isAsideSticky="true"}}
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Payment details with Klarna" isAsideSticky="true"}}
 {{#content "steps"}}
 {{> steps-three-steps active-step-index="2"}}
 {{/content}}
@@ -18,15 +18,12 @@
 
 
 {{#content "main"}}
-
-
-
     <div class="delivery-block">
         <h3 class="delivery-block__heading">Delivery Information</h3>
         <apple-pay-button buttonstyle="black" type="buy" locale="en-GB"></apple-pay-button>
         <div class="delivery-block__wrapper">
             {{#with checkoutOrder.deliveryPayments.[0]}}
-                <div class="checkout-order">        
+                <div class="checkout-order">
                     {{> checkout-order-block}}
                 </div>
             {{/with}}
@@ -37,7 +34,7 @@
         <h3 class="click-collect-block__heading">Click & Collect</h3>
         <div class="click-collect-block__wrapper">
           {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
-            <div class="checkout-order">        
+            <div class="checkout-order">
                 {{> checkout-order-block}}
             </div>
           {{/with}}

package/src/page_my-orders-empty.html

@@ -0,0 +1,49 @@
+{{#extend
+"my-account-v2"
+dataBreadcrumbs=my_orders.breadcrumbs
+pageClass="page_my-account_new"
+title="My Orders"
+pageMyAcc=true
+myAccV2=true
+isLoggedIn=true
+mainClass="my-orders"
+}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/page_my-orders.css">
+{{/content}}
+{{#content "notification"}}
+<div class="globalMessages">
+</div>
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+      menu=default-store.menu
+      active-index=1
+      page-name=my_orders.menu.[1].title
+      }}
+    </div>
+  </div>
+</div>
+
+<div class="container my-orders__wrap">
+  <div class="row">
+    <div class="col-12">
+      <div class="my-orders__header">
+        <h1 class="my-orders__title">My Orders</h1>
+      </div>
+      {{> my-account/empty-orders
+          title=my_orders.emptyOrders.title
+          image=my_orders.emptyOrdersImage
+          btnText=my_orders.emptyOrders.btnTitle
+      }}
+    </div>
+  </div>
+</div>
+
+{{/content}}
+{{#content "foot" mode="append"}}
+{{/content}}
+{{/extend}}

package/src/page_my-orders.html

@@ -0,0 +1,64 @@
+{{#extend
+  "my-account-v2"
+  dataBreadcrumbs=my_orders.breadcrumbs
+  pageClass="page_my-account_new"
+  title="My Orders"
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="my-orders"
+}}
+{{#content "head" mode="append"}}
+<link href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" rel="stylesheet">
+<link href="https://cdn.jsdelivr.net/npm/flatpickr/dist/plugins/monthSelect/style.css" rel="stylesheet">
+<link type="text/css" rel="stylesheet" href="./css/pages/page_my-orders.css">
+{{/content}}
+{{#content "notification"}}
+<div class="globalMessages">
+</div>
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+      menu=default-store.menu
+      active-index=1
+      page-name=my_orders.menu.[1].title
+      }}
+    </div>
+  </div>
+</div>
+
+<div class="container my-orders__wrap">
+  <div class="row">
+    <div class="col-12">
+      <div class="my-orders__header">
+        <h1 class="my-orders__title">My Orders</h1>
+        <div class="my-orders__sorts">
+          {{> flatpickr-calendar
+              textTooltip="Filter by year and month the order was placed"
+          }}
+          {{> my-account/sort-by }}
+        </div>
+        {{> my-account/orders-nav
+            nav=my_orders.nav
+            category=my_orders.nav.[0].title
+            }}
+      </div>
+      {{> my-account/active-orders/list-orders
+          title=false
+          orders=my_orders.orderList
+          isLoadMore=true
+          }}
+    </div>
+  </div>
+</div>
+
+{{/content}}
+{{#content "foot" mode="append"}}
+<script src="https://cdn.jsdelivr.net/npm/flatpickr" defer></script>
+<script src="https://cdn.jsdelivr.net/npm/flatpickr/dist/plugins/monthSelect/index.js" defer></script>
+<script src="./js/my-orders.min.js" defer></script>
+{{/content}}
+{{/extend}}