spree_storefront 5.1.0.beta3 → 5.1.0.rc1

data/app/views/spree/checkout/_delivery.html.erb

@@ -1,19 +1,8 @@
 <%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), data: { controller: 'checkout-delivery' } do |form| %>
   <div class="mb-5">
-    <%= turbo_frame_tag :checkout_lock_version do %>
-      <%= hidden_field_tag 'order[state_lock_version]', @order.state_lock_version %>
-    <% end %>
+    <%= render 'spree/checkout/order_lock_version', order: @order %>
     <div id="shipping-method">
-      <% if @order.backordered_variants.any? %>
-        <div class="alert rounded border border-default text-sm p-5 mb-6">
-          Some products in your cart will be dispatched a bit later than the rest of your order:
-          <ul class="list-disc list-inside flex-col flex space-y-1 mt-2">
-            <% @order.backordered_variants.each do |variant| %>
-              <li><%= variant.name %></li>
-            <% end %>
-          </ul>
-        </div>
-      <% end %>
+      <%= render 'spree/checkout/delivery_backorder_notice', order: @order %>
 
       <div id="methods">
         <%= form.fields_for :shipments do |ship_form| %>
@@ -27,28 +16,7 @@
             </h5>
             <ul class="rounded-md list-group mb-4 border border-default border-b-0 text-sm border-default" data-checkout-delivery-target="shippingList">
               <% ship_form.object.shipping_rates.includes(:shipping_method, :tax_rate).each do |rate| %>
-                <li class="list-group-item p-0 m-0 border-b delivery-list-item border-default" data-checkout-delivery-target="shippingRate">
-                  <div class="custom-control custom-radio flex items-center px-5 py-4">
-                    <%= ship_form.radio_button :selected_shipping_rate_id,
-                      rate.id,
-                      class: 'custom-control-input radio-input',
-                      id: "shipping-rate-#{rate.id}",
-                      data: {
-                        action: 'click->checkout-delivery#update',
-                        cost: rate.display_cost,
-                        tax: rate.display_tax_amount
-                      } %>
-                    <label class="select-none cursor-pointer px-2 word-break w-full" for="<%= "shipping-rate-#{rate.id}" %>">
-                      <%= rate.name %>
-                      <% if rate.delivery_range %>
-                        <span class="text-gray-600 text-xs ml-3"><%= rate.display_delivery_range %></span>
-                      <% end %>
-                    </label>
-                    <span class="text-right">
-                      <%= rate.cost <= 0 ? Spree.t(:free) : rate.display_cost %>
-                    </span>
-                  </div>
-                </li>
+                <%= render 'spree/checkout/delivery_shipping_rate', ship_form: ship_form, rate: rate %>
               <% end %>
             </ul>
           </div>
@@ -67,4 +35,3 @@
     </div>
   </div>
 <% end %>
-

data/app/views/spree/checkout/_delivery_backorder_notice.html.erb

@@ -0,0 +1,10 @@
+<% if order.backordered_variants.any? %>
+  <div class="alert rounded border border-default text-sm p-5 mb-6">
+    <%= Spree.t("storefront.checkout.backorder_notice") %>
+    <ul class="list-disc list-inside flex-col flex space-y-1 mt-2">
+      <% order.backordered_variants.each do |variant| %>
+        <li><%= variant.name %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/spree/checkout/_delivery_shipping_rate.html.erb

@@ -0,0 +1,22 @@
+<li class="list-group-item p-0 m-0 border-b delivery-list-item border-default" data-checkout-delivery-target="shippingRate" id="<%= spree_dom_id(rate) %>">
+  <div class="custom-control custom-radio flex items-center px-5 py-4">
+    <%= ship_form.radio_button :selected_shipping_rate_id,
+      rate.id,
+      class: 'custom-control-input radio-input',
+      id: "shipping-rate-#{rate.id}",
+      data: {
+        action: 'click->checkout-delivery#update',
+        cost: rate.display_cost,
+        tax: rate.display_tax_amount
+      } %>
+    <label class="select-none cursor-pointer px-2 word-break w-full" for="<%= "shipping-rate-#{rate.id}" %>">
+      <%= rate.name %>
+      <% if rate.delivery_range %>
+        <span class="text-gray-600 text-xs ml-3"><%= rate.display_delivery_range %></span>
+      <% end %>
+    </label>
+    <span class="text-right">
+      <%= rate.cost <= 0 ? Spree.t(:free) : rate.display_cost %>
+    </span>
+  </div>
+</li>

