wickes-css2 2.112.1-develop.1 → 2.113.0-develop.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/css/pages/checkout-new.css +1 -1
- package/build/css/pages/checkout.css +1 -1
- package/build/css/pages/page_checkout_delivery-new.css +1 -1
- package/build/css/pages/page_merged-basket.css +1 -1
- package/build/img/premium-delivery.png +0 -0
- package/build/img/premium-delivery.svg +1 -0
- package/build/js/emulation.min.js +55 -3
- package/package.json +1 -1
- package/src/components/banner-news.hbs +5 -1
- package/src/components/date-selection.hbs +33 -10
- package/src/components/delivery-types.hbs +5 -0
- package/src/data/my-account/data_my-account.json +6 -26
- package/src/data/my-account/data_my-order.json +43 -0
- package/src/data/my-account/data_my-orders.json +15 -1
- package/src/img/premium-delivery.png +0 -0
- package/src/img/premium-delivery.svg +1 -0
- package/src/js/emulation/date-selection.js +59 -2
- package/src/page_checkout_premium-delivery-details.html +161 -0
- package/src/scss/components/_checkout_order.scss +1 -1
- package/src/scss/components/_date-selection-add-new-styles.scss +30 -7
- package/src/scss/components/_date-selection.scss +32 -12
- package/src/scss/pages/checkout-new.scss +7 -2
- package/src/scss/pages/page_checkout_delivery-new.scss +1 -1
- package/src/sitemap.html +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
.checkout-order{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px;flex-direction:column;font-size:1rem}.checkout-order__charity{display:flex;flex-wrap:wrap;margin:0;flex-direction:row}.checkout-order__img{flex:0 0 50%;max-width:50%}.checkout-order__img .image{width:115px;height:115px}.checkout-order__info-wrap{flex:0 0 50%;max-width:50%;display:flex;flex-direction:column;justify-content:space-between;font-size:1rem}.checkout-order__info-wrap .title-wrap{display:flex;flex-direction:column}.checkout-order__info-wrap .title-wrap .title{margin-bottom:8px}.checkout-order__info-wrap .title-wrap .subtitle-link{text-decoration:none}.checkout-order__info-wrap .price-wrap{display:flex;justify-content:space-between}.checkout-order .order-block__time-head{display:flex;flex-direction:column;background-color:#003058;color:#fff;font-size:1.375rem;padding:27px 24px}.checkout-order .order-block__time-head .iconHead{margin-right:10px}.checkout-order .order-block__time-head .boldDate{font-weight:500}.checkout-order .order-block__time-head-info{font-size:1rem;margin-left:30px}.checkout-order .order-block__address-wrap{display:flex;flex-direction:column;justify-content:space-between}.checkout-order .order-block__address-info{margin-right:10px}.checkout-order .order-block__address .fa-map-marker-alt{color:#003058;font-size:1.125rem;margin-right:15px}.checkout-order .order-block .btn-link{text-decoration:underline;font-size:1rem;padding:0}.checkout-order .order-block__store-info{display:none;background-color:#fff;margin-top:36px}.checkout-order .order-block__store-info .header-block{display:flex;align-items:center;justify-content:space-between;margin-bottom:40px}.checkout-order .order-block__store-info .header-block .store-name{color:#003058;font-size:20px;line-height:24px;margin:0 10px 0 0;font-weight:400}.checkout-order .order-block__store-info .header-block .hide-info{white-space:normal}.checkout-order .order-block__store-info .contact-block{margin-bottom:62px}.checkout-order .order-block__store-info .contact-block__phone{margin-bottom:27px}.checkout-order .order-block__store-info .contact-block__address{display:flex;align-items:center;justify-content:space-between;margin-bottom:27px}.checkout-order .order-block__store-info .opening-times-block{display:flex;flex-wrap:wrap;margin:0}.checkout-order .order-block__store-info .opening-times-block__col{flex:0 0 100%;max-width:100%;padding-right:5px;padding-left:5px}.checkout-order .order-block__store-info .opening-times-block__col .title{color:#003058;font-size:16px;line-height:19px;margin-bottom:20px}.checkout-order .order-block__store-info .opening-times-block__col .schedule{border:1px solid #d6d6d6}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular{margin-bottom:20px}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item{display:flex;justify-content:space-between;padding:9px 0}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time{width:60%;padding-right:15px}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time span:last-child{white-space:nowrap}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__day{width:auto}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item:first-child{background-color:#003058;color:#fff;font-weight:700}.checkout-order .order-block__store-info .opening-times-block__col .schedule .schedule-item:nth-child(2n),.checkout-order .order-block__store-info .opening-times-block__col .schedule .store-locator-details .schedule-item .schedule-item:nth-child(odd){background-color:#fff}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__main{display:flex;flex-direction:row;align-items:center;width:100%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__day-reason{width:50%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__time{width:50%;padding-right:15px}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__day{width:100%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__reason{font-weight:400}.checkout-order .order-block__order-line{background-color:#fff;margin-bottom:8px;padding:20px 23px 28px}.checkout-order .order-block__order-line .order-line__wrap{display:flex;flex-wrap:wrap;margin:0;padding-bottom:20px}.checkout-order .order-block__order-line .order-line__image{flex:0 0 41.6666666667%;max-width:41.6666666667%;display:flex;justify-content:center}.checkout-order .order-block__order-line .order-line__image .image{max-width:90px;max-height:90px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 58.3333333333%;max-width:58.3333333333%}.checkout-order .order-block__order-line .order-line__promo{margin:10px 0 0}.checkout-order .order-block__order-line .order-line__product{display:flex;flex-direction:column;justify-content:space-between}.checkout-order .order-block__order-line .order-line__quantity{width:40px;height:40px;background-color:#f8f8f8;padding:10px}.checkout-order .order-block__order-line .order-line__quantity .value{font-weight:700}.checkout-order .order-block__order-line .order-line__price{border-top:1px dashed #aaa;margin:0 -23px;padding-top:23px}.checkout-order .order-block__order-line .order-line__price-item{display:flex;flex-direction:row;justify-content:space-between;padding:0 23px;margin-bottom:10px}.checkout-order .order-block__order-line .order-line__price-item .price-item__info{text-align:end}.checkout-order .order-block__order-line .supplier-block{border-top:1px dashed #aaa;padding:14px 0;margin-top:25px}.checkout-order .order-block__order-line .supplier-block .fa-exclamation-circle{color:#0277bd}.checkout-order .order-block__order-line .supplier-block__title{font-weight:700}.checkout-order .order-block__price{display:flex;flex-direction:row;justify-content:space-between;font-size:1rem;margin:40px 23px 0}.checkout-order .order-block__product-line .hide-products,.checkout-order .order-block__product-line .show-products{padding:21px 0 29px 32px}.checkout-order .order-block__product-info,.checkout-order .order-block__product-line .hide-products{display:none}.checkout-order .order-block__product-info .order-line__image a{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start}.checkout-order .order-block__product-info .order-line__image a .image{max-width:90px;max-height:90px;width:auto;height:auto}.checkout-order .order-block:last-child .order-block__product-line .show-products{padding-bottom:0}.total-delivery__wrap{flex-direction:row;justify-content:space-between;font-size:1.375rem}.click-collect-message,.total-delivery__wrap{display:flex;background-color:#eee;padding:20px 60px;margin:0 -15px}.click-collect-message{position:relative;font-size:1rem}.click-collect-message .icon-info{position:absolute;color:#0277bd;left:25px;top:24px}@media (min-width:1200px){.checkout-order .order-block__store-info .opening-times-block{justify-content:space-between}.checkout-order .order-block__store-info .opening-times-block__col{flex:0 0 50%;max-width:50%}.checkout-order .order-block__store-info .opening-times-block__col .schedule{height:90%}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular{margin-bottom:0}.special-opening-schedule-item.schedule-item__reason{min-width:106px}}@media (min-width:768px){.checkout-order .order-block__address-wrap{flex-direction:row;align-items:center}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time,.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__time{width:auto}.checkout-order .order-block__order-line .order-line__image .image.image{width:auto;height:auto}}@media (min-width:992px){.checkout-order{margin:0}.checkout-order__img{flex:0 0 25%;max-width:25%}.checkout-order__info-wrap{flex:0 0 75%;max-width:75%;display:flex;flex-direction:column;justify-content:space-between;font-size:1rem}.checkout-order .order-block__time-head{flex-direction:row;justify-content:space-between;align-items:center;font-size:1.625rem}.checkout-order .order-block__time-head .iconHead{margin-right:20px}.checkout-order .order-block__time-head-info{font-size:1.125rem;margin:0}.checkout-order .order-block__order-line .order-line__image{flex:0 0 16.6666666667%;max-width:16.6666666667%}.checkout-order .order-block__order-line .order-line__image .image{width:auto;max-height:60px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 83.3333333333%;max-width:83.3333333333%}.checkout-order .order-block__order-line .order-line__product{flex-direction:row;align-items:center}.checkout-order .order-block__order-line .order-line__quantity{margin-left:10px}.checkout-order .order-block__product-info .order-line__image a .image{max-width:60px;max-height:60px}.click-collect-message,.total-delivery__wrap{margin:0}}@media (min-width:768px) and (max-width:991.98px){.checkout-order__img{flex:0 0 33.3333333333%;max-width:33.3333333333%}.checkout-order__info-wrap{flex:0 0 66.6666666667%;max-width:66.6666666667%}.checkout-order .order-block__order-line .order-line__image{flex:0 0 33.3333333333%;max-width:33.3333333333%}.checkout-order .order-block__order-line .order-line__image .image{width:90px;height:90px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 66.6666666667%;max-width:66.6666666667%}}.special-opening-schedule-item.schedule-item{display:flex;flex-direction:column;line-height:2;padding:5px 0;position:relative}.special-opening-schedule-item.schedule-item__reason{font-weight:700;padding:0 0 0 15px;line-height:24px}.special-opening-schedule-item.schedule-item__data-time{display:flex;justify-content:space-between}.special-opening-schedule-item.schedule-item__time{position:absolute;top:50%;transform:translateY(-50%);right:0}.special-opening-schedule-item.schedule-item__time span:last-child{white-space:nowrap}.special-opening-schedule-item.schedule-item__addition-info{font-weight:500;padding:0 15px;margin:5px 0;line-height:16px;font-size:12px}.merged .page-header__title{font-weight:400}.merged .merge-basket-options__choise-inner{padding-bottom:20px;border:0}.merged h2{color:#0a3055}.merged .baskets .lines-group{border:0}.merged .baskets .lines-group__count{font-weight:400;font-size:1rem}.merged .baskets .lines-group__header{padding-bottom:15px;border-bottom:1px solid #ccc}.merged .baskets .lines-group__header-icon{top:-3px;font-size:1.75rem}.merged .baskets .lines-group__header-text{font-weight:400}.merged .baskets .lines-group__header .product-code{padding:0;background:0 0;border:0;font-size:1rem}.merged .checkout-title{padding-top:30px}.merged .summary .checkout-widget__details,.merged .summary .checkout-widget_order-summary{padding-top:0}.merged .summary__payment{display:block}.merged .btn-link{text-decoration:underline;font-size:1rem}.checkout-order .order-block__address{margin:0 5px;background:0 0;padding:0}.checkout-order .order-block__store-info.order-block__store-info{padding:20px;margin-bottom:0;margin-top:10px}@media (max-width:991.98px){.merged .baskets .order-item__cost{justify-content:space-between}.merged .baskets .order-item__quant{display:flex}.merged .baskets .order-item__quant-title{-ms-grid-row-align:center;align-self:center;margin-right:10px;color:#3e3e3e}.merged .baskets .order-item__value{font-size:1rem}.merged .baskets .order-item__area~.order-item__quant{display:block}.merged .baskets .order-item__area~.order-item__quant .order-item__quant-title{line-height:14px;font-size:.75rem;color:#7f7f7f;font-weight:400}.merged .baskets .order-item__area~.order-item__quant .order-item__quant-title:after{content:none}}.checkout-order{flex-wrap:nowrap;border-top:2px dotted #ccc;margin-top:15px}.checkout-order .order-block__address-wrap{padding:10px 10px 0;background:#f8f8f8}.checkout-order .order-block__address .show-info{padding:initial;text-decoration:underline}.checkout-order .order-block__address .address-icon svg{color:#0277bd;margin-right:5px}.checkout-order .order-block__store-info{padding:0 20px;margin-bottom:20px}.checkout-order .schedule-item__time{padding-right:15px;text-align:right}@media (max-width:991.98px){.merged .baskets .order-item__cost{justify-content:space-between}.merged .baskets .order-item__quant{display:flex}.merged .baskets .order-item__quant-title{-ms-grid-row-align:center;align-self:center;margin-right:10px;color:#3e3e3e}.merged .baskets .order-item__value{font-size:1rem}}@media (max-width:767.98px){.checkout-order .schedule-item__time span:first-child{display:inline-block;min-width:80px}.merged .baskets .show-info{text-align:left}}@media (min-width:576px){.special-opening-schedule-item.schedule-item__time{white-space:nowrap}.merged .baskets__basket-lines,.merged .baskets__basket-summary{flex:0 0 100%;max-width:100%}.merged .baskets .order-item__main{-ms-grid-rows:1fr;grid-template-rows:1fr}}@media (min-width:992px){.merged .merge-basket-options{padding:25px 0 25px 10px;margin-bottom:35px}.merged .merge-basket-options__choise-inner{padding-bottom:8px;border:0}.merged .baskets__basket-lines{flex:1;max-width:100%;padding-right:5px}.merged .baskets__basket-summary{flex:0 0 33.3333333333%;max-width:33.3333333333%;padding-left:5px;max-width:325px}}
|
|
1
|
+
.checkout-order{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px;flex-direction:column;font-size:1rem}.checkout-order__charity{display:flex;flex-wrap:wrap;margin:0;flex-direction:row}.checkout-order__img{flex:0 0 50%;max-width:50%}.checkout-order__img .image{width:115px;height:115px}.checkout-order__info-wrap{flex:0 0 50%;max-width:50%;display:flex;flex-direction:column;justify-content:space-between;font-size:1rem}.checkout-order__info-wrap .title-wrap{display:flex;flex-direction:column}.checkout-order__info-wrap .title-wrap .title{margin-bottom:8px}.checkout-order__info-wrap .title-wrap .subtitle-link{text-decoration:none}.checkout-order__info-wrap .price-wrap{display:flex;justify-content:space-between}.checkout-order .order-block__time-head{display:flex;flex-direction:column;background-color:#003058;color:#fff;font-size:1.375rem;padding:27px 24px}.checkout-order .order-block__time-head .iconHead{margin-right:5px}.checkout-order .order-block__time-head .boldDate{font-weight:500}.checkout-order .order-block__time-head-info{font-size:1rem;margin-left:30px}.checkout-order .order-block__address-wrap{display:flex;flex-direction:column;justify-content:space-between}.checkout-order .order-block__address-info{margin-right:10px}.checkout-order .order-block__address .fa-map-marker-alt{color:#003058;font-size:1.125rem;margin-right:15px}.checkout-order .order-block .btn-link{text-decoration:underline;font-size:1rem;padding:0}.checkout-order .order-block__store-info{display:none;background-color:#fff;margin-top:36px}.checkout-order .order-block__store-info .header-block{display:flex;align-items:center;justify-content:space-between;margin-bottom:40px}.checkout-order .order-block__store-info .header-block .store-name{color:#003058;font-size:20px;line-height:24px;margin:0 10px 0 0;font-weight:400}.checkout-order .order-block__store-info .header-block .hide-info{white-space:normal}.checkout-order .order-block__store-info .contact-block{margin-bottom:62px}.checkout-order .order-block__store-info .contact-block__phone{margin-bottom:27px}.checkout-order .order-block__store-info .contact-block__address{display:flex;align-items:center;justify-content:space-between;margin-bottom:27px}.checkout-order .order-block__store-info .opening-times-block{display:flex;flex-wrap:wrap;margin:0}.checkout-order .order-block__store-info .opening-times-block__col{flex:0 0 100%;max-width:100%;padding-right:5px;padding-left:5px}.checkout-order .order-block__store-info .opening-times-block__col .title{color:#003058;font-size:16px;line-height:19px;margin-bottom:20px}.checkout-order .order-block__store-info .opening-times-block__col .schedule{border:1px solid #d6d6d6}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular{margin-bottom:20px}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item{display:flex;justify-content:space-between;padding:9px 0}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time{width:60%;padding-right:15px}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time span:last-child{white-space:nowrap}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__day{width:auto}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item:first-child{background-color:#003058;color:#fff;font-weight:700}.checkout-order .order-block__store-info .opening-times-block__col .schedule .schedule-item:nth-child(2n),.checkout-order .order-block__store-info .opening-times-block__col .schedule .store-locator-details .schedule-item .schedule-item:nth-child(odd){background-color:#fff}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__main{display:flex;flex-direction:row;align-items:center;width:100%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__day-reason{width:50%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__time{width:50%;padding-right:15px}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__day{width:100%}.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__reason{font-weight:400}.checkout-order .order-block__order-line{background-color:#fff;margin-bottom:8px;padding:20px 23px 28px}.checkout-order .order-block__order-line .order-line__wrap{display:flex;flex-wrap:wrap;margin:0;padding-bottom:20px}.checkout-order .order-block__order-line .order-line__image{flex:0 0 41.6666666667%;max-width:41.6666666667%;display:flex;justify-content:center}.checkout-order .order-block__order-line .order-line__image .image{max-width:90px;max-height:90px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 58.3333333333%;max-width:58.3333333333%}.checkout-order .order-block__order-line .order-line__promo{margin:10px 0 0}.checkout-order .order-block__order-line .order-line__product{display:flex;flex-direction:column;justify-content:space-between}.checkout-order .order-block__order-line .order-line__quantity{width:40px;height:40px;background-color:#f8f8f8;padding:10px}.checkout-order .order-block__order-line .order-line__quantity .value{font-weight:700}.checkout-order .order-block__order-line .order-line__price{border-top:1px dashed #aaa;margin:0 -23px;padding-top:23px}.checkout-order .order-block__order-line .order-line__price-item{display:flex;flex-direction:row;justify-content:space-between;padding:0 23px;margin-bottom:10px}.checkout-order .order-block__order-line .order-line__price-item .price-item__info{text-align:end}.checkout-order .order-block__order-line .supplier-block{border-top:1px dashed #aaa;padding:14px 0;margin-top:25px}.checkout-order .order-block__order-line .supplier-block .fa-exclamation-circle{color:#0277bd}.checkout-order .order-block__order-line .supplier-block__title{font-weight:700}.checkout-order .order-block__price{display:flex;flex-direction:row;justify-content:space-between;font-size:1rem;margin:40px 23px 0}.checkout-order .order-block__product-line .hide-products,.checkout-order .order-block__product-line .show-products{padding:21px 0 29px 32px}.checkout-order .order-block__product-info,.checkout-order .order-block__product-line .hide-products{display:none}.checkout-order .order-block__product-info .order-line__image a{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start}.checkout-order .order-block__product-info .order-line__image a .image{max-width:90px;max-height:90px;width:auto;height:auto}.checkout-order .order-block:last-child .order-block__product-line .show-products{padding-bottom:0}.total-delivery__wrap{flex-direction:row;justify-content:space-between;font-size:1.375rem}.click-collect-message,.total-delivery__wrap{display:flex;background-color:#eee;padding:20px 60px;margin:0 -15px}.click-collect-message{position:relative;font-size:1rem}.click-collect-message .icon-info{position:absolute;color:#0277bd;left:25px;top:24px}@media (min-width:1200px){.checkout-order .order-block__store-info .opening-times-block{justify-content:space-between}.checkout-order .order-block__store-info .opening-times-block__col{flex:0 0 50%;max-width:50%}.checkout-order .order-block__store-info .opening-times-block__col .schedule{height:90%}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular{margin-bottom:0}.special-opening-schedule-item.schedule-item__reason{min-width:106px}}@media (min-width:768px){.checkout-order .order-block__address-wrap{flex-direction:row;align-items:center}.checkout-order .order-block__store-info .opening-times-block__col .schedule-regular .schedule-item__time,.checkout-order .order-block__store-info .opening-times-block__col .schedule .special-opening-schedule-item.schedule-item__time{width:auto}.checkout-order .order-block__order-line .order-line__image .image.image{width:auto;height:auto}}@media (min-width:992px){.checkout-order{margin:0}.checkout-order__img{flex:0 0 25%;max-width:25%}.checkout-order__info-wrap{flex:0 0 75%;max-width:75%;display:flex;flex-direction:column;justify-content:space-between;font-size:1rem}.checkout-order .order-block__time-head{flex-direction:row;justify-content:space-between;align-items:center;font-size:1.625rem}.checkout-order .order-block__time-head .iconHead{margin-right:20px}.checkout-order .order-block__time-head-info{font-size:1.125rem;margin:0}.checkout-order .order-block__order-line .order-line__image{flex:0 0 16.6666666667%;max-width:16.6666666667%}.checkout-order .order-block__order-line .order-line__image .image{width:auto;max-height:60px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 83.3333333333%;max-width:83.3333333333%}.checkout-order .order-block__order-line .order-line__product{flex-direction:row;align-items:center}.checkout-order .order-block__order-line .order-line__quantity{margin-left:10px}.checkout-order .order-block__product-info .order-line__image a .image{max-width:60px;max-height:60px}.click-collect-message,.total-delivery__wrap{margin:0}}@media (min-width:768px) and (max-width:991.98px){.checkout-order__img{flex:0 0 33.3333333333%;max-width:33.3333333333%}.checkout-order__info-wrap{flex:0 0 66.6666666667%;max-width:66.6666666667%}.checkout-order .order-block__order-line .order-line__image{flex:0 0 33.3333333333%;max-width:33.3333333333%}.checkout-order .order-block__order-line .order-line__image .image{width:90px;height:90px}.checkout-order .order-block__order-line .order-line__info{flex:0 0 66.6666666667%;max-width:66.6666666667%}}.special-opening-schedule-item.schedule-item{display:flex;flex-direction:column;line-height:2;padding:5px 0;position:relative}.special-opening-schedule-item.schedule-item__reason{font-weight:700;padding:0 0 0 15px;line-height:24px}.special-opening-schedule-item.schedule-item__data-time{display:flex;justify-content:space-between}.special-opening-schedule-item.schedule-item__time{position:absolute;top:50%;transform:translateY(-50%);right:0}.special-opening-schedule-item.schedule-item__time span:last-child{white-space:nowrap}.special-opening-schedule-item.schedule-item__addition-info{font-weight:500;padding:0 15px;margin:5px 0;line-height:16px;font-size:12px}.merged .page-header__title{font-weight:400}.merged .merge-basket-options__choise-inner{padding-bottom:20px;border:0}.merged h2{color:#0a3055}.merged .baskets .lines-group{border:0}.merged .baskets .lines-group__count{font-weight:400;font-size:1rem}.merged .baskets .lines-group__header{padding-bottom:15px;border-bottom:1px solid #ccc}.merged .baskets .lines-group__header-icon{top:-3px;font-size:1.75rem}.merged .baskets .lines-group__header-text{font-weight:400}.merged .baskets .lines-group__header .product-code{padding:0;background:0 0;border:0;font-size:1rem}.merged .checkout-title{padding-top:30px}.merged .summary .checkout-widget__details,.merged .summary .checkout-widget_order-summary{padding-top:0}.merged .summary__payment{display:block}.merged .btn-link{text-decoration:underline;font-size:1rem}.checkout-order .order-block__address{margin:0 5px;background:0 0;padding:0}.checkout-order .order-block__store-info.order-block__store-info{padding:20px;margin-bottom:0;margin-top:10px}@media (max-width:991.98px){.merged .baskets .order-item__cost{justify-content:space-between}.merged .baskets .order-item__quant{display:flex}.merged .baskets .order-item__quant-title{-ms-grid-row-align:center;align-self:center;margin-right:10px;color:#3e3e3e}.merged .baskets .order-item__value{font-size:1rem}.merged .baskets .order-item__area~.order-item__quant{display:block}.merged .baskets .order-item__area~.order-item__quant .order-item__quant-title{line-height:14px;font-size:.75rem;color:#7f7f7f;font-weight:400}.merged .baskets .order-item__area~.order-item__quant .order-item__quant-title:after{content:none}}.checkout-order{flex-wrap:nowrap;border-top:2px dotted #ccc;margin-top:15px}.checkout-order .order-block__address-wrap{padding:10px 10px 0;background:#f8f8f8}.checkout-order .order-block__address .show-info{padding:initial;text-decoration:underline}.checkout-order .order-block__address .address-icon svg{color:#0277bd;margin-right:5px}.checkout-order .order-block__store-info{padding:0 20px;margin-bottom:20px}.checkout-order .schedule-item__time{padding-right:15px;text-align:right}@media (max-width:991.98px){.merged .baskets .order-item__cost{justify-content:space-between}.merged .baskets .order-item__quant{display:flex}.merged .baskets .order-item__quant-title{-ms-grid-row-align:center;align-self:center;margin-right:10px;color:#3e3e3e}.merged .baskets .order-item__value{font-size:1rem}}@media (max-width:767.98px){.checkout-order .schedule-item__time span:first-child{display:inline-block;min-width:80px}.merged .baskets .show-info{text-align:left}}@media (min-width:576px){.special-opening-schedule-item.schedule-item__time{white-space:nowrap}.merged .baskets__basket-lines,.merged .baskets__basket-summary{flex:0 0 100%;max-width:100%}.merged .baskets .order-item__main{-ms-grid-rows:1fr;grid-template-rows:1fr}}@media (min-width:992px){.merged .merge-basket-options{padding:25px 0 25px 10px;margin-bottom:35px}.merged .merge-basket-options__choise-inner{padding-bottom:8px;border:0}.merged .baskets__basket-lines{flex:1;max-width:100%;padding-right:5px}.merged .baskets__basket-summary{flex:0 0 33.3333333333%;max-width:33.3333333333%;padding-left:5px;max-width:325px}}
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><g clip-path="url(#a)"><circle cx="19.828" cy="12.892" r="6.953" stroke="#99b5cf" stroke-width="1.112"/><rect width="1.112" height="2.503" x="19.272" y="5.661" fill="#99b5cf" rx=".556"/><rect width="1.112" height="2.503" x="12.32" y="13.448" fill="#99b5cf" rx=".556" transform="rotate(-90 12.32 13.448)"/><path fill="#99b5cf" d="M1.056 21.513a.556.556 0 1 1 0-1.112H4.95v1.112z"/><rect width="1.112" height="2.503" x="24.834" y="13.448" fill="#99b5cf" rx=".556" transform="rotate(-90 24.834 13.448)"/><rect width="1.112" height="2.503" x="14.127" y="8.116" fill="#99b5cf" rx=".556" transform="rotate(-45 14.127 8.116)"/><rect width="1.112" height="2.503" fill="#99b5cf" rx=".556" transform="rotate(225 10.734 5.935)scale(-1 1)"/><rect width="1.112" height="2.503" fill="#99b5cf" rx=".556" transform="rotate(45 2.994 34.94)scale(-1 1)"/><rect width="1.112" height="3.428" fill="#99b5cf" rx=".556" transform="matrix(1 0 0 -1 19.272 12.844)"/><rect width="1.112" height="2.781" fill="#99b5cf" rx=".556" transform="matrix(0 -1 -1 0 19.78 13.448)"/><rect width="1.112" height="2.503" x="25.583" y="17.721" fill="#99b5cf" rx=".556" transform="rotate(135 25.583 17.72)"/><rect width="1.112" height="2.503" x="19.272" y="17.898" fill="#99b5cf" rx=".556"/><rect width="1.669" height="1.669" x="18.994" y="12.058" fill="#99b5cf" rx=".834"/><path fill="#99b5cf" d="M1.056 24.85a.556.556 0 1 1 0-1.112H4.95v1.113zM1.056 28.188a.556.556 0 1 1 0-1.112H4.95v1.112zM1.056 31.525a.556.556 0 1 1 0-1.112H4.95v1.112z"/><path fill="#99b5cf" fill-rule="evenodd" d="M10.86 35.419a2.98 2.98 0 0 1 2.266 1.044H8.593a2.98 2.98 0 0 1 2.266-1.044m.864-20.024c1.027 3.329 4.047 5.785 7.668 5.968l.436.012a8.49 8.49 0 0 0 8.107-5.98h4.547c1.229 0 2.225.997 2.225 2.226v4.435q.115-.026.246-.051a14 14 0 0 1 2.376-.253c1.902-.038 4.365.319 6.418 1.97 1.286 1.035 2.179 2.954 2.804 4.863.634 1.938 1.03 3.99 1.254 5.41.21 1.33-.837 2.468-2.146 2.468h-2.353a4.52 4.52 0 0 0-3.847-2.568l-.232-.005a4.52 4.52 0 0 0-4.08 2.573H14.94a4.52 4.52 0 0 0-3.847-2.568l-.233-.005a4.52 4.52 0 0 0-4.073 2.557 2.226 2.226 0 0 1-1.975-2.21v-2.71h5.005a.557.557 0 0 0 0-1.114H4.811V28.19h2.92a.557.557 0 0 0 0-1.113H4.81v-2.224h5.005a.556.556 0 1 0 0-1.112H4.811v-2.226h8.065a.556.556 0 0 0 0-1.113H4.811v-2.78c0-1.229.996-2.226 2.225-2.226zm27.503 20.024a2.98 2.98 0 0 1 2.266 1.044H36.96a2.98 2.98 0 0 1 2.268-1.044M37.48 24.715a.945.945 0 0 0-.965.953v4.263c0 .537.436.973.973.973h4.728c.53 0 .997-.44.95-1.017a8 8 0 0 0-.355-1.814c-.23-.703-.617-1.482-1.278-2.043-1.17-.993-2.79-1.24-3.707-1.3z" clip-rule="evenodd"/><circle cx="10.86" cy="38.408" r="3.476" fill="#fff" stroke="#99b5cf" stroke-width="1.53"/><circle cx="10.86" cy="38.408" r="1.738" fill="#fff" stroke="#99b5cf" stroke-width="1.112"/><circle cx="39.226" cy="38.408" r="3.476" fill="#fff" stroke="#99b5cf" stroke-width="1.53"/><circle cx="39.226" cy="38.408" r="1.738" stroke="#99b5cf" stroke-width="1.112"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h48v48H0z"/></clipPath></defs></svg>
|
|
@@ -5692,12 +5692,14 @@ var DS_EL = {
|
|
|
5692
5692
|
title: '.delivery-btn .title',
|
|
5693
5693
|
subtitle: '.delivery-btn .subtitle',
|
|
5694
5694
|
infoIcon: '.rapid-info-icon',
|
|
5695
|
-
image: '.delivery-btn__image'
|
|
5695
|
+
image: '.delivery-btn__image',
|
|
5696
|
+
premiumImage: '.delivery-btn__image--premium'
|
|
5696
5697
|
};
|
|
5697
5698
|
var DS_CLASSES = {
|
|
5698
5699
|
selectedCell: 'calendar__cell_selected',
|
|
5699
5700
|
isSelected: 'date-selection_selected',
|
|
5700
|
-
rapidCell: '
|
|
5701
|
+
rapidCell: 'calendar-rapid-day',
|
|
5702
|
+
premiumCell: 'calendar-premium-day',
|
|
5701
5703
|
hidden: 'd-none'
|
|
5702
5704
|
};
|
|
5703
5705
|
var rapidLoaderShown = false;
|
|
@@ -5774,15 +5776,65 @@ function updateRapidInfo() {
|
|
|
5774
5776
|
$image.removeClass(DS_CLASSES.hidden);
|
|
5775
5777
|
updateDeliveryInfo();
|
|
5776
5778
|
}
|
|
5779
|
+
function getPremiumOrdinal(day) {
|
|
5780
|
+
if (day > 3 && day < 21) return 'th';
|
|
5781
|
+
switch (day % 10) {
|
|
5782
|
+
case 1:
|
|
5783
|
+
return 'st';
|
|
5784
|
+
case 2:
|
|
5785
|
+
return 'nd';
|
|
5786
|
+
case 3:
|
|
5787
|
+
return 'rd';
|
|
5788
|
+
default:
|
|
5789
|
+
return 'th';
|
|
5790
|
+
}
|
|
5791
|
+
}
|
|
5792
|
+
function formatPremiumDate() {
|
|
5793
|
+
var tomorrow = new Date();
|
|
5794
|
+
tomorrow.setDate(tomorrow.getDate() + 1);
|
|
5795
|
+
var day = tomorrow.getDate();
|
|
5796
|
+
var month = tomorrow.toLocaleString('en-GB', {
|
|
5797
|
+
month: 'long'
|
|
5798
|
+
});
|
|
5799
|
+
var year = tomorrow.getFullYear();
|
|
5800
|
+
return "".concat(day).concat(getPremiumOrdinal(day), " ").concat(month, " ").concat(year);
|
|
5801
|
+
}
|
|
5802
|
+
function updatePremiumDeliveryBlock() {
|
|
5803
|
+
var $timeHead = $('.delivery-block .checkout-order .order-block__time-head');
|
|
5804
|
+
if (!$timeHead.length) return;
|
|
5805
|
+
var $span = $timeHead.find('> span').first();
|
|
5806
|
+
var $icon = $span.find('.iconHead').detach();
|
|
5807
|
+
$span.empty().append($icon).append(" By 12 PM ");
|
|
5808
|
+
$span.append($('<span class="boldDate">').text("- ".concat(formatPremiumDate())));
|
|
5809
|
+
$timeHead.find('.order-block__time-head-info').text('Delivery date');
|
|
5810
|
+
}
|
|
5811
|
+
function updatePremiumInfo() {
|
|
5812
|
+
var $title = $(DS_EL.title);
|
|
5813
|
+
var $subtitle = $(DS_EL.subtitle);
|
|
5814
|
+
var $infoIcon = $subtitle.find(DS_EL.infoIcon).detach();
|
|
5815
|
+
var $image = $(DS_EL.image);
|
|
5816
|
+
var $premiumImage = $(DS_EL.premiumImage);
|
|
5817
|
+
$title.text('Premium delivery');
|
|
5818
|
+
$subtitle.html('Delivered tomorrow morning for £12.00');
|
|
5819
|
+
$infoIcon.addClass(DS_CLASSES.hidden);
|
|
5820
|
+
$subtitle.append($infoIcon);
|
|
5821
|
+
$image.addClass(DS_CLASSES.hidden);
|
|
5822
|
+
$premiumImage.removeClass(DS_CLASSES.hidden);
|
|
5823
|
+
updatePremiumDeliveryBlock();
|
|
5824
|
+
}
|
|
5777
5825
|
function selectTimeSlot(e) {
|
|
5778
5826
|
var $self = $(DS_EL.dateSelection);
|
|
5779
5827
|
var $cell = $(e.target).closest(DS_EL.cell);
|
|
5780
5828
|
var isRapid = $cell.hasClass(DS_CLASSES.rapidCell);
|
|
5829
|
+
var isPremiumCell = $cell.hasClass(DS_CLASSES.premiumCell);
|
|
5781
5830
|
$(DS_EL.cell).removeClass(DS_CLASSES.selectedCell);
|
|
5782
5831
|
$cell.addClass(DS_CLASSES.selectedCell);
|
|
5783
5832
|
$self.trigger('selected');
|
|
5784
5833
|
_isDateSelected = true;
|
|
5785
|
-
if (
|
|
5834
|
+
if (isPremiumCell) {
|
|
5835
|
+
$self.addClass(DS_CLASSES.isSelected);
|
|
5836
|
+
updatePremiumInfo();
|
|
5837
|
+
} else if (isRapid) {
|
|
5786
5838
|
if (!rapidLoaderShown) {
|
|
5787
5839
|
rapidLoaderShown = true;
|
|
5788
5840
|
showRapidLoader();
|
package/package.json
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
<span class="description">{{{description}}}</span>
|
|
4
4
|
</div>
|
|
5
5
|
<div class="banner-news__image">
|
|
6
|
-
|
|
6
|
+
{{#if imgSrc}}
|
|
7
|
+
<img src="{{imgSrc}}" class="banner-news__img{{#if imgClass}} {{imgClass}}{{/if}}" alt="">
|
|
8
|
+
{{else}}
|
|
9
|
+
<i class="{{classImg}}"></i>
|
|
10
|
+
{{/if}}
|
|
7
11
|
</div>
|
|
8
12
|
</div>
|
|
@@ -28,16 +28,29 @@
|
|
|
28
28
|
<div class="calendar__row">
|
|
29
29
|
<div class="calendar__row_days">
|
|
30
30
|
{{/if}}
|
|
31
|
-
<span class="calendar__cell calendar__cell_cnt{{#if isInactive}} calendar__cell_inactive{{/if}}{{#if (eq day '1')}}{{#unless isInactive}}
|
|
32
|
-
{{#if
|
|
33
|
-
{{#
|
|
34
|
-
{{
|
|
35
|
-
|
|
31
|
+
<span class="calendar__cell calendar__cell_cnt{{#if isInactive}} calendar__cell_inactive{{/if}}{{#if ../premium}}{{#if (eq day '1')}} calendar__cell_inactive{{/if}}{{#unless isInactive}}{{#if (eq day '2')}} calendar__cell_highlight calendar-premium-day{{/if}}{{/unless}}{{else}}{{#if (eq day '1')}}{{#unless isInactive}} calendar__cell_highlight calendar-rapid-day{{/unless}}{{/if}}{{/if}}">
|
|
32
|
+
{{#if ../premium}}
|
|
33
|
+
{{#if (eq day '2')}}
|
|
34
|
+
{{#unless isInactive}}
|
|
35
|
+
{{day}}
|
|
36
|
+
<span class="calendar-cell-label">Premium</span>
|
|
37
|
+
{{else}}
|
|
38
|
+
{{day}}
|
|
39
|
+
{{/unless}}
|
|
36
40
|
{{else}}
|
|
37
41
|
{{day}}
|
|
38
|
-
{{/
|
|
42
|
+
{{/if}}
|
|
39
43
|
{{else}}
|
|
40
|
-
{{day}}
|
|
44
|
+
{{#if (eq day '1')}}
|
|
45
|
+
{{#unless isInactive}}
|
|
46
|
+
{{day}}
|
|
47
|
+
<span class="calendar-cell-label">Rapid</span>
|
|
48
|
+
{{else}}
|
|
49
|
+
{{day}}
|
|
50
|
+
{{/unless}}
|
|
51
|
+
{{else}}
|
|
52
|
+
{{day}}
|
|
53
|
+
{{/if}}
|
|
41
54
|
{{/if}}
|
|
42
55
|
</span>
|
|
43
56
|
{{#if (eq (mod_inc @index 7) 0)}}
|
|
@@ -64,18 +77,28 @@
|
|
|
64
77
|
</div>
|
|
65
78
|
</div>
|
|
66
79
|
<div class="delivery-time">
|
|
67
|
-
<div class="delivery-time__rapid-hint">
|
|
80
|
+
<div class="{{#if premium}}delivery-time__premium-hint{{else}}delivery-time__rapid-hint{{/if}}">
|
|
68
81
|
<span class="icon-wrap icon-wrap--large">
|
|
69
|
-
|
|
82
|
+
{{#if premium}}
|
|
83
|
+
<img src="./img/premium-delivery.svg" class="icon" alt="Premium delivery">
|
|
84
|
+
{{else}}
|
|
85
|
+
<i class="fas fa-shipping-fast icon"></i>
|
|
86
|
+
{{/if}}
|
|
70
87
|
</span>
|
|
71
88
|
<p class="description">
|
|
72
|
-
|
|
89
|
+
{{#if premium}}
|
|
90
|
+
Select tomorrow’s day on the calendar to get Premium delivery.
|
|
91
|
+
{{else}}
|
|
92
|
+
Select todays’ day on the calendar to get Rapid delivery.
|
|
93
|
+
{{/if}}
|
|
73
94
|
</p>
|
|
74
95
|
</div>
|
|
75
96
|
{{> delivery-types
|
|
76
97
|
title=titleDelivery
|
|
77
98
|
subtitle=subtitleDelivery
|
|
78
99
|
classImg=imgDelivery
|
|
100
|
+
imgSrc=premiumImg
|
|
101
|
+
premium=premium
|
|
79
102
|
}}
|
|
80
103
|
</div>
|
|
81
104
|
</div>
|
|
@@ -19,6 +19,11 @@
|
|
|
19
19
|
<i class="{{classImg}}"></i>
|
|
20
20
|
</span>
|
|
21
21
|
{{/if}}
|
|
22
|
+
{{#if imgSrc}}
|
|
23
|
+
<span class="delivery-btn__image delivery-btn__image--premium d-none">
|
|
24
|
+
<img src="{{imgSrc}}" class="delivery-btn__img" alt="">
|
|
25
|
+
</span>
|
|
26
|
+
{{/if}}
|
|
22
27
|
{{else}}
|
|
23
28
|
<span class="delivery-btn__content">
|
|
24
29
|
<span class="title">7am - 7pm - Free</span>
|
|
@@ -112,37 +112,17 @@
|
|
|
112
112
|
"orderDate": "22nd January 2025 10:35 am",
|
|
113
113
|
"totalConsignments": 5,
|
|
114
114
|
"shipmentDetails": [
|
|
115
|
-
{
|
|
116
|
-
"shipmentIcon": "fas fa-hand-holding-box",
|
|
117
|
-
"shipmentTitle": "Click & Collect at Southport Kitchens & Bathrooms Showroom",
|
|
118
|
-
"shipmentInfo": "Ready for Collection",
|
|
119
|
-
"itemsCount": 2
|
|
120
|
-
},
|
|
121
|
-
{
|
|
122
|
-
"shipmentIcon": "fas fa-times",
|
|
123
|
-
"shipmentTitle": "Click & Collect at Wickes Long Eaton",
|
|
124
|
-
"shipmentInfo": "Cancelled",
|
|
125
|
-
"itemsCount": 4
|
|
126
|
-
},
|
|
127
|
-
{
|
|
128
|
-
"shipmentIcon": "fas fa-shipping-fast",
|
|
129
|
-
"shipmentTitle": "Wickes Delivery from Ashford Store",
|
|
130
|
-
"shipmentInfo": "Dispatched. Delivery - 8th Jan 2025",
|
|
131
|
-
"itemsCount": 4,
|
|
132
|
-
"trackingLink": "/"
|
|
133
|
-
},
|
|
134
115
|
{
|
|
135
116
|
"shipmentIcon": "fas fa-shipping-fast",
|
|
136
|
-
"shipmentTitle": "
|
|
137
|
-
"shipmentInfo": "Dispatched. Delivery —
|
|
138
|
-
"itemsCount":
|
|
139
|
-
"trackingLink": "/"
|
|
117
|
+
"shipmentTitle": "Premium Delivery from Southampton store",
|
|
118
|
+
"shipmentInfo": "Dispatched. Delivery — By 12 PM - 12th Apr 2026",
|
|
119
|
+
"itemsCount": 1
|
|
140
120
|
},
|
|
141
121
|
{
|
|
142
|
-
"shipmentIcon": "fas fa-
|
|
122
|
+
"shipmentIcon": "fas fa-box-alt",
|
|
143
123
|
"shipmentTitle": "Supplier Delivery",
|
|
144
|
-
"shipmentInfo": "
|
|
145
|
-
"itemsCount":
|
|
124
|
+
"shipmentInfo": "Order placed. These item(s) will be delivered within 14 days after receiving your order confirmation. Supplier will contact you with additional information.",
|
|
125
|
+
"itemsCount": 3
|
|
146
126
|
}
|
|
147
127
|
]
|
|
148
128
|
},
|
|
@@ -318,6 +318,49 @@
|
|
|
318
318
|
}
|
|
319
319
|
],
|
|
320
320
|
"subtotalTooltip": "Order level promotions and delivery charges are not included"
|
|
321
|
+
},
|
|
322
|
+
{
|
|
323
|
+
"title": "Premium Delivery",
|
|
324
|
+
"subtotal": "£53.65",
|
|
325
|
+
"track": "#",
|
|
326
|
+
"deliveryRange": [
|
|
327
|
+
{
|
|
328
|
+
"icon": "fas fa-box-alt",
|
|
329
|
+
"title": "Order placed",
|
|
330
|
+
"isComplete": true
|
|
331
|
+
},
|
|
332
|
+
{
|
|
333
|
+
"icon": "fas fa-shipping-fast",
|
|
334
|
+
"title": "Dispatched",
|
|
335
|
+
"isComplete": true
|
|
336
|
+
},
|
|
337
|
+
{
|
|
338
|
+
"icon": "fas fa-box-check",
|
|
339
|
+
"title": "To be Delivered",
|
|
340
|
+
"isComplete": false
|
|
341
|
+
}
|
|
342
|
+
],
|
|
343
|
+
"customClassTooltip": "order__expectation--rapid",
|
|
344
|
+
"storeName": "Wickes Ashford Store",
|
|
345
|
+
"orders": [
|
|
346
|
+
{
|
|
347
|
+
"img": "https://media.wickes.co.uk/is/image/wickes/S3308_190167_00?$thumbnail$",
|
|
348
|
+
"title": "Wickes Instant Grab Adhesive Solvent Free - 300ml",
|
|
349
|
+
"productCode": "791262",
|
|
350
|
+
"quantity": "10",
|
|
351
|
+
"total": "£22.50",
|
|
352
|
+
"switchVat": true,
|
|
353
|
+
"perSQM": "£14.18"
|
|
354
|
+
},
|
|
355
|
+
{
|
|
356
|
+
"img": "https://media.wickes.co.uk/is/image/wickes/S3308_190167_00?$thumbnail$",
|
|
357
|
+
"title": "Hecta LED Wall Light - Chrome",
|
|
358
|
+
"productCode": "790123",
|
|
359
|
+
"quantity": "2",
|
|
360
|
+
"total": "£40"
|
|
361
|
+
}
|
|
362
|
+
],
|
|
363
|
+
"subtotalTooltip": "Order level promotions and delivery charges are not included"
|
|
321
364
|
}
|
|
322
365
|
]
|
|
323
366
|
},
|
|
@@ -97,7 +97,21 @@
|
|
|
97
97
|
},
|
|
98
98
|
"totalPrice": "920.75",
|
|
99
99
|
"totalItemCount": 7,
|
|
100
|
-
"orderDate": "21st November 2024 4:32 PM"
|
|
100
|
+
"orderDate": "21st November 2024 4:32 PM",
|
|
101
|
+
"shipmentDetails": [
|
|
102
|
+
{
|
|
103
|
+
"shipmentIcon": "fas fa-shipping-fast",
|
|
104
|
+
"shipmentTitle": "Premium Delivery from Southampton store",
|
|
105
|
+
"shipmentInfo": "Dispatched. Delivery — By 12 PM - 12th Apr 2026",
|
|
106
|
+
"itemsCount": 1
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"shipmentIcon": "fas fa-box-alt",
|
|
110
|
+
"shipmentTitle": "Supplier Delivery",
|
|
111
|
+
"shipmentInfo": "Order placed. These item(s) will be delivered within 14 days after receiving your order confirmation. Supplier will contact you with additional information.",
|
|
112
|
+
"itemsCount": 3
|
|
113
|
+
}
|
|
114
|
+
]
|
|
101
115
|
},
|
|
102
116
|
{
|
|
103
117
|
"orderId": "940564923",
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none"><g clip-path="url(#a)"><circle cx="19.828" cy="12.892" r="6.953" stroke="#99b5cf" stroke-width="1.112"/><rect width="1.112" height="2.503" x="19.272" y="5.661" fill="#99b5cf" rx=".556"/><rect width="1.112" height="2.503" x="12.32" y="13.448" fill="#99b5cf" rx=".556" transform="rotate(-90 12.32 13.448)"/><path fill="#99b5cf" d="M1.056 21.513a.556.556 0 1 1 0-1.112H4.95v1.112z"/><rect width="1.112" height="2.503" x="24.834" y="13.448" fill="#99b5cf" rx=".556" transform="rotate(-90 24.834 13.448)"/><rect width="1.112" height="2.503" x="14.127" y="8.116" fill="#99b5cf" rx=".556" transform="rotate(-45 14.127 8.116)"/><rect width="1.112" height="2.503" fill="#99b5cf" rx=".556" transform="rotate(225 10.734 5.935)scale(-1 1)"/><rect width="1.112" height="2.503" fill="#99b5cf" rx=".556" transform="rotate(45 2.994 34.94)scale(-1 1)"/><rect width="1.112" height="3.428" fill="#99b5cf" rx=".556" transform="matrix(1 0 0 -1 19.272 12.844)"/><rect width="1.112" height="2.781" fill="#99b5cf" rx=".556" transform="matrix(0 -1 -1 0 19.78 13.448)"/><rect width="1.112" height="2.503" x="25.583" y="17.721" fill="#99b5cf" rx=".556" transform="rotate(135 25.583 17.72)"/><rect width="1.112" height="2.503" x="19.272" y="17.898" fill="#99b5cf" rx=".556"/><rect width="1.669" height="1.669" x="18.994" y="12.058" fill="#99b5cf" rx=".834"/><path fill="#99b5cf" d="M1.056 24.85a.556.556 0 1 1 0-1.112H4.95v1.113zM1.056 28.188a.556.556 0 1 1 0-1.112H4.95v1.112zM1.056 31.525a.556.556 0 1 1 0-1.112H4.95v1.112z"/><path fill="#99b5cf" fill-rule="evenodd" d="M10.86 35.419a2.98 2.98 0 0 1 2.266 1.044H8.593a2.98 2.98 0 0 1 2.266-1.044m.864-20.024c1.027 3.329 4.047 5.785 7.668 5.968l.436.012a8.49 8.49 0 0 0 8.107-5.98h4.547c1.229 0 2.225.997 2.225 2.226v4.435q.115-.026.246-.051a14 14 0 0 1 2.376-.253c1.902-.038 4.365.319 6.418 1.97 1.286 1.035 2.179 2.954 2.804 4.863.634 1.938 1.03 3.99 1.254 5.41.21 1.33-.837 2.468-2.146 2.468h-2.353a4.52 4.52 0 0 0-3.847-2.568l-.232-.005a4.52 4.52 0 0 0-4.08 2.573H14.94a4.52 4.52 0 0 0-3.847-2.568l-.233-.005a4.52 4.52 0 0 0-4.073 2.557 2.226 2.226 0 0 1-1.975-2.21v-2.71h5.005a.557.557 0 0 0 0-1.114H4.811V28.19h2.92a.557.557 0 0 0 0-1.113H4.81v-2.224h5.005a.556.556 0 1 0 0-1.112H4.811v-2.226h8.065a.556.556 0 0 0 0-1.113H4.811v-2.78c0-1.229.996-2.226 2.225-2.226zm27.503 20.024a2.98 2.98 0 0 1 2.266 1.044H36.96a2.98 2.98 0 0 1 2.268-1.044M37.48 24.715a.945.945 0 0 0-.965.953v4.263c0 .537.436.973.973.973h4.728c.53 0 .997-.44.95-1.017a8 8 0 0 0-.355-1.814c-.23-.703-.617-1.482-1.278-2.043-1.17-.993-2.79-1.24-3.707-1.3z" clip-rule="evenodd"/><circle cx="10.86" cy="38.408" r="3.476" fill="#fff" stroke="#99b5cf" stroke-width="1.53"/><circle cx="10.86" cy="38.408" r="1.738" fill="#fff" stroke="#99b5cf" stroke-width="1.112"/><circle cx="39.226" cy="38.408" r="3.476" fill="#fff" stroke="#99b5cf" stroke-width="1.53"/><circle cx="39.226" cy="38.408" r="1.738" stroke="#99b5cf" stroke-width="1.112"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h48v48H0z"/></clipPath></defs></svg>
|
|
@@ -6,12 +6,14 @@ const DS_EL = {
|
|
|
6
6
|
subtitle: '.delivery-btn .subtitle',
|
|
7
7
|
infoIcon: '.rapid-info-icon',
|
|
8
8
|
image: '.delivery-btn__image',
|
|
9
|
+
premiumImage: '.delivery-btn__image--premium',
|
|
9
10
|
};
|
|
10
11
|
|
|
11
12
|
const DS_CLASSES = {
|
|
12
13
|
selectedCell: 'calendar__cell_selected',
|
|
13
14
|
isSelected: 'date-selection_selected',
|
|
14
|
-
rapidCell: '
|
|
15
|
+
rapidCell: 'calendar-rapid-day',
|
|
16
|
+
premiumCell: 'calendar-premium-day',
|
|
15
17
|
hidden: 'd-none',
|
|
16
18
|
};
|
|
17
19
|
|
|
@@ -98,17 +100,72 @@ function updateRapidInfo() {
|
|
|
98
100
|
updateDeliveryInfo();
|
|
99
101
|
}
|
|
100
102
|
|
|
103
|
+
function getPremiumOrdinal(day) {
|
|
104
|
+
if (day > 3 && day < 21) return 'th';
|
|
105
|
+
switch (day % 10) {
|
|
106
|
+
case 1:
|
|
107
|
+
return 'st';
|
|
108
|
+
case 2:
|
|
109
|
+
return 'nd';
|
|
110
|
+
case 3:
|
|
111
|
+
return 'rd';
|
|
112
|
+
default:
|
|
113
|
+
return 'th';
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
function formatPremiumDate() {
|
|
118
|
+
const tomorrow = new Date();
|
|
119
|
+
tomorrow.setDate(tomorrow.getDate() + 1);
|
|
120
|
+
const day = tomorrow.getDate();
|
|
121
|
+
const month = tomorrow.toLocaleString('en-GB', { month: 'long' });
|
|
122
|
+
const year = tomorrow.getFullYear();
|
|
123
|
+
return `${day}${getPremiumOrdinal(day)} ${month} ${year}`;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
function updatePremiumDeliveryBlock() {
|
|
127
|
+
const $timeHead = $('.delivery-block .checkout-order .order-block__time-head');
|
|
128
|
+
if (!$timeHead.length) return;
|
|
129
|
+
|
|
130
|
+
const $span = $timeHead.find('> span').first();
|
|
131
|
+
const $icon = $span.find('.iconHead').detach();
|
|
132
|
+
|
|
133
|
+
$span.empty().append($icon).append(` By 12 PM `);
|
|
134
|
+
$span.append($('<span class="boldDate">').text(`- ${formatPremiumDate()}`));
|
|
135
|
+
$timeHead.find('.order-block__time-head-info').text('Delivery date');
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
function updatePremiumInfo() {
|
|
139
|
+
const $title = $(DS_EL.title);
|
|
140
|
+
const $subtitle = $(DS_EL.subtitle);
|
|
141
|
+
const $infoIcon = $subtitle.find(DS_EL.infoIcon).detach();
|
|
142
|
+
const $image = $(DS_EL.image);
|
|
143
|
+
const $premiumImage = $(DS_EL.premiumImage);
|
|
144
|
+
|
|
145
|
+
$title.text('Premium delivery');
|
|
146
|
+
$subtitle.html('Delivered tomorrow morning for £12.00');
|
|
147
|
+
$infoIcon.addClass(DS_CLASSES.hidden);
|
|
148
|
+
$subtitle.append($infoIcon);
|
|
149
|
+
$image.addClass(DS_CLASSES.hidden);
|
|
150
|
+
$premiumImage.removeClass(DS_CLASSES.hidden);
|
|
151
|
+
updatePremiumDeliveryBlock();
|
|
152
|
+
}
|
|
153
|
+
|
|
101
154
|
function selectTimeSlot(e) {
|
|
102
155
|
const $self = $(DS_EL.dateSelection);
|
|
103
156
|
const $cell = $(e.target).closest(DS_EL.cell);
|
|
104
157
|
const isRapid = $cell.hasClass(DS_CLASSES.rapidCell);
|
|
158
|
+
const isPremiumCell = $cell.hasClass(DS_CLASSES.premiumCell);
|
|
105
159
|
|
|
106
160
|
$(DS_EL.cell).removeClass(DS_CLASSES.selectedCell);
|
|
107
161
|
$cell.addClass(DS_CLASSES.selectedCell);
|
|
108
162
|
$self.trigger('selected');
|
|
109
163
|
isDateSelected = true;
|
|
110
164
|
|
|
111
|
-
if (
|
|
165
|
+
if (isPremiumCell) {
|
|
166
|
+
$self.addClass(DS_CLASSES.isSelected);
|
|
167
|
+
updatePremiumInfo();
|
|
168
|
+
} else if (isRapid) {
|
|
112
169
|
if (!rapidLoaderShown) {
|
|
113
170
|
rapidLoaderShown = true;
|
|
114
171
|
showRapidLoader();
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
|
|
2
|
+
{{#content "steps"}}
|
|
3
|
+
{{> steps-three-steps active-step-index="1" }}
|
|
4
|
+
{{/content}}
|
|
5
|
+
|
|
6
|
+
{{#content "head" mode="append"}}
|
|
7
|
+
<link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
|
|
8
|
+
<link type="text/css" rel="stylesheet" href="./css/pages/page_checkout_delivery-new.css">
|
|
9
|
+
{{/content}}
|
|
10
|
+
|
|
11
|
+
{{#content "aside"}}
|
|
12
|
+
{{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true paymentsCheckoutV2="true"}}
|
|
13
|
+
{{/content}}
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
{{#content "main"}}
|
|
17
|
+
<div class="delivery-block">
|
|
18
|
+
<h3 class="delivery-block__heading">Delivery Information</h3>
|
|
19
|
+
{{> banner-news
|
|
20
|
+
description="<b>Your order qualifies for Premium delivery.</b></br>Alternative delivery options are available."
|
|
21
|
+
imgSrc="./img/premium-delivery.png"
|
|
22
|
+
}}
|
|
23
|
+
<div class="delivery-block__wrapper">
|
|
24
|
+
<div class="date-selection__wrapper">
|
|
25
|
+
<h3 class="date-selection__header">Select delivery date</h3>
|
|
26
|
+
<p class="date-selection__info-block">
|
|
27
|
+
Please choose a date for delivery from the calendar below.
|
|
28
|
+
</p>
|
|
29
|
+
<p class="date-selection__info-block">
|
|
30
|
+
Our delivery slots are currently available up to 8 days in advance.<br> We release additional delivery slots daily.
|
|
31
|
+
</p>
|
|
32
|
+
<p>*Individual couriers will provide more information on delivery times, closer to your chosen delivery date.</p>
|
|
33
|
+
</div>
|
|
34
|
+
|
|
35
|
+
<div class="component component-date-selection">
|
|
36
|
+
{{> date-selection
|
|
37
|
+
titleDelivery="Premium delivery"
|
|
38
|
+
subtitleDelivery="Delivered tomorrow morning for £12.00"
|
|
39
|
+
imgDelivery="fas fa-shipping-fast"
|
|
40
|
+
premiumImg="./img/premium-delivery.png"
|
|
41
|
+
wisdom=true
|
|
42
|
+
premium=true
|
|
43
|
+
}}
|
|
44
|
+
</div>
|
|
45
|
+
|
|
46
|
+
{{#with checkoutOrder.deliveryDeliveryDetails.[0]}}
|
|
47
|
+
<div class="checkout-order">
|
|
48
|
+
{{> checkout-order-block}}
|
|
49
|
+
</div>
|
|
50
|
+
{{/with}}
|
|
51
|
+
|
|
52
|
+
</div>
|
|
53
|
+
</div>
|
|
54
|
+
|
|
55
|
+
<div class="click-collect-block">
|
|
56
|
+
<h3 class="click-collect-block__heading">Click & Collect</h3>
|
|
57
|
+
|
|
58
|
+
<div class="click-collect-block__head-info">
|
|
59
|
+
<p>Simply enter or correct the contact information required below and continue to the next step of the checkout.</p>
|
|
60
|
+
<div class="head-info__wrapper">
|
|
61
|
+
<div class="head-info__wrapper-exclamation">
|
|
62
|
+
<i class="far fa-exclamation-circle"></i>
|
|
63
|
+
<span>Your order will be held for up to 24 hours</span>
|
|
64
|
+
</div>
|
|
65
|
+
<div class="head-info__wrapper-text">
|
|
66
|
+
<p>You will receive a text when your order is ready to collect (usually within 1 trading hour of receiving your order confirmation email).</p>
|
|
67
|
+
<p>Please wait for confirmation before travelling to your chosen store.</p>
|
|
68
|
+
</div>
|
|
69
|
+
</div>
|
|
70
|
+
</div>
|
|
71
|
+
|
|
72
|
+
<div class="click-collect-block__wrapper">
|
|
73
|
+
{{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
|
|
74
|
+
<div class="checkout-order">
|
|
75
|
+
{{> checkout-order-block}}
|
|
76
|
+
</div>
|
|
77
|
+
{{/with}}
|
|
78
|
+
|
|
79
|
+
<div class="add-contact-details">
|
|
80
|
+
<h3 class="add-contact-details__heading">Add contact details</h3>
|
|
81
|
+
<p>Please enter your phone number(s) below so we can contact you regarding your order.</p>
|
|
82
|
+
|
|
83
|
+
<div class="add-contact-details__form">
|
|
84
|
+
{{> form-row type="tel" id="mobile" label="Mobile number" required="true"}}
|
|
85
|
+
{{> form-row type="tel" id="home-phone" label="Home phone"}}
|
|
86
|
+
</div>
|
|
87
|
+
</div>
|
|
88
|
+
</div>
|
|
89
|
+
</div>
|
|
90
|
+
|
|
91
|
+
<div class="simplify-collection">
|
|
92
|
+
<h3 class="simplify-collection__heading">Simplify your collection</h3>
|
|
93
|
+
<p class="simplify-collection__info">All the Click & Collect items in your order are currently available at the following stores. Select
|
|
94
|
+
one of the store to collect all your items from the same location.</p>
|
|
95
|
+
|
|
96
|
+
<div class="simplify-collection__wrapper">
|
|
97
|
+
<div class="your-contact-details__checkbox">
|
|
98
|
+
{{#extend "radiobutton" id="oldham" name="store" label="Oldham" checked="true"}}
|
|
99
|
+
{{#content "html"}}
|
|
100
|
+
<span class="distance">6.2 Miles</span>
|
|
101
|
+
<div class="store-address">
|
|
102
|
+
<div class="store-address__street">Wickes Larch Street,</div>
|
|
103
|
+
<div class="store-address__town">Oldham</div>
|
|
104
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
105
|
+
<div class="store-address__postcode">OL8 1TA</div>
|
|
106
|
+
<div class="store-address__country">United Kingdom</div>
|
|
107
|
+
</div>
|
|
108
|
+
{{/content}}
|
|
109
|
+
{{/extend}}
|
|
110
|
+
</div>
|
|
111
|
+
<div class="your-contact-details__checkbox">
|
|
112
|
+
{{#extend "radiobutton" id="clifton" name="store" label="Clifton"}}
|
|
113
|
+
{{#content "html"}}
|
|
114
|
+
<span class="distance">4.9 Miles</span>
|
|
115
|
+
<div class="store-address">
|
|
116
|
+
<div class="store-address__street">Wickes Wynne Avenue,</div>
|
|
117
|
+
<div class="store-address__town"> Clifton, Swinton</div>
|
|
118
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
119
|
+
<div class="store-address__postcode">M27 8FU</div>
|
|
120
|
+
<div class="store-address__country">United Kingdom</div>
|
|
121
|
+
</div>
|
|
122
|
+
{{/content}}
|
|
123
|
+
{{/extend}}
|
|
124
|
+
</div>
|
|
125
|
+
</div>
|
|
126
|
+
|
|
127
|
+
<p class="simplify-collection__info">I would like to update my order to collect all my items from one store.</p>
|
|
128
|
+
|
|
129
|
+
<button class="btn btn-primary simplify-collection__btn">
|
|
130
|
+
<span class="btn__text">Simplify collection</span>
|
|
131
|
+
</button>
|
|
132
|
+
</div>
|
|
133
|
+
|
|
134
|
+
<div class="continue-btn">
|
|
135
|
+
<button class="btn btn-action">Continue to Payment Details</button>
|
|
136
|
+
</div>
|
|
137
|
+
{{/content}}
|
|
138
|
+
|
|
139
|
+
{{#content "foot" mode="append"}}
|
|
140
|
+
{{> loader titleLoader="Loading Rapid delivery..." hidden=true modifier="basket-loader rapid-loader"}}
|
|
141
|
+
|
|
142
|
+
<script defer src="./js/page/checkout-confirmation-new.js"></script>
|
|
143
|
+
<script defer src="./js/page/select-address.js"></script>
|
|
144
|
+
|
|
145
|
+
{{#extend "modal" classMod="edit-delivery-address" id="modalEditAddress" title="Edit delivery address" fullWidth=true}}
|
|
146
|
+
{{#content "body"}}
|
|
147
|
+
<div class="edit-address-modal-block">
|
|
148
|
+
{{> notifications notification-page.error-deliver-area}}
|
|
149
|
+
<div class="delivery-block__wrapper customer-journey-block">
|
|
150
|
+
{{> user-address-delivery radioName="checkout-address-radio" modal="modalDeliveryEdit" selectedAddress=true simpleAddress=true isDeleted=true}}
|
|
151
|
+
</div>
|
|
152
|
+
|
|
153
|
+
<button class="btn btn-action btn_full">
|
|
154
|
+
<span class="btn__text">Continue to delivery details</span>
|
|
155
|
+
</button>
|
|
156
|
+
</div>
|
|
157
|
+
{{/content}}
|
|
158
|
+
{{/extend}}
|
|
159
|
+
|
|
160
|
+
{{/content}}
|
|
161
|
+
{{/extend}}
|