raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-23 05:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter distributors before listing on checkout options

Browse Source
This commit is contained in:
Mohamed ABDELLANI
2023-06-19 12:12:39 +01:00
parent 5ec872c6fd
commit b072da142e
3 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/helpers/order_cycles_helper.rb
View File

@@ -36,6 +36,15 @@ module OrderCyclesHelper
shipping_and_payment_methods: true
end
def distributors_with_editable_shipping_and_payment_methods(order_cycle)
return order_cycle.distributors if order_cycle.coordinator
.in? Enterprise.managed_by(spree_current_user)
order_cycle.distributors.select do |distributor|
distributor.in? Enterprise.managed_by(spree_current_user)
end
end
def order_cycle_status_class(order_cycle)
if order_cycle.undated?
'undated'

4
app/views/admin/order_cycles/checkout_options.html.haml
View File

@@ -19,7 +19,7 @@
%th{ colspan: 2 }
= t('.shipping_methods')
= hidden_field_tag "order_cycle[selected_distributor_shipping_method_ids][]", ""
- @order_cycle.distributors.each do |distributor|
- distributors_with_editable_shipping_and_payment_methods(@order_cycle).each do |distributor|
- distributor_shipping_methods = @order_cycle.attachable_distributor_shipping_methods.where("distributor_id = ?", distributor.id).includes(:shipping_method)
%tr{ class: "distributor-#{distributor.id}-shipping-methods", "data-controller": "checked" }
%td.text-center
@@ -50,7 +50,7 @@
%th{ colspan: 2 }
= t('.payment_methods')
= hidden_field_tag "order_cycle[selected_distributor_payment_method_ids][]", ""
- @order_cycle.distributors.each do |distributor|
- distributors_with_editable_shipping_and_payment_methods(@order_cycle).each do |distributor|
- distributor_payment_methods = @order_cycle.attachable_distributor_payment_methods.where("distributor_id = ?", distributor.id).includes(:payment_method)
%tr{ class: "distributor-#{distributor.id}-payment-methods", "data-controller": "checked" }
%td.text-center