data/app/views/spree/checkout/_line_item.html.erb

@@ -15,7 +15,7 @@
   <div class="font-semibold text-sm text-right shrink-0">
     <% if should_display_compare_at_price?(line_item.variant) %>
       <span class="line-through text-red-500">
-        <%= Spree::Money.new(line_item.variant.compare_at_amount_in(line_item.currency) * line_item.quantity, currency: line_item.currency) %>
+        <%= line_item.display_compare_at_amount %>
       </span>
       <br />
     <% end %>

data/app/views/spree/checkout/_missing_all_line_items.html.erb

@@ -7,8 +7,8 @@
           <p class="mb-4"><%= Spree.t('errors.messages.no_shipping_methods_available') %> </p>
 
           <div class="flex justify-end items-center flex-wrap mt-6">
-            <%= link_to 'Return to cart', spree.cart_path, class: 'mx-4 py-4', target: :_top %>
-            <%= link_to 'Close', checkout_state_path(@order.token, @order.state), class: 'btn-primary font-semibold checkout-content-save-continue-button my-5 ml-4 !py-4', target: :_top %>
+            <%= link_to Spree.t("storefront.checkout.return_to_cart"), spree.cart_path, class: 'mx-4 py-4', target: :_top %>
+            <%= link_to Spree.t(:close), checkout_state_path(@order.token, @order.state), class: 'btn-primary font-semibold checkout-content-save-continue-button my-5 ml-4 !py-4', target: :_top %>
           </div>
         </div>
       </div>

data/app/views/spree/checkout/_order_lock_version.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag :checkout_lock_version do %>
+  <%= hidden_field_tag 'order[state_lock_version]', order.state_lock_version %>
+<% end %>

data/app/views/spree/checkout/_payment.html.erb

@@ -1,23 +1,25 @@
 <%= form_for @order, url: spree.update_checkout_path(@order.token, @order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
-  <%= form.hidden_field :state_lock_version %>
-  
+  <%= render 'spree/checkout/order_lock_version', order: @order %>
+
   <% if @order.respond_to?(:gift_card) %>
     <%= turbo_frame_tag :gift_card_code_field do %>
       <%= hidden_field_tag 'order[gift_card_code]', @order.gift_card&.code %>
       <%= hidden_field_tag 'order[gift_card_amount]', @order.gift_card_total %>
     <% end %>
   <% end %>
-  
-  <% use_shipping = @order.shipping_eq_billing_address? || @order.bill_address.nil? || @order.bill_address.new_record? %>
-  
+
+  <% use_shipping = (@order.shipping_eq_billing_address? || @order.bill_address.nil? || @order.bill_address.new_record?) && @order.requires_ship_address? %>
+
   <div id="billing-address" class="mb-8 max-w-full" data-controller="toggle">
     <h5 class="mb-3 font-body font-semibold">
       <%= Spree.t(:billing_address) %>
     </h5>
-    <div class="flex items-center">
-      <%= form.check_box :use_shipping, { checked: use_shipping, class: 'checkbox-input', data: { action: 'change->toggle#toggle' } } %>
-      <%= form.label :use_shipping, Spree.t(:use_shipping_address), class: 'ml-1 cursor-pointer select-none' %>
-    </div>
+    <% if @order.requires_ship_address? %>
+      <div class="flex items-center">
+        <%= form.check_box :use_shipping, { checked: use_shipping, class: 'checkbox-input', data: { action: 'change->toggle#toggle' } } %>
+        <%= form.label :use_shipping, Spree.t(:use_shipping_address), class: 'ml-1 cursor-pointer select-none' %>
+      </div>
+    <% end %>
     <%= form.fields_for :bill_address do |address_form| %>
       <div class="mt-4 <%= 'hidden' if use_shipping %>" data-toggle-target='toggleable'>
         <%= render partial: 'spree/addresses/form', locals: {

data/app/views/spree/checkout/_payment_methods.html.erb

@@ -66,7 +66,7 @@
             class="btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4"
     >
       <%= render 'button_processing', is_hidden: true %>
-      <%= Spree.t(:pay).titleize %>
+      <%= Spree.t(:pay) %>
     </button>
   </div>
 <% end %>

data/app/views/spree/checkout/_store_credit.html.erb

@@ -11,7 +11,7 @@
           <%= check_box_tag :store_credit, '1', @order.using_store_credit?,
             class: 'input-checkbox !border-neutral-200 rounded-md',
             data: { action: 'auto-submit#submit' } %>
-          <%= Spree.t("store_credit.apply") %>
+          <%= Spree.t(:apply_store_credit) %>
         <% end %>
 
         <div><%= @order.display_total_available_store_credit %></div>

data/app/views/spree/checkout/_summary.html.erb

@@ -47,70 +47,71 @@
                   <span>
                     <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
                   </span>
-                <% end %>
+                </div>
               <% end %>
             <% end %>
-          <% elsif order.state == 'address' %>
-            <div class="flex justify-between items-center mb-2">
-              <span><%= Spree.t(:shipping) %>:</span>
-              <span class="text-xs text-gray-500"><%= Spree.t('storefront.checkout.calculated_at_next_step') %></span>
-            </div>
           <% end %>
+        <% elsif order.state == 'address' %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:shipping) %>:</span>
+            <span class="text-xs text-gray-500"><%= Spree.t('storefront.checkout.calculated_at_next_step') %></span>
+          </div>
+        <% end %>
 
-          <% if order.payment? || order.completed? %>
-            <% cache spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version) do %>
-              <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
-                <div class="flex justify-between items-center mb-2">
-                  <span><%= label %></span>
+        <% if order.payment? || order.completed? %>
+          <% cache spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version) do %>
+            <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+              <div class="flex justify-between items-center mb-2">
+                <span><%= label %></span>
 
