spree_core 4.1.14 → 4.2.0.beta

data/app/models/spree/price.rb

@@ -15,10 +15,16 @@ module Spree
       less_than_or_equal_to: MAXIMUM_AMOUNT
     }
 
+    validates :compare_at_amount, allow_nil: true, numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: MAXIMUM_AMOUNT
+    }
+
     extend DisplayMoney
-    money_methods :amount, :price
+    money_methods :amount, :price, :compare_at_amount
+    alias display_compare_at_price display_compare_at_amount
 
-    self.whitelisted_ransackable_attributes = ['amount']
+    self.whitelisted_ransackable_attributes = ['amount', 'compare_at_amount']
 
     def money
       Spree::Money.new(amount || 0, currency: currency)
@@ -28,17 +34,35 @@ module Spree
       self[:amount] = Spree::LocalizedNumber.parse(amount)
     end
 
+    def compare_at_money
+      Spree::Money.new(compare_at_amount || 0, currency: currency)
+    end
+
+    def compare_at_amount=(compare_at_amount)
+      self[:compare_at_amount] = Spree::LocalizedNumber.parse(compare_at_amount)
+    end
+
     alias_attribute :price, :amount
+    alias_attribute :compare_at_price, :compare_at_amount
 
     def price_including_vat_for(price_options)
       options = price_options.merge(tax_category: variant.tax_category)
       gross_amount(price, options)
     end
 
+    def compare_at_price_including_vat_for(price_options)
+      options = price_options.merge(tax_category: variant.tax_category)
+      gross_amount(compare_at_price, options)
+    end
+
     def display_price_including_vat_for(price_options)
       Spree::Money.new(price_including_vat_for(price_options), currency: currency)
     end
 
+    def display_compare_at_price_including_vat_for(price_options)
+      Spree::Money.new(compare_at_price_including_vat_for(price_options), currency: currency)
+    end
+
     # Remove variant default_scope `deleted_at: nil`
     def variant
       Spree::Variant.unscoped { super }

data/app/models/spree/product.rb

@@ -113,17 +113,17 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
-    self.whitelisted_ransackable_scopes = %w[not_discontinued]
+    self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name]
 
     [
       :sku, :price, :currency, :weight, :height, :width, :depth, :is_master,
-      :cost_currency, :price_in, :amount_in, :cost_price
+      :cost_currency, :price_in, :amount_in, :cost_price, :compare_at_price
     ].each do |method_name|
       delegate method_name, :"#{method_name}=", to: :find_or_build_master
     end
 
     delegate :display_amount, :display_price, :has_default_price?,
-             :images, to: :find_or_build_master
+             :display_compare_at_price, :images, to: :find_or_build_master
 
     alias master_images images
 
@@ -160,10 +160,8 @@ module Spree
     #
     # @return [Spree::Variant]
     def default_variant
-      track_inventory = Spree::Config[:track_inventory_levels]
-
-      Rails.cache.fetch("spree/default-variant/#{cache_key_with_version}/#{track_inventory}") do
-        if track_inventory && variants.in_stock_or_backorderable.any?
+      Rails.cache.fetch(default_variant_cache_key) do
+        if Spree::Config[:track_inventory_levels] && variants.in_stock_or_backorderable.any?
           variants.in_stock_or_backorderable.first
         else
           has_variants? ? variants.first : master
@@ -252,6 +250,14 @@ module Spree
       where conditions.inject(:or)
     end
 
+    def self.search_by_name(query)
+      if defined?(SpreeGlobalize)
+        joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
+      else
+        where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
+      end
+    end
+
     # Suitable for displaying only variants that has at least one option value.
     # There may be scenarios where an option type is removed and along with it
     # all option values. At that point all variants associated with only those
@@ -344,6 +350,10 @@ module Spree
       save
     end
 
+    def default_variant_cache_key
+      "spree/default-variant/#{cache_key_with_version}/#{Spree::Config[:track_inventory_levels]}"
+    end
+
     def ensure_master
       return unless new_record?
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,9 +25,10 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
+
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
-          order.order_promotions.find_by!(promotion_id: promotion.id).destroy
+          order.order_promotions.where(promotion_id: promotion.id).destroy_all
 
           remove_promotion_adjustments(promotion)
           remove_promotion_line_items(promotion)
