solidus_core 2.6.6 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0b9d1c95266b86c40ea5b48169a7ed167f400f73705eca32692e9e8e7fe9f2f7
-  data.tar.gz: 97a277fb97d84e1d4fb27eea25326c3132d7218ecd8f8d03a8358fbe217530a1
+SHA1:
+  metadata.gz: eb1818adf868e3d8d1e880f8f6b50c544b9d6a8d
+  data.tar.gz: ef14156407da2c1e067a74e718cfe96ca9843380
 SHA512:
-  metadata.gz: 65795d1ede7bf14be214725f161c0ab4f834cc91bc6444c06125950aebb590465ef4dbb19bdf63eca297f3241e520beeddea614f754784c70a3372fbcf7a52a2
-  data.tar.gz: 9fff27c8dd410fcd86c79e3ca80ccbc4b620d34030476bf3032e2fc8148bc8d5119a96f0be37e47137f231035de01ba3864bc1f0289a6b46d548019d330fe4c9
+  metadata.gz: fa66bde468ab5d0a0225f3de3e85ec8753abbded64ec884bf2fc49262dc08c122b700c60bcd19cd311506db616bd08cd2aeaee693a6e333462de7d7e6869aa82
+  data.tar.gz: 79750dd5214ba7c407f03d736bd5e1f537a69efaee2ba00465758a949f80f4e021fedeec4963cddf65883e65623a71bfcb426104191a906aa74a0da4cedd7251

data/app/helpers/spree/taxons_helper.rb

@@ -7,12 +7,12 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
       price_scope = Spree::Price.where(current_pricing_options.search_arguments)
-      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").limit(max)
+      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
       if products.size < max
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |descendent_taxon|
           to_get = max - products.length
-          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/jobs/spree/promotion_code_batch_job.rb

@@ -10,13 +10,13 @@ module Spree
       ).build_promotion_codes
 
       if promotion_code_batch.email?
-        Spree::PromotionCodeBatchMailer
+        Spree::Config.promotion_code_batch_mailer_class
           .promotion_code_batch_finished(promotion_code_batch)
           .deliver_now
       end
     rescue StandardError => e
       if promotion_code_batch.email?
-        Spree::PromotionCodeBatchMailer
+        Spree::Config.promotion_code_batch_mailer_class
           .promotion_code_batch_errored(promotion_code_batch)
           .deliver_now
       end

data/app/models/spree/order.rb

@@ -448,7 +448,7 @@ module Spree
     end
 
     def deliver_order_confirmation_email
-      Spree::OrderMailer.confirm_email(self).deliver_later
+      Spree::Config.order_mailer_class.confirm_email(self).deliver_later
       update_column(:confirmation_delivered, true)
     end
 
@@ -552,7 +552,6 @@ module Spree
       Spree::PromotionHandler::Shipping.new(self).activate
       recalculate
     end
-    alias_method :apply_free_shipping_promotions, :apply_shipping_promotions
     deprecate apply_free_shipping_promotions: :apply_shipping_promotions, deprecator: Spree::Deprecation
 
     # Clean shipments and make order back to address state
@@ -890,7 +889,7 @@ module Spree
     end
 
     def send_cancel_email
-      Spree::OrderMailer.cancel_email(self).deliver_later
+      Spree::Config.order_mailer_class.cancel_email(self).deliver_later
     end
 
     def after_resume

data/app/models/spree/order_cancellations.rb

@@ -40,7 +40,7 @@ class Spree::OrderCancellations
         end
 
         update_shipped_shipments(inventory_units)
-        Spree::OrderMailer.inventory_cancellation_email(@order, inventory_units.to_a).deliver_later if Spree::OrderCancellations.send_cancellation_mailer
+        Spree::Config.order_mailer_class.inventory_cancellation_email(@order, inventory_units.to_a).deliver_later if Spree::OrderCancellations.send_cancellation_mailer
       end
 
       @order.recalculate

data/app/models/spree/price.rb

@@ -26,7 +26,7 @@ module Spree
     validates :currency, inclusion: { in: ::Money::Currency.all.map(&:iso_code), message: :invalid_code }
     validates :country, presence: true, unless: -> { for_any_country? }
 
