raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop

Browse Source 
Fix Orders in confirmation state cannot be completed by hub or shop
This commit is contained in:
Filipe
2023-11-16 19:50:14 +00:00
committed by GitHub
parent 37436aab80 a764cc0f89
commit ed8fd41bec
13 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/spree/admin/payments_controller.rb
View File

@@ -140,7 +140,8 @@ module Spree
#
# Otherwise redirect user to that step
def can_transition_to_payment
return if @order.payment? || @order.complete? || @order.canceled? || @order.resumed?
return if @order.confirmation? || @order.payment? ||
@order.complete? || @order.canceled? || @order.resumed?
flash[:notice] = Spree.t(:fill_in_customer_info)
redirect_to spree.edit_admin_order_customer_url(@order)
@@ -184,7 +185,8 @@ module Spree
end
def allowed_events
%w{capture void_transaction credit refund resend_authorization_email}
%w{capture void_transaction credit refund resend_authorization_email
capture_and_complete_order}
end
end
end