Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

updated Invoice PDF generation task for more performance

Browse Source
This commit is contained in:
Frank Schubert
2024-09-01 19:08:11 +02:00
parent c56b7c238a
commit e770f32bc3
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Invoice/InvoiceController.php
View File

@@ -837,7 +837,7 @@ class InvoiceController extends mfBaseController {
public function createPDFs($limit = false) {
$invoice_path_base = MFUPLOAD_FILE_SAVE_PATH."/".TT_INVOICE_SAVE_SUBFOLDER;
$created = 0;
foreach(InvoiceModel::getAll() as $invoice) {
foreach(InvoiceModel::search(["invoice_file" => false]) as $invoice) {
if($limit && $created >= $limit) {
return $created;
}

25
application/Invoice/InvoiceModel.php
View File

@@ -238,7 +238,11 @@ class InvoiceModel {
$db = FronkDB::singleton();
$res = $db->select("Invoice", "*", "1 = 1 ORDER BY invoice_number");
$sql = "SELECT Invoice.* FROM Invoice
LEFT JOIN InvoiceFile ON (InvoiceFile.invoice_id = Invoice.id)
ORDER BY invoice_number";
$res = $db->query($sql);
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Invoice($data);
@@ -252,7 +256,8 @@ class InvoiceModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT * FROM Invoice
$sql = "SELECT Invoice.* FROM Invoice
LEFT JOIN InvoiceFile ON (InvoiceFile.invoice_id = Invoice.id)
WHERE $where
ORDER BY invoice_number LIMIT 1";
//var_dump($sql);exit;
@@ -273,7 +278,8 @@ class InvoiceModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT * FROM Invoice
$sql = "SELECT Invoice.* FROM Invoice
LEFT JOIN InvoiceFile ON (InvoiceFile.invoice_id = Invoice.id)
WHERE $where
ORDER BY invoice_number DESC LIMIT 1";
@@ -297,6 +303,7 @@ class InvoiceModel {
$where = self::getSqlFilter($filter);
$sql = "SELECT COUNT(*) as cnt FROM Invoice
LEFT JOIN InvoiceFile ON (InvoiceFile.invoice_id = Invoice.id)
WHERE $where";
mfLoghandler::singleton()->debug($sql);
@@ -320,7 +327,8 @@ class InvoiceModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT * FROM Invoice
$sql = "SELECT Invoice.* FROM Invoice
LEFT JOIN InvoiceFile ON (InvoiceFile.invoice_id = Invoice.id)
WHERE $where
ORDER BY $order";
@@ -358,6 +366,15 @@ class InvoiceModel {
}
}
if(array_key_exists("invoice_file", $filter)) {
$invoice_file = $filter['invoice_file'];
if($invoice_file === true) {
$where .= " AND InvoiceFile.id > 0'";
} elseif($invoice_file === false || $invoice_file === null) {
$where .= " AND InvoiceFile.id IS NOT NULL";
}
}
if(array_key_exists("invoice_number", $filter)) {
$invoice_number = $filter['invoice_number'];
if($invoice_number === true) {

2
db/migrations/20240827113849_create_invoice_job.php
View File

@@ -14,7 +14,7 @@ final class CreateInvoiceJob extends AbstractMigration
$table->addColumn("to_date", "date", ["null" => false]);
$table->addColumn("started", "datetime", ["null" => true, "default" => null]);
$table->addColumn("finished", "datetime", ["null" => true, "default" => null]);
$table->addColumn("status", "string", ["null" => true, "default" => true, "limit" => 64]);
$table->addColumn("status", "string", ["null" => true, "default" => null, "limit" => 64]);
$table->addColumn("result", "json", ["null" => true, "default" => null]);
$table->addColumn("create_by", "integer", ["null" => false]);