From 65ee9e148601c5bec86e41e67a4831d9664186ae Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 9 Sep 2022 10:48:33 +0100
Subject: [PATCH] Implement new design with shipping and payment methods on
 different rows instead of same one, the select all checkboxes still need to
 be added back later

This is the new design from https://github.com/openfoodfoundation/openfoodnetwork/pull/9262#issuecomment-1206673689
---
 .../order_cycles/checkout_options.html.haml   | 76 ++++++++++---------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml
index 97a2a9abef..79cfe59d20 100644
--- a/app/views/admin/order_cycles/checkout_options.html.haml
+++ b/app/views/admin/order_cycles/checkout_options.html.haml
@@ -12,41 +12,47 @@
 
   = hidden_field_tag "order_cycle[selected_shipping_method_ids][]", ""
 
-  %table.checkout-options
-    %thead
-      %tr
-        %th= t('.distributor')
-        %th= t('.shipping_methods')
-        %th= t('.payment_methods')
-      - @order_cycle.distributors.each do |distributor|
-        - payment_methods = @order_cycle.attachable_payment_methods.where("distributor_id = ?", distributor.id)
-        - shipping_methods = @order_cycle.attachable_shipping_methods.where("distributor_id = ?", distributor.id)
-        %tr
-          %td= distributor.name
-          %td
-            - shipping_methods.each do |shipping_method|
-              %p
-                %label
-                  = check_box_tag "order_cycle[selected_shipping_method_ids][]",
-                      shipping_method.id, @order_cycle.shipping_methods.include?(shipping_method),
-                      id: "order_cycle_selected_shipping_method_ids_#{shipping_method.id}"
-                  = shipping_method.name
-            - distributor.shipping_methods.backend.each do |shipping_method|
-              %label.disabled
-                = check_box_tag nil, nil, false, disabled: true
-                = shipping_method.name
-                = "(#{t('.back_end')})"
-            - if distributor.shipping_methods.frontend.none?
-              %p
-                = t('.no_shipping_methods')
-          %td
-            - if distributor.payment_methods.available(:both).any?
-              %ul
-                - payment_methods.each do |payment_method|
-                  %li= payment_method.name
-            - else
-              %p
-                = t('.no_payment_methods')
+  .row
+    .three.columns
+      &nbsp;
+    .ten.columns
+      %table.checkout-options
+        %thead
+          %tr
+            %th{ colspan: 2 }= t('.shipping_methods')
+          - @order_cycle.distributors.each do |distributor|
+            - shipping_methods = @order_cycle.attachable_shipping_methods.where("distributor_id = ?", distributor.id)
+            %tr
+              %td
+              %td
+                %em= distributor.name
+                - shipping_methods.each do |shipping_method|
+                  %p
+                    %label
+                      = check_box_tag "order_cycle[selected_shipping_method_ids][]",
+                          shipping_method.id, @order_cycle.shipping_methods.include?(shipping_method),
+                          id: "order_cycle_selected_shipping_method_ids_#{shipping_method.id}"
+                      = shipping_method.name
+                - distributor.shipping_methods.backend.each do |shipping_method|
+                  %label.disabled
+                    = check_box_tag nil, nil, false, disabled: true
+                    = shipping_method.name
+                    = "(#{t('.back_end')})"
+                - if distributor.shipping_methods.frontend.none?
+                  %p
+                    = t('.no_shipping_methods')
+          %tr
+            %th{ colspan: 2 }= t('.payment_methods')
+          %tr
+            %td
+            %td
+              - if @order_cycle.attachable_payment_methods.available(:both).any?
+                %ul
+                  - @order_cycle.attachable_payment_methods.available(:both).each do |payment_method|
+                    %li= payment_method.name
+              - else
+                %p
+                  = t('.no_payment_methods')
 
   %div#save-bar
     %div.container