spree_core 4.0.0.beta → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5064fe41cb92fc49b65d326a8104d304e34e53b14cd8ad841207bef116b35464
-  data.tar.gz: c5288fc5c3b503961af981fe4c374e4bafcb93cb117dcd6e9be983d2c06f96e8
+  metadata.gz: f1e151381e092c35c7a9cf8860afc569afee679c44465209bbe1760ada4dd716
+  data.tar.gz: 71cb114b3a96d8e865c1d9bbed17e95c54764f71db1c1ca002d05510d27455cc
 SHA512:
-  metadata.gz: b70df4383270e04fc466c704e7d97ca152793bb74eec3ca7f66cbe901700671255eb2d94016b66031f43f57fa40ab9817f3498a272624a383a392d998ff675ed
-  data.tar.gz: 2eaf71128b93b12a4502d4bdb0ef0719ab39c480968a8436b422a723d6c7c43e97c323df636259fe03891fbf924c3043fafab4dc1e505fafa13317717a4c6fbf
+  metadata.gz: e7a25734d828b63ffa3ea6db68681ddf0c590c7a516583f76b2c9b8eb300ab4943dbba82e0beac67f2ad1a7915e6bdbe6656c4382df2cc56981d34b98cbd23e1
+  data.tar.gz: 073535b1a83ada55a42a391ee4a68f74cd600e0ec41f2fdf7deb2c6657218aba51221cf09a451fe18d14c45003499ac4046ea7ce438c0bd56a0ca99b500eee4b

data/app/models/spree/calculator/percent_on_line_item.rb

@@ -8,7 +8,14 @@ module Spree
       end
 
       def compute(object)
-        (object.amount * preferred_percent) / 100
+        computed_amount = (object.amount * preferred_percent / 100).round(2)
+
+        # We don't want to cause the promotion adjustments to push the order into a negative total.
+        if computed_amount > object.amount
+          object.amount
+        else
+          computed_amount
+        end
       end
     end
   end

data/app/models/spree/order.rb

@@ -128,7 +128,7 @@ module Spree
     before_update :homogenize_line_item_currencies, if: :currency_changed?
 
     with_options presence: true do
-      validates :number, length: { maximum: 32, allow_blank: true }, uniqueness: { allow_blank: true }
+      validates :number, length: { maximum: 32, allow_blank: true }, uniqueness: { allow_blank: true, case_sensitive: false }
       validates :email, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email
       validates :item_count, numericality: { greater_than_or_equal_to: 0, less_than: 2**31, only_integer: true, allow_blank: true }
       validates :store

data/app/models/spree/order/address_book.rb

@@ -67,7 +67,7 @@ module Spree
           attributes.delete(:id)
 
           if address&.editable?
-            address.update_attributes(attributes)
+            address.update(attributes)
             return address
           else
             attributes.delete(:id)

data/app/models/spree/shipping_method.rb

@@ -21,7 +21,7 @@ module Spree
 
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
-    validates :name, presence: true
+    validates :name, :display_on, presence: true
 
     validate :at_least_one_shipping_category
 

data/app/models/spree/variant.rb

@@ -48,7 +48,7 @@ module Spree
       validates :cost_price
       validates :price
     end
-    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) } }, allow_blank: true
+    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false }, allow_blank: true
 
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
@@ -92,7 +92,6 @@ module Spree
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
     end
-
     LOCALIZED_NUMBERS = %w(cost_price weight depth width height)
 
     LOCALIZED_NUMBERS.each do |m|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.0.0.beta'
+    '4.0.0.rc1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant