cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

add adjustment row in new invoice

Browse Source
This commit is contained in:
Edmond Teh
2020-09-25 16:04:02 +08:00
parent 82e72bfc6d
commit eac4336774
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/NewInvoice.vue
+33 -4
View File
@@ -266,6 +266,18 @@
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr class="subtotal-line">
<td colspan="5"/>
<td class="subtotal-title text-center">
Rounding
</td>
<td class="subtotal text-center">
plus or minus some number
</td>
<td>
&nbsp;
</td>
</tr>
<tr class="subtotal-line"> <tr class="subtotal-line">
<td colspan="5"/> <td colspan="5"/>
<td class="subtotal-title text-center"> <td class="subtotal-title text-center">
@@ -278,6 +290,18 @@
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr class="service-charge">
<td colspan="5"/>
<td class="subtotal-title text-center">
Service Charge
</td>
<td class="subtotal text-center">
{{ service_charge }}
</td>
<td>
&nbsp;
</td>
</tr>
<tr v-if="tax > 0" class="gst-line"> <tr v-if="tax > 0" class="gst-line">
<td colspan="5"/> <td colspan="5"/>
<td class="gst-title text-center"> <td class="gst-title text-center">
@@ -477,6 +501,7 @@ export default {
return { return {
id: null, id: null,
bia: null, bia: null,
amount: null,
user_bankslip_path: null, user_bankslip_path: null,
china_bankslip_path: null, china_bankslip_path: null,
marking: null marking: null
@@ -513,8 +538,10 @@ export default {
rate: 0, rate: 0,
service_charge: 0, service_charge: 0,
amount: 0, amount: 0,
bia: 0,
invoice_total: 0, invoice_total: 0,
tax: 0, tax: 0,
billing_fee: 0,
subtotal: 0, subtotal: 0,
total: 0, total: 0,
role: null, role: null,
@@ -591,16 +618,18 @@ export default {
const { const {
marking, marking,
tax, tax,
service_charge,
bia, bia,
amount,
rate rate
} = this.booking_details } = this.booking_details
this.form.formData.marking = marking this.form.formData.marking = marking
this.tax = tax this.tax = tax
this.service_charge = service_charge this.amount = amount
this.bia = bia this.bia = bia
this.rate = rate this.rate = rate
this.service_charge = parseFloat(this.bia - (this.amount / this.rate)).toFixed(2)
this.total = this.service_charge // Will not work if there is tax. Temporary fix.
} }
}, },
mounted () { mounted () {
@@ -651,11 +680,11 @@ export default {
setTotal: function () { setTotal: function () {
if (this.form.formData.lines.length < 1) { if (this.form.formData.lines.length < 1) {
this.subtotal = 0 this.subtotal = 0
this.total = 0 this.total = this.service_charge // Temporary fix. Will return error if GST is implemented.
return return
} }
this.subtotal = parseFloat(this.form.formData.lines.map(line => line.total).reduce((a, b) => parseFloat(a) + parseFloat(b))).toFixed(2) this.subtotal = parseFloat(this.form.formData.lines.map(line => line.total).reduce((a, b) => parseFloat(a) + parseFloat(b))).toFixed(2)
this.total = parseFloat(+this.subtotal + (+this.subtotal * (+this.tax || 0) / 100)).toFixed(2) this.total = parseFloat(+this.subtotal + (+this.subtotal * (+this.tax || 0) / 100) + +this.service_charge).toFixed(2)
}, },
clearAddLine: function () { clearAddLine: function () {
this.form.addLine.order = null this.form.addLine.order = null