Merge pull request #1 from gpstiip88/master

Fix auth and get orders
kusflo · Aug 5, 2018 · 624c449 · 624c449
2 parents be4f448 + 2caaff5
commit 624c449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Entities/PShopWs.php b/src/Entities/PShopWs.php
@@ -28,7 +28,7 @@ public function getApiPermissions()
 
     protected function get($options = null)
     {
-        $response = $this->client->request('GET', $this->getValidUrl($options), ['auth' => [$this->key]]);
+        $response = $this->client->request('GET', $this->getValidUrl($options), ['auth' => [$this->key, '']]);
         PShopWsException::checkStatusCode($response->getStatusCode());
 
         return $this->parseXML($response->getBody());

diff --git a/src/Entities/PShopWsOrders.php b/src/Entities/PShopWsOrders.php
@@ -39,7 +39,7 @@ public function getListLastDays($days = 7)
         foreach ($days as $day) {
             $result = $this->getListByDay($day);
             if ($result) {
-                $orders [] = $result[0];
+                $orders = array_merge($orders, $result);
             }
         }
 
@@ -125,4 +125,4 @@ private function getDateTimeNow()
 
         return new \DateTime('now', new \DateTimeZone($default_timezone));
     }
-}
+}