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

Fix tests and rubocop warnings

Browse Source
This commit is contained in:
binarygit
2023-12-20 19:52:39 +05:45
parent 36c5d7c5ee
commit 75ca1dddf1
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/spree/admin/orders_helper.rb
View File

@@ -96,8 +96,7 @@ module Spree
def ship_order_link
{ name: t(:ship_order),
url: '#',
icon: 'icon-truck',
}
icon: 'icon-truck' }
end
def cancel_order_link

5
app/models/spree/order.rb
View File

@@ -29,6 +29,7 @@ module Spree
attr_accessor :use_billing, :checkout_processing, :save_bill_address,
:save_ship_address
attr_writer :send_shipment_email
token_resource
@@ -623,10 +624,6 @@ module Spree
@send_shipment_email
end
def send_shipment_email=(val)
@send_shipment_email = val
end
private
def reapply_tax_on_changed_address

2
spec/system/admin/orders_spec.rb
View File

@@ -771,7 +771,7 @@ describe '
page.find("button.icon-road").click
within ".reveal-modal" do
uncheck 'Send email confirmation to customer'
uncheck 'Send a shipment/pick up notification email to the customer.'
expect {
find_button("Confirm").click
}.not_to enqueue_job(ActionMailer::MailDeliveryJob)