solidus_core 2.4.2 → 2.5.0.beta1

data/app/models/spree/tax_rate.rb

@@ -1,9 +1,16 @@
+require 'discard'
+
 module Spree
   class TaxRate < Spree::Base
     acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
 
     # Need to deal with adjustments before calculator is destroyed.
-    before_destroy :deals_with_adjustments_for_deleted_source
+    before_destroy :remove_adjustments_from_incomplete_orders
+    before_discard :remove_adjustments_from_incomplete_orders
 
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
@@ -102,9 +109,9 @@ module Spree
     end
 
     def adjustment_label(amount)
-      Spree.t(
+      I18n.t(
         translation_key(amount),
-        scope: "adjustment_labels.tax_rates",
+        scope: "spree.adjustment_labels.tax_rates",
         name: name.presence || tax_categories.map(&:name).join(", "),
         amount: amount_for_adjustment_label
       )

data/app/models/spree/taxon.rb

@@ -37,9 +37,6 @@ module Spree
     # @return [Array] filters that should be used for a taxon
     def applicable_filters
       fs = []
-      # fs << ProductFilters.taxons_below(self)
-      ## unless it's a root taxon? left open for demo purposes
-
       fs << Spree::Core::ProductFilters.price_filter if Spree::Core::ProductFilters.respond_to?(:price_filter)
       fs << Spree::Core::ProductFilters.brand_filter if Spree::Core::ProductFilters.respond_to?(:brand_filter)
       fs
@@ -59,7 +56,7 @@ module Spree
     # name and its parents permalink (if present.)
     def set_permalink
       permalink_tail = permalink.split('/').last if permalink.present?
-      permalink_tail ||= name.to_url
+      permalink_tail ||= Spree::Config.taxon_url_parametizer_class.parameterize(name)
       self.permalink_part = permalink_tail
     end
 
@@ -87,6 +84,19 @@ module Spree
       products.not_deleted.available
     end
 
+    # @return [ActiveRecord::Relation<Spree::Product>] all self and descendant products
+    def all_products
+      scope = Product.joins(:taxons)
+      scope.where(
+        spree_taxons: { id: self_and_descendants.select(:id) }
+      )
+    end
+
+    # @return [ActiveRecord::Relation<Spree::Variant>] all self and descendant variants, including master variants.
+    def all_variants
+      Variant.where(product_id: all_products.select(:id))
+    end
+
     # @return [String] this taxon's ancestors names followed by its own name,
     #   separated by arrows
     def pretty_name

data/app/models/spree/taxonomy.rb

@@ -9,7 +9,7 @@ module Spree
 
     after_save :set_name
 
-    default_scope -> { order(:position) }
+    default_scope -> { order(position: :asc) }
 
     private
 

data/app/models/spree/unit_cancel.rb

@@ -20,7 +20,7 @@ class Spree::UnitCancel < Spree::Base
       source: self,
       amount: amount,
       order: inventory_unit.order,
-      label: "#{Spree.t(:cancellation)} - #{reason}",
+      label: "#{I18n.t('spree.cancellation')} - #{reason}",
       eligible: true,
       finalized: true
     )

data/app/models/spree/variant.rb

@@ -1,3 +1,5 @@
+require 'discard'
+
 module Spree
   # == Master Variant
   #
@@ -14,9 +16,21 @@ module Spree
   # option values and may have inventory units. Sum of on_hand each variant's
   # inventory level determine "on_hand" level for the product.
   class Variant < Spree::Base
-    acts_as_paranoid
     acts_as_list scope: :product
 
+    acts_as_paranoid
+    include Spree::ParanoiaDeprecations
+
+    include Discard::Model
+    self.discard_column = :deleted_at
+
+    after_discard do
+      stock_items.discard_all
+      images.destroy_all
+      prices.discard_all
+      currently_valid_prices.discard_all
+    end
+
     attr_writer :rebuild_vat_prices
     include Spree::DefaultPrice
 
@@ -78,6 +92,8 @@ module Spree
     # a parameter, the scope is limited to variants that are in stock in the
     # provided stock locations.
     #
+    # If you want to also include backorderable variants see {[suppliable}}
+    #
     # @param stock_locations [Array<Spree::StockLocation>] the stock locations to check
     # @return [ActiveRecord::Relation]
     def self.in_stock(stock_locations = nil)
@@ -89,6 +105,22 @@ module Spree
       in_stock_variants
     end
 
