Fixed sub modules and added collection.

Author: maab16

composer.json

@@ -59,7 +59,8 @@
                 "Term": "Codexshaper\\WooCommerce\\Models\\Term",
                 "Variation": "Codexshaper\\WooCommerce\\Models\\Variation",
                 "Webhook": "Codexshaper\\WooCommerce\\Facades\\Webhook",
-                "WooCommerce": "Codexshaper\\WooCommerce\\Facades\\WooCommerce"
+                "WooCommerce": "Codexshaper\\WooCommerce\\Facades\\WooCommerce",
+                "Query": "Codexshaper\\WooCommerce\\Facades\\Query"
             }
         }
     }

src/Facades/Query.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Codexshaper\WooCommerce\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Query extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'Codexshaper\WooCommerce\Query';
+    }
+}

src/Models/Attribute.php

@@ -2,6 +2,7 @@
 
 namespace Codexshaper\WooCommerce\Models;
 
+use Codexshaper\WooCommerce\Facades\Query;
 use Codexshaper\WooCommerce\Traits\QueryBuilderTrait;
 
 class Attribute extends BaseModel
@@ -20,9 +21,9 @@ class Attribute extends BaseModel
      */
     protected function getTerms($attribute_id, $options = [])
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::all($options);
+        return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->all($options);
     }
 
     /**
@@ -36,9 +37,9 @@ protected function getTerms($attribute_id, $options = [])
      */
     protected function getTerm($attribute_id, $term_id, $options = [])
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::find($term_id, $options);
+        return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->find($term_id, $options);
     }
 
     /**
@@ -51,9 +52,9 @@ protected function getTerm($attribute_id, $term_id, $options = [])
      */
     protected function addTerm($attribute_id, $data)
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::create($data);
+        return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->create($data);
     }
 
     /**
@@ -67,9 +68,9 @@ protected function addTerm($attribute_id, $data)
      */
     protected function updateTerm($attribute_id, $term_id, $data)
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::update($term_id, $data);
+        return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->update($term_id, $data);
     }
 
     /**
@@ -83,9 +84,9 @@ protected function updateTerm($attribute_id, $term_id, $data)
      */
     protected function deleteTerm($attribute_id, $term_id, $options = [])
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::delete($term_id, $options);
+        return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->delete($term_id, $options);
     }
 
     /**
@@ -98,8 +99,8 @@ protected function deleteTerm($attribute_id, $term_id, $options = [])
      */
     protected function batchTerm($attribute_id, $data)
     {
-        $this->endpoint = "products/attributes/{$attribute_id}/terms";
-
-        return self::batch($data);
+        $return Query::init()
+            ->setEndpoint("products/attributes/{$attribute_id}/terms")
+            ->batch($data);
     }
 }

src/Models/Customer.php

@@ -2,6 +2,7 @@
 
 namespace Codexshaper\WooCommerce\Models;
 
+use Codexshaper\WooCommerce\Facades\Query;
 use Codexshaper\WooCommerce\Traits\QueryBuilderTrait;
 
 class Customer extends BaseModel
@@ -10,10 +11,17 @@ class Customer extends BaseModel
 
     protected $endpoint = 'customers';
 
+    /**
+     * Download.
+     *
+     * @param int   $id
+     *
+     * @return object
+     */
     protected function downloads($id)
     {
-        $this->endpoint = "customers/{$id}/downloads";
-
-        return self::all();
+    	return Query::init()
+            ->setEndpoint("customers/{$id}/downloads")
+            ->all($options);
     }
 }

src/Models/Note.php

@@ -2,6 +2,7 @@
 
 namespace Codexshaper\WooCommerce\Models;
 
+use Codexshaper\WooCommerce\Facades\Query;
 use Codexshaper\WooCommerce\Traits\QueryBuilderTrait;
 
 class Note extends BaseModel
@@ -20,9 +21,9 @@ class Note extends BaseModel
      */
     protected function all($order_id, $options = [])
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::all($options);
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->all($options);
     }
 
     /**
@@ -36,9 +37,9 @@ protected function all($order_id, $options = [])
      */
     protected function find($order_id, $note_id, $options = [])
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::find($note_id, $options);
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->find($note_id, $options);
     }
 
     /**
@@ -51,9 +52,9 @@ protected function find($order_id, $note_id, $options = [])
      */
     protected function create($order_id, $data)
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::create($data);
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->create($data);
     }
 
     /**
@@ -67,16 +68,19 @@ protected function create($order_id, $data)
      */
     protected function delete($order_id, $note_id, $options = [])
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::delete($note_id, $options);
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->delete($note_id, $options);
     }
 
     /**
      * Paginate results.
      *
+     *
+     * @param int $order_id
      * @param int $per_page
      * @param int $current_page
+     * @param array $options
      *
      * @return array
      */
@@ -86,32 +90,36 @@ protected function paginate(
         $current_page = 1,
         $options = []
     ) {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::paginate($per_page, $current_page, $options);
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->paginate($per_page, $current_page, $options);
     }
 
     /**
      * Count all results.
      *
+     * @param int $order_id
+     *
      * @return int
      */
     protected function count($order_id)
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::count();
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->count();
     }
 
     /**
      * Store data.
      *
+     * @param int $order_id
+     *
      * @return array
      */
     public function save($order_id)
     {
-        $this->endpoint = "orders/{$order_id}/notes";
-
-        return self::save();
+        return Query::init()
+            ->setEndpoint("orders/{$order_id}/notes")
+            ->save();
     }
 }