From 464a9b95a4911427ecf5b24e70ffec499c6d1356 Mon Sep 17 00:00:00 2001 From: Cillian O'Ruanaidh Date: Thu, 30 Jun 2022 12:40:31 +0100 Subject: [PATCH] On order cycle checkout options shipping methods shared between distributors should be checked by default too --- .../order_cycles/checkout_options.html.haml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml index 7552c5f3a5..6612ba85c7 100644 --- a/app/views/admin/order_cycles/checkout_options.html.haml +++ b/app/views/admin/order_cycles/checkout_options.html.haml @@ -54,16 +54,17 @@ %tr %td= t('.shared') %td - - if shared_shipping_methods.any? - = f.collection_check_boxes :selected_shipping_method_ids, shared_shipping_methods, :id, :name do |input| - - shared_shipping_method = input.object - %p - = input.check_box - = input.label - %p - — - %em - = shared_shipping_method.distributors.where(id: @order_cycle.distributor_ids).map(&:name).join(", ") + - shared_shipping_methods.each do |shared_shipping_method| + %p + %label + = check_box_tag "order_cycle[selected_shipping_method_ids][]", + shared_shipping_method.id, @order_cycle.shipping_methods.include?(shared_shipping_method), + id: "order_cycle_selected_shipping_method_ids_#{shared_shipping_method.id}" + = shared_shipping_method.name + %p + — + %em + = shared_shipping_method.distributors.where(id: @order_cycle.distributor_ids).map(&:name).join(", ") %td - if shared_payment_methods.any? %ul