Fixed MAJOR bug in Order.update call that was sending up customer and delivery_mode ids with zero values when they were not set. This was due to my not using the magic attributes and instead declaring these two attributes in the class. The attributes declarations were removed, forcing the attribtues to exist within the magic. Also needed to update the update() method on the model to properly understand and deal with customer and delivery mode allowing either the object _or_ the id to be set. Added 'can_pick' attribute support to Order. Updated print methods

Author: timbkbasic

examples/create_order.php

@@ -32,8 +32,8 @@
 	print "   attachmentFilePath is the path to the file on the local computer" . PHP_EOL;
 } else {
 	try {
-		$products = Product::all();
-		$customers = Customer::all();
+		$products = Product::all( array('offset' => 0, 'count' => 10) );
+		$customers = Customer::all( array('offset' => 0, 'count' => 10) );
 		$delivery_modes = DeliveryMode::all();
 
 		$createOrder = new Order();

examples/printers.php

@@ -37,6 +37,7 @@ function print_order( $title, $order ) {
 	print "   Customer Reference: " . $order->customer_reference . PHP_EOL;
 	print "   CreateDate: " . $order->create_date . PHP_EOL;
 	print "   DeliveryDate: " . $order->delivery_date . PHP_EOL;
+	print "   Pickable?: " . ($order->can_pick ? 'Yes' : 'No') . PHP_EOL;
 	print "   Total Price: " . $order->total_price . PHP_EOL;
 	print "   Weight: " . $order->weight . PHP_EOL;
 	print "   Urgent: " . ($order->urgent ? 'Yes' : 'No') . PHP_EOL;
@@ -127,13 +128,16 @@ function print_product( $title, $product ) {
 	print "   Description: " . $product->description . PHP_EOL;
 	print "   PhotoUrl: " . $product->photo_url . PHP_EOL;
 	print "   SupplierRef: " . $product->supplier_reference . PHP_EOL;
-	print "   Physical Inventory: " . $product->physical_inventory . PHP_EOL;
-	print "   Reserved Inventory: " . $product->reserved_inventory . PHP_EOL;
+	print "   Physical Inventory:  " . $product->physical_inventory . PHP_EOL;
+	print "   Reserved Inventory:  " . $product->reserved_inventory . PHP_EOL;
+	print "   WaitPay Inventory:   " . $product->waitpayment_inventory . PHP_EOL;
+	print "   RecvPay Inventory:   " . $product->recvpayment_inventory . PHP_EOL;
+	print "   Approved Inventory:  " . $product->approved_inventory . PHP_EOL;
 	print "   Available Inventory: " . $product->available_inventory . PHP_EOL;
-	print "   ClientReference[1]: " . $product->getClientReference(0) . PHP_EOL;
-	print "   ClientReference[2]: " . $product->getClientReference(1) . PHP_EOL;
-	print "   ClientReference[3]: " . $product->getClientReference(2) . PHP_EOL;
-	print "   ClientReference[4]: " . $product->getClientReference(3) . PHP_EOL;
+	print "   ClientReference[1]:  " . $product->getClientReference(0) . PHP_EOL;
+	print "   ClientReference[2]:  " . $product->getClientReference(1) . PHP_EOL;
+	print "   ClientReference[3]:  " . $product->getClientReference(2) . PHP_EOL;
+	print "   ClientReference[4]:  " . $product->getClientReference(3) . PHP_EOL;
 }
 
 function print_shop( $title, $shop ) {

lib/MyCloud/Api/Model/Customer.php

@@ -128,13 +128,15 @@ public static function all( $params = array(), $apiContext = null )
 		// ArgumentValidator::validate($params, 'params');
         $payLoad = "";
         $allowedParams = array(
-            'page_size' => 1,
-            'page' => 1,
-            'start_time' => 1,
-            'end_time' => 1,
-            'sort_order' => 1,
-            'sort_by' => 1,
-            'total_required' => 1
+            'offset' => 0,
+            'count' => 10,
+            // 'page_size' => 1,
+            // 'page' => 1,
+            // 'start_time' => 1,
+            // 'end_time' => 1,
+            // 'sort_order' => 1,
+            // 'sort_by' => 1,
+            // 'total_required' => 1
         );
 
         $json_data = self::executeCall(

lib/MyCloud/Api/Model/Order.php

@@ -34,9 +34,9 @@ class Order extends MyCloudModel
 
 	public $order_items = array();
 
-	public $customer = NULL;
-	
-	public $delivery_mode = NULL;
+	// public $customer = NULL;
+	//
+	// public $delivery_mode = NULL;
 
 	public $attachments = array();
 
@@ -463,10 +463,37 @@ public static function get( $orderId, $apiContext = null )
     public function create( $apiContext = null )
     {
 		$order = NULL;
+		$customer_id = NULL;
+		$delivery_mode_id = NULL;
+
+		// First we need to remove Objects that can never be set.
+		// We need to get their Id's and unset their fields BEFORE
+		// the call to toArray() below. Then set their payload values
+		// after that call, if they are actually set.
+		//
+		if ( ! empty($this->customer) ) {
+			$customer_id = $this->customer->id;
+			unset($this->customer);
+		}
+		if ( ! empty($this->delivery_mode) ) {
+			$delivery_mode_id = $this->delivery_mode->id;
+			unset($this->delivery_mode);
+		}
+
         $payload = $this->toArray();
 
-		$payload['customer_id'] = empty($this->customer) ? '0' : $this->customer->id;
-		$payload['delivery_mode_id'] = empty($this->delivery_mode) ? '0' : $this->delivery_mode->id;
+		// NOTE These sets will override the ID if it was set explicitly
+		// In other words, we are ASSUMING that if the client set the Object
+		// field, they intended to override the ID field. If this assumption
+		// is wrong, this code needs to be modified.
+		//
+		if ( $customer_id !== NULL ) {
+			$payload['customer_id'] = $customer_id;
+		}
+
+		if ( $delivery_mode_id !== NULL ) {
+			$payload['delivery_mode_id'] = $delivery_mode_id;
+		}
 
 		$index  = 0;
 		foreach ( $this->order_items as $order_item ) {

lib/MyCloud/Api/Model/Product.php

@@ -136,7 +136,7 @@ public static function all( $params = array(), $apiContext = null )
         $payLoad = "";
         $allowedParams = array(
             'offset' => 0,
-            'count' => 100,
+            'count' => 10,
             // 'start_time' => 1,
             // 'end_time' => 1,
             // 'sort_order' => 1,