CDPIP-2116

emartech · Nov 21, 2019 · 1f90e43 · 1f90e43
1 parent 31e1140
commit 1f90e43
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/Model/Api/CustomersApi.php b/Model/Api/CustomersApi.php
@@ -111,10 +111,10 @@ public function get($page, $pageSize, $websiteId = null, $storeId = null, $onlyR
 
         $this
             ->handleWebsiteId($websiteId, $onlyReg)
-            ->initCollection($websiteId)
+            ->initCollection()
             ->handleIds($page, $pageSize)
-            ->handleAttributeData($websiteId)
-            ->handleAddressesAttributeData($websiteId)
+            ->handleAttributeData()
+            ->handleAddressesAttributeData()
             ->joinSubscriptionStatus()
             ->setWhere()
             ->setOrder();
@@ -126,7 +126,7 @@ public function get($page, $pageSize, $websiteId = null, $storeId = null, $onlyR
             ->setLastPage($lastPageNumber)
             ->setPageSize($pageSize)
             ->setTotalCount($this->numberOfItems)
-            ->setCustomers($this->handleCustomers($websiteId));
+            ->setCustomers($this->handleCustomers());
     }
 
     /**
@@ -144,13 +144,11 @@ private function handleWebsiteId($websiteId = null, $onlyReg = false)
     }
 
     /**
-     * @param int $websiteId
-     *
      * @return $this
      */
-    private function initCollection($websiteId)
+    private function initCollection()
     {
-        $this->customerHelper->initCollection($websiteId);
+        $this->customerHelper->initCollection($this->websiteId);
 
         return $this;
     }
@@ -176,32 +174,28 @@ private function handleIds($page, $pageSize)
     }
 
     /**
-     * @param int $websiteId
-     *
      * @return $this
      */
-    private function handleAttributeData($websiteId)
+    private function handleAttributeData()
     {
         $this->customerHelper->getCustomersAttributeData(
             $this->minId,
             $this->maxId,
-            $websiteId
+            $this->websiteId
         );
 
         return $this;
     }
 
     /**
-     * @param int $websiteId
-     *
      * @return $this
      */
-    private function handleAddressesAttributeData($websiteId)
+    private function handleAddressesAttributeData()
     {
         $this->customerHelper->getCustomersAddressesAttributeData(
             $this->minId,
             $this->maxId,
-            $websiteId
+            $this->websiteId
         );
 
         return $this;
@@ -228,15 +222,13 @@ protected function setOrder()
     }
 
     /**
-     * @param int $websiteId
-     *
      * @return array
      */
-    private function handleCustomers($websiteId)
+    private function handleCustomers()
     {
         $customerArray = [];
         foreach ($this->customerHelper->getCustomerCollection() as $customer) {
-            $customerArray[] = $this->customerHelper->buildCustomerObject($customer, $websiteId);
+            $customerArray[] = $this->customerHelper->buildCustomerObject($customer, $this->websiteId);
         }
 
         return $customerArray;