From 5b4e1f32bd6331ca78043bed61776e6db6dc445b Mon Sep 17 00:00:00 2001 From: Gopi Katwala Date: Tue, 16 Jul 2019 14:41:36 -0400 Subject: [PATCH] * Fixed Typos in error texts * add payment amount check added --- .../src/app/invoice/invoice.component.ts | 4 +- .../src/app/services/astute-client-service.ts | 58 +++++++++---------- .../src/main/java/com/astute/dao/SqlDAO.java | 3 + 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts index 4f11329..68fdab1 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.ts +++ b/AstuteClient2/src/app/invoice/invoice.component.ts @@ -593,11 +593,11 @@ export class InvoiceComponent implements OnInit { this.astuteClientService.createInvoiceDetail(emptyData).then((data) => { if (!data) { - this.notif('Creating SO detailed failed!'); + this.notif('Creating Invoice details failed!'); } this.refreshDetailsOfSelected(); }, (reason) => { - this.notif('Creating SO detailed failed: ' + reason); + this.notif('Creating Invoice details failed: ' + reason); }); } diff --git a/AstuteClient2/src/app/services/astute-client-service.ts b/AstuteClient2/src/app/services/astute-client-service.ts index 2b19f2a..23f4591 100644 --- a/AstuteClient2/src/app/services/astute-client-service.ts +++ b/AstuteClient2/src/app/services/astute-client-service.ts @@ -273,7 +273,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Sales Orders Failed: ' + message); } }, (reason) => { this.notif('Get Sales Orders Failed: ' + reason); @@ -296,7 +296,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Sales Order Details Failed: ' + message); } }, (reason) => { this.notif('Get Sales Order Details Failed: ' + reason); @@ -319,7 +319,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Sales Order Failed: ' + message); } }, (reason) => { this.notif('Update Sales Order Failed: ' + reason); @@ -342,7 +342,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Create Sales Order Failed: ' + message); } }, (reason) => { this.notif('Create Sales Order Failed: ' + reason); @@ -366,7 +366,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Sales Order Details Failed: ' + message); } }, (reason) => { this.notif('Update Sales Order Details Failed: ' + reason); @@ -389,7 +389,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Create Sales Order Failed: ' + message); } }, (reason) => { this.notif('Create Sales Order Failed: ' + reason); @@ -435,7 +435,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('finalizePO Failed: ' + message); } }, (reason) => { this.notif('Finalize Sales Order Failed: ' + reason); @@ -458,7 +458,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Delete Sales Order Failed: ' + message); } }, (reason) => { this.notif('Delete Sales Order Failed: ' + reason); @@ -481,7 +481,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Rate Types Failed: ' + message); } }, (reason) => { this.notif('Get Rate Types Failed: ' + reason); @@ -506,7 +506,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Submit Invoice Failed: ' + message); } }, (reason) => { this.notif('Submit Invoice Failed: ' + reason); @@ -529,7 +529,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Void Invoice Failed: ' + message); } }, (reason) => { this.notif('Void Invoice Failed: ' + reason); @@ -552,7 +552,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Delete Invoice Failed: ' + message); } }, (reason) => { this.notif('Delete Invoice Failed: ' + reason); @@ -575,7 +575,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Generate Invoice Failed: ' + message); } }, (reason) => { this.notif('Generate Invoice Failed: ' + reason); @@ -598,7 +598,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Invoices Failed: ' + message); } }, (reason) => { this.notif('Get Invoices Failed: ' + reason); @@ -621,7 +621,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Invoice Details Failed: ' + message); } }, (reason) => { this.notif('Get Invoice Details Failed: ' + reason); @@ -644,7 +644,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Generated Invoice Failed: ' + message); } }, (reason) => { this.notif('Get Generated Invoice Failed: ' + reason); @@ -667,7 +667,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Invoice Failed: ' + message); } }, (reason) => { this.notif('Update Invoice Failed: ' + reason); @@ -690,7 +690,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Create Invoice Failed: ' + message); } }, (reason) => { this.notif('Create Invoice Failed: ' + reason); @@ -713,7 +713,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Invoice Detail Failed: ' + message); } }, (reason) => { this.notif('Update Invoice Detail Failed: ' + reason); @@ -736,10 +736,10 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Create Invoice Details Failed: ' + message); } }, (reason) => { - this.notif('Create Invoice Detail Failed: ' + reason); + this.notif('Create Invoice Details Failed: ' + reason); }) .catch( error => { this.notif(error); @@ -762,7 +762,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Submitted Invoices Failed: ' + message); } }, (reason) => { this.notif('Get Submitted Invoices Failed: ' + reason); @@ -785,7 +785,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Invoice Payment Types Failed: ' + message); } }, (reason) => { this.notif('Get Invoice Payment Types Failed: ' + reason); @@ -808,7 +808,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Invoice Payments Failed: ' + message); } }, (reason) => { this.notif('Get Invoice Payments Failed: ' + reason); @@ -832,7 +832,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Invoice Payment Failed: ' + message); } }, (reason) => { this.notif('Update Invoice Payment Failed: ' + reason); @@ -855,7 +855,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Add Invoice Payment Failed: ' + message); } }, (reason) => { this.notif('Add Invoice Payment Failed: ' + reason); @@ -880,7 +880,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Get Service Types Failed: ' + message); } }, (reason) => { this.notif('Get Service Types Failed: ' + reason); @@ -904,7 +904,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Update Service Type Failed: ' + message); } }, (reason) => { this.notif('Update Service Type Failed: ' + reason); @@ -927,7 +927,7 @@ export class AstuteClientService { } else if (message.includes('login')) { this.notif('Please login again!'); } else { - this.notif('Get Customers Failed: ' + message); + this.notif('Create Service Type Failed: ' + message); } }, (reason) => { this.notif('Create Service Type Failed: ' + reason); diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java index 8e06230..6d07410 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java @@ -1319,6 +1319,9 @@ public class SqlDAO extends DAO { public void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkNo, String transactionNo) throws AstuteException{ try { + if (paymentAmount > getOutstandingBalance(invoiceNum) ) { + throw new AstuteException(DB_ERROR,"Payment amount can't be greater than outstanding balance for Invoice " + invoiceNum); + } String dateString = "STR_TO_DATE('" + paymentDate + "', '%Y-%m-%d')"; String sql = "insert into invoice_payment (inv_no, invoice_payment_type, invoice_amount, payment_date, check_no, transaction_no) values ('" + invoiceNum + "', " + invoicePaymentTypeId + ", " + paymentAmount + ", " + dateString + ", '" + checkNo +"', '" + transactionNo + "')"; Statement stmt = conn.createStatement();