Merge pull request #40 from MondstaubRepos/master

Update AmazonShipmentItemList.php
Resolves #39

Author: keithbrink

src/AmazonShipmentItemList.php

@@ -179,12 +179,16 @@ public function resetTimeLimits()
      */
     public function fetchItems($r = true)
     {
-        if (! array_key_exists('ShipmentId', $this->options)) {
-            $this->log('Shipment ID must be set before requesting items!', 'Warning');
+        if (! array_key_exists('ShipmentId', $this->options) and ! (array_key_exists('LastUpdatedAfter', $this->options) and array_key_exists('LastUpdatedBefore', $this->options))) {
+            $this->log('Shipment ID or TimeLimits must be set before requesting items!', 'Warning');
 
             return false;
         }
 
+        if (array_key_exists('ShipmentId', $this->options) and (array_key_exists('LastUpdatedAfter', $this->options) or array_key_exists('LastUpdatedBefore', $this->options))) {
+            $this->log('If Shipment ID  AND TimeLimits is set, TimeLimits get ignored!', 'Warning');
+        }
+
         $this->prepareToken();
 
         $url = $this->urlbase.$this->urlbranch;

tests/classes/AmazonShipmentItemListTest.php

@@ -103,17 +103,25 @@ public function testFetchItems()
     {
         resetLog();
         $this->object->setMock(true, 'fetchShipmentItems.xml'); //no token
-        $this->assertFalse($this->object->fetchItems()); //no ID set yet
+        $this->assertFalse($this->object->fetchItems()); //no ID and no time is set yet
 
-        $this->object->setShipmentId('123');
+        $this->object->setShipmentId('123'); //Only ID
+        $this->assertNull($this->object->fetchItems());
+
+        $this->object->setShipmentId(null); //Only Tine
+        $this->object->setTimeLimits(strtotime('now -9999 years'), strtotime('now'));
+        $this->assertNull($this->object->fetchItems());
+
+        $this->object->setShipmentId('123'); //Both (Time gets ignored)
         $this->assertNull($this->object->fetchItems());
 
         $o = $this->object->getOptions();
         $this->assertEquals('ListInboundShipmentItems', $o['Action']);
 
         $check = parseLog();
         $this->assertEquals('Single Mock File set: fetchShipmentItems.xml', $check[1]);
-        $this->assertEquals('Shipment ID must be set before requesting items!', $check[2]);
+        $this->assertEquals('Shipment ID or TimeLimits must be set before requesting items!', $check[2]);
+        $this->assertEquals('If Shipment ID  AND TimeLimits is set, TimeLimits get ignored!', $check[4]);
 
         $this->assertFalse($this->object->hasToken());