Compare commits
6 Commits
ece8666881
...
de0ed31ccb
| Author | SHA1 | Date | |
|---|---|---|---|
|
de0ed31ccb | ||
|
|
39f7cb6247 | ||
|
|
fd2754c9eb | ||
|
|
69eea552fb | ||
|
|
4db0935d71 | ||
|
|
9f8c3dc8ec |
18
.gitignore
vendored
18
.gitignore
vendored
@ -1,25 +1,11 @@
|
|||||||
# Ignore tout par défaut
|
|
||||||
*
|
*
|
||||||
|
*.sql
|
||||||
|
|
||||||
# Exceptions : fichiers et dossiers à inclure
|
|
||||||
!.gitignore
|
!.gitignore
|
||||||
!Jenkinsfile
|
|
||||||
|
|
||||||
# Dossiers à inclure
|
|
||||||
!calendar/
|
!calendar/
|
||||||
!gestion/
|
!gestion/
|
||||||
|
!Jenkinsfile
|
||||||
|
|
||||||
# Inclure tout le contenu de ces dossiers
|
|
||||||
!calendar/**
|
!calendar/**
|
||||||
!gestion/**
|
!gestion/**
|
||||||
|
|
||||||
# Ignorer spécifiquement (même dans les dossiers inclus)
|
|
||||||
*.sql
|
|
||||||
node_modules/
|
|
||||||
**/node_modules/
|
|
||||||
**/package-lock.json
|
|
||||||
**/composer.lock
|
|
||||||
**/.env
|
|
||||||
**/.env.*
|
|
||||||
**/dist/
|
|
||||||
**/build/
|
|
||||||
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 it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,52 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace OCA\Gestion\Migration;
|
|
||||||
|
|
||||||
use Closure;
|
|
||||||
use OCP\DB\ISchemaWrapper;
|
|
||||||
use OCP\Migration\IOutput;
|
|
||||||
use OCP\Migration\SimpleMigrationStep;
|
|
||||||
use OCP\IDBConnection;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Migration pour ajouter le champ is_tva à la table oc_gestion_client
|
|
||||||
*/
|
|
||||||
class Version20001Date20250812120000 extends SimpleMigrationStep
|
|
||||||
{
|
|
||||||
private IDbConnection $db;
|
|
||||||
public function __construct(IDbConnection $db)
|
|
||||||
{
|
|
||||||
$this->db = $db;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* @param IOutput $output
|
|
||||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
|
||||||
* @param array $options
|
|
||||||
* @return null|ISchemaWrapper
|
|
||||||
*/
|
|
||||||
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper
|
|
||||||
{
|
|
||||||
/** @var ISchemaWrapper $schema */
|
|
||||||
$schema = $schemaClosure();
|
|
||||||
$tableprefix = "gestion_";
|
|
||||||
// Vérifier si la table existe
|
|
||||||
if ($schema->hasTable($tableprefix.'client')) {
|
|
||||||
$table = $schema->getTable($tableprefix.'client');
|
|
||||||
// Ajouter le champ is_tva s'il n'existe pas déjà
|
|
||||||
if (!$table->hasColumn('is_tva')) {
|
|
||||||
$table->addColumn('is_tva', 'smallint', [
|
|
||||||
'notnull' => true,
|
|
||||||
'default' => 1,
|
|
||||||
'comment' => 'Indique si le client est assujetti à la TVA (1=oui, 0=non)',
|
|
||||||
'unsigned' => true,
|
|
||||||
'length' => 1
|
|
||||||
]);
|
|
||||||
$output->info('Champ is_tva ajouté à la table gestion_client');
|
|
||||||
return $schema;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -27,17 +27,18 @@ declare(strict_types=1);
|
|||||||
namespace OCA\Gestion\Service\Devis\Pdf;
|
namespace OCA\Gestion\Service\Devis\Pdf;
|
||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use FPDF;
|
use \FPDF;
|
||||||
use OCA\Gestion\Helpers\FileExportHelpers;
|
use OCA\Gestion\Helpers\FileExportHelpers;
|
||||||
use OCA\Gestion\Helpers\PriceHelpers;
|
use OCA\Gestion\Helpers\PriceHelpers;
|
||||||
|
|
||||||
class DevisPdfHandler extends FPDF
|
class DevisPdfHandler extends FPDF
|
||||||
{
|
{
|
||||||
|
|
||||||
private $multipleDevisData = [];
|
private $multipleDevisData = [];
|
||||||
private $devisData = [];
|
private $devisData = [];
|
||||||
private $logo = null;
|
private $logo = null;
|
||||||
private $logoPath = "/var/www/html/data/admin/files/.gestion/";
|
private $logoPath = "/var/www/html/data/admin/files/.gestion/";
|
||||||
public function Header()
|
function Header()
|
||||||
{
|
{
|
||||||
if ($this->logo != "nothing") {
|
if ($this->logo != "nothing") {
|
||||||
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
|
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
|
||||||
@ -45,7 +46,7 @@ class DevisPdfHandler extends FPDF
|
|||||||
$this->Cell(55, 30, '');
|
$this->Cell(55, 30, '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public function Footer()
|
function Footer()
|
||||||
{
|
{
|
||||||
$this->SetY(-40);
|
$this->SetY(-40);
|
||||||
$this->SetFont('ComicSans', '', 7);
|
$this->SetFont('ComicSans', '', 7);
|
||||||
@ -118,82 +119,67 @@ class DevisPdfHandler extends FPDF
|
|||||||
|
|
||||||
private function DrawArticlesTableHeader()
|
private function DrawArticlesTableHeader()
|
||||||
{
|
{
|
||||||
$tvaDefault = $this->devisData["configuration"]->tva_default;
|
$tvaValue = $this->devisData["configuration"]->tva_default;
|
||||||
$clientTvaStatus = isset($this->devisData["tva"]) ? (int)$this->devisData["tva"] : 1;
|
|
||||||
|
|
||||||
// Déterminer le libellé TVA selon le statut du client
|
|
||||||
$tvaLabel = ($clientTvaStatus === 0) ? "TVA 0%" : "TVA " . $tvaDefault . "%";
|
|
||||||
|
|
||||||
$this->SetFont('ComicSans', '', 10);
|
$this->SetFont('ComicSans', '', 10);
|
||||||
$this->SetXY(10, 106);
|
$this->SetXY(10, 106);
|
||||||
$this->Cell(20, 8, "Date", 0, 0, 'C');
|
$this->Cell(20, 8, "Date", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(35, 106);
|
$this->SetXY(35, 106);
|
||||||
$this->Cell(100, 8, "Description", 0, 0, 'C');
|
$this->Cell(100, 8, "Description", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(135, 106);
|
$this->SetXY(135, 106);
|
||||||
$this->Cell(20, 8, "Prix Uni. HT", 0, 0, 'C');
|
$this->Cell(20, 8, "Prix Uni. HT", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(155, 106);
|
$this->SetXY(155, 106);
|
||||||
$this->Cell(20, 8, $tvaLabel, 0, 0, 'C');
|
$this->Cell(20, 8, 'TVA ' . $tvaValue . '%', 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(175, 106);
|
$this->SetXY(175, 106);
|
||||||
$this->Cell(25, 8, "Prix Uni. TTC", 0, 0, 'C');
|
$this->Cell(25, 8, "Prix Uni. TTC", 0, 0, 'C');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function DrawArticlesTableValueAndReturnTotalPrice()
|
public function DrawArticlesTableValueAndReturnTotalPrice()
|
||||||
{
|
{
|
||||||
$this->SetFont('ComicSans', '', 10);
|
$this->SetFont('ComicSans', '', 10);
|
||||||
$tvaDefault = $this->devisData["configuration"]->tva_default;
|
$tvaValue = $this->devisData["configuration"]->tva_default;
|
||||||
$clientTvaStatus = isset($this->devisData["tva"]) ? (int)$this->devisData["tva"] : 1;
|
|
||||||
|
|
||||||
// Déterminer le taux de TVA à appliquer selon le statut du client
|
|
||||||
$tvaValue = ($clientTvaStatus === 0) ? 0 : $tvaDefault;
|
|
||||||
$tvaLabel = ($clientTvaStatus === 0) ? "0%" : $tvaDefault . "%";
|
|
||||||
|
|
||||||
$totalHt = 0;
|
$totalHt = 0;
|
||||||
$totalTtc = 0;
|
$totalTtc = 0;
|
||||||
$totalTva = 0;
|
$totalTva = 0;
|
||||||
$products = $this->devisData["products"];
|
$products = $this->devisData["products"];
|
||||||
$yValue = 116;
|
$yValue = 116;
|
||||||
|
|
||||||
foreach ($products as $product) {
|
foreach ($products as $product) {
|
||||||
$valueHt = $product['produit_price'] * $product['quantite'];
|
$valueHt = $product['produit_price'] * $product['quantite'];
|
||||||
|
|
||||||
// Calculer la TVA selon le statut du client
|
|
||||||
if ($clientTvaStatus === 0) {
|
|
||||||
// Client exonéré - pas de TVA
|
|
||||||
$valueTtc = $valueHt;
|
|
||||||
$tvaAmount = 0;
|
|
||||||
} else {
|
|
||||||
// Client soumis à la TVA - utiliser le calcul normal
|
|
||||||
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
|
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
|
||||||
$tvaAmount = $valueTtc - $valueHt;
|
|
||||||
}
|
|
||||||
|
|
||||||
$totalHt += $valueHt;
|
$totalHt += $valueHt;
|
||||||
$totalTtc += $valueTtc;
|
$totalTtc += $valueTtc;
|
||||||
$totalTva += $tvaAmount;
|
|
||||||
|
|
||||||
$productDescription = $product["produit_description"];
|
$productDescription = $product["produit_description"];
|
||||||
$dateValue = "";
|
$dateValue = "";
|
||||||
if ($product === end($products)) {
|
if ($product === end($products)) {
|
||||||
$dateValue = $this->devisData['devis_date'];
|
$dateValue = $this->devisData['devis_date'];
|
||||||
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->devisData['defunt_sexe']) . ' ' . $this->devisData["defunt_nom"];
|
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->devisData['defunt_sexe']) . ' ' . $this->devisData["defunt_nom"];
|
||||||
}
|
}
|
||||||
|
$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, utf8_decode(html_entity_decode($productDescription)), 0, '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');
|
||||||
|
|
||||||
$this->SetXY(155, $yValue);
|
$this->SetXY(155, $yValue);
|
||||||
$this->Cell(20, 6, number_format($tvaAmount, 2, '.', '') . chr(128), 0, 0, 'C');
|
$this->Cell(20, 6, number_format($tvaAmount, 2, '.', '') . chr(128), 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(175, $yValue);
|
$this->SetXY(175, $yValue);
|
||||||
$this->Cell(25, 6, number_format($valueTtc, 2, '.', '') . chr(128), 0, 1, 'C');
|
$this->Cell(25, 6, number_format($valueTtc, 2, '.', '') . chr(128), 0, 1, 'C');
|
||||||
$yValue += 12;
|
$yValue += 12;
|
||||||
|
$totalTva += $tvaAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
"TOTAL HT" => $totalHt,
|
"TOTAL HT" => $totalHt,
|
||||||
"TVA " . $tvaLabel => $totalTva,
|
"TVA " . $tvaValue . "%" => $totalTva,
|
||||||
"TOTAL TTC" => $totalTtc
|
"TOTAL TTC" => $totalTtc
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@ -248,7 +234,7 @@ class DevisPdfHandler extends FPDF
|
|||||||
$this->DrawBankAndTotalPriceInfo($totalPriceValue);
|
$this->DrawBankAndTotalPriceInfo($totalPriceValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
|
function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
|
||||||
{
|
{
|
||||||
// Store reset values for (x,y) positions
|
// Store reset values for (x,y) positions
|
||||||
$x = $this->GetX() + $w;
|
$x = $this->GetX() + $w;
|
||||||
@ -263,22 +249,19 @@ class DevisPdfHandler extends FPDF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NbLines($w, $txt)
|
function NbLines($w, $txt)
|
||||||
{
|
{
|
||||||
// Compute the number of lines a MultiCell of width w will take
|
// Compute the number of lines a MultiCell of width w will take
|
||||||
if (!isset($this->CurrentFont)) {
|
if (!isset($this->CurrentFont))
|
||||||
$this->Error('No font has been set');
|
$this->Error('No font has been set');
|
||||||
}
|
|
||||||
$cw = $this->CurrentFont['cw'];
|
$cw = $this->CurrentFont['cw'];
|
||||||
if ($w == 0) {
|
if ($w == 0)
|
||||||
$w = $this->w - $this->rMargin - $this->x;
|
$w = $this->w - $this->rMargin - $this->x;
|
||||||
}
|
|
||||||
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
|
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
|
||||||
$s = str_replace("\r", '', (string) $txt);
|
$s = str_replace("\r", '', (string) $txt);
|
||||||
$nb = strlen($s);
|
$nb = strlen($s);
|
||||||
if ($nb > 0 && $s[$nb - 1] == "\n") {
|
if ($nb > 0 && $s[$nb - 1] == "\n")
|
||||||
$nb--;
|
$nb--;
|
||||||
}
|
|
||||||
$sep = -1;
|
$sep = -1;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$j = 0;
|
$j = 0;
|
||||||
@ -294,26 +277,22 @@ class DevisPdfHandler extends FPDF
|
|||||||
$nl++;
|
$nl++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($c == ' ') {
|
if ($c == ' ')
|
||||||
$sep = $i;
|
$sep = $i;
|
||||||
}
|
|
||||||
$l += $cw[$c];
|
$l += $cw[$c];
|
||||||
if ($l > $wmax) {
|
if ($l > $wmax) {
|
||||||
if ($sep == -1) {
|
if ($sep == -1) {
|
||||||
if ($i == $j) {
|
if ($i == $j)
|
||||||
$i++;
|
$i++;
|
||||||
}
|
} else
|
||||||
} else {
|
|
||||||
$i = $sep + 1;
|
$i = $sep + 1;
|
||||||
}
|
|
||||||
$sep = -1;
|
$sep = -1;
|
||||||
$j = $i;
|
$j = $i;
|
||||||
$l = 0;
|
$l = 0;
|
||||||
$nl++;
|
$nl++;
|
||||||
} else {
|
} else
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return $nl;
|
return $nl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,6 @@ declare(strict_types=1);
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\Gestion\Service\Devis\Pdf;
|
namespace OCA\Gestion\Service\Devis\Pdf;
|
||||||
|
|
||||||
require_once __DIR__ . '/../../../../vendor/autoload.php';
|
require_once __DIR__ . '/../../../../vendor/autoload.php';
|
||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
@ -91,7 +90,6 @@ class DevisPdfService
|
|||||||
private function formatDevisDataToPdfDataFormat($devis, $configuration)
|
private function formatDevisDataToPdfDataFormat($devis, $configuration)
|
||||||
{
|
{
|
||||||
$devisDate = $devis['devis_date'];
|
$devisDate = $devis['devis_date'];
|
||||||
$tva = isset($devis["tva"]) ? $devis["tva"] : 1;
|
|
||||||
$devisDate = DateTime::createFromFormat('Y-m-d', $devisDate);
|
$devisDate = DateTime::createFromFormat('Y-m-d', $devisDate);
|
||||||
$devisDate = $devisDate->format('d-m-Y');
|
$devisDate = $devisDate->format('d-m-Y');
|
||||||
$devis['devis_date'] = $devisDate;
|
$devis['devis_date'] = $devisDate;
|
||||||
@ -101,7 +99,6 @@ class DevisPdfService
|
|||||||
$firstClient = $this->gestionBdd->getFirstClient();
|
$firstClient = $this->gestionBdd->getFirstClient();
|
||||||
$devis["siret"] = $firstClient != null ? $firstClient['legal_one'] : '';
|
$devis["siret"] = $firstClient != null ? $firstClient['legal_one'] : '';
|
||||||
$devis["products"] = $products;
|
$devis["products"] = $products;
|
||||||
$devis["tva"] = $tva;
|
|
||||||
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($devis["client_adresse"]);
|
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($devis["client_adresse"]);
|
||||||
$devis["client_real_adress"] = $clientAdresses["address"];
|
$devis["client_real_adress"] = $clientAdresses["address"];
|
||||||
$devis["client_adress_city"] = $clientAdresses["city"];
|
$devis["client_adress_city"] = $clientAdresses["city"];
|
||||||
|
|||||||
@ -27,7 +27,7 @@ declare(strict_types=1);
|
|||||||
namespace OCA\Gestion\Service;
|
namespace OCA\Gestion\Service;
|
||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use FPDF;
|
use \FPDF;
|
||||||
use OCA\Gestion\Constants\MultipleFactureTypeConstant;
|
use OCA\Gestion\Constants\MultipleFactureTypeConstant;
|
||||||
use OCA\Gestion\Helpers\DateHelpers;
|
use OCA\Gestion\Helpers\DateHelpers;
|
||||||
use OCA\Gestion\Helpers\FileExportHelpers;
|
use OCA\Gestion\Helpers\FileExportHelpers;
|
||||||
@ -35,6 +35,7 @@ use OCA\Gestion\Helpers\PriceHelpers;
|
|||||||
|
|
||||||
class InvoicePdfHandler extends FPDF
|
class InvoicePdfHandler extends FPDF
|
||||||
{
|
{
|
||||||
|
|
||||||
private $multipleFactureData = [];
|
private $multipleFactureData = [];
|
||||||
private $factureData = [];
|
private $factureData = [];
|
||||||
private $logo = null;
|
private $logo = null;
|
||||||
@ -48,7 +49,7 @@ class InvoicePdfHandler extends FPDF
|
|||||||
private $articleTablesHeight = 130;
|
private $articleTablesHeight = 130;
|
||||||
|
|
||||||
public $interLigneHeader = 5;
|
public $interLigneHeader = 5;
|
||||||
public function Header()
|
function Header()
|
||||||
{
|
{
|
||||||
if ($this->logo != "nothing") {
|
if ($this->logo != "nothing") {
|
||||||
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
|
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
|
||||||
@ -58,7 +59,7 @@ class InvoicePdfHandler extends FPDF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function AddWatermark()
|
function AddWatermark()
|
||||||
{
|
{
|
||||||
$this->SetAlpha(0.2);
|
$this->SetAlpha(0.2);
|
||||||
|
|
||||||
@ -83,7 +84,7 @@ class InvoicePdfHandler extends FPDF
|
|||||||
$this->SetAlpha(0.1); // Définir l'opacité
|
$this->SetAlpha(0.1); // Définir l'opacité
|
||||||
}
|
}
|
||||||
|
|
||||||
public function SetAlpha($alpha)
|
function SetAlpha($alpha)
|
||||||
{
|
{
|
||||||
// Appliquer la transparence au document
|
// Appliquer la transparence au document
|
||||||
$this->SetFillColor(255, 255, 255, $alpha * 255);
|
$this->SetFillColor(255, 255, 255, $alpha * 255);
|
||||||
@ -92,7 +93,7 @@ class InvoicePdfHandler extends FPDF
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function Footer()
|
function Footer()
|
||||||
{
|
{
|
||||||
$this->SetY(-34);
|
$this->SetY(-34);
|
||||||
$this->SetFont('ComicSans', '', 7);
|
$this->SetFont('ComicSans', '', 7);
|
||||||
@ -282,22 +283,21 @@ class InvoicePdfHandler extends FPDF
|
|||||||
private function DrawArticlesTableHeader()
|
private function DrawArticlesTableHeader()
|
||||||
{
|
{
|
||||||
$additionalMargRight = 1;
|
$additionalMargRight = 1;
|
||||||
$tvaDefault = $this->factureData["configuration"]->tva_default;
|
$tvaValue = $this->factureData["configuration"]->tva_default;
|
||||||
$clientTvaStatus = isset($this->factureData["tva"]) ? (int)$this->factureData["tva"] : 1;
|
|
||||||
|
|
||||||
// Déterminer le libellé TVA selon le statut du client
|
|
||||||
$tvaLabel = ($clientTvaStatus === 0) ? "TVA 0%" : "TVA " . $tvaDefault . "%";
|
|
||||||
|
|
||||||
$columnNameY = $this->startingYOfArticlesTable - 1;
|
$columnNameY = $this->startingYOfArticlesTable - 1;
|
||||||
$this->SetFont('ComicSans', '', 10);
|
$this->SetFont('ComicSans', '', 10);
|
||||||
$this->SetXY(12 + $additionalMargRight, $columnNameY);
|
$this->SetXY(12 + $additionalMargRight, $columnNameY);
|
||||||
$this->Cell(7, 10, "Date", 0, 0, 'C');
|
$this->Cell(7, 10, "Date", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(30 + $additionalMargRight, $columnNameY);
|
$this->SetXY(30 + $additionalMargRight, $columnNameY);
|
||||||
$this->Cell(100, 10, "Description", 0, 0, 'C');
|
$this->Cell(100, 10, "Description", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(143 + $additionalMargRight, $columnNameY);
|
$this->SetXY(143 + $additionalMargRight, $columnNameY);
|
||||||
$this->Cell(20, 10, "Prix Uni. HT", 0, 0, 'C');
|
$this->Cell(20, 10, "Prix Uni. HT", 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(163 + $additionalMargRight, $columnNameY);
|
$this->SetXY(163 + $additionalMargRight, $columnNameY);
|
||||||
$this->Cell(20, 10, $tvaLabel, 0, 0, 'C');
|
$this->Cell(20, 10, 'TVA ' . $tvaValue . '%', 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(185, $columnNameY);
|
$this->SetXY(185, $columnNameY);
|
||||||
$this->Cell(20, 10, "Prix Uni. TTC", 0, 0, 'C');
|
$this->Cell(20, 10, "Prix Uni. TTC", 0, 0, 'C');
|
||||||
}
|
}
|
||||||
@ -308,62 +308,49 @@ class InvoicePdfHandler extends FPDF
|
|||||||
$devisDate = $this->factureData['devis_date'];
|
$devisDate = $this->factureData['devis_date'];
|
||||||
$devisDate = DateTime::createFromFormat('Y-m-d', $devisDate);
|
$devisDate = DateTime::createFromFormat('Y-m-d', $devisDate);
|
||||||
$devisDate = $devisDate->format('d-m-Y');
|
$devisDate = $devisDate->format('d-m-Y');
|
||||||
|
$tvaValue = $this->factureData["configuration"]->tva_default;
|
||||||
$tvaDefault = $this->factureData["configuration"]->tva_default;
|
|
||||||
$clientTvaStatus = isset($this->factureData["tva"]) ? (int)$this->factureData["tva"] : 1;
|
|
||||||
|
|
||||||
// Déterminer le taux de TVA à appliquer selon le statut du client
|
|
||||||
$tvaValue = ($clientTvaStatus === 0) ? 0 : $tvaDefault;
|
|
||||||
$tvaLabel = ($clientTvaStatus === 0) ? "0%" : $tvaDefault . "%";
|
|
||||||
|
|
||||||
$totalHt = 0;
|
$totalHt = 0;
|
||||||
$totalTtc = 0;
|
$totalTtc = 0;
|
||||||
$totalTva = 0;
|
$totalTva = 0;
|
||||||
$products = $this->factureData["products"];
|
$products = $this->factureData["products"];
|
||||||
$yValue = $this->startingYOfArticlesTable + 13;
|
$yValue = $this->startingYOfArticlesTable + 13;
|
||||||
$maxDescriptionWidth = 102;
|
$maxDescriptionWidth = 102;
|
||||||
|
|
||||||
foreach ($products as $product) {
|
foreach ($products as $product) {
|
||||||
|
|
||||||
$valueHt = $product['produit_price'] * $product['quantite'];
|
$valueHt = $product['produit_price'] * $product['quantite'];
|
||||||
|
|
||||||
// Calculer la TVA selon le statut du client
|
|
||||||
if ($clientTvaStatus === 0) {
|
|
||||||
// Client exonéré - pas de TVA
|
|
||||||
$valueTtc = $valueHt;
|
|
||||||
$tvaAmount = 0;
|
|
||||||
} else {
|
|
||||||
// Client soumis à la TVA - utiliser le calcul normal
|
|
||||||
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
|
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
|
||||||
$tvaAmount = $valueTtc - $valueHt;
|
|
||||||
}
|
|
||||||
|
|
||||||
$totalHt += $valueHt;
|
$totalHt += $valueHt;
|
||||||
$totalTtc += $valueTtc;
|
$totalTtc += $valueTtc;
|
||||||
$totalTva += $tvaAmount;
|
|
||||||
|
|
||||||
$productDescription = $product["produit_description"];
|
$productDescription = $product["produit_description"];
|
||||||
$dateValue = "";
|
$dateValue = "";
|
||||||
if ($product === end($products)) {
|
if ($product === end($products)) {
|
||||||
$dateValue = $devisDate;
|
$dateValue = $devisDate;
|
||||||
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->factureData['defunt_sexe']) . ' ' . $this->factureData["defunt_nom"];
|
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->factureData['defunt_sexe']) . ' ' . $this->factureData["defunt_nom"];
|
||||||
}
|
}
|
||||||
|
$tvaAmount = $valueTtc - $valueHt;
|
||||||
$this->SetXY(5, $yValue);
|
$this->SetXY(5, $yValue);
|
||||||
$this->Cell(5, 6, $dateValue, 0, 0);
|
$this->Cell(5, 6, $dateValue, 0, 0);
|
||||||
|
|
||||||
$this->SetXY(30, $yValue);
|
$this->SetXY(30, $yValue);
|
||||||
$this->MultiAlignCell($maxDescriptionWidth, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0', );
|
$this->MultiAlignCell($maxDescriptionWidth, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0', );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$this->SetXY(144, $yValue);
|
$this->SetXY(144, $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');
|
||||||
|
|
||||||
$this->SetXY(165, $yValue);
|
$this->SetXY(165, $yValue);
|
||||||
$this->Cell(20, 6, number_format($tvaAmount, 2, '.', '') . chr(128), 0, 0, 'C');
|
$this->Cell(20, 6, number_format($tvaAmount, 2, '.', '') . chr(128), 0, 0, 'C');
|
||||||
|
|
||||||
$this->SetXY(182, $yValue);
|
$this->SetXY(182, $yValue);
|
||||||
$this->Cell(25, 6, number_format($valueTtc, 2, '.', '') . chr(128), 0, 1, 'C');
|
$this->Cell(25, 6, number_format($valueTtc, 2, '.', '') . chr(128), 0, 1, 'C');
|
||||||
$yValue += 12;
|
$yValue += 12;
|
||||||
|
$totalTva += $tvaAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
"TOTAL HT" => $totalHt,
|
"TOTAL HT" => $totalHt,
|
||||||
"TVA " . $tvaLabel => $totalTva,
|
"TVA " . $tvaValue . "%" => $totalTva,
|
||||||
"TOTAL TTC" => $totalTtc
|
"TOTAL TTC" => $totalTtc
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@ -426,7 +413,7 @@ class InvoicePdfHandler extends FPDF
|
|||||||
$this->DrawBankAndTotalPriceInfo($totalPriceValue);
|
$this->DrawBankAndTotalPriceInfo($totalPriceValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
|
function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
|
||||||
{
|
{
|
||||||
// Store reset values for (x,y) positions
|
// Store reset values for (x,y) positions
|
||||||
$x = $this->GetX() + $w;
|
$x = $this->GetX() + $w;
|
||||||
@ -441,22 +428,19 @@ class InvoicePdfHandler extends FPDF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function NbLines($w, $txt)
|
function NbLines($w, $txt)
|
||||||
{
|
{
|
||||||
// Compute the number of lines a MultiCell of width w will take
|
// Compute the number of lines a MultiCell of width w will take
|
||||||
if (!isset($this->CurrentFont)) {
|
if (!isset($this->CurrentFont))
|
||||||
$this->Error('No font has been set');
|
$this->Error('No font has been set');
|
||||||
}
|
|
||||||
$cw = $this->CurrentFont['cw'];
|
$cw = $this->CurrentFont['cw'];
|
||||||
if ($w == 0) {
|
if ($w == 0)
|
||||||
$w = $this->w - $this->rMargin - $this->x;
|
$w = $this->w - $this->rMargin - $this->x;
|
||||||
}
|
|
||||||
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
|
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
|
||||||
$s = str_replace("\r", '', (string) $txt);
|
$s = str_replace("\r", '', (string) $txt);
|
||||||
$nb = strlen($s);
|
$nb = strlen($s);
|
||||||
if ($nb > 0 && $s[$nb - 1] == "\n") {
|
if ($nb > 0 && $s[$nb - 1] == "\n")
|
||||||
$nb--;
|
$nb--;
|
||||||
}
|
|
||||||
$sep = -1;
|
$sep = -1;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$j = 0;
|
$j = 0;
|
||||||
@ -472,26 +456,22 @@ class InvoicePdfHandler extends FPDF
|
|||||||
$nl++;
|
$nl++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($c == ' ') {
|
if ($c == ' ')
|
||||||
$sep = $i;
|
$sep = $i;
|
||||||
}
|
|
||||||
$l += $cw[$c];
|
$l += $cw[$c];
|
||||||
if ($l > $wmax) {
|
if ($l > $wmax) {
|
||||||
if ($sep == -1) {
|
if ($sep == -1) {
|
||||||
if ($i == $j) {
|
if ($i == $j)
|
||||||
$i++;
|
$i++;
|
||||||
}
|
} else
|
||||||
} else {
|
|
||||||
$i = $sep + 1;
|
$i = $sep + 1;
|
||||||
}
|
|
||||||
$sep = -1;
|
$sep = -1;
|
||||||
$j = $i;
|
$j = $i;
|
||||||
$l = 0;
|
$l = 0;
|
||||||
$nl++;
|
$nl++;
|
||||||
} else {
|
} else
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return $nl;
|
return $nl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,8 +41,7 @@ use OCA\Gestion\Service\InvoiceRecap\InvoiceRecapService;
|
|||||||
use OCP\DB\Exception;
|
use OCP\DB\Exception;
|
||||||
use OCP\Files\IRootFolder;
|
use OCP\Files\IRootFolder;
|
||||||
|
|
||||||
class InvoicePdfService
|
class InvoicePdfService {
|
||||||
{
|
|
||||||
/** @var Bdd */
|
/** @var Bdd */
|
||||||
private $gestionBdd;
|
private $gestionBdd;
|
||||||
|
|
||||||
@ -56,15 +55,13 @@ class InvoicePdfService
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
Bdd $gestionBdd,
|
Bdd $gestionBdd,
|
||||||
IRootFolder $rootFolder,
|
IRootFolder $rootFolder,
|
||||||
InvoiceRecapService $invoiceRecapService
|
InvoiceRecapService $invoiceRecapService) {
|
||||||
) {
|
|
||||||
$this->gestionBdd = $gestionBdd;
|
$this->gestionBdd = $gestionBdd;
|
||||||
$this->rootFolder = $rootFolder;
|
$this->rootFolder = $rootFolder;
|
||||||
$this->invoiceRecapService = $invoiceRecapService;
|
$this->invoiceRecapService = $invoiceRecapService;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getLogo()
|
private function getLogo(){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
||||||
try{
|
try{
|
||||||
try {
|
try {
|
||||||
@ -76,15 +73,15 @@ class InvoicePdfService
|
|||||||
} catch(\OCP\Files\NotFoundException $e) {
|
} catch(\OCP\Files\NotFoundException $e) {
|
||||||
$file = $storage->get('/.gestion/logo.jpeg');
|
$file = $storage->get('/.gestion/logo.jpeg');
|
||||||
}
|
}
|
||||||
} catch(\OCP\Files\NotFoundException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotFoundException $e) {
|
||||||
return "nothing";
|
return "nothing";
|
||||||
}
|
}
|
||||||
|
|
||||||
return base64_encode($file->getContent());
|
return base64_encode($file->getContent());
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateFactureSinglePdfByFactureId($factureId, $idNextCloud)
|
private function generateFactureSinglePdfByFactureId($factureId,$idNextCloud){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
||||||
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
||||||
$currentConfig = $configs[0];
|
$currentConfig = $configs[0];
|
||||||
@ -111,7 +108,8 @@ class InvoicePdfService
|
|||||||
foreach($factureFolders as $folder){
|
foreach($factureFolders as $folder){
|
||||||
try {
|
try {
|
||||||
$storage->newFolder($folder);
|
$storage->newFolder($folder);
|
||||||
} catch(\OCP\Files\NotPermittedException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotPermittedException $e) {
|
||||||
}
|
}
|
||||||
$ff_pdf = $folder.$pdfFilename.'.pdf';
|
$ff_pdf = $folder.$pdfFilename.'.pdf';
|
||||||
$storage->newFile($ff_pdf);
|
$storage->newFile($ff_pdf);
|
||||||
@ -126,18 +124,17 @@ class InvoicePdfService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateFacturePdfByFactureId($factureId, $idNextCloud)
|
public function generateFacturePdfByFactureId($factureId,$idNextCloud){
|
||||||
{
|
|
||||||
$factureType = $this->gestionBdd->getFactureTypeByFactureId($factureId);
|
$factureType = $this->gestionBdd->getFactureTypeByFactureId($factureId);
|
||||||
if($factureType == FactureTypeConstant::TYPE_SINGLE){
|
if($factureType == FactureTypeConstant::TYPE_SINGLE){
|
||||||
return $this->generateFactureSinglePdfByFactureId($factureId,$idNextCloud);
|
return $this->generateFactureSinglePdfByFactureId($factureId,$idNextCloud);
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
return $this->generateFactureGroupPdfByFactureId($factureId,$idNextCloud);
|
return $this->generateFactureGroupPdfByFactureId($factureId,$idNextCloud);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getGroupFactureFolder(array $factureData, $racinePath)
|
private function getGroupFactureFolder(array $factureData,$racinePath){
|
||||||
{
|
|
||||||
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["group_name"],'UTF-8').'/';
|
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["group_name"],'UTF-8').'/';
|
||||||
$factureDate = $factureData['date_paiement'];
|
$factureDate = $factureData['date_paiement'];
|
||||||
$factureDatetime = new DateTime($factureDate);
|
$factureDatetime = new DateTime($factureDate);
|
||||||
@ -149,8 +146,7 @@ class InvoicePdfService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getFacturesFolder(array $factureData, $racinePath)
|
private function getFacturesFolder(array $factureData,$racinePath){
|
||||||
{
|
|
||||||
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_nom"],'UTF-8').'/';
|
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_nom"],'UTF-8').'/';
|
||||||
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
|
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
|
||||||
$devisDate = $factureData['devis_date'];
|
$devisDate = $factureData['devis_date'];
|
||||||
@ -164,8 +160,7 @@ class InvoicePdfService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateFactureGroupPdfByFactureId($factureId, $idNextCloud)
|
private function generateFactureGroupPdfByFactureId($factureId,$idNextCloud){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
||||||
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
||||||
$currentConfig = $configs[0];
|
$currentConfig = $configs[0];
|
||||||
@ -203,7 +198,8 @@ class InvoicePdfService
|
|||||||
foreach($factureFolders as $folder){
|
foreach($factureFolders as $folder){
|
||||||
try {
|
try {
|
||||||
$storage->newFolder($folder);
|
$storage->newFolder($folder);
|
||||||
} catch(\OCP\Files\NotPermittedException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotPermittedException $e) {
|
||||||
}
|
}
|
||||||
$ff_pdf = $folder.$pdfFilename.'.pdf';
|
$ff_pdf = $folder.$pdfFilename.'.pdf';
|
||||||
$storage->newFile($ff_pdf);
|
$storage->newFile($ff_pdf);
|
||||||
@ -218,15 +214,13 @@ class InvoicePdfService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateFacturePdfByFactureIds(array $factureIds, $idNextCloud)
|
public function generateFacturePdfByFactureIds(array $factureIds,$idNextCloud){
|
||||||
{
|
|
||||||
foreach( $factureIds as $factureId ){
|
foreach( $factureIds as $factureId ){
|
||||||
$this->generateFacturePdfByFactureId($factureId,$idNextCloud);
|
$this->generateFacturePdfByFactureId($factureId,$idNextCloud);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateMultipleInvoicePdfByClientAndMonthYear($filter, $month, $year, $idNextCloud, $filterType)
|
public function generateMultipleInvoicePdfByClientAndMonthYear($filter,$month,$year,$idNextCloud,$filterType){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
$storage = $this->rootFolder->getUserFolder($idNextCloud);
|
||||||
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
$configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
|
||||||
$currentConfig = $configs[0];
|
$currentConfig = $configs[0];
|
||||||
@ -253,7 +247,8 @@ class InvoicePdfService
|
|||||||
$pdfContent = $pdf->Output('','S');
|
$pdfContent = $pdf->Output('','S');
|
||||||
try {
|
try {
|
||||||
$storage->newFolder($clientRacineFolder);
|
$storage->newFolder($clientRacineFolder);
|
||||||
} catch(\OCP\Files\NotPermittedException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotPermittedException $e) {
|
||||||
}
|
}
|
||||||
$storage->newFile($filenamePath);
|
$storage->newFile($filenamePath);
|
||||||
$file_pdf = $storage->get($filenamePath);
|
$file_pdf = $storage->get($filenamePath);
|
||||||
@ -261,13 +256,11 @@ class InvoicePdfService
|
|||||||
return $filenamePath;
|
return $filenamePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateInvoiceRecap($filter, $filterType, $date, $idNextCloud)
|
public function generateInvoiceRecap($filter,$filterType,$date,$idNextCloud){
|
||||||
{
|
|
||||||
$this->invoiceRecapService->generateInvoiceRecap($filter,$filterType,$date,$idNextCloud);
|
$this->invoiceRecapService->generateInvoiceRecap($filter,$filterType,$date,$idNextCloud);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function exportGroupOfDevisIntoFacture($clientId, $clientType, $month, $year, $facturationDate, $idNextcloud = BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD)
|
public function exportGroupOfDevisIntoFacture($clientId,$clientType,$month,$year,$facturationDate,$idNextcloud = BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
|
||||||
{
|
|
||||||
try{
|
try{
|
||||||
$datetime = new Datetime();
|
$datetime = new Datetime();
|
||||||
$month = $month ?? $datetime->format('m');
|
$month = $month ?? $datetime->format('m');
|
||||||
@ -333,7 +326,8 @@ class InvoicePdfService
|
|||||||
return $factureGeneratedResponse["filenames"];
|
return $factureGeneratedResponse["filenames"];
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
} catch(Exception) {
|
}
|
||||||
|
catch(Exception){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -31,12 +31,11 @@ use OCA\Gestion\Constants\MultipleFactureTypeConstant;
|
|||||||
use OCA\Gestion\Db\Bdd;
|
use OCA\Gestion\Db\Bdd;
|
||||||
use OCA\Gestion\Helpers\DateHelpers;
|
use OCA\Gestion\Helpers\DateHelpers;
|
||||||
use OCP\Files\IRootFolder;
|
use OCP\Files\IRootFolder;
|
||||||
use FPDF;
|
use \FPDF;
|
||||||
use IntlDateFormatter;
|
use IntlDateFormatter;
|
||||||
use OCA\Gestion\Helpers\FileExportHelpers;
|
use OCA\Gestion\Helpers\FileExportHelpers;
|
||||||
|
|
||||||
class InvoiceRecapService
|
class InvoiceRecapService {
|
||||||
{
|
|
||||||
/** @var Bdd */
|
/** @var Bdd */
|
||||||
private $gestionBdd;
|
private $gestionBdd;
|
||||||
|
|
||||||
@ -48,14 +47,12 @@ class InvoiceRecapService
|
|||||||
private const DEFAULT_NEXTCLOUD_ADMIN = "admin";
|
private const DEFAULT_NEXTCLOUD_ADMIN = "admin";
|
||||||
public function __construct(
|
public function __construct(
|
||||||
Bdd $gestionBdd,
|
Bdd $gestionBdd,
|
||||||
IRootFolder $rootFolder
|
IRootFolder $rootFolder) {
|
||||||
) {
|
|
||||||
$this->gestionBdd = $gestionBdd;
|
$this->gestionBdd = $gestionBdd;
|
||||||
$this->rootFolder = $rootFolder;
|
$this->rootFolder = $rootFolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function doesSignatureImageExists()
|
private function doesSignatureImageExists(){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
||||||
try{
|
try{
|
||||||
if(isset($storage)){
|
if(isset($storage)){
|
||||||
@ -64,14 +61,14 @@ class InvoiceRecapService
|
|||||||
}else{
|
}else{
|
||||||
$signatureExist = false;
|
$signatureExist = false;
|
||||||
}
|
}
|
||||||
} catch(\OCP\Files\NotFoundException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotFoundException $e) {
|
||||||
$signatureExist = false;
|
$signatureExist = false;
|
||||||
}
|
}
|
||||||
return $signatureExist;
|
return $signatureExist;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function doesLogoExist()
|
private function doesLogoExist(){
|
||||||
{
|
|
||||||
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
$storage = $this->rootFolder->getUserFolder(self::DEFAULT_NEXTCLOUD_ADMIN);
|
||||||
try{
|
try{
|
||||||
if(isset($storage)){
|
if(isset($storage)){
|
||||||
@ -80,13 +77,13 @@ class InvoiceRecapService
|
|||||||
}else{
|
}else{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} catch(\OCP\Files\NotFoundException $e) {
|
}
|
||||||
|
catch(\OCP\Files\NotFoundException $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateInvoiceRecapPerClientGroupFacturation($clientGroupId, $date, $idNextcloud)
|
private function generateInvoiceRecapPerClientGroupFacturation($clientGroupId,$date,$idNextcloud){
|
||||||
{
|
|
||||||
$data_factures = [];
|
$data_factures = [];
|
||||||
$storage = $this->rootFolder->getUserFolder($idNextcloud);
|
$storage = $this->rootFolder->getUserFolder($idNextcloud);
|
||||||
$doesLogoExist = $this->doesLogoExist();
|
$doesLogoExist = $this->doesLogoExist();
|
||||||
@ -96,7 +93,7 @@ class InvoiceRecapService
|
|||||||
$configurationAddress = $configurationAddresses["address"];
|
$configurationAddress = $configurationAddresses["address"];
|
||||||
$configurationAddressCity = $configurationAddresses["city"];
|
$configurationAddressCity = $configurationAddresses["city"];
|
||||||
$factures = json_decode($this->gestionBdd->getClientFacturesByClientGroupFacturationIdAndDate($clientGroupId,$date));
|
$factures = json_decode($this->gestionBdd->getClientFacturesByClientGroupFacturationIdAndDate($clientGroupId,$date));
|
||||||
$factures = array_filter($factures, callback: function ($facture) {return $facture->id_client != null; });
|
$factures = array_filter($factures, callback: function($facture) {return $facture->id_client != NULL; });
|
||||||
$clientGroupFacturation = $this->gestionBdd->getClientGroupFacturationById($clientGroupId);
|
$clientGroupFacturation = $this->gestionBdd->getClientGroupFacturationById($clientGroupId);
|
||||||
if($clientGroupFacturation == null){
|
if($clientGroupFacturation == null){
|
||||||
return null;
|
return null;
|
||||||
@ -145,7 +142,7 @@ class InvoiceRecapService
|
|||||||
$data_temp = array();
|
$data_temp = array();
|
||||||
foreach ($data_factures as $key => $facture) {
|
foreach ($data_factures as $key => $facture) {
|
||||||
$datesplit = explode('-', $facture['date_facture']);
|
$datesplit = explode('-', $facture['date_facture']);
|
||||||
if($data_temp[strval($datesplit[0])][strval($datesplit[1])] == null) {
|
if($data_temp[strval($datesplit[0])][strval($datesplit[1])]==NULL) {
|
||||||
$data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0=>$facture);
|
$data_temp[strval($datesplit[0])][strval($datesplit[1])] = array(0=>$facture);
|
||||||
} else {
|
} else {
|
||||||
array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])], $facture);
|
array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])], $facture);
|
||||||
@ -164,13 +161,12 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
$storage->newFolder(html_entity_decode($defaultConfig[0]->path).'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'/');
|
$storage->newFolder(html_entity_decode($defaultConfig[0]->path).'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'/');
|
||||||
} catch(\OCP\Files\NotPermittedException $e) {
|
} catch(\OCP\Files\NotPermittedException $e) { }
|
||||||
}
|
|
||||||
|
|
||||||
$pdf->AddPage();
|
$pdf->AddPage();
|
||||||
$pdf->SetLineWidth(0.2);
|
$pdf->SetLineWidth(0.2);
|
||||||
// on sup les 2 cm en bas
|
// on sup les 2 cm en bas
|
||||||
$pdf->SetAutoPagebreak(false);
|
$pdf->SetAutoPagebreak(False);
|
||||||
$pdf->SetMargins(0,0,0);
|
$pdf->SetMargins(0,0,0);
|
||||||
|
|
||||||
// logo : 80 de largeur et 55 de hauteur
|
// logo : 80 de largeur et 55 de hauteur
|
||||||
@ -227,39 +223,26 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
// observations
|
// observations
|
||||||
$objetYAxis = 110;
|
$objetYAxis = 110;
|
||||||
$pdf->SetFont("ComicSans", "BU", 10);
|
$pdf->SetFont( "ComicSans", "BU", 10 ); $pdf->SetXY( 10, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
|
||||||
$pdf->SetXY(10, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
|
|
||||||
$objet = utf8_decode("Récapitulatif Facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]));
|
$objet = utf8_decode("Récapitulatif Facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]));
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($objet), 0, $objet, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($objet), 0, $objet, 0, "L");
|
|
||||||
|
|
||||||
$objetYAxis += 10;
|
$objetYAxis += 10;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ); $pdf->Cell($pdf->GetStringWidth("Madame, Monsieur"), 0, "Madame, Monsieur", 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis);
|
|
||||||
$pdf->Cell($pdf->GetStringWidth("Madame, Monsieur"), 0, "Madame, Monsieur", 0, "L");
|
|
||||||
|
|
||||||
$text1 = utf8_decode("Veuillez trouver ci-dessous le récapitulatif de la facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).".";
|
$text1 = utf8_decode("Veuillez trouver ci-dessous le récapitulatif de la facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).".";
|
||||||
$text2 = utf8_decode("Vous en souhaitant bonne réception.");
|
$text2 = utf8_decode("Vous en souhaitant bonne réception.");
|
||||||
$text3 = utf8_decode("Veuillez agréer, Madame, Monsieur, mes salutations les meilleures.");
|
$text3 = utf8_decode("Veuillez agréer, Madame, Monsieur, mes salutations les meilleures.");
|
||||||
|
|
||||||
$objetYAxis += 10;
|
$objetYAxis += 10;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text1), 0, $text1, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text1), 0, $text1, 0, "L");
|
|
||||||
$objetYAxis += 5;
|
$objetYAxis += 5;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text2), 0, $text2, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text2), 0, $text2, 0, "L");
|
|
||||||
$objetYAxis += 5;
|
$objetYAxis += 5;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text3), 0, $text3, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text3), 0, $text3, 0, "L");
|
|
||||||
|
|
||||||
// signature
|
// signature
|
||||||
$pdf->SetFont('ComicSans', '', 11);
|
$pdf->SetFont('ComicSans','',11); $pdf->SetXY( 145, 170);
|
||||||
$pdf->SetXY(145, 170);
|
|
||||||
$pdf->Cell( $pdf->GetStringWidth($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom), 0, utf8_decode(html_entity_decode($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom)), 0, 0, 'L');
|
$pdf->Cell( $pdf->GetStringWidth($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom), 0, utf8_decode(html_entity_decode($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom)), 0, 0, 'L');
|
||||||
if($doesSignatureExist){
|
if($doesSignatureExist){
|
||||||
$pdf->Image($this->defaultImagePath."sign.png", 140, 175, 45,30);
|
$pdf->Image($this->defaultImagePath."sign.png", 140, 175, 45,30);
|
||||||
@ -270,12 +253,9 @@ class InvoiceRecapService
|
|||||||
//Positionnement en bas et tout centrer
|
//Positionnement en bas et tout centrer
|
||||||
$pdf->SetFont('ComicSans','',6);
|
$pdf->SetFont('ComicSans','',6);
|
||||||
|
|
||||||
$pdf->SetXY(1, $y0 + 4);
|
$pdf->SetXY( 1, $y0 + 4 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 8 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 8);
|
$pdf->SetXY( 1, $y0 + 12 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(1, $y0 + 12);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
|
||||||
|
|
||||||
/*$pdf->SetXY( 1, $y0 + 16 );
|
/*$pdf->SetXY( 1, $y0 + 16 );
|
||||||
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
||||||
@ -292,7 +272,7 @@ class InvoiceRecapService
|
|||||||
while ($num_page <= $nb_page) {
|
while ($num_page <= $nb_page) {
|
||||||
$pdf->AddPage();
|
$pdf->AddPage();
|
||||||
// on sup les 2 cm en bas
|
// on sup les 2 cm en bas
|
||||||
$pdf->SetAutoPagebreak(false);
|
$pdf->SetAutoPagebreak(False);
|
||||||
$pdf->SetMargins(0,0,10);
|
$pdf->SetMargins(0,0,10);
|
||||||
|
|
||||||
if($doesLogoExist){
|
if($doesLogoExist){
|
||||||
@ -320,9 +300,7 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
// n° page en haute à droite
|
// n° page en haute à droite
|
||||||
if($nb_page>1){
|
if($nb_page>1){
|
||||||
$pdf->SetXY(120, 5);
|
$pdf->SetXY( 120, 5 ); $pdf->SetFont( "ComicSans", "B", 9 ); $pdf->Cell( 160, 8, $num_page . '/' . $nb_page, 0, 0, 'C');
|
||||||
$pdf->SetFont("ComicSans", "B", 9);
|
|
||||||
$pdf->Cell(160, 8, $num_page . '/' . $nb_page, 0, 0, 'C');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// adresse du facture
|
// adresse du facture
|
||||||
@ -366,34 +344,21 @@ class InvoiceRecapService
|
|||||||
$pdf->Line(25, 80, 25, 225);
|
$pdf->Line(25, 80, 25, 225);
|
||||||
$pdf->Line(46, 80, 46, 225);
|
$pdf->Line(46, 80, 46, 225);
|
||||||
$pdf->Line(99, 80, 99, 225);
|
$pdf->Line(99, 80, 99, 225);
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$pdf->Line(183, 80, 183, 233);
|
$pdf->Line(183, 80, 183, 233);
|
||||||
$pdf->Line(25, 80, 25, 233);
|
$pdf->Line(25, 80, 25, 233);
|
||||||
$pdf->Line(46, 80, 46, 233);
|
$pdf->Line(46, 80, 46, 233);
|
||||||
$pdf->Line(99, 80, 99, 233);
|
$pdf->Line(99, 80, 99, 233);
|
||||||
}
|
}
|
||||||
// titre colonne
|
// titre colonne
|
||||||
$pdf->SetXY(1, 81);
|
$pdf->SetXY( 1, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 30, 8, FileExportHelpers::FormatTextForExport("N°"), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetXY( 26, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 18, 8, "Date", 0, 0, 'C');
|
||||||
$pdf->Cell(30, 8, FileExportHelpers::FormatTextForExport("N°"), 0, 0, 'C');
|
$pdf->SetXY( 47, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 50, 8, FileExportHelpers::FormatTextForExport("Défunt"), 0, 0, 'C');
|
||||||
$pdf->SetXY(26, 81);
|
$pdf->SetXY( 100, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 45, 8, FileExportHelpers::FormatTextForExport("Articles"), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetXY( 147, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 13, 8, "H.T.", 0, 0, 'C');
|
||||||
$pdf->Cell(18, 8, "Date", 0, 0, 'C');
|
$pdf->SetXY( 168, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 10, 8, "TVA 20%", 0, 0, 'C');
|
||||||
$pdf->SetXY(47, 81);
|
$pdf->SetXY( 183, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 22, 8, "T.T.C", 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(50, 8, FileExportHelpers::FormatTextForExport("Défunt"), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(100, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(45, 8, FileExportHelpers::FormatTextForExport("Articles"), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(147, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(13, 8, "H.T.", 0, 0, 'C');
|
|
||||||
$pdf->SetXY(168, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(10, 8, "TVA 20%", 0, 0, 'C');
|
|
||||||
$pdf->SetXY(183, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(22, 8, "T.T.C", 0, 0, 'C');
|
|
||||||
|
|
||||||
// (new DateTime($facture['date_soin']))->format('d-M')
|
// (new DateTime($facture['date_soin']))->format('d-M')
|
||||||
$formatter_ds = new IntlDateFormatter('fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
|
$formatter_ds = new IntlDateFormatter('fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
|
||||||
@ -411,31 +376,20 @@ class InvoiceRecapService
|
|||||||
$defuntNameText = $mois[$index_facture_position]['defunt'];
|
$defuntNameText = $mois[$index_facture_position]['defunt'];
|
||||||
$defuntNameTextWidth = $pdf->GetStringWidth($defuntNameText);
|
$defuntNameTextWidth = $pdf->GetStringWidth($defuntNameText);
|
||||||
$defuntNameTextIsMultiline = $defuntNameTextWidth >= 50;
|
$defuntNameTextIsMultiline = $defuntNameTextWidth >= 50;
|
||||||
$pdf->SetXY(6, $y_facture);
|
$pdf->SetXY( 6, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, $mois[$index_facture_position]['num'], 0, 0, '');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetXY( 29, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
|
||||||
$pdf->Cell(28, 5, $mois[$index_facture_position]['num'], 0, 0, '');
|
|
||||||
$pdf->SetXY(29, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(28, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
|
|
||||||
$pdf->SetXY( 47, $y_facture );
|
$pdf->SetXY( 47, $y_facture );
|
||||||
$pdf->SetFont('ComicSans','',8);
|
$pdf->SetFont('ComicSans','',8);
|
||||||
if($defuntNameTextIsMultiline){
|
if($defuntNameTextIsMultiline){
|
||||||
$pdf->MultiCell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0,'L');
|
$pdf->MultiCell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0,'L');
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$pdf->Cell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0);
|
$pdf->Cell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0);
|
||||||
}
|
}
|
||||||
$pdf->SetXY(100, $y_facture);
|
$pdf->SetXY( 100, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 38, 5, FileExportHelpers::FormatTextForExport($mois[$index_facture_position]['produit_references']), 0, 0, '');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetXY( 147, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 13, 5, number_format($mois[$index_facture_position]['montant_htc'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->Cell(38, 5, FileExportHelpers::FormatTextForExport($mois[$index_facture_position]['produit_references']), 0, 0, '');
|
$pdf->SetXY( 168, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 10, 5, number_format($mois[$index_facture_position]['montant_tva'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetXY(147, $y_facture);
|
$pdf->SetXY( 183, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 22, 5, number_format($mois[$index_facture_position]['montant_ttc'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(13, 5, number_format($mois[$index_facture_position]['montant_htc'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(168, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(10, 5, number_format($mois[$index_facture_position]['montant_tva'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(183, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(22, 5, number_format($mois[$index_facture_position]['montant_ttc'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
|
|
||||||
$montant_ht_total = $montant_ht_total+$mois[$index_facture_position]['montant_htc'];
|
$montant_ht_total = $montant_ht_total+$mois[$index_facture_position]['montant_htc'];
|
||||||
$montant_tva_total = $montant_tva_total+$mois[$index_facture_position]['montant_tva'];
|
$montant_tva_total = $montant_tva_total+$mois[$index_facture_position]['montant_tva'];
|
||||||
@ -452,27 +406,16 @@ class InvoiceRecapService
|
|||||||
$max_nb_toget = ($reste_a_chargee <= 26) ? $reste_a_chargee+1 : 26;
|
$max_nb_toget = ($reste_a_chargee <= 26) ? $reste_a_chargee+1 : 26;
|
||||||
|
|
||||||
// si derniere page alors afficher cadre des TVA
|
// si derniere page alors afficher cadre des TVA
|
||||||
if ($num_page == $nb_page) {
|
if ($num_page == $nb_page)
|
||||||
|
{
|
||||||
$pdf->Line(5, 225, 205, 225);
|
$pdf->Line(5, 225, 205, 225);
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 5, 225 ); $pdf->Cell( 140, 8, 'TOTAL', 0, 0, 'C');
|
||||||
$pdf->SetXY(5, 225);
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 147, 225 ); $pdf->Cell( 13, 8, number_format($montant_ht_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->Cell(140, 8, 'TOTAL', 0, 0, 'C');
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 168, 225 ); $pdf->Cell( 10, 8, number_format($montant_tva_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 183, 225 ); $pdf->Cell( 22, 8, number_format($montant_ttc_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetXY(147, 225);
|
|
||||||
$pdf->Cell(13, 8, number_format($montant_ht_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->SetXY(168, 225);
|
|
||||||
$pdf->Cell(10, 8, number_format($montant_tva_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->SetXY(183, 225);
|
|
||||||
$pdf->Cell(22, 8, number_format($montant_ttc_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 147, 233 ); $pdf->Cell( 30, 6.5, 'TOTAL TTC', 0, 0, 'C');
|
||||||
$pdf->SetXY(147, 233);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 183, 233 ); $pdf->Cell( 22, 6.5, number_format($montant_ttc_total,2,'.','').chr(128), 0, 0, 'C', true);
|
||||||
$pdf->Cell(30, 6.5, 'TOTAL TTC', 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->SetXY(183, 233);
|
|
||||||
$pdf->Cell(22, 6.5, number_format($montant_ttc_total, 2, '.', '').chr(128), 0, 0, 'C', true);
|
|
||||||
$pdf->Line(145, 233, 145, 240);
|
$pdf->Line(145, 233, 145, 240);
|
||||||
$pdf->Line(183, 233, 183, 240);
|
$pdf->Line(183, 233, 183, 240);
|
||||||
$pdf->Line(183, 233, 205, 233);
|
$pdf->Line(183, 233, 205, 233);
|
||||||
@ -487,24 +430,18 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
$pdf->SetFont('ComicSans','',9);
|
$pdf->SetFont('ComicSans','',9);
|
||||||
|
|
||||||
$pdf->SetXY(10, $y1);
|
$pdf->SetXY( 10, $y1 ); $pdf->Cell( $pdf->GetPageWidth(), 4, utf8_decode("Loi N° 92-442 du 31 décembre 1992: La présente facture est payable en comptant a réception."), 0, 0, 'L');
|
||||||
$pdf->Cell($pdf->GetPageWidth(), 4, utf8_decode("Loi N° 92-442 du 31 décembre 1992: La présente facture est payable en comptant a réception."), 0, 0, 'L');
|
$pdf->SetXY( 10, $y1 + 4 ); $pdf->Cell( $pdf->GetPageWidth(), 4, utf8_decode("Indemnité forfaitaire pour frais de recouvrement due en cas de retard de paiement: 40").chr(128), 0, 0, 'L');
|
||||||
$pdf->SetXY(10, $y1 + 4);
|
$pdf->SetXY( 10, $y1 + 8 ); $pdf->Multicell( $pdf->GetPageWidth()-20, 4, utf8_decode("Toute somme non payée dans les trente jours est susceptible de porter intérets à un taux égal à une fois et demi le taux de l'intéret légal."), 0, 0, 'L');
|
||||||
$pdf->Cell($pdf->GetPageWidth(), 4, utf8_decode("Indemnité forfaitaire pour frais de recouvrement due en cas de retard de paiement: 40").chr(128), 0, 0, 'L');
|
|
||||||
$pdf->SetXY(10, $y1 + 8);
|
|
||||||
$pdf->Multicell($pdf->GetPageWidth() - 20, 4, utf8_decode("Toute somme non payée dans les trente jours est susceptible de porter intérets à un taux égal à une fois et demi le taux de l'intéret légal."), 0, 0, 'L');
|
|
||||||
|
|
||||||
// **************************
|
// **************************
|
||||||
// pied de page
|
// pied de page
|
||||||
// **************************
|
// **************************
|
||||||
|
|
||||||
$pdf->SetFont('ComicSans','',6);
|
$pdf->SetFont('ComicSans','',6);
|
||||||
$pdf->SetXY(1, $y0 + 4);
|
$pdf->SetXY( 1, $y0 + 4 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 8 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 8);
|
$pdf->SetXY( 1, $y0 + 12 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(1, $y0 + 12);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
|
||||||
|
|
||||||
/*$pdf->SetXY( 1, $y0 + 16 );
|
/*$pdf->SetXY( 1, $y0 + 16 );
|
||||||
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
||||||
@ -512,8 +449,7 @@ class InvoiceRecapService
|
|||||||
$num_page++;
|
$num_page++;
|
||||||
}
|
}
|
||||||
$ff_pdf = html_entity_decode(
|
$ff_pdf = html_entity_decode(
|
||||||
$defaultConfig[0]->path
|
$defaultConfig[0]->path).
|
||||||
).
|
|
||||||
'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.
|
'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.
|
||||||
strtoupper(
|
strtoupper(
|
||||||
FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])
|
FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])
|
||||||
@ -530,8 +466,7 @@ class InvoiceRecapService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateInvoiceRecapPerClient($clientId, $date, $idNextcloud)
|
private function generateInvoiceRecapPerClient($clientId,$date,$idNextcloud){
|
||||||
{
|
|
||||||
$data_factures = [];
|
$data_factures = [];
|
||||||
$storage = $this->rootFolder->getUserFolder($idNextcloud);
|
$storage = $this->rootFolder->getUserFolder($idNextcloud);
|
||||||
$doesLogoExist = $this->doesLogoExist();
|
$doesLogoExist = $this->doesLogoExist();
|
||||||
@ -544,7 +479,7 @@ class InvoiceRecapService
|
|||||||
clientId: $clientId,
|
clientId: $clientId,
|
||||||
date: $date
|
date: $date
|
||||||
));
|
));
|
||||||
$factures = array_filter($factures, callback: function ($facture) {return $facture->id_client != null; });
|
$factures = array_filter($factures, callback: function($facture) {return $facture->id_client != NULL; });
|
||||||
foreach ($factures as $key => $facture) {
|
foreach ($factures as $key => $facture) {
|
||||||
$facture_temp = array(
|
$facture_temp = array(
|
||||||
'num' => $facture->num,
|
'num' => $facture->num,
|
||||||
@ -598,7 +533,7 @@ class InvoiceRecapService
|
|||||||
$data_temp = array();
|
$data_temp = array();
|
||||||
foreach ($data_factures as $key => $facture) {
|
foreach ($data_factures as $key => $facture) {
|
||||||
$datesplit = explode('-', $facture['date_facture']);
|
$datesplit = explode('-', $facture['date_facture']);
|
||||||
if($data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']] == null) {
|
if($data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']]==NULL) {
|
||||||
$data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']] = array(0=>$facture);
|
$data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']] = array(0=>$facture);
|
||||||
} else {
|
} else {
|
||||||
array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']], $facture);
|
array_push($data_temp[strval($datesplit[0])][strval($datesplit[1])][$facture['id_client']], $facture);
|
||||||
@ -628,7 +563,8 @@ class InvoiceRecapService
|
|||||||
$clientCity = $facture["group_postal_code"]. " ".$facture["group_city"];
|
$clientCity = $facture["group_postal_code"]. " ".$facture["group_city"];
|
||||||
$tvaIntraCommuValue = $facture["group_siret_number"];
|
$tvaIntraCommuValue = $facture["group_siret_number"];
|
||||||
$clientMail = $facture["group_email"];
|
$clientMail = $facture["group_email"];
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$clientAddresses = FileExportHelpers::GetAddressAndCityFromAddress($facture['adresse_client']);
|
$clientAddresses = FileExportHelpers::GetAddressAndCityFromAddress($facture['adresse_client']);
|
||||||
$clientAddress = $clientAddresses['address'];
|
$clientAddress = $clientAddresses['address'];
|
||||||
$clientCity = $clientAddresses['city'];
|
$clientCity = $clientAddresses['city'];
|
||||||
@ -643,13 +579,12 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
$storage->newFolder(html_entity_decode($defaultConfig[0]->path).'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'/');
|
$storage->newFolder(html_entity_decode($defaultConfig[0]->path).'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'/');
|
||||||
} catch(\OCP\Files\NotPermittedException $e) {
|
} catch(\OCP\Files\NotPermittedException $e) { }
|
||||||
}
|
|
||||||
|
|
||||||
$pdf->AddPage();
|
$pdf->AddPage();
|
||||||
$pdf->SetLineWidth(0.2);
|
$pdf->SetLineWidth(0.2);
|
||||||
// on sup les 2 cm en bas
|
// on sup les 2 cm en bas
|
||||||
$pdf->SetAutoPagebreak(false);
|
$pdf->SetAutoPagebreak(False);
|
||||||
$pdf->SetMargins(0,0,10);
|
$pdf->SetMargins(0,0,10);
|
||||||
|
|
||||||
// logo : 80 de largeur et 55 de hauteur
|
// logo : 80 de largeur et 55 de hauteur
|
||||||
@ -705,39 +640,26 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
// observations
|
// observations
|
||||||
$objetYAxis = 110;
|
$objetYAxis = 110;
|
||||||
$pdf->SetFont("ComicSans", "BU", 10);
|
$pdf->SetFont( "ComicSans", "BU", 10 ); $pdf->SetXY( 10, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
|
||||||
$pdf->SetXY(10, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
|
|
||||||
$objet = utf8_decode("Récapitulatif Facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]));
|
$objet = utf8_decode("Récapitulatif Facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]));
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($objet), 0, $objet, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($objet), 0, $objet, 0, "L");
|
|
||||||
|
|
||||||
$objetYAxis += 10;
|
$objetYAxis += 10;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ); $pdf->Cell($pdf->GetStringWidth("Madame, Monsieur"), 0, "Madame, Monsieur", 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis);
|
|
||||||
$pdf->Cell($pdf->GetStringWidth("Madame, Monsieur"), 0, "Madame, Monsieur", 0, "L");
|
|
||||||
|
|
||||||
$text1 = utf8_decode("Veuillez trouver ci-dessous le récapitulatif de la facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).".";
|
$text1 = utf8_decode("Veuillez trouver ci-dessous le récapitulatif de la facturation du mois de ").strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).".";
|
||||||
$text2 = utf8_decode("Vous en souhaitant bonne réception.");
|
$text2 = utf8_decode("Vous en souhaitant bonne réception.");
|
||||||
$text3 = utf8_decode("Veuillez agréer, Madame, Monsieur, mes salutations les meilleures.");
|
$text3 = utf8_decode("Veuillez agréer, Madame, Monsieur, mes salutations les meilleures.");
|
||||||
|
|
||||||
$objetYAxis += 10;
|
$objetYAxis += 10;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text1), 0, $text1, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text1), 0, $text1, 0, "L");
|
|
||||||
$objetYAxis += 5;
|
$objetYAxis += 5;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text2), 0, $text2, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text2), 0, $text2, 0, "L");
|
|
||||||
$objetYAxis += 5;
|
$objetYAxis += 5;
|
||||||
$pdf->SetFont("ComicSans", "", 10);
|
$pdf->SetFont( "ComicSans", "", 10 ); $pdf->SetXY( $pdf->GetStringWidth("Objet")+15, $objetYAxis ) ; $pdf->Cell($pdf->GetStringWidth($text3), 0, $text3, 0, "L");
|
||||||
$pdf->SetXY($pdf->GetStringWidth("Objet") + 15, $objetYAxis) ;
|
|
||||||
$pdf->Cell($pdf->GetStringWidth($text3), 0, $text3, 0, "L");
|
|
||||||
|
|
||||||
// signature
|
// signature
|
||||||
$pdf->SetFont('ComicSans', '', 11);
|
$pdf->SetFont('ComicSans','',11); $pdf->SetXY( 145, 170);
|
||||||
$pdf->SetXY(145, 170);
|
|
||||||
$pdf->Cell( $pdf->GetStringWidth($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom), 0, utf8_decode(html_entity_decode($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom)), 0, 0, 'L');
|
$pdf->Cell( $pdf->GetStringWidth($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom), 0, utf8_decode(html_entity_decode($defaultConfig[0]->nom.' '.$defaultConfig[0]->prenom)), 0, 0, 'L');
|
||||||
if($doesSignatureExist){
|
if($doesSignatureExist){
|
||||||
$pdf->Image($this->defaultImagePath."sign.png", 140, 175, 45,30);
|
$pdf->Image($this->defaultImagePath."sign.png", 140, 175, 45,30);
|
||||||
@ -747,14 +669,10 @@ class InvoiceRecapService
|
|||||||
$pageWidth = $pdf->GetPageWidth();
|
$pageWidth = $pdf->GetPageWidth();
|
||||||
//Positionnement en bas et tout centrer
|
//Positionnement en bas et tout centrer
|
||||||
$pdf->SetFont('ComicSans','',7);
|
$pdf->SetFont('ComicSans','',7);
|
||||||
$pdf->SetXY(1, $y0 + 4);
|
$pdf->SetXY( 1, $y0 + 4 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->mentions_default)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->mentions_default)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 8 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 8);
|
$pdf->SetXY( 1, $y0 + 12 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 16 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 12);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(1, $y0 + 16);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
|
||||||
|
|
||||||
/*$pdf->SetXY( 1, $y0 + 16 );
|
/*$pdf->SetXY( 1, $y0 + 16 );
|
||||||
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
||||||
@ -771,7 +689,7 @@ class InvoiceRecapService
|
|||||||
while ($num_page <= $nb_page) {
|
while ($num_page <= $nb_page) {
|
||||||
$pdf->AddPage();
|
$pdf->AddPage();
|
||||||
// on sup les 2 cm en bas
|
// on sup les 2 cm en bas
|
||||||
$pdf->SetAutoPagebreak(false);
|
$pdf->SetAutoPagebreak(False);
|
||||||
$pdf->SetMargins(0,0,10);
|
$pdf->SetMargins(0,0,10);
|
||||||
if($doesLogoExist){
|
if($doesLogoExist){
|
||||||
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
|
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
|
||||||
@ -798,9 +716,7 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
// n° page en haute à droite
|
// n° page en haute à droite
|
||||||
if($nb_page>1){
|
if($nb_page>1){
|
||||||
$pdf->SetXY(120, 5);
|
$pdf->SetXY( 120, 5 ); $pdf->SetFont( "ComicSans", "B", 9 ); $pdf->Cell( 160, 8, $num_page . '/' . $nb_page, 0, 0, 'C');
|
||||||
$pdf->SetFont("ComicSans", "B", 9);
|
|
||||||
$pdf->Cell(160, 8, $num_page . '/' . $nb_page, 0, 0, 'C');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// adresse du facture
|
// adresse du facture
|
||||||
@ -844,34 +760,21 @@ class InvoiceRecapService
|
|||||||
$pdf->Line(25, 80, 25, 225);
|
$pdf->Line(25, 80, 25, 225);
|
||||||
$pdf->Line(46, 80, 46, 225);
|
$pdf->Line(46, 80, 46, 225);
|
||||||
$pdf->Line(99, 80, 99, 225);
|
$pdf->Line(99, 80, 99, 225);
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$pdf->Line(183, 80, 183, 233);
|
$pdf->Line(183, 80, 183, 233);
|
||||||
$pdf->Line(25, 80, 25, 233);
|
$pdf->Line(25, 80, 25, 233);
|
||||||
$pdf->Line(46, 80, 46, 233);
|
$pdf->Line(46, 80, 46, 233);
|
||||||
$pdf->Line(99, 80, 99, 233);
|
$pdf->Line(99, 80, 99, 233);
|
||||||
}
|
}
|
||||||
// titre colonne
|
// titre colonne
|
||||||
$pdf->SetXY(1, 81);
|
$pdf->SetXY( 1, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 30, 8, FileExportHelpers::FormatTextForExport("N°"), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetXY( 26, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 18, 8, "Date", 0, 0, 'C');
|
||||||
$pdf->Cell(30, 8, FileExportHelpers::FormatTextForExport("N°"), 0, 0, 'C');
|
$pdf->SetXY( 47, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 50, 8, FileExportHelpers::FormatTextForExport("Défunt"), 0, 0, 'C');
|
||||||
$pdf->SetXY(26, 81);
|
$pdf->SetXY( 100, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 45, 8, "Articles", 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetXY( 147, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 13, 8, "H.T.", 0, 0, 'C');
|
||||||
$pdf->Cell(18, 8, "Date", 0, 0, 'C');
|
$pdf->SetXY( 168, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 10, 8, "TVA 20%", 0, 0, 'C');
|
||||||
$pdf->SetXY(47, 81);
|
$pdf->SetXY( 183, 81 ); $pdf->SetFont('ComicSans','B',8); $pdf->Cell( 22, 8, "T.T.C", 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(50, 8, FileExportHelpers::FormatTextForExport("Défunt"), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(100, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(45, 8, "Articles", 0, 0, 'C');
|
|
||||||
$pdf->SetXY(147, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(13, 8, "H.T.", 0, 0, 'C');
|
|
||||||
$pdf->SetXY(168, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(10, 8, "TVA 20%", 0, 0, 'C');
|
|
||||||
$pdf->SetXY(183, 81);
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->Cell(22, 8, "T.T.C", 0, 0, 'C');
|
|
||||||
|
|
||||||
// (new DateTime($facture['date_soin']))->format('d-M')
|
// (new DateTime($facture['date_soin']))->format('d-M')
|
||||||
$formatter_ds = new IntlDateFormatter('fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
|
$formatter_ds = new IntlDateFormatter('fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
|
||||||
@ -889,31 +792,19 @@ class InvoiceRecapService
|
|||||||
$defuntNameText = $client[$index_facture_position]['defunt'];
|
$defuntNameText = $client[$index_facture_position]['defunt'];
|
||||||
$defuntNameTextWidth = $pdf->GetStringWidth($defuntNameText);
|
$defuntNameTextWidth = $pdf->GetStringWidth($defuntNameText);
|
||||||
$defuntNameTextIsMultiline = $defuntNameTextWidth >= 50;
|
$defuntNameTextIsMultiline = $defuntNameTextWidth >= 50;
|
||||||
$pdf->SetXY(6, $y_facture);
|
$pdf->SetXY( 6, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, $client[$index_facture_position]['num'], 0, 0, '');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetXY( 29, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 18, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
|
||||||
$pdf->Cell(28, 5, $client[$index_facture_position]['num'], 0, 0, '');
|
$pdf->SetXY( 47, $y_facture ); $pdf->SetFont('ComicSans','',8);
|
||||||
$pdf->SetXY(29, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(18, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
|
|
||||||
$pdf->SetXY(47, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
if($defuntNameTextIsMultiline){
|
if($defuntNameTextIsMultiline){
|
||||||
$pdf->MultiCell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText));
|
$pdf->MultiCell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText));
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$pdf->Cell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0);
|
$pdf->Cell( 50, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0);
|
||||||
}
|
}
|
||||||
$pdf->SetXY(100, $y_facture);
|
$pdf->SetXY( 100, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, utf8_decode(html_entity_decode($client[$index_facture_position]['produit_references'])), 0, 0, '');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetXY( 147, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 13, 5, number_format($client[$index_facture_position]['montant_htc'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->Cell(28, 5, utf8_decode(html_entity_decode($client[$index_facture_position]['produit_references'])), 0, 0, '');
|
$pdf->SetXY( 168, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 10, 5, number_format($client[$index_facture_position]['montant_tva'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetXY(147, $y_facture);
|
$pdf->SetXY( 183, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 22, 5, number_format($client[$index_facture_position]['montant_ttc'],2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(13, 5, number_format($client[$index_facture_position]['montant_htc'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(168, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(10, 5, number_format($client[$index_facture_position]['montant_tva'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(183, $y_facture);
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->Cell(22, 5, number_format($client[$index_facture_position]['montant_ttc'], 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
|
|
||||||
$montant_ht_total = $montant_ht_total+$client[$index_facture_position]['montant_htc'];
|
$montant_ht_total = $montant_ht_total+$client[$index_facture_position]['montant_htc'];
|
||||||
$montant_tva_total = $montant_tva_total+$client[$index_facture_position]['montant_tva'];
|
$montant_tva_total = $montant_tva_total+$client[$index_facture_position]['montant_tva'];
|
||||||
@ -929,28 +820,17 @@ class InvoiceRecapService
|
|||||||
$max_nb_toget = ($reste_a_chargee <= 26) ? $reste_a_chargee+1 : 26;
|
$max_nb_toget = ($reste_a_chargee <= 26) ? $reste_a_chargee+1 : 26;
|
||||||
|
|
||||||
// si derniere page alors afficher cadre des TVA
|
// si derniere page alors afficher cadre des TVA
|
||||||
if ($num_page == $nb_page) {
|
if ($num_page == $nb_page)
|
||||||
|
{
|
||||||
|
|
||||||
$pdf->Line(5, 225, 205, 225);
|
$pdf->Line(5, 225, 205, 225);
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 5, 225 ); $pdf->Cell( 140, 8, 'TOTAL', 0, 0, 'C');
|
||||||
$pdf->SetXY(5, 225);
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 147, 225 ); $pdf->Cell( 13, 8, number_format($montant_ht_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->Cell(140, 8, 'TOTAL', 0, 0, 'C');
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 168, 225 ); $pdf->Cell( 10, 8, number_format($montant_tva_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
$pdf->SetFont('ComicSans','',8); $pdf->SetXY( 183, 225 ); $pdf->Cell( 22, 8, number_format($montant_ttc_total,2,'.','').chr(128), 0, 0, 'C');
|
||||||
$pdf->SetXY(147, 225);
|
|
||||||
$pdf->Cell(13, 8, number_format($montant_ht_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->SetXY(168, 225);
|
|
||||||
$pdf->Cell(10, 8, number_format($montant_tva_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', '', 8);
|
|
||||||
$pdf->SetXY(183, 225);
|
|
||||||
$pdf->Cell(22, 8, number_format($montant_ttc_total, 2, '.', '').chr(128), 0, 0, 'C');
|
|
||||||
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 147, 233 ); $pdf->Cell( 30, 6.5, 'TOTAL TTC', 0, 0, 'C');
|
||||||
$pdf->SetXY(147, 233);
|
$pdf->SetFont('ComicSans','B',8); $pdf->SetXY( 183, 233 ); $pdf->Cell( 22, 6.5, number_format($montant_ttc_total,2,'.','').chr(128), 0, 0, 'C', true);
|
||||||
$pdf->Cell(30, 6.5, 'TOTAL TTC', 0, 0, 'C');
|
|
||||||
$pdf->SetFont('ComicSans', 'B', 8);
|
|
||||||
$pdf->SetXY(183, 233);
|
|
||||||
$pdf->Cell(22, 6.5, number_format($montant_ttc_total, 2, '.', '').chr(128), 0, 0, 'C', true);
|
|
||||||
$pdf->Line(145, 233, 145, 240);
|
$pdf->Line(145, 233, 145, 240);
|
||||||
$pdf->Line(183, 233, 183, 240);
|
$pdf->Line(183, 233, 183, 240);
|
||||||
$pdf->Line(183, 233, 205, 233);
|
$pdf->Line(183, 233, 205, 233);
|
||||||
@ -965,26 +845,19 @@ class InvoiceRecapService
|
|||||||
|
|
||||||
$pdf->SetFont('ComicSans','',9);
|
$pdf->SetFont('ComicSans','',9);
|
||||||
|
|
||||||
$pdf->SetXY(10, $y1);
|
$pdf->SetXY( 10, $y1 );$pdf->Cell( $pdf->GetPageWidth(), 4, utf8_decode("Loi N° 92-442 du 31 décembre 1992: La présente facture est payable en comptant a réception."), 0, 0, 'L');
|
||||||
$pdf->Cell($pdf->GetPageWidth(), 4, utf8_decode("Loi N° 92-442 du 31 décembre 1992: La présente facture est payable en comptant a réception."), 0, 0, 'L');
|
$pdf->SetXY( 10, $y1 + 4 );$pdf->Cell( $pdf->GetPageWidth(), 4, utf8_decode("Indemnité forfaitaire pour frais de recouvrement due en cas de retard de paiement: 40").chr(128), 0, 0, 'L');
|
||||||
$pdf->SetXY(10, $y1 + 4);
|
$pdf->SetXY( 10, $y1 + 8 );$pdf->Multicell( $pdf->GetPageWidth()-20, 4, utf8_decode("Toute somme non payée dans les trente jours est susceptible de porter intérets à un taux égal à une fois et demi le taux de l'intéret légal."), 0, 0, 'L');
|
||||||
$pdf->Cell($pdf->GetPageWidth(), 4, utf8_decode("Indemnité forfaitaire pour frais de recouvrement due en cas de retard de paiement: 40").chr(128), 0, 0, 'L');
|
|
||||||
$pdf->SetXY(10, $y1 + 8);
|
|
||||||
$pdf->Multicell($pdf->GetPageWidth() - 20, 4, utf8_decode("Toute somme non payée dans les trente jours est susceptible de porter intérets à un taux égal à une fois et demi le taux de l'intéret légal."), 0, 0, 'L');
|
|
||||||
|
|
||||||
// **************************
|
// **************************
|
||||||
// pied de page
|
// pied de page
|
||||||
// **************************
|
// **************************
|
||||||
|
|
||||||
$pdf->SetFont('ComicSans','',7);
|
$pdf->SetFont('ComicSans','',7);
|
||||||
$pdf->SetXY(1, $y0 + 4);
|
$pdf->SetXY( 1, $y0 + 4 ); $pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->mentions_default)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->mentions_default)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 8 );$pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 8);
|
$pdf->SetXY( 1, $y0 + 12 );$pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_one)), 0, 0, 'C');
|
$pdf->SetXY( 1, $y0 + 16 );$pdf->Cell( $pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
||||||
$pdf->SetXY(1, $y0 + 12);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->legal_two)), 0, 0, 'C');
|
|
||||||
$pdf->SetXY(1, $y0 + 16);
|
|
||||||
$pdf->Cell($pageWidth, 5, utf8_decode(html_entity_decode($defaultConfig[0]->telephone)), 0, 0, 'C');
|
|
||||||
|
|
||||||
/*$pdf->SetXY( 1, $y0 + 16 );
|
/*$pdf->SetXY( 1, $y0 + 16 );
|
||||||
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
$pdf->Cell( $pageWidth, 5, utf8_decode("SIREN 751621293"), 0, 0, 'C');*/
|
||||||
@ -1003,15 +876,14 @@ class InvoiceRecapService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateInvoiceRecap($filter, $filterType, $date, $idNextcloud)
|
public function generateInvoiceRecap($filter,$filterType,$date,$idNextcloud){
|
||||||
{
|
|
||||||
try {
|
try {
|
||||||
if($filterType == MultipleFactureTypeConstant::GROUP_FILTER_TYPE){
|
if($filterType == MultipleFactureTypeConstant::GROUP_FILTER_TYPE){
|
||||||
$this->generateInvoiceRecapPerClientGroupFacturation($filter,$date,$idNextcloud);
|
$this->generateInvoiceRecapPerClientGroupFacturation($filter,$date,$idNextcloud);
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$this->generateInvoiceRecapPerClient($filter,$date,$idNextcloud);
|
$this->generateInvoiceRecapPerClient($filter,$date,$idNextcloud);
|
||||||
}
|
}
|
||||||
} catch(\OCP\Files\NotFoundException $e) {
|
} catch(\OCP\Files\NotFoundException $e) { }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -215,45 +215,13 @@ export function getGlobal(id_devis) {
|
|||||||
})
|
})
|
||||||
}).done((function (res) {
|
}).done((function (res) {
|
||||||
var myresp = JSON.parse(response)[0];
|
var myresp = JSON.parse(response)[0];
|
||||||
var devisData = JSON.parse(res);
|
var total = JSON.parse(res).total;
|
||||||
var total = devisData.total;
|
var tva = parseFloat(myresp.tva_default);
|
||||||
var clientTvaStatus = devisData.client_tva_status;
|
|
||||||
// S'assurer que total est un nombre
|
|
||||||
total = parseFloat(total);
|
|
||||||
clientTvaStatus = parseInt(clientTvaStatus);
|
|
||||||
|
|
||||||
var tvaDefault = parseFloat(myresp.tva_default);
|
|
||||||
|
|
||||||
$('#totaldevis tbody').empty();
|
$('#totaldevis tbody').empty();
|
||||||
|
$('#totaldevis tbody').append('<tr><td>' + cur.format(total) + '</td><td id="tva">' + tva + ' %</td><td id="totaltva">' + cur.format(Math.round((total * tva)) / 100) + '</td><td>' + cur.format(Math.round((total * (tva + 100))) / 100) + '</td></tr>');
|
||||||
if (clientTvaStatus === 0) {
|
|
||||||
// Client exonéré de TVA - TVA = 0%
|
|
||||||
$('#totaldevis tbody').append(
|
|
||||||
'<tr>' +
|
|
||||||
'<td>' + cur.format(total) + '</td>' +
|
|
||||||
'<td id="tva">0 %</td>' +
|
|
||||||
'<td id="totaltva">' + cur.format(0) + '</td>' +
|
|
||||||
'<td>' + cur.format(total) + '</td>' +
|
|
||||||
'</tr>'
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// Client soumis à la TVA - utiliser le taux par défaut
|
|
||||||
var montantTva = Math.round((total * tvaDefault)) / 100;
|
|
||||||
var totalTTC = Math.round((total * (tvaDefault + 100))) / 100;
|
|
||||||
|
|
||||||
$('#totaldevis tbody').append(
|
|
||||||
'<tr>' +
|
|
||||||
'<td>' + cur.format(total) + '</td>' +
|
|
||||||
'<td id="tva">' + tvaDefault + ' %</td>' +
|
|
||||||
'<td id="totaltva">' + cur.format(montantTva) + '</td>' +
|
|
||||||
'<td>' + cur.format(totalTTC) + '</td>' +
|
|
||||||
'</tr>'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$('#mentions_default').html(myresp.mentions_default);
|
$('#mentions_default').html(myresp.mentions_default);
|
||||||
}));
|
}));
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getGlobalPromise() {
|
export function getGlobalPromise() {
|
||||||
|
|||||||
@ -10,18 +10,15 @@ export class Client {
|
|||||||
*/
|
*/
|
||||||
constructor(myresp) {
|
constructor(myresp) {
|
||||||
this.id = myresp.id;
|
this.id = myresp.id;
|
||||||
this.code_comptable = ((myresp.code_comptable && myresp.code_comptable.length > 0) ? myresp.code_comptable : '-'); // AJOUTÉ
|
this.entreprise = ((myresp.entreprise.length === 0) ? '-' : myresp.entreprise);
|
||||||
this.agence = ((myresp.agence && myresp.agence.length > 0) ? myresp.agence : '-'); // AJOUTÉ
|
this.prenom = ((myresp.prenom.length === 0) ? '-' : myresp.prenom);
|
||||||
this.entreprise = ((myresp.entreprise && myresp.entreprise.length > 0) ? myresp.entreprise : '-');
|
this.nom = ((myresp.nom.length === 0) ? '-' : myresp.nom);
|
||||||
this.prenom = ((myresp.prenom && myresp.prenom.length > 0) ? myresp.prenom : '-');
|
this.legal_one = ((myresp.legal_one.length === 0) ? '-' : myresp.legal_one);
|
||||||
this.nom = ((myresp.nom && myresp.nom.length > 0) ? myresp.nom : '-');
|
this.telephone = ((myresp.telephone.length === 0) ? '-' : myresp.telephone);
|
||||||
this.legal_one = ((myresp.legal_one && myresp.legal_one.length > 0) ? myresp.legal_one : '-');
|
this.mail = ((myresp.mail.length === 0) ? '-' : myresp.mail);
|
||||||
this.telephone = ((myresp.telephone && myresp.telephone.length > 0) ? myresp.telephone : '-');
|
this.adresse = ((myresp.adresse.length === 0) ? '-' : myresp.adresse);
|
||||||
this.mail = ((myresp.mail && myresp.mail.length > 0) ? myresp.mail : '-');
|
this.clientGroupName = ((myresp.client_group_name.length === 0) ? '-' : myresp.client_group_name);
|
||||||
this.adresse = ((myresp.adresse && myresp.adresse.length > 0) ? myresp.adresse : '-');
|
this.clientGroupFacturationName = ((myresp.client_group_facturation_name.length === 0) ? '-' : myresp.client_group_facturation_name);
|
||||||
this.is_tva = myresp.is_tva !== undefined && myresp.is_tva !== null ? myresp.is_tva : 0;
|
|
||||||
this.clientGroupName = ((myresp.client_group_name && myresp.client_group_name.length > 0) ? myresp.client_group_name : '-');
|
|
||||||
this.clientGroupFacturationName = ((myresp.client_group_facturation_name && myresp.client_group_facturation_name.length > 0) ? myresp.client_group_facturation_name : '-');
|
|
||||||
|
|
||||||
let clientGroupId = 0;
|
let clientGroupId = 0;
|
||||||
if(myresp.fk_client_group_id != null && myresp.fk_client_group_id.length > 0){
|
if(myresp.fk_client_group_id != null && myresp.fk_client_group_id.length > 0){
|
||||||
@ -43,21 +40,17 @@ export class Client {
|
|||||||
let myrow = [
|
let myrow = [
|
||||||
'<input class="clientToExport" data-id= '+ this.id + ' type="checkbox" name="clientToExport" value="' + this.id + '"/>',
|
'<input class="clientToExport" data-id= '+ this.id + ' type="checkbox" name="clientToExport" value="' + this.id + '"/>',
|
||||||
'<div>' + this.id + '</div>',
|
'<div>' + this.id + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="code_comptable" data-id="' + this.id + '">' + this.code_comptable + '</div>',
|
'<div class="editable" data-table="client" data-column="entreprise" data-id="' + this.id + '">' + this.entreprise + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="agence" data-id="' + this.id + '">' + this.agence + '</div>',
|
|
||||||
'<div class="editable" data-table="client" data-column="prenom" data-id="' + this.id + '">' + this.prenom + '</div>',
|
'<div class="editable" data-table="client" data-column="prenom" data-id="' + this.id + '">' + this.prenom + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="nom" data-id="' + this.id + '">' + this.nom + '</div>',
|
'<div class="editable" data-table="client" data-column="nom" data-id="' + this.id + '">' + this.nom + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="entreprise" data-id="' + this.id + '">' + this.entreprise + '</div>',
|
|
||||||
'<div class="editable" data-table="client" data-column="legal_one" data-id="' + this.id + '">' + this.legal_one + '</div>',
|
'<div class="editable" data-table="client" data-column="legal_one" data-id="' + this.id + '">' + this.legal_one + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="telephone" data-id="' + this.id + '">' + this.telephone + '</div>',
|
'<div class="editable" data-table="client" data-column="telephone" data-id="' + this.id + '">' + this.telephone + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="mail" data-id="' + this.id + '">' + this.mail + '</div>',
|
'<div class="editable" data-table="client" data-column="mail" data-id="' + this.id + '">' + this.mail + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="adresse" data-id="' + this.id + '">' + this.adresse + '</div>',
|
'<div class="editable" data-table="client" data-column="adresse" data-id="' + this.id + '">' + this.adresse + '</div>',
|
||||||
'<div><input type="checkbox" class="gestion-checkbox" data-table="client" data-column="is_tva" data-id="' + this.id + '" ' + (this.is_tva == 1 || this.is_tva == true ? 'checked' : '') + ' /></div>',
|
|
||||||
'<div class="selectClientGroupList" data-table="client" data-column="fk_client_group_id" data-id="' + this.id + '" data-current="' + this.clientGroupId + '">' + this.clientGroupName + '</div>',
|
'<div class="selectClientGroupList" data-table="client" data-column="fk_client_group_id" data-id="' + this.id + '" data-current="' + this.clientGroupId + '">' + this.clientGroupName + '</div>',
|
||||||
'<div class="selectClientGroupFacturationList" data-table="client" data-column="fk_client_group_facturation_id" data-id="' + this.id + '" data-current="' + this.clientGroupFacturationId + '">' + this.clientGroupFacturationName + '</div>',
|
'<div class="selectClientGroupFacturationList" data-table="client" data-column="fk_client_group_facturation_id" data-id="' + this.id + '" data-current="' + this.clientGroupFacturationId + '">' + this.clientGroupFacturationName + '</div>',
|
||||||
'<div><center><div data-modifier="client" data-id=' + this.id + ' data-table="client" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div></center></div>' // MODIFIÉ
|
'<center><div data-modifier="client" data-id=' + this.id + ' data-table="client" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div></center>'
|
||||||
];
|
];
|
||||||
|
|
||||||
return myrow;
|
return myrow;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,8 +82,7 @@ export class Client {
|
|||||||
oReq.setRequestHeader("Content-Type", "application/json");
|
oReq.setRequestHeader("Content-Type", "application/json");
|
||||||
oReq.onload = function(e){
|
oReq.onload = function(e){
|
||||||
if (this.status == 200) {
|
if (this.status == 200) {
|
||||||
const data = JSON.parse(this.response);
|
LoadDT(clientDT, JSON.parse(this.response), Client);
|
||||||
LoadDT(clientDT, data, Client);
|
|
||||||
}else{
|
}else{
|
||||||
showError(this.response);
|
showError(this.response);
|
||||||
}
|
}
|
||||||
@ -108,8 +100,7 @@ export class Client {
|
|||||||
oReq.setRequestHeader("Content-Type", "application/json");
|
oReq.setRequestHeader("Content-Type", "application/json");
|
||||||
oReq.onload = function(e){
|
oReq.onload = function(e){
|
||||||
if (this.status == 200) {
|
if (this.status == 200) {
|
||||||
const data = JSON.parse(this.response);
|
callback(JSON.parse(this.response));
|
||||||
callback(data);
|
|
||||||
}else{
|
}else{
|
||||||
showError(this.response);
|
showError(this.response);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,9 +17,8 @@
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
<select name="annee" id="yearselector">
|
<select name="annee" id="yearselector">
|
||||||
<option value="-1" <?php if ((int) $_GET['annee'] == -1) {
|
<option value="-1" <?php if ((int) $_GET['annee'] == -1)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Toutes les années</option>
|
||||||
} ?>>Toutes les années</option>
|
|
||||||
<?php
|
<?php
|
||||||
$currentYear = date('Y');
|
$currentYear = date('Y');
|
||||||
for ($year = $currentYear; $year >= $currentYear - 10; $year--) {
|
for ($year = $currentYear; $year >= $currentYear - 10; $year--) {
|
||||||
@ -28,45 +27,32 @@
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
<select name="mois" id="monthselector">
|
<select name="mois" id="monthselector">
|
||||||
<option value="0" <?php if ((int) $_GET['mois'] == 0) {
|
<option value="0" <?php if ((int) $_GET['mois'] == 0)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Tous les mois</option>
|
||||||
} ?>>Tous les mois</option>
|
<option value="1" <?php if ((int) $_GET['mois'] == 1)
|
||||||
<option value="1" <?php if ((int) $_GET['mois'] == 1) {
|
echo 'selected' ?>>Janvier</option>
|
||||||
echo 'selected';
|
<option value="2" <?php if ((int) $_GET['mois'] == 2)
|
||||||
} ?>>Janvier</option>
|
echo 'selected' ?>>Fevrier</option>
|
||||||
<option value="2" <?php if ((int) $_GET['mois'] == 2) {
|
<option value="3" <?php if ((int) $_GET['mois'] == 3)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Mars</option>
|
||||||
} ?>>Fevrier</option>
|
<option value="4" <?php if ((int) $_GET['mois'] == 4)
|
||||||
<option value="3" <?php if ((int) $_GET['mois'] == 3) {
|
echo 'selected' ?>>Avril</option>
|
||||||
echo 'selected';
|
<option value="5" <?php if ((int) $_GET['mois'] == 5)
|
||||||
} ?>>Mars</option>
|
echo 'selected' ?>>Mai</option>
|
||||||
<option value="4" <?php if ((int) $_GET['mois'] == 4) {
|
<option value="6" <?php if ((int) $_GET['mois'] == 6)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Juin</option>
|
||||||
} ?>>Avril</option>
|
<option value="7" <?php if ((int) $_GET['mois'] == 7)
|
||||||
<option value="5" <?php if ((int) $_GET['mois'] == 5) {
|
echo 'selected' ?>>Juillet</option>
|
||||||
echo 'selected';
|
<option value="8" <?php if ((int) $_GET['mois'] == 8)
|
||||||
} ?>>Mai</option>
|
echo 'selected' ?>>Août</option>
|
||||||
<option value="6" <?php if ((int) $_GET['mois'] == 6) {
|
<option value="9" <?php if ((int) $_GET['mois'] == 9)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Septembre</option>
|
||||||
} ?>>Juin</option>
|
<option value="10" <?php if ((int) $_GET['mois'] == 10)
|
||||||
<option value="7" <?php if ((int) $_GET['mois'] == 7) {
|
echo 'selected' ?>>Octobre</option>
|
||||||
echo 'selected';
|
<option value="11" <?php if ((int) $_GET['mois'] == 11)
|
||||||
} ?>>Juillet</option>
|
echo 'selected' ?>>Novembre</option>
|
||||||
<option value="8" <?php if ((int) $_GET['mois'] == 8) {
|
<option value="12" <?php if ((int) $_GET['mois'] == 12)
|
||||||
echo 'selected';
|
echo 'selected' ?>>Decembre</option>
|
||||||
} ?>>Août</option>
|
|
||||||
<option value="9" <?php if ((int) $_GET['mois'] == 9) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Septembre</option>
|
|
||||||
<option value="10" <?php if ((int) $_GET['mois'] == 10) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Octobre</option>
|
|
||||||
<option value="11" <?php if ((int) $_GET['mois'] == 11) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Novembre</option>
|
|
||||||
<option value="12" <?php if ((int) $_GET['mois'] == 12) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Decembre</option>
|
|
||||||
</select>
|
</select>
|
||||||
<input type="hidden" name="filterType" id="filterType"
|
<input type="hidden" name="filterType" id="filterType"
|
||||||
value="<?php echo ($_GET['filterType'] ?? 'group'); ?>">
|
value="<?php echo ($_GET['filterType'] ?? 'group'); ?>">
|
||||||
@ -124,9 +110,8 @@
|
|||||||
<div id="gestion-canvas" class="canvas_div_pdf">
|
<div id="gestion-canvas" class="canvas_div_pdf">
|
||||||
<?php
|
<?php
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'GET' && strcmp($_GET['cli'], '') != 0) {
|
if ($_SERVER['REQUEST_METHOD'] == 'GET' && strcmp($_GET['cli'], '') != 0) {
|
||||||
if (sizeof($devis) == 0) {
|
if (sizeof($devis) == 0)
|
||||||
echo "Aucun devis trouvé.";
|
echo "Aucun devis trouvé.";
|
||||||
}
|
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -270,25 +255,13 @@
|
|||||||
<?php
|
<?php
|
||||||
$totalhtc = 0;
|
$totalhtc = 0;
|
||||||
$tva = json_decode($_['configuration'])[0]->tva_default;
|
$tva = json_decode($_['configuration'])[0]->tva_default;
|
||||||
$clientTvaStatus = isset($currentDevis->tva) ? (int)$currentDevis->tva : 1;
|
|
||||||
$totalttc = 0;
|
$totalttc = 0;
|
||||||
$totalprice = 0;
|
$totalprice = 0;
|
||||||
|
|
||||||
foreach ($currentDevis->dproduits as $key => $produit) {
|
foreach ($currentDevis->dproduits as $key => $produit) {
|
||||||
$totalhtc = $totalhtc + ($produit->quantite * $produit->prix_unitaire);
|
$totalhtc = $totalhtc + ($produit->quantite * $produit->prix_unitaire);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculer la TVA selon le statut du client
|
|
||||||
if ($clientTvaStatus === 0) {
|
|
||||||
// Client exonéré de TVA
|
|
||||||
$tva = 0;
|
|
||||||
$totalttc = 0;
|
|
||||||
$totalprice = $totalhtc;
|
|
||||||
} else {
|
|
||||||
// Client soumis à la TVA
|
|
||||||
$totalttc = ($totalhtc * $tva) / 100;
|
$totalttc = ($totalhtc * $tva) / 100;
|
||||||
$totalprice = $totalhtc + $totalttc;
|
$totalprice = $totalhtc + $totalttc;
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td>€<?php echo number_format($totalhtc, 2) ?></td>
|
<td>€<?php echo number_format($totalhtc, 2) ?></td>
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
<div class="d-flex flex-column w-100 p-4">
|
<div class="d-flex flex-column w-100 p-4">
|
||||||
<?php $factures = [];
|
<?php $factures = []; $showRecapButton=false;?>
|
||||||
$showRecapButton = false;?>
|
|
||||||
<div class="d-flex justify-content-between">
|
<div class="d-flex justify-content-between">
|
||||||
<form method="get" class="d-flex flex-row align-items-center">
|
<form method="get" class="d-flex flex-row align-items-center">
|
||||||
<select name="cli" id="clientselector">
|
<select name="cli" id="clientselector">
|
||||||
@ -23,9 +22,7 @@
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
<select name="annee" id="yearselector">
|
<select name="annee" id="yearselector">
|
||||||
<option value="-1" <?php if((int) $_GET['annee'] == -1) {
|
<option value="-1" <?php if((int) $_GET['annee'] == -1) echo 'selected' ?>>Toutes les années</option>
|
||||||
echo 'selected';
|
|
||||||
} ?>>Toutes les années</option>
|
|
||||||
<?php
|
<?php
|
||||||
$currentYear = date('Y');
|
$currentYear = date('Y');
|
||||||
for ($year = $currentYear; $year >= $currentYear - 10; $year--) {
|
for ($year = $currentYear; $year >= $currentYear - 10; $year--) {
|
||||||
@ -34,45 +31,19 @@
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
<select name="mois" id="monthselector">
|
<select name="mois" id="monthselector">
|
||||||
<option value="0" <?php if((int) $_GET['mois'] == 0) {
|
<option value="0" <?php if((int) $_GET['mois'] == 0) echo 'selected' ?>>Tous les mois</option>
|
||||||
echo 'selected';
|
<option value="1" <?php if((int) $_GET['mois'] == 1) echo 'selected' ?>>Janvier</option>
|
||||||
} ?>>Tous les mois</option>
|
<option value="2" <?php if((int) $_GET['mois'] == 2) echo 'selected' ?>>Fevrier</option>
|
||||||
<option value="1" <?php if((int) $_GET['mois'] == 1) {
|
<option value="3" <?php if((int) $_GET['mois'] == 3) echo 'selected' ?>>Mars</option>
|
||||||
echo 'selected';
|
<option value="4" <?php if((int) $_GET['mois'] == 4) echo 'selected' ?>>Avril</option>
|
||||||
} ?>>Janvier</option>
|
<option value="5" <?php if((int) $_GET['mois'] == 5) echo 'selected' ?>>Mai</option>
|
||||||
<option value="2" <?php if((int) $_GET['mois'] == 2) {
|
<option value="6" <?php if((int) $_GET['mois'] == 6) echo 'selected' ?>>Juin</option>
|
||||||
echo 'selected';
|
<option value="7" <?php if((int) $_GET['mois'] == 7) echo 'selected' ?>>Juillet</option>
|
||||||
} ?>>Fevrier</option>
|
<option value="8" <?php if((int) $_GET['mois'] == 8) echo 'selected' ?>>Août</option>
|
||||||
<option value="3" <?php if((int) $_GET['mois'] == 3) {
|
<option value="9" <?php if((int) $_GET['mois'] == 9) echo 'selected' ?>>Septembre</option>
|
||||||
echo 'selected';
|
<option value="10" <?php if((int) $_GET['mois'] == 10) echo 'selected' ?>>Octobre</option>
|
||||||
} ?>>Mars</option>
|
<option value="11" <?php if((int) $_GET['mois'] == 11) echo 'selected' ?>>Novembre</option>
|
||||||
<option value="4" <?php if((int) $_GET['mois'] == 4) {
|
<option value="12" <?php if((int) $_GET['mois'] == 12) echo 'selected' ?>>Decembre</option>
|
||||||
echo 'selected';
|
|
||||||
} ?>>Avril</option>
|
|
||||||
<option value="5" <?php if((int) $_GET['mois'] == 5) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Mai</option>
|
|
||||||
<option value="6" <?php if((int) $_GET['mois'] == 6) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Juin</option>
|
|
||||||
<option value="7" <?php if((int) $_GET['mois'] == 7) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Juillet</option>
|
|
||||||
<option value="8" <?php if((int) $_GET['mois'] == 8) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Août</option>
|
|
||||||
<option value="9" <?php if((int) $_GET['mois'] == 9) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Septembre</option>
|
|
||||||
<option value="10" <?php if((int) $_GET['mois'] == 10) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Octobre</option>
|
|
||||||
<option value="11" <?php if((int) $_GET['mois'] == 11) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Novembre</option>
|
|
||||||
<option value="12" <?php if((int) $_GET['mois'] == 12) {
|
|
||||||
echo 'selected';
|
|
||||||
} ?>>Decembre</option>
|
|
||||||
</select>
|
</select>
|
||||||
<input type="hidden" name="filterType" id="filterType" value="<?php echo ($_GET['filterType'] ?? 'client'); ?>">
|
<input type="hidden" name="filterType" id="filterType" value="<?php echo ($_GET['filterType'] ?? 'client'); ?>">
|
||||||
<input type="submit" value="Filtrer"/>
|
<input type="submit" value="Filtrer"/>
|
||||||
@ -80,9 +51,7 @@
|
|||||||
<div class="d-flex flex-row">
|
<div class="d-flex flex-row">
|
||||||
<?php
|
<?php
|
||||||
if($_SERVER['REQUEST_METHOD'] == 'GET') {
|
if($_SERVER['REQUEST_METHOD'] == 'GET') {
|
||||||
if(intval($_GET['mois']) != 0 && intval($_GET['annee']) != 0) {
|
if(intval($_GET['mois'])!=0 && intval($_GET['annee'])!=0) $showRecapButton = true;
|
||||||
$showRecapButton = true;
|
|
||||||
}
|
|
||||||
$factures = array_filter($_['factures'], function($f) {
|
$factures = array_filter($_['factures'], function($f) {
|
||||||
$datesplit = explode("-", $f->date_paiement);
|
$datesplit = explode("-", $f->date_paiement);
|
||||||
$year = (int) $datesplit[0];
|
$year = (int) $datesplit[0];
|
||||||
@ -95,7 +64,8 @@
|
|||||||
if($_GET['cli'] != null && $_GET['cli'] != '') {
|
if($_GET['cli'] != null && $_GET['cli'] != '') {
|
||||||
if($filterType == "group"){
|
if($filterType == "group"){
|
||||||
$checkClient = $f->fk_client_group_facturation_id == $_GET['cli'];
|
$checkClient = $f->fk_client_group_facturation_id == $_GET['cli'];
|
||||||
} else {
|
}
|
||||||
|
else{
|
||||||
$checkClient = $f->id_cli == $_GET['cli'];
|
$checkClient = $f->id_cli == $_GET['cli'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -117,9 +87,7 @@
|
|||||||
<div class="canvas_div_pdf">
|
<div class="canvas_div_pdf">
|
||||||
<?php
|
<?php
|
||||||
if($_SERVER['REQUEST_METHOD'] == 'GET') {
|
if($_SERVER['REQUEST_METHOD'] == 'GET') {
|
||||||
if(sizeof($factures) == 0) {
|
if(sizeof($factures)==0) echo "Aucune facture trouvée.";
|
||||||
echo "Aucune facture trouvée.";
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach ($factures as $key => $facture) {
|
foreach ($factures as $key => $facture) {
|
||||||
@ -224,26 +192,13 @@
|
|||||||
<?php
|
<?php
|
||||||
$totalhtc = 0;
|
$totalhtc = 0;
|
||||||
$tva = json_decode($_['configuration'])[0]->tva_default;
|
$tva = json_decode($_['configuration'])[0]->tva_default;
|
||||||
$clientTvaStatus = isset($facture->tva_cli) ? (int)$facture->tva_cli : 1;
|
|
||||||
|
|
||||||
$totalttc = 0;
|
$totalttc = 0;
|
||||||
$totalprice = 0;
|
$totalprice = 0;
|
||||||
|
|
||||||
foreach ($facture->dproduits as $key => $produit) {
|
foreach ($facture->dproduits as $key => $produit) {
|
||||||
$totalhtc = $totalhtc + ($produit->quantite*$produit->prix_unitaire);
|
$totalhtc = $totalhtc + ($produit->quantite*$produit->prix_unitaire);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculer la TVA selon le statut du client
|
|
||||||
if ($clientTvaStatus === 0) {
|
|
||||||
// Client exonéré de TVA
|
|
||||||
$tva = 0;
|
|
||||||
$totalttc = 0;
|
|
||||||
$totalprice = $totalhtc;
|
|
||||||
} else {
|
|
||||||
// Client soumis à la TVA
|
|
||||||
$totalttc = ($totalhtc * $tva)/100;
|
$totalttc = ($totalhtc * $tva)/100;
|
||||||
$totalprice = $totalhtc + $totalttc;
|
$totalprice = $totalhtc + $totalttc;
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td>€<?php echo number_format($totalhtc, 2) ?></td>
|
<td>€<?php echo number_format($totalhtc, 2) ?></td>
|
||||||
|
|||||||
@ -27,14 +27,11 @@
|
|||||||
<th><?php p($l->t('ID'));?></th>
|
<th><?php p($l->t('ID'));?></th>
|
||||||
<th><?php p($l->t('Code comptable'));?></th>
|
<th><?php p($l->t('Code comptable'));?></th>
|
||||||
<th><?php p($l->t('Agence'));?></th>
|
<th><?php p($l->t('Agence'));?></th>
|
||||||
<th><?php p($l->t('Prénom'));?></th> <!-- AJOUTÉ -->
|
|
||||||
<th><?php p($l->t('Nom'));?></th> <!-- AJOUTÉ -->
|
|
||||||
<th><?php p($l->t('Company'));?></th>
|
<th><?php p($l->t('Company'));?></th>
|
||||||
<th><?php p($l->t('Legal information'));?></th>
|
<th><?php p($l->t('Legal information'));?></th>
|
||||||
<th><?php p($l->t('Phone number'));?></th>
|
<th><?php p($l->t('Phone number'));?></th>
|
||||||
<th><?php p($l->t('Email'));?></th>
|
<th><?php p($l->t('Email'));?></th>
|
||||||
<th><?php p($l->t('Address'));?></th>
|
<th><?php p($l->t('Address'));?></th>
|
||||||
<th><?php p($l->t('TVA'));?></th>
|
|
||||||
<th><?php p($l->t('Groupes tarifaires'));?></th>
|
<th><?php p($l->t('Groupes tarifaires'));?></th>
|
||||||
<th><?php p($l->t('Groupes facturations'));?></th>
|
<th><?php p($l->t('Groupes facturations'));?></th>
|
||||||
<th><?php p($l->t('Actions'));?></th>
|
<th><?php p($l->t('Actions'));?></th>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user