From ddb9ae1140a9df5d4e4f2a204595c81ff9d77060 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Fri, 22 Jun 2018 15:34:17 +1000
Subject: [PATCH] Load all shops that a user is associated with as a customer

Regardless of the presence of an order
---
 app/controllers/api/customers_controller.rb       |  2 +-
 app/helpers/injection_helper.rb                   |  3 ++-
 app/models/customer.rb                            |  5 +++++
 spec/controllers/api/customers_controller_spec.rb | 12 ++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/customers_controller.rb b/app/controllers/api/customers_controller.rb
index cbbe4ce35f..e983b372c9 100644
--- a/app/controllers/api/customers_controller.rb
+++ b/app/controllers/api/customers_controller.rb
@@ -1,7 +1,7 @@
 module Api
   class CustomersController < BaseController
     def index
-      @customers = current_api_user.customers
+      @customers = current_api_user.customers.of_regular_shops
       render json: @customers, each_serializer: CustomerSerializer
     end
 
diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index ea5589abe6..f4e857607e 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -69,7 +69,8 @@ module InjectionHelper
   end
 
   def inject_shops
-    shops = Enterprise.where(id: @orders.pluck(:distributor_id).uniq)
+    customers = spree_current_user.customers.of_regular_shops
+    shops = Enterprise.where(id: @orders.pluck(:distributor_id).uniq | customers.pluck(:enterprise_id))
     inject_json_ams "shops", shops.all, Api::ShopForOrdersSerializer
   end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index dfddd90c80..0ec6f52262 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -23,6 +23,11 @@ class Customer < ActiveRecord::Base
 
   scope :of, ->(enterprise) { where(enterprise_id: enterprise) }
 
+  scope :of_regular_shops, lambda {
+    next scoped unless Spree::Config.accounts_distributor_id
+    where('enterprise_id <> ?', Spree::Config.accounts_distributor_id)
+  }
+
   before_create :associate_user
 
   private
diff --git a/spec/controllers/api/customers_controller_spec.rb b/spec/controllers/api/customers_controller_spec.rb
index f6c8f4e0a5..360037cc90 100644
--- a/spec/controllers/api/customers_controller_spec.rb
+++ b/spec/controllers/api/customers_controller_spec.rb
@@ -23,6 +23,18 @@ module Api
         expect(json_response.length).to eq 1
         expect(json_response.first[:id]).to eq customer1.id
       end
+
+      context "when the accounts distributor id has been set" do
+        before do
+          Spree::Config.set(accounts_distributor_id: customer1.enterprise.id)
+        end
+
+        it "ignores the customer for that enterprise (if it exists)" do
+          spree_get :index
+          expect(response.status).to eq 200
+          expect(json_response.length).to eq 0
+        end
+      end
     end
 
     describe "#update" do