Merge branch 'master' of github.com:forecho/amazon-mws

forecho · Mar 20, 2020 · cfd3e70 · cfd3e70
2 parents 4db93e9 + dd5d709
commit cfd3e70
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/MWSClient.php b/src/MWSClient.php
@@ -94,7 +94,7 @@ public function validateCredentials()
         try {
             $this->ListOrderItems('validate');
         } catch (Exception $e) {
-            if ($e->getMessage() == 'Invalid AmazonOrderId: validate') {
+            if ($e->getMessage() == 'Invalid AmazonOrderId: validate' || $e->getMessage() == 'The order id you have requested is not valid.') {
                 return true;
             } else {
                 return false;
@@ -1023,6 +1023,7 @@ public function GetReport($ReportId)
                     $reader->setHeaderOffset(0);
                     $headers = $reader->getHeader();
                     $statement = new \League\Csv\Statement;
+                    $result = array();
                     foreach ($statement->process($reader) as $row) {
                         $result[] = array_combine($headers, $row);
                     }
@@ -1452,4 +1453,4 @@ public function setClient(Client $client)
     {
         $this->client = $client;
     }
-}
+}