spree_core 4.1.8 → 4.2.0.rc1

data/app/presenters/spree/variant_presenter.rb

@@ -3,19 +3,23 @@ module Spree
     include Rails.application.routes.url_helpers
     include Spree::BaseHelper
 
-    attr_reader :current_currency, :current_price_options
+    attr_reader :current_currency, :current_price_options, :current_store
 
     def initialize(opts = {})
       @variants = opts[:variants]
       @is_product_available_in_currency = opts[:is_product_available_in_currency]
       @current_currency = opts[:current_currency]
       @current_price_options = opts[:current_price_options]
+      @current_store = opts[:current_store]
     end
 
     def call
       @variants.map do |variant|
         {
           display_price: display_price(variant),
+          price: variant.price_in(current_currency),
+          display_compare_at_price: display_compare_at_price(variant),
+          should_display_compare_at_price: should_display_compare_at_price(variant),
           is_product_available_in_currency: @is_product_available_in_currency,
           backorderable: backorderable?(variant),
           in_stock: in_stock?(variant),
@@ -71,5 +75,9 @@ module Spree
         purchasable: variant.purchasable?
       }
     end
+
+    def should_display_compare_at_price(variant)
+      variant.compare_at_price.present? && variant.compare_at_price > variant.price
+    end
   end
 end

data/app/presenters/spree/variants/option_types_presenter.rb

@@ -76,6 +76,7 @@ module Spree
             id: option_value.id,
             position: option_value.position,
             presentation: option_value.presentation,
+            name: option_value.name,
             variant_id: option_value.variants.where(id: @variant_ids).order(:position).first.id,
             is_default: option_value == default_variant_data[:option_value]
           }

data/app/services/spree/account/addresses/base.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Account
+    module Addresses
+      class Base
+        prepend Spree::ServiceModule::Base
+
+        private
+
+        attr_accessor :country
+
+        def fill_country_and_state_ids(params)
+          replace_country_iso_with_id(params)
+          fill_state_id(params)
+        end
+
+        def replace_country_iso_with_id(params)
+          iso = params[:country_iso]
+          return params unless iso.present?
+
+          country = Spree::Country.by_iso(iso)
+          params[:country_id] = country&.id
+          params.delete(:country_iso)
+          params
+        end
+
+        def fill_state_id(params)
+          state_name = params[:state_name]
+          return params unless state_name.present?
+
+          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
+          return params unless country
+
+          params[:state_id] = country.states.find_by(name: state_name)&.id
+          params
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/create.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Create < ::Spree::Account::Addresses::Base
+        def call(user:, address_params:)
+          fill_country_and_state_ids(address_params)
+
+          address = user.addresses.new(address_params)
+          if address.save
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/update.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Update < ::Spree::Account::Addresses::Base
+        def call(address:, address_params:)
+          address_params[:country_id] ||= address.country_id
+          fill_country_and_state_ids(address_params)
+
+          if address.update(address_params)
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/checkout/update.rb

@@ -4,8 +4,12 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
-        params = replace_country_iso_with_id(params, 'ship') if address_with_country_iso_present?(params, 'ship')
-        params = replace_country_iso_with_id(params, 'bill') if address_with_country_iso_present?(params, 'bill')
+        ship_changed = address_with_country_iso_present?(params, 'ship')
+        bill_changed = address_with_country_iso_present?(params, 'bill')
+        params = replace_country_iso_with_id(params, 'ship') if ship_changed
+        params = replace_country_iso_with_id(params, 'bill') if bill_changed
+        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
+        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -20,6 +24,13 @@ module Spree
         true
       end
 
+      def selected_shipping_rate_present?(params)
+        shipments_attributes = params.dig(:order, :shipments_attributes)
+        return false unless shipments_attributes
+
+        shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
+      end
+
       def replace_country_iso_with_id(params, address_kind = 'ship')
         country_id = Spree::Country.by_iso(params[:order]["#{address_kind}_address_attributes"].fetch(:country_iso))&.id
 

data/app/views/layouts/spree/base_mailer.html.erb

@@ -1,41 +1,46 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="viewport" content="width=device-width"/>
-		<%= render partial: 'spree/shared/base_mailer_stylesheets' %>
-	</head>
-	<body>
-	  <table class="body">
-	    <tr>
-	      <td class="center" align="center" valign="top">
-	        <center>
-	          <%= render partial: 'spree/shared/base_mailer_header' %>
-	          <table class="container">
-	            <tr>
-	              <td>
-	                <table class="row">
-	                  <tr>
-	                    <td class="wrapper last">
-	                      <table class="twelve columns">
-	                        <tr>
-	                          <td>
-	                            <%= yield %>
-	                          </td>
-	                          <td class="expander"></td>
-	                        </tr>
-	                      </table>
-	                    </td>
-	                  </tr>
-	                </table>
-	                <%= render partial: 'spree/shared/base_mailer_footer' %>
-	              <!-- container end below -->
-	              </td>
-	            </tr>
-	          </table>
-	        </center>
-	      </td>
-	    </tr>
-	  </table>
-	</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="x-apple-disable-message-reformatting"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+    <%= render partial: 'spree/shared/base_mailer_stylesheets' %>
+  </head>
+  <body>
+    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+      <tr>
+        <td align="center">
+          <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+            <%= render partial: 'spree/shared/base_mailer_header' %>
+            <!-- Email Body -->
+            <tr>
+              <td class="email-body" width="570" cellpadding="0" cellspacing="0">
+                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+                  <!-- Body content -->
+                  <tbody>
+                  <tr>
+                    <td class="content-cell">
+                      <div class="f-fallback">
+                        <%= yield %>
+                      </div>
+                    </td>
+                  </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <%= render partial: 'spree/shared/base_mailer_footer' %>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="60px">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
 </html>

