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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
cancelled & returned orders should be uneditable by user (#10937)
Kacper Mękarski08a1cc3c3294
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 731b3373f3..8d7d3300cd 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -326,6 +326,10 @@ module Spreecomplete? || resumed? || awaiting_return? || returned?end+ def uneditable?+ complete? || canceled? || returned?+ end+def credit_cardscredit_card_ids = payments.from_credit_card.pluck(:source_id).uniqCreditCard.where(id: credit_card_ids)diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex a2e8756baa..f7fe8d30b0 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -763,6 +763,34 @@ describe Spree::Order, type: :model doendend+ context '#uneditable?' do+ let(:order) { Spree::Order.create }++ it 'returns true when order is completed' do+ allow(order).to receive_messages(complete?: true)++ expect(order.uneditable?).to be true+ end++ it 'returns true when order is canceled' do+ allow(order).to receive_messages(canceled?: true)++ expect(order.uneditable?).to be true+ end++ it 'returns true when order is returned' do+ allow(order).to receive_messages(returned?: true)++ expect(order.uneditable?).to be true+ end++ it 'returns false when order is during checkout' do+ allow(order).to receive_messages(confirm?: true)++ expect(order.uneditable?).to be false+ end+ end+context '#completed?' doit 'indicates if order is completed' doorder.completed_at = nildiff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rbindex 0cd05793fa..e77e57736f 100644--- a/frontend/app/helpers/spree/frontend_helper.rb+++ b/frontend/app/helpers/spree/frontend_helper.rb@@ -305,7 +305,7 @@ module Spreeenddef checkout_edit_link(step = 'address', order = @order)- return if order.complete?+ return if order.uneditable?classes = 'align-text-bottom checkout-confirm-delivery-informations-link'diff --git a/frontend/app/views/spree/shared/_order_details.html.erb b/frontend/app/views/spree/shared/_order_details.html.erbindex af99eeec0f..1700cb3694 100644--- a/frontend/app/views/spree/shared/_order_details.html.erb+++ b/frontend/app/views/spree/shared/_order_details.html.erb@@ -117,7 +117,7 @@<div class="mt-5" id="checkout-summary" data-hook="checkout_summary_box"><%= render partial: 'spree/checkout/summary', locals: { order: @order } %>- <% unless @order.complete? %>+ <% unless @order.uneditable? %><div data-hook="buttons"><% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %><%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>diff --git a/frontend/spec/features/checkout_spec.rb b/frontend/spec/features/checkout_spec.rbindex 9f844e92b3..d03b8f787e 100644--- a/frontend/spec/features/checkout_spec.rb+++ b/frontend/spec/features/checkout_spec.rb@@ -230,6 +230,24 @@ describe 'Checkout', type: :feature, inaccessible: true, js: true doexpect(page).to have_selector('input.btn-primary.checkout-content-save-continue-button[data-disable-with]')end++ it 'checks if link to checkout address step will be displayed' do+ visit spree.checkout_state_path(:confirm)++ expect(page).to have_link(href: spree.checkout_state_path(:address))+ end++ it 'checks if link to checkout delivery step will be displayed' do+ visit spree.checkout_state_path(:confirm)++ expect(page).to have_link(href: spree.checkout_state_path(:delivery))+ end++ it 'checks if link to checkout payment step will be displayed' do+ visit spree.checkout_state_path(:confirm)++ expect(page).to have_link(href: spree.checkout_state_path(:payment))+ endendcontext 'when several payment methods are available', js: true dodiff --git a/frontend/spec/features/order_spec.rb b/frontend/spec/features/order_spec.rbindex 4fa34e6767..3b4a9d847e 100644--- a/frontend/spec/features/order_spec.rb+++ b/frontend/spec/features/order_spec.rb@@ -105,4 +105,34 @@ describe 'orders', type: :feature doendendend++ it 'does not have save and continue button' do+ visit spree.order_path(order)++ expect(page).not_to have_selector('input.btn-primary.checkout-content-save-continue-button[data-disable-with]')+ end++ it 'does not have place order button' do+ visit spree.order_path(order)++ expect(page).not_to have_button(class: 'btn-primary', value: 'Place Order')+ end++ it 'does not have link to checkout address step' do+ visit spree.order_path(order)++ expect(page).not_to have_link(href: spree.checkout_state_path(:address))+ end++ it 'does not have link to checkout delivery step' do+ visit spree.order_path(order)++ expect(page).not_to have_link(href: spree.checkout_state_path(:delivery))+ end++ it 'does not have link to checkout payment step' do+ visit spree.order_path(order)++ expect(page).not_to have_link(href: spree.checkout_state_path(:payment))+ endend