Skip to content

Merge from ItFlow to Personal ItFlow #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Merge from ItFlow to Personal ItFlow #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa5da20
Updated Invoice to show TAX seperately
jatin23pasrija Dec 9, 2023
bce57fd
Merge pull request #1 from jatin23pasrija/Development
jatin23pasrija Dec 9, 2023
6cf7139
Merge branch 'itflow-org:master' into master
jatin23pasrija May 12, 2024
301c075
Added API for Invoice Items
May 12, 2024
c86a683
Merge pull request #2 from jatin23pasrija/Development
jatin23pasrija May 12, 2024
d20592e
Merge branch 'master' into master
jatin23pasrija Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions api/v1/invoice-items/read.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

require_once '../validate_api_key.php';

require_once '../require_get_method.php';


if (isset($_GET['invoice_id'])) {
// Invoice items via ID (single)

$id = intval($_GET['invoice_id']);
$sql = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = '$id'");

} else {
// All invoices items

$sql = mysqli_query($mysqli, "SELECT * FROM invoice_items ORDER BY item_id LIMIT $limit OFFSET $offset");
}

// Output
require_once "../read_output.php";
28 changes: 24 additions & 4 deletions invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,10 @@
</div>
</div>

<?php $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC"); ?>

<?php $sql_invoice_taxes = mysqli_query($mysqli, "Select sum(i.item_tax) as tax, i.item_tax_id, t.tax_name, t.tax_percent from invoice_items i left join taxes t on i.item_tax_id = t.tax_id where i.item_invoice_id = $invoice_id GROUP by i.item_tax_id"); ?>
<div class="row mb-4">

<div class="row mb-3">
<div class="col-md-12">
<div class="card">
<div class="table-responsive">
Expand Down Expand Up @@ -518,8 +519,27 @@
}
?>
<?php if ($total_tax > 0) { ?>
<tr>
<td>Tax:</td>

<?php
if (mysqli_num_rows($sql_invoice_taxes) > 0) {
while ($row = mysqli_fetch_assoc($sql_invoice_taxes)) {
$taxName = $row['tax_name'];
$taxPercent = $row['tax_percent'];
$taxAmount = $row['tax'];

echo ('
<tr class="border-bottom">
<td>'.$taxName. " " .$taxPercent .'%</td>
<td class="text-right">'. numfmt_format_currency($currency_format, $taxAmount, $invoice_currency_code) .'</td>
</tr>
');
}
}
?>

<tr class="border-bottom">
<td>Total Tax</td>

<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
</tr>
<?php } ?>
Expand Down