Merge branch 'hotfixes/hotfix-order' into releases/release-h2f

gestion/src/js/objects/order.mjs

@@ -26,7 +26,7 @@ export class Order {
     this.productReferences = Order.getProductReferences(myresp);
     this.orderDetailsUrl = generateUrl(`/apps/gestion/order/${this.id}/details`);
     this.fkProviderId = myresp.fk_provider_id;
-    this.providerName = ((myresp.provider_name == null || myresp.provider_name.length === 0) ? '-' : myresp.provider_name);
+    this.providerCompanyName = ((myresp.provider_company_name == null || myresp.provider_company_name.length === 0) ? '-' : myresp.provider_company_name);
     this.orderType = myresp.fk_order_type_key;
     this.thanatoColumnClass = myresp.fk_order_type_key == OrderTypeDevis ? "" : "getThanatosSubcontractor";
   }
@@ -107,7 +107,7 @@ export class Order {
       '<div class="'+this.thanatoColumnClass+'" data-table="orders" data-column="fk_thanato_id" data-id="' + this.id + '" data-current="' + this.thanatoId + '">'+ this.thanatoFullName + '</div>',
       '<div>'+ this.locationName + '</div>',
       '<div>' + this.productReferences + '</div>',
-      '<div class="selectProviders" data-table="orders" data-column="fk_provider_id" data-id="' + this.id + '" data-current="' + this.fkProviderId + '">'+ this.providerName + '</div>',
+      '<div class="selectProviders" data-table="orders" data-column="fk_provider_id" data-id="' + this.id + '" data-current="' + this.fkProviderId + '">'+ this.providerCompanyName + '</div>',
       '<div style="'+ Order.getComandStatusCssSytle(this.statusKey) +'">' + this.statusLabel + '</div>',
       '<div style="display:inline-block;margin-right:0px;width:80%;"><a href="' + this.orderDetailsUrl + '"><button>' + t('gestion', 'Open') + '</button></a>'+'<div data-modifier="orders" data-id=' + this.id + ' data-table="orders" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div>'
     ];

gestion/src/js/objects/provider.mjs

@@ -186,7 +186,7 @@ export class Provider {
 
       JSON.parse(response).forEach((myresp) => {
         var txt = document.createElement("textarea");
-        txt.innerHTML = myresp.provider_name;
+        txt.innerHTML = myresp.provider_company_name;
         var option = document.createElement("option");
         option.value = myresp.id;
         option.text = txt.value;

gestion/templates/content/orderDetails.php

@@ -13,8 +13,12 @@ use OCA\Gestion\Constants\OrderTypeConstant;
 
     $clientFullName = $isOrderDevis ? 
                         $order->client_prenom . " " . $order->client_nom :
-                        $order->provider_company_name;
+                        $order->provider_name . " " . $order->provider_last_name;
 
+    
+    $clientCompanyName = $isOrderDevis ?
+                        $order->client_entreprise : 
+                        $order->provider_company_name;
     $clientAddress = $isOrderDevis ? 
                         $order->client_adresse : 
                         $order->provider_address.' '.$order->provider_city;
@@ -29,7 +33,7 @@ use OCA\Gestion\Constants\OrderTypeConstant;
 
     $clientSiret = $isOrderDevis ? 
                     $order->client_legal_one : 
-                    $order->provider_company_name;
+                    $order->provider_siret_number;
 ?>
 <div class="bootstrap-iso">
     <div id="orderId" data-id="<?php echo $order->id; ?>"></div>
@@ -68,6 +72,7 @@ use OCA\Gestion\Constants\OrderTypeConstant;
         <div class="col-5 h-100 m-0" style="min-height:250px;">
             <h5 class="p-3 m-0 text-dark text-center border border-2 border-dark"><?php p($l->t('TO'));?> <span><?php echo $clientCompany; ?></span></h5>
             <p style="min-height:180px;" class="p-3 m-0 h-100 text-center text-dark text-center border border-top-0 border-2 border-dark">
+            <span><?php echo $clientCompanyName; ?></span><br/>
             <span><?php echo $clientFullName; ?></span><br/>
             <span><?php echo $clientAddress; ?></span><br/>
             <span><?php echo $clientEmail; ?></span><br/>