data/app/views/spree/order_mailer/cancel_email.html.erb

@@ -1,30 +1,24 @@
-<table class="row header">
+<h1>
+  <%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
+</h1>
+<p>
+  <%= Spree.t('order_mailer.cancel_email.instructions') %>
+</p>
+
+<table class="purchase" role="presentation">
   <tr>
     <td>
-      <p class="lede">
-        <%= Spree.t('order_mailer.cancel_email.dear_customer') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.cancel_email.instructions') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>
-      </p>
-      <table class="container">
-        <tr>
-          <td class="wrapper last">
-            <table class="twelve columns">
-              <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
-              <%= render 'spree/order_mailer/subtotal', order: @order %>
-              <% @order.adjustments.eligible.each do |adjustment| %>
-                <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
-              <% end %>
-              <%= render 'spree/order_mailer/total', order: @order %>
-            </table>
-          </td>
-        </tr>
-      </table>
+      <h3> <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
     </td>
-    <td class="expander"></td>
   </tr>
 </table>
+<p>
+  <%= Spree.t('order_mailer.cancel_email.thanks') %>
+  <br />
+  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('order_mailer.cancel_email.dear_customer') %>
+<%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
 
 <%= Spree.t('order_mailer.cancel_email.instructions') %>
 
@@ -10,7 +10,29 @@
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
+<% if @order.line_item_adjustments.exists? %>
+  <% if @order.all_adjustments.promotion.eligible.exists? %>
+    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+      <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
+<% end %>
+
+<% if @order.all_adjustments.eligible.tax.exists? %>
+  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+    <%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+  <% end %>
+<% end %>
+
 <% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
+  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+  <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>
+============================================================
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
+<%= Spree.t('order_mailer.cancel_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -1,70 +1,23 @@
-<table class="row header">
+<h1>
+  <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
+</h1>
+<p>
+  <%= Spree.t('order_mailer.confirm_email.instructions') %>
+</p>
+<table class="purchase" role="presentation">
   <tr>
     <td>
-      <p class="lede">
-        <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.instructions') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
-      </p>
-      <table class="container">
-        <tr>
-          <td class="wrapper last">
-            <table class="twelve columns">
-              <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
-              <%= render 'spree/order_mailer/subtotal', order: @order %>
-              <% if @order.line_item_adjustments.exists? %>
-                <% if @order.all_adjustments.promotion.eligible.exists? %>
-                  <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-                    <tr>
-                      <td class="six sub-columns">
-                        <%= Spree.t(:promotion) %> <%= label %>:
-                      </td>
-                      <td class="six sub-columns last right">
-                        <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
-                      </td>
-                    </tr>
-                  <% end %>
-                <% end %>
-              <% end %>
-              <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
-                <tr>
-                  <td class="six sub-columns">
-                    <%= Spree.t(:shipping) %> <%= name %>:
-                  </td>
-                  <td class="six sub-columns last right">
-                    <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
-                  </td>
-                </tr>
-              <% end %>
-              <% if @order.all_adjustments.eligible.tax.exists? %>
-                <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
-                  <tr>
-                    <td class="six sub-columns">
-                      <%= Spree.t(:tax) %> <%= label %>:
-                    </td>
-                    <td class="six sub-columns last right">
-                      <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
-                    </td>
-                  </tr>
-                <% end %>
-              <% end %>
-              <% @order.adjustments.eligible.each do |adjustment| %>
-                <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
-                <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
-              <% end %>
-              <%= render 'spree/order_mailer/total', order: @order %>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.thanks') %>
-      </p>
+      <h3><%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
     </td>
-    <td class="expander"></td>
   </tr>
 </table>
+<p>
+  <%= Spree.t('order_mailer.confirm_email.thanks') %>
+  <br />
+  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('order_mailer.confirm_email.dear_customer') %>
+<%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
 
 <%= Spree.t('order_mailer.confirm_email.instructions') %>
 
@@ -36,3 +36,4 @@
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
 
 <%= Spree.t('order_mailer.confirm_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/order_mailer/store_owner_notification_email.html.erb

@@ -0,0 +1,23 @@
+<h1>
+  <%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
+</h1>
+<p>
+  <%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
+</p>
+<table class="purchase" role="presentation">
+  <tr>
+    <td>
+      <h3><%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
+    </td>
+  </tr>
+</table>
+<p>
+  <%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
+  <br />
+  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
+</p>