mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
Merge pull request #7265 from andrewpbrett/freeze-adjustments
Don't allow edits to adjustments for canceled orders
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
%td.align-center.label= adjustment.label
|
||||
%td.align-center.amount= adjustment.display_amount.to_html
|
||||
%td.align-center.included-tax= adjustment.display_included_tax.to_html
|
||||
%td.actions
|
||||
= link_to_edit adjustment, no_text: true
|
||||
= link_to_delete adjustment, no_text: true
|
||||
- unless @order.canceled?
|
||||
%td.actions
|
||||
= link_to_edit adjustment, no_text: true
|
||||
= link_to_delete adjustment, no_text: true
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
= t(:adjustments)
|
||||
|
||||
- content_for :page_actions do
|
||||
%li= button_link_to t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus'
|
||||
- unless @order.canceled?
|
||||
%li= button_link_to t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus'
|
||||
= render partial: 'spree/admin/shared/order_links'
|
||||
%li= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
|
||||
|
||||
|
||||
@@ -87,4 +87,18 @@ feature '
|
||||
expect(page).to have_selector 'td.amount', text: '110'
|
||||
expect(page).to have_selector 'td.included-tax', text: '10'
|
||||
end
|
||||
|
||||
scenario "viewing adjustments on a canceled order" do
|
||||
# Given a taxed adjustment
|
||||
adjustment = create(:adjustment, label: "Extra Adjustment", adjustable: order,
|
||||
amount: 110, included_tax: 10, order: order)
|
||||
order.cancel!
|
||||
|
||||
login_as_admin_and_visit spree.edit_admin_order_path(order)
|
||||
|
||||
click_link 'Adjustments'
|
||||
|
||||
expect(page).to_not have_selector('tr a.icon-edit')
|
||||
expect(page).to_not have_selector('a.icon-plus'), text: I18n.t(:new_adjustment)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user