+    # Returns a scope of Variants which are suppliable. This includes:
+    # * in_stock variants
+    # * backorderable variants
+    # * variants which do not track stock
+    #
+    # @return [ActiveRecord::Relation]
+    def self.suppliable
+      return all unless Spree::Config.track_inventory_levels
+      arel_conditions = [
+        arel_table[:track_inventory].eq(false),
+        Spree::StockItem.arel_table[:count_on_hand].gt(0),
+        Spree::StockItem.arel_table[:backorderable].eq(true)
+      ]
+      joins(:stock_items).where(arel_conditions.inject(:or))
+    end
+
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
 

data/app/models/spree/variant/price_selector.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Variant
+  class Variant < Spree::Base
     # This class is responsible for selecting a price for a variant given certain pricing options.
     # A variant can have multiple or even dynamic prices. The `price_for`
     # method determines which price applies under the given circumstances.

data/app/models/spree/variant/pricing_options.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Variant
+  class Variant < Spree::Base
     # Instances of this class represent the set of circumstances that influence how expensive a
     # variant is. For this particular pricing options class, country_iso and currency influence
     # the price of a variant.

data/app/models/spree/variant/scopes.rb

@@ -2,7 +2,7 @@ module Spree
   class Variant < Spree::Base
     # FIXME: WARNING tested only under sqlite and postgresql
     scope :descend_by_popularity, -> {
-      order("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC")
+      order(Arel.sql("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC"))
     }
 
     class << self

data/app/models/spree/variant/vat_price_generator.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Variant
+  class Variant < Spree::Base
     # This class generates gross prices for all countries that have VAT configured.
     # The prices will include their respective VAT rates. It will also generate an
     # export (net) price for any country that doesn't have VAT.

data/app/views/spree/carton_mailer/shipped_email.html.erb

@@ -2,13 +2,13 @@
   <tr>
     <td>
       <p class="lede">
-        <%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
+        <%= t('spree.shipment_mailer.shipped_email.dear_customer') %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+        <%= t('spree.shipment_mailer.shipped_email.instructions') %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
+        <%= t('spree.shipment_mailer.shipped_email.shipment_summary') %>
       </p>
       <table>
         <% @manifest.each do |item| %>
@@ -20,13 +20,13 @@
         <% end %>
       </table>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @carton.tracking) if @carton.tracking %>
+        <%= t('spree.shipment_mailer.shipped_email.track_information', tracking: @carton.tracking) if @carton.tracking %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @carton.tracking_url) if @carton.tracking_url %>
+        <%= t('spree.shipment_mailer.shipped_email.track_link', url: @carton.tracking_url) if @carton.tracking_url %>
       </p>
       <p>
-        <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
+        <%= t('spree.shipment_mailer.shipped_email.thanks') %>
       </p>
     </td>
     <td class="expander"></td>

data/app/views/spree/carton_mailer/shipped_email.text.erb

@@ -1,16 +1,16 @@
-<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
+<%= t('spree.shipment_mailer.shipped_email.dear_customer') %>
 
-<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+<%= t('spree.shipment_mailer.shipped_email.instructions') %>
 
 ============================================================
-<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
+<%= t('spree.shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
 <% @manifest.each do |item| %>
   <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
 <% end %>
 ============================================================
 
-<%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @carton.tracking)     if @carton.tracking %>
-<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @carton.tracking_url) if @carton.tracking_url %>
+<%= t('spree.shipment_mailer.shipped_email.track_information', tracking: @carton.tracking) if @carton.tracking %>
+<%= t('spree.shipment_mailer.shipped_email.track_link', url: @carton.tracking_url) if @carton.tracking_url %>
 
-<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
+<%= t('spree.shipment_mailer.shipped_email.thanks') %>

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

@@ -2,13 +2,13 @@
   <tr>
     <td>
       <p class="lede">
-        <%= Spree.t('order_mailer.cancel_email.dear_customer') %>
+        <%= t('.dear_customer') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.cancel_email.instructions') %>
+        <%= t('.instructions') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
+        <%= t('.order_summary_canceled') %>
       </p>
       <table>
         <% @order.line_items.each do |item| %>
@@ -23,7 +23,7 @@
         <% end %>
         <tr>
           <td></td>
-          <td><%= Spree.t('order_mailer.cancel_email.subtotal') %></td>
+          <td><%= t('.subtotal') %></td>
           <td><%= @order.display_item_total %></td>
         </tr>
         <% @order.adjustments.eligible.each do |adjustment| %>
@@ -35,7 +35,7 @@
         <% end %>
         <tr>
           <td></td>
-          <td><%= Spree.t('order_mailer.cancel_email.total') %></td>
+          <td><%= t('.total') %></td>
           <td><%= @order.display_total %></td>
         </tr>
       </table>

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

@@ -1,16 +1,16 @@
-<%= Spree.t('order_mailer.cancel_email.dear_customer') %>
+<%= t('.dear_customer') %>
 
