Fix timestamps, delete requests, invoice dates and GR quantities
Apply the configured timezone to PHP and both DB connections, wrap unwrapped ajax payloads so delete buttons reach their engines, normalise and validate invoice due dates, reject stock quantities below the stored 4dp scale, and list stock movements across all warehouses.
This commit is contained in:
@@ -146,7 +146,9 @@
|
||||
<?php require '../include_ending.php'; ?>
|
||||
|
||||
<script>
|
||||
var invoice_id = <?php echo $invoice_id; ?>;
|
||||
var invoice_id = <?php echo $invoice_id; ?>;
|
||||
var issued_date = ''; // ISO issue date — lower bound for the due date
|
||||
var due_picker = null; // flatpickr instance on #due_date
|
||||
|
||||
function doc_type_badge(doc_type) {
|
||||
const map = {
|
||||
@@ -208,6 +210,11 @@
|
||||
$('#display_issued').html(inv.issued_date ? format_date(inv.issued_date) : '<span class="text-muted">—</span>');
|
||||
$('#display_due').html(inv.due_date ? format_date(inv.due_date) : '<span class="text-muted">—</span>');
|
||||
$('#due_date').val(inv.due_date ? format_date_input(inv.due_date) : '');
|
||||
|
||||
// A due date before the issue date is not a valid payment term, so stop
|
||||
// the picker from offering one.
|
||||
issued_date = inv.issued_date ? String(inv.issued_date).split(' ')[0] : '';
|
||||
if (due_picker && issued_date) due_picker.set('minDate', issued_date);
|
||||
$('#display_notes').html(inv.notes ? escape_html(inv.notes).replace(/\n/g, '<br>') : '<span class="text-muted">—</span>');
|
||||
|
||||
var rows = '';
|
||||
@@ -279,6 +286,18 @@
|
||||
}
|
||||
|
||||
function save_invoice() {
|
||||
// autoPrepare sweeps every .form-control into the payload, so #due_date
|
||||
// arrives as the picker's DD/MM/YYYY text. Sent unconverted it reaches a
|
||||
// MySQL DATE column verbatim and the insert fails, which the engine
|
||||
// reports as the opaque "Database error, please try again." Convert it
|
||||
// here, the way the purchase-invoice page already does.
|
||||
var due_date = $('#due_date').val().trim();
|
||||
|
||||
if (due_date && issued_date && to_iso_date(due_date) < issued_date) {
|
||||
bootbox.alert('The due date cannot be earlier than the issue date.');
|
||||
return;
|
||||
}
|
||||
|
||||
ajax_request({
|
||||
url: '<?php echo $server_url?>order/api/engine/manage_invoice.php',
|
||||
autoPrepare: true,
|
||||
@@ -286,6 +305,7 @@
|
||||
action: 'update',
|
||||
data: {
|
||||
id: invoice_id,
|
||||
due_date: due_date ? to_iso_date(due_date) : '',
|
||||
tax_adjustment: parseFloat($('#tax_adjustment').val()) || 0,
|
||||
},
|
||||
onSuccess: function() { retrieve_invoice(); }
|
||||
@@ -320,6 +340,10 @@
|
||||
bootbox.alert('Please enter a due date before issuing this invoice.');
|
||||
return;
|
||||
}
|
||||
if (due_date && issued_date && to_iso_date(due_date) < issued_date) {
|
||||
bootbox.alert('The due date cannot be earlier than the issue date.');
|
||||
return;
|
||||
}
|
||||
bootbox.confirm({
|
||||
message: 'Issue this invoice?',
|
||||
buttons: {
|
||||
@@ -390,8 +414,8 @@
|
||||
}
|
||||
|
||||
$(function() {
|
||||
due_picker = flatpickr('#due_date', { dateFormat: 'd/m/Y', allowInput: true });
|
||||
if (invoice_id) retrieve_invoice();
|
||||
flatpickr('#due_date', { dateFormat: 'd/m/Y', allowInput: true });
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user