wickes-css2 2.106.0-develop.6 → 2.106.0-develop.7

package/build/js/share-project-list.min.js

@@ -1 +1 @@
-!function t(i,r,c){function l(n,e){if(!r[n]){if(!i[n]){var o="function"==typeof require&&require;if(!e&&o)return o(n,!0);if(u)return u(n,!0);throw(e=new Error("Cannot find module '"+n+"'")).code="MODULE_NOT_FOUND",e}o=r[n]={exports:{}},i[n][0].call(o.exports,function(e){return l(i[n][1][e]||e)},o,o.exports,t,i,r,c)}return r[n].exports}for(var u="function"==typeof require&&require,e=0;e<c.length;e++)l(c[e]);return l}({1:[function(e,n,o){"use strict";var t,i,r=e("./utils/copy-to-clipboard"),e=window.Wick||{};function c(){document.activeElement}function l(e,n){if(e.length){var o=e.get(0),t=(o.value||"").length;c(),e.removeAttr("disabled");try{o.focus()}catch(e){console.error("[ShareProjectList] input.focus() failed",{source:n,error:e})}c();try{"function"==typeof o.setSelectionRange?o.setSelectionRange(0,t):"function"==typeof o.select&&o.select()}catch(e){console.error("[ShareProjectList] selection failed",{source:n,error:e})}c(),setTimeout(function(){c()},0),setTimeout(function(){c()},50),setTimeout(function(){c()},150)}}function u(e){var n=e.$input,o=e.$linkContainer,t=e.$link;n.on("focus",function(){c()}),n.on("blur",function(){c()}),t.on("click",function(e){e.preventDefault()}),o.on("mousedown",function(){c()}),o.on("click",function(e){c(),e.preventDefault(),l(n,"linkContainer click"),(e=String(n.val()||"").trim())&&(0,r.copyToClipboard)(e,o.get(0),{noUpperCase:!0}).then(function(){t.addClass(i.copied),c(),l(n,"copy success refocus"),setTimeout(function(){l(n,"copy success refocus timeout 0")},0),setTimeout(function(){l(n,"copy success refocus timeout 50")},50)}).catch(function(e){console.error("[ShareProjectList] Failed to copy shopping list link",e),c(),l(n,"copy error refocus")})}),n.on("click",function(){l(n,"input click"),t.removeClass(i.copied)})}e.ShareProjectList=(t={input:"#share-list-modal #shopping-list-link",linkContainer:"#copy-link",link:"a"},i={copied:"copy-link_hovered"},{init:function(){o=$(t.input),e=$(t.linkContainer),n=e.find(t.link);var e,n,o={$input:o,$linkContainer:e,$link:n};o.$input.length&&o.$linkContainer.length&&o.$link.length&&u(o)}}),e.ShareProjectList.init()},{"./utils/copy-to-clipboard":2}],2:[function(e,n,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.copyToClipboard=function(e,n){var o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},e=function(e,n){e=null==e?"":e+"";return(n.noUpperCase?e:e.replace(/(^\w|\s\w)/g,function(e){return e.toUpperCase()})).split(" ").filter(function(e){return""!==e}).join(" ").trim()}(e,o);if(!e)return Promise.reject(new Error("Empty text"));if(null!=(o=window.webkit)&&null!=(o=o.messageHandlers)&&o.copy)try{return window.webkit.messageHandlers.copy.postMessage(e),Promise.resolve(!0)}catch(e){console.error(e)}if(null!=(o=window.Android)&&o.copyToClipboard&&"function"==typeof window.Android.copyToClipboard)try{return window.Android.copyToClipboard(e),Promise.resolve(!0)}catch(e){console.error(e)}if(null!=(o=navigator.clipboard)&&o.writeText)return navigator.clipboard.writeText(e).then(function(){return!0});return function(u,s){return new Promise(function(e,n){try{var o,t=$(s).parent(),i=$("<textarea>").val(u).attr("readonly","readonly").css({position:"fixed",top:0,left:"-9999px",opacity:0,width:"1px",height:"1px",padding:0,border:0,margin:0}),r=(t.append(i),i.get(0)),c=(r.focus(),(r.value||"").length),l=("function"==typeof r.setSelectionRange?r.setSelectionRange(0,c):i.select(),document.execCommand("copy"));i.remove(),window.getSelection&&(o=window.getSelection())&&o.removeAllRanges&&o.removeAllRanges(),l?e(!0):n(new Error("execCommand failed"))}catch(e){n(e)}})}(e,n)}},{}]},{},[1]);
+!function t(r,i,c){function l(n,e){if(!i[n]){if(!r[n]){var o="function"==typeof require&&require;if(!e&&o)return o(n,!0);if(a)return a(n,!0);throw(e=new Error("Cannot find module '"+n+"'")).code="MODULE_NOT_FOUND",e}o=i[n]={exports:{}},r[n][0].call(o.exports,function(e){return l(r[n][1][e]||e)},o,o.exports,t,r,i,c)}return i[n].exports}for(var a="function"==typeof require&&require,e=0;e<c.length;e++)l(c[e]);return l}({1:[function(e,n,o){"use strict";var t,r,i,c,l=e("./utils/copy-to-clipboard");function a(){var e,n;t.length&&(e=t.get(0),t.removeAttr("disabled"),e.focus(),n=(e.value||"").length,"function"==typeof e.setSelectionRange?e.setSelectionRange(0,n):"function"==typeof e.select&&e.select())}t=$("#share-list-modal #shopping-list-link"),r=$("#copy-link"),i=r.find("a"),c="copy-link_hovered",i.on("click",function(e){e.preventDefault()}),r.on("click",function(e){e.preventDefault(),a();e=(t.val()||"").trim();e&&(0,l.copyToClipboard)(e,r[0],{noUpperCase:!0}).then(function(){i.addClass(c)}).catch(function(e){console.error(e)})}),t.on("click",function(e){e.preventDefault(),a(),i.removeClass(c)})},{"./utils/copy-to-clipboard":2}],2:[function(e,n,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.copyToClipboard=function(e,n){var o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},e=function(e,n){e=null==e?"":e+"";return(n.noUpperCase?e:e.replace(/(^\w|\s\w)/g,function(e){return e.toUpperCase()})).split(" ").filter(function(e){return""!==e}).join(" ").trim()}(e,o);if(!e)return Promise.reject(new Error("Empty text"));if(null!=(o=window.webkit)&&null!=(o=o.messageHandlers)&&o.copy)try{return window.webkit.messageHandlers.copy.postMessage(e),Promise.resolve(!0)}catch(e){console.error(e)}if(null!=(o=window.Android)&&o.copyToClipboard&&"function"==typeof window.Android.copyToClipboard)try{return window.Android.copyToClipboard(e),Promise.resolve(!0)}catch(e){console.error(e)}if(null!=(o=navigator.clipboard)&&o.writeText)return navigator.clipboard.writeText(e).then(function(){return!0});return function(a,u){return new Promise(function(e,n){try{var o,t=$(u).parent(),r=$("<textarea>").val(a).attr("readonly","readonly").css({position:"fixed",top:0,left:"-9999px",opacity:0,width:"1px",height:"1px",padding:0,border:0,margin:0}),i=(t.append(r),r.get(0)),c=(i.focus(),(i.value||"").length),l=("function"==typeof i.setSelectionRange?i.setSelectionRange(0,c):r.select(),document.execCommand("copy"));r.remove(),window.getSelection&&(o=window.getSelection())&&o.removeAllRanges&&o.removeAllRanges(),l?e(!0):n(new Error("execCommand failed"))}catch(e){n(e)}})}(e,n)}},{}]},{},[1]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.106.0-develop.6",
+  "version": "2.106.0-develop.7",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -125,7 +125,7 @@
     "branches": [
       "alt-master",
       {
-        "name": "custom-tag/0.5.0-icons",
+        "name": "develop",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/components/card_product_v2.hbs

@@ -6,7 +6,12 @@
         {{#if badge-text}}
             <div class="products-list-v2__badges price__badges-v2 price__badges-v2-{{badge-color}}
                 {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}">
-                <div class="products-list-v2__badge">{{badge-text}}</div>
+                {{#ifCond switch-vat '&&' badge-text-exc}}
+                    <div class="products-list-v2__badge including-vat">{{badge-text}}</div>
+                    <div class="products-list-v2__badge excluding-vat d-none">{{badge-text-exc}}</div>
+                {{else}}
+                    <div class="products-list-v2__badge">{{badge-text}}</div>
+                {{/ifCond}}
             </div>
         {{/if}}
         <a href="{{range-link}}" class="card__img-wrap">

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

@@ -3,7 +3,12 @@
         <div class="pdp__badges pdp-price-container__badges price__badges-v2 price__badges-v2-{{badge-color}}
             {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}
             {{#if badge-wide}}price__badges-v2-wide{{/if}}">
-            <div class="pdp__badge">{{badge-text}}</div>
+            {{#ifCond switch-vat '&&' badge-text-exc}}
+                <div class="pdp__badge including-vat">{{badge-text}}</div>
+                <div class="pdp__badge excluding-vat d-none">{{badge-text-exc}}</div>
+            {{else}}
+                <div class="pdp__badge">{{badge-text}}</div>
+            {{/ifCond}}
         </div>
     {{/if}}
     <div class="pdp-price">
@@ -17,9 +22,9 @@
                             <div class="main-price__vat">Inc.VAT</div>
                         </div>
                         {{#if isSQM}}
-                            <div class="pdp-price__sqm">&pound;40.00 per SQM</div>
+                            <div class="pdp-price__sqm">&pound;40 per SQM</div>
                         {{/if}}
-                        <div class="pdp-price__remainder">You save &pound;40.00</div>
+                        <div class="pdp-price__remainder">You save &pound;40</div>
                         {{#if isExcludingDelivery}}
                           <a href="#" class="pdp-price__excluding-delivery">Excluding delivery</a>
                         {{/if}}
@@ -37,9 +42,7 @@
                                 </div>
                             {{else}}
                                 <div class="pdp-price__description">
-                                    Long offer message Lorem ipsum dolor sit amet,
-                                    consectetur adipiscing elit.
-                                    Aenean euismod bibendum laoreet
+                                    Offer price equivalent to &pound;24 per item
                                 </div>
                             {{/if}}
                         {{/if}}
@@ -50,15 +53,15 @@
                 </div>
                 <div class="pdp-price-sale__value excluding-vat d-none">
                     {{#if isDiscount}}
-                        <div class="pdp-price__old-price"><s>&pound;119.99</s></div>
+                        <div class="pdp-price__old-price"><s>&pound;118.99</s></div>
                         <div class="main-price">
-                            <div class="main-price__value pdp-price__new-price">&pound;79.99</div>
+                            <div class="main-price__value pdp-price__new-price">&pound;78.99</div>
                             <div class="main-price__vat">Exc.VAT</div>
                         </div>
                         {{#if isSQM}}
-                            <div class="pdp-price__sqm">&pound;40.00 per SQM</div>
+                            <div class="pdp-price__sqm">&pound;39 per SQM</div>
                         {{/if}}
-                        <div class="pdp-price__remainder">You save &pound;40.00</div>
+                        <div class="pdp-price__remainder">You save &pound;39</div>
                         {{#if isExcludingDelivery}}
                           <a href="#" class="pdp-price__excluding-delivery">Excluding delivery</a>
                         {{/if}}
@@ -76,9 +79,7 @@
                                 </div>
                             {{else}}
                                 <div class="pdp-price__description">
-                                    Long offer message Lorem ipsum dolor sit amet,
-                                    consectetur adipiscing elit.
-                                    Aenean euismod bibendum laoreet
+                                    Offer price equivalent to &pound;23 per item
                                 </div>
                             {{/if}}
                         {{/if}}
@@ -93,9 +94,9 @@
                         <div class="pdp-price__old-price"><s>&pound;119.99</s></div>
                         <div class="pdp-price__new-price">&pound;79.99</div>
                         {{#if isSQM}}
-                            <div class="pdp-price__sqm">&pound;40.00 per SQM</div>
+                            <div class="pdp-price__sqm">&pound;40 per SQM</div>
                         {{/if}}
-                        <div class="pdp-price__remainder">You save &pound;40.00</div>
+                        <div class="pdp-price__remainder">You save &pound;40</div>
                         {{#if isExcludingDelivery}}
                           <a href="#" class="pdp-price__excluding-delivery">Excluding delivery</a>
                         {{/if}}

package/src/data/data_search-results_v2.json

@@ -84,7 +84,8 @@
         "price": "<span class='product-card__price-value-text'>From</span> £99,009.00",
         "review-rating": "1.0",
         "recommended": false,
-        "badge-text": "Buy Bulk and Save",
+        "badge-text": "15% off",
+        "badge-text-exc": "14% off",
         "badge-color": "blue",
         "badge-text-color": "white"
       },

package/src/js/components/general/switchVat.js

@@ -54,10 +54,7 @@ Wick.VatToggle = {
   },
 
   isToggleVatAvailable: function() {
-    //added so that it doesn't trigger in the local environment
-    if (!Wick.checkLocalEnv) {
-      return window.ACC.app.isVatToggleAvailable;
-    }
+    return window.ACC.app.isVatToggleAvailable;
   },
 
   isOn: function () {

package/src/js/components/share-project-list.js

@@ -0,0 +1,56 @@
+// this file should be delete after <script defer="defer" src="./js/share-project-list.min.js"></script>
+// implementation on backend (IC-1182 comment https://wickesit.atlassian.net/browse/IC-1182?focusedCommentId=312018)
+
+var Wick = Wick || {};
+
+Wick.ShareProjectList = (function () {
+    function init() {
+        var shoppingListLinkInput = $('#share-list-modal #shopping-list-link'),
+            shoppingListLinkEl = shoppingListLinkInput[0],
+            linkContainer = $('#copy-link'),
+            actualLink = linkContainer.find('a'),
+            copyClass = 'copy-link_hovered';
+
+        actualLink.click(function (e) {
+            e.preventDefault();
+        });
+
+        linkContainer.click(function () {
+            if (navigator.userAgent.match(/TradeProMobile_iOS|DIYMobile_iOS/i)) {
+                iosCopyToClipboard(shoppingListLinkInput);
+            } else if (navigator.userAgent.match(/ipad|ipod|iphone/i)) {
+                shoppingListLinkEl.select();
+                shoppingListLinkEl.setSelectionRange(0, 999999);
+            } else {
+                shoppingListLinkEl.select();
+            }
+
+            document.execCommand('copy');
+            actualLink.addClass(copyClass);
+        });
+
+        shoppingListLinkInput.click(function () {
+            linkContainer.click();
+            actualLink.removeClass(copyClass);
+        });
+    }
+
+    function iosCopyToClipboard($input) {
+        var el = $input.get(0);
+        var editable = el.contentEditable;
+        var readOnly = el.readOnly;
+
+        el.contentEditable = true;
+        el.readOnly = false;
+        var range = document.createRange();
+        range.selectNodeContents(el);
+        var sel = window.getSelection();
+        sel.removeAllRanges();
+        sel.addRange(range);
+        el.setSelectionRange(0, 999999);
+        el.contentEditable = editable;
+        el.readOnly = readOnly;
+    }
+
+    init();
+})();