Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add ability to pass specific date of order cancelation in `Order#canceled_by`

Damian Legawiec60ba675e73ee
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 7ea9acb448..51dbdf50ae 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -584,12 +584,14 @@ module Spree
!payments.risky.empty?
end
- def canceled_by(user)
+ def canceled_by(user, canceled_at = nil)
+ canceled_at ||= Time.current
+
transaction do
cancel!
update_columns(
canceler_id: user.id,
- canceled_at: Time.current
+ canceled_at: canceled_at
)
end
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index aa64459869..b52b6984ea 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -92,15 +92,28 @@ describe Spree::Order, type: :model do
expect(order.reload.canceler_id).to eq(admin_user.id)
end
- it 'saves canceled_at' do
- subject
- expect(order.reload.canceled_at).not_to be_nil
- end
-
it 'has canceler' do
subject
expect(order.reload.canceler).to eq(admin_user)
end
+
+ context 'when canceled_at is not given' do
+ it 'saves canceled_at to Time.current' do
+ Timecop.freeze(Time.current) do
+ subject
+ expect(order.reload.canceled_at.to_s).to eq Time.current.to_s
+ end
+ end
+ end
+
+ context 'when canceled_at is given' do
+ it 'saves canceled_at to given time' do
+ Timecop.freeze(Time.current) do
+ order.canceled_by(admin_user, Time.current - 1.day)
+ expect(order.reload.canceled_at.to_s).to eq (Time.current - 1.day).to_s
+ end
+ end
+ end
end
context '#create' do