-                  <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-                  <span><%= tax_total.to_html %></span>
-                </div>
-              <% end %>
+                <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+                <span><%= tax_total.to_html %></span>
+              </div>
             <% end %>
           <% end %>
+        <% end %>
 
-          <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
-            <% order.adjustments.nonzero.non_tax.eligible.each do |adjustment| %>
-              <div class="flex justify-between items-center mb-2">
+        <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
+          <% order.adjustments.nonzero.non_tax.eligible.each do |adjustment| %>
+            <div class="flex justify-between items-center mb-2">
                 <span>
                   <%= adjustment.label %>:
                 </span>
-                <span>
+              <span>
                   <%= adjustment.display_amount.to_html %>
                 </span>
-              </div>
-            <% end %>
-          <% end %>
-
-          <% if order.respond_to?(:gift_card) && order.gift_card.present? %>
-            <div class="flex justify-between items-center mb-2">
-              <span><%= Spree.t(:gift_card) %>:</span>
-              <span>-<%= order.display_gift_card_total %></span>
-            </div>
-          <% elsif order.using_store_credit? %>
-            <div class="flex justify-between items-center mb-2">
-              <span>Store credit:</span>
-              <span><%= order.display_total_applied_store_credit %></span>
             </div>
           <% end %>
+        <% end %>
 
-          <div>
-            <div class="flex justify-between items-center">
-              <span class="font-bold text-lg"><%= Spree.t(:total) %></span>
-              <div class="">
-                <span class="text-xs mr-1"><%= order.currency.upcase %></span>
-                <span class="font-semibold text-lg inline" id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
+        <% if order.respond_to?(:gift_card) && order.gift_card.present? %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:gift_card) %>:</span>
+            <span>-<%= order.display_gift_card_total %></span>
+          </div>
+        <% elsif order.using_store_credit? %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:store_credit_name) %>:</span>
+            <span><%= order.display_total_applied_store_credit %></span>
+          </div>
+        <% end %>
+
+        <div>
+          <div class="flex justify-between items-center">
+            <span class="font-bold text-lg"><%= Spree.t(:total) %></span>
+            <div class="">
+              <span class="text-xs mr-1"><%= order.currency.upcase %></span>
+              <span class="font-semibold text-lg inline" id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
                   <%= order.display_total_minus_store_credits.to_html %>
                 </span>
-              </div>
             </div>
           </div>
         </div>
-      <% end %>
-
-      <div id="checkout-message" class="mt-8">
-        <%= current_store.checkout_message if current_store.checkout_message.present? %>
       </div>
+    <% end %>
+
+    <div id="checkout-message" class="mt-8">
+      <%= current_store.checkout_message if current_store.checkout_message.present? %>
     </div>
-  <% end %>
+  </div>
+<% end %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -11,7 +11,7 @@
     <div class="form-group mb-3 relative">
       <% options_hash = Rails.env.production? ? {autocomplete: 'off'} : {} %>
       <label for="card_number" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:card_number) %></label>
-      <%= text_field_tag "#{param_prefix}[number]", '', 
+      <%= text_field_tag "#{param_prefix}[number]", '',
           options_hash.merge(
             id: 'card_number',
             data: { card_validation_target: "number" },
@@ -23,7 +23,7 @@
             required: true
           )
       %>
