From 1a70cc0c4c35e2c0b1ad1394737ff2eeba7318cf Mon Sep 17 00:00:00 2001 From: Cillian O'Ruanaidh Date: Thu, 30 Jun 2022 12:41:02 +0100 Subject: [PATCH] Don't display no shipping/payment method warnings on order cycle checkout options if the distributor has some that are shared with other distributors --- app/views/admin/order_cycles/checkout_options.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml index 6612ba85c7..9f15616ae6 100644 --- a/app/views/admin/order_cycles/checkout_options.html.haml +++ b/app/views/admin/order_cycles/checkout_options.html.haml @@ -39,11 +39,11 @@ = check_box_tag nil, nil, false, disabled: true = shipping_method.name = "(#{t('.back_end')})" - - if shipping_methods.none? && distributor.shipping_methods.backend.none? + - if distributor.shipping_methods.frontend.none? %p.text-center = t('.no_shipping_methods') %td - - if payment_methods.any? + - if distributor.payment_methods.available(:both).any? %ul - payment_methods.each do |payment_method| %li= payment_method.name