Fixed lingering bug in customer_id and delivery_mode_id caused by missing two lines of old code that needed to be removed. Removed debugging output from examples/update_order_pickable.php

Author: timbkbasic

examples/update_order_pickable.php

@@ -19,7 +19,6 @@
 } else {
 	try {
 		$updateOrder = new Order();
-		var_export($updateOrder);
 		$updateOrder->setId($argv[1]);
 		$updateOrder->can_pick =
 			($argv[2] == '1' || strtoupper($argv[2]) == 'TRUE') ? 1 : 0;

lib/MyCloud/Api/Model/Order.php

@@ -590,10 +590,41 @@ public function update( $apiContext = null )
 		}
 
 		$order = NULL;
+		$customer_id = NULL;
+		$delivery_mode_id = NULL;
+
+		// REVIEW These special treatments are in create() and update().
+		//        Maybe Order should implement it's own toArray() to
+		//        consolidate this code in one place?
+
+		// 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 ) {