-      <div class="absolute right-2 top-7" 
+      <div class="absolute right-2 top-7"
            data-card-validation-target="typeContainer"
            id="credit-card-type-container">
       </div>
@@ -32,37 +32,37 @@
     <div class="flex gap-3">
       <div class="form-group">
         <label for="card_expiry" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:expiration_date) %></label>
-        <%= text_field_tag "#{param_prefix}[expiry]", '', 
-            id: 'card_expiry', 
+        <%= text_field_tag "#{param_prefix}[expiry]", '',
+            id: 'card_expiry',
             class: 'text-input',
             data: {
               card_validation_target: "expiry"
             },
-            placeholder: "MM/YYYY",
+            placeholder: Spree.t(:card_expiration_placeholder),
             required: true
         %>
       </div>
       <div class="form-group">
         <label for="card_code" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:cvv) %></label>
-        <%= text_field_tag "#{param_prefix}[verification_value]", '', 
+        <%= text_field_tag "#{param_prefix}[verification_value]", '',
             options_hash.merge(
-              id: 'card_code', 
-              class: 'text-input', 
+              id: 'card_code',
+              class: 'text-input',
               data: { card_validation_target: "cvv" },
               size: 4,
               maxlength: 4,
               pattern: '[0-9]*',
               inputmode: 'numeric',
-              placeholder: Spree.t(:cvv), 
+              placeholder: Spree.t(:cvv),
               required: true
-            ) 
+            )
         %>
       </div>
     </div>
 
-    <%= hidden_field_tag "#{param_prefix}[cc_type]", '', 
+    <%= hidden_field_tag "#{param_prefix}[cc_type]", '',
         id: "cc_type",
-        data: { card_validation_target: "ccType" } 
+        data: { card_validation_target: "ccType" }
     %>
 
     <% PaymentIcon.credit_cards.each do |card| %>

data/app/views/spree/checkout/payment/_store_credit.html.erb

@@ -2,12 +2,12 @@
   <div class="d-flex flex-column mb-5" data-hook="checkout_payment_store_credit_success">
     <p class="store-credit-title font-body">
       <% if @order.respond_to?(:gift_card) && @order.gift_card.present? %>
-        <%= Spree.t('storefront.checkout.gift_card_amount_applied', amount: @order.display_gift_card_total, code: @order.gift_card.code) %>
+        <%= Spree.t('storefront.checkout.gift_card_amount_applied', amount: @order.display_gift_card_total, code: @order.gift_card.code.upcase) %>
       <% else %>
         <%= Spree.t('storefront.checkout.store_credits_amount_applied', amount: @order.display_total_applicable_store_credit.abs) %>
       <% end %>
 
-      <%= Spree.t('storefront.checkout.you_will_need_to_pay_only', amount: @order.display_total_minus_store_credits) %>
+      <%= Spree.t('storefront.checkout.you_will_need_to_pay_only', amount: @order.display_total_minus_store_credits) if @order.total_minus_store_credits.positive? %>
     </p>
   </div>
 <% end %>

data/app/views/spree/checkout/update.turbo_stream.erb

@@ -2,9 +2,7 @@
   <%= render 'summary', order: @order %>
 <% end %>
 <%= turbo_stream.replace :checkout_lock_version do %>
-  <%= turbo_frame_tag :checkout_lock_version do %>
-    <%= hidden_field_tag 'order[state_lock_version]', @order.state_lock_version %>
-  <% end %>
+  <%= render 'spree/checkout/order_lock_version', order: @order %>
 <% end %>
 <%= turbo_stream.update 'summary-order-total' do %>
   <%= @order.display_total.to_html %>

data/app/views/spree/line_items/destroy.turbo_stream.erb

@@ -1,13 +1,17 @@
-<%= turbo_stream.replace_all '.cart-contents' do %>
-  <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
-    <% if @order.line_items.empty? %>
-      <%= render 'spree/orders/empty' %>
-    <% else %>
-      <%= render 'spree/orders/cart' %>
-    <% end %>
+<% if flash[:error] %>
+  <%= spree_turbo_update_flashes %>
+<% else %>
+  <%= turbo_stream.replace_all '.cart-contents' do %>
+    <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
+      <% if @order.line_items.empty? %>
+        <%= render 'spree/orders/empty' %>
+      <% else %>
+        <%= render 'spree/orders/cart' %>
+      <% end %>
 
