mirror of https://github.com/itflow-org/itflow
Do Not calculate Non-Billable Invoices towards a clients balance Convert Add Payment Modal to AJAX and add it as an option from the invoice listing page
This commit is contained in:
johnnyq
parent
18ce12f60d
commit
674da36cd1
|
|
@ -0,0 +1,182 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once '../includes/ajax_header.php';
|
||||||
|
|
||||||
|
$invoice_id = intval($_GET['id']);
|
||||||
|
|
||||||
|
$sql = mysqli_query(
|
||||||
|
$mysqli,
|
||||||
|
"SELECT * FROM invoices
|
||||||
|
LEFT JOIN clients ON invoice_client_id = client_id
|
||||||
|
LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
|
||||||
|
WHERE invoice_id = $invoice_id
|
||||||
|
LIMIT 1"
|
||||||
|
);
|
||||||
|
|
||||||
|
$row = mysqli_fetch_array($sql);
|
||||||
|
$invoice_id = intval($row['invoice_id']);
|
||||||
|
$invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
|
||||||
|
$invoice_number = intval($row['invoice_number']);
|
||||||
|
$invoice_amount = floatval($row['invoice_amount']);
|
||||||
|
$client_id = intval($row['client_id']);
|
||||||
|
$client_name = nullable_htmlentities($row['client_name']);
|
||||||
|
$client_currency_code = nullable_htmlentities($row['client_currency_code']);
|
||||||
|
$contact_name = nullable_htmlentities($row['contact_name']);
|
||||||
|
$contact_email = nullable_htmlentities($row['contact_email']);
|
||||||
|
|
||||||
|
|
||||||
|
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
||||||
|
$sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id");
|
||||||
|
$row = mysqli_fetch_array($sql_amount_paid);
|
||||||
|
$amount_paid = floatval($row['amount_paid']);
|
||||||
|
|
||||||
|
$balance = $invoice_amount - $amount_paid;
|
||||||
|
|
||||||
|
// Generate the HTML form content using output buffering.
|
||||||
|
ob_start();
|
||||||
|
?>
|
||||||
|
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?>: Make Payment</h5>
|
||||||
|
<button type="button" class="close text-white" data-dismiss="modal">
|
||||||
|
<span>×</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<form action="post.php" method="post" autocomplete="off">
|
||||||
|
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
|
||||||
|
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
|
||||||
|
<input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
|
||||||
|
<div class="modal-body bg-white">
|
||||||
|
|
||||||
|
<div class="form-row">
|
||||||
|
<div class="col-md">
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Date <strong class="text-danger">*</strong></label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
|
||||||
|
</div>
|
||||||
|
<input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md">
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Amount <strong class="text-danger">*</strong></label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
|
||||||
|
</div>
|
||||||
|
<input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Account <strong class="text-danger">*</strong></label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
|
||||||
|
</div>
|
||||||
|
<select class="form-control select2" name="account" required>
|
||||||
|
<option value="">- Select an Account -</option>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
|
||||||
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
|
$account_id = intval($row['account_id']);
|
||||||
|
$account_name = nullable_htmlentities($row['account_name']);
|
||||||
|
$opening_balance = floatval($row['opening_balance']);
|
||||||
|
|
||||||
|
$sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
|
||||||
|
$row = mysqli_fetch_array($sql_payments);
|
||||||
|
$total_payments = floatval($row['total_payments']);
|
||||||
|
|
||||||
|
$sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
|
||||||
|
$row = mysqli_fetch_array($sql_revenues);
|
||||||
|
$total_revenues = floatval($row['total_revenues']);
|
||||||
|
|
||||||
|
$sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
|
||||||
|
$row = mysqli_fetch_array($sql_expenses);
|
||||||
|
$total_expenses = floatval($row['total_expenses']);
|
||||||
|
|
||||||
|
$account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
|
||||||
|
|
||||||
|
?>
|
||||||
|
<option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?>
|
||||||
|
value="<?php echo $account_id; ?>">
|
||||||
|
<?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]
|
||||||
|
</option>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Payment Method <strong class="text-danger">*</strong></label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
|
||||||
|
</div>
|
||||||
|
<select class="form-control select2" name="payment_method" required>
|
||||||
|
<option value="">- Method of Payment -</option>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL ORDER BY category_name ASC");
|
||||||
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
|
$category_name = nullable_htmlentities($row['category_name']);
|
||||||
|
?>
|
||||||
|
<option <?php if ($config_default_payment_method == $category_name) {
|
||||||
|
echo "selected";
|
||||||
|
} ?>><?php echo $category_name; ?></option>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Reference</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
|
||||||
|
</div>
|
||||||
|
<input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc" maxlength="200">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Email Receipt</label>
|
||||||
|
<div class="custom-control custom-checkbox">
|
||||||
|
<input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" checked>
|
||||||
|
<label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer bg-white">
|
||||||
|
<button type="submit" name="add_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
|
||||||
|
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once "../includes/ajax_footer.php";
|
||||||
|
|
@ -11,7 +11,7 @@ require_once "includes/inc_all.php";
|
||||||
|
|
||||||
// Billing Card Queries
|
// Billing Card Queries
|
||||||
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
||||||
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $session_client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
|
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $session_client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
|
||||||
$row = mysqli_fetch_array($sql_invoice_amounts);
|
$row = mysqli_fetch_array($sql_invoice_amounts);
|
||||||
|
|
||||||
$invoice_amounts = floatval($row['invoice_amounts']);
|
$invoice_amounts = floatval($row['invoice_amounts']);
|
||||||
|
|
|
||||||
|
|
@ -339,7 +339,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
|
||||||
$client_tags_display = implode('', $client_tag_name_display_array);
|
$client_tags_display = implode('', $client_tag_name_display_array);
|
||||||
|
|
||||||
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
||||||
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' ");
|
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' ");
|
||||||
$row = mysqli_fetch_array($sql_invoice_amounts);
|
$row = mysqli_fetch_array($sql_invoice_amounts);
|
||||||
|
|
||||||
$invoice_amounts = floatval($row['invoice_amounts']);
|
$invoice_amounts = floatval($row['invoice_amounts']);
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ if ($user_config_dashboard_financial_enable == 1) {
|
||||||
$row = mysqli_fetch_array($sql_total_expenses);
|
$row = mysqli_fetch_array($sql_total_expenses);
|
||||||
$total_expenses = floatval($row['total_expenses']);
|
$total_expenses = floatval($row['total_expenses']);
|
||||||
|
|
||||||
$sql_invoice_totals = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_totals FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' AND YEAR(invoice_date) = $year");
|
$sql_invoice_totals = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_totals FROM invoices WHERE invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' AND YEAR(invoice_date) = $year");
|
||||||
$row = mysqli_fetch_array($sql_invoice_totals);
|
$row = mysqli_fetch_array($sql_invoice_totals);
|
||||||
$invoice_totals = floatval($row['invoice_totals']);
|
$invoice_totals = floatval($row['invoice_totals']);
|
||||||
|
|
||||||
|
|
@ -99,7 +99,7 @@ if ($user_config_dashboard_financial_enable == 1) {
|
||||||
$row = mysqli_fetch_array($sql_total_payments_to_invoices_all_years);
|
$row = mysqli_fetch_array($sql_total_payments_to_invoices_all_years);
|
||||||
$total_payments_to_invoices_all_years = floatval($row['total_payments_to_invoices_all_years']);
|
$total_payments_to_invoices_all_years = floatval($row['total_payments_to_invoices_all_years']);
|
||||||
|
|
||||||
$sql_invoice_totals_all_years = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_totals_all_years FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
|
$sql_invoice_totals_all_years = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_totals_all_years FROM invoices WHERE invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
|
||||||
$row = mysqli_fetch_array($sql_invoice_totals_all_years);
|
$row = mysqli_fetch_array($sql_invoice_totals_all_years);
|
||||||
$invoice_totals_all_years = floatval($row['invoice_totals_all_years']);
|
$invoice_totals_all_years = floatval($row['invoice_totals_all_years']);
|
||||||
|
|
||||||
|
|
@ -808,7 +808,7 @@ if ($user_config_dashboard_technical_enable == 1) {
|
||||||
<?php
|
<?php
|
||||||
$largest_invoice_month = 0;
|
$largest_invoice_month = 0;
|
||||||
for ($month = 1; $month <= 12; $month++) {
|
for ($month = 1; $month <= 12; $month++) {
|
||||||
$sql_projected = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amount_for_month FROM invoices WHERE YEAR(invoice_due) = $year AND MONTH(invoice_due) = $month AND invoice_status NOT LIKE 'Cancelled' AND invoice_status NOT LIKE 'Draft'");
|
$sql_projected = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amount_for_month FROM invoices WHERE YEAR(invoice_due) = $year AND MONTH(invoice_due) = $month AND invoice_status != 'Cancelled' AND invoice_status != 'Draft' AND invoice_status != 'Non-Billable'");
|
||||||
$row = mysqli_fetch_array($sql_projected);
|
$row = mysqli_fetch_array($sql_projected);
|
||||||
$invoice_for_month = floatval($row['invoice_amount_for_month']);
|
$invoice_for_month = floatval($row['invoice_amount_for_month']);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ $balance = $invoice_amount - $amount_paid;
|
||||||
|
|
||||||
//check to see if overdue
|
//check to see if overdue
|
||||||
$invoice_color = $invoice_badge_color; // Default
|
$invoice_color = $invoice_badge_color; // Default
|
||||||
if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status !== "Cancelled") {
|
if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status !== "Cancelled" && $invoice_status !== "Non-Billable") {
|
||||||
$unixtime_invoice_due = strtotime($invoice_due) + 86400;
|
$unixtime_invoice_due = strtotime($invoice_due) + 86400;
|
||||||
if ($unixtime_invoice_due < time()) {
|
if ($unixtime_invoice_due < time()) {
|
||||||
$invoice_color = "text-danger";
|
$invoice_color = "text-danger";
|
||||||
|
|
@ -133,7 +133,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
|
||||||
|
|
||||||
// Get Total Account Balance
|
// Get Total Account Balance
|
||||||
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
||||||
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' ");
|
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
|
||||||
$row = mysqli_fetch_array($sql_invoice_amounts);
|
$row = mysqli_fetch_array($sql_invoice_amounts);
|
||||||
|
|
||||||
$account_balance = floatval($row['invoice_amounts']);
|
$account_balance = floatval($row['invoice_amounts']);
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ if (isset($_GET['client_id'])) {
|
||||||
$client_tags_display = implode('', $client_tag_name_display_array);
|
$client_tags_display = implode('', $client_tag_name_display_array);
|
||||||
|
|
||||||
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
//Add up all the payments for the invoice and get the total amount paid to the invoice
|
||||||
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
|
$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
|
||||||
$row = mysqli_fetch_array($sql_invoice_amounts);
|
$row = mysqli_fetch_array($sql_invoice_amounts);
|
||||||
|
|
||||||
$invoice_amounts = floatval($row['invoice_amounts']);
|
$invoice_amounts = floatval($row['invoice_amounts']);
|
||||||
|
|
|
||||||
11
invoice.php
11
invoice.php
|
|
@ -139,7 +139,7 @@ if (isset($_GET['invoice_id'])) {
|
||||||
$balance = $invoice_amount - $amount_paid;
|
$balance = $invoice_amount - $amount_paid;
|
||||||
|
|
||||||
//check to see if overdue
|
//check to see if overdue
|
||||||
if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status !== "Cancelled") {
|
if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status !== "Cancelled" && $invoice_status !== "Non-Billable") {
|
||||||
$unixtime_invoice_due = strtotime($invoice_due) + 86400;
|
$unixtime_invoice_due = strtotime($invoice_due) + 86400;
|
||||||
if ($unixtime_invoice_due < time()) {
|
if ($unixtime_invoice_due < time()) {
|
||||||
$invoice_overdue = "Overdue";
|
$invoice_overdue = "Overdue";
|
||||||
|
|
@ -220,8 +220,12 @@ if (isset($_GET['invoice_id'])) {
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_amount != 0) { ?>
|
<?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
|
||||||
<a class="btn btn-success" href="#" data-toggle="modal" data-target="#addPaymentModal">
|
<a class="btn btn-success" href="#"
|
||||||
|
data-toggle = "ajax-modal"
|
||||||
|
data-ajax-url = "ajax/ajax_invoice_pay.php"
|
||||||
|
data-ajax-id = "<?php echo $invoice_id; ?>"
|
||||||
|
>
|
||||||
<i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
|
<i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
|
||||||
</a>
|
</a>
|
||||||
<?php if ($invoice_status !== 'Partial' && $config_stripe_enable && $stripe_id && $stripe_pm) { ?>
|
<?php if ($invoice_status !== 'Partial' && $config_stripe_enable && $stripe_id && $stripe_pm) { ?>
|
||||||
|
|
@ -701,7 +705,6 @@ if (isset($_GET['invoice_id'])) {
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
include_once "modals/invoice_add_ticket_modal.php";
|
include_once "modals/invoice_add_ticket_modal.php";
|
||||||
include_once "modals/invoice_payment_add_modal.php";
|
|
||||||
include_once "modals/invoice_recurring_add_modal.php";
|
include_once "modals/invoice_recurring_add_modal.php";
|
||||||
include_once "modals/invoice_note_modal.php";
|
include_once "modals/invoice_note_modal.php";
|
||||||
|
|
||||||
|
|
|
||||||
16
invoices.php
16
invoices.php
|
|
@ -342,6 +342,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
|
||||||
<i class="fas fa-ellipsis-h"></i>
|
<i class="fas fa-ellipsis-h"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
|
<?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_status !== 'Non-Billable' && $invoice_amount != 0) { ?>
|
||||||
|
<a class="dropdown-item" href="#"
|
||||||
|
data-toggle = "ajax-modal"
|
||||||
|
data-ajax-url = "ajax/ajax_invoice_pay.php"
|
||||||
|
data-ajax-id = "<?php echo $invoice_id; ?>"
|
||||||
|
>
|
||||||
|
<i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
|
||||||
|
</a>
|
||||||
|
<div class="dropdown-divider"></div>
|
||||||
|
<?php if ($invoice_status !== 'Partial' && $config_stripe_enable && $stripe_id && $stripe_pm) { ?>
|
||||||
|
<a class="dropdown-item confirm-link" href="post.php?add_payment_stripe&invoice_id=<?php echo $invoice_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token']; ?>">
|
||||||
|
<i class="fa fa-fw fa-credit-card mr-2"></i>Pay via saved card
|
||||||
|
</a>
|
||||||
|
<div class="dropdown-divider"></div>
|
||||||
|
<?php } ?>
|
||||||
|
<?php } ?>
|
||||||
<a class="dropdown-item" href="#"
|
<a class="dropdown-item" href="#"
|
||||||
data-toggle = "ajax-modal"
|
data-toggle = "ajax-modal"
|
||||||
data-ajax-url = "ajax/ajax_invoice_edit.php"
|
data-ajax-url = "ajax/ajax_invoice_edit.php"
|
||||||
|
|
|
||||||
|
|
@ -1,146 +0,0 @@
|
||||||
<div class="modal" id="addPaymentModal" tabindex="-1">
|
|
||||||
<div class="modal-dialog">
|
|
||||||
<div class="modal-content bg-dark">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?>: Make Payment</h5>
|
|
||||||
<button type="button" class="close text-white" data-dismiss="modal">
|
|
||||||
<span>×</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<form action="post.php" method="post" autocomplete="off">
|
|
||||||
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
|
|
||||||
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
|
|
||||||
<input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
|
|
||||||
<div class="modal-body bg-white">
|
|
||||||
|
|
||||||
<div class="form-row">
|
|
||||||
<div class="col-md">
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Date <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
|
|
||||||
</div>
|
|
||||||
<input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md">
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Amount <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Account <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
|
|
||||||
</div>
|
|
||||||
<select class="form-control select2" name="account" required>
|
|
||||||
<option value="">- Select an Account -</option>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
|
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
|
||||||
$account_id = intval($row['account_id']);
|
|
||||||
$account_name = nullable_htmlentities($row['account_name']);
|
|
||||||
$opening_balance = floatval($row['opening_balance']);
|
|
||||||
|
|
||||||
$sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
|
|
||||||
$row = mysqli_fetch_array($sql_payments);
|
|
||||||
$total_payments = floatval($row['total_payments']);
|
|
||||||
|
|
||||||
$sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
|
|
||||||
$row = mysqli_fetch_array($sql_revenues);
|
|
||||||
$total_revenues = floatval($row['total_revenues']);
|
|
||||||
|
|
||||||
$sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
|
|
||||||
$row = mysqli_fetch_array($sql_expenses);
|
|
||||||
$total_expenses = floatval($row['total_expenses']);
|
|
||||||
|
|
||||||
$account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
|
|
||||||
|
|
||||||
?>
|
|
||||||
<option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?>
|
|
||||||
value="<?php echo $account_id; ?>">
|
|
||||||
<?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]
|
|
||||||
</option>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Payment Method <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
|
|
||||||
</div>
|
|
||||||
<select class="form-control select2" name="payment_method" required>
|
|
||||||
<option value="">- Method of Payment -</option>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL ORDER BY category_name ASC");
|
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
|
||||||
$category_name = nullable_htmlentities($row['category_name']);
|
|
||||||
?>
|
|
||||||
<option <?php if ($config_default_payment_method == $category_name) {
|
|
||||||
echo "selected";
|
|
||||||
} ?>><?php echo $category_name; ?></option>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Reference</label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc" maxlength="200">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Email Receipt</label>
|
|
||||||
<div class="custom-control custom-checkbox">
|
|
||||||
<input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" checked>
|
|
||||||
<label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="modal-footer bg-white">
|
|
||||||
<button type="submit" name="add_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
|
|
||||||
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
@ -27,8 +27,9 @@ enforceUserPermission('module_financial');
|
||||||
invoices
|
invoices
|
||||||
ON
|
ON
|
||||||
clients.client_id = invoices.invoice_client_id
|
clients.client_id = invoices.invoice_client_id
|
||||||
AND invoices.invoice_status NOT LIKE 'Draft'
|
AND invoices.invoice_status != 'Draft'
|
||||||
AND invoices.invoice_status NOT LIKE 'Cancelled'
|
AND invoices.invoice_status != 'Cancelled'
|
||||||
|
AND invoice_status != 'Non-Billable'
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
(SELECT
|
(SELECT
|
||||||
payment_invoice_id,
|
payment_invoice_id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue