Added: Webservice for bookings management.

classes/webservice/WebserviceOrder.php

@@ -27,5 +27,6 @@ public function __construct()
     {
         $this->displayName = $this->l('Order from API');
         $this->validateOrderAmount = false;
+        $this->payment_type = OrderPayment::PAYMENT_TYPE_ONLINE;
     }
 }

classes/webservice/WebserviceOutputBuilder.php

@@ -626,7 +626,21 @@ protected function renderAssociations($object, $depth, $associations, $ws_params
                 }
                 $output_details = '';
                 foreach ($objects_assoc as $object_assoc) {
-                    if ($depth == 0 || $class_name === null) {
+                    if (isset($association['only_leaf_nodes']) && $association['only_leaf_nodes']) {
+                        unset($association['only_leaf_nodes']);
+                        unset($association['getter']);
+                        unset($association['setter']);
+                        foreach ($association as $associationKey => $resource) {
+                            $field = array();
+                            $field['sqlId'] = $associationKey;
+                            $field['value'] = null;
+                            if (!is_null($this->schemaToDisplay)) {
+                                $field['synopsis_details'] = $this->getSynopsisDetails($resource);
+                            }
+
+                            $output_details .= $this->setIndent($depth - 1).$this->objectRender->renderField($field);
+                        }
+                    } elseif ($depth == 0 || $class_name === null) {
                         $value = null;
                         if (!empty($object_assoc)) {
                             $value = $object_assoc;
@@ -676,7 +690,30 @@ protected function renderFlatAssociation($object, $depth, $assoc_name, $resource
         $output .= $this->setIndent($depth - 1).$this->objectRender->renderNodeHeader($resource_name, array(), $more_attr);
 
         foreach ($fields_assoc as $field_name => $field) {
-            if (!is_array($this->fieldsToDisplay) || in_array($field_name, $this->fieldsToDisplay[$assoc_name])) {
+            if (isset($field['resource']) && isset($field['fields'])) {
+                $parent_details = array(
+                    'object_id'    => null,
+                    'entity_name'    => $field['resource'],
+                    'entities_name'    => $field_name,
+                );
+                $output_details = '';
+                $output_details = $this->renderFlatAssociation(
+                    $object,
+                    $depth,
+                    $field_name,
+                    $field['resource'],
+                    $field['fields'],
+                    $object_assoc,
+                    $parent_details
+                );
+                if ($output_details != '') {
+                    $output .= $this->setIndent($depth).$this->objectRender->renderNodeHeader($field_name, array());
+                    $output .= $output_details;
+                    $output .= $this->setIndent($depth).$this->objectRender->renderNodeFooter($field_name, array());
+                } else {
+                    $output .= $this->setIndent($depth).$this->objectRender->renderNodeHeader($field_name, array());
+                }
+            } elseif (!is_array($this->fieldsToDisplay) || in_array($field_name, $this->fieldsToDisplay[$assoc_name])) {
                 if (isset($field['id']) && !isset($field['sqlId'])) {
                     $field['sqlId'] = 'id';
                     $field['value'] = isset($object_assoc['id']) ? $object_assoc['id'] : null;

classes/webservice/WebserviceOutputJSON.php

@@ -104,7 +104,7 @@ public function renderField($field)
         }
         // Case 1 : fields of the current entity (not an association)
         if (!$is_association) {
-            $this->currentEntity[$field['sqlId']]  = $field['value'];
+            $this->currentEntity[$field['sqlId']] = $field['value'];
         } else { // Case 2 : fields of an associated entity to the current one
             $this->currentAssociatedEntity[] = array('name' => $field['entities_name'], 'key' => $field['sqlId'], 'value' => $field['value']);
         }
@@ -146,7 +146,7 @@ public function renderNodeFooter($node_name, $params)
             }
             $this->currentEntity = array();
         }
-        if (count($this->currentAssociatedEntity)) {
+        if (is_array($this->currentAssociatedEntity) && count($this->currentAssociatedEntity)) {
             $current = array();
             foreach ($this->currentAssociatedEntity as $element) {
                 $current[$element['key']] = $element['value'];
@@ -159,9 +159,6 @@ public function renderNodeFooter($node_name, $params)
 
     public function overrideContent($content)
     {
-        array_walk($this->content, function (&$item) {
-            $item = array_filter($item);
-        });
         $content = json_encode($this->content, JSON_UNESCAPED_UNICODE);
 
         return (false !== $content) ? $content : '';
@@ -187,20 +184,23 @@ public function renderAssociationHeader($obj, $params, $assoc_name, $closed_tags
     }
     public function renderAssociationFooter($obj, $params, $assoc_name)
     {
-        return;
     }
+
     public function renderErrorsHeader()
     {
         return '';
     }
+
     public function renderErrorsFooter()
     {
         return '';
     }
+
     public function renderAssociationField($field)
     {
         return '';
     }
+
     public function renderi18nField($field)
     {
         return '';

classes/webservice/WebserviceRequest.php

@@ -255,7 +255,8 @@ protected function getOutputObject($type)
     public static function getResources()
     {
         $resources = array(
-            'addresses' => array('description' => 'The Customer, Manufacturer and Customer addresses','class' => 'Address'),
+            'addresses' => array('description' => 'The Customer address','class' => 'Address'),
+            'bookings' => array('description' => 'The Customer bookings', 'specific_management' => 'true','forbidden_method' => array('DELETE')),
             'carriers' => array('description' => 'The Carriers','class' => 'Carrier'),
             'carts' => array('description' => 'Customer\'s carts', 'class' => 'Cart'),
             'cart_rules' => array('description' => 'Cart rules management', 'class' => 'CartRule'),