Merge pull request solidusio#6443 from SuperGoodSoft/quantity-adjustment-issue

Persist line item action quantity when updated

Author: jarednorman

legacy_promotions/app/models/spree/promotion/actions/create_quantity_adjustments.rb

@@ -111,6 +111,13 @@ def set_line_item_action_quantity(quantity, line_item)
           line_item_action = line_item_actions.where(
             line_item_id: line_item.id
           ).first_or_initialize
+
+          if line_item_action.persisted?
+            line_item.line_item_actions
+              .find { |action| action.id == line_item_action.id }
+              .quantity = quantity
+          end
+
           line_item_action.quantity = quantity
         end
 

legacy_promotions/app/models/spree/promotion/order_adjustments_recalculator.rb

@@ -70,7 +70,10 @@ def recalculate(adjustment, persist:)
 
           adjustment.eligible = calculate_eligibility(adjustment)
 
-          adjustment.save!(validate: false) if persist
+          if persist
+            adjustment.save!(validate: false)
+            adjustment.adjustable.line_item_actions.find_all(&:changed?).each(&:save!) if adjustment.adjustable.respond_to?(:line_item_actions)
+          end
         end
         adjustment.amount
       end

legacy_promotions/spec/models/spree/promotion/order_adjustments_recalculator_spec.rb

@@ -18,6 +18,35 @@ def initialize(_adjustments)
       let(:order) { create(:order_with_line_items, line_items_count: 1, line_items_price: 10) }
       let(:line_item) { order.line_items[0] }
 
+      context "when the quantity changes with a CreateQuantityAdjustments promotion" do
+        let(:promotion) { create(:promotion, promotion_actions: [promotion_action]) }
+        let(:promotion_action) { Spree::Promotion::Actions::CreateQuantityAdjustments.new(calculator:, preferred_group_size: 2) }
+        let(:calculator) { create :calculator, preferred_amount: 5 }
+        let(:order) { create(:order_with_line_items, line_items_attributes: [{quantity: 2, price: 10}]) }
+
+        before do
+          promotion.activate(order:)
+          order.recalculate
+          line_item.update!(quantity: 5)
+        end
+
+        it "updates the promotion adjustments amount" do
+          expect {
+            subject
+          }.to change {
+            line_item.adjustments.first.amount
+          }.from(-10).to(-20)
+        end
+
+        it "updates the quantity on the line item action" do
+          expect {
+            subject
+          }.to change {
+            promotion_action.line_item_actions.reload.first.quantity
+          }.from(2).to(4)
+        end
+      end
+
       context "when the item quantity has changed" do
         let(:promotion) { create(:promotion, promotion_actions: [promotion_action]) }
         let(:promotion_action) { Spree::Promotion::Actions::CreateItemAdjustments.new(calculator:) }