spree_core 3.1.0.rc3 → 3.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7332a65fecf422eca443206a5ac81db7673245b5
-  data.tar.gz: 3998319e6c69fa2e2a60fac23a763c6edbd55110
+  metadata.gz: 4cb7bbd6bde30953cc5391ee02b054f23ca0b9b9
+  data.tar.gz: b9824021ae30dabf0f658a412bdcb8b37a76ebbd
 SHA512:
-  metadata.gz: 2918da963fa83b604b0605d7ff8e68359a348df533fe9775474a2c5793d70f27aa27ec405190e47b62a9d90d23040d5f7603f7f3f8d006e87c3c99e23ec636c1
-  data.tar.gz: 9ffb99aa4ac936e7a1fbe994700c595a6f92f128039e8765e7e56f700920a697bbf1c59eb1b7ec1e9c64cef9e91c34f38ca6d72d3a779793cc8717609a5818f0
+  metadata.gz: e993ddd8cd1329cf5a7925c4cea0ac14a33c7a8cabc75b2ee6c0793502e4d8d759e2f94a92d4c100c34ef6408ff073f9df5205df23356afdbb2249a9e548edf6
+  data.tar.gz: c7f741a6505e5d5c15ff12f08afdc137aa8b3f8cfde04541b834e6bcb782a750257ac2463c2da5d74994fc8abf194d9683867fbb7bd8dba9875a9555ee1ec614

data/app/models/spree/order.rb

@@ -3,8 +3,8 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < Spree::Base
-    PAYMENT_STATES = %w(balance_due credit_owed failed paid void).freeze
-    SHIPMENT_STATES = %w(backorder canceled partial pending ready shipped).freeze
+    PAYMENT_STATES = %w(balance_due credit_owed failed paid void)
+    SHIPMENT_STATES = %w(backorder canceled partial pending ready shipped)
 
     extend FriendlyId
     friendly_id :number, slug_column: :number, use: :slugged

data/app/models/spree/order_updater.rb

@@ -20,6 +20,7 @@ module Spree
         update_payment_state
         update_shipments
         update_shipment_state
+        update_shipment_total
       end
       run_hooks
       persist_totals

data/app/models/spree/stock_item.rb

@@ -21,6 +21,7 @@ module Spree
 
     after_save :conditional_variant_touch, if: :changed?
     after_touch { variant.touch }
+    after_destroy { variant.touch }
 
     self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
     self.whitelisted_ransackable_associations = ['variant']

data/config/locales/en.yml

@@ -439,6 +439,7 @@ en:
     address: Address
     address1: Address
     address2: Address (contd.)
+    addresses: Addresses
     adjustable: Adjustable
     adjustment: Adjustment
     adjustment_amount: Amount
@@ -1352,7 +1353,7 @@ en:
       apply: Apply Store Credit
       applicable_amount: "%{amount} in store credit will be applied to this order."
       available_amount: "You have %{amount} in Store Credit available!"
-      remaining_amount: "You have %{amount} remaining in your account\'s Store Credit."
+      remaining_amount: "You have %{amount} remaining in your account's Store Credit."
       additional_payment_needed: Select another payment method for the remaining %{amount}.
       errors:
         cannot_change_used_store_credit: You cannot change a store credit that has already been used
@@ -1393,6 +1394,8 @@ en:
     taxon: Taxon
     taxon_edit: Edit Taxon
     taxon_placeholder: Add a Taxon
+    tags: Tags
+    tags_placeholder: Add Tags
     taxon_rule:
       choose_taxons: Choose taxons
       label: Order must contain x amount of these taxons

data/lib/spree/core/engine.rb

@@ -115,6 +115,12 @@ module Spree
       end
 
       config.to_prepare do
+        # Load spree locales before decorators
+        I18n.load_path += Dir.glob(
+          File.join(
+            File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
+          )
+        )
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.0.rc3"
+    "3.1.0.rc4"
   end
 end

data/spec/models/spree/order_updater_spec.rb

@@ -210,45 +210,56 @@ module Spree
     context "completed order" do
       before { allow(order).to receive_messages completed?: true }
 
-      it "updates payment state" do
-        expect(updater).to receive(:update_payment_state)
-        updater.update
-      end
-
-      it "updates shipment state" do
-        expect(updater).to receive(:update_shipment_state)
-        updater.update
-      end
+      describe "#update" do
+        it "updates payment state" do
+          expect(updater).to receive(:update_payment_state)
+          updater.update
+        end
 
-      it "updates each shipment" do
-        shipment = stub_model(Spree::Shipment, order: order)
-        shipments = [shipment]
-        allow(order).to receive_messages shipments: shipments
-        allow(shipments).to receive_messages states: []
-        allow(shipments).to receive_messages ready: []
-        allow(shipments).to receive_messages pending: []
-        allow(shipments).to receive_messages shipped: []
+        it "updates shipment state" do
+          expect(updater).to receive(:update_shipment_state)
+          updater.update
+        end
 
-        expect(shipment).to receive(:update!).with(order)
-        updater.update_shipments
+        it "updates shipments total again after updating shipments" do
+          expect(updater).to receive(:update_shipment_total).ordered
+          expect(updater).to receive(:update_shipments).ordered
+          expect(updater).to receive(:update_shipment_total).ordered
+          updater.update
+        end
       end
 
-      it "refreshes shipment rates" do
-        shipment = stub_model(Spree::Shipment, order: order)
-        shipments = [shipment]
-        allow(order).to receive_messages shipments: shipments
+      describe "#update_shipments" do
+        it "updates each shipment" do
+          shipment = stub_model(Spree::Shipment, order: order)
+          shipments = [shipment]
+          allow(order).to receive_messages shipments: shipments
+          allow(shipments).to receive_messages states: []
+          allow(shipments).to receive_messages ready: []
+          allow(shipments).to receive_messages pending: []
+          allow(shipments).to receive_messages shipped: []
+
+          expect(shipment).to receive(:update!).with(order)
+          updater.update_shipments
+        end
 
-        expect(shipment).to receive(:refresh_rates)
-        updater.update_shipments
-      end
+        it "refreshes shipment rates" do
+          shipment = stub_model(Spree::Shipment, order: order)
+          shipments = [shipment]
+          allow(order).to receive_messages shipments: shipments
 
-      it "updates the shipment amount" do
-        shipment = stub_model(Spree::Shipment, order: order)
-        shipments = [shipment]
-        allow(order).to receive_messages shipments: shipments
+          expect(shipment).to receive(:refresh_rates)
+          updater.update_shipments
+        end
+
+        it "updates the shipment amount" do
+          shipment = stub_model(Spree::Shipment, order: order)
+          shipments = [shipment]
+          allow(order).to receive_messages shipments: shipments
 
-        expect(shipment).to receive(:update_amounts)
-        updater.update_shipments
+          expect(shipment).to receive(:update_amounts)
+          updater.update_shipments
+        end
       end
     end
 

data/spree_core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.add_dependency 'activemerchant', '~> 1.47.0'
+  s.add_dependency 'activemerchant', '~> 1.49.0'
   s.add_dependency 'acts_as_list', '0.7.2'
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'friendly_id', '~> 5.1.0'
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
-  s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
+  s.add_dependency 'kaminari', '~> 0.17'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.3.0'
   s.add_dependency 'paranoia', '~> 2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc3
+  version: 3.1.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 1.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 1.49.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement