From a73b608f8a3ee35af41038e83acf55bbf064f631 Mon Sep 17 00:00:00 2001
From: Cillian O'Ruanaidh <contact@cilliano.com>
Date: Fri, 9 Sep 2022 10:36:41 +0100
Subject: [PATCH] Remove 'shared' shipping method sections from order cycle
 checkout options form, any shared shipping methods are to be displayed for
 each distributor e.g. if they belong to multiple distributors they will be
 displayed multiple times

---
 app/helpers/admin/order_cycles_helper.rb      | 19 -----------
 .../order_cycles/checkout_options.html.haml   | 32 ++-----------------
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 app/helpers/admin/order_cycles_helper.rb

diff --git a/app/helpers/admin/order_cycles_helper.rb b/app/helpers/admin/order_cycles_helper.rb
deleted file mode 100644
index 6bc3fea258..0000000000
--- a/app/helpers/admin/order_cycles_helper.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  module OrderCyclesHelper
-    def order_cycle_shared_payment_methods(order_cycle)
-      order_cycle.attachable_payment_methods.
-        where("distributor_id IN (?)", order_cycle.distributors.select(:id)).
-        group("spree_payment_methods.id").
-        having("COUNT(DISTINCT(distributor_id)) > 1")
-    end
-
-    def order_cycle_shared_shipping_methods(order_cycle)
-      order_cycle.attachable_shipping_methods.
-        where("distributor_id IN (?)", order_cycle.distributors.select(:id)).
-        group("spree_shipping_methods.id").
-        having("COUNT(DISTINCT(distributor_id)) > 1")
-    end
-  end
-end
diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml
index 9b87b807c0..97a2a9abef 100644
--- a/app/views/admin/order_cycles/checkout_options.html.haml
+++ b/app/views/admin/order_cycles/checkout_options.html.haml
@@ -3,9 +3,6 @@
 - content_for :page_title do
   = t :edit_order_cycle
 
-- shared_payment_methods = order_cycle_shared_payment_methods(@order_cycle)
-- shared_shipping_methods = order_cycle_shared_shipping_methods(@order_cycle)
-
 = form_for [main_app, :admin, @order_cycle], html: { class: "order_cycle" } do |f|
 
   = render 'wizard_progress'
@@ -22,8 +19,8 @@
         %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) -  shared_payment_methods
-        - shipping_methods = @order_cycle.attachable_shipping_methods.where("distributor_id = ?", distributor.id) - shared_shipping_methods
+        - 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
@@ -50,31 +47,6 @@
             - else
               %p
                 = t('.no_payment_methods')
-      - if shared_payment_methods.any? || shared_shipping_methods.any?
-        %tr
-          %td= t('.shared')
-          %td
-            - 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
-                &mdash;
-                %em
-                  = shared_shipping_method.distributors.where(id: @order_cycle.distributor_ids).map(&:name).join(", ")
-          %td
-            - if shared_payment_methods.any?
-              %ul
-                - shared_payment_methods.each do |shared_payment_method|
-                  %li
-                    = shared_payment_method.name
-                    %p
-                      &mdash;
-                      %em
-                        = shared_payment_method.distributors.where(id: @order_cycle.distributor_ids).map(&:name).join(", ")
 
   %div#save-bar
     %div.container