wickes-css2 2.94.0 → 2.95.0

package/build/js/quiz.min.js

@@ -1 +1 @@
-!function n(r,o,a){function l(t,e){if(!o[t]){if(!r[t]){var i="function"==typeof require&&require;if(!e&&i)return i(t,!0);if(u)return u(t,!0);throw(e=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",e}i=o[t]={exports:{}},r[t][0].call(i.exports,function(e){return l(r[t][1][e]||e)},i,i.exports,n,r,o,a)}return o[t].exports}for(var u="function"==typeof require&&require,e=0;e<a.length;e++)l(a[e]);return l}({1:[function(e,t,i){"use strict";var r=e("./utils/create-event"),n=e("./utils/validation"),o=e("./utils/helpers");function a(e){return(a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(t,e){var i,n=Object.keys(t);return Object.getOwnPropertySymbols&&(i=Object.getOwnPropertySymbols(t),e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)),n}function u(n){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?l(Object(r),!0).forEach(function(e){var t,i;t=n,i=r[e=e],(e=function(e){e=function(e,t){if("object"!==a(e)||null===e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!==a(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}(e,"string");return"symbol"===a(e)?e:String(e)}(e))in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i}):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(r)):l(Object(r)).forEach(function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(r,e))})}return n}var d=window.Wick||{};d.Quiz={STYLE_QUIZ_EMAIL:"styleQuizEmail",el:{quizContainer:".main-quiz",quizActions:".quiz-actions",body:"body",html:"html",input:'input[type="text"]',modal:".quiz-modal",modalEmail:"#quiz-modal",modalEmailFinal:"#quiz-modal-final",btnQuizEmail:"#email-results-quiz",cancelBtn:".quiz-modal__controls .btn-cancel",submitBtn:'.quiz-modal__controls [type="submit"]',quizForm:".quiz-modal__form",btnPrintResultQuiz:"#print-results-quiz",emailInput:"#email",firstNameInput:"#firstName",surnameInput:"#surname",formInvalidClass:"form_invalid"},errorMessages:{errorFirstName:"Please enter a first name",errorSurname:"Please enter a surname",errorEmail:"Please enter a valid email address"},getFieldsConfigurations:function(){return[{input:d.Quiz.el.firstNameInput,validator:n.isValidInputTextField,error:d.Quiz.errorMessages.errorFirstName},{input:d.Quiz.el.surnameInput,validator:n.isValidInputTextField,error:d.Quiz.errorMessages.errorSurname},{input:d.Quiz.el.emailInput,validator:n.isValidEmail,error:d.Quiz.errorMessages.errorEmail}]},showModal:function(e){$(e).modal("show")},closeModal:function(e,t){t&&t.preventDefault(),$(e).modal("hide")},validateInput:function(e,t,i){t=t($(e).val());return(0,n.updateStylingError)(e,t,i),t},validateForm:function(){var e=d.Quiz.getFieldsConfigurations(),t=!0;return e.forEach(function(e){e=d.Quiz.validateInput(e.input,e.validator,e.error);t=t&&e}),t},clearAllForm:function(){$(d.Quiz.el.modalEmail+" ".concat(d.Quiz.el.input)).val("")},disableButton:function(e){$(e).attr("disabled",!0)},enableButton:function(e){$(e).removeAttr("disabled")},requestToEmailResult:function(){var n={email:$(d.Quiz.el.emailInput).val(),firstName:$(d.Quiz.el.firstNameInput).val(),lastName:$(d.Quiz.el.surnameInput).val()};return d.Quiz.disableButton(d.Quiz.el.submitBtn),new Promise(function(e,t){var i=u({},n),i=(0,r.createEvent)(d.Quiz.STYLE_QUIZ_EMAIL,i,{resolve:e,reject:t});window.dispatchEvent(i)}).then(function(){d.Quiz.closeModal(d.Quiz.el.modalEmail)}).catch(function(e){console.error(e)}).finally(function(){d.Quiz.clearAllForm(),d.Quiz.showModal(d.Quiz.el.modalEmailFinal),d.Quiz.enableButton(d.Quiz.el.submitBtn)})},submitForm:function(e){e.preventDefault(),d.Quiz.validateForm()?d.Quiz.requestToEmailResult():$(d.Quiz.el.quizForm).addClass(d.Quiz.el.formInvalidClass)},loadScript:function(e,t){var i=document.createElement("script");i.src=e,i.onload=t,i.onerror=function(){return console.error("Failed to load script:",e)},document.head.appendChild(i)},handleSaveAsPDF:function(){"undefined"==typeof html2pdf?d.Quiz.loadScript("https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.2/html2pdf.bundle.min.js",function(){d.Quiz.generatePDF()}):d.Quiz.generatePDF()},convertSvgToCanvas:function(t){return new Promise(function(r,o){var e=document.querySelectorAll(t+' img[src*=".svg"]'),a=e.length;0===a&&r(),e.forEach(function(e){var t=document.createElement("canvas"),i=t.getContext("2d"),n=new Image;n.crossOrigin="Anonymous",n.onload=function(){t.width=2*n.width,t.height=2*n.height,i.drawImage(n,0,0,t.width,t.height);try{e.src=t.toDataURL("image/png"),--a}catch(e){return void o(e)}0===a&&r()},n.onerror=function(){o(new Error("Failed to load image"))},n.src=e.src})})},generatePDF:function(){var e=document.body.querySelector(d.Quiz.el.quizContainer);d.Quiz.convertSvgToCanvas(d.Quiz.el.quizContainer).then(function(){html2pdf().set({margin:1,filename:"Wickes Matchmaker Quiz result.pdf",image:{type:"jpeg",quality:.98},html2canvas:{scale:2,useCORS:!0,windowWidth:770},jsPDF:{format:[695.28,200]}}).from(e).save()}).catch(function(e){return console.error("Error converting SVGs:",e)})},handlePrint:function(){var e=d.Quiz.el.html,t=document.createElement("iframe"),i=(t.name="printFrame",t.style.display="none",document.body.appendChild(t),t.contentWindow),e=(i.document.write("<html><head>"),$('[type="text/css"]').each(function(e,t){i.document.write(t.outerHTML)}),i.document.write("</head><body>"),$(e).clone());e.find("script, iframe").remove(),e.find("svg").each(function(){this.setAttribute("xmlns","http://www.w3.org/2000/svg")}),i.document.write(e.html()),i.document.write("</body></html>"),i.document.close(),i.focus(),t.onload=function(){setTimeout(function(){i.print(),document.body.removeChild(t)},500)}},disablePrintButtonOnMobileApp:function(){(0,o.isApp)()&&d.Quiz.disableButton(d.Quiz.el.btnPrintResultQuiz)},handlePrintOrPDFInteraction:function(e){e.preventDefault(),(0,o.isTouchDevice)()?d.Quiz.handleSaveAsPDF():d.Quiz.handlePrint()},init:function(){$(d.Quiz.el.body).on("click",d.Quiz.el.btnQuizEmail,function(e){e.preventDefault(),d.Quiz.showModal(d.Quiz.el.modalEmail)}),$(d.Quiz.el.cancelBtn).on("click",function(e){d.Quiz.closeModal(d.Quiz.el.modal,e)}),$(d.Quiz.el.body).on("submit",d.Quiz.el.quizForm,d.Quiz.submitForm);var t=_.debounce(d.Quiz.handlePrintOrPDFInteraction,500);$(d.Quiz.el.btnPrintResultQuiz).on("click",function(e){e.preventDefault(),t(e)}),d.Quiz.disablePrintButtonOnMobileApp()}},$(document).ready(function(){d.Quiz.init()})},{"./utils/create-event":2,"./utils/helpers":3,"./utils/validation":4}],2:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.createEvent=function(e,t,i){return new CustomEvent(e,{detail:{payload:t,resolve:i.resolve,reject:i.reject}})}},{}],3:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.countLetters=function(e){e=e.match(/[a-zA-Z]/g);return e?e.length:0},i.createImageElements=function(e,t){return e.map(function(e){return $("<img>").attr("src",e).attr("alt",t)})},i.highlightCharacter=function(e,t,i){return e.includes(t)?(t=new RegExp("\\".concat(t,"+"),"g"),i='<span class="'.concat(i,'">$&</span>'),e.replace(t,i)):e},i.isApp=function(){return navigator.userAgent.match(/TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android|DIYApp_Guest_Mobile_iOS|DIYApp_Guest_Mobile_Android|AGENT_PLACEHOLDER/i)},i.isHasSymbol=function(e,t){return e.includes(t)},i.isKeyboardOpen=function(){var e=window.innerHeight,t=window.visualViewport.height;return e!==t},i.isTouchDevice=function(){return"ontouchstart"in window},i.scrollToTop=function(e){e.scrollTop(0)}},{}],4:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.addErrorMessage=A,i.addFieldValidation=function(e,i){$(e).each(function(e,t){$(t).blur(function(){a(this),i(this),n.idsOfInputsWithNoNeedToUpdateDuringTyping.includes(t.id)||$(this).keyup(function(){a(this),i(this)})})})},i.clearValidationErrors=function(e){e=$(e);e.hasClass("form_invalid")&&e.removeClass("form_invalid").find(".form-row[data-row-required]").removeClass("form-row_validation-error").find(".form-row__error").remove()},i.isNameOnCardContainsAtLeast14Digits=b,i.isNameOnCardContainsOnly16Digits=w,i.isValidAddress2=h,i.isValidAddressSelection=p,i.isValidEmail=l,i.isValidFieldSize=s,i.isValidHouseName=v,i.isValidInputTextField=c,i.isValidPassword=u,i.isValidPhoneNumber=f,i.isValidPostcodeField=m,i.isValidStoreId=z,i.isValidTitle=d,i.isValidVoucher=g,i.removeErrorStyling=Q,i.showValidationErrors=function(e,t){e=$(e);e.hasClass(r.formInvalid)?e.find(r.fieldRow).find(".form-row__error").text(t):(e.find(".form-row__error").remove(),e.addClass(r.formInvalid).find(r.fieldRow).append(function(e){return'<div class="form-row__error"> '.concat(e||"Error message here","</div>")}(t)).addClass(r.rowValidationError));t=e.find(r.fieldRow).first();{var i;t.length&&!function(e){"function"==typeof jQuery&&e instanceof jQuery&&(e=e[0]);e=e.getBoundingClientRect();return 0<=e.top&&0<=e.left&&e.bottom<=(window.innerHeight||document.documentElement.clientHeight)&&e.right<=(window.innerWidth||document.documentElement.clientWidth)}(t)&&(e=t.closest(".modal").length,i=e?t.closest(".modal"):$("html, body"),e=e?0:t.offset().top-30,i.animate({scrollTop:e},300))}},i.updateInputValueBeforeValidation=a,i.updateStylingError=y,i.updateStylingErrorForElement=E,i.validateAddress1=function(e){y(e.id,c(e.value),invalidAddressOne)},i.validateAddress2=function(e){y(e.id,h(e.value),invalidAddressTwo)},i.validateAddressSelection=function(e){y(e.id,p(e),selectAddressMessage)},i.validateCity=function(e){y(e.id,c(e.value),invalidTownCity)},i.validateEmail=function(e){y(e.id,l(e.value),invalidEmailAddress)},i.validateFirstName=function(e){y(e.id,c(e.value),invalidFirstName)},i.validateGuidPattern=function(e){return o.guidPattern.test(e)},i.validateHouseName=function(e){y(e.id,v(e.value))},i.validateLastName=function(e){y(e.id,c(e.value),invalidLastName)},i.validateMobile=function(e,t){y(e.id,f(e.value,t),invalidMobile)},i.validateNameOnCard=function(e){y(e.id,!0);var t=c(e.value);t?e.value.length>nameOnCardMaxLength?y(e.id,!1,invalidNameOnCardLength):w(e.value)?y(e.id,!1,invalidCustomNameOnCard):b(e.value)&&y(e.id,!1,validationWarnNameOnCard):y(e.id,t,invalidNameOnCard)},i.validatePassword=function(e){y(e.id,u(e.value),invalidPassword)},i.validatePhone=function(e){y(e.id,f(e.value,!0),invalidTelephone)},i.validatePostcode=function(e,t){var i=e.value,n=m(i);t&&n&&(i=i.replace(/\s/g,""),$("#"+$.escapeSelector(e.id)).val(i.substr(0,i.length-3)+" "+i.substr(i.length-3)));y(e.id,n,invalidPostCode)},i.validateStoreId=function(e){y(e.id,z(e.value),invalidStoreId)},i.validateTitle=function(e){y(e.id,d(e.value),invalidTitle)},i.validateUserFriendlyIdPattern=function(e){return o.userFriendlyIdPattern.test(e)},i.validateVoucher=function(e){E(e,g(e.value),invalidVoucherCode)},i.wrapWithError=P;var n={idsOfInputsWithNoNeedToUpdateDuringTyping:["address-lookup-query","modal-address-lookup-query"]},r={formInvalid:"form_invalid",fieldRow:".form-row[data-row-required]",rowValidationError:"form-row_validation-error"},o={guidPattern:/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i,userFriendlyIdPattern:/^[A-Za-z]{2,3}\d{6}$/};function a(e){$(e).val($.trim($(e).val()))}function l(e){var t=new RegExp("^(?=.{1,64}@)[\\w\\+-]+(\\.[\\w\\+-]+)*@(([A-Za-z\\d]+[A-Za-z\\d-]*\\.){1,3}[A-Za-z]{2,16}|(?:(?:25[0-5]|2[0-4][\\d]|[01]?[\\d][\\d]?)\\.){3}(?:25[0-5]|2[0-4][\\d]|[01]?[\\d][\\d]?))$"),i=e.length<=254;return t.test(e)&&i}function u(e){return 0<e.length}function d(e){return 0<e.length}function s(e){return 0<e.length&&e.length<255}function c(e){var t=new RegExp("^[\\w ()/&.,'-]+$|^$");return s(e)&&t.test(e)}function f(e,t){var i=new RegExp("^0{1}\\d{10}$|^0{1}\\d{5}\\s{1}\\d{5}$|^0{1}\\d{4}\\s{1}\\d{6}$|^0{1}\\d{3}\\s{1}\\d{3}\\s{1}\\d{4}$|^0{1}\\d{2}\\s{1}\\d{4}\\s{1}\\d{4}$|^0{1}\\d{3}\\s{1}\\d{7}$"),n=new RegExp("^0{1}\\d{9}$|^0{1}\\d{5}\\s{1}\\d{4}$|^0{1}\\d{4}\\s{1}\\d{5}$"),i=i.test(e)||n.test(e);return t?0===e.length||i:0<e.length&&i}function m(e){var e=e.toUpperCase().replaceAll(" ",""),t=new RegExp("^(GIR 0AA)|((([A-PR-UWYZ][0-9][0-9]?)|([A-PR-UWYZ][A-HK-Y][0-9][0-9]?)|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))[0-9][A-BD-HJLNP-UW-Z]{2})$");return 4<e.replace(/\s+/g,"").length&&t.test(e)}function v(e){var t=new RegExp("^[\\w ()/&.,'-]+$|^$");return 0<e.length&&t.test(e)}function p(e){return!$("#"+$.escapeSelector(e.id)).is(":visible")}function h(e){var t=new RegExp("^[\\w ().,'-]+$|^$");return 0===e.length||t.test(e)}function g(e){return 0<e.trim().length}function w(e){return new RegExp("^\\d{16}$").test(e)}function b(e){return new RegExp("^(.*\\d){14,}.*$").test(e)}function z(e){return"0"!==e}function y(e,t,i){E($(e),t,i)}function E(e,t,i){e=$(e).closest(".form-row");e.is(":visible")&&(Q(e),t||(P(e),A(e,i)))}function Q(e){e.removeClass("form-row_validation-error"),e.find(".form-row__error").remove()}function P(e){$(e).addClass("form-row_validation-error")}function A(e,t){t&&$(e).append('<div class="form-row__error">'+t+"</div>")}},{}]},{},[1]);
+!function n(r,o,a){function l(t,e){if(!o[t]){if(!r[t]){var i="function"==typeof require&&require;if(!e&&i)return i(t,!0);if(u)return u(t,!0);throw(e=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",e}i=o[t]={exports:{}},r[t][0].call(i.exports,function(e){return l(r[t][1][e]||e)},i,i.exports,n,r,o,a)}return o[t].exports}for(var u="function"==typeof require&&require,e=0;e<a.length;e++)l(a[e]);return l}({1:[function(e,t,i){"use strict";var r=e("./utils/create-event"),n=e("./utils/validation"),o=e("./utils/helpers");function a(e){return(a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(t,e){var i,n=Object.keys(t);return Object.getOwnPropertySymbols&&(i=Object.getOwnPropertySymbols(t),e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)),n}function u(n){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?l(Object(r),!0).forEach(function(e){var t,i;t=n,i=r[e=e],(e=function(e){e=function(e,t){if("object"!==a(e)||null===e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!==a(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}(e,"string");return"symbol"===a(e)?e:String(e)}(e))in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i}):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(r)):l(Object(r)).forEach(function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(r,e))})}return n}var d=window.Wick||{};d.Quiz={STYLE_QUIZ_EMAIL:"styleQuizEmail",el:{quizContainer:".main-quiz",quizActions:".quiz-actions",body:"body",html:"html",input:'input[type="text"]',modal:".quiz-modal",modalEmail:"#quiz-modal",modalEmailFinal:"#quiz-modal-final",btnQuizEmail:"#email-results-quiz",cancelBtn:".quiz-modal__controls .btn-cancel",submitBtn:'.quiz-modal__controls [type="submit"]',quizForm:".quiz-modal__form",btnPrintResultQuiz:"#print-results-quiz",emailInput:"#email",firstNameInput:"#firstName",surnameInput:"#surname",formInvalidClass:"form_invalid"},errorMessages:{errorFirstName:"Please enter a first name",errorSurname:"Please enter a surname",errorEmail:"Please enter a valid email address"},getFieldsConfigurations:function(){return[{input:d.Quiz.el.firstNameInput,validator:n.isValidInputTextField,error:d.Quiz.errorMessages.errorFirstName},{input:d.Quiz.el.surnameInput,validator:n.isValidInputTextField,error:d.Quiz.errorMessages.errorSurname},{input:d.Quiz.el.emailInput,validator:n.isValidEmail,error:d.Quiz.errorMessages.errorEmail}]},showModal:function(e){$(e).modal("show")},closeModal:function(e,t){t&&t.preventDefault(),$(e).modal("hide")},validateInput:function(e,t,i){t=t($(e).val());return(0,n.updateStylingError)(e,t,i),t},validateForm:function(){var e=d.Quiz.getFieldsConfigurations(),t=!0;return e.forEach(function(e){e=d.Quiz.validateInput(e.input,e.validator,e.error);t=t&&e}),t},clearAllForm:function(){$(d.Quiz.el.modalEmail+" ".concat(d.Quiz.el.input)).val("")},disableButton:function(e){$(e).attr("disabled",!0)},enableButton:function(e){$(e).removeAttr("disabled")},requestToEmailResult:function(){var n={email:$(d.Quiz.el.emailInput).val(),firstName:$(d.Quiz.el.firstNameInput).val(),lastName:$(d.Quiz.el.surnameInput).val()};return d.Quiz.disableButton(d.Quiz.el.submitBtn),new Promise(function(e,t){var i=u({},n),i=(0,r.createEvent)(d.Quiz.STYLE_QUIZ_EMAIL,i,{resolve:e,reject:t});window.dispatchEvent(i)}).then(function(){d.Quiz.closeModal(d.Quiz.el.modalEmail)}).catch(function(e){console.error(e)}).finally(function(){d.Quiz.clearAllForm(),d.Quiz.showModal(d.Quiz.el.modalEmailFinal),d.Quiz.enableButton(d.Quiz.el.submitBtn)})},submitForm:function(e){e.preventDefault(),d.Quiz.validateForm()?d.Quiz.requestToEmailResult():$(d.Quiz.el.quizForm).addClass(d.Quiz.el.formInvalidClass)},loadScript:function(e,t){var i=document.createElement("script");i.src=e,i.onload=t,i.onerror=function(){return console.error("Failed to load script:",e)},document.head.appendChild(i)},handleSaveAsPDF:function(){"undefined"==typeof html2pdf?d.Quiz.loadScript("https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.2/html2pdf.bundle.min.js",function(){d.Quiz.generatePDF()}):d.Quiz.generatePDF()},convertSvgToCanvas:function(t){return new Promise(function(r,o){var e=document.querySelectorAll(t+' img[src*=".svg"]'),a=e.length;0===a&&r(),e.forEach(function(e){var t=document.createElement("canvas"),i=t.getContext("2d"),n=new Image;n.crossOrigin="Anonymous",n.onload=function(){t.width=2*n.width,t.height=2*n.height,i.drawImage(n,0,0,t.width,t.height);try{e.src=t.toDataURL("image/png"),--a}catch(e){return void o(e)}0===a&&r()},n.onerror=function(){o(new Error("Failed to load image"))},n.src=e.src})})},generatePDF:function(){var e=document.body.querySelector(d.Quiz.el.quizContainer);d.Quiz.convertSvgToCanvas(d.Quiz.el.quizContainer).then(function(){var t={margin:1,filename:"Wickes Matchmaker Quiz result.pdf",image:{type:"jpeg",quality:.98},html2canvas:{scale:2,useCORS:!0,windowWidth:770},jsPDF:{format:[695.28,200]}};html2pdf().set(t).from(e).output("datauristring").then(function(e){window.ReactNativeWebView&&window.ReactNativeWebView.postMessage?window.ReactNativeWebView.postMessage(JSON.stringify({event:"matchMakertoolResultBase64",data:{filename:t.filename,file:e}})):console.warn("ReactNativeWebView not available")}).save()}).catch(function(e){return console.error("Error converting SVGs:",e)})},handlePrint:function(){var e=d.Quiz.el.html,t=document.createElement("iframe"),i=(t.name="printFrame",t.style.display="none",document.body.appendChild(t),t.contentWindow),e=(i.document.write("<html><head>"),$('[type="text/css"]').each(function(e,t){i.document.write(t.outerHTML)}),i.document.write("</head><body>"),$(e).clone());e.find("script, iframe").remove(),e.find("svg").each(function(){this.setAttribute("xmlns","http://www.w3.org/2000/svg")}),i.document.write(e.html()),i.document.write("</body></html>"),i.document.close(),i.focus(),t.onload=function(){setTimeout(function(){i.print(),document.body.removeChild(t)},500)}},handlePrintOrPDFInteraction:function(e){e.preventDefault(),(0,o.isTouchDevice)()?d.Quiz.handleSaveAsPDF():d.Quiz.handlePrint()},init:function(){$(d.Quiz.el.body).on("click",d.Quiz.el.btnQuizEmail,function(e){e.preventDefault(),d.Quiz.showModal(d.Quiz.el.modalEmail)}),$(d.Quiz.el.cancelBtn).on("click",function(e){d.Quiz.closeModal(d.Quiz.el.modal,e)}),$(d.Quiz.el.body).on("submit",d.Quiz.el.quizForm,d.Quiz.submitForm);var t=_.debounce(d.Quiz.handlePrintOrPDFInteraction,500);$(d.Quiz.el.btnPrintResultQuiz).on("click",function(e){e.preventDefault(),t(e)})}},$(document).ready(function(){d.Quiz.init()})},{"./utils/create-event":2,"./utils/helpers":3,"./utils/validation":4}],2:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.createEvent=function(e,t,i){return new CustomEvent(e,{detail:{payload:t,resolve:i.resolve,reject:i.reject}})}},{}],3:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.countLetters=function(e){e=e.match(/[a-zA-Z]/g);return e?e.length:0},i.createImageElements=function(e,t){return e.map(function(e){return $("<img>").attr("src",e).attr("alt",t)})},i.highlightCharacter=function(e,t,i){return e.includes(t)?(t=new RegExp("\\".concat(t,"+"),"g"),i='<span class="'.concat(i,'">$&</span>'),e.replace(t,i)):e},i.isApp=function(){return navigator.userAgent.match(/TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android|DIYApp_Guest_Mobile_iOS|DIYApp_Guest_Mobile_Android|AGENT_PLACEHOLDER/i)},i.isHasSymbol=function(e,t){return e.includes(t)},i.isKeyboardOpen=function(){var e=window.innerHeight,t=window.visualViewport.height;return e!==t},i.isTouchDevice=function(){return"ontouchstart"in window},i.scrollToTop=function(e){e.scrollTop(0)}},{}],4:[function(e,t,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0}),i.addErrorMessage=_,i.addFieldValidation=function(e,i){$(e).each(function(e,t){$(t).blur(function(){a(this),i(this),n.idsOfInputsWithNoNeedToUpdateDuringTyping.includes(t.id)||$(this).keyup(function(){a(this),i(this)})})})},i.clearValidationErrors=function(e){e=$(e);e.hasClass("form_invalid")&&e.removeClass("form_invalid").find(".form-row[data-row-required]").removeClass("form-row_validation-error").find(".form-row__error").remove()},i.isNameOnCardContainsAtLeast14Digits=b,i.isNameOnCardContainsOnly16Digits=w,i.isValidAddress2=h,i.isValidAddressSelection=p,i.isValidEmail=l,i.isValidFieldSize=s,i.isValidHouseName=v,i.isValidInputTextField=c,i.isValidPassword=u,i.isValidPhoneNumber=f,i.isValidPostcodeField=m,i.isValidStoreId=y,i.isValidTitle=d,i.isValidVoucher=g,i.removeErrorStyling=Q,i.showValidationErrors=function(e,t){e=$(e);e.hasClass(r.formInvalid)?e.find(r.fieldRow).find(".form-row__error").text(t):(e.find(".form-row__error").remove(),e.addClass(r.formInvalid).find(r.fieldRow).append(function(e){return'<div class="form-row__error"> '.concat(e||"Error message here","</div>")}(t)).addClass(r.rowValidationError));t=e.find(r.fieldRow).first();{var i;t.length&&!function(e){"function"==typeof jQuery&&e instanceof jQuery&&(e=e[0]);e=e.getBoundingClientRect();return 0<=e.top&&0<=e.left&&e.bottom<=(window.innerHeight||document.documentElement.clientHeight)&&e.right<=(window.innerWidth||document.documentElement.clientWidth)}(t)&&(e=t.closest(".modal").length,i=e?t.closest(".modal"):$("html, body"),e=e?0:t.offset().top-30,i.animate({scrollTop:e},300))}},i.updateInputValueBeforeValidation=a,i.updateStylingError=z,i.updateStylingErrorForElement=E,i.validateAddress1=function(e){z(e.id,c(e.value),invalidAddressOne)},i.validateAddress2=function(e){z(e.id,h(e.value),invalidAddressTwo)},i.validateAddressSelection=function(e){z(e.id,p(e),selectAddressMessage)},i.validateCity=function(e){z(e.id,c(e.value),invalidTownCity)},i.validateEmail=function(e){z(e.id,l(e.value),invalidEmailAddress)},i.validateFirstName=function(e){z(e.id,c(e.value),invalidFirstName)},i.validateGuidPattern=function(e){return o.guidPattern.test(e)},i.validateHouseName=function(e){z(e.id,v(e.value))},i.validateLastName=function(e){z(e.id,c(e.value),invalidLastName)},i.validateMobile=function(e,t){z(e.id,f(e.value,t),invalidMobile)},i.validateNameOnCard=function(e){z(e.id,!0);var t=c(e.value);t?e.value.length>nameOnCardMaxLength?z(e.id,!1,invalidNameOnCardLength):w(e.value)?z(e.id,!1,invalidCustomNameOnCard):b(e.value)&&z(e.id,!1,validationWarnNameOnCard):z(e.id,t,invalidNameOnCard)},i.validatePassword=function(e){z(e.id,u(e.value),invalidPassword)},i.validatePhone=function(e){z(e.id,f(e.value,!0),invalidTelephone)},i.validatePostcode=function(e,t){var i=e.value,n=m(i);t&&n&&(i=i.replace(/\s/g,""),$("#"+$.escapeSelector(e.id)).val(i.substr(0,i.length-3)+" "+i.substr(i.length-3)));z(e.id,n,invalidPostCode)},i.validateStoreId=function(e){z(e.id,y(e.value),invalidStoreId)},i.validateTitle=function(e){z(e.id,d(e.value),invalidTitle)},i.validateUserFriendlyIdPattern=function(e){return o.userFriendlyIdPattern.test(e)},i.validateVoucher=function(e){E(e,g(e.value),invalidVoucherCode)},i.wrapWithError=P;var n={idsOfInputsWithNoNeedToUpdateDuringTyping:["address-lookup-query","modal-address-lookup-query"]},r={formInvalid:"form_invalid",fieldRow:".form-row[data-row-required]",rowValidationError:"form-row_validation-error"},o={guidPattern:/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i,userFriendlyIdPattern:/^[A-Za-z]{2,3}\d{6}$/};function a(e){$(e).val($.trim($(e).val()))}function l(e){var t=new RegExp("^(?=.{1,64}@)[\\w\\+-]+(\\.[\\w\\+-]+)*@(([A-Za-z\\d]+[A-Za-z\\d-]*\\.){1,3}[A-Za-z]{2,16}|(?:(?:25[0-5]|2[0-4][\\d]|[01]?[\\d][\\d]?)\\.){3}(?:25[0-5]|2[0-4][\\d]|[01]?[\\d][\\d]?))$"),i=e.length<=254;return t.test(e)&&i}function u(e){return 0<e.length}function d(e){return 0<e.length}function s(e){return 0<e.length&&e.length<255}function c(e){var t=new RegExp("^[\\w ()/&.,'-]+$|^$");return s(e)&&t.test(e)}function f(e,t){var i=new RegExp("^0{1}\\d{10}$|^0{1}\\d{5}\\s{1}\\d{5}$|^0{1}\\d{4}\\s{1}\\d{6}$|^0{1}\\d{3}\\s{1}\\d{3}\\s{1}\\d{4}$|^0{1}\\d{2}\\s{1}\\d{4}\\s{1}\\d{4}$|^0{1}\\d{3}\\s{1}\\d{7}$"),n=new RegExp("^0{1}\\d{9}$|^0{1}\\d{5}\\s{1}\\d{4}$|^0{1}\\d{4}\\s{1}\\d{5}$"),i=i.test(e)||n.test(e);return t?0===e.length||i:0<e.length&&i}function m(e){var e=e.toUpperCase().replaceAll(" ",""),t=new RegExp("^(GIR 0AA)|((([A-PR-UWYZ][0-9][0-9]?)|([A-PR-UWYZ][A-HK-Y][0-9][0-9]?)|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))[0-9][A-BD-HJLNP-UW-Z]{2})$");return 4<e.replace(/\s+/g,"").length&&t.test(e)}function v(e){var t=new RegExp("^[\\w ()/&.,'-]+$|^$");return 0<e.length&&t.test(e)}function p(e){return!$("#"+$.escapeSelector(e.id)).is(":visible")}function h(e){var t=new RegExp("^[\\w ().,'-]+$|^$");return 0===e.length||t.test(e)}function g(e){return 0<e.trim().length}function w(e){return new RegExp("^\\d{16}$").test(e)}function b(e){return new RegExp("^(.*\\d){14,}.*$").test(e)}function y(e){return"0"!==e}function z(e,t,i){E($(e),t,i)}function E(e,t,i){e=$(e).closest(".form-row");e.is(":visible")&&(Q(e),t||(P(e),_(e,i)))}function Q(e){e.removeClass("form-row_validation-error"),e.find(".form-row__error").remove()}function P(e){$(e).addClass("form-row_validation-error")}function _(e,t){t&&$(e).append('<div class="form-row__error">'+t+"</div>")}},{}]},{},[1]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.94.0",
+  "version": "2.95.0",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {

package/src/components/checkout-action.hbs

@@ -1,14 +1,15 @@
-<div class="checkout-action__wrapper {{mod}}">
+<div class="checkout-action__wrapper {{lookup . "mod"}} {{view}}">
     {{#if head}}
         {{> checkout-section-title title=head}}
     {{/if}}
-    <div class="checkout-action">
+    <div class="checkout-action {{#if container}}container{{/if}}">
         <div class="checkout-action__section">
             <a href="#" class="btn btn_full btn-action btn-checkout">
-                Checkout
-                <span class="icon">
-                  <i class="fas fa-arrow-right"></i>
-                </span>
+              <span class="btn-wickes-checkout__label checkout-text--mixed">Checkout</span>
+              <span class="btn-wickes-checkout__label checkout-text--collect">Wickes Checkout</span>
+              <span class="icon">
+                <i class="fas fa-arrow-right"></i>
+              </span>
             </a>
         </div>
         <div class="checkout-action__section checkout-widget__basket-block">
@@ -23,13 +24,15 @@
                         </div>
                     </div>
                 </a>
+              {{#unless hidePaypalEmail}}
                 <div class="pay-pal_container-email">
-                    <div class="pay-pal_email-heading">Your PayPal email: </div>
-                    <div class="pay-pal_email-value">John.doe@gmail.com</div>
-                    <div class="pay-pal_email-link">
-                        <a href="#" title="" target="_blank">Don't use this email</a>
-                    </div>
+                  <div class="pay-pal_email-heading">Your PayPal email: </div>
+                  <div class="pay-pal_email-value">John.doe@gmail.com</div>
+                  <div class="pay-pal_email-link">
+                    <a href="#" title="" target="_blank">Don't use this email</a>
+                  </div>
                 </div>
+              {{/unless}}
             </div>
         </div>
     </div>

package/src/components/checkout-voucher-accordion.hbs

@@ -0,0 +1,15 @@
+<li class="checkout-widget__voucher-accordion">
+  <div
+      class="checkout-widget__voucher-toggle collapsed"
+      data-toggle="collapse"
+      data-target="#checkout-voucher-accordion-{{id}}"
+  >
+    Got a voucher?
+    <span class="checkout-widget__icon">
+            <i class="fal fa-angle-up fa-2x"></i>
+          </span>
+  </div>
+  <div class="collapse" id="checkout-voucher-accordion-{{id}}">
+    {{> checkout_voucher_large  id=id title=""}}
+  </div>
+</li>

package/src/components/checkout_order-summary-new.hbs

@@ -12,12 +12,13 @@
             {{/each}}
         {{else}}
             {{#each info}}
-                <li class="checkout-widget__item {{#if mod}}checkout-widget__item-{{mod}}{{/if}}">
+                <li class="checkout-widget__item {{#if (lookup this "mod")}}checkout-widget__item-{{lookup this "mod"}}{{/if}}">
                     <span>{{title}}</span>
                     <span class="checkout-widget__item-value">{{value}}</span>
                 </li>
             {{/each}}
         {{/if}}
+        {{> checkout-voucher-accordion id=id}}
         {{#if discounts}}
             <li class="checkout-widget__accordion-wrap checkout-widget__details-discount">
             <span class="checkout-widget__detail-name checkout-widget__detail-name_accordion collapsed" data-toggle="collapse"
@@ -35,7 +36,8 @@
             </li>
         {{/if}}
     </ul>
-    <div class="checkout-widget__total">
+  {{#unless mobile}}
+    <div class="checkout-widget__total" data-sticky-observe>
         {{#if confirmationSummary}}
             <div> {{ confirmation-summary.total.title }}</div>
             <div class="checkout-widget__total-value">{{ confirmation-summary.total.value }}</div>
@@ -44,5 +46,5 @@
             <div class="checkout-widget__total-value">{{ total.value }}</div>
         {{/if}}
     </div>
-
+  {{/unless}}
 </div>

package/src/components/checkout_voucher_large.hbs

@@ -1,19 +1,23 @@
 <div class="voucher">
-    {{#if title}}
-        {{> checkout-section-title}}
-    {{/if}}
-    <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
-        <form id="form-checkout-voucher{{id}}">
-            {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code"}}
-            <button class="voucher__btn btn btn-secondary btn_full">
-                <span class="btn__text">Apply</span>
-            </button>
-        </form>
+  {{#if title}}
+    {{> checkout-section-title}}
+  {{/if}}
+  <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
+    <form id="form-checkout-voucher{{id}}">
+      {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code" info=""}}
+      <button class="voucher__btn btn btn-primary">
+        <span class="btn__text">Apply</span>
+      </button>
+    </form>
+  </div>
+  {{#unless voucherApplied}}
+    <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
+      <div class="voucher-applied__inner">
+      <span class="icon icon__check">
+        <i class="fas fa-check-circle"></i>
+      </span>
+        <h5 class="heading-5 text-center">Voucher has been applied</h5>
+      </div>
     </div>
-    {{#unless voucherApplied}}
-        <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
-            <i class="fas fa-check-circle"></i>
-            <h3 class="heading-3 text-center">Voucher has been applied</h3>
-        </div>
-    {{/unless}}
+  {{/unless}}
 </div>

package/src/components/date-selection.hbs

@@ -24,7 +24,7 @@
                     {{/each}}
                   </div>
                   {{#each calendar}}
-                    {{#if (eq (mod @index 7) 0)}}
+                    {{#if (eq (mod_dec @index 7) 0)}}
                       <div class="calendar__row">
                         <div class="calendar__row_days">
                     {{/if}}

package/src/components/flatpickr-calendar.hbs

@@ -0,0 +1,26 @@
+<div class="flatpickr-datepicker" choose-date="" show-years="15">
+  <label class="flatpickr-datepicker__label">
+    Monthly view
+    {{> info-icon
+      modification="icon-info"
+      title=textTooltip
+      data-placement="top"
+      data-container=".flatpickr-datepicker__label"
+    }}
+  </label>
+  <div class="flatpickr-datepicker__field">
+    <input
+      type="text"
+      class="flatpickr-input"
+      id="calendarInputFlatpickr"
+      placeholder="Select year and month"
+      readonly
+    />
+    <span class="icon-wrap icon-wrap--cross" id="crossIcon">
+      <i class="far fa-times cross-icon"></i>
+    </span>
+    <span class="icon-wrap" id="calendarIcon">
+      <i class="fas fa-calendar-alt icon-calendar"></i>
+    </span>
+  </div>
+</div>

package/src/components/my-account/active-orders/header.hbs

@@ -1,4 +1,8 @@
 <div class="active-orders__header">
-  <h3 class="active-orders__title">{{title}}</h3>
-  <a class="btn btn_full btn-primary btn--all-orders d-none d-sm-block" rel="stylesheet" href="#">{{linkText}}</a>
+  {{#if title}}
+    <h3 class="active-orders__title">{{title}}</h3>
+  {{/if}}
+  {{#if linkText}}
+    <a class="btn btn_full btn-primary btn--all-orders d-none d-sm-block" rel="stylesheet" href="#">{{linkText}}</a>
+  {{/if}}
 </div>

package/src/components/my-account/active-orders/list-orders.hbs

@@ -1,9 +1,21 @@
 <div class="active-orders">
-  {{> my-account/active-orders/header}}
+  {{#if title}}
+    {{> my-account/active-orders/header}}
+  {{/if}}
 
   {{#each orders}}
     {{> my-account/active-orders/order switch-vat=../switch-vat}}
   {{/each}}
 
-  <a class="btn btn_full btn-primary btn--all-orders d-sm-none" rel="stylesheet" href="#">{{linkText}}</a>
+  {{#if linkText}}
+    <a class="btn btn_full btn-primary btn--all-orders d-sm-none" rel="stylesheet" href="#">{{linkText}}</a>
+  {{/if}}
 </div>
+{{#if isLoadMore}}
+  <div class="load-more-wrap">
+    <input id="numberOfPagesOrders" value="3" type="hidden">
+    <button class="btn btn-primary btn-load-more">
+      Load more
+    </button>
+  </div>
+{{/if}}

package/src/components/my-account/active-orders/order-header.hbs

@@ -1,6 +1,6 @@
 <header class="order-header">
   <h3 class="order-header__title">Order {{orderId}}</h3>
-  <div class="order-header__status">
+  <div class="order-status {{orderStatus.statusClass}}">
     <i class="{{orderStatus.statusIcon}} icon"></i>
     <span>{{orderStatus.statusTitle}}</span>
   </div>

package/src/components/my-account/active-orders/order.hbs

@@ -3,13 +3,17 @@
 
   {{> my-account/active-orders/order-details switch-vat=switch-vat}}
 
-  {{> my-account/active-orders/consignment-info}}
+  {{#if totalConsignments}}
+    {{> my-account/active-orders/consignment-info}}
+  {{/if}}
 
-  <section class="shipment-details">
-    {{#each shipmentDetails}}
-      {{> my-account/active-orders/shipment-detail}}
-    {{/each}}
-  </section>
+  {{#if shipmentDetails}}
+    <section class="shipment-details">
+      {{#each shipmentDetails}}
+        {{> my-account/active-orders/shipment-detail}}
+      {{/each}}
+    </section>
+  {{/if}}
 
   <div class="view-more">
     <a class="link" href="/">

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

@@ -1,4 +1,4 @@
-<div class="clipboard-code {{mod}}">
+<div class="clipboard-code {{this.mod}}">
   {{#if customIcon}}
     {{{customIcon}}}
   {{else}}

package/src/components/my-account/empty-orders.hbs

@@ -0,0 +1,9 @@
+<div class="empty-orders">
+  <h2 class="empty-orders__title">{{title}}</h2>
+  <span class="empty-orders__image">
+    {{{image}}}
+  </span>
+  {{#if btnText}}
+    <a href="#" class="btn btn-primary empty-orders__btn">{{btnText}}</a>
+  {{/if}}
+</div>

package/src/components/my-account/mobile-nav.hbs

@@ -1,17 +1,19 @@
-<div class="account-nav {{mod}}" {{#if (eq @index ../active-index)}}data-active-index="{{active-index}}"{{/if}}>
+<div class="account-nav {{this.mod}}" {{#if (eq @index ../active-index)}}data-active-index="{{active-index}}"{{/if}}>
   <div class="account-nav__toggle accordion accordion_collapsed">
     <div class="accordion__header" role="link" aria-expanded="false">
-      <span class="account-nav__icon">
-        {{#each menu}}
-          {{#if (eq @index ../active-index)}}
-            {{#if customIcon}}
-              {{{icon}}}
-            {{else}}
-              <i class="{{icon}} icon"></i>
-            {{/if}}
+      {{#each menu}}
+        {{#if (eq @index ../active-index)}}
+          {{#if icon}}
+            <span class="account-nav__icon">
+              {{#if customIcon}}
+                {{{icon}}}
+              {{else}}
+                <i class="{{icon}} icon"></i>
+              {{/if}}
+            </span>
           {{/if}}
-        {{/each}}
-      </span>
+        {{/if}}
+      {{/each}}
       <span class="accordion__header-text">{{page-name}}</span>
       <span class="icon accordion__header-icon">
         <i class="fas fa-angle-up"></i>
@@ -23,14 +25,16 @@
           <ul class="account-nav__list">
             {{#each menu}}
               <li class="account-nav__item">
-                <a class="account-nav__link" data-index="{{@index}}" href="{{link}}">
-                  <span class="account-nav__icon">
-                    {{#if customIcon}}
-                      {{{icon}}}
-                    {{else}}
-                      <i class="{{icon}} icon"></i>
-                    {{/if}}
-                  </span>
+                <a class="account-nav__link" data-index="{{@index}}" href="{{link}}" id="{{id}}">
+                  {{#if icon}}
+                    <span class="account-nav__icon">
+                      {{#if customIcon}}
+                        {{{icon}}}
+                      {{else}}
+                        <i class="{{icon}} icon"></i>
+                      {{/if}}
+                    </span>
+                  {{/if}}
                   {{title}}
                   {{#if total}}
                     <span class="rewards">{{total}}</span>

package/src/components/my-account/orders-nav.hbs

@@ -0,0 +1,15 @@
+<nav class="nav-orders">
+  {{> my-account/mobile-nav
+    mod="d-sm-none"
+    menu=nav
+    active-index=0
+    page-name=nav.[0].title
+  }}
+  <ul class="nav-orders__wrap d-none d-sm-flex">
+    {{#each nav}}
+      <li class="nav-orders__item {{#if isActive}}active{{/if}}">
+        <a class="link" href="#" id="{{id}}">{{title}}</a>
+      </li>
+    {{/each}}
+  </ul>
+</nav>

package/src/components/my-account/sort-by.hbs

@@ -0,0 +1,3 @@
+<div class="sort-orders">
+  {{> form-row dropdown="true" id="sort_orders" label="Sort by" placeholder="Name (descending)"}}
+</div>

package/src/components/my-account/user-account-actions.hbs

@@ -1,4 +1,4 @@
-<ul class="account-actions__list {{mod}}">
+<ul class="account-actions__list {{this.mod}}">
   <li class="account-actions__item">
     <a class="account-actions__link" href="#">
       <span class="icon">

package/src/components/order-item.hbs

@@ -87,7 +87,7 @@
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{price}}</span>
+                                <span class="order-item__value">£{{priceExcVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
@@ -106,7 +106,7 @@
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{pricePerSQM.value}}</span>
+                                <span class="order-item__value">£{{pricePerSQMExcVat.value}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
@@ -127,7 +127,7 @@
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{total}}</span>
+                                <span class="order-item__value">£{{totalExcVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}

package/src/components/order-summary.hbs

@@ -1,66 +1,101 @@
+{{#if basket}}
+<div class="summary summary--mobile d-lg-none" id="summary-mobile-{{id}}">
+  {{> summary-mobile-bar}}
+  <div class="collapse summary__aside container" id="checkout-summary-mobile-accordion-{{id}}" data-sticky-element>
+
+    {{> checkout_order-summary-new head=title mod=mod id=(concat id "-mobile") mobile="true"}}
+    {{#unless basket}}
+      <div class="summary__payment footer-checkout">
+        {{#unless merged}}
+          {{#if paymentsCheckoutV2}}
+            <div class="footer-checkout-holder footer-checkout-holder--payways">
+              {{> payments-checkout-v2}}
+            </div>
+          {{else}}
+            <div class="footer-checkout-holder">
+              {{> payments-checkout clearPayIcon="true"}}
+              <span class="footer-checkout__copyright">
+                        Copyright ©
+                        <span class="current-year"></span> Wickes.co.uk
+                      </span>
+            </div>
+          {{/if}}
+        {{else}}
+          <div class="summary__payment-message">
+            <p class="summary__payment-main">{{vat-message.main}}</p>
+            <p class="summary__payment-additional">{{vat-message.additional}}</p>
+          </div>
+        {{/unless}}
+      </div>
+    {{/unless}}
+  </div>
+</div>
+{{/if}}
+
+
 <div class="summary {{#if mod}}summary-large{{/if}} {{#if paymentsCheckoutV2 }}summary--payways{{/if}}">
-    {{> checkout-section-title}}
-    {{#if mod}}
-        <div class="summary__accordion collapsed"
-              data-toggle="collapse"
-              data-target="#checkout-details-accordion-{{id}}"
-        >
-            <span class="summary__accordion-text">Show full summary</span>
-            <span class="icon summary-icon-small">
+  {{> checkout-section-title}}
+  {{#if mod}}
+    <div class="summary__accordion collapsed"
+         data-toggle="collapse"
+         data-target="#checkout-details-accordion-{{id}}"
+    >
+      <span class="summary__accordion-text">Show full summary</span>
+      <span class="icon summary-icon-small">
                 <i class="fas fa-angle-up"></i>
             </span>
-        </div>
-    {{/if}}
-    <div class="summary__aside">
-        {{> checkout_order-summary-new head=title mod=mod id=id}}
+    </div>
+  {{/if}}
+  <div class="summary__aside">
+    {{> checkout_order-summary-new head=title mod=mod id=id}}
 
-        {{#if klarna-placement}}
-            <div class="summary__klarna">
-                <klarna-placement
-                    data-key="credit-promotion-badge"
-                    data-locale="en-GB"
-                    data-purchase-amount="12000"
-                ></klarna-placement>
+    {{#if klarna-placement}}
+      <div class="summary__klarna">
+        <klarna-placement
+            data-key="credit-promotion-badge"
+            data-locale="en-GB"
+            data-purchase-amount="12000"
+        ></klarna-placement>
+      </div>
+    {{/if}}
+    {{#if clearpay-placement}}
+      {{> clearpay applyMargin=true hasKlarna=true}}
+    {{/if}}
+    {{#unless basket}}
+      <div class="summary__payment footer-checkout">
+        {{#unless merged}}
+          {{#if paymentsCheckoutV2 }}
+            <div class="footer-checkout-holder footer-checkout-holder--payways">
+              {{> payments-checkout-v2 }}
             </div>
-        {{/if}}
-        {{#if clearpay-placement}}
-            {{> clearpay applyMargin=true hasKlarna=true}}
-        {{/if}}
-        {{#unless basket}}
-            <div class="summary__payment footer-checkout">
-                {{#unless merged}}
-                  {{#if paymentsCheckoutV2 }}
-                    <div class="footer-checkout-holder footer-checkout-holder--payways">
-                      {{> payments-checkout-v2 }}
-                    </div>
-                  {{else}}
-                    <div class="footer-checkout-holder">
-                      {{> payments-checkout clearPayIcon="true" }}
-                      <span class="footer-checkout__copyright">Copyright © <span class="current-year"></span> Wickes.co.uk</span>
-                    </div>
-                  {{/if}}
-                {{else}}
-                    <div class="summary__payment-message">
-                        <p class="summary__payment-main">{{vat-message.main}}</p>
-                        <p class="summary__payment-additional">{{vat-message.additional}}</p>
-                    </div>
-                {{/unless}}
+          {{else}}
+            <div class="footer-checkout-holder">
+              {{> payments-checkout clearPayIcon="true" }}
+              <span class="footer-checkout__copyright">Copyright © <span class="current-year"></span> Wickes.co.uk</span>
             </div>
+          {{/if}}
+        {{else}}
+          <div class="summary__payment-message">
+            <p class="summary__payment-main">{{vat-message.main}}</p>
+            <p class="summary__payment-additional">{{vat-message.additional}}</p>
+          </div>
         {{/unless}}
-    </div>
+      </div>
+    {{/unless}}
+  </div>
 
-    {{#if basket-id}}
-        <div class="summary__basked-id">
-            Basket ID: <span class="id-number">136589003</span>
-        </div>
-    {{/if}}
+  {{#if basket-id}}
+    <div class="summary__basked-id">
+      Basket ID: <span class="id-number">136589003</span>
+    </div>
+  {{/if}}
 
-    {{#if email}}
-        <div class="summary__email">
-            <h3 class="heading-3">Email</h3>
-            <div class="summary__email-info">
-                Examplemail@wickes.co.uk
-            </div>
-        </div>
-    {{/if}}
+  {{#if email}}
+    <div class="summary__email">
+      <h3 class="heading-3">Email</h3>
+      <div class="summary__email-info">
+        Examplemail@wickes.co.uk
+      </div>
+    </div>
+  {{/if}}
 </div>

package/src/components/partner-signup-form.hbs

@@ -3,6 +3,10 @@
     <div class="col-md-12 pl-0">
       <div class="row">
         <div class="col-md-7 signup-tradepro-wrap">
+          {{#if fill-remaining}}
+            {{> notifications notification-page.warning classModifier="notification_warning fill-remaining fill-remaining--local"
+              text="Please fill in the remaining fields below, in order to create your account."}}
+          {{/if}}
           <form class="signup-tradepro form-bg">
             <div class="signup-tradepro__row">
               <div class="signup-tradepro__descr">