From 413799203292c398a5e8cb7e3ae2913d57b051b6 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Tue, 19 Jun 2018 22:12:34 +0200 Subject: [PATCH] fix auto_close_and_send_min_quantity --- app/models/order.rb | 2 +- spec/models/order_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index e1205c773..7f4708a7a 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -278,7 +278,7 @@ def do_end_action! send_to_supplier!(created_by) elsif auto_close_and_send_min_quantity? finish!(created_by) - send_to_supplier!(created_by) if order.sum >= order.supplier.min_order_quantity + send_to_supplier!(created_by) if sum >= supplier.min_order_quantity.to_r end end diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index 69a076852..33842d8a5 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -16,6 +16,14 @@ expect(order).to be_finished end + it 'sends mail if min_order_quantity has been reached' do + create :user, groups: [create(:ordergroup)] + create :order, created_by: User.first, starts: Date.yesterday, ends: 1.hour.ago, end_action: :auto_close_and_send_min_quantity + + Order.finish_ended! + expect(ActionMailer::Base.deliveries.count).to eq 1 + end + it 'needs a supplier' do expect(build(:order, supplier: nil)).to be_invalid end