-<%= Spree.t('order_mailer.cancel_email.instructions') %>
+<%= t('.instructions') %>
 
 ============================================================
-<%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
+<%= t('.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>
+<%= t('.subtotal') %> <%= @order.display_item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-<%= Spree.t('order_mailer.cancel_email.total') %> <%= @order.display_total %>
+<%= t('.total') %> <%= @order.display_total %>

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

@@ -2,13 +2,13 @@
   <tr>
     <td>
       <p class="lede">
-        <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
+        <%= t('.dear_customer') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.confirm_email.instructions') %>
+        <%= t('.instructions') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.confirm_email.order_summary') %>
+        <%= t('.order_summary') %>
       </p>
       <table>
         <% @order.line_items.each do |item| %>
@@ -24,7 +24,7 @@
         <tr>
           <td></td>
           <td>
-            <%= Spree.t('order_mailer.confirm_email.subtotal') %>
+            <%= t('.subtotal') %>
           </td>
           <td>
             <%= @order.display_item_total %>
@@ -35,7 +35,7 @@
             <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
               <tr>
                 <td></td>
-                <td><%= Spree.t(:promotion) %> <%= label %>:</td>
+                <td><%= t('spree.promotion') %> <%= label %>:</td>
                 <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
               </tr>
             <% end %>
@@ -44,7 +44,7 @@
         <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
           <tr>
             <td></td>
-            <td><%= Spree.t(:shipping) %> <%= name %>:</td>
+            <td><%= t('spree.shipping') %> <%= name %>:</td>
             <td><%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: @order.currency) %></td>
           </tr>
         <% end %>
@@ -52,7 +52,7 @@
           <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
             <tr>
               <td></td>
-              <td><%= Spree.t(:tax) %> <%= label %>:</td>
+              <td><%= t('spree.tax') %> <%= label %>:</td>
               <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
             </tr>
           <% end %>
@@ -68,7 +68,7 @@
         <tr>
           <td></td>
           <td>
-            <%= Spree.t('order_mailer.confirm_email.total') %>
+            <%= t('.total') %>
           </td>
           <td>
             <%= @order.display_total %>
@@ -76,7 +76,7 @@
         </tr>
       </table>
       <p>
-        <%= Spree.t('order_mailer.confirm_email.thanks') %>
+        <%= t('.thanks') %>
       </p>
     </td>
     <td class="expander"></td>

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

@@ -1,30 +1,30 @@
-<%= Spree.t('order_mailer.confirm_email.dear_customer') %>
+<%= t('.dear_customer') %>
 
-<%= Spree.t('order_mailer.confirm_email.instructions') %>
+<%= t('.instructions') %>
 
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.order_summary') %>
+<%= t('.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.subtotal') %> <%= @order.display_item_total %>
+<%= t('.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) %>
+<%= t('spree.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(&:total_before_tax), currency: @order.currency) %>
+<%= t('spree.shipping') %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:total_before_tax), 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) %>
+<%= t('spree.tax') %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
   <% end %>
 <% end %>
 
@@ -33,6 +33,6 @@
 <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.total') %> <%= @order.display_total %>
+<%= t('.total') %> <%= @order.display_total %>
 
-<%= Spree.t('order_mailer.confirm_email.thanks') %>
+<%= t('.thanks') %>

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

@@ -2,13 +2,13 @@
   <tr>
     <td>
       <p class="lede">
-        <%= Spree.t('order_mailer.inventory_cancellation.dear_customer') %>
+        <%= t('spree.order_mailer.inventory_cancellation.dear_customer') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.inventory_cancellation.instructions') %>
+        <%= t('spree.order_mailer.inventory_cancellation.instructions') %>
       </p>
       <p>
-        <%= Spree.t('order_mailer.inventory_cancellation.order_summary_canceled') %>
+        <%= t('spree.order_mailer.inventory_cancellation.order_summary_canceled') %>
       </p>
       <table>
         <% @inventory_units.each do |item| %>

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

@@ -1,9 +1,9 @@
-<%= Spree.t('order_mailer.inventory_cancellation.dear_customer') %>
+<%= t('order_mailer.inventory_cancellation.dear_customer') %>
 
-<%= Spree.t('order_mailer.inventory_cancellation.instructions') %>
+<%= t('order_mailer.inventory_cancellation.instructions') %>
 
 ============================================================
-<%= Spree.t('order_mailer.inventory_cancellation.order_summary_canceled') %>
+<%= t('order_mailer.inventory_cancellation.order_summary_canceled') %>
 ============================================================
 <% @inventory_units.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%>