-    scope :currently_valid, -> { order(Arel.sql("country_iso IS NULL, updated_at DESC, id DESC")) }
+    scope :currently_valid, -> { order(Arel.sql("country_iso IS NULL")).order(updated_at: :DESC, id: :DESC) }
     scope :for_master, -> { joins(:variant).where(spree_variants: { is_master: true }) }
     scope :for_variant, -> { joins(:variant).where(spree_variants: { is_master: false }) }
     scope :for_any_country, -> { where(country: nil) }

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

@@ -63,10 +63,9 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      includes(:classifications)
-        .where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id))
-        .select(Spree::Classification.arel_table[:position])
-        .order(Spree::Classification.arel_table[:position].asc)
+      includes(:classifications).
+      where("spree_products_taxons.taxon_id" => taxon.self_and_descendants.pluck(:id)).
+      order(Spree::Classification.arel_table[:position].asc)
     end
 
     # This scope selects products in all taxons AND all its descendants

data/app/models/spree/reimbursement.rb

@@ -162,7 +162,7 @@ module Spree
     end
 
     def send_reimbursement_email
-      Spree::ReimbursementMailer.reimbursement_email(id).deliver_later
+      Spree::Config.reimbursement_mailer_class.reimbursement_email(id).deliver_later
     end
 
     # If there are multiple different reimbursement types for a single

data/app/models/spree/store.rb

@@ -28,7 +28,7 @@ module Spree
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
     class << self
-      deprecate by_url: "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
+      deprecate :by_url, "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
     end
 
     def available_locales

data/app/models/spree/user_class_handle.rb

@@ -4,7 +4,7 @@ module Spree
   # Configuration point for User model implementation.
   #
   # `Spree::UserClassHandle` allows you to configure your own implementation of a
-  # User class or use an extnesion like `solidus_auth_devise`.
+  # User class or use an extension like `solidus_auth_devise`.
   #
   # @note Placeholder for name of Spree.user_class to ensure later evaluation at
   #  runtime.

data/config/locales/en.yml

@@ -177,7 +177,6 @@ en:
       spree/product_property:
         value: Value
       spree/promotion:
-        advertise: Advertise
         apply_automatically: Apply Automatically
         code: Code
         description: Description
@@ -185,7 +184,7 @@ en:
         expires_at: End
         name: Name
         path: Path
-        per_code_usage_limit: Per Code Usage Limit
+        per_code_usage_limit: Per code usage limit
         promotion_uses: Promotion Uses
         starts_at: Start
         status: Status
@@ -859,7 +858,6 @@ en:
         activations_new:
           auto: Apply to all orders
           multiple_codes: Multiple promotion codes
-          path: URL Path
           single_code: Single promotion code
         activations_edit:
           auto: All orders will attempt to use this promotion
@@ -1791,6 +1789,7 @@ en:
       authorized: Authorized
       canceled: Canceled
     return_authorizations: Return Merchandise Authorizations
+    return_authorization_fire_error: Cannot perform this action on return merchandise authorization
     return_authorization_updated: Return merchandise authorization updated
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
     return_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed

data/lib/spree/app_configuration.rb

@@ -307,6 +307,32 @@ module Spree
     # @api experimental
     class_name_attribute :shipping_rate_tax_calculator_class, default: 'Spree::TaxCalculator::ShippingRate'
 
+    # Allows providing your own Mailer for order mailer.
+    #
+    # @!attribute [rw] order_mailer_class
+    # @return [ActionMailer::Base] an object that responds to "confirm_email",
+    #   "cancel_email" and "inventory_cancellation_email"
+    #   (e.g. an ActionMailer with a "confirm_email" method) with the same
+    #   signature as Spree::OrderMailer.confirm_email.
+    class_name_attribute :order_mailer_class, default: 'Spree::OrderMailer'
+
+    # Allows providing your own Mailer for promotion code batch mailer.
+    #
+    # @!attribute [rw] promotion_code_batch_mailer_class
+    # @return [ActionMailer::Base] an object that responds to "promotion_code_batch_finished",
+    #   and "promotion_code_batch_errored"
+    #   (e.g. an ActionMailer with a "promotion_code_batch_finished" method) with the same
+    #   signature as Spree::PromotionCodeBatchMailer.promotion_code_batch_finished.
+    class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::PromotionCodeBatchMailer'
+
+    # Allows providing your own Mailer for reimbursement mailer.
+    #
+    # @!attribute [rw] reimbursement_mailer_class
+    # @return [ActionMailer::Base] an object that responds to "reimbursement_email"
+    #   (e.g. an ActionMailer with a "reimbursement_email" method) with the same
+    #   signature as Spree::ReimbursementMailer.reimbursement_email.
+    class_name_attribute :reimbursement_mailer_class, default: 'Spree::ReimbursementMailer'
+
     # Allows providing your own Mailer for shipped cartons.
     #
     # @!attribute [rw] carton_shipped_email_class

