I also have product-contents.liquid
{% comment %}
@param product {Product}
@param variant {Variant}
@param form {ProductForm}
@param section {Section}
@param layout {String}
One of `one-column` or `two-column`
@param show_payment_button {Boolean}
Renders the DPBs
@param is_quickshop {Boolean}
Link title to product page
{% endcomment %}
{% comment %}Dynamic checkout is not shown if selling plans are available{% endcomment %}
{% if product.selling_plan_groups.size > 0 %}
{% assign show_payment_button = false %}
{% endif %}
{% assign rendered_quantity_selector = false %}
{% assign rendered_variant_selection = false %}
{% assign has_price_and_quantity_block = false %}
{% assign price_and_quantity_block_count = section.blocks | where: 'type', 'price_and_quantity' | size %}
{% if price_and_quantity_block_count > 0 %}
{% assign has_price_and_quantity_block = true %}
{% endif %}
{% assign first_block_class = 'product-block--first' %}
{% for block in section.blocks %}
{% case block.type %}
{% when '@app' %}
<div class="product-details__app" {{ block.shopify_attributes }}>
{% render block %}
</div>
{% when 'title' %}
{% assign heading_element = 'h2' %}
{% if template.name == 'product' %}
{% assign heading_element = 'h1' %}
{% endif %}
<{{ heading_element }}
class="product__heading {{ first_block_class }}"
{{ block.shopify_attributes }}
>
{% if is_quickshop %}<a href="{{ product.url | within: collection }}">{% endif %}
{% if onboarding %}
{{ 'product.onboarding.title' | t }}
{% else %}
{{ product.title }}
{% endif %}
{% if is_quickshop %}</a>{% endif %}
</{{ heading_element }}>
{% when 'vendor' %}
<p
class="
product__vendor
{{ first_block_class }}
"
{{ block.shopify_attributes }}
>
{% if onboarding %}
{{ 'product.onboarding.vendor' | t }}
{% else %}
{{ product.vendor | link_to_vendor }}
{% endif %}
</p>
{% when 'variant_selection' %}
{% if onboarding %}
{% continue %}
{% endif %}
{%
render 'product-options-dropdown',
product: product,
block: block,
class: first_block_class,
%}
{% assign rendered_variant_selection = true %}
{% when 'price' %}
{% if has_price_and_quantity_block %}
{% continue %}
{% endif %}
{%
render 'product-form-price',
product: product,
variant: variant,
form: form,
class: first_block_class,
%}
{% when 'quantity' %}
{% if has_price_and_quantity_block %}
{% continue %}
{% endif %}
{%
render 'product-form-quantity',
class: first_block_class,
%}
{% assign rendered_quantity_selector = true %}
{% when 'price_and_quantity' %}
<div
class="
product-details__qty-price-container
{% if product.options.size > 1 or show_payment_button %}
product-details__qty-price-container--align-columns
{% endif %}
{{ first_block_class }}
"
{{ block.shopify_attributes }}
>
{%
render 'product-form-price',
product: product,
variant: variant,
form: form,
%}
{% render 'product-form-quantity' %}
{% assign rendered_quantity_selector = true %}
</div>
{% when 'text' %}
<div
class="product-details__text"
data-rich-text-area
{{ block.shopify_attributes }}
>
{{ block.settings.text }}
</div>
{% when 'description' %}
{% if product.description != blank or onboarding %}
<div
class="
product-details__description
{{ first_block_class }}
"
data-rich-text-area
{{ block.shopify_attributes }}
>
{% if onboarding %}
{{ 'product.onboarding.description' | t }}
{% else %}
{{ product.description }}
{% endif %}
</div>
{% endif %}
{% when 'form' %}
<div
class="
product-details__add-to-cart-area
{% if product.variants.size == 1 or product.available == false %}
no-variants
{% endif %}
{{ first_block_class }}
"
{{ block.shopify_attributes }}
>
<div
class="
product-details__add-to-cart-buttons
{% if show_payment_button %}
product-details__add-to-cart-buttons--spb-enabled
{% else %}
product-details__add-to-cart-buttons--spb-disabled
{% endif %}
"
>
<button
class="product-details__add-to-cart-button"
type="submit"
data-product-atc
{% unless variant.available %}disabled{% endunless %}
>
<span data-product-atc-text>
{%- if variant.available -%}
{{ 'product.add_to_cart.submit' | t }}
{% else %}
{{ 'product.add_to_cart.sold_out' | t }}
{% endif %}
</span>
<span data-product-atc-loader>
{% render 'icon-library', id: 'icon-spinner' %}
</span>
</button>
{% if show_payment_button %}
{{ form | payment_button }}
{% endif %}
</div>
<div class="
surface-pick-up
{% unless show_payment_button %}
surface-pick-up--spb-disabled
{% endunless %}
"
data-surface-pick-up
></div>
</div>
{% when 'share' %}
<div
class="
product__share
{{ first_block_class }}
"
{{ block.shopify_attributes }}
>
<p class="product__share-text">{{ 'general.social.share_this' | t }}</p>
{% render 'share-buttons', context: product %}
</div>
{% when 'gallery' %}
{% if layout == 'two-column' %}
{% continue %}
{% endif %}
{% capture gallery_classes %}
{{ first_block_class }}
{% if forloop.last %}product-gallery--last{% endif %}
{% endcapture %}
{%
render 'product-gallery',
product: product,
layout: layout,
enable_zoom: enable_zoom,
onboarding: onboarding,
class: gallery_classes,
block: block,
%}
{% when 'rating' %}
{%- if product.metafields.reviews.rating.value != blank -%}
<div class="product__rating rating {{ first_block_class }}" {{ block.shopify_attributes }}>
{%
render 'rating-stars',
value: product.metafields.reviews.rating.value.rating,
scale_max: product.metafields.reviews.rating.value.scale_max,
%}
<p class="rating__text">
<span aria-hidden="true">{{ product.metafields.reviews.rating.value }} / {{ product.metafields.reviews.rating.value.scale_max }}</span>
</p>
<p class="rating__count">
<span aria-hidden="true">({{ product.metafields.reviews.rating_count }})</span>
<span class="visually-hidden">{{ product.metafields.reviews.rating_count }} {{ "general.accessibility.total_reviews" | t }}</span>
</p>
</div>
{%- endif -%}
{% endcase %}
{% assign first_block_class = '' %}
{% endfor %}
{% unless rendered_quantity_selector %}
<input type="hidden" name="quantity" value="1">
{% endunless %}
{% unless rendered_variant_selection %}
<input
name="id"
value="{{ product.selected_or_first_available_variant.id }}"
type="hidden"
>
{% endunless %}
