From e50e09ad2351ac33a1126118246c2b41c667e190 Mon Sep 17 00:00:00 2001 From: Sofia Matulis Date: Fri, 21 Jul 2023 07:50:11 -0300 Subject: [PATCH 1/4] Fix font for quick order list --- assets/quick-order-list.css | 5 +++-- sections/quick-order-list.liquid | 8 ++++---- snippets/quick-order-list-row.liquid | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/assets/quick-order-list.css b/assets/quick-order-list.css index 22a8fac96de..a57e3ecab83 100644 --- a/assets/quick-order-list.css +++ b/assets/quick-order-list.css @@ -215,6 +215,7 @@ quick-order-list .quantity__button { .variant-item__sold-out { opacity: 0.7; font-size: 1.6rem; + color: rgb(var(--color-foreground)); } quick-order-list-remove-button { @@ -598,7 +599,7 @@ quick-order-list-remove-button { align-items: center; } -.quick-order-list__total-items h3, +.quick-order-list__total-items span, .totals__subtotal-value { margin-top: 0; margin-bottom: 0; @@ -658,7 +659,7 @@ quick-order-list-remove-button { } .totals__subtotal-value, - .quick-order-list__total-items h3 { + .quick-order-list__total-items span { margin-right: 1.2rem; } diff --git a/sections/quick-order-list.liquid b/sections/quick-order-list.liquid index b2eb96dbfe6..766508f2698 100644 --- a/sections/quick-order-list.liquid +++ b/sections/quick-order-list.liquid @@ -160,9 +160,9 @@
-

+ {{ items_in_cart }} -

+

{{ 'sections.quick_order_list.total_items' | t }}

@@ -172,12 +172,12 @@
-

+ {% comment %} TODO: enable theme-check once `line_items_for` is accepted as valid filter {% endcomment %} {% # theme-check-disable %} {{ cart | line_items_for: product | sum: 'original_line_price' | money }} {% # theme-check-enable %} -

+

{{ 'sections.quick_order_list.product_total' | t }}

diff --git a/snippets/quick-order-list-row.liquid b/snippets/quick-order-list-row.liquid index 89b82c491ff..84ccaffec1d 100644 --- a/snippets/quick-order-list-row.liquid +++ b/snippets/quick-order-list-row.liquid @@ -212,7 +212,7 @@ {%- endif -%} {%- if variant.available == false or quantity_rule_soldout -%} - {{ 'products.product.sold_out' | t }} + {{ 'products.product.sold_out' | t }} {%- else -%} {% comment %} TODO: Remove theme check {% endcomment %} {% # theme-check-disable %} From dd05f126394a132c18496453238bd8673e677d17 Mon Sep 17 00:00:00 2001 From: Sofia Matulis Date: Tue, 1 Aug 2023 11:25:27 -0400 Subject: [PATCH 2/4] Update opacity --- assets/quick-order-list.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/quick-order-list.css b/assets/quick-order-list.css index a57e3ecab83..1737d2d9384 100644 --- a/assets/quick-order-list.css +++ b/assets/quick-order-list.css @@ -603,6 +603,7 @@ quick-order-list-remove-button { .totals__subtotal-value { margin-top: 0; margin-bottom: 0; + color: rgb(var(--color-foreground)); } .quick-order-list__total-items p, From 1c9db71d661a50c8823162f62d5af20bce9744e8 Mon Sep 17 00:00:00 2001 From: Sofia Matulis Date: Fri, 21 Jul 2023 08:03:42 -0300 Subject: [PATCH 3/4] Hide vol pricing unavailable --- assets/global.js | 14 +++++++++++++- sections/featured-product.liquid | 4 ++-- sections/main-product.liquid | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/assets/global.js b/assets/global.js index c128d2dedc4..6b043588400 100644 --- a/assets/global.js +++ b/assets/global.js @@ -798,7 +798,7 @@ class SlideshowComponent extends SliderComponent { setSlidePosition(position) { if (this.setPositionTimeout) clearTimeout(this.setPositionTimeout); - this.setPositionTimeout = setTimeout (() => { + this.setPositionTimeout = setTimeout(() => { this.slider.scrollTo({ left: position, }); @@ -1110,6 +1110,12 @@ class VariantSelects extends HTMLElement { const pricePerItemSource = html.getElementById(`Price-Per-Item-${this.dataset.originalSection ? this.dataset.originalSection : this.dataset.section}`); const volumePricingDestination = document.getElementById(`Volume-${this.dataset.section}`); + const qtyRules = document.getElementById(`Quantity-Rules-${this.dataset.section}`); + const volumeNote = document.getElementById(`Volume-Note-${this.dataset.section}`); + + if (volumeNote) volumeNote.classList.remove('visibility-hidden'); + if (volumePricingDestination) volumePricingDestination.classList.remove('visibility-hidden'); + if (qtyRules) qtyRules.classList.remove('visibility-hidden'); if (source && destination) destination.innerHTML = source.innerHTML; if (inventorySource && inventoryDestination) inventoryDestination.innerHTML = inventorySource.innerHTML; @@ -1176,6 +1182,9 @@ class VariantSelects extends HTMLElement { const inventory = document.getElementById(`Inventory-${this.dataset.section}`); const sku = document.getElementById(`Sku-${this.dataset.section}`); const pricePerItem = document.getElementById(`Price-Per-Item-${this.dataset.section}`); + const volumeNote = document.getElementById(`Volume-Note-${this.dataset.section}`); + const volumeTable = document.getElementById(`Volume-${this.dataset.section}`); + const qtyRules = document.getElementById(`Quantity-Rules-${this.dataset.section}`); if (!addButton) return; addButtonText.textContent = window.variantStrings.unavailable; @@ -1183,6 +1192,9 @@ class VariantSelects extends HTMLElement { if (inventory) inventory.classList.add('visibility-hidden'); if (sku) sku.classList.add('visibility-hidden'); if (pricePerItem) pricePerItem.classList.add('visibility-hidden'); + if (volumeNote) volumeNote.classList.add('visibility-hidden'); + if (volumeTable) volumeTable.classList.add('visibility-hidden'); + if (qtyRules) qtyRules.classList.add('visibility-hidden'); } getVariantData() { diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid index cd9291ae323..fe7897ac72a 100644 --- a/sections/featured-product.liquid +++ b/sections/featured-product.liquid @@ -177,7 +177,7 @@ -%}
{%- if product.quantity_price_breaks_configured? -%} -
+
{{ 'products.product.volume_pricing.note' | t }}
{%- endif -%} @@ -361,7 +361,7 @@ {%- endif -%}
-
+
{%- if product.selected_or_first_available_variant.quantity_rule.increment > 1 -%} {{- diff --git a/sections/main-product.liquid b/sections/main-product.liquid index 8b9e9fc9b4c..b026b6042d1 100644 --- a/sections/main-product.liquid +++ b/sections/main-product.liquid @@ -106,7 +106,7 @@ -%}
{%- if product.quantity_price_breaks_configured? -%} -
+
{{ 'products.product.volume_pricing.note' | t }}
{%- endif -%} @@ -334,7 +334,7 @@ {%- endif -%}
-
+
{%- if product.selected_or_first_available_variant.quantity_rule.increment > 1 -%} {{- From 052aca751be8574fbe2525ba5018d3dd9b2dd34f Mon Sep 17 00:00:00 2001 From: Sofia Matulis Date: Wed, 2 Aug 2023 11:23:22 -0400 Subject: [PATCH 4/4] Update to hidden --- assets/global.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/global.js b/assets/global.js index 6b043588400..c04d3d37ad3 100644 --- a/assets/global.js +++ b/assets/global.js @@ -1113,15 +1113,15 @@ class VariantSelects extends HTMLElement { const qtyRules = document.getElementById(`Quantity-Rules-${this.dataset.section}`); const volumeNote = document.getElementById(`Volume-Note-${this.dataset.section}`); - if (volumeNote) volumeNote.classList.remove('visibility-hidden'); - if (volumePricingDestination) volumePricingDestination.classList.remove('visibility-hidden'); - if (qtyRules) qtyRules.classList.remove('visibility-hidden'); + if (volumeNote) volumeNote.classList.remove('hidden'); + if (volumePricingDestination) volumePricingDestination.classList.remove('hidden'); + if (qtyRules) qtyRules.classList.remove('hidden'); if (source && destination) destination.innerHTML = source.innerHTML; if (inventorySource && inventoryDestination) inventoryDestination.innerHTML = inventorySource.innerHTML; if (skuSource && skuDestination) { skuDestination.innerHTML = skuSource.innerHTML; - skuDestination.classList.toggle('visibility-hidden', skuSource.classList.contains('visibility-hidden')); + skuDestination.classList.toggle('hidden', skuSource.classList.contains('hidden')); } if (volumePricingSource && volumePricingDestination) { @@ -1130,15 +1130,15 @@ class VariantSelects extends HTMLElement { if (pricePerItemSource && pricePerItemDestination) { pricePerItemDestination.innerHTML = pricePerItemSource.innerHTML; - pricePerItemDestination.classList.toggle('visibility-hidden', pricePerItemSource.classList.contains('visibility-hidden')); + pricePerItemDestination.classList.toggle('hidden', pricePerItemSource.classList.contains('hidden')); } const price = document.getElementById(`price-${this.dataset.section}`); - if (price) price.classList.remove('visibility-hidden'); + if (price) price.classList.remove('hidden'); if (inventoryDestination) - inventoryDestination.classList.toggle('visibility-hidden', inventorySource.innerText === ''); + inventoryDestination.classList.toggle('hidden', inventorySource.innerText === ''); const addButtonUpdated = html.getElementById(`ProductSubmitButton-${sectionId}`); this.toggleAddButton( @@ -1188,13 +1188,13 @@ class VariantSelects extends HTMLElement { if (!addButton) return; addButtonText.textContent = window.variantStrings.unavailable; - if (price) price.classList.add('visibility-hidden'); - if (inventory) inventory.classList.add('visibility-hidden'); - if (sku) sku.classList.add('visibility-hidden'); - if (pricePerItem) pricePerItem.classList.add('visibility-hidden'); - if (volumeNote) volumeNote.classList.add('visibility-hidden'); - if (volumeTable) volumeTable.classList.add('visibility-hidden'); - if (qtyRules) qtyRules.classList.add('visibility-hidden'); + if (price) price.classList.add('hidden'); + if (inventory) inventory.classList.add('hidden'); + if (sku) sku.classList.add('hidden'); + if (pricePerItem) pricePerItem.classList.add('hidden'); + if (volumeNote) volumeNote.classList.add('hidden'); + if (volumeTable) volumeTable.classList.add('hidden'); + if (qtyRules) qtyRules.classList.add('hidden'); } getVariantData() {