slambert/Thanasoft-H2F
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish order pdf , wip update quantity on order details

Browse Source
This commit is contained in:
Tiavina 2025-02-20 11:41:03 +03:00
parent 13768c442b
commit b9a28fcf28
5 changed files with 87 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gestion/lib/Constants/OrderPdfConstant.php Normal file
View File

@ -0,0 +1,9 @@
<?php
declare(strict_types=1);
namespace OCA\Gestion\Constants;
abstract class OrderPdfConstant
{
const SUBCONTRACTOR_TYPE = "SOUS TRAITANT";
const PROVIDER_TYPE = "FOURNISSEUR";
}

3
gestion/lib/Db/OrderBdd.php
View File

@ -414,7 +414,8 @@ class OrderBdd {
provider.provider_phone, provider.provider_phone,
provider.provider_email, provider.provider_email,
provider.provider_address, provider.provider_address,
provider.provider_city provider.provider_city,
devis.date as devis_date
FROM " FROM "
.$this->orderTablePrefix."orders as orders .$this->orderTablePrefix."orders as orders
LEFT JOIN ".$this->orderTablePrefix."devis as devis on orders.fk_devis_id = devis.id LEFT JOIN ".$this->orderTablePrefix."devis as devis on orders.fk_devis_id = devis.id

51
gestion/lib/Service/Order/OrderPdfService.php
View File

@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order;
use DateTime; use DateTime;
use OCA\Gestion\Constants\BddConstant; use OCA\Gestion\Constants\BddConstant;
use OCA\Gestion\Constants\OrderTypeConstant;
use OCA\Gestion\Db\Bdd; use OCA\Gestion\Db\Bdd;
use OCA\Gestion\Db\OrderBdd; use OCA\Gestion\Db\OrderBdd;
use OCA\Gestion\Helpers\DateHelpers; use OCA\Gestion\Helpers\DateHelpers;
@ -80,28 +81,52 @@ class OrderPdfService {
$orderDate = DateTime::createFromFormat('Y-m-d',$orderDate); $orderDate = DateTime::createFromFormat('Y-m-d',$orderDate);
$orderDate = $orderDate->format('d-m-Y'); $orderDate = $orderDate->format('d-m-Y');
$orderPdfData['order_date'] = $orderDate; $orderPdfData['order_date'] = $orderDate;
$devisDate = $orderPdfData['devis_date'];
$devisDate = DateTime::createFromFormat('Y-m-d',$devisDate);
$devisDate = $devisDate->format('d-m-Y');
$orderPdfData['devis_date'] = $devisDate;
return $orderPdfData; return $orderPdfData;
} }
private function getCommandeFolders($orderPdfData,$racinePath){ private function getCommandeFolders($orderPdfData,$racinePath){
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($orderPdfData["client_entreprise"],'UTF-8').'/'; if($orderPdfData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($orderPdfData['defunt_nom'],'UTF-8').'/'.'FOURNISSEUR'.'/'; $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($orderPdfData["client_entreprise"],'UTF-8').'/';
$orderDate = $orderPdfData['order_date']; $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($orderPdfData['defunt_nom'],'UTF-8').'/'.'FOURNISSEUR'.'/';
$orderDatetime = new DateTime($orderDate); $orderDate = $orderPdfData['order_date'];
$orderYear = $orderDatetime->format('Y'); $orderDatetime = new DateTime($orderDate);
$orderMonth = DateHelpers::GetDateWithFormatDayAndMonthPlainString($orderPdfData['order_date']); $orderYear = $orderDatetime->format('Y');
$orderByYearFolder = $clientRacineFolder."$orderYear".'/'.$orderMonth.'/'.'FOURNISSEUR'.'/'; $orderMonth = DateHelpers::GetDateWithFormatDayAndMonthPlainString($orderPdfData['order_date']);
return [ $orderByYearFolder = $clientRacineFolder."$orderYear".'/'.$orderMonth.'/'.'FOURNISSEUR'.'/';
$defuntsFolder, return [
$orderByYearFolder $defuntsFolder,
]; $orderByYearFolder
];
}
else{
$providerRacineFolder = $racinePath.'FOURNISSEURS/'.mb_strtoupper($orderPdfData["provider_name"],'UTF-8').'/';
$orderDate = $orderPdfData['order_date'];
$orderDatetime = new DateTime($orderDate);
$orderYear = $orderDatetime->format('Y');
$orderMonth = DateHelpers::GetDateWithFormatDayAndMonthPlainString($orderPdfData['order_date']);
$orderByYearFolder = $providerRacineFolder."$orderYear".'/'.$orderMonth.'/';
return [
$orderByYearFolder
];
}
} }
private function GetOrderFilename($orderPdfData){ private function GetOrderFilename($orderPdfData){
$orderFullNumber = $orderPdfData['order_full_number']; $orderFullNumber = $orderPdfData['order_full_number'];
$orderFullNumber = str_replace('/','-',$orderFullNumber); $orderFullNumber = str_replace('/','-',$orderFullNumber);
$defuntNom = str_replace('&nbsp;',' ',$orderPdfData['defunt_nom']); $filename = "BDC_".$orderFullNumber."_";
return "BDC".'_'.$orderFullNumber.'_'.mb_strtoupper($defuntNom,'UTF-8'); if($orderPdfData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){
$defuntNom = str_replace('&nbsp;',' ',$orderPdfData['defunt_nom']);
$filename .= mb_strtoupper($defuntNom,'UTF-8');
}
else{
$filename .= mb_strtoupper($orderPdfData['provider_name'],'UTF-8');
}
return $filename;
} }
public function generateOrderPdfByOrderId($orderId,$idNextCloud){ public function generateOrderPdfByOrderId($orderId,$idNextCloud){

33
gestion/lib/Service/Order/OrderService.php
View File

@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order;
use DateTime; use DateTime;
use OCA\Gestion\Constants\BddConstant; use OCA\Gestion\Constants\BddConstant;
use OCA\Gestion\Constants\OrderPdfConstant;
use OCA\Gestion\Constants\OrderTypeConstant; use OCA\Gestion\Constants\OrderTypeConstant;
use OCA\Gestion\Db\Bdd; use OCA\Gestion\Db\Bdd;
use OCA\Gestion\Db\OrderBdd; use OCA\Gestion\Db\OrderBdd;
@ -120,11 +121,35 @@ class OrderService {
if($orderDetails == null){ if($orderDetails == null){
return null; return null;
} }
$orderProducts = $this->orderBdd->getOrderProductsByOrderId($orderId); $orderProducts = [];
if($orderDetails["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){
$orderProducts = $this->gestionBdd->getDevisProduits($orderDetails["fk_devis_id"]);
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($orderDetails["client_adresse"]);
$orderDetails["client_real_adress"] = $clientAdresses["address"];
$orderDetails["client_adress_city"] = $clientAdresses["city"];
$orderDetails["type"] = OrderPdfConstant::SUBCONTRACTOR_TYPE;
$orderDetails["defunt_name_with_sexe"] = FileExportHelpers::GetSexeLabel($orderDetails['defunt_sexe']) . ' '. $orderDetails["defunt_nom"];
}
else{
$orderItems = $this->orderBdd->getOrderItemsByOrderId($orderId);
foreach($orderItems as $orderItem){
$orderProducts[] = [
"produit_id" => $orderItem["order_product_id"],
"quantite" => $orderItem["order_item_quantity"],
"produit_price" => $orderItem["order_product_ht_amount"],
"produit_reference" => $orderItem["order_product_reference"],
"description" => $orderItem["order_product_label"],
];
}
$orderDetails["client_real_adress"] = $orderDetails["provider_address"];
$orderDetails["client_adress_city"] = $orderDetails["provider_city"];
$orderDetails["client_legal_one"] = $orderDetails["provider_siret_number"];;
$orderDetails["client_mail"] = $orderDetails["provider_email"];
$orderDetails["type"] = OrderPdfConstant::PROVIDER_TYPE;
$orderDetails["devis_date"] = $orderDetails["order_date"];
}
$orderDetails["products"] = $orderProducts; $orderDetails["products"] = $orderProducts;
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($orderDetails["client_adresse"]);
$orderDetails["client_real_adress"] = $clientAdresses["address"];
$orderDetails["client_adress_city"] = $clientAdresses["city"];
return $orderDetails; return $orderDetails;
} }

17
gestion/lib/Service/Order/PdfHandler/OrderPdfHandler.php
View File

@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order\PdfHandler;
use DateTime; use DateTime;
use \FPDF; use \FPDF;
use OCA\Gestion\Constants\OrderTypeConstant;
use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\FileExportHelpers;
use OCA\Gestion\Helpers\PriceHelpers; use OCA\Gestion\Helpers\PriceHelpers;
@ -70,7 +71,7 @@ class OrderPdfHandler extends FPDF {
$this->SetFont('Arial', '', 12); $this->SetFont('Arial', '', 12);
$this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->orderData['configuration']->entreprise), 0, 0); $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->orderData['configuration']->entreprise), 0, 0);
$this->Cell(0, 7, FileExportHelpers::FormatTextForExport( $this->Cell(0, 7, FileExportHelpers::FormatTextForExport(
self::DEFAULT_SUBCONTRACTOR_NAME), $this->orderData['type']),
0, 1,'R'); 0, 1,'R');
$this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->orderData['configuration_adresse']), 0, 0); $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->orderData['configuration_adresse']), 0, 0);
$this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->orderData['client_real_adress'])), 0, 1,'R'); $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->orderData['client_real_adress'])), 0, 1,'R');
@ -93,9 +94,9 @@ class OrderPdfHandler extends FPDF {
$this->SetFont('Arial', '', 10); $this->SetFont('Arial', '', 10);
$this->Cell(45, 7, $this->orderData["order_date"], 1, 0, 'C'); $this->Cell(45, 7, $this->orderData["order_date"], 1, 0, 'C');
$this->Cell(65, 7, utf8_decode(html_entity_decode($this->orderData['lieu_nom'])), 1, 0, 'C'); $this->Cell(65, 7, FileExportHelpers::FormatTextForExport($this->orderData['lieu_nom'] ?? ""), 1, 0, 'C');
$this->Cell(40, 7, $this->orderData['order_full_number'], 1, 0, 'C'); $this->Cell(40, 7, $this->orderData['order_full_number'], 1, 0, 'C');
$this->Cell(40, 7, $this->orderData["order_date"], 1, 1, 'C'); $this->Cell(40, 7, $this->orderData["devis_date"], 1, 1, 'C');
$this->Ln(4); $this->Ln(4);
} }
@ -141,22 +142,22 @@ class OrderPdfHandler extends FPDF {
$products = $this->orderData["products"]; $products = $this->orderData["products"];
$yValue = 116; $yValue = 116;
foreach($products as $product){ foreach($products as $product){
$valueHt = $product['produit_ht_price']; $valueHt = $product['produit_price'] * $product['quantite'];
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue); $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);
$totalHt+=$valueHt; $totalHt+=$valueHt;
$totalTtc+=$valueTtc; $totalTtc+=$valueTtc;
$productDescription = $product["produit_description"]; $productDescription = $product["produit_reference"];
$dateValue = ""; $dateValue = "";
if($product === end($products)){ if($product === end($products) && $this->orderData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){
$dateValue = $this->orderData["order_date"]; $dateValue = $this->orderData["order_date"];
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->orderData['defunt_sexe']) . ' '. $this->orderData["defunt_nom"]; $productDescription .= " de " . $this->orderData["defunt_name_with_sexe"];
} }
$tvaAmount = $valueTtc - $valueHt; $tvaAmount = $valueTtc - $valueHt;
$this->SetXY( 10,$yValue ); $this->SetXY( 10,$yValue );
$this->Cell(20, 6, $dateValue, 0,0); $this->Cell(20, 6, $dateValue, 0,0);
$this->SetXY( 35,$yValue ); $this->SetXY( 35,$yValue );
$this->MultiAlignCell(100, 6, utf8_decode(html_entity_decode($productDescription)),0,'0',); $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($productDescription),0);
$this->SetXY( 135,$yValue ); $this->SetXY( 135,$yValue );
$this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');