Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@JiaJasonLiu
JiaJasonLiu committed May 23, 2024
1 parent 2e23834 commit 4d2d85d
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 79 deletions.
1 change: 1 addition & 0 deletions sections/main-collection-product-grid.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
section_id: section.id
%}

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets

Check warning on line 189 in sections/main-collection-product-grid.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/main-collection-product-grid.liquid#L179-L189 

[NestedSnippet] Too many nested snippets
</li>
{% endif %}
{%- endfor -%}
</ul>

Expand Down
159 changes: 80 additions & 79 deletions snippets/card-product.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,88 +213,89 @@
Please <a href="{{ routes.root_url }}/account" style="color: #000; text-decoration: underline">sign in</a> to see pricing
</div>
{%- else -%}
{% render 'price', product: card_product, price_class: '', show_compare_at_price: true %}
{%- if card_product.quantity_price_breaks_configured? -%}
{% if card_product.variants.size == 1 and quick_add == 'bulk' %}
{% liquid
assign quantity_rule = card_product.selected_or_first_available_variant.quantity_rule
assign has_qty_rules = false
if quantity_rule.increment > 1 or quantity_rule.min > 1 or quantity_rule.max != null
assign has_qty_rules = true
endif
%}
<quantity-popover>
<button class="card__information-volume-pricing-note card__information-volume-pricing-note--button card__information-volume-pricing-note--button-{{ settings.card_text_alignment }} quantity-popover__info-button--icon-only button button button--tertiary medium-hide small-hide">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</button>
<button class="card__information-volume-pricing-note card__information-volume-pricing-note--button card__information-volume-pricing-note--button-{{ settings.card_text_alignment }} quantity-popover__info-button--icon-with-label button button--tertiary large-up-hide">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</button>
{% else %}
<div class="card__information-volume-pricing-note">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</div>
{% endif %}
{% if card_product.variants.size == 1 and quick_add == 'bulk' %}
<div
class="global-settings-popup quantity-popover__info"
tabindex="-1"
hidden
id="quantity-popover-info-{{ card_product.selected_or_first_available_variant.id }}"
>
{%- if has_qty_rules -%}
<div class="quantity__rules caption no-js-hidden">
{%- if quantity_rule.increment > 1 -%}
<span class="divider">
{{- 'products.product.quantity.multiples_of' | t: quantity: quantity_rule.increment -}}
</span>
{%- endif -%}
{%- if quantity_rule.min > 1 -%}
<span class="divider">
{{- 'products.product.quantity.min_of' | t: quantity: quantity_rule.min -}}
</span>
{% render 'price', product: card_product, price_class: '', show_compare_at_price: true %}
{%- if card_product.quantity_price_breaks_configured? -%}
{% if card_product.variants.size == 1 and quick_add == 'bulk' %}
{% liquid
assign quantity_rule = card_product.selected_or_first_available_variant.quantity_rule
assign has_qty_rules = false
if quantity_rule.increment > 1 or quantity_rule.min > 1 or quantity_rule.max != null
assign has_qty_rules = true
endif
%}
<quantity-popover>
<button class="card__information-volume-pricing-note card__information-volume-pricing-note--button card__information-volume-pricing-note--button-{{ settings.card_text_alignment }} quantity-popover__info-button--icon-only button button button--tertiary medium-hide small-hide">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</button>
<button class="card__information-volume-pricing-note card__information-volume-pricing-note--button card__information-volume-pricing-note--button-{{ settings.card_text_alignment }} quantity-popover__info-button--icon-with-label button button--tertiary large-up-hide">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</button>
{% else %}
<div class="card__information-volume-pricing-note">
<span class="caption">{{ 'products.product.volume_pricing.note' | t }}</span>
</div>
{% endif %}
{% if card_product.variants.size == 1 and quick_add == 'bulk' %}
<div
class="global-settings-popup quantity-popover__info"
tabindex="-1"
hidden
id="quantity-popover-info-{{ card_product.selected_or_first_available_variant.id }}"
>
{%- if has_qty_rules -%}
<div class="quantity__rules caption no-js-hidden">
{%- if quantity_rule.increment > 1 -%}
<span class="divider">
{{- 'products.product.quantity.multiples_of' | t: quantity: quantity_rule.increment -}}
</span>
{%- endif -%}
{%- if quantity_rule.min > 1 -%}
<span class="divider">
{{- 'products.product.quantity.min_of' | t: quantity: quantity_rule.min -}}
</span>
{%- endif -%}
{%- if quantity_rule.max != null -%}
<span class="divider">
{{- 'products.product.quantity.max_of' | t: quantity: quantity_rule.max -}}
</span>
{%- endif -%}
</div>
{%- endif -%}
{%- if quantity_rule.max != null -%}
<span class="divider">
{{- 'products.product.quantity.max_of' | t: quantity: quantity_rule.max -}}
</span>
<button
class="button-close button button--tertiary large-up-hide"
type="button"
aria-label="{{ 'accessibility.close' | t }}"
>
{%- render 'icon-close' -%}
</button>
{%- if card_product.selected_or_first_available_variant.quantity_price_breaks.size > 0 -%}
<volume-pricing class="parent-display">
<ul class="list-unstyled">
<li>
<span>{{ card_product.selected_or_first_available_variant.quantity_rule.min }}+</span>
{%- assign price = card_product.selected_or_first_available_variant.price
| money_with_currency
-%}
<span>{{ 'sections.quick_order_list.each' | t: money: price }}</span>
</li>
{%- for price_break in card_product.selected_or_first_available_variant.quantity_price_breaks -%}
<li>
<span>
{{- price_break.minimum_quantity -}}
<span aria-hidden="true">+</span></span
>
{%- assign price = price_break.price | money_with_currency -%}
<span> {{ 'sections.quick_order_list.each' | t: money: price }}</span>
</li>
{%- endfor -%}
</ul>
</volume-pricing>
{%- endif -%}
</div>
{%- endif -%}
<button
class="button-close button button--tertiary large-up-hide"
type="button"
aria-label="{{ 'accessibility.close' | t }}"
>
{%- render 'icon-close' -%}
</button>
{%- if card_product.selected_or_first_available_variant.quantity_price_breaks.size > 0 -%}
<volume-pricing class="parent-display">
<ul class="list-unstyled">
<li>
<span>{{ card_product.selected_or_first_available_variant.quantity_rule.min }}+</span>
{%- assign price = card_product.selected_or_first_available_variant.price
| money_with_currency
-%}
<span>{{ 'sections.quick_order_list.each' | t: money: price }}</span>
</li>
{%- for price_break in card_product.selected_or_first_available_variant.quantity_price_breaks -%}
<li>
<span>
{{- price_break.minimum_quantity -}}
<span aria-hidden="true">+</span></span
>
{%- assign price = price_break.price | money_with_currency -%}
<span> {{ 'sections.quick_order_list.each' | t: money: price }}</span>
</li>
{%- endfor -%}
</ul>
</volume-pricing>
{%- endif -%}
</div>
</quantity-popover>
{% endif %}
{%- endif -%}
</quantity-popover>
{% endif %}
{%- endif -%}
{%- endif -%}
</div>
</div>
{% if quick_add == 'standard' %}
Expand Down

0 comments on commit 4d2d85d

Please sign in to comment.