-    <%= render_storefront_partials(:remove_from_cart_partials) %>
+      <%= render_storefront_partials(:remove_from_cart_partials) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= spree_turbo_update_cart(@order) %>
+  <%= spree_turbo_update_cart(@order) %>
+<% end %>

data/app/views/spree/seo/sitemap.xml.erb

@@ -12,8 +12,8 @@
     <% end %>
   <% end %>
 
-  <% cache [current_store.products, current_currency] do %>
-    <% current_store.products.active(current_currency).find_each do |product| %>
+  <% cache [storefront_products_scope, current_currency] do %>
+    <% storefront_products_scope.find_each do |product| %>
       <url>
         <loc><%= spree_storefront_resource_url(product) %></loc>
         <lastmod><%= product.updated_at.strftime('%Y-%m-%d') %></lastmod>

data/app/views/themes/default/spree/account/_order.html.erb

@@ -8,16 +8,16 @@
       <% if order.payment_state == 'void' %>
         <% if order.order_refunded? %>
           <span class="badge-refunded">
-            <%= Spree.t("payment_states.refunded").titleize %>
+            <%= Spree.t("payment_states.refunded") %>
           </span>
         <% else %>
           <span class="badge-void">
-            <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+            <%= Spree.t("payment_states.#{order.payment_state}") %>
           </span>
         <% end %>
       <% else %>
         <span class="badge-success">
-          <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+          <%= Spree.t("payment_states.#{order.payment_state}") %>
         </span>
       <% end %>
     <% end %>
@@ -26,11 +26,11 @@
     <% if order.shipment_state %>
       <% if order.shipment_state == 'shipped' %>
         <span class="badge-success">
-          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+          <%= Spree.t("shipment_states.#{order.shipment_state}") %>
         </span>
       <% else %>
         <span class="badge-<%= order.shipment_state %>">
-          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+          <%= Spree.t("shipment_states.#{order.shipment_state}") %>
         </span>
       <% end %>
     <% end %>

data/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb

@@ -0,0 +1,26 @@
+<tr class="flex flex-wrap w-full md:table-row md:h-[72px] border border-accent md:border-none mb-4 p-4 md:p-0 hover:bg-accent-100" id="<%= dom_id(gift_card) %>">
+  <td class="mb-4 w-full md:w-auto md:px-4 md:border-y border-accent md:border-l font-medium">
+    <%= gift_card.code.upcase %>
+  </td>
+
+  <td class="mb-4 w-full md:w-auto md:px-4 md:border-y border-accent">
+    <span class="<%= gift_card.active? ? 'badge-active' : 'badge-inactive'%>">
+      <%= gift_card.display_state.titleize %>
+    </span>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:amount) %>:</span>
+    <%= gift_card.display_amount %>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:used) %>:</span>
+    <%= gift_card.display_amount_used %>
+  </td>
+
+  <td class="w-full md:w-auto md:px-4 md:border-y md:border-r border-accent">
+    <span class="md:hidden font-medium mr-1"><%= Spree.t(:expires_at) %>:</span>
+    <%= gift_card.expires_at.present? ? local_date(gift_card.expires_at) : '-' %>
+  </td>
+</tr>

data/app/views/themes/default/spree/account/gift_cards/index.html.erb

@@ -0,0 +1,30 @@
+<div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6">
+  <div class="lg:col-span-3">
+    <%= render 'spree/account/account_nav', current: 'gift_cards' %>
+  </div>
+  <div class="lg:col-span-8 lg:col-start-5">
+    <h1 class="font-medium mb-4">
+      <%= Spree.t(:gift_cards) %>
+    </h1>
+    <% if @gift_cards.any? %>
+      <table class="inline-table md:table table-auto overflow-scroll w-full text-sm border-separate border-spacing-y-4 mb-24 mt-4">
+        <thead class="hidden md:table-row-group">
+          <tr class="text-left text-neutral text-xs">
+            <th class="font-normal px-4"><%= Spree.t(:code) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:status) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:amount) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:used) %></th>
+            <th class="font-normal px-4"><%= Spree.t(:expires_at) %></th>
+          </tr>
+        </thead>
+        <tbody class="block md:table-row-group">
+          <%= render collection: @gift_cards, partial: 'spree/account/gift_cards/gift_card', cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    <% else %>
+      <div class="text-center my-16 lg:my14">
+        <p class="mb-2 font-medium uppercase"><%= Spree.t('storefront.account.no_gift_cards') %></p>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/themes/default/spree/checkout/complete.html.erb

