Merge pull request #83 from Peardian/items

Added order ID to order item list class

Author: Peardian

includes/classes/AmazonOrderItemList.php

@@ -24,6 +24,7 @@
  * required. This object can use tokens when retrieving the list.
  */
 class AmazonOrderItemList extends AmazonOrderCore implements Iterator{
+    protected $orderId;
     protected $itemList;
     protected $tokenFlag = false;
     protected $tokenUseFlag = false;
@@ -140,8 +141,10 @@ public function fetchItems($r = true){
         if (is_null($xml->AmazonOrderId)){
             $this->log("You just got throttled.",'Warning');
             return false;
-        } else if (isset($this->options['AmazonOrderId']) && $this->options['AmazonOrderId'] && $this->options['AmazonOrderId'] != $xml->AmazonOrderId){
-            $this->log('You grabbed the wrong Order\'s items! - '.$this->options['AmazonOrderId'].' =/= '.$xml->AmazonOrderId,'Urgent');
+        }
+        $this->orderId = (string)$xml->AmazonOrderId;
+        if (!empty($this->options['AmazonOrderId']) && $this->options['AmazonOrderId'] != $this->orderId){
+            $this->log('You grabbed the wrong Order\'s items! - '.$this->options['AmazonOrderId'].' =/= '.$this->orderId,'Urgent');
         }
 
         $this->parseXML($xml->OrderItems);
@@ -297,6 +300,20 @@ protected function parseXML($xml){
         }
 
     }
+
+    /**
+     * Returns the order ID for the items.
+     *
+     * This method will return <b>FALSE</b> if the list has not yet been filled.
+     * @return string|boolean single value, or <b>FALSE</b> if not set yet
+     */
+    public function getOrderId(){
+        if (isset($this->orderId)){
+            return $this->orderId;
+        } else {
+            return false;
+        }
+    }
 
     /**
      * Returns the specified order item, or all of them.