Updated phpdocs and old method outbound classes

Author: Peardian

includes/classes/AmazonFulfillmentOrderCreator.php

@@ -74,7 +74,7 @@ public function setDisplayableOrderId($s){
     }
 
     /**
-     * Sets the shipping action that the shipment should use. (Optional)
+     * Sets the fulfillment action that the shipment should use. (Optional)
      *
      * This method indicates whether the order should ship now or be put on hold.
      * If this option is not sent, Amazon will assume that the order will ship now.
@@ -83,9 +83,9 @@ public function setDisplayableOrderId($s){
      */
     public function setFulfillmentAction($s){
         if ($s === 'Ship' || $s === 'Hold'){
-            $this->options['ShippingSpeedCategory'] = $s;
+            $this->options['FulfillmentAction'] = $s;
         } else {
-            $this->log("Tried to set shipping action to invalid value", 'Warning');
+            $this->log("Tried to set fulfillment action to invalid value", 'Warning');
             return false;
         }
     }
@@ -402,6 +402,8 @@ public function resetDeliveryWindow(){
      * <li><b>CurrencyCode</b> - ISO 4217 currency code</li>
      * <li><b>Value</b> - number</li>
      * </ul>
+     * <li><b>PerUnitPrice</b> (optional array) - same structure as PerUnitDeclaredValue</li>
+     * <li><b>PerUnitTax</b> (optional array) - same structure as PerUnitDeclaredValue</li>
      * </ul>
      * @param array $a <p>See above.</p>
      * @return boolean <b>FALSE</b> if improper input
@@ -585,18 +587,18 @@ public function updateOrder(){
     }
 
     /**
-     * Sets up options for using <i>CreateFulfillmentOrder</i>.
+     * Sets up options for using <i>createOrder</i>.
      *
-     * This changes key options for using <i>CreateFulfillmentOrder</i>.
+     * This changes key options for using <i>createOrder</i>.
      */
     protected function prepareCreate() {
         $this->options['Action'] = 'CreateFulfillmentOrder';
     }
 
     /**
-     * Sets up options for using <i>UpdateFulfillmentOrder</i>.
+     * Sets up options for using <i>updateOrder</i>.
      *
-     * This changes key options for using <i>UpdateFulfillmentOrder</i>. Please note: because the
+     * This changes key options for using <i>updateOrder</i>. Please note: because the
      * operation for updating the order does not use all of the parameters, some of the
      * parameters will be removed. The following parameters are removed:
      * COD settings and delivery window.

includes/classes/AmazonFulfillmentOrderList.php

@@ -71,26 +71,13 @@ public function setStartTime($s){
     }
 
     /**
-     * Sets the fulfillment method filter. (Optional)
-     * 
-     * This method sets the Fulfillment Method to be sent in the next request.
-     * If this parameter is set, Amazon will return fulfillment orders using the given method.
-     * If this parameter is not set, Amazon will only return fulfillment orders
-     * with a <i>Consumer</i> method.
-     * Here is a quick description of the methods:
-     * <ul>
-     * <li><b>Consumer</b> - customer order</li>
-     * <li><b>Removal</b> - inventory will be returned to the given address</li>
-     * </ul>
-     * @param string $s <p>"Consumer" or "Removal"</p>
-     * @return boolean <b>FALSE</b> if improper input
+     * The "FulfillmentMethod" option is no longer used.
+     * @return boolean <b>FALSE</b>
+     * @deprecated since 1.3.0
      */
     public function setMethodFilter($s){
-        if ($s == 'Consumer' || $s == 'Removal'){
-            $this->options['FulfillmentMethod'] = $s;
-        } else {
-            return false;
-        }
+        $this->log("The FulfillmentMethod option is no longer used for getting fulfillment orders.", 'Warning');
+        return FALSE;
     }
 
     /**
@@ -176,7 +163,6 @@ protected function prepareToken(){
         if ($this->tokenFlag && $this->tokenUseFlag){
             $this->options['Action'] = 'ListAllFulfillmentOrdersByNextToken';
             unset($this->options['QueryStartDateTime']);
-            unset($this->options['FulfillmentMethod']);
         } else {
             $this->options['Action'] = 'ListAllFulfillmentOrders';
             unset($this->options['NextToken']);

test-cases/includes/classes/AmazonFulfillmentOrderListTest.php

@@ -36,17 +36,6 @@ public function testSetStartTime(){
         $this->assertNotEquals('1969-12-31T18:58:00-0500',$o['QueryStartDateTime']);
     }
 
-    public function testSetMethodFilter(){
-        $this->assertFalse($this->object->setMethodFilter(null)); //can't be nothing
-        $this->assertFalse($this->object->setMethodFilter(5)); //can't be an int
-        $this->assertFalse($this->object->setMethodFilter('wrong')); //not a valid value
-        $this->assertNull($this->object->setMethodFilter('Consumer'));
-        $this->assertNull($this->object->setMethodFilter('Removal'));
-        $o = $this->object->getOptions();
-        $this->assertArrayHasKey('FulfillmentMethod',$o);
-        $this->assertEquals('Removal',$o['FulfillmentMethod']);
-    }
-    
     public function testSetUseToken(){
         $this->assertNull($this->object->setUseToken());
         $this->assertNull($this->object->setUseToken(true));