@@ -24,7 +24,7 @@
       <div class="mt-3 border-t pt-3">
         <span class="text-sm"><%= Spree.t(:status) %></span>
         <% if @order.payment_state.present? %>
-          <span class="badge-<%= @order.payment_state %>"><%= Spree.t("payment_states.#{@order.payment_state}").titleize %></span>
+          <span class="badge-<%= @order.payment_state %>"><%= Spree.t("payment_states.#{@order.payment_state}") %></span>
         <% else %>
           <span class="badge-pending"><%= Spree.t(:pending) %></span>
         <% end %>

data/app/views/themes/default/spree/orders/_line_item.html.erb

@@ -1,5 +1,5 @@
-<%= turbo_frame_tag dom_id(line_item), data: { controller: 'reveal' } do %>
-  <li class="cart-line-item flex items-top py-6 px-4 w-full" data-reveal-target="item">
+<%= turbo_frame_tag dom_id(line_item) do %>
+  <li class="cart-line-item flex items-top py-6 px-4 w-full">
     <div class="line-item-overlay"></div>
       <div class="cart-product-image flex-shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
         <% image = line_item.variant.default_image %>
@@ -14,7 +14,7 @@
           <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-text', data: { 'turbo-frame': '_top' } %>
 
           <%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), method: :delete, data: { controller: 'turbo-stream-form' } do |item_form| %>
-            <%= button_tag type: :submit, class: 'remove-line-item-button h-100', data: { action: "click->reveal#hide click->cart#disableCart" } do %>
+            <%= button_tag type: :submit, class: 'remove-line-item-button h-100', data: { action: "click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart" } do %>
               <%= render 'spree/shared/icons/cross', size: 16 %>
             <% end %>
           <% end %>

data/app/views/themes/default/spree/page_sections/_featured_posts.html.erb

@@ -0,0 +1,56 @@
+<div style='<%= section_styles(section) %>' class='animate-fadeIn'>
+  <div class='page-container'>
+    <% heading_size =
+      case section.preferred_heading_size
+      when "small"
+        "text-base font-medium"
+      when "medium"
+        "text-lg lg:text-xl font-medium"
+      when "large"
+        "text-xl lg:text-2xl font-medium"
+      end %>
+    <% if section.preferred_heading.present? %>
+      <div class='mb-8 flex flex-col'>
+        <h3
+          class='
+            <%= heading_size %> featured-taxon--title font-medium
+            text-<%= section.preferred_heading_alignment %>
+          '
+          data-title="<%= section.preferred_heading.downcase %>"
+          style='<%= section_heading_styles(section) %>'
+        >
+          <%= section.preferred_heading %>
+        </h3>
+
+        <% if section.description.present? %>
+          <div class='pt-4 text-<%= section.preferred_description_alignment %>'>
+            <%= section.description %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+    <div class='flex h-full relative'>
+      <div
+        class='
+          swiper-container overflow-hidden flex-1 pr-8 lg:pr-0 -mx-4 lg:mx-0 flex flex-col
+          lg:flex-col-reverse
+        '
+        data-controller='carousel'
+        data-carousel-options-value='{ "slidesPerView": 1, "centeredSlides": false, "spaceBetween": 16, "grabCursor": true, "breakpoints": { "768": { "slidesPerView": 3, "spaceBetween": 24 } }, "navigation": { "nextEl": ".swiper-custom-button-next-<%= section.id %>", "prevEl": ".swiper-custom-button-prev-<%= section.id %>" } }'
+      >
+        <div class='swiper-wrapper px-4 lg:px-0 h-auto'>
+          <%= render partial: "spree/posts/post",
+          collection: section.posts,
+          cached: spree_base_cache_scope,
+          as: :post %>
+        </div>
+        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block top-[100px]", aria: { label: "Previous posts" }, style: "transform: translate(-50%, -50%);" do %>
+          <%= render "spree/shared/icons/chevron" %>
+        <% end %>
+        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block top-[100px]", aria: { label: "Next posts" }, style: "transform: translate(50%, -50%);" do %>
+          <%= render "spree/shared/icons/chevron_right" %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/themes/default/spree/page_sections/_featured_product.html.erb

@@ -89,7 +89,7 @@
                           <% if presenter.product %>
                             <div class="absolute flex" data-controller="copy-input">
                               <div class="has-float-label flex flex-col max-w-[200px]">
-                                <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %>
+                                <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url_or_custom_domain), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %>
                                 <%= label_tag "product-#{presenter.product.id}-share-link", Spree.t(:link) %>
                               </div>
                               <button