Fix and add messages, highlighting etc.

emaijala · Dec 3, 2024 · b833eef · b833eef
1 parent b34b698
commit b833eef
Show file tree

Hide file tree

Showing 19 changed files with 140 additions and 100 deletions.
diff --git a/add_rows.php b/add_rows.php
@@ -95,4 +95,5 @@
 dbQueryCheck('COMMIT');
 dbQueryCheck('SET AUTOCOMMIT = 1');
 
+$_SESSION['formWarningMessage'] = Translator::Translate('CheckUpdatedInvoice');
 header("Location: index.php?func=invoices&list=invoice&form=invoice&id=$invoiceId");
diff --git a/copy_invoice.php b/copy_invoice.php
@@ -130,7 +130,7 @@
         $invoiceData['template_invoice_id'] = $intInvoiceId;
     }
 
-    advanceInvoiceIntervalData($invoiceData);
+    advanceInvoiceIntervalDate($invoiceData);
 
     dbQueryCheck('SET AUTOCOMMIT = 0');
     dbQueryCheck('BEGIN');

diff --git a/create_invoice_from_template.php b/create_invoice_from_template.php
@@ -83,85 +83,75 @@
     return;
 }
 
-    $paymentDays = getPaymentDays($invoiceData['company_id']);
-
-    unset($invoiceData['id']);
-    unset($invoiceData['invoice_no']);
-    $invoiceData['deleted'] = 0;
-    $invoiceData['invoice_date'] = date('Ymd');
-    $invoiceData['due_date'] = date(
-        'Ymd', mktime(0, 0, 0, date('m'), date('d') + $paymentDays, date('Y'))
-    );
-    $invoiceData['payment_date'] = null;
-    $invoiceData['state_id'] = 1;
-    $invoiceData['archived'] = false;
-    $invoiceData['refunded_invoice_id'] = null;
-    $invoiceData['interval_type'] = 0;
-    $invoiceData['next_interval_date'] = null;
-    $invoiceData['template_invoice_id'] = $intInvoiceId;
-
-
-
-    dbQueryCheck('SET AUTOCOMMIT = 0');
-    dbQueryCheck('BEGIN');
-
-    try {
-        if ($invoiceData['interval_type'] > 0) {
-            // Reset interval type of the original invoice
-            $strQuery = 'UPDATE {prefix}invoice ' . 'SET interval_type = 0 ' .
-                 'WHERE {prefix}invoice.id = ?';
-            dbParamQuery($strQuery, [$intInvoiceId], 'exception');
+$paymentDays = getPaymentDays($invoiceData['company_id']);
+
+unset($invoiceData['id']);
+unset($invoiceData['invoice_no']);
+$invoiceData['deleted'] = 0;
+$invoiceData['invoice_date'] = date('Ymd');
+$invoiceData['due_date'] = date(
+    'Ymd', mktime(0, 0, 0, date('m'), date('d') + $paymentDays, date('Y'))
+);
+$invoiceData['payment_date'] = null;
+$invoiceData['state_id'] = 1;
+$invoiceData['archived'] = false;
+$invoiceData['refunded_invoice_id'] = null;
+$invoiceData['interval_type'] = 0;
+$invoiceData['next_interval_date'] = null;
+$invoiceData['template_invoice_id'] = $templateId;
+
+dbQueryCheck('SET AUTOCOMMIT = 0');
+dbQueryCheck('BEGIN');
+
+try {
+    $strQuery = 'INSERT INTO {prefix}invoice(' .
+            implode(', ', array_keys($invoiceData)) . ') ' . 'VALUES (' .
+            str_repeat('?, ', count($invoiceData) - 1) . '?)';
+
+    dbParamQuery($strQuery, array_values($invoiceData), 'exception');
+    $intNewId = mysqli_insert_id($dblink);
+    if (!$intNewId) {
+        die('Could not get ID of the new invoice');
+    }
+    $newRowDate = date('Ymd');
+    $strQuery = 'SELECT * ' . 'FROM {prefix}invoice_row WHERE deleted=0 AND invoice_id=?';
+    $rows = dbParamQuery($strQuery, [$templateId], 'exception');
+    foreach ($rows as $row) {
+        if ($boolRefund) {
+            $row['pcs'] = -$row['pcs'];
+            if ($row['partial_payment']) {
+                $row['price'] = -$row['price'];
+            }
+        } elseif ($row['reminder_row']) {
+            continue;
         }
+        unset($row['id']);
+        $row['invoice_id'] = $intNewId;
 
-        $strQuery = 'INSERT INTO {prefix}invoice(' .
-             implode(', ', array_keys($invoiceData)) . ') ' . 'VALUES (' .
-             str_repeat('?, ', count($invoiceData) - 1) . '?)';
-
-        dbParamQuery($strQuery, array_values($invoiceData), 'exception');
-        $intNewId = mysqli_insert_id($dblink);
-        if (!$intNewId) {
-            die('Could not get ID of the new invoice');
+        if ($row['row_date']) {
+            $row['row_date'] = $newRowDate;
         }
-        $newRowDate = date('Ymd');
-        $strQuery = 'SELECT * ' . 'FROM {prefix}invoice_row ' .
-             'WHERE deleted=0 AND invoice_id=?';
-        $rows = dbParamQuery($strQuery, [$intInvoiceId], 'exception');
-        foreach ($rows as $row) {
-            if ($boolRefund) {
-                $row['pcs'] = -$row['pcs'];
-                if ($row['partial_payment']) {
-                    $row['price'] = -$row['price'];
-                }
-            } elseif ($row['reminder_row']) {
-                continue;
-            }
-            unset($row['id']);
-            $row['invoice_id'] = $intNewId;
-
-            if (getSetting('invoice_update_row_dates_on_copy')) {
-                $row['row_date'] = $newRowDate;
-            }
-            // Update product stock balance
-            if (!$isOffer && !$isTemplate && $row['product_id'] !== null) {
-                updateProductStockBalance(null, $row['product_id'], $row['pcs']);
-            }
-            $strQuery = 'INSERT INTO {prefix}invoice_row(' .
-                 implode(', ', array_keys($row)) . ') ' . 'VALUES (' .
-                 str_repeat('?, ', count($row) - 1) . '?)';
-            dbParamQuery($strQuery, $row, 'exception');
+        // Update product stock balance
+        if (!$isOffer && !$isTemplate && $row['product_id'] !== null) {
+            updateProductStockBalance(null, $row['product_id'], $row['pcs']);
         }
-
-        // Update interval of the template:
-        $template = getInvoice($templateId);
-        advanceInvoiceIntervalData($template);
-        updateInvoice($template);
-    } catch (Exception $e) {
-        dbQueryCheck('ROLLBACK');
-        dbQueryCheck('SET AUTOCOMMIT = 1');
-        die($e->getMessage());
+        $strQuery = 'INSERT INTO {prefix}invoice_row(' .
+                implode(', ', array_keys($row)) . ') ' . 'VALUES (' .
+                str_repeat('?, ', count($row) - 1) . '?)';
+        dbParamQuery($strQuery, $row, 'exception');
     }
-    dbQueryCheck('COMMIT');
+
+    // Update interval of the template:
+    $template = getInvoice($templateId);
+    advanceInvoiceIntervalDate($template);
+    updateInvoice($template);
+} catch (Exception $e) {
+    dbQueryCheck('ROLLBACK');
     dbQueryCheck('SET AUTOCOMMIT = 1');
+    die($e->getMessage());
 }
+dbQueryCheck('COMMIT');
+dbQueryCheck('SET AUTOCOMMIT = 1');
 
+$_SESSION['formWarningMessage'] = Translator::Translate('CheckCreatedInvoice');
 header("Location: index.php?func=$strFunc&list=$strList&form=invoice&id=$intNewId");
diff --git a/css/_table.scss b/css/_table.scss
@@ -2,7 +2,7 @@
  * dataTables display
  */
 
-tr.overdue td.due-date {
+tr.overdue td.due-date, tr.due td.next-interval-date {
   &, &.sorting_1, &.sorting_2, &.sorting_3 {
 	background-color: #FFCCDD;
   }

diff --git a/css/style.css b/css/style.css
diff --git a/css/style.css.map b/css/style.css.map
diff --git a/form.php b/form.php
@@ -69,17 +69,23 @@ function createForm($strFunc, $strList, $strForm)
     }
 
     $strMessage = '';
-    if (isset($_SESSION['formMessage']) && $_SESSION['formMessage']) {
-        $strMessage = Translator::translate($_SESSION['formMessage']);
+    if ($msg = $_SESSION['formMessage'] ?? null) {
+        $strMessage = Translator::translate($msg);
         unset($_SESSION['formMessage']);
     }
 
     $strErrorMessage = '';
-    if (isset($_SESSION['formErrorMessage']) && $_SESSION['formErrorMessage']) {
-        $strErrorMessage = Translator::translate($_SESSION['formErrorMessage']);
+    if ($msg = $_SESSION['formErrorMessage'] ?? null) {
+        $strErrorMessage = Translator::translate($msg);
         unset($_SESSION['formErrorMessage']);
     }
 
+    $strWarningMessage = '';
+    if ($msg = $_SESSION['formWarningMessage'] ?? null) {
+        $strWarningMessage = Translator::translate($msg);
+        unset($_SESSION['formWarningMessage']);
+    }
+
     if ('new' === $action) {
         $formConfig['readOnly'] = false;
     }
@@ -202,7 +208,7 @@ function createForm($strFunc, $strList, $strForm)
         $strForm, $formConfig, $intKeyValue ? false : true, true, $recordDeleted
     );
 
-    if ($strForm == 'invoice' && !empty($astrValues['next_interval_date'])
+    if ($strForm == 'invoice_template' && !empty($astrValues['next_interval_date'])
         && strDate2UnixTime($astrValues['next_interval_date']) <= time()
     ) {
         ?>
@@ -427,6 +433,11 @@ function ($s) {
       MLInvoice.errormsg(<?php echo json_encode($strErrorMessage)?>);
         <?php
     }
+    if ($strWarningMessage) {
+        ?>
+      MLInvoice.warningmsg(<?php echo json_encode($strWarningMessage)?>, 5000);
+        <?php
+    }
     if ($strForm == 'product') {
         ?>
   MLInvoice.Form.updateStockBalanceLog();
@@ -1101,7 +1112,7 @@ function createFormButtons($form, $formConfig, $new, $top, $deleted)
         ?>
         <div class="btn-set">
             <a id="linked_invoices_button" class="btn btn-secondary" role="button" aria-expanded="false">
-                <?php echo Translator::translate('Created Invoices')?>
+                <?php echo Translator::translate('CreatedInvoices')?>
                 (<span class="linked-invoice-count"><?php echo count($linkedInvoices)?></span>)
                 <span class="dropdown-open"><i class="icon-down-dir"></i><span class="visually-hidden"><?php echo Translator::translate('Show')?></span></span>
                 <span class="dropdown-close hidden"><i class="icon-up-dir"></i><span class="visually-hidden"><?php echo Translator::translate('Hide')?></span></span>
@@ -1185,7 +1196,6 @@ function createFormButtons($form, $formConfig, $new, $top, $deleted)
                             <th><?php echo Translator::translate('HeaderInvoiceName') ?></th>
                             <th><?php echo Translator::translate('HeaderInvoiceReference') ?></th>
                             <th><?php echo Translator::translate('HeaderInvoiceState') ?></th>
-                            <th><?php echo Translator::translate('HeaderInvoiceTotal') ?></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -1202,7 +1212,6 @@ function createFormButtons($form, $formConfig, $new, $top, $deleted)
                                 <td><?php echo escapeHtml($linkedInvoice['name'])?></td>
                                 <td><?php echo escapeHtml($linkedInvoice['reference'])?></td>
                                 <td><?php echo Translator::translate($linkedInvoice['state'])?></td>
-                                <td><?php echo miscRound2Decim($linkedInvoice['row_total'] ?? 0)?></td>
                             </tr>
                             <?php
                             if (++$linkCount === 10) {
@@ -1211,6 +1220,7 @@ function createFormButtons($form, $formConfig, $new, $top, $deleted)
                                     ...
                                 </td>
                                 <?php
+                                break;
                             }
                         }
                         ?>

diff --git a/index.php b/index.php
@@ -270,7 +270,7 @@
         } elseif ($strFunc == 'archived_invoices') {
             createList('archived_invoices', 'archived_invoices', 'archived_invoices', '', Search::SEARCH_ARCHIVED_INVOICES, false, false, 'invoice');
         } elseif ($strFunc == 'invoice_templates') {
-            createList('invoice_templates', 'invoice_templates', 'invoice_templates', '', Search::SEARCH_RECURRING_INVOICE_TEMPLATES, false, false, 'invoice');
+            createList('invoice_templates', 'invoice_templates', 'invoice_templates', '', Search::SEARCH_RECURRING_INVOICE_TEMPLATES, false, true, 'invoice');
         } elseif ($strFunc == 'offers') {
             createList($strFunc, $strList, '', '', Search::SEARCH_NON_ARCHIVED_OFFERS, false, false, 'invoice');
         } elseif ($strFunc == 'archived_offers') {

diff --git a/js/mlinvoice.js b/js/mlinvoice.js
@@ -337,6 +337,11 @@ var MLInvoice = (function CreateMLInvoice() {
     infomsg(msg, timeout, 'text-white bg-danger');
   }
 
+  function warningmsg(msg, timeout)
+  {
+    infomsg(msg, timeout, 'bg-warning');
+  }
+
   function clearMessages()
   {
     $('#toasts').html('');
@@ -803,6 +808,7 @@ var MLInvoice = (function CreateMLInvoice() {
     updateRowSelectedState: updateRowSelectedState,
     infomsg: infomsg,
     errormsg: errormsg,
+    warningmsg: warningmsg,
     editUnitPrice: editUnitPrice,
     setCurrencyDecimals: setCurrencyDecimals,
     getDateFormat: getDateFormat,

diff --git a/js/mlinvoice.min.js b/js/mlinvoice.min.js
diff --git a/js/mlinvoice.min.js.map b/js/mlinvoice.min.js.map
diff --git a/lang/en-US.ini b/lang/en-US.ini
@@ -285,6 +285,8 @@ ServerError = 'Error from server'
 CannotDeleteCurrentUser = 'Cannot delete currently logged-in user'
 RecurringInvoiceDueForProcessing = 'This recurring invoice is due for processing'
 RecurringInvoicesDueForProcesing = 'There are recurring invoices due for processing'
+CheckCreatedInvoice = 'Check created invoice'
+CheckUpdatedInvoice = 'Check updated invoice'
 
 ; Updater
 UpdateAvailable = '(update v{version} available)'
@@ -461,9 +463,10 @@ RecurringInvoiceTemplate = 'Recurring invoice template'
 RecurringInvoiceTemplates = 'Recurring invoice templates'
 NewRecurringInvoiceTemplate = 'New Recurring Invoice Template'
 AddToInvoice = 'Add to Invoice'
-AddToExistingOpenInvoice = 'Add to the Existing Open Invoice'
-CreateNewInvoice = 'Create a New Invoice'
+AddToExistingOpenInvoice = 'Add to Existing Open Invoice'
+CreateNewInvoice = 'Create New Invoice'
 ShowRecurringInvoiceTemplate = 'Show Template'
+CreatedInvoices = 'Created Invoices'
 
 ; Email
 SendEmail = 'Send Email'

diff --git a/lang/fi-FI.ini b/lang/fi-FI.ini
@@ -285,6 +285,8 @@ ServerError = 'Virhe palvelimelta'
 CannotDeleteCurrentUser = 'Kirjautuneena olevaa käyttäjää ei voida poistaa'
 RecurringInvoiceDueForProcessing = 'Tämä toistuva lasku odottaa käsittelyä'
 RecurringInvoicesDueForProcesing = 'Käsittelyä odottavia toistuvia laskuja'
+CheckCreatedInvoice = 'Tarkista luotu lasku'
+CheckUpdatedInvoice = 'Tarkista päivitetty lasku'
 
 ; Updater
 UpdateAvailable = '(päivitys v{version} saatavissa)'
@@ -462,6 +464,8 @@ NewRecurringInvoiceTemplate = 'Uusi toistuvan laskun malli'
 AddToInvoice = 'Lisää laskulle'
 AddToExistingOpenInvoice = 'Lisää olemassaolevaan avoimeen laskuun'
 CreateNewInvoice = 'Luo uusi lasku'
+ShowRecurringInvoiceTemplate = 'Näytä malli'
+CreatedInvoices = 'Luodut laskut'
 
 ; Email
 SendEmail = 'Sähköpostin lähetys'

diff --git a/lang/sv-FI.ini b/lang/sv-FI.ini
@@ -287,6 +287,8 @@ ServerError = 'Fel från servern'
 CannotDeleteCurrentUser = 'Kan inte radera inloggad användare'
 RecurringInvoiceDueForProcessing = 'Denna återkommande faktura ska behandlas'
 RecurringInvoicesDueForProcesing = 'Det finns återkommande fakturor som ska behandlas'
+CheckCreatedInvoice = 'Kontrollera skapad faktura'
+CheckUpdatedInvoice = 'Kontrollera uppdaterad faktura'
 
 ; Updater
 UpdateAvailable = '(uppdatering till v{version} tillgänglig)'
@@ -465,6 +467,8 @@ NewRecurringInvoiceTemplate = 'Ny mall för en återkommande faktura'
 AddToInvoice = 'Lägg till på faktura'
 AddToExistingOpenInvoice = 'Lägg till i den befintliga öppna fakturan'
 CreateNewInvoice = 'Skapa en ny faktura'
+ShowRecurringInvoiceTemplate = 'Visa mallen'
+CreatedInvoices = 'Skapade fakturor'
 
 ; Email
 SendEmail = 'Skicka per e-post'

diff --git a/list.php b/list.php
@@ -170,6 +170,8 @@ function createList($strFunc, $strList, $strTableName = '', $strTitleOverride =
             $class = 'editable';
         } elseif ('i.due_date' === $field['name']) {
             $class = 'due-date';
+        } elseif ('i.next_interval_date' === $field['name']) {
+            $class = 'next-interval-date';
         }
         $visible = !isset($field['visible']) || $field['visible'] ? 'true' : 'false';
         ?>
@@ -626,7 +628,7 @@ function createJSONList(
             $resultValues[] = $value;
 
             // Special colouring for overdue invoices
-            if ($highlight && $name == 'due_date') {
+            if ($highlight && 'invoices' === $strList && $name == 'due_date') {
                 $rowDue = dbDate2UnixTime($row['due_date']);
                 if ($rowDue < mktime(0, 0, 0, date("m"), date("d") - 14, date("Y"))
                 ) {
@@ -640,6 +642,19 @@ function createJSONList(
                     $rowClass = 'overdue';
                 }
             }
+
+            // Special colouring for due/overdue invoice templates
+            if ($highlight
+                && 'invoice_templates' === $strList
+                && $name == 'next_interval_date'
+                && $row['next_interval_date']
+            ) {
+                $nextDate = dbDate2UnixTime($row['next_interval_date']);
+                if ($nextDate <= mktime(0, 0, 0, date("m"), date("d"), date("Y"))
+                ) {
+                    $rowClass = 'due';
+                }
+            }
         }
         $class = trim("$rowClass$deleted");
         if ($class) {

diff --git a/list_switch.php b/list_switch.php
@@ -264,7 +264,7 @@
             'width' => 60,
             'type' => 'INTDATE',
             'header' => 'HeaderInvoiceNextIntervalDate',
-            'visible' => false,
+            'visible' => 'invoice_templates' === $strList,
         ],
         [
             'name' => 'i.ref_number',