data/lib/spree/core/importer/order.rb

@@ -20,8 +20,8 @@ module Spree
 
             shipments_attrs = params.delete(:shipments_attributes)
 
-            create_shipments_from_params(shipments_attrs, order)
             create_line_items_from_params(params.delete(:line_items_attributes), order)
+            create_shipments_from_params(shipments_attrs, order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.6.6"
+    "2.7.0"
   end
 
   def self.solidus_gem_version

data/lib/spree/mailer_previews/order_preview.rb

@@ -6,19 +6,19 @@ module Spree
       def confirm
         order = Order.complete.last
         raise "Your database needs at least one completed order to render this preview" unless order
-        OrderMailer.confirm_email(order)
+        Spree::Config.order_mailer_class.confirm_email(order)
       end
 
       def cancel
         order = Order.with_state(:canceled).last
         raise "Your database needs at least one cancelled order to render this preview" unless order
-        OrderMailer.cancel_email(order)
+        Spree::Config.order_mailer_class.cancel_email(order)
       end
 
       def inventory_cancellation
         order = Spree::Order.joins(:inventory_units).merge(Spree::InventoryUnit.canceled).last
         raise "Your database needs at least one order with a canceled inventory unit to render this preview" unless order
-        OrderMailer.inventory_cancellation_email(order, [order.inventory_units.first])
+        Spree::Config.order_mailer_class.inventory_cancellation_email(order, [order.inventory_units.first])
       end
     end
   end

data/lib/spree/mailer_previews/reimbursement_preview.rb

@@ -6,7 +6,7 @@ module Spree
       def reimbursement
         reimbursement = Reimbursement.last
         raise "Your database needs at least one Reimbursement to render this preview" unless reimbursement
-        ReimbursementMailer.reimbursement_email(reimbursement)
+        Spree::Config.reimbursement_mailer_class.reimbursement_email(reimbursement)
       end
     end
   end

data/lib/spree/permission_sets/default_customer.rb

@@ -11,6 +11,9 @@ module Spree
         can [:read, :update], Order do |order, token|
           order.user == user || (order.guest_token.present? && token == order.guest_token)
         end
+        cannot :update, Order do |order|
+          order.completed?
+        end
         can :create, ReturnAuthorization do |return_authorization|
           return_authorization.order.user == user
         end

data/spec/lib/spree/core/importer/order_spec.rb

@@ -360,6 +360,31 @@ module Spree
             expect(order.shipment_total.to_f).to eq 4.99
           end
         end
+
+        context "when line items and shipments are present" do
+          let(:params) do
+            {
+              completed_at: 2.days.ago,
+              line_items_attributes: line_items,
+              shipments_attributes: [
+                {
+                  tracking: '123456789',
+                  cost: '4.99',
+                  shipped_at: 1.day.ago,
+                  shipping_method: shipping_method.name,
+                  stock_location: stock_location.name,
+                  inventory_units: [{ sku: sku }]
+                }
+              ]
+            }
+          end
+
+          it 'builds quantities properly' do
+            order = Importer::Order.import(user, params)
+            line_item = order.line_items.first
+            expect(line_item.quantity).to eq(5)
+          end
+        end
       end
 
       it 'adds adjustments' do

data/spec/models/spree/store_credit_event_spec.rb

@@ -235,7 +235,7 @@ RSpec.describe Spree::StoreCreditEvent do
   end
 
   describe "#display_event_date" do
-    let(:date) { Time.parse("2014-06-01") }
+    let(:date) { Time.zone.parse("2014-06-01") }
 
     subject { create(:store_credit_auth_event, created_at: date) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1194,7 +1194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.