solidus_core 2.4.0.beta1 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 780ddce063f4f0cb4182e2409c326a0c67af6d17
-  data.tar.gz: d07bc3bed5b865e1fa058457b1ea0a29450cdb33
+  metadata.gz: 7ab7a222e9a608b36c6772f3d1f68407a6b97e46
+  data.tar.gz: 551e309a2b550305f02f80300c217c8f4e5d894e
 SHA512:
-  metadata.gz: 8ea1a5401f592da810efbba723f7766bf617c88e9a55803cc6b887374276dafbe798c367615b7f0bb42d6855e307de9f14cee9effe9596d44f0dc19916ec98cf
-  data.tar.gz: aad148fef039045c3c994ca4e32f5fb60b4793079d57e1c598b9f7791bcbe935aef9d70b407663c91b43414585d2bffbb366d4b44b7d0c937bd9027560df7a15
+  metadata.gz: e90f8698ec8213e501f72a04bf4f8f2e2de96d5d5fca1914cc7c71554e0a7cce7d10b2396ce076069431f7442904f1a3a18273babe1766e3da8e61e24feebe99
+  data.tar.gz: f2041f442f02364460b57d5265967410795caad8f15d25de36bc5b8fb7835286d509c3dce793829bffe173d06e5f8dc65eebfad97c3401effd1bdad9220787eb

data/app/models/spree/fulfilment_changer.rb

@@ -43,17 +43,21 @@ module Spree
       return false if invalid?
       desired_shipment.save! if desired_shipment.new_record?
 
-      new_on_hand_quantity = [desired_shipment.stock_location.count_on_hand(variant), quantity].min
+      # Retrieve how many on hand items we can take from desired stock location
+      available_quantity = [desired_shipment.stock_location.count_on_hand(variant), 0].max
+
+      new_on_hand_quantity = [available_quantity, quantity].min
+      unstock_quantity = desired_shipment.stock_location.backorderable?(variant) ? quantity : new_on_hand_quantity
 
       ActiveRecord::Base.transaction do
         if handle_stock_counts?
           # We only run this query if we need it.
-          current_on_hand_quantity = [current_shipment.inventory_units.on_hand.size, quantity].min
+          current_on_hand_quantity = [current_shipment.inventory_units.pre_shipment.size, quantity].min
 
           # Restock things we will not fulfil from the current shipment anymore
           current_stock_location.restock(variant, current_on_hand_quantity, current_shipment)
           # Unstock what we will fulfil with the new shipment
-          desired_stock_location.unstock(variant, new_on_hand_quantity, desired_shipment)
+          desired_stock_location.unstock(variant, unstock_quantity, desired_shipment)
         end
 
         # These two statements are the heart of this class. We change the number

data/app/models/spree/promotion_handler/shipping.rb

@@ -11,14 +11,18 @@ module Spree
 
       def activate
         connected_promotions.each do |order_promotion|
-          order_promotion.promotion.activate(
-            order: order,
-            promotion_code: order_promotion.promotion_code,
-          )
+          if order_promotion.promotion.eligible?(order)
+            order_promotion.promotion.activate(
+              order: order,
+              promotion_code: order_promotion.promotion_code,
+            )
+          end
         end
 
         not_connected_automatic_promotions.each do |promotion|
-          promotion.activate(order: order)
+          if promotion.eligible?(order)
+            promotion.activate(order: order)
+          end
         end
       end
 

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.4.0.beta1"
+    "2.4.0.rc1"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/fulfilment_changer_spec.rb

@@ -110,12 +110,12 @@ RSpec.describe Spree::FulfilmentChanger do
           stock_item.update(backorderable: true)
         end
 
-        it "restocks five at the original stock location" do
+        it "restocks seven at the original stock location" do
           expect { subject }.to change { current_shipment.stock_location.count_on_hand(variant) }.by(7)
         end
 
-        it "unstocks five at the desired stock location" do
-          expect { subject }.to change { desired_shipment.stock_location.count_on_hand(variant) }.by(-5)
+        it "unstocks seven at the desired stock location" do
+          expect { subject }.to change { desired_shipment.stock_location.count_on_hand(variant) }.by(-7)
         end
 
         it "creates a shipment with the correct number of on hand and backordered units" do
