mirror of https://github.com/itflow-org/itflow
Fixed Currency on Quote and Download PDF on quote and invoice guest urls
This commit is contained in:
parent
a9346845ab
commit
d71b48342e
|
|
@ -291,7 +291,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src='plugins/pdfmake/pdfmake.js'></script>
|
<script src='plugins/pdfmake/pdfmake.min.js'></script>
|
||||||
<script src='plugins/pdfmake/vfs_fonts.js'></script>
|
<script src='plugins/pdfmake/vfs_fonts.js'></script>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
@ -892,7 +892,7 @@ var docDefinition = {
|
||||||
$payment_id = $row['payment_id'];
|
$payment_id = $row['payment_id'];
|
||||||
$payment_date = $row['payment_date'];
|
$payment_date = $row['payment_date'];
|
||||||
$payment_amount = $row['payment_amount'];
|
$payment_amount = $row['payment_amount'];
|
||||||
$payment_currency_code = $row['payment_currency_code']
|
$payment_currency_code = $row['payment_currency_code'];
|
||||||
$payment_method = $row['payment_method'];
|
$payment_method = $row['payment_method'];
|
||||||
$payment_reference = $row['payment_reference'];
|
$payment_reference = $row['payment_reference'];
|
||||||
if(strtotime($payment_date) > strtotime($invoice_due)){
|
if(strtotime($payment_date) > strtotime($invoice_due)){
|
||||||
|
|
|
||||||
|
|
@ -185,9 +185,9 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
|
||||||
<td><?php echo $item_name; ?></td>
|
<td><?php echo $item_name; ?></td>
|
||||||
<td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
|
<td><div style="white-space:pre-line"><?php echo $item_description; ?></div></td>
|
||||||
<td class="text-center"><?php echo $item_quantity; ?></td>
|
<td class="text-center"><?php echo $item_quantity; ?></td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?></td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?></td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_total, $quote_currency_code); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
@ -217,23 +217,23 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td>Subtotal</td>
|
<td>Subtotal</td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $quote_currency_code); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php if($discount > 0){ ?>
|
<?php if($discount > 0){ ?>
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td>Discount</td>
|
<td>Discount</td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($quote_discount,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $quote_discount, $quote_currency_code); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if($total_tax > 0){ ?>
|
<?php if($total_tax > 0){ ?>
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td>Tax</td>
|
<td>Tax</td>
|
||||||
<td class="text-right"><?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?></td>
|
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $quote_currency_code); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<tr class="border-bottom">
|
<tr class="border-bottom">
|
||||||
<td><strong>Total</strong></td>
|
<td><strong>Total</strong></td>
|
||||||
<td class="text-right"><strong><?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?></strong></td>
|
<td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></strong></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -246,7 +246,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src='plugins/pdfmake/pdfmake.js'></script>
|
<script src='plugins/pdfmake/pdfmake.min.js'></script>
|
||||||
<script src='plugins/pdfmake/vfs_fonts.js'></script>
|
<script src='plugins/pdfmake/vfs_fonts.js'></script>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
@ -413,15 +413,15 @@ var docDefinition = {
|
||||||
style:'itemQty'
|
style:'itemQty'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_price,2); ?>',
|
text:'<?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?>',
|
||||||
style:'itemNumber'
|
style:'itemNumber'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($item_tax,2); ?>',
|
text:'<?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?>',
|
||||||
style:'itemNumber'
|
style:'itemNumber'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($item_total,2); ?>',
|
text: '<?php echo numfmt_format_currency($currency_format, $item_total, $quote_currency_code); ?>',
|
||||||
style:'itemNumber'
|
style:'itemNumber'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
@ -463,7 +463,7 @@ var docDefinition = {
|
||||||
style:'itemsFooterSubTitle'
|
style:'itemsFooterSubTitle'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text:'<?php echo $client_currency_symbol; ?> <?php echo number_format($sub_total,2); ?>',
|
text:'<?php echo numfmt_format_currency($currency_format, $sub_total, $quote_currency_code); ?>',
|
||||||
style:'itemsFooterSubValue'
|
style:'itemsFooterSubValue'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
@ -474,7 +474,7 @@ var docDefinition = {
|
||||||
style:'itemsFooterSubTitle'
|
style:'itemsFooterSubTitle'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($total_tax,2); ?>',
|
text: '<?php echo numfmt_format_currency($currency_format, $total_tax, $quote_currency_code); ?>',
|
||||||
style:'itemsFooterSubValue'
|
style:'itemsFooterSubValue'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
@ -485,7 +485,7 @@ var docDefinition = {
|
||||||
style:'itemsFooterSubTitle'
|
style:'itemsFooterSubTitle'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '<?php echo $client_currency_symbol; ?> <?php echo number_format($quote_amount,2); ?>',
|
text: '<?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?>',
|
||||||
style:'itemsFooterSubValue'
|
style:'itemsFooterSubValue'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue