Merge branch 'features/feature-add-thanato-address' into releases/release-h2f

This commit is contained in:
Tiavina 2025-02-26 12:47:35 +03:00
commit 44222b8ebe

View File

@ -7,33 +7,29 @@ use OCA\Gestion\Constants\OrderTypeConstant;
$isOrderPurchase = $order->fk_order_type_key == OrderTypeConstant::ORDER_TYPE_PURCHASE;
$orderComment = $order->order_comment == null || $order->order_comment == "" ? "-": $order->order_comment;
$clientCompany = $isOrderDevis ?
$order->client_entreprise :
"FOURNISSEUR";
$clientFullName = $isOrderDevis ?
$order->client_prenom . " " . $order->client_nom :
$order->thanato_nom . " " . $order->thanato_prenom :
$order->provider_name . " " . $order->provider_last_name;
$clientCompanyName = $isOrderDevis ?
$order->client_entreprise :
$order->thanato_company_name :
$order->provider_company_name;
$clientAddress = $isOrderDevis ?
$order->client_adresse :
$order->thanato_address . ' ' . $order->thanato_city :
$order->provider_address.' '.$order->provider_city;
$clientEmail = $isOrderDevis ?
$order->client_mail :
$order->thanato_email :
$order->provider_email;
$clientSiret = $isOrderDevis ?
$order->thanato_siret :
$order->provider_siret_number;
$clientPhone = $isOrderDevis ?
$order->client_phone :
$order->thanato_phone :
$order->provider_phone;
$clientSiret = $isOrderDevis ?
$order->client_legal_one :
$order->provider_siret_number;
?>
<div class="bootstrap-iso">
<div id="orderId" data-id="<?php echo $order->id; ?>"></div>
@ -70,14 +66,14 @@ use OCA\Gestion\Constants\OrderTypeConstant;
?>
</div>
<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 $clientCompanyName; ?></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/>
<span><?php echo $clientPhone; ?></span><br/>
<span><?php echo $clientSiret; ?></span><br/>
<span><?php echo $clientPhone; ?></span><br/>
</p>
</div>
</div>