show provider_company_name not provider_name on order list
This commit is contained in:
parent
dc52bd25d0
commit
f87f47b3b2
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -26,7 +26,7 @@ export class Order {
|
|||||||
this.productReferences = Order.getProductReferences(myresp);
|
this.productReferences = Order.getProductReferences(myresp);
|
||||||
this.orderDetailsUrl = generateUrl(`/apps/gestion/order/${this.id}/details`);
|
this.orderDetailsUrl = generateUrl(`/apps/gestion/order/${this.id}/details`);
|
||||||
this.fkProviderId = myresp.fk_provider_id;
|
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.orderType = myresp.fk_order_type_key;
|
||||||
this.thanatoColumnClass = myresp.fk_order_type_key == OrderTypeDevis ? "" : "getThanatosSubcontractor";
|
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 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.locationName + '</div>',
|
||||||
'<div>' + this.productReferences + '</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="'+ 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>'
|
'<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>'
|
||||||
];
|
];
|
||||||
|
|||||||
@ -186,7 +186,7 @@ export class Provider {
|
|||||||
|
|
||||||
JSON.parse(response).forEach((myresp) => {
|
JSON.parse(response).forEach((myresp) => {
|
||||||
var txt = document.createElement("textarea");
|
var txt = document.createElement("textarea");
|
||||||
txt.innerHTML = myresp.provider_name;
|
txt.innerHTML = myresp.provider_company_name;
|
||||||
var option = document.createElement("option");
|
var option = document.createElement("option");
|
||||||
option.value = myresp.id;
|
option.value = myresp.id;
|
||||||
option.text = txt.value;
|
option.text = txt.value;
|
||||||
|
|||||||
@ -13,8 +13,12 @@ use OCA\Gestion\Constants\OrderTypeConstant;
|
|||||||
|
|
||||||
$clientFullName = $isOrderDevis ?
|
$clientFullName = $isOrderDevis ?
|
||||||
$order->client_prenom . " " . $order->client_nom :
|
$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 ?
|
$clientAddress = $isOrderDevis ?
|
||||||
$order->client_adresse :
|
$order->client_adresse :
|
||||||
$order->provider_address.' '.$order->provider_city;
|
$order->provider_address.' '.$order->provider_city;
|
||||||
@ -29,7 +33,7 @@ use OCA\Gestion\Constants\OrderTypeConstant;
|
|||||||
|
|
||||||
$clientSiret = $isOrderDevis ?
|
$clientSiret = $isOrderDevis ?
|
||||||
$order->client_legal_one :
|
$order->client_legal_one :
|
||||||
$order->provider_company_name;
|
$order->provider_siret_number;
|
||||||
?>
|
?>
|
||||||
<div class="bootstrap-iso">
|
<div class="bootstrap-iso">
|
||||||
<div id="orderId" data-id="<?php echo $order->id; ?>"></div>
|
<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;">
|
<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>
|
<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">
|
<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 $clientFullName; ?></span><br/>
|
||||||
<span><?php echo $clientAddress; ?></span><br/>
|
<span><?php echo $clientAddress; ?></span><br/>
|
||||||
<span><?php echo $clientEmail; ?></span><br/>
|
<span><?php echo $clientEmail; ?></span><br/>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user