From b9a28fcf28dbc44da87c9426eded9267a150b848 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Thu, 20 Feb 2025 11:41:03 +0300 Subject: [PATCH] finish order pdf , wip update quantity on order details --- gestion/lib/Constants/OrderPdfConstant.php | 9 ++++ gestion/lib/Db/OrderBdd.php | 3 +- gestion/lib/Service/Order/OrderPdfService.php | 51 ++++++++++++++----- gestion/lib/Service/Order/OrderService.php | 33 ++++++++++-- .../Order/PdfHandler/OrderPdfHandler.php | 17 ++++--- 5 files changed, 87 insertions(+), 26 deletions(-) create mode 100644 gestion/lib/Constants/OrderPdfConstant.php diff --git a/gestion/lib/Constants/OrderPdfConstant.php b/gestion/lib/Constants/OrderPdfConstant.php new file mode 100644 index 0000000..0e1e380 --- /dev/null +++ b/gestion/lib/Constants/OrderPdfConstant.php @@ -0,0 +1,9 @@ +orderTablePrefix."orders as orders LEFT JOIN ".$this->orderTablePrefix."devis as devis on orders.fk_devis_id = devis.id diff --git a/gestion/lib/Service/Order/OrderPdfService.php b/gestion/lib/Service/Order/OrderPdfService.php index 7544950..32113e3 100644 --- a/gestion/lib/Service/Order/OrderPdfService.php +++ b/gestion/lib/Service/Order/OrderPdfService.php @@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order; use DateTime; use OCA\Gestion\Constants\BddConstant; +use OCA\Gestion\Constants\OrderTypeConstant; use OCA\Gestion\Db\Bdd; use OCA\Gestion\Db\OrderBdd; use OCA\Gestion\Helpers\DateHelpers; @@ -80,28 +81,52 @@ class OrderPdfService { $orderDate = DateTime::createFromFormat('Y-m-d',$orderDate); $orderDate = $orderDate->format('d-m-Y'); $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; } private function getCommandeFolders($orderPdfData,$racinePath){ - $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($orderPdfData["client_entreprise"],'UTF-8').'/'; - $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($orderPdfData['defunt_nom'],'UTF-8').'/'.'FOURNISSEUR'.'/'; - $orderDate = $orderPdfData['order_date']; - $orderDatetime = new DateTime($orderDate); - $orderYear = $orderDatetime->format('Y'); - $orderMonth = DateHelpers::GetDateWithFormatDayAndMonthPlainString($orderPdfData['order_date']); - $orderByYearFolder = $clientRacineFolder."$orderYear".'/'.$orderMonth.'/'.'FOURNISSEUR'.'/'; - return [ - $defuntsFolder, - $orderByYearFolder - ]; + if($orderPdfData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){ + $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($orderPdfData["client_entreprise"],'UTF-8').'/'; + $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($orderPdfData['defunt_nom'],'UTF-8').'/'.'FOURNISSEUR'.'/'; + $orderDate = $orderPdfData['order_date']; + $orderDatetime = new DateTime($orderDate); + $orderYear = $orderDatetime->format('Y'); + $orderMonth = DateHelpers::GetDateWithFormatDayAndMonthPlainString($orderPdfData['order_date']); + $orderByYearFolder = $clientRacineFolder."$orderYear".'/'.$orderMonth.'/'.'FOURNISSEUR'.'/'; + return [ + $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){ $orderFullNumber = $orderPdfData['order_full_number']; $orderFullNumber = str_replace('/','-',$orderFullNumber); - $defuntNom = str_replace(' ',' ',$orderPdfData['defunt_nom']); - return "BDC".'_'.$orderFullNumber.'_'.mb_strtoupper($defuntNom,'UTF-8'); + $filename = "BDC_".$orderFullNumber."_"; + if($orderPdfData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){ + $defuntNom = str_replace(' ',' ',$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){ diff --git a/gestion/lib/Service/Order/OrderService.php b/gestion/lib/Service/Order/OrderService.php index 0f8d76e..77c4a31 100644 --- a/gestion/lib/Service/Order/OrderService.php +++ b/gestion/lib/Service/Order/OrderService.php @@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order; use DateTime; use OCA\Gestion\Constants\BddConstant; +use OCA\Gestion\Constants\OrderPdfConstant; use OCA\Gestion\Constants\OrderTypeConstant; use OCA\Gestion\Db\Bdd; use OCA\Gestion\Db\OrderBdd; @@ -120,11 +121,35 @@ class OrderService { if($orderDetails == 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; - $clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($orderDetails["client_adresse"]); - $orderDetails["client_real_adress"] = $clientAdresses["address"]; - $orderDetails["client_adress_city"] = $clientAdresses["city"]; + return $orderDetails; } diff --git a/gestion/lib/Service/Order/PdfHandler/OrderPdfHandler.php b/gestion/lib/Service/Order/PdfHandler/OrderPdfHandler.php index ab1f1cb..394b22a 100644 --- a/gestion/lib/Service/Order/PdfHandler/OrderPdfHandler.php +++ b/gestion/lib/Service/Order/PdfHandler/OrderPdfHandler.php @@ -28,6 +28,7 @@ namespace OCA\Gestion\Service\Order\PdfHandler; use DateTime; use \FPDF; +use OCA\Gestion\Constants\OrderTypeConstant; use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\PriceHelpers; @@ -70,7 +71,7 @@ class OrderPdfHandler extends FPDF { $this->SetFont('Arial', '', 12); $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->orderData['configuration']->entreprise), 0, 0); $this->Cell(0, 7, FileExportHelpers::FormatTextForExport( - self::DEFAULT_SUBCONTRACTOR_NAME), + $this->orderData['type']), 0, 1,'R'); $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'); @@ -93,9 +94,9 @@ class OrderPdfHandler extends FPDF { $this->SetFont('Arial', '', 10); $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_date"], 1, 1, 'C'); + $this->Cell(40, 7, $this->orderData["devis_date"], 1, 1, 'C'); $this->Ln(4); } @@ -141,22 +142,22 @@ class OrderPdfHandler extends FPDF { $products = $this->orderData["products"]; $yValue = 116; foreach($products as $product){ - $valueHt = $product['produit_ht_price']; + $valueHt = $product['produit_price'] * $product['quantite']; $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue); $totalHt+=$valueHt; $totalTtc+=$valueTtc; - $productDescription = $product["produit_description"]; + $productDescription = $product["produit_reference"]; $dateValue = ""; - if($product === end($products)){ + if($product === end($products) && $this->orderData["fk_order_type_key"] == OrderTypeConstant::ORDER_TYPE_DEVIS){ $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; $this->SetXY( 10,$yValue ); $this->Cell(20, 6, $dateValue, 0,0); $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->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');