spree_core 3.7.11 → 4.0.0.beta

data/app/models/spree/order_merger.rb

@@ -47,6 +47,7 @@ module Spree
         handle_error(current_line_item) unless current_line_item.save
       else
         other_order_line_item.order_id = order.id
+        other_order_line_item.adjustments.update_all(order_id: order.id)
         handle_error(other_order_line_item) unless other_order_line_item.save
       end
     end

data/app/models/spree/payment.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/payment/processing'
+
 module Spree
   class Payment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
@@ -227,7 +229,7 @@ module Spree
           state: 'pending',
           capture_on_dispatch: true
         ).authorize!
-        update_attributes(amount: captured_amount)
+        update(amount: captured_amount)
       end
     end
 
@@ -252,7 +254,7 @@ module Spree
       return unless store_credit? && source.is_a?(Spree::StoreCredit)
 
       # creates the store credit event
-      source.update_attributes!(action: Spree::StoreCredit::ELIGIBLE_ACTION,
+      source.update!(action: Spree::StoreCredit::ELIGIBLE_ACTION,
                                 action_amount: amount,
                                 action_authorization_code: response_code)
     end

data/app/models/spree/payment/gateway_options.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Payment
+  class Payment < Spree::Base
     class GatewayOptions
       def initialize(payment)
         @payment = payment

data/app/models/spree/payment/processing.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/payment/gateway_options'
+
 module Spree
   class Payment < Spree::Base
     module Processing

data/app/models/spree/preferences/configuration.rb

@@ -29,7 +29,7 @@ module Spree::Preferences
     end
 
     def preferences
-      ScopedStore.new(self.class.name.underscore)
+      ::Spree::Preferences::ScopedStore.new(self.class.name.underscore)
     end
 
     def reset

data/app/models/spree/product.rb

@@ -21,7 +21,8 @@
 module Spree
   class Product < Spree::Base
     extend FriendlyId
-    include ActsAsTaggable
+    include Spree::ProductScopes
+
     friendly_id :slug_candidates, use: :history
 
     acts_as_paranoid
@@ -432,5 +433,3 @@ module Spree
     end
   end
 end
-
-require_dependency 'spree/product/scopes'

data/app/models/spree/reimbursement_tax_calculator.rb

@@ -29,7 +29,7 @@ module Spree
         additional_tax_total = percent_of_tax * return_item.inventory_unit.additional_tax_total
         included_tax_total   = percent_of_tax * return_item.inventory_unit.included_tax_total
 
-        return_item.update_attributes!(additional_tax_total: additional_tax_total,
+        return_item.update!(additional_tax_total: additional_tax_total,
                                        included_tax_total: included_tax_total)
       end
     end

data/app/models/spree/return_item.rb

@@ -171,7 +171,7 @@ module Spree
     private
 
     def persist_acceptance_status_errors
-      update_attributes(acceptance_status_errors: validator.errors)
+      update(acceptance_status_errors: validator.errors)
     end
 
     def stock_item

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -1,3 +1,5 @@
+require_relative 'r_m_a_required'
+
 module Spree
   class ReturnItem::EligibilityValidator::Default < Spree::ReturnItem::EligibilityValidator::BaseValidator
     class_attribute :permitted_eligibility_validators

data/app/models/spree/shipment.rb

@@ -307,7 +307,7 @@ module Spree
 
     # Update Shipment and make sure Order states follow the shipment changes
     def update_attributes_and_order(params = {})
-      if update_attributes params
+      if update params
         if params.key? :selected_shipping_rate_id
           # Changing the selected Shipping Rate won't update the cost (for now)
           # so we persist the Shipment#cost before calculating order shipment

data/app/models/spree/store_credit.rb

@@ -52,9 +52,8 @@ module Spree
       else
         authorization_code = generate_authorization_code
       end
-
       if validate_authorization(amount, order_currency)
-        update_attributes!(
+        update!(
           action: AUTHORIZE_ACTION,
           action_amount: amount,
           action_originator: options[:action_originator],
@@ -85,7 +84,7 @@ module Spree
           errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))
           false
         else
-          update_attributes!(
+          update!(
             action: CAPTURE_ACTION,
             action_amount: amount,
             action_originator: options[:action_originator],
@@ -103,7 +102,7 @@ module Spree
 
     def void(authorization_code, options = {})
       if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
-        update_attributes!(
+        update!(
           action: VOID_ACTION,
           action_amount: auth_event.amount,
           action_authorization_code: authorization_code,
@@ -209,7 +208,7 @@ module Spree
                 store_credit_events.where(action: ALLOCATION_ACTION).first_or_initialize
               end
 
-      event.update_attributes!(
+      event.update!(
         amount: action_amount || amount,
         authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
         user_total_amount: user.total_available_store_credit,

data/app/models/spree/taxon_image.rb

@@ -1,6 +1,6 @@
 module Spree
   class TaxonImage < Asset
-    include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
+    include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
 
     def styles

data/app/models/spree/taxonomy.rb

@@ -19,7 +19,7 @@ module Spree
     end
 
     def set_root_taxon_name
-      root.update_attributes(name: name)
+      root.update(name: name)
     end
   end
 end

data/app/services/spree/cart/add_item.rb

@@ -35,7 +35,9 @@ module Spree
 
         return failure(line_item) unless line_item.save
 
-        ::Spree::TaxRate.adjust(order, [line_item.reload]) if line_item_created
+        line_item.reload.update_price
+
+        ::Spree::TaxRate.adjust(order, [line_item]) if line_item_created
         success(order: order, line_item: line_item, line_item_created: line_item_created, options: options)
       end
     end

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

@@ -4,7 +4,7 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:)
-        return failure(order) unless order.update_attributes(filter_order_items(order, params))
+        return failure(order) unless order.update(filter_order_items(order, params))
 
         order.line_items = order.line_items.select { |li| li.quantity > 0 }
         # Update totals, then check if the order is eligible for any cart promotions.

data/config/locales/en.yml

@@ -478,6 +478,20 @@ en:
     address1: Address
     address2: Address (contd.)
     addresses: Addresses
+    address_book:
+      other_address: "Other address"
+      add_new_shipping_address: "Add new address"
+      new_shipping_address: "New Address"
+      edit_shipping_address: "Edit Address"
+      no_shipping_addresses_on_file: "No addresses on file"
+      shipping_addresses: "Addresses"
+      successfully_created: "Address has been successfully created."
+      successfully_removed: "Address has been successfully removed."
+      successfully_saved: "Saved successfully"
+      unsuccessfully_saved: "There was an error while trying to save your address."
+      successfully_updated: "Updated successfully"
+      unsuccessfully_updated: "There was an update while trying to update your address."
+      save: "Save"
     adjustable: Adjustable
     adjustment: Adjustment
     adjustment_amount: Amount
@@ -682,6 +696,7 @@ en:
     date_range: Date Range
     default: Default
     default_country_cannot_be_deleted: Default country cannot be deleted
+    default_currency: Default currency
     default_refund_amount: Default Refund Amount
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone

data/db/default/spree/stores.rb

@@ -5,5 +5,6 @@ unless Spree::Store.where(code: 'spree').exists?
     s.name              = 'Spree Demo Site'
     s.url               = 'example.com'
     s.mail_from_address = 'spree@example.com'
+    s.default_currency  = 'USD'
   end.save!
 end

data/db/default/spree/zones.rb

@@ -1,5 +1,8 @@
 eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
 north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
+south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
+middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
+asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
 
 %w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).each do |name|
   eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
@@ -8,3 +11,16 @@ end
 %w(US CA).each do |name|
   north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
+
+%w(BH CY EG IR IQ IL JO KW LB OM QA SA SY TR AE YE).each do |name|
+  middle_east.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
+end
+
+%w(AF AM AZ BH BD BT BN KH CN CX CC IO GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
+  KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE).each do |name|
+  asia.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
+end
+
+%w(AR BO BR CL CO EC FK GF GY PY PE SR UY VE).each do |name|
+  south_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
+end

data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb

@@ -4,6 +4,6 @@ class AddTypeToReimbursementType < ActiveRecord::Migration[4.2]
     add_index :spree_reimbursement_types, :type
 
     Spree::ReimbursementType.reset_column_information
-    Spree::ReimbursementType.find_by(name: Spree::ReimbursementType::ORIGINAL).update_attributes!(type: 'Spree::ReimbursementType::OriginalPayment')
+    Spree::ReimbursementType.find_by(name: Spree::ReimbursementType::ORIGINAL).update!(type: 'Spree::ReimbursementType::OriginalPayment')
   end
 end

data/db/migrate/20141101231208_fix_adjustment_order_presence.rb

@@ -4,9 +4,9 @@ class FixAdjustmentOrderPresence < ActiveRecord::Migration[4.2]
     Spree::Adjustment.where(order: nil).find_each do |adjustment|
       adjustable = adjustment.adjustable
       if adjustable.is_a? Spree::Order
-        adjustment.update_attributes!(order_id: adjustable.id)
+        adjustment.update!(order_id: adjustable.id)
       else
-        adjustment.update_attributes!(adjustable: adjustable.order)
+        adjustment.update!(adjustable: adjustable.order)
       end
     end
   end

data/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb

@@ -26,7 +26,7 @@ class AddMissingUniqueIndexesForUniqueAttributes < ActiveRecord::Migration[5.0]
 
           remove_index table_name, column if index_exists?(table_name, column)
           if supports_expression_index?
-            add_index table_name, "lower(#{column})", unique: true
+            add_index table_name, "(lower(#{column}))", unique: true
           else
             add_index table_name, column, unique: true
           end

data/db/migrate/20190305121659_add_iso_and_iso3_validation_on_presence_and_uniqueness.rb

@@ -0,0 +1,18 @@
+class AddIsoAndIso3ValidationOnPresenceAndUniqueness < ActiveRecord::Migration[5.2]
+  def up
+    Spree::Country.where.not(id: Spree::Country.group(:iso).select("min(id)")).destroy_all
+    Spree::Country.where.not(id: Spree::Country.group(:iso3).select("min(id)")).destroy_all
+
+    change_column_null(:spree_countries, :iso, false)
+    change_column_null(:spree_countries, :iso3, false)
+    add_index :spree_countries, :iso, unique: true
+    add_index :spree_countries, :iso3, unique: true
+  end
+
+  def down
+    change_column_null(:spree_countries, :iso, true)
+    change_column_null(:spree_countries, :iso3, true)
+    remove_index :spree_countries, :iso, unique: true
+    remove_index :spree_countries, :iso3, unique: true
+  end
+end

data/db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb

@@ -0,0 +1,12 @@
+# this migration does the same as this two from SpreeAddressBook
+# https://github.com/spree-contrib/spree_address_book/blob/master/db/migrate/20110302102208_add_user_id_and_deleted_at_to_addresses.rb
+# https://github.com/spree-contrib/spree_address_book/blob/master/db/migrate/20170405133031_add_missing_indexes.rb
+class AddUserIdAndDeletedAtToSpreeAddresses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_addresses, :user_id, :integer unless column_exists?(:spree_addresses, :user_id)
+    add_index :spree_addresses, :user_id unless index_exists?(:spree_addresses, :user_id)
+
+    add_column :spree_addresses, :deleted_at, :datetime unless column_exists?(:spree_addresses, :deleted_at)
+    add_index :spree_addresses, :deleted_at unless index_exists?(:spree_addresses, :deleted_at)
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -38,6 +38,8 @@ module Spree
       opts[:skip_spring] = true
       opts[:skip_test] = true
       opts[:skip_yarn] = true
+      opts[:skip_javascript] = true
+      opts[:skip_bootsnap] = true
 
       puts 'Generating dummy Rails application...'
       invoke Rails::Generators::AppGenerator,

data/lib/spree/core.rb

@@ -7,7 +7,6 @@ require 'friendly_id'
 require 'kaminari'
 require 'mail'
 require 'monetize'
-require 'paperclip'
 require 'paranoia'
 require 'mini_magick'
 require 'premailer/rails'
@@ -101,7 +100,6 @@ require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
-require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'

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

@@ -26,7 +26,7 @@ module Spree
 
           params.delete(:user_id) unless user.try(:has_spree_role?, 'admin') && params.key?(:user_id)
 
-          order.update_attributes!(params)
+          order.update!(params)
 
           order.create_proposed_shipments unless shipments_attrs.present?
 
@@ -47,41 +47,41 @@ module Spree
           return [] unless shipments_hash
 
           shipments_hash.each do |s|
-            begin
-              shipment = order.shipments.build
-              shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by(admin_name: s[:stock_location]) || Spree::StockLocation.find_by!(name: s[:stock_location])
-              inventory_units = create_inventory_units_from_order_and_params(order, s[:inventory_units])
+            shipment = order.shipments.build
+            shipment.tracking       = s[:tracking]
+            shipment.stock_location = Spree::StockLocation.find_by(admin_name: s[:stock_location]) ||
+              Spree::StockLocation.find_by!(name: s[:stock_location])
+            inventory_units = create_inventory_units_from_order_and_params(order, s[:inventory_units])
 
-              inventory_units.each do |inventory_unit|
-                inventory_unit.shipment = shipment
-
-                if s[:shipped_at].present?
-                  inventory_unit.pending = false
-                  inventory_unit.state = 'shipped'
-                end
-
-                inventory_unit.save!
-              end
+            inventory_units.each do |inventory_unit|
+              inventory_unit.shipment = shipment
 
               if s[:shipped_at].present?
-                shipment.shipped_at = s[:shipped_at]
-                shipment.state      = 'shipped'
+                inventory_unit.pending = false
+                inventory_unit.state = 'shipped'
               end
 
-              shipment.save!
+              inventory_unit.save!
+            end
+
+            if s[:shipped_at].present?
+              shipment.shipped_at = s[:shipped_at]
+              shipment.state      = 'shipped'
+            end
+
+            shipment.save!
 
-              shipping_method = Spree::ShippingMethod.find_by(name: s[:shipping_method]) || Spree::ShippingMethod.find_by!(admin_name: s[:shipping_method])
-              rate = shipment.shipping_rates.create!(shipping_method: shipping_method, cost: s[:cost])
+            shipping_method = Spree::ShippingMethod.find_by(name: s[:shipping_method]) ||
+              Spree::ShippingMethod.find_by!(admin_name: s[:shipping_method])
+            rate = shipment.shipping_rates.create!(shipping_method: shipping_method, cost: s[:cost])
 
-              shipment.selected_shipping_rate_id = rate.id
-              shipment.update_amounts
+            shipment.selected_shipping_rate_id = rate.id
+            shipment.update_amounts
 
-              adjustments = s.delete(:adjustments_attributes)
-              create_adjustments_from_params(adjustments, order, shipment)
-            rescue Exception => e
-              raise "Order import shipments: #{e.message} #{s}"
-            end
+            adjustments = s.delete(:adjustments_attributes)
+            create_adjustments_from_params(adjustments, order, shipment)
+          rescue Exception => e
+            raise "Order import shipments: #{e.message} #{s}"
           end
         end
 
@@ -101,57 +101,22 @@ module Spree
         def self.create_line_items_from_params(line_items, order)
           return {} unless line_items
 
-          iterator = case line_items
-                     when Hash
-                       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-              Passing a hash is now deprecated and will be removed in Spree 4.0.
-              It is recommended that you pass it as an array instead.
-
-              New Syntax:
-
-              {
-                "order": {
-                  "line_items": [
-                    { "variant_id": 123, "quantity": 1 },
-                    { "variant_id": 456, "quantity": 1 }
-                  ]
-                }
-              }
-
-              Old Syntax:
-
-              {
-                "order": {
-                  "line_items": {
-                    "1": { "variant_id": 123, "quantity": 1 },
-                    "2": { "variant_id": 123, "quantity": 1 }
-                  }
-                }
-              }
-                       DEPRECATION
-                       :each_value
-                     when Array
-                       :each
-                     end
-
-          line_items.send(iterator) do |line_item|
-            begin
-              adjustments = line_item.delete(:adjustments_attributes)
-              extra_params = line_item.except(:variant_id, :quantity, :sku)
-              line_item = ensure_variant_id_from_params(line_item)
-              variant = Spree::Variant.find(line_item[:variant_id])
-              line_item = Cart::AddItem.call(order: order, variant: variant, quantity: line_item[:quantity]).value
-              # Raise any errors with saving to prevent import succeeding with line items
-              # failing silently.
-              if extra_params.present?
-                line_item.update_attributes!(extra_params)
-              else
-                line_item.save!
-              end
-              create_adjustments_from_params(adjustments, order, line_item)
-            rescue Exception => e
-              raise "Order import line items: #{e.message} #{line_item}"
+          line_items.each do |line_item|
+            adjustments = line_item.delete(:adjustments_attributes)
+            extra_params = line_item.except(:variant_id, :quantity, :sku)
+            line_item = ensure_variant_id_from_params(line_item)
+            variant = Spree::Variant.find(line_item[:variant_id])
+            line_item = Cart::AddItem.call(order: order, variant: variant, quantity: line_item[:quantity]).value
+            # Raise any errors with saving to prevent import succeeding with line items
+            # failing silently.
+            if extra_params.present?
+              line_item.update!(extra_params)
+            else
+              line_item.save!
             end
+            create_adjustments_from_params(adjustments, order, line_item)
+          rescue Exception => e
+            raise "Order import line items: #{e.message} #{line_item}"
           end
         end
 
@@ -159,18 +124,16 @@ module Spree
           return [] unless adjustments
 
           adjustments.each do |a|
-            begin
-              adjustment = (adjustable || order).adjustments.build(
-                order: order,
-                amount: a[:amount].to_f,
-                label: a[:label],
-                source_type: source_type_from_adjustment(a)
-              )
-              adjustment.save!
-              adjustment.close!
-            rescue Exception => e
-              raise "Order import adjustments: #{e.message} #{a}"
-            end
+            adjustment = (adjustable || order).adjustments.build(
+              order: order,
+              amount: a[:amount].to_f,
+              label: a[:label],
+              source_type: source_type_from_adjustment(a)
+            )
+            adjustment.save!
+            adjustment.close!
+          rescue Exception => e
+            raise "Order import adjustments: #{e.message} #{a}"
           end
         end
 
@@ -178,19 +141,17 @@ module Spree
           return [] unless payments_hash
 
           payments_hash.each do |p|
-            begin
-              payment = order.payments.build order: order
-              payment.amount = p[:amount].to_f
-              # Order API should be using state as that's the normal payment field.
-              # spree_wombat serializes payment state as status so imported orders should fall back to status field.
-              payment.state = p[:state] || p[:status] || 'completed'
-              payment.created_at = p[:created_at] if p[:created_at]
-              payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
-              payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
-              payment.save!
-            rescue Exception => e
-              raise "Order import payments: #{e.message} #{p}"
-            end
+            payment = order.payments.build order: order
+            payment.amount = p[:amount].to_f
+            # Order API should be using state as that's the normal payment field.
+            # spree_wombat serializes payment state as status so imported orders should fall back to status field.
+            payment.state = p[:state] || p[:status] || 'completed'
+            payment.created_at = p[:created_at] if p[:created_at]
+            payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
+            payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
+            payment.save!
+          rescue Exception => e
+            raise "Order import payments: #{e.message} #{p}"
           end
         end