Merge branch 'master' of https://github.com/ukfast/sdk-php

Author: Pramaganus

src/Account/Entities/InvoiceQuery.php

@@ -2,6 +2,8 @@
 
 namespace UKFast\SDK\Account\Entities;
 
+use DateTime;
+
 class InvoiceQuery
 {
     /**
@@ -44,6 +46,21 @@ class InvoiceQuery
      */
     public $contactMethod;
 
+    /**
+     * @var string
+     */
+    public $resolution;
+
+    /**
+     * @var \DateTime
+     */
+    public $resolutionDate;
+
+    /**
+     * @var string
+     */
+    public $status;
+
     /**
      * InvoiceQuery constructor.
      *
@@ -55,6 +72,10 @@ public function __construct($item = null)
             return;
         }
 
+        $resolutionDate = ($item->resolution_date != null)
+            ? DateTime::createFromFormat(DateTime::ISO8601, $item->resolution_date)
+            : null;
+
         $this->id = $item->id;
         $this->contactId = $item->contact_id;
         $this->amount = $item->amount;
@@ -63,5 +84,8 @@ public function __construct($item = null)
         $this->proposedSolution = $item->proposed_solution;
         $this->invoiceIds = $item->invoice_ids;
         $this->contactMethod = $item->contact_method;
+        $this->resolution = $item->resolution;
+        $this->resolutionDate = $resolutionDate;
+        $this->status = $item->status;
     }
 }

src/Account/InvoiceQueryClient.php

@@ -11,6 +11,25 @@ class InvoiceQueryClient extends BaseClient
 {
     protected $basePath = 'account/';
 
+    /**
+     * Gets a paginated response of all invoice queries
+     *
+     * @param int $page
+     * @param int $perPage
+     * @param array $filters
+     * @return Page
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function getPage($page = 1, $perPage = 15, $filters = [])
+    {
+        $page = $this->paginatedRequest('v1/invoice-queries', $page, $perPage, $filters);
+        $page->serializeWith(function ($item) {
+            return new InvoiceQuery($item);
+        });
+
+        return $page;
+    }
+
     /**
      * Gets an individual invoice query
      *
@@ -64,7 +83,7 @@ protected function invoiceQueryToJson($invoiceQuery)
             'what_was_received' => $invoiceQuery->whatWasReceived,
             'proposed_solution' => $invoiceQuery->proposedSolution,
             'invoice_ids' => $invoiceQuery->invoiceIds,
-            'contact_method' => $invoiceQuery->contactMethod,
+            'contact_method' => $invoiceQuery->contactMethod
         ];
 
         return json_encode($payload);

src/PSS/ReplyClient.php

@@ -75,6 +75,7 @@ public function create($requestId, $reply)
      */
     public function upload($replyId, $name, $content)
     {
+        $name = urlencode($name);
         $uri = "v1/replies/$replyId/attachments/$name";
         $response = $this->request('POST', $uri, $content);
 

tests/Account/InvoiceQueryTest.php

@@ -32,7 +32,10 @@ public function get_invoice_query_by_id()
                             2456789,
                             1245678
                     ],
-                    "contact_method" => "email"
+                    "contact_method" => "email",
+                    "resolution" => "This issue was resolved.",
+                    "resolution_date" => '2019-10-25T00:00:00+01:00',
+                    "status" => "Submitted"
                 ],
                 "meta" => []
             ])),
@@ -55,6 +58,9 @@ public function get_invoice_query_by_id()
         $this->assertEquals("Resolve the difference", $invoiceQuery->proposedSolution);
         $this->assertEquals([2514571, 2456789, 1245678], $invoiceQuery->invoiceIds);
         $this->assertEquals("email", $invoiceQuery->contactMethod);
+        $this->assertEquals("This issue was resolved.", $invoiceQuery->resolution);
+        $this->assertInstanceOf(DateTime::class, $invoiceQuery->resolutionDate);
+        $this->assertEquals("Submitted", $invoiceQuery->status);
     }
 
     /**
@@ -67,13 +73,13 @@ public function check_self_response_parses_query_response()
                 'id' => 123
             ],
             'meta' => (object) [
-                'location' => 'https://api.ukfast.io/account/v1/invoices/query/123'
+                'location' => 'https://api.ukfast.io/account/v1/invoice-queries/123'
             ],
         ];
 
         $selfResponse = new SelfResponse($response);
 
         $this->assertEquals(123, $selfResponse->getId());
-        $this->assertEquals('https://api.ukfast.io/account/v1/invoices/query/123', $selfResponse->getLocation());
+        $this->assertEquals('https://api.ukfast.io/account/v1/invoice-queries/123', $selfResponse->getLocation());
     }
 }