wickes-css2 2.98.0-develop.2 → 2.98.0-develop.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.98.0-develop.2",
+  "version": "2.98.0-develop.3",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -108,7 +108,7 @@
     "branches": [
       "alt-master",
       {
-        "name": "custom-tag/RG-1311-prototype-charity-reg-no-for-calm-basket",
+        "name": "custom-tag/0.3.0-legends",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/components/header-menu/logout-action.hbs

@@ -0,0 +1,8 @@
+<div class="user__logout">
+  {{#each items}}
+    <a href="{{url}}" class="user__action link-logout">
+      {{text}}
+      <span class="icon icon-logout"><i class="{{iconClass}}"></i></span>
+    </a>
+  {{/each}}
+</div>

package/src/components/header-menu/popover-actions-mob.hbs

@@ -0,0 +1,11 @@
+{{#each items}}
+  <div class="main-nav__button">
+    <a href="{{url}}" class="nav-button">
+      <span class="nav-button__icon"></span>
+      <span class="nav-button__text">{{text}}</span>
+      {{#if total}}
+        <span class="rewards-counter">{{total}}</span>
+      {{/if}}
+    </a>
+  </div>
+{{/each}}

package/src/components/header-menu/popover-actions.hbs

@@ -0,0 +1,13 @@
+<div class="user__popover-actions">
+  {{#each items}}
+    <a href="{{url}}" class="user__action">
+        <span class="icon-wrap">
+          <i class="{{iconClass}}"></i>
+        </span>
+      {{text}}
+      {{#if total}}
+        <span class="rewards-counter">{{total}}</span>
+      {{/if}}
+    </a>
+  {{/each}}
+</div>

package/src/components/header-menu/user-actions-mob.hbs

@@ -0,0 +1,18 @@
+{{#each items}}
+  <div class="main-nav__button">
+    <a href="{{url}}" class="nav-button">
+      <span class="nav-button__icon">
+        {{#ifCond customIcon '||' iconClass}}
+          {{#if icon}}
+            {{{icon}}}
+          {{else}}
+            <i class="{{iconClass}} icon"></i>
+          {{/if}}
+        {{else}}
+          <i class="fas fa-user"></i>
+        {{/ifCond}}
+      </span>
+      <span class="nav-button__text">{{text}}</span>
+    </a>
+  </div>
+{{/each}}

package/src/components/header-menu/user-actions.hbs

@@ -0,0 +1,12 @@
+{{#each items}}
+  <a href="{{url}}" class="user__action user__action--account">
+    <span class="icon-wrap">
+      {{#if customIcon}}
+        {{{icon}}}
+      {{else}}
+        <i class="{{iconClass}}"></i>
+      {{/if}}
+    </span>
+    {{text}}
+  </a>
+{{/each}}

package/src/components/my-account/clipboard-code-card.hbs

@@ -1,9 +1,11 @@
-<div class="clipboard-code {{this.mod}}">
-  {{#if customIcon}}
-    {{{customIcon}}}
-  {{else}}
-    <i class="{{icon}} icon"></i>
-  {{/if}}
+<div class="clipboard-code {{mod}}">
+  <span class="icon-wrap">
+    {{#if customIcon}}
+      {{{customIcon}}}
+    {{else}}
+      <i class="{{icon}} icon"></i>
+    {{/if}}
+  </span>
   <div class="clipboard-code__content">
     <p class="title">{{title}}</p>
     <div class="clipboard-code__cta">
@@ -13,4 +15,9 @@
       </button>
     </div>
   </div>
+  {{#if description}}
+    <div class="clipboard-code__description">
+      <p>{{description.text}} <a class="link" href="{{{description.link}}}">{{description.link}}</a></p>
+    </div>
+  {{/if}}
 </div>

package/src/components/my-account/discount.hbs

@@ -1,6 +1,8 @@
 <div class="discount">
   <div class="discount__content">
-    <i class="icon fas fa-barcode-alt"></i>
+    <span class="icon-wrap">
+      <i class="icon fas fa-barcode-alt"></i>
+    </span>
 
     <div class="discount__code">
       <p class="title">{{title}}</p>

package/src/components/price-block-order.hbs

@@ -33,7 +33,6 @@
                             <strong>Saturday: 8am - 6pm</strong><br>
                             <strong>Sunday: 10am - 5pm</strong></div>
                     </div>
-                    <br/>
                 </div>
             </div>
         </div>

package/src/components/track-my-order-info.hbs

@@ -1,9 +1,7 @@
 <div class="order-info">
   <h3 class="order-info__toggle" data-toggle="collapse" data-target="#collapseInfo" aria-expanded="false" aria-controls="collapseInfo">
     {{title}}
-    <span class="icon-wrap">
-      <i class="fas fa-plus icon"></i>
-    </span>
+    <span class="icon-wrap"></span>
   </h3>
 
   <div class="collapse" id="collapseInfo">

package/src/data/data_header-menu.json

@@ -0,0 +1,153 @@
+{
+  "header_menu": {
+    "diy": [
+      {
+        "type": "userActions",
+        "items": [
+          {
+            "url": "./page_my-account.html",
+            "iconClass": "fas fa-user",
+            "text": "My Account"
+          }
+        ]
+      },
+      {
+        "type": "popoverActions",
+        "items": [
+          {
+            "url": "/page_my-account_order-history.html",
+            "iconClass": "fas fa-box-open",
+            "text": "My Orders"
+          },
+          {
+            "url": "/page_my-shopping-list.html",
+            "iconClass": "fas fa-list",
+            "text": "Project Lists"
+          },
+          {
+            "url": "/page_marketing-preferences.html",
+            "iconClass": "fas fa-sliders-h",
+            "text": "Marketing Preferences"
+          }
+        ]
+      },
+      {
+        "type": "logoutAction",
+        "items": [
+          {
+            "url": "",
+            "iconClass": "fas fa-sign-out",
+            "text": "Log out"
+          }
+        ]
+      }
+    ],
+    "installer": [
+      {
+        "type": "userActions",
+        "items": [
+          {
+            "customIcon": true,
+            "url": "/page_my-account-installer.html",
+            "icon": "<svg class=\"installer-icon\" width=\"18\" height=\"19\" viewBox=\"0 0 18 19\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n<path d=\"M6 0.75C6 0.334375 6.33437 0 6.75 0H7.25C7.66563 0 8 0.334375 8 0.75V2.5L8.8875 0.721875C10.075 1.35938 10.9062 2.58125 10.9937 4H11C11.4156 4 11.75 4.33437 11.75 4.75C11.75 5.16563 11.4156 5.5 11 5.5H3C2.58437 5.5 2.25 5.16563 2.25 4.75C2.25 4.33437 2.58437 4 3 4H3.00625C3.09375 2.58125 3.925 1.35938 5.1125 0.721875L6 2.5V0.75Z\" fill=\"#3E3E3E\"/>\n<path d=\"M10.9688 6.5C10.7219 8.47188 9.04062 10 7 10C4.95937 10 3.27813 8.47188 3.03125 6.5H10.9688Z\" fill=\"#3E3E3E\"/>\n<path d=\"M0 15.2C0 12.8813 1.88125 11 4.2 11H9.8C10.2255 11 10.6362 11.0633 11.0233 11.1811C10.927 11.8173 11.002 12.421 11.1001 12.7031L7.90625 16H0.8C0.359375 16 0 15.6406 0 15.2Z\" fill=\"#3E3E3E\"/>\n<path d=\"M14.875 15.25C16.6016 15.25 18 13.8516 18 12.125C18 11.8262 17.957 11.5371 17.8789 11.2617C17.8184 11.0508 17.5586 11.0039 17.4043 11.1582L15.9043 12.6582C15.8457 12.7168 15.7656 12.75 15.6836 12.75H14.5625C14.3906 12.75 14.25 12.6094 14.25 12.4375V11.3164C14.25 11.2344 14.2832 11.1543 14.3418 11.0957L15.8418 9.5957C15.9961 9.44141 15.9473 9.18164 15.7383 9.12109C15.4629 9.04297 15.1738 9 14.875 9C13.1484 9 11.75 10.3984 11.75 12.125C11.75 12.498 11.8164 12.8574 11.9355 13.1895L8.38867 16.7363C8.14062 16.9844 8 17.3223 8 17.6738C8 18.4062 8.59375 19 9.32617 19C9.67773 19 10.0156 18.8594 10.2637 18.6113L13.8105 15.0645C14.1426 15.1855 14.502 15.25 14.875 15.25ZM9.5625 16.9688C9.68682 16.9688 9.80605 17.0181 9.89396 17.106C9.98186 17.194 10.0312 17.3132 10.0312 17.4375C10.0312 17.5618 9.98186 17.681 9.89396 17.769C9.80605 17.8569 9.68682 17.9062 9.5625 17.9062C9.43818 17.9062 9.31895 17.8569 9.23104 17.769C9.14314 17.681 9.09375 17.5618 9.09375 17.4375C9.09375 17.3132 9.14314 17.194 9.23104 17.106C9.31895 17.0181 9.43818 16.9688 9.5625 16.9688Z\" fill=\"#3E3E3E\"/>\n</svg>\n",
+            "text": "My Installer Account"
+          }
+        ]
+      },
+      {
+        "type": "popoverActions",
+        "items": [
+          {
+            "url": "./page_discount_installer.html",
+            "iconClass": "fas fa-hard-hat",
+            "text": "Installer Discount"
+          },
+          {
+            "url": "/page_my-account_order-history.html",
+            "iconClass": "fas fa-box-open",
+            "text": "My Orders"
+          },
+          {
+            "iconClass": "fas fa-gift",
+            "url": "#",
+            "text": "Installer Rewards",
+            "total": 4
+          },
+          {
+            "url": "/page_my-shopping-list.html",
+            "iconClass": "fas fa-list",
+            "text": "Project Lists"
+          },
+          {
+            "url": "/page_marketing-preferences.html",
+            "iconClass": "fas fa-sliders-h",
+            "text": "Marketing Preferences"
+          }
+        ]
+      },
+      {
+        "type": "logoutAction",
+        "items": [
+          {
+            "url": "",
+            "iconClass": "fas fa-sign-out",
+            "text": "Log out"
+          }
+        ]
+      }
+    ],
+    "tradepro": [
+      {
+        "type": "userActions",
+        "items": [
+          {
+            "url": "./page_my-account-trade-pro.html",
+            "iconClass": "fas fa-user-hard-hat",
+            "text": "My TradePro Account"
+          }
+        ]
+      },
+      {
+        "type": "popoverActions",
+        "items": [
+          {
+            "url": "./page_discount_installer.html",
+            "iconClass": "fas fa-hard-hat",
+            "text": "TradePro Discount"
+          },
+          {
+            "url": "/page_my-account_order-history.html",
+            "iconClass": "fas fa-box-open",
+            "text": "My Orders"
+          },
+          {
+            "iconClass": "fas fa-gift",
+            "url": "#",
+            "text": "TradePro Rewards",
+            "total": 4
+          },
+          {
+            "url": "/page_my-shopping-list.html",
+            "iconClass": "fas fa-list",
+            "text": "Project Lists"
+          },
+          {
+            "url": "/page_marketing-preferences.html",
+            "iconClass": "fas fa-sliders-h",
+            "text": "Marketing Preferences"
+          }
+        ]
+      },
+      {
+        "type": "logoutAction",
+        "items": [
+          {
+            "url": "",
+            "iconClass": "fas fa-sign-out",
+            "text": "Log out"
+          }
+        ]
+      }
+    ]
+  }
+}

package/src/data/data_shopping-cart-v2.json

@@ -1145,57 +1145,6 @@
         }
       }
     },
-    "charityDonationNew": {
-      "title": "Charity Donation",
-      "checkoutOrder": {
-        "charity": {
-          "title": "Would you like to make a donation to our chosen charity, Campaign Against Living Miserably (CALM)?",
-          "descr": "All charity donations are non-refundable.",
-          "message": "For more information about our charity partner",
-          "subLink": "https://www.wickes.co.uk/the-brain-tumour-charity",
-          "total": "Total",
-          "img": "img/calm-primary-logo.png",
-          "price": "£1",
-          "options": [
-            {
-              "title": "£1",
-              "value": "1",
-              "active": false
-            },
-            {
-              "title": "£3",
-              "value": "3",
-              "active": false
-            },
-            {
-              "title": "£5",
-              "value": "5",
-              "active": true
-            },
-            {
-              "title": "£10",
-              "value": "10",
-              "active": false
-            },
-            {
-              "title": "£15",
-              "value": "15",
-              "active": false
-            },
-            {
-              "title": "£50",
-              "value": "50",
-              "active": false
-            },
-            {
-              "title": "£100",
-              "value": "100",
-              "active": false
-            }
-          ]
-        }
-      }
-    },
     "charityDonationMultiple": {
       "title": "Charity Donation",
       "img": "img/young-minds-long.png",

package/src/data/my-account/data_discount.json

@@ -0,0 +1,80 @@
+{
+  "discount": {
+    "menu": [
+      {
+        "icon": "fas fa-user",
+        "title": "My Account",
+        "link": "./page_my-account.html"
+      },
+      {
+        "icon": "fas fa-box-open",
+        "link": "./page_my-account_order-history.html",
+        "title": "My Orders",
+        "description": "View and manage your orders."
+      },
+      {
+        "icon": "fas fa-address-card",
+        "link": "./page_personal-details.html",
+        "title": "Personal Details",
+        "description": "View and update your Personal Details."
+      },
+      {
+        "icon": "fas fa-book",
+        "link": "./page_my-account_address-book.html",
+        "title": "Address Book",
+        "description": "Manage your delivery addresses."
+      },
+      {
+        "icon": "fas fa-sliders-h",
+        "link": "./page_marketing-preferences.html",
+        "title": "Marketing Preferences",
+        "description": "Manage  how you would like to receive the latest offers and deals."
+      },
+      {
+        "icon": "fas fa-list",
+        "link": "./page_my-shopping-list.html",
+        "title": "Project Lists",
+        "description": "Save products to your project lists."
+      },
+      {
+        "icon": "fas fa-warehouse",
+        "link": "#",
+        "title": "Default Store",
+        "description": "Set your default store."
+      },
+      {
+        "icon": "fas fa-hard-hat",
+        "link": "#",
+        "title": "TradePro Discount",
+        "description": "Set your default store."
+      }
+    ],
+    "tradePro": {
+      "breadcrumbs": [
+        {
+          "url": "/",
+          "text": "Home"
+        },
+        {
+          "url": "/page_my-account-trade-pro.html",
+          "text": "My TradePro Account"
+        },
+        {
+          "url": "/",
+          "text": "TradePro Discount"
+        }
+      ],
+      "discountIdText": {
+        "text": "The Wickes TradePro discount does not apply to Gift Vouchers or Delivery Charges and cannot be used with any other voucher code or coupon. For full terms and conditions visit",
+        "link": "wickes.co.uk/trade/terms-conditions"
+      },
+      "onlineDiscountText": {
+        "text": "This voucher code will be automatically applied at checkout for you to receive 10% discount"
+      }
+    },
+    "downloadAppImages": {
+      "appStore": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"119.664\" height=\"40\"><path d=\"M110.135 0H9.535c-.367 0-.73 0-1.095.002-.306.002-.61.008-.919.013A13.215 13.215 0 0 0 5.517.19a6.665 6.665 0 0 0-1.9.627 6.438 6.438 0 0 0-1.62 1.18A6.258 6.258 0 0 0 .82 3.617a6.601 6.601 0 0 0-.625 1.903 12.993 12.993 0 0 0-.179 2.002c-.01.307-.01.615-.015.921V31.56c.005.31.006.61.015.921a12.992 12.992 0 0 0 .18 2.002 6.588 6.588 0 0 0 .624 1.905A6.208 6.208 0 0 0 1.998 38a6.274 6.274 0 0 0 1.618 1.179 6.7 6.7 0 0 0 1.901.63 13.455 13.455 0 0 0 2.004.177c.31.007.613.011.919.011.366.002.728.002 1.095.002h100.6c.36 0 .724 0 1.084-.002.304 0 .617-.004.922-.01a13.279 13.279 0 0 0 2-.178 6.804 6.804 0 0 0 1.908-.63A6.277 6.277 0 0 0 117.666 38a6.395 6.395 0 0 0 1.182-1.614 6.604 6.604 0 0 0 .619-1.905 13.506 13.506 0 0 0 .185-2.002c.004-.31.004-.61.004-.921.008-.364.008-.725.008-1.094V9.536c0-.366 0-.73-.008-1.092 0-.306 0-.614-.004-.92a13.507 13.507 0 0 0-.185-2.003 6.618 6.618 0 0 0-.62-1.903 6.466 6.466 0 0 0-2.798-2.8 6.768 6.768 0 0 0-1.908-.627 13.044 13.044 0 0 0-2-.176c-.305-.005-.618-.011-.922-.013-.36-.002-.725-.002-1.084-.002Z\" style=\"fill:#a6a6a6\"/><path d=\"M8.445 39.125c-.305 0-.602-.004-.904-.01a12.687 12.687 0 0 1-1.87-.164 5.884 5.884 0 0 1-1.656-.548 5.406 5.406 0 0 1-1.397-1.016 5.32 5.32 0 0 1-1.02-1.397 5.722 5.722 0 0 1-.544-1.657 12.414 12.414 0 0 1-.166-1.875c-.007-.21-.015-.913-.015-.913v-23.1s.009-.692.015-.895a12.37 12.37 0 0 1 .165-1.872 5.755 5.755 0 0 1 .544-1.662 5.373 5.373 0 0 1 1.015-1.398 5.565 5.565 0 0 1 1.402-1.023 5.823 5.823 0 0 1 1.653-.544A12.586 12.586 0 0 1 7.543.887l.902-.012h102.769l.913.013a12.385 12.385 0 0 1 1.858.162 5.938 5.938 0 0 1 1.671.548 5.594 5.594 0 0 1 2.415 2.42 5.763 5.763 0 0 1 .535 1.649 12.995 12.995 0 0 1 .174 1.887c.003.283.003.588.003.89.008.375.008.732.008 1.092v20.929c0 .363 0 .718-.008 1.075 0 .325 0 .623-.004.93a12.731 12.731 0 0 1-.17 1.853 5.739 5.739 0 0 1-.54 1.67 5.48 5.48 0 0 1-1.016 1.386 5.413 5.413 0 0 1-1.4 1.022 5.862 5.862 0 0 1-1.668.55 12.542 12.542 0 0 1-1.869.163c-.293.007-.6.011-.897.011l-1.084.002Z\"/><g data-name=\"&lt;Group&gt;\"><g data-name=\"&lt;Group&gt;\"><path data-name=\"&lt;Path&gt;\" d=\"M24.769 20.3a4.949 4.949 0 0 1 2.356-4.151 5.066 5.066 0 0 0-3.99-2.158c-1.68-.176-3.308 1.005-4.164 1.005-.872 0-2.19-.988-3.608-.958a5.315 5.315 0 0 0-4.473 2.728c-1.934 3.348-.491 8.269 1.361 10.976.927 1.325 2.01 2.805 3.428 2.753 1.387-.058 1.905-.885 3.58-.885 1.658 0 2.144.885 3.59.852 1.489-.025 2.426-1.332 3.32-2.67a10.962 10.962 0 0 0 1.52-3.092 4.782 4.782 0 0 1-2.92-4.4ZM22.037 12.21a4.872 4.872 0 0 0 1.115-3.49 4.957 4.957 0 0 0-3.208 1.66A4.636 4.636 0 0 0 18.8 13.74a4.1 4.1 0 0 0 3.237-1.53Z\" style=\"fill:#fff\"/></g><path d=\"M42.302 27.14H37.57l-1.137 3.356h-2.005l4.484-12.418h2.083l4.483 12.418h-2.039Zm-4.243-1.55h3.752l-1.85-5.446h-.051ZM55.16 25.97c0 2.813-1.506 4.62-3.779 4.62a3.07 3.07 0 0 1-2.848-1.583h-.043v4.484H46.63V21.442h1.8v1.506h.033a3.212 3.212 0 0 1 2.883-1.6c2.298 0 3.813 1.816 3.813 4.622Zm-1.91 0c0-1.833-.948-3.038-2.393-3.038-1.42 0-2.375 1.23-2.375 3.038 0 1.824.955 3.046 2.375 3.046 1.445 0 2.393-1.197 2.393-3.046ZM65.125 25.97c0 2.813-1.506 4.62-3.779 4.62a3.07 3.07 0 0 1-2.848-1.583h-.043v4.484h-1.859V21.442h1.799v1.506h.034a3.212 3.212 0 0 1 2.883-1.6c2.298 0 3.813 1.816 3.813 4.622Zm-1.91 0c0-1.833-.948-3.038-2.393-3.038-1.42 0-2.375 1.23-2.375 3.038 0 1.824.955 3.046 2.375 3.046 1.445 0 2.392-1.197 2.392-3.046ZM71.71 27.036c.138 1.232 1.334 2.04 2.97 2.04 1.566 0 2.693-.808 2.693-1.919 0-.964-.68-1.54-2.29-1.936l-1.609-.388c-2.28-.55-3.339-1.617-3.339-3.348 0-2.142 1.867-3.614 4.519-3.614 2.624 0 4.423 1.472 4.483 3.614h-1.876c-.112-1.239-1.136-1.987-2.634-1.987s-2.521.757-2.521 1.858c0 .878.654 1.395 2.255 1.79l1.368.336c2.548.603 3.606 1.626 3.606 3.443 0 2.323-1.85 3.778-4.793 3.778-2.754 0-4.614-1.42-4.734-3.667ZM83.346 19.3v2.142h1.722v1.472h-1.722v4.991c0 .776.345 1.137 1.102 1.137a5.808 5.808 0 0 0 .611-.043v1.463a5.104 5.104 0 0 1-1.032.086c-1.833 0-2.548-.689-2.548-2.445v-5.189h-1.316v-1.472h1.316V19.3ZM86.065 25.97c0-2.849 1.678-4.639 4.294-4.639 2.625 0 4.295 1.79 4.295 4.639 0 2.856-1.661 4.638-4.295 4.638-2.633 0-4.294-1.782-4.294-4.638Zm6.695 0c0-1.954-.895-3.108-2.401-3.108s-2.4 1.162-2.4 3.108c0 1.962.894 3.106 2.4 3.106s2.401-1.144 2.401-3.106ZM96.186 21.442h1.773v1.541h.043a2.16 2.16 0 0 1 2.177-1.635 2.866 2.866 0 0 1 .637.069v1.738a2.598 2.598 0 0 0-.835-.112 1.873 1.873 0 0 0-1.937 2.083v5.37h-1.858ZM109.384 27.837c-.25 1.643-1.85 2.771-3.898 2.771-2.634 0-4.269-1.764-4.269-4.595 0-2.84 1.644-4.682 4.19-4.682 2.506 0 4.08 1.72 4.08 4.466v.637h-6.394v.112a2.358 2.358 0 0 0 2.436 2.564 2.048 2.048 0 0 0 2.09-1.273Zm-6.282-2.702h4.526a2.177 2.177 0 0 0-2.22-2.298 2.292 2.292 0 0 0-2.306 2.298Z\" style=\"fill:#fff\"/></g><g data-name=\"&lt;Group&gt;\"><path d=\"M37.826 8.731a2.64 2.64 0 0 1 2.808 2.965c0 1.906-1.03 3.002-2.808 3.002h-2.155V8.73Zm-1.228 5.123h1.125a1.876 1.876 0 0 0 1.967-2.146 1.881 1.881 0 0 0-1.967-2.134h-1.125ZM41.68 12.444a2.133 2.133 0 1 1 4.248 0 2.134 2.134 0 1 1-4.247 0Zm3.334 0c0-.976-.439-1.547-1.208-1.547-.773 0-1.207.571-1.207 1.547 0 .984.434 1.55 1.207 1.55.77 0 1.208-.57 1.208-1.55ZM51.573 14.698h-.922l-.93-3.317h-.07l-.927 3.317h-.913l-1.242-4.503h.902l.806 3.436h.067l.926-3.436h.852l.926 3.436h.07l.803-3.436h.889ZM53.854 10.195h.855v.715h.066a1.348 1.348 0 0 1 1.344-.802 1.465 1.465 0 0 1 1.559 1.675v2.915h-.889v-2.692c0-.724-.314-1.084-.972-1.084a1.033 1.033 0 0 0-1.075 1.141v2.635h-.888ZM59.094 8.437h.888v6.26h-.888ZM61.218 12.444a2.133 2.133 0 1 1 4.247 0 2.134 2.134 0 1 1-4.247 0Zm3.333 0c0-.976-.439-1.547-1.208-1.547-.773 0-1.207.571-1.207 1.547 0 .984.434 1.55 1.207 1.55.77 0 1.208-.57 1.208-1.55ZM66.4 13.424c0-.81.604-1.278 1.676-1.344l1.22-.07v-.389c0-.475-.315-.744-.922-.744-.497 0-.84.182-.939.5h-.86c.09-.773.818-1.27 1.84-1.27 1.128 0 1.765.563 1.765 1.514v3.077h-.855v-.633h-.07a1.515 1.515 0 0 1-1.353.707 1.36 1.36 0 0 1-1.501-1.348Zm2.895-.384v-.377l-1.1.07c-.62.042-.9.253-.9.65 0 .405.351.64.834.64a1.062 1.062 0 0 0 1.166-.983ZM71.348 12.444c0-1.423.732-2.324 1.87-2.324a1.484 1.484 0 0 1 1.38.79h.067V8.437h.888v6.26h-.851v-.71h-.07a1.563 1.563 0 0 1-1.415.785c-1.145 0-1.869-.901-1.869-2.328Zm.918 0c0 .955.45 1.53 1.203 1.53.75 0 1.212-.583 1.212-1.526 0-.938-.468-1.53-1.212-1.53-.748 0-1.203.58-1.203 1.526ZM79.23 12.444a2.133 2.133 0 1 1 4.247 0 2.134 2.134 0 1 1-4.247 0Zm3.333 0c0-.976-.438-1.547-1.208-1.547-.772 0-1.207.571-1.207 1.547 0 .984.435 1.55 1.207 1.55.77 0 1.208-.57 1.208-1.55ZM84.67 10.195h.855v.715h.066a1.348 1.348 0 0 1 1.344-.802 1.465 1.465 0 0 1 1.559 1.675v2.915h-.889v-2.692c0-.724-.314-1.084-.972-1.084a1.033 1.033 0 0 0-1.075 1.141v2.635h-.889ZM93.515 9.074v1.141h.976v.749h-.976v2.315c0 .472.194.679.637.679a2.967 2.967 0 0 0 .339-.021v.74a2.916 2.916 0 0 1-.484.046c-.988 0-1.381-.348-1.381-1.216v-2.543h-.715v-.749h.715V9.074ZM95.705 8.437h.88v2.481h.07a1.386 1.386 0 0 1 1.374-.806 1.483 1.483 0 0 1 1.55 1.679v2.907h-.889V12.01c0-.72-.335-1.084-.963-1.084a1.052 1.052 0 0 0-1.134 1.142v2.63h-.888ZM104.761 13.482a1.828 1.828 0 0 1-1.95 1.303 2.045 2.045 0 0 1-2.081-2.325 2.077 2.077 0 0 1 2.076-2.352c1.253 0 2.009.856 2.009 2.27v.31h-3.18v.05a1.19 1.19 0 0 0 1.2 1.29 1.08 1.08 0 0 0 1.07-.546Zm-3.126-1.451h2.275a1.086 1.086 0 0 0-1.109-1.167 1.152 1.152 0 0 0-1.166 1.167Z\" style=\"fill:#fff\"/></g></svg>",
+      "googleStore": "<svg width=\"121\" height=\"41\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"1\" y=\".976\" width=\"119\" height=\"39\" rx=\"5.5\" fill=\"#000\"/><rect x=\"1\" y=\".976\" width=\"119\" height=\"39\" rx=\"5.5\" stroke=\"#A6A6A6\"/><path d=\"M18.305 19.937 8.59 30.481c0 .002 0 .005.002.007.298 1.145 1.32 1.988 2.534 1.988.485 0 .94-.135 1.331-.37l.031-.019 10.935-6.452-5.118-5.698Z\" fill=\"#EA4335\"/><path d=\"m28.133 18.142-.009-.007-4.721-2.798-5.319 4.84 5.338 5.457 4.696-2.77a2.696 2.696 0 0 0 1.382-2.366 2.69 2.69 0 0 0-1.367-2.356Z\" fill=\"#FBBC04\"/><path d=\"M8.59 10.469a2.69 2.69 0 0 0-.09.69v18.633c0 .239.031.47.09.69L18.64 20.207l-10.05-9.738Z\" fill=\"#4285F4\"/><path d=\"m18.376 20.476 5.028-5.141-10.922-6.476a2.582 2.582 0 0 0-1.356-.383c-1.214 0-2.238.844-2.536 1.99l-.001.003 9.787 10.007Z\" fill=\"#34A853\"/><path d=\"M44.11 12.186c0 1-.297 1.796-.89 2.39-.667.706-1.543 1.06-2.63 1.06-1.04 0-1.92-.36-2.64-1.08-.72-.72-1.08-1.607-1.08-2.66 0-1.054.36-1.94 1.08-2.66.72-.72 1.6-1.08 2.64-1.08.527 0 1.023.093 1.49.28.467.186.85.45 1.15.79l-.66.66a2.169 2.169 0 0 0-.86-.62 2.738 2.738 0 0 0-1.12-.23c-.78 0-1.44.27-1.98.81-.533.546-.8 1.23-.8 2.05 0 .82.267 1.503.8 2.05.54.54 1.2.81 1.98.81.713 0 1.307-.2 1.78-.6.473-.4.747-.95.82-1.65h-2.6v-.86h3.47c.033.186.05.366.05.54Zm5.298-3.87v.88h-3.26v2.27h2.94v.86h-2.94v2.27h3.26v.88h-4.18v-7.16h4.18Zm3.68.88v6.28h-.92v-6.28h-2v-.88h4.92v.88h-2Zm6.077 6.28h-.92v-7.16h.92v7.16Zm3.884-6.28v6.28h-.92v-6.28h-2v-.88h4.92v.88h-2Zm11.972 2.7c0 1.06-.353 1.946-1.06 2.66-.713.72-1.587 1.08-2.62 1.08-1.04 0-1.913-.36-2.62-1.08-.707-.714-1.06-1.6-1.06-2.66s.353-1.947 1.06-2.66c.707-.72 1.58-1.08 2.62-1.08s1.913.363 2.62 1.09c.707.713 1.06 1.596 1.06 2.65Zm-6.42 0c0 .826.26 1.51.78 2.05.527.54 1.18.81 1.96.81s1.43-.27 1.95-.81c.527-.534.79-1.217.79-2.05 0-.834-.263-1.517-.79-2.05-.52-.54-1.17-.81-1.95-.81s-1.433.27-1.96.81c-.52.54-.78 1.223-.78 2.05Zm8.426 3.58h-.92v-7.16h1.12l3.48 5.57h.04l-.04-1.38v-4.19h.92v7.16h-.96l-3.64-5.84h-.04l.04 1.38v4.46ZM94.018 31.885h1.629V20.874h-1.629v11.011Zm14.671-7.045-1.867 4.774h-.056l-1.938-4.774h-1.755l2.906 6.673-1.656 3.711h1.698L110.5 24.84h-1.811Zm-9.237 5.794c-.534 0-1.278-.268-1.278-.935 0-.85.926-1.175 1.726-1.175.716 0 1.054.156 1.489.368-.127 1.02-.997 1.742-1.937 1.742Zm.196-6.034c-1.179 0-2.401.524-2.906 1.686l1.446.608c.309-.608.884-.807 1.488-.807.843 0 1.699.51 1.713 1.417v.113c-.295-.17-.926-.425-1.699-.425-1.558 0-3.145.864-3.145 2.479 0 1.473 1.278 2.423 2.71 2.423 1.095 0 1.699-.496 2.078-1.077h.056v.85h1.572v-4.222c0-1.955-1.446-3.045-3.313-3.045Zm-10.066 1.58h-2.316v-3.774h2.316c1.218 0 1.91 1.018 1.91 1.887 0 .854-.692 1.888-1.91 1.888Zm-.042-5.306h-3.903v11.011h1.629v-4.172h2.274c1.805 0 3.58-1.319 3.58-3.42 0-2.1-1.775-3.42-3.58-3.42Zm-21.282 9.762c-1.125 0-2.067-.95-2.067-2.256 0-1.32.942-2.285 2.067-2.285 1.112 0 1.983.966 1.983 2.285 0 1.306-.871 2.256-1.983 2.256Zm1.87-5.18h-.056c-.366-.439-1.068-.836-1.954-.836-1.857 0-3.558 1.645-3.558 3.76 0 2.1 1.701 3.732 3.558 3.732.886 0 1.588-.397 1.954-.851h.057v.54c0 1.433-.76 2.2-1.983 2.2-.999 0-1.618-.725-1.87-1.335l-1.421.596c.408.994 1.49 2.214 3.29 2.214 1.913 0 3.53-1.136 3.53-3.903v-6.727H70.13v.61Zm2.673 6.43h1.631V20.872h-1.631v11.012Zm4.035-3.633c-.042-1.448 1.111-2.186 1.94-2.186.648 0 1.197.326 1.379.795l-3.319 1.39Zm5.063-1.25c-.31-.836-1.252-2.383-3.178-2.383-1.913 0-3.501 1.518-3.501 3.746 0 2.1 1.574 3.746 3.683 3.746 1.702 0 2.687-1.05 3.095-1.66l-1.266-.852c-.422.625-.999 1.036-1.829 1.036s-1.42-.383-1.8-1.134l4.964-2.073-.168-.425ZM42.35 25.77v1.589h3.768c-.112.894-.407 1.546-.857 2-.549.554-1.407 1.164-2.91 1.164-2.322 0-4.136-1.887-4.136-4.229s1.814-4.229 4.135-4.229c1.252 0 2.166.497 2.84 1.136l1.112-1.121c-.943-.908-2.194-1.604-3.952-1.604-3.178 0-5.85 2.611-5.85 5.819 0 3.207 2.672 5.817 5.85 5.817 1.715 0 3.009-.568 4.021-1.632 1.042-1.05 1.365-2.525 1.365-3.718 0-.369-.028-.709-.085-.992h-5.3Zm9.67 4.866c-1.124 0-2.095-.936-2.095-2.27 0-1.348.97-2.27 2.096-2.27 1.124 0 2.095.922 2.095 2.27 0 1.334-.97 2.27-2.095 2.27Zm0-6.016c-2.053 0-3.726 1.575-3.726 3.746 0 2.157 1.673 3.746 3.727 3.746 2.053 0 3.726-1.589 3.726-3.746 0-2.171-1.673-3.746-3.726-3.746Zm8.13 6.016c-1.125 0-2.096-.936-2.096-2.27 0-1.348.97-2.27 2.096-2.27 1.125 0 2.095.922 2.095 2.27 0 1.334-.97 2.27-2.095 2.27Zm0-6.016c-2.053 0-3.726 1.575-3.726 3.746 0 2.157 1.673 3.746 3.726 3.746s3.726-1.589 3.726-3.746c0-2.171-1.673-3.746-3.726-3.746Z\" fill=\"#fff\"/></svg>"
+    }
+  }
+}

package/src/data/my-account/data_personal-details.json

@@ -59,6 +59,28 @@
         ]
       }
     },
+    "confirmation-popup": {
+      "title": "Your personal email address will be changed",
+      "headerIcon": "fas fa-exclamation-circle",
+      "description": "Are you sure you want to change your email address to <span class=\"new-email\"></span>?",
+      "actions": {
+        "mod": "actions",
+        "buttons": [
+          {
+            "title": "Cancel",
+            "data-action": "cancel-reset",
+            "isPrimary": true,
+            "close-modal": true
+          },
+          {
+            "mod": "btn-continue",
+            "data-action": "reset-details",
+            "title": "Yes, continue",
+            "isSecondary": true
+          }
+        ]
+      }
+    },
     "diy": {
       "breadcrumbs": [
         {

package/src/js/components/general/clamp-content.js

@@ -10,6 +10,7 @@ Wick.ClampContent = {
   clampContentSelector: '.clamp-content',
   clampElementsList: [
     '.page-header__intro',
+    '.srp-injected__content'
   ],
   calculateLineCount(element) {
     const lineHeight = parseFloat(element.css('line-height'));

package/src/js/components/general/main-nav.js

@@ -185,7 +185,7 @@ Wick.MainNav = (function () {
 
         if (section.color) {
           switch(section.color.toUpperCase()) {
-            case 'GREEN': 
+            case 'GREEN':
               colorClass = 'green'
               break;
             case 'RED':
@@ -194,7 +194,7 @@ Wick.MainNav = (function () {
           }
 
           switch(category) {
-            case 1: 
+            case 1:
               colorClass += ' main-nav__top-level__label--invert'
               break;
             case 2:
@@ -214,19 +214,19 @@ Wick.MainNav = (function () {
 
         if(section.color) {
           switch(section.color.toUpperCase()) {
-            case 'GREEN': 
+            case 'GREEN':
               style += `background-color: #9acd32; color: #fff;`
               break;
             case 'RED':
               style += `background-color: #cf000f; color: #fff;`
               break;
           }
-        } 
+        }
 
         if (section.bold) {
           style += 'font-weight: 700;';
         }
-        
+
         return style+'"'
       }
 

package/src/js/page/basket-v2.js

@@ -16,8 +16,8 @@ import {checkPayPalAvailability} from './basket/paypal';
 import {
     updateCharity,
     changeCharityPrice,
-    setDefaultCharityValue,
-    initCharityInteractions,
+    toggleCharityElements,
+    setDefaultCharityValue
 } from './components/charity';
 import {callAction} from './utils/http-action';
 import {ROUTES} from './utils/routes';
@@ -80,7 +80,7 @@ Wick.BasketPage = {
         orderItemInfoOffers: 'order-item__info-offers',
         charityInput: '#donation',
         charityItem: '.charity-new',
-        donationCartBtn: '.donation-cart__btn, .donation-cart-new__btn',
+        donationCartBtn: '.donation-cart__btn',
         checkoutWidgetDetails: '.checkout-widget__details',
         checkoutWidgetDetailsFlex: 'checkout-widget__details-flex',
         subtotal: '.checkout-widget__item-bold',
@@ -311,6 +311,7 @@ Wick.BasketPage = {
         } else {
             if (charity) {
                 Wick.BasketPage.updateCart();
+                quantityToUpdate === 0 && toggleCharityElements();
             } else {
                 if (maxValue > 1 || minValue > 1) {
                     if (quantityToUpdate > maxValue || quantityToUpdate < minValue) {
@@ -1281,16 +1282,8 @@ $(document).ready(function () {
         $(Wick.BasketPage.el.content).on('focusout', Wick.BasketPage.el.quantityValue, Wick.BasketPage.changeOnBlur);
         $(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.deliveryButtonInCC, Wick.BasketPage.changeMethodToDelivery);
         $(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.updateStoreButton, Wick.BasketPage.changeMethodToCC);
-        $(Wick.BasketPage.el.donationCartBtn).on('click', function(e) {
-            e.preventDefault();
-            const context = $(this).closest(Wick.BasketPage.el.charityItem);
-            if (!context.hasClass('charity-added')) {
-                updateCharity(this);
-                context.addClass('charity-added');
-            } else {
-                changeCharityPrice.call(this);
-            }
-        });
+        $(Wick.BasketPage.el.charityInput).on('click', updateCharity);
+        $(Wick.BasketPage.el.donationCartBtn).on('click', changeCharityPrice);
         $(Wick.BasketPage.el.charityItem).on('click', Wick.BasketPage.el.removeButton, updateCharity);
         $(Wick.BasketPage.el.orderSummary).on('click', Wick.BasketPage.el.voucherRemove, voucherRemove);
         $(Wick.BasketPage.el.promoWrapper).on('click', Wick.BasketPage.el.promoClose, Wick.BasketPage.removePromotion);
@@ -1313,7 +1306,6 @@ $(document).ready(function () {
         );
         Wick.BasketPage.updateCart(...Array(3), true);
         setDefaultCharityValue();
-        initCharityInteractions();
         if (!$(Wick.BasketPage.el.loader).length) {
             appendLoader(Wick.BasketPage.loaderPayload);
         }