@@ -124,6 +124,24 @@ RSpec.describe Spree::FulfilmentChanger do
           expect(desired_shipment.inventory_units.backordered.count).to eq(2)
         end
 
+        context "when the desired stock location already has a backordered units" do
+          let(:desired_count_on_hand) { -1 }
+
+          it "restocks seven at the original stock location" do
+            expect { subject }.to change { current_shipment.stock_location.count_on_hand(variant) }.by(7)
+          end
+
+          it "unstocks seven at the desired stock location" do
+            expect { subject }.to change { desired_shipment.stock_location.count_on_hand(variant) }.by(-7)
+          end
+
+          it "creates a shipment with the correct number of on hand and backordered units" do
+            subject
+            expect(desired_shipment.inventory_units.on_hand.count).to eq(0)
+            expect(desired_shipment.inventory_units.backordered.count).to eq(7)
+          end
+        end
+
         context "when the original shipment has on hand and backordered units" do
           before do
             current_shipment.inventory_units.limit(6).update_all(state: :backordered)
@@ -137,16 +155,21 @@ RSpec.describe Spree::FulfilmentChanger do
         end
 
         context "when the original shipment had some backordered units" do
+          let(:current_stock_item) { current_shipment.stock_location.stock_items.find_by(variant: variant) }
+          let(:desired_stock_item) { desired_shipment.stock_location.stock_items.find_by(variant: variant) }
+          let(:backordered_units)  { 6 }
+
           before do
-            current_shipment.inventory_units.limit(6).update_all(state: :backordered)
+            current_shipment.inventory_units.limit(backordered_units).update_all(state: :backordered)
+            current_stock_item.set_count_on_hand(-backordered_units)
           end
 
           it "restocks four at the original stock location" do
-            expect { subject }.to change { current_shipment.stock_location.count_on_hand(variant) }.by(4)
+            expect { subject }.to change { current_stock_item.reload.count_on_hand }.from(-backordered_units).to(1)
           end
 
           it "unstocks five at the desired stock location" do
-            expect { subject }.to change { desired_shipment.stock_location.count_on_hand(variant) }.by(-5)
+            expect { subject }.to change { desired_stock_item.reload.count_on_hand }.from(5).to(-2)
           end
 
           it "creates a shipment with the correct number of on hand and backordered units" do

data/spec/models/spree/promotion_handler/shipping_spec.rb

@@ -13,8 +13,20 @@ module Spree
       context 'with apply_automatically' do
         let!(:promotion) { create(:promotion, apply_automatically: true, promotion_actions: [action]) }
 
-        it "creates the adjustment" do
-          expect { subject.activate }.to change { shipment.adjustments.count }.by(1)
+        context 'for eligible promotion' do
+          it "creates the adjustment" do
+            expect { subject.activate }.to change { shipment.adjustments.count }.by(1)
+          end
+        end
+
+        context 'for ineligible promotion' do
+          let!(:promotion) do
+            create(:promotion, :with_item_total_rule, item_total_threshold_amount: 1_000, apply_automatically: true, promotion_actions: [action])
+          end
+
+          it "does not create the adjustment" do
+            expect { subject.activate }.to change { shipment.adjustments.count }.by(0)
+          end
         end
       end
 
@@ -31,6 +43,22 @@ module Spree
               subject.activate
             }.to change { shipment.adjustments.count }
           end
+
+          context 'when currently ineligible' do
+            let(:promotion) do
+              create(:promotion, :with_item_total_rule, item_total_threshold_amount: 1_000, code: 'freeshipping', promotion_actions: [action])
+            end
+
+            before do
+              order.order_promotions.create!(promotion: promotion, promotion_code: promotion.codes.first)
+            end
+
+            it 'does not adjust the shipment' do
+              expect {
+                subject.activate
+              }.to_not change { shipment.adjustments.count }
+            end
+          end
         end
 
         context 'when not already applied' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.4.0.beta1
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant