raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This is the new design from https://github.com/openfoodfoundation/openfoodnetwork/pull/9262#issuecomment-1206673689
This commit is contained in:
Cillian O'Ruanaidh
2022-09-09 10:48:33 +01:00
committed by Filipe
parent a73b608f8a
commit 65ee9e1486
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
 
.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