AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 02:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set Invoice Credit, Consolidated all expense modals to modals/expense removed ajax_ and _modal prefixes from file name create new modal header and footer to include another parent directory eventually will consolidate all, this was just an example

Browse Source
This commit is contained in:
johnnyq
2025-08-22 16:59:31 -04:00
parent 7f49ecefb1
commit 6ccf7a0fb8
12 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
user/expenses.php
View File

@@ -305,11 +305,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</td>
<td>
<?php echo $receipt_attached; ?>
<a class="text-dark" href="#" title="Created: <?php echo $expense_created_at; ?>"
data-toggle="ajax-modal"
<a class="text-dark ajax-modal" href="#" title="Created: <?php echo $expense_created_at; ?>"
data-modal-size="lg"
data-ajax-url="ajax/ajax_expense_edit.php"
data-ajax-id="<?php echo $expense_id; ?>">
data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
<?php echo $expense_date; ?>
</a>
</td>
@@ -334,26 +332,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</a>
<div class="dropdown-divider"></div>
<?php } ?>
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
<a class="dropdown-item ajax-modal" href="#"
data-modal-size="lg"
data-ajax-url="ajax/ajax_expense_edit.php"
data-ajax-id="<?php echo $expense_id; ?>">
data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
<a class="dropdown-item ajax-modal" href="#"
data-modal-size="lg"
data-ajax-url="ajax/ajax_expense_copy.php"
data-ajax-id="<?php echo $expense_id; ?>">
data-modal-url="modals/expense/expense_copy.php?id=<?= $expense_id ?>">
<i class="fas fa-fw fa-copy mr-2"></i>Copy
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#"
data-toggle="ajax-modal"
<a class="dropdown-item ajax-modal" href="#"
data-modal-size="lg"
data-ajax-url="ajax/ajax_expense_refund.php"
data-ajax-id="<?php echo $expense_id; ?>">
data-modal-url="modals/expense/expense_refund.php?id=<?= $expense_id ?>">
<i class="fas fa-fw fa-undo-alt mr-2"></i>Refund
</a>
<div class="dropdown-divider"></div>
@@ -372,9 +364,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</tbody>
</table>
</div>
<?php require_once "modals/expense_bulk_edit_category_modal.php"; ?>
<?php require_once "modals/expense_bulk_edit_account_modal.php"; ?>
<?php require_once "modals/expense_bulk_edit_client_modal.php"; ?>
<?php require_once "modals/expense/expense_bulk_edit_category.php"; ?>
<?php require_once "modals/expense/expense_bulk_edit_account.php"; ?>
<?php require_once "modals/expense/expense_bulk_edit_client.php"; ?>
</form>
<?php require_once "../includes/filter_footer.php";
?>
@@ -384,7 +376,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<script src="../js/bulk_actions.js"></script>
<?php
require_once "modals/expense_add_modal.php";
require_once "modals/expense_export_modal.php";
require_once "modals/expense/expense_add.php";
require_once "modals/expense/expense_export.php";
require_once "../includes/footer.php";

0
user/modals/expense_add_modal.php → user/modals/expense/expense_add.php
View File

0
user/modals/expense_bulk_edit_account_modal.php → user/modals/expense/expense_bulk_edit_account.php
View File

0
user/modals/expense_bulk_edit_category_modal.php → user/modals/expense/expense_bulk_edit_category.php
View File

0
user/modals/expense_bulk_edit_client_modal.php → user/modals/expense/expense_bulk_edit_client.php
View File

4
user/ajax/ajax_expense_copy.php → user/modals/expense/expense_copy.php
View File

@@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$expense_id = intval($_GET['id']);
@@ -208,7 +208,7 @@ ob_start();
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';
?>

4
user/ajax/ajax_expense_edit.php → user/modals/expense/expense_edit.php
View File

@@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$expense_id = intval($_GET['id']);
@@ -245,7 +245,7 @@ ob_start();
<?php
require_once '../../includes/modal_footer.php';
require_once '../../../includes/modal_footer_new.php';
?>

0
user/modals/expense_export_modal.php → user/modals/expense/expense_export.php
View File

6
user/ajax/ajax_expense_refund.php → user/modals/expense/expense_refund.php
View File

@@ -1,6 +1,6 @@
<?php
require_once '../../includes/modal_header.php';
require_once '../../../includes/modal_header_new.php';
$expense_id = intval($_GET['id']);
@@ -88,7 +88,5 @@ ob_start();
<?php
require_once '../../includes/modal_footer.php';
?>
require_once '../../../includes/modal_footer_new.php';

7
user/post/invoice.php
View File

@@ -968,6 +968,13 @@ if (isset($_POST['apply_credit'])) {
$invoice_due = $invoice_amount + $total_credit_applied;
$invoice_status = ($invoice_due <= 0) ? 'Paid' : 'Partial';
// Update the invoice credit amount
mysqli_query($mysqli, "
UPDATE invoices
SET invoice_credit_amount = $total_credit_applied
WHERE invoice_id = $invoice_id
");
// Update invoice status only (not invoice_credit_amount)
mysqli_query($mysqli, "UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id");