raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4855 from luisramos0/3-0-ship-method-services

Browse Source 
[Spree 2.1] Fix ShippingMethod.services query
This commit is contained in:
Pau Pérez Fabregat
2020-02-28 11:31:53 +01:00
committed by GitHub
parent 3d453eb5ee b1714d73ef
commit 19dd5d0af3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/spree/shipping_method_decorator.rb
View File

@@ -39,7 +39,7 @@ Spree::ShippingMethod.class_eval do
select("distributor_id").
select("BOOL_OR(spree_shipping_methods.require_ship_address = 'f') AS pickup").
select("BOOL_OR(spree_shipping_methods.require_ship_address = 't') AS delivery").
map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup == 't', delivery: sm.delivery == 't' }] }
map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup, delivery: sm.delivery }] }
]
end

6
spec/features/admin/shipping_methods_spec.rb
View File

@@ -36,7 +36,7 @@ feature 'shipping methods' do
expect(page).to have_no_button I18n.t("actions.create")
# Then the shipping method should have its distributor set
message = "Shipping method \"Carrier Pidgeon\" has been successfully created!"
message = "Shipping Method \"Carrier Pidgeon\" has been successfully created!"
expect(page).to have_flash_message message
sm = Spree::ShippingMethod.last
@@ -49,7 +49,7 @@ feature 'shipping methods' do
scenario "deleting a shipping method" do
visit_delete spree.admin_shipping_method_path(@shipping_method)
expect(page).to have_content "Shipping method \"#{@shipping_method.name}\" has been successfully removed!"
expect(page).to have_content "Shipping Method \"#{@shipping_method.name}\" has been successfully removed!"
expect(Spree::ShippingMethod.where(id: @shipping_method.id)).to be_empty
end
@@ -126,7 +126,7 @@ feature 'shipping methods' do
click_button I18n.t("actions.create")
expect(page).to have_content I18n.t('spree.admin.shipping_methods.edit.editing_shipping_method')
expect(flash_message).to eq I18n.t('successfully_created', resource: 'Shipping method "Teleport"')
expect(flash_message).to eq I18n.t('successfully_created', resource: 'Shipping Method "Teleport"')
expect(first('tags-input .tag-list ti-tag-item')).to have_content "local"