@@ -75,7 +76,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/reimbursement.rb

@@ -60,6 +60,8 @@ module Spree
     class_attribute :reimbursement_failure_hooks
     self.reimbursement_failure_hooks = []
 
+    delegate :store, :currency, to: :order
+
     state_machine :reimbursement_status, initial: :pending do
       event :errored do
         transition to: :errored, from: :pending

data/app/models/spree/shipment.rb

@@ -42,6 +42,8 @@ module Spree
     scope :reverse_chronological, -> { order(Arel.sql('coalesce(spree_shipments.shipped_at, spree_shipments.created_at) desc'), id: :desc) }
     scope :valid, -> { where.not(state: :canceled) }
 
+    delegate :store, :currency, to: :order
+
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :pending, use_transactions: false do
       event :ready do
@@ -104,11 +106,6 @@ module Spree
       inventory_units.any?(&:backordered?)
     end
 
-    # TODO: delegate currency to Order, order.currency is mandatory
-    def currency
-      order ? order.currency : Spree::Config[:currency]
-    end
-
     # Determines the appropriate +state+ according to the following logic:
     #
     # pending    unless order is complete and +order.payment_state+ is +paid+

data/app/models/spree/stock_location.rb

@@ -106,8 +106,19 @@ module Spree
     private
 
     def create_stock_items
-      Variant.includes(:product).find_each do |variant|
-        propagate_variant(variant)
+      variants_scope = Spree::Variant
+      prepared_stock_items = variants_scope.ids.map do |variant_id|
+        Hash[
+          'stock_location_id', id,
+          'variant_id', variant_id,
+          'backorderable', backorderable_default,
+          'created_at', Time.current,
+          'updated_at', Time.current
+        ]
+      end
+      if prepared_stock_items.any?
+        stock_items.insert_all(prepared_stock_items)
+        variants_scope.touch_all
       end
     end
 

data/app/models/spree/store.rb

@@ -2,12 +2,23 @@ module Spree
   class Store < Spree::Base
     has_many :orders, class_name: 'Spree::Order'
     has_many :payment_methods, class_name: 'Spree::PaymentMethod'
+    belongs_to :default_country, class_name: 'Spree::Country'
 
     with_options presence: true do
-      validates :name, :url, :mail_from_address
-      validates :default_currency
+      validates :name, :url, :mail_from_address, :default_currency, :code
     end
 
+    validates :code, uniqueness: true
+
+    if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
+        connected? &&
+        table_exists? &&
+        connection.column_exists?(:spree_stores, :new_order_notifications_email)
+      validates :new_order_notifications_email, email: { allow_blank: true }
+    end
+
+    has_one_attached :logo
+
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
@@ -26,6 +37,12 @@ module Spree
       end
     end
 
+    def supported_currencies_list
+      (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
+        ::Money::Currency.find(code.strip)
+      end.uniq.compact
+    end
+
     private
 
     def ensure_default_exists_and_is_unique

data/app/models/spree/variant.rb

@@ -103,10 +103,19 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
-    self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont)
+    self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
 
     def self.product_name_or_sku_cont(query)
-      joins(:product).where("#{Product.table_name}.name LIKE :query OR sku LIKE :query", query: "%#{query}%")
+      joins(:product).where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query) OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+    end
+
+    def self.search_by_product_name_or_sku(query)
+      if defined?(SpreeGlobalize)
+        joins(product: :translations).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query) OR LOWER(sku) LIKE LOWER(:query)",
+                                            query: "%#{query}%")
+      else
+        product_name_or_sku_cont(query)
+      end
     end
 
     def available?
@@ -223,6 +232,10 @@ module Spree
       end.sum
     end
 
+    def compare_at_price
+      price_in(cost_currency).try(:compare_at_amount)
+    end
+
     def name_and_sku
       "#{name} - #{sku}"
     end

data/app/presenters/spree/variant_presenter.rb

@@ -16,6 +16,9 @@ module Spree
       @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 +74,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/checkout/update.rb

@@ -4,12 +4,8 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
-        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')
+        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')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -24,13 +20,6 @@ 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>