From d76671f0cada8b78057b793596308e7d3f133f83 Mon Sep 17 00:00:00 2001 From: gopi17701 Date: Thu, 10 Jan 2019 10:44:56 -0500 Subject: [PATCH] Fixed defects. --- .../src/app/customer/customer.component.html | 544 ++-- .../invoice-payment.component.css | 1 + .../invoice-payment.component.html | 47 +- .../invoice-payment.component.ts | 16 +- .../src/app/invoice/invoice.component.html | 1281 +++++----- .../src/app/invoice/invoice.component.ts | 982 ++++---- .../sales-order/sales-order.component.html | 764 +++--- AstuteSystem/astutesystem.iml | 1 - AstuteSystem/db.config | 6 - AstuteSystem/sql/astute.sql | 1209 ++++----- .../src/main/java/com/astute/dao/DAO.java | 36 +- .../src/main/java/com/astute/dao/SqlDAO.java | 2189 +++++++++-------- .../main/java/com/astute/model/Invoice.java | 216 +- .../java/com/astute/model/InvoicePayment.java | 147 +- .../requests/InvoicePaymentRequest.java | 154 +- .../resources/InvoicePaymentResource.java | 118 +- .../astute/service/InvoicePaymentService.java | 72 +- 17 files changed, 3972 insertions(+), 3811 deletions(-) create mode 100644 AstuteClient2/src/app/invoice-payment/invoice-payment.component.css delete mode 100644 AstuteSystem/db.config diff --git a/AstuteClient2/src/app/customer/customer.component.html b/AstuteClient2/src/app/customer/customer.component.html index bbe01d5..47d95a8 100644 --- a/AstuteClient2/src/app/customer/customer.component.html +++ b/AstuteClient2/src/app/customer/customer.component.html @@ -1,271 +1,273 @@ - -

Customers

-
-
-
- -
-
-
-
- -
-
- -
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID* - - -
- Name* - - -
- Bill To Dept* - - -
- Address 1* - - -
- Address 2 - - -
- City* - - - - State* - - - - ZIP*(+4) - -
- - -
-
- Email* - - -
- Phone* - - -
- Fax* - - -
-
- -
- - -
- - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Name* - - -
- Bill To Dept* - - -
- Address 1* - - -
- Address 2 - - -
- City* - - - - State* - - - - ZIP*(+4) - -
- - -
-
- Email* - - -
- Phone* - - -
- Fax - - -
-
- -
- - -
-
-
-
- Choose a Customer First! -
-
- - -
-
- + +

Customers

+ +
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID* + + +
+ Name* + + +
+ Bill To Dept* + + +
+ Address 1* + + +
+ Address 2 + + +
+ City* + + + + State* + + + + ZIP*(+4) + +
+ + +
+
+ Email* + + +
+ Phone* + + +
+ Fax* + + +
+
+ +
+ + +
+ + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Name* + + +
+ Bill To Dept* + + +
+ Address 1* + + +
+ Address 2 + + +
+ City* + + + + State* + + + + ZIP*(+4) + +
+ + +
+
+ Email* + + +
+ Phone* + + +
+ Fax + + +
+
+ +
+ + +
+
+
+
+ Choose a Customer First! +
+
+ + +
+
+ diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.css b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.css new file mode 100644 index 0000000..8ac91a5 --- /dev/null +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.css @@ -0,0 +1 @@ +/* Empty file */ diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html index e2760b1..8cc0a83 100644 --- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html @@ -50,8 +50,8 @@ Payment Received* - - + + @@ -78,6 +78,15 @@ + + + Check# / ACH transaction#* + + + + + + @@ -85,8 +94,9 @@
@@ -118,6 +128,21 @@ + + + Payment Type* + + + + + + + + + + + + Date Received* @@ -126,13 +151,23 @@ + + + + Check# / ACH transaction#* + + + + + +
diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts index c549da0..c2472ff 100644 --- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts @@ -21,7 +21,9 @@ export class InvoicePaymentComponent implements OnInit { {headerName: 'Invoice Number', field: 'invoiceNum'}, {headerName: 'Payment Received', field: 'invoiceAmount'}, {headerName: 'Date Received', field: 'paymentDate'}, - {headerName: 'Payment Type', field: 'paymentType'} + {headerName: 'Payment Type', field: 'paymentType'}, + {headerName: 'Check / ACH Transaction #', field: 'checkTransactionNo'} + ]; constructor(protected astuteClientService: AstuteClientService) { @@ -48,14 +50,14 @@ export class InvoicePaymentComponent implements OnInit { } } - addInvoicePayment(invoiceNum, invoicePaymentId, paymentTypeId, paymentType, paymentDate, paymentReceived, ref) { + addInvoicePayment(invoiceNum, invoicePaymentId, paymentTypeId, paymentDate, paymentReceived, checkTransactionNo, ref) { let invoicePaymentData = { "invoiceNum": invoiceNum, "invoicePaymentId":invoicePaymentId, "paymentTypeId":paymentTypeId, - "paymentType": paymentType, "paymentDate": paymentDate, - "invoiceAmount": paymentReceived + "invoiceAmount": paymentReceived, + "checkTransactionNo": checkTransactionNo }; this.astuteClientService.addInvoicePayment(invoicePaymentData).then((data) => { if (data) { @@ -69,14 +71,14 @@ export class InvoicePaymentComponent implements OnInit { }); } - updateInvoicePayment(invoiceNum, invoicePaymentId, paymentTypeId, paymentType, dateReceived, paymentReceived, ref) { + updateInvoicePayment(invoiceNum, invoicePaymentId, paymentTypeId, dateReceived, paymentReceived, checkTransactionNo, ref) { const invoicePaymentData = { "invoiceNum": invoiceNum, "invoicePaymentId": invoicePaymentId, "paymentTypeId": paymentTypeId, - "paymentType": paymentType, "paymentDate": dateReceived, - "invoiceAmount": paymentReceived + "invoiceAmount": paymentReceived, + "checkTransactionNo": checkTransactionNo }; this.astuteClientService.updateInvoicePayment(invoiceNum, invoicePaymentId, invoicePaymentData).then((data) => { diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html index dcbf1e3..ca072af 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.html +++ b/AstuteClient2/src/app/invoice/invoice.component.html @@ -1,615 +1,666 @@ - -

Invoices

-
- -
-
- -
-
- - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- - - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Customer - - - - SO Number* - - - - - - - -
-

- To, {{customers[customerSelec.value].billToDept}} -

- 		- Invoice Number* - - -
-

- {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} -

- 		- Change Order Num - - -
-

- {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}-{{customers[customerSelec.value].ziplast4}} -

- 		- Payment Status* - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-

Detail

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#DescriptionRate TypeRateQuantity
- - - - - - -
-

{{getPerc(qty.value, inDet.remainingQty)}}%

- 		-
-
- {{qty.value}} -
-
- {{inDet.remainingQty - (qty.value)}} -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Original Contract Amount -
{{selectedPO.contractAmt | currency}}
- 		  
Net Changes by Change Orders -
{{0 | currency}}
- 		  
Total Contract Amount
{{selectedPO.contractAmt | currency}}
  
Previously Billed
{{selectedPO.previouslyBilledAmount | currency}}
  
Balance to be Billed
{{(selectedPO.contractAmt - selectedPO.previouslyBilledAmount - selectedBillAmt) | currency}}
Total due this invoice{{selectedBillAmt | currency}}
- - - - - - - - - - -
- - -
-

Footer

-
-
-
- Special Notes* -
- -
- -
-
- Certification* -
- -
-
- - -
-

Choose an Invoice First!

-
- - -
- - -
- - - - - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Customer - - - - SO Number* - - -
-

- To, {{customers[customerSelec.value].billToDept}} -

- 		- Invoice Number* - - -
-

- {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} -

- 		- Change Order Num - - -
-

- {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}-{{customers[customerSelec.value].ziplast4}} -

- 		- Payment Status* - - -
-
- - -
-

Detail

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#DescriptionRate TypeRateQuantity
- - - - - - - - -
-

{{getPerc(qty.value, inDet.remainingQty)}}%

- 		-
-
- {{qty.value}} -
-
- {{inDet.remainingQty - (qty.value)}} -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Original Contract Amount -
{{chosenPo.contractAmt | currency}}
- 		  
Net Changes by Change Orders
{{0 | currency}}
  
Total Contract Amount
{{chosenPo.contractAmt | currency}}
  
Previously Billed
{{chosenPo.previouslyBilledAmount | currency}}
  
Balance to be Billed
{{(chosenPo.contractAmt - chosenPo.previouslyBilledAmount - newBillAmt) | currency}}
Total due this invoice{{newBillAmt | currency}}
-
- - -
-

Footer

-
-
-
- Notes: -
- -
- -
-
- Certification: -
- -
-
- - -
- - -
- - + +

Invoices

+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+
+ + + + +
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Customer + + + + + + + + + + + SO Number* + + + + + + + +
+

+ To, {{customers[customerSelec.value].billToDept}} +

+ 		+ Invoice Number* + + +
+

+ {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} +

+ 		+ Change Order Num + + +
+

+ {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}-{{customers[customerSelec.value].ziplast4}} +

+ 		+ Payment Status* + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+

Detail

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#DescriptionRate TypeRateQuantity
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Original Contract Amount +
{{selectedPO.contractAmt | currency}}
+ 		  
Net Changes by Change Orders +
{{0 | currency}}
+ 		  
Total Contract Amount
{{selectedPO.contractAmt | currency}}
  
Previously Billed
{{selectedPO.previouslyBilledAmount | currency}}
  
Balance to be Billed
{{(selectedPO.contractAmt - selectedPO.previouslyBilledAmount - selectedBillAmt) | currency}}
Total due this invoice{{selectedBillAmt | currency}}
+ + + + + + + + + + +
+ + +
+

Footer

+
+
+
+ Special Notes* +
+ +
+ +
+
+ Certification* +
+ +
+
+ + +
+

Choose an Invoice First!

+
+ + +
+

+ +

+

+ +

+
+ + + + + + +
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Customer + + + + SO Number* + + +
+

+ {{customers[customerSelec.value].billToDept}} +

+ 		+ Invoice Number* + + +
+

+ {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} +

+ 		+ Change Order Num + + +
+

+ {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}} + +

+ 		+ Payment Status* + + + + +
+
+ + +
+

Detail

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#DescriptionRate TypeRateQuantity
+ + + + + + + +
+

{{getPerc(qty.value, inDet.remainingQty)}}%

+ 		+
+
+ Qty - {{(qty.value)}} / Amount - {{(qty.value * inDet.fee) | currency}} +
+
+ Qty - {{(inDet.remainingQty - qty.value)}} / Amount - {{(inDet.remainingQty - qty.value) * inDet.fee | currency}} +
+
+
+

{{getPerc(qty.value, inDet.remainingQty)}}%

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Original Contract Amount +
{{chosenPo.contractAmt | currency}}
+ 		  
Net Changes by Change Orders
{{0 | currency}}
  
Total Contract Amount
{{chosenPo.contractAmt | currency}}
  
Previously Billed
{{chosenPo.previouslyBilledAmount | currency}}
  
Balance to be Billed
{{(chosenPo.contractAmt - chosenPo.previouslyBilledAmount - newBillAmt) | currency}}
Total due this invoice{{newBillAmt | currency}}
+
+ + +
+

Footer

+
+
+
+ Notes: +
+ +
+ +
+
+ Certification: +
+ +
+
+ + +
+ + +
+ + diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts index b9eecc5..8cf8549 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.ts +++ b/AstuteClient2/src/app/invoice/invoice.component.ts @@ -1,490 +1,492 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; -import {AstuteClientService} from '../services/astute-client-service'; -import {formatCurrency} from "@angular/common"; - -declare var $: any; - -@Component({ - selector: 'app-invoice', - templateUrl: './invoice.component.html', - styleUrls: ['./invoice.component.css'] -}) -export class InvoiceComponent implements OnInit { - @ViewChild('agGrid') agGrid; - chosenCustomerID: any = 0; - chosenInv: any = 0; - source; - customers; - pos = []; - chosenPo; - correspondingPos = []; - generatedInvoiceNumber = ''; - feeTypes = ['Fixed Fee', 'Hourly']; - serviceTypes = ['Study', 'Design', 'Peer Review', 'Cost Investigation', 'Forensic Investigation']; - columnDefs = [ - {headerName: 'Invoice Number', field: 'invoiceNumber'}, - {headerName: 'Date', field: 'invoiceDate'}, - {headerName: 'Sales Order Number', field: 'poNum'}, - {headerName: 'Change Order Number', field: 'changeOrderNum'}, - {headerName: 'Paid', field: 'pmtStatus'}, - {headerName: 'Bll Amount', field: 'billAmt'} - ]; - newInDetails = []; - newBillAmt = 0; - selectedInDetails = []; - selectedPO; - selectedBillAmt = 0; - poDetails = []; - selectedPODetails = []; - - gridOptions = { - - // PROPERTIES - object properties, myRowData and myColDefs are created somewhere in your application - rowData: this.source, - columnDefs: this.columnDefs, - - // PROPERTIES - simple boolean / string / number properties - enableColResize: true, - rowSelection: 'single', - - // EVENTS - add event callback handlers - onRowClicked: (event) => { - this.getSelectedRows(); - }, - onColumnResized: function (event) { - console.log('a column was resized'); - }, - onGridReady: (event) => { - }, - // this.agGrid.sizeColumnsToFit(); - // 1: draft - // 2: submitted - // 3: void - - // getRowStyle: function(params) { - // if (params.data.invoiceStatus === 1) { - // return { 'color': 'red' } - // } else if (params.data.invoiceStatus === 3) { - // return { 'text-decoration': 'line-through'} - // } - // } - - rowClassRules: { - // apply green to 2008 - // 'bg-red': true, - - // apply amber 2004 - 'text-danger': function (params) { - return params.data.invoiceStatus === 1; - }, - 'text-primary': function (params) { - return params.data.invoiceStatus === 2; - }, - 'text-warning': function (params) { - return params.data.invoiceStatus === 3; - }, - - // apply red to 2000 - // 'rag-red-outer': function(params) { return params.data.year === 2000} - } - } - - constructor(protected astuteClientService: AstuteClientService) { - } - - customerDropdownChange(index) { - this.chosenCustomerID = this.customers[index].customerId; - this.setCorrespondingPos(); - } - - poDropdownChange(ponum) { - this.pos.forEach((po) => { - if (po.ponum === ponum) { - this.chosenPo = po; - } - }) - this.astuteClientService.getPODetail(ponum).then((data) => { - if (data) { - // fee - // feeTypeId - // lineItemNo - // ponum - // qty - // remainingQty - // serviceDesc - // serviceTypeId - - // lineItemNo, feeTypeId, serviceTypeId, serviceDesc, fee, remainingQty - this.poDetails = data; - this.poDetails[-1] = { - 'lineItemNo': -1, - 'feeTypeId': 1, - 'serviceTypeId': 1, - 'serviceDesc': 'Out of Pocket Expenses', - 'fee': 0, - 'remainingQty': 0 - }; - } else { - alert("get PO detail failed!"); - } - }); - this.astuteClientService.generateInvoiceNumber(ponum).then((data) => { - if (data) { - this.generatedInvoiceNumber = data; - } else { - alert('gen inv num failed!'); - } - }); - } - - ngOnInit() { - this.refreshData(); - } - - refreshData() { - this.astuteClientService.getInvoices().then((data) => { - this.source = data; - this.source.forEach((row) => { - row.billAmt = formatCurrency(row.billAmt, 'en-US', '$', 'USD'); - }); - }); - - this.astuteClientService.getCustomers().then((data) => { - this.customers = data; - }); - - this.astuteClientService.getPOs().then((data) => { - this.pos = data; - }); - } - - getPODetails(poIndex) { - let ponum = this.pos[poIndex].ponum; - this.astuteClientService.getPODetail(ponum).then((data) => { - this.selectedInDetails = data; - console.log("inDetails:"); - console.log(this.selectedInDetails); - }); - } - - onSelectedCellChange(row: number, col: string, value) { - this.selectedInDetails[row][col] = value; - console.log(this.selectedInDetails); - } - - onNewCellChange(row: number, col: string, value) { - this.newInDetails[row][col] = value; - console.log(this.newInDetails); - } - - pushOntoSelectedDetail(invoiceNum, lineItemNum, poLineItemNum, serviceTypeId, desc, qty, fee) { - this.selectedInDetails.push({ - 'invoiceNum': invoiceNum, - 'lineItemNum': lineItemNum, - 'poLineItemNum': poLineItemNum, - 'serviceTypeId': serviceTypeId, - 'desc': desc, - 'qty': +qty, - 'fee': +fee - }); - } - - pushOntoNewDetail(invoiceNum, lineItemNum, poLineItemNum, feeTypeId, serviceTypeId, desc, qty, fee, remainingQty, poNum) { - this.newInDetails.push({ - 'invoiceNum': invoiceNum, - 'lineItemNum': lineItemNum, - 'poLineItemNum': poLineItemNum, - 'feeTypeId': feeTypeId, - 'serviceTypeId': serviceTypeId, - 'desc': desc, - 'qty': +qty, - 'fee': +fee, - 'remainingQty': +remainingQty, - 'poNum': poNum - }); - console.log(this.newInDetails); - } - - updateNewBillAmt() { - let tot = 0; - this.newInDetails.forEach((d) => { - tot += +d.qty * +d.fee; - }); - this.newBillAmt = tot; - } - - updateSelectedBillAmt() { - let tot = 0; - this.selectedInDetails.forEach((d) => { - tot += +d.qty * +d.fee; - }); - this.selectedBillAmt = tot; - } - - assignActity(): void { - window.open('/invoice-gen'); - } - - getSelectedRows() { - const selectedNodes = this.agGrid.api.getSelectedNodes(); - if (selectedNodes.length) { - this.chosenInv = selectedNodes.map(node => node.data)[0]; - // console.log (this.chosenInv); - this.selectedBillAmt = +(this.chosenInv.billAmt.replace(',', '').replace('$', '')); - this.astuteClientService.getPODetail(this.chosenInv.poNum).then((poDetails) => { - if (poDetails) { - this.selectedPODetails = poDetails; - this.astuteClientService.getInvoiceDetail(this.chosenInv.invoiceNumber).then((invoiceDetails) => { - if (invoiceDetails) { - this.selectedInDetails = invoiceDetails; - this.selectedInDetails.forEach((invDetail) => { - const tempPo = this.selectedPODetails.filter((po) => { - // console.log (po.lineItemNo + " and " + invDetail.poLineItemNum); - return po.lineItemNo === invDetail.poLineItemNum; - })[0]; - if (tempPo) { - invDetail.remainingQty = tempPo.remainingQty; - } - }); - } else { - alert("get Inv detail failed!"); - } - }); - } else { - alert("get PO detail failed!") - } - }); - this.pos.forEach((po) => { - if (po.ponum === this.chosenInv.poNum) { - this.selectedPO = po; - } - }); - } else { - this.chosenInv = null; - this.selectedPODetails = []; - } - } - - open(content, indexPO, indexINV) { - content.open(); - // this.detailDescription = ViewChild('detailDescription'); - // this.detailAmount = ViewChild('detailAmount'); - // this.detailRate = ViewChild('detailRate'); - // this.detailTotal = ViewChild('detailTotal'); - // if (indexINV) { - // this.chosenInv = indexINV; - // } - // if (indexPO) { - // this.chosenPo = indexPO; - // this.getPODetails(this.chosenPo); - // } - // this.modalService.open(content, { size: 'lg' }).result.then((result) => { - // this.closeResult = `Closed with: ${result}`; - // }, (reason) => { - // this.closeResult = `Dismissed ${this.getDismissReason(reason)}`; - // }); - } - - close(content) { - content.close(); - // this.newInDetails = []; - } - - getCurrDate() { - let d = new Date(), - month = '' + (d.getMonth() + 1), - day = '' + d.getDate(), - year = d.getFullYear(); - - if (month.length < 2) month = '0' + month; - if (day.length < 2) day = '0' + day; - - - return [year, month, day].join('-'); - } - - formatDate(d: Date) { - let month = '' + (d.getMonth() + 1), - day = '' + d.getDate(), - year = d.getFullYear(); - - if (month.length < 2) { - month = '0' + month; - } - if (day.length < 2) { - day = '0' + day; - } - return [year, month, day].join('-'); - } - - deleteInvoice (invoiceNum) { - if (confirm('Are you sure you want to delete invoice, ' + invoiceNum)) { - this.astuteClientService.deleteInvoice(invoiceNum).then((data) => { - if (data) { - console.log('Invoice, ' + invoiceNum + ' successfully deleted'); - this.refreshData(); - } else { - alert ('Error in deleting; Invoice, ' + invoiceNum + ' has not been deleted'); - } - }); - } - } - - addInvoice(invoiceNumber, poNum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification, status, ref) { - // String invoiceNumber; - // Date invoiceDate; - // String poNum; - // String changeOrderNum; - // int pmtStatus; - // Double billAmt; - // String specialNotes; - // String certification; - // Date pmtReceivedDate; - const invData = { - "invoiceNumber": invoiceNumber, - "invoiceDate": this.formatDate(new Date()), - "poNum": poNum, - "changeOrderNum": changeOrderNum, - "pmtStatus": +pmtStatus, - "billAmt": +billAmt, - "specialNotes": specialNotes, - "certification": certification, - "pmtReceivedDate": this.formatDate(new Date()), - 'invoiceStatus': status - }; - console.log(invData); - - this.astuteClientService.createInvoice(invData) - .catch((response) => { - console.log("rejected: " + response); - }) - .then((data) => { - if (data) { - this.refreshData(); - this.addInvoiceDetail(this.newInDetails); - ref.close(); - } else { - alert('Invoice Creation Failed, Check Input Fields'); - } - }); - } - - addInvoiceDetail(details) { - if (details.length) { - // console.log(details[0]); - // if (details[0].poLineItemNum !== -1) { - this.astuteClientService.createInvoiceDetail(details[0]).then((data) => { - if (data) { - details.splice(0, 1); - this.addInvoiceDetail(details); - } else { - alert('add inv detail failed'); - } - }); - // } else { - // desc - // fee - // feeTypeId - // invoiceNum - // lineItemNum - // poLineItemNum - // qty - // remainingQty - // serviceTypeId - // poNum - - // const data = { - // // 'lineItemNo': details[0]., - // 'poNum': details[0].poNum, - // 'serviceDesc': details[0].desc, - // 'feeTypeId': details[0].feeTypeId, - // 'serviceTypeId': details[0].serviceTypeId, - // 'qty': +details[0].qty, - // 'fee': +details[0].fee, - // 'remainingQty': +details[0].fee * +details[0].qty - // }; - // this.astuteClientService.createPODetail(data).then((d) => { - // if (d) { - // console.log (d); - // } else { - // alert('create custom PO failed.'); - // } - // }); - // } - } else { - this.newInDetails = []; - } - } - - editInvoice(invoiceNumber, poNum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification) { - // String invoiceNumber; - // Date invoiceDate; - // String poNum; - // String changeOrderNum; - // int pmtStatus; - // Double billAmt; - // String specialNotes; - // String certification; - // Date pmtReceivedDate; - const invData = { - "invoiceNumber": invoiceNumber, - "invoiceDate": new Date(), - "poNum": poNum, - "changeOrderNum": changeOrderNum, - "pmtStatus": +pmtStatus, - "billAmt": +billAmt, - "specialNotes": specialNotes, - "certification": certification, - "pmtReceivedDate": new Date() - }; - - this.astuteClientService.updateInvoice(invoiceNumber, invData) - .catch((response) => { - console.log("rejected: " + response); - }) - .then((data) => { - if (data) { - alert("invoice " + invoiceNumber + " updated!"); - console.log("fulfilled: " + data); - // this.source[this.chosenInv] = invData; - this.refreshData(); - } else { - alert("Invoice Update Failed, Check Input Fields") - } - }); - } - - voidInvoice(invoiceNumber) { - this.astuteClientService.voidInvoice(invoiceNumber).then((data) => { - if (data) { - this.refreshData(); - } else { - alert('void invoice failed.'); - } - }); - } - - submitInvoice(invoiceNumber) { - this.astuteClientService.submitInvoice(invoiceNumber).then((data) => { - if (data) { - this.refreshData(); - } else { - alert('submit invoice failed.'); - } - }); - } - - getPerc(amt, total): number { - return Math.floor(((amt) / total) * 100); - } - - getRangeMax(total, num) { - return Math.floor(total / num); - } - - setCorrespondingPos() { - this.correspondingPos = this.pos.filter((po, index, array) => { - return po.customerId === this.chosenCustomerID; - }); - } -} +import {Component, OnInit, ViewChild} from '@angular/core'; +import {AstuteClientService} from '../services/astute-client-service'; +import {formatCurrency} from "@angular/common"; + +declare var $: any; + +@Component({ + selector: 'app-invoice', + templateUrl: './invoice.component.html', + styleUrls: ['./invoice.component.css'] +}) +export class InvoiceComponent implements OnInit { + @ViewChild('agGrid') agGrid; + chosenCustomerID: any = 0; + chosenInv: any = 0; + source; + customers; + pos = []; + chosenPo; + correspondingPos = []; + generatedInvoiceNumber = ''; + feeTypes = ['Fixed Fee', 'Hourly']; + serviceTypes = ['Study', 'Design', 'Peer Review', 'Cost Investigation', 'Forensic Investigation']; + columnDefs = [ + {headerName: 'Invoice Number', field: 'invoiceNumber'}, + {headerName: 'Date', field: 'invoiceDate'}, + {headerName: 'Sales Order Number', field: 'poNum'}, + {headerName: 'Change Order Number', field: 'changeOrderNum'}, + {headerName: 'Payment', field: 'pmtStatusDesc'}, + {headerName: 'Bll Amount', field: 'billAmt'} + ]; + newInDetails = []; + newBillAmt = 0; + selectedInDetails = []; + selectedPO; + selectedBillAmt = 0; + poDetails = []; + selectedPODetails = []; + + gridOptions = { + + // PROPERTIES - object properties, myRowData and myColDefs are created somewhere in your application + rowData: this.source, + columnDefs: this.columnDefs, + + // PROPERTIES - simple boolean / string / number properties + enableColResize: true, + rowSelection: 'single', + + // EVENTS - add event callback handlers + onRowClicked: (event) => { + this.getSelectedRows(); + }, + onColumnResized: function (event) { + console.log('a column was resized'); + }, + onGridReady: (event) => { + }, + // this.agGrid.sizeColumnsToFit(); + // 1: draft + // 2: submitted + // 3: void + + // getRowStyle: function(params) { + // if (params.data.invoiceStatus === 1) { + // return { 'color': 'red' } + // } else if (params.data.invoiceStatus === 3) { + // return { 'text-decoration': 'line-through'} + // } + // } + + rowClassRules: { + // apply green to 2008 + // 'bg-red': true, + + // apply amber 2004 + 'text-danger': function (params) { + return params.data.invoiceStatus === 1; + }, + 'text-primary': function (params) { + return params.data.invoiceStatus === 2; + }, + 'text-warning': function (params) { + return params.data.invoiceStatus === 3; + }, + + // apply red to 2000 + // 'rag-red-outer': function(params) { return params.data.year === 2000} + } + } + + constructor(protected astuteClientService: AstuteClientService) { + } + + customerDropdownChange(index) { + this.chosenCustomerID = this.customers[index].customerId; + this.setCorrespondingPos(); + } + + poDropdownChange(ponum) { + this.pos.forEach((po) => { + if (po.ponum === ponum) { + this.chosenPo = po; + } + }) + this.astuteClientService.getPODetail(ponum).then((data) => { + if (data) { + // fee + // feeTypeId + // lineItemNo + // ponum + // qty + // remainingQty + // serviceDesc + // serviceTypeId + + // lineItemNo, feeTypeId, serviceTypeId, serviceDesc, fee, remainingQty + this.poDetails = data; + this.poDetails[-1] = { + 'lineItemNo': -1, + 'feeTypeId': 1, + 'serviceTypeId': 1, + 'serviceDesc': 'Out of Pocket Expenses', + 'fee': 0, + 'remainingQty': 0 + }; + } else { + alert("get PO detail failed!"); + } + }); + this.astuteClientService.generateInvoiceNumber(ponum).then((data) => { + if (data) { + this.generatedInvoiceNumber = data; + } else { + alert('gen inv num failed!'); + } + }); + } + + ngOnInit() { + this.refreshData(); + } + + refreshData() { + this.astuteClientService.getInvoices().then((data) => { + this.source = data; + this.source.forEach((row) => { + row.billAmt = formatCurrency(row.billAmt, 'en-US', '$', 'USD'); + }); + }); + + this.astuteClientService.getCustomers().then((data) => { + this.customers = data; + }); + + this.astuteClientService.getPOs().then((data) => { + this.pos = data; + }); + } + + getPODetails(poIndex) { + let ponum = this.pos[poIndex].ponum; + this.astuteClientService.getPODetail(ponum).then((data) => { + this.selectedInDetails = data; + console.log("inDetails:"); + console.log(this.selectedInDetails); + }); + } + + onSelectedCellChange(row: number, col: string, value) { + this.selectedInDetails[row][col] = value; + console.log(this.selectedInDetails); + } + + onNewCellChange(row: number, col: string, value) { + this.newInDetails[row][col] = value; + console.log(this.newInDetails); + } + + pushOntoSelectedDetail(invoiceNum, lineItemNum, poLineItemNum, serviceTypeId, desc, qty, fee) { + this.selectedInDetails.push({ + 'invoiceNum': invoiceNum, + 'lineItemNum': lineItemNum, + 'poLineItemNum': poLineItemNum, + 'serviceTypeId': serviceTypeId, + 'desc': desc, + 'qty': +qty, + 'fee': +fee + }); + } + + pushOntoNewDetail(invoiceNum, lineItemNum, poLineItemNum, feeTypeId, serviceTypeId, desc, qty, fee, remainingQty, poNum) { + this.newInDetails.push({ + 'invoiceNum': invoiceNum, + 'lineItemNum': lineItemNum, + 'poLineItemNum': poLineItemNum, + 'feeTypeId': feeTypeId, + 'serviceTypeId': serviceTypeId, + 'desc': desc, + 'qty': +qty, + 'fee': +fee, + 'remainingQty': +remainingQty, + 'poNum': poNum + }); + console.log(this.newInDetails); + } + + updateNewBillAmt() { + let tot = 0; + this.newInDetails.forEach((d) => { + tot += +d.qty * +d.fee; + }); + this.newBillAmt = tot; + } + + updateSelectedBillAmt() { + let tot = 0; + this.selectedInDetails.forEach((d) => { + tot += +d.qty * +d.fee; + }); + this.selectedBillAmt = tot; + } + + assignActity(): void { + window.open('/invoice-gen'); + } + + getSelectedRows() { + const selectedNodes = this.agGrid.api.getSelectedNodes(); + if (selectedNodes.length) { + this.chosenInv = selectedNodes.map(node => node.data)[0]; + // console.log (this.chosenInv); + this.selectedBillAmt = +(this.chosenInv.billAmt.replace(',', '').replace('$', '')); + this.astuteClientService.getPODetail(this.chosenInv.poNum).then((poDetails) => { + if (poDetails) { + this.selectedPODetails = poDetails; + this.astuteClientService.getInvoiceDetail(this.chosenInv.invoiceNumber).then((invoiceDetails) => { + if (invoiceDetails) { + this.selectedInDetails = invoiceDetails; + this.selectedInDetails.forEach((invDetail) => { + const tempPo = this.selectedPODetails.filter((po) => { + // console.log (po.lineItemNo + " and " + invDetail.poLineItemNum); + return po.lineItemNo === invDetail.poLineItemNum; + })[0]; + if (tempPo) { + invDetail.remainingQty = tempPo.remainingQty; + } + }); + } else { + alert("get Inv detail failed!"); + } + }); + } else { + alert("get PO detail failed!") + } + }); + this.pos.forEach((po) => { + if (po.ponum === this.chosenInv.poNum) { + this.selectedPO = po; + } + }); + } else { + this.chosenInv = null; + this.selectedPODetails = []; + } + } + + open(content, indexPO, indexINV) { + content.open(); + // this.detailDescription = ViewChild('detailDescription'); + // this.detailAmount = ViewChild('detailAmount'); + // this.detailRate = ViewChild('detailRate'); + // this.detailTotal = ViewChild('detailTotal'); + // if (indexINV) { + // this.chosenInv = indexINV; + // } + // if (indexPO) { + // this.chosenPo = indexPO; + // this.getPODetails(this.chosenPo); + // } + // this.modalService.open(content, { size: 'lg' }).result.then((result) => { + // this.closeResult = `Closed with: ${result}`; + // }, (reason) => { + // this.closeResult = `Dismissed ${this.getDismissReason(reason)}`; + // }); + } + + close(content) { + content.close(); + // this.newInDetails = []; + } + + getCurrDate() { + let d = new Date(), + month = '' + (d.getMonth() + 1), + day = '' + d.getDate(), + year = d.getFullYear(); + + if (month.length < 2) month = '0' + month; + if (day.length < 2) day = '0' + day; + + + return [year, month, day].join('-'); + } + + formatDate(d: Date) { + let month = '' + (d.getMonth() + 1), + day = '' + d.getDate(), + year = d.getFullYear(); + + if (month.length < 2) { + month = '0' + month; + } + if (day.length < 2) { + day = '0' + day; + } + return [year, month, day].join('-'); + } + + deleteInvoice (invoiceNum) { + if (confirm('Are you sure you want to delete invoice, ' + invoiceNum)) { + this.astuteClientService.deleteInvoice(invoiceNum).then((data) => { + if (data) { + console.log('Invoice, ' + invoiceNum + ' successfully deleted'); + this.refreshData(); + } else { + alert ('Error in deleting; Invoice, ' + invoiceNum + ' has not been deleted'); + } + }); + } + } + + addInvoice(invoiceNumber, poNum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification, status, ref) { + // String invoiceNumber; + // Date invoiceDate; + // String poNum; + // String changeOrderNum; + // int pmtStatus; + // Double billAmt; + // String specialNotes; + // String certification; + // Date pmtReceivedDate; + const invData = { + "invoiceNumber": invoiceNumber, + "invoiceDate": this.formatDate(new Date()), + "poNum": poNum, + "changeOrderNum": changeOrderNum, + "pmtStatus": +pmtStatus, + "billAmt": +billAmt, + "specialNotes": specialNotes, + "certification": certification, + "pmtReceivedDate": this.formatDate(new Date()), + 'invoiceStatus': status + }; + console.log(invData); + + this.astuteClientService.createInvoice(invData) + .catch((response) => { + console.log("rejected: " + response); + }) + .then((data) => { + if (data) { + this.refreshData(); + this.addInvoiceDetail(this.newInDetails); + ref.close(); + } else { + alert('Invoice Creation Failed, Check Input Fields'); + } + }); + } + + addInvoiceDetail(details) { + if (details.length) { + // console.log(details[0]); + // if (details[0].poLineItemNum !== -1) { + this.astuteClientService.createInvoiceDetail(details[0]).then((data) => { + if (data) { + details.splice(0, 1); + this.addInvoiceDetail(details); + } else { + alert('add inv detail failed'); + } + }); + // } else { + // desc + // fee + // feeTypeId + // invoiceNum + // lineItemNum + // poLineItemNum + // qty + // remainingQty + // serviceTypeId + // poNum + + // const data = { + // // 'lineItemNo': details[0]., + // 'poNum': details[0].poNum, + // 'serviceDesc': details[0].desc, + // 'feeTypeId': details[0].feeTypeId, + // 'serviceTypeId': details[0].serviceTypeId, + // 'qty': +details[0].qty, + // 'fee': +details[0].fee, + // 'remainingQty': +details[0].fee * +details[0].qty + // }; + // this.astuteClientService.createPODetail(data).then((d) => { + // if (d) { + // console.log (d); + // } else { + // alert('create custom PO failed.'); + // } + // }); + // } + } else { + this.newInDetails = []; + } + } + + editInvoice(invoiceNumber, poNum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification) { + // String invoiceNumber; + // Date invoiceDate; + // String poNum; + // String changeOrderNum; + // int pmtStatus; + // Double billAmt; + // String specialNotes; + // String certification; + // Date pmtReceivedDate; + const invData = { + "invoiceNumber": invoiceNumber, + "invoiceDate": new Date(), + "poNum": poNum, + "changeOrderNum": changeOrderNum, + "pmtStatus": +pmtStatus, + "billAmt": +billAmt, + "specialNotes": specialNotes, + "certification": certification, + "pmtReceivedDate": new Date() + }; + + this.astuteClientService.updateInvoice(invoiceNumber, invData) + .catch((response) => { + console.log("rejected: " + response); + }) + .then((data) => { + if (data) { + alert("invoice " + invoiceNumber + " updated!"); + console.log("fulfilled: " + data); + // this.source[this.chosenInv] = invData; + this.refreshData(); + } else { + alert("Invoice Update Failed, Check Input Fields") + } + }); + } + + voidInvoice(invoiceNumber) { + if (confirm('Are you sure you want to void invoice, ' + invoiceNumber)) { + this.astuteClientService.voidInvoice(invoiceNumber).then((data) => { + if (data) { + this.refreshData(); + } else { + alert('void invoice failed.'); + } + }); + } + } + + submitInvoice(invoiceNumber) { + this.astuteClientService.submitInvoice(invoiceNumber).then((data) => { + if (data) { + this.refreshData(); + } else { + alert('submit invoice failed.'); + } + }); + } + + getPerc(amt, total): number { + return Math.floor(((amt) / total) * 100); + } + + getRangeMax(total, num) { + return Math.floor(total / num); + } + + setCorrespondingPos() { + this.correspondingPos = this.pos.filter((po, index, array) => { + return po.customerId === this.chosenCustomerID; + }); + } +} diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.html b/AstuteClient2/src/app/sales-order/sales-order.component.html index 0171e5e..77738ff 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.html +++ b/AstuteClient2/src/app/sales-order/sales-order.component.html @@ -1,382 +1,382 @@ - -

Sales Orders

-
-
-
- -
-
-
-
- -
-
- -
-
-
- - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Astute Proj. No.
Customer - -
SO Title
SO NumberSO Date
Contract NumberContract Amount
-
- - - - - - - - - - - -
-

Detail

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#DescriptionRate TypeService TypeQty(#)Rate($)
- - - - - - - - -
- -
-
- -
- - -
- - - - -
-
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Astute Proj. No.
Customer - -
SO Title
SO NumberSO Date
Contract NumberContract Amount
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
-

Detail

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#DescriptionRate TypeService TypeQty(#)Rate($)
- - - - - - - - -
- -
-
- -
- - -
-
-
-
- Choose a Sales Order First! -
- -
- - -
-
- + +

Sales Orders

+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + + +
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Astute Proj. No.
Customer + +
SO Title
SO NumberSO Date
Contract NumberContract Amount
+
+ + + + + + + + + + + +
+

Detail

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#DescriptionRate TypeService TypeQty(#)Rate($)
+ + + + + + + + +
+ +
+
+ +
+ + +
+ + + + +
+
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Astute Proj. No.
Customer + +
SO Title
SO NumberSO Date
Contract NumberContract Amount
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+

Detail

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#DescriptionRate TypeService TypeQuantityRate
+ + + + + + + + +
+ +
+
+ +
+ + +
+
+
+
+ Choose a Sales Order First! +
+ +
+ + +
+
+ diff --git a/AstuteSystem/astutesystem.iml b/AstuteSystem/astutesystem.iml index c44636d..6d30024 100644 --- a/AstuteSystem/astutesystem.iml +++ b/AstuteSystem/astutesystem.iml @@ -17,7 +17,6 @@ - diff --git a/AstuteSystem/db.config b/AstuteSystem/db.config deleted file mode 100644 index dfdfd8a..0000000 --- a/AstuteSystem/db.config +++ /dev/null @@ -1,6 +0,0 @@ -database=sql -host=localhost -port=3306 -username=root -password=password -schema=astute diff --git a/AstuteSystem/sql/astute.sql b/AstuteSystem/sql/astute.sql index 1f2de48..fc40246 100644 --- a/AstuteSystem/sql/astute.sql +++ b/AstuteSystem/sql/astute.sql @@ -1,586 +1,623 @@ --- -------------------------------------------------------- --- Host: 127.0.0.1 --- Server version: 5.7.12-log - MySQL Community Server (GPL) --- Server OS: Win64 --- HeidiSQL Version: 9.4.0.5125 --- -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!50503 SET NAMES utf8mb4 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; - - --- Dumping database structure for astute -DROP DATABASE IF EXISTS `astute`; -CREATE DATABASE IF NOT EXISTS `astute` /*!40100 DEFAULT CHARACTER SET utf8 */; -USE `astute`; - --- Dumping structure for table astute.change_order -CREATE TABLE IF NOT EXISTS `change_order` ( - `PO_num` varchar(20) NOT NULL, - `change_order_num` int(20) NOT NULL, - `change_order_date` date DEFAULT NULL, - `change_order_amt` double NOT NULL, - `description` varchar(500) DEFAULT NULL, - PRIMARY KEY (`PO_num`,`change_order_num`), - CONSTRAINT `fk_PO_CO_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.change_order: ~0 rows (approximately) -/*!40000 ALTER TABLE `change_order` DISABLE KEYS */; -/*!40000 ALTER TABLE `change_order` ENABLE KEYS */; - --- Dumping structure for function astute.create_customer_fun -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `create_customer_fun`(customerid varchar(20), customerName varchar(100), billToDept varchar(100), add1In varchar(100), add2In varchar(100), cityIn varchar(50), stateIn varchar(20), zipIn int(5), zipLast4In int(4), emailIn varchar(50), phoneIn varchar(20), faxIn varchar(20)) RETURNS varchar(20) CHARSET utf8 -BEGIN -DECLARE last_inserted_id varchar(20); -INSERT INTO customer (customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax) -VALUES (customerid, customerName, billToDept, add1In, add2In, cityIn, stateIn, zipIn, ziplast4In, emailIn, phoneIn, faxIn); -SELECT LAST_INSERT_ID() into last_inserted_id; -return last_inserted_id; -END// -DELIMITER ; - --- Dumping structure for procedure astute.create_invoice -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice`(invNo varchar(20),invDate date,PONo varchar(20),paymentStatus int,billAmt double,specialNotes varchar(500), certClause Varchar(500), invoiceStatus int) -BEGIN -INSERT INTO invoice (inv_no,inv_date,PO_num,pmt_status,bill_amt,special_notes,certification,inv_status) -VALUES (invNo, invDate, PONo, paymentStatus, billAmt, specialNotes, certClause, invoiceStatus); -END// -DELIMITER ; - --- Dumping structure for procedure astute.create_invoice_detail -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice_detail`(invoiceNum varchar(20), lineItemNum int, POLineItemNum varchar(20), serviceTypeId int, description varchar(500), qty_in double, fee_in double, fee_type_id_in int) -BEGIN -INSERT INTO INVOICE_DETAIL (inv_num, line_item_num, PO_line_item_num, service_type_id, description, qty, fee, fee_type_id) -VALUES (invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, description, qty_in, fee_in, fee_type_id_in); -END// -DELIMITER ; - --- Dumping structure for procedure astute.create_po -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po`(PONum varchar(40), contractNum varchar(20), PODate date, contractAmt double(10,2), customerid varchar(20), astute_project_num_in varchar(20), title_in varchar(200)) -BEGIN -DECLARE next_po_id int(11); -SELECT count(*) + 1 INTO next_po_id FROM PO WHERE customer_id = customerid; -INSERT INTO PO (po_id, PO_num, contract_num, PO_date, contract_amt, customer_id,astute_project_num, title ) -VALUES (next_po_id, PONum, contractNum, PODate, contractAmt, customerId,astute_project_num_in, title_in); -END// -DELIMITER ; - --- Dumping structure for procedure astute.create_po_detail -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po_detail`(PONum varchar(40), lineItemNo int, servicedesc varchar(500), feetypeid int(11), quantity double, fee_in double, servicetypeid int(1), remaining_qty double) -BEGIN -INSERT INTO PO_DETAIL (PO_num,line_item_no,service_desc,fee_type_id,qty,fee,service_type_id, remaining_qty) -VALUES (POnum,lineitemno,servicedesc,feetypeid,quantity,fee_in, servicetypeid, remaining_qty); -END// -DELIMITER ; - --- Dumping structure for table astute.customer -CREATE TABLE IF NOT EXISTS `customer` ( - `customer_id` varchar(10) NOT NULL, - `customer_name` varchar(100) DEFAULT NULL, - `bill_to_dept` varchar(50) DEFAULT NULL, - `add1` varchar(50) DEFAULT NULL, - `add2` varchar(50) DEFAULT NULL, - `city` varchar(50) DEFAULT NULL, - `state` varchar(2) DEFAULT NULL, - `zip` int(5) DEFAULT NULL, - `zip_last_4` int(4) DEFAULT NULL, - `email` varchar(50) DEFAULT NULL, - `phone` varchar(20) DEFAULT NULL, - `fax` varchar(20) DEFAULT NULL, - PRIMARY KEY (`customer_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.customer: ~0 rows (approximately) -/*!40000 ALTER TABLE `customer` DISABLE KEYS */; -INSERT INTO `customer` (`customer_id`, `customer_name`, `bill_to_dept`, `add1`, `add2`, `city`, `state`, `zip`, `zip_last_4`, `email`, `phone`, `fax`) VALUES - ('VDOT', 'Virginia Depart of Transportation', 'Billing Department', '13134 Saturn Drive', 'Unit 100', 'McLean', 'VA', 22043, 0, 'Billing@vdot.gov', '(703) 122-1234', '(703) 122-1212'); -/*!40000 ALTER TABLE `customer` ENABLE KEYS */; - --- Dumping structure for function astute.delete_invoice -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `delete_invoice`(inv_no_in varchar(20)) RETURNS varchar(40) CHARSET utf8 -BEGIN - - DECLARE inv_status_in int; - - SELECT inv_status - INTO inv_status_in - FROM invoice - WHERE inv_no = inv_no_in; - - IF inv_status_in <> 1 THEN - RETURN 'ERROR - ONLY DRAFT INVOICE CAN BE DELETED'; - END IF; - - UPDATE INVOICE_DETAIL SET QTY = 0 WHERE inv_num = inv_no_in; - CALL update_all_remaining_quantities(inv_no_in); - DELETE FROM INVOICE WHERE inv_no = inv_no_in; - - RETURN 'SUCCESS'; - -END// -DELIMITER ; - --- Dumping structure for function astute.duplicate_invoice -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `duplicate_invoice`(inv_no_in varchar(20)) RETURNS varchar(20) CHARSET utf8 -BEGIN - DECLARE generated_inv_number varchar(20); - DECLARE po_num_in varchar(20); - - SELECT po_num - INTO po_num_in - FROM invoice - WHERE inv_no = inv_no_in; - - SELECT generate_inv_number(po_num_in) - INTO generated_inv_number; - - INSERT INTO invoice - (inv_no,inv_date,PO_num,change_order_num,bill_amt,special_notes,certification,inv_status,pmt_status) - (SELECT generated_inv_number, CURDATE(), PO_num, change_order_num, bill_amt, special_notes, certification, inv_status, pmt_status - FROM invoice - WHERE inv_no = inv_no_in); - - INSERT INTO invoice_detail - (inv_num,line_item_num,PO_line_item_num,service_type_id,description,qty,fee,fee_type_id) - (SELECT generated_inv_number, line_item_num, PO_line_item_num, service_type_id, description, 0, fee, fee_type_id - FROM invoice_detail - WHERE inv_num = inv_no_in); - - return generated_inv_number; - -END// -DELIMITER ; - --- Dumping structure for table astute.fee_type -CREATE TABLE IF NOT EXISTS `fee_type` ( - `fee_type_id` int(11) NOT NULL, - `fee_type_desc` varchar(40) NOT NULL, - PRIMARY KEY (`fee_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.fee_type: ~2 rows (approximately) -/*!40000 ALTER TABLE `fee_type` DISABLE KEYS */; -INSERT INTO `fee_type` (`fee_type_id`, `fee_type_desc`) VALUES - (1, 'Fixed fee'), - (2, 'Hourly'); -/*!40000 ALTER TABLE `fee_type` ENABLE KEYS */; - --- Dumping structure for function astute.generate_final_inv_number -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `generate_final_inv_number`(po_num_in varchar(20)) RETURNS varchar(40) CHARSET utf8 -BEGIN - DECLARE customer_id_in int; - DECLARE customer_code varchar(4); - DECLARE po_count int; - DECLARE inv_count int; - DECLARE inv_number varchar(40); - - SELECT customer_id - INTO customer_id_in - FROM po - WHERE po.po_num = po_num_in; - - SELECT substr(customer.customer_id, 1, 3) - INTO customer_code - FROM customer - WHERE customer_id = customer_id_in; - - SELECT po_id - INTO po_count - FROM po - WHERE PO_num = po_num_in; - - SELECT inv_seq+1 - INTO inv_count - FROM po - WHERE po.PO_num = po_num_in; - - SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_', date_format(now(),'%m%d'),'_',inv_count) INTO inv_number; - RETURN inv_number; - -END// -DELIMITER ; - --- Dumping structure for function astute.generate_inv_number -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `generate_inv_number`(po_num_in varchar(20)) RETURNS varchar(40) CHARSET utf8 -BEGIN - DECLARE customer_id_in varchar(20); - DECLARE customer_code varchar(4); - DECLARE po_count int; - DECLARE inv_count int; - DECLARE inv_number varchar(40); - - SELECT customer_id - INTO customer_id_in - FROM po - WHERE po.po_num = po_num_in; - - SELECT substr(customer.customer_id, 1, 3) - INTO customer_code - FROM customer - WHERE customer_id = customer_id_in; - - SELECT po_id - INTO po_count - FROM po - WHERE PO_num = po_num_in; - - SELECT inv_seq + 1 - INTO inv_count - FROM PO - WHERE PO.PO_num = po_num_in; - - SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_DRAFT_',FLOOR(RAND()*(999))) INTO inv_number; - RETURN inv_number; - -END// -DELIMITER ; - --- Dumping structure for function astute.get_payment_type -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `get_payment_type`(pmt_type int) RETURNS varchar(20) CHARSET utf8 -BEGIN - declare payment_type VARCHAR(20); - SELECT payment_type_name INTO payment_type FROM payment_type WHERE payment_type_id = pmt_type; - return payment_type; -END// -DELIMITER ; - --- Dumping structure for function astute.get_previously_billed_amt -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `get_previously_billed_amt`(po_no varchar(20)) RETURNS double(10,2) -BEGIN - declare billed_amt double(10,2); - SELECT sum(bill_amt) INTO billed_amt FROM invoice WHERE invoice.PO_num = po_no; - return billed_amt; -END// -DELIMITER ; - --- Dumping structure for table astute.invoice -CREATE TABLE IF NOT EXISTS `invoice` ( - `inv_no` varchar(20) NOT NULL, - `inv_date` date NOT NULL, - `PO_num` varchar(40) NOT NULL, - `bill_amt` double NOT NULL, - `special_notes` varchar(500) DEFAULT NULL, - `certification` varchar(500) DEFAULT 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', - `inv_status` int(2) DEFAULT '1', - `pmt_status` int(11) NOT NULL DEFAULT '1', - PRIMARY KEY (`inv_no`), - KEY `fk_InvMaster_POnum` (`PO_num`), - CONSTRAINT `fk_InvMaster_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.invoice: ~2 rows (approximately) -/*!40000 ALTER TABLE `invoice` DISABLE KEYS */; -INSERT INTO `invoice` (`inv_no`, `inv_date`, `PO_num`, `bill_amt`, `special_notes`, `certification`, `inv_status`, `pmt_status`) VALUES - ('VDO-01_0927_1', '2018-09-23', 'VDOT-54321', 5000, 'First invoice', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned', 2, 0), - ('VDO-02_DRAFT_392', '2018-09-23', 'ABC-123', 500, 'First Invoice', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned', 1, 0); -/*!40000 ALTER TABLE `invoice` ENABLE KEYS */; - --- Dumping structure for table astute.invoice_detail -CREATE TABLE IF NOT EXISTS `invoice_detail` ( - `inv_num` varchar(20) NOT NULL, - `line_item_num` int(11) NOT NULL, - `PO_line_item_num` int(11) DEFAULT NULL, - `service_type_id` int(11) DEFAULT NULL, - `description` varchar(500) DEFAULT NULL, - `qty` double DEFAULT NULL, - `fee` double DEFAULT NULL, - `fee_type_id` int(11) DEFAULT NULL, - PRIMARY KEY (`inv_num`,`line_item_num`), - KEY `fk_InvDetail_FeeType` (`fee_type_id`), - CONSTRAINT `fk_InvDetail_FeeType` FOREIGN KEY (`fee_type_id`) REFERENCES `fee_type` (`fee_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk_InvDetail_InvNum` FOREIGN KEY (`inv_num`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.invoice_detail: ~4 rows (approximately) -/*!40000 ALTER TABLE `invoice_detail` DISABLE KEYS */; -INSERT INTO `invoice_detail` (`inv_num`, `line_item_num`, `PO_line_item_num`, `service_type_id`, `description`, `qty`, `fee`, `fee_type_id`) VALUES - ('VDO-01_0927_1', 1, 1, 1, 'Study existing designs', 0, 1000, 1), - ('VDO-01_0927_1', 2, 4, 3, 'Peer Review', 50, 100, 2), - ('VDO-02_DRAFT_392', 1, 1, 2, 'Design', 0, 5000, 1), - ('VDO-02_DRAFT_392', 2, -1, 1, 'Out of Pocket Expenses', 50, 10, 1); -/*!40000 ALTER TABLE `invoice_detail` ENABLE KEYS */; - --- Dumping structure for table astute.invoice_notes -CREATE TABLE IF NOT EXISTS `invoice_notes` ( - `inv_no` varchar(20) NOT NULL, - `inv_note` varchar(500) NOT NULL, - PRIMARY KEY (`inv_no`), - CONSTRAINT `fk_inv_notes_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.invoice_notes: ~0 rows (approximately) -/*!40000 ALTER TABLE `invoice_notes` DISABLE KEYS */; -/*!40000 ALTER TABLE `invoice_notes` ENABLE KEYS */; - --- Dumping structure for table astute.invoice_payment -CREATE TABLE IF NOT EXISTS `invoice_payment` ( - `inv_no` varchar(20) NOT NULL, - `invoice_payment_type` int(11) NOT NULL, - `invoice_amount` double NOT NULL, - `payment_date` date NOT NULL, - `invoice_payment_id` int(11) NOT NULL AUTO_INCREMENT, - `description` varchar(50) DEFAULT NULL, - PRIMARY KEY (`invoice_payment_id`), - KEY `fk_inv_pmt_inv_no` (`inv_no`), - KEY `fk_pinv_pmt_type` (`invoice_payment_type`), - CONSTRAINT `fk_inv_pmt_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk_pinv_pmt_type` FOREIGN KEY (`invoice_payment_type`) REFERENCES `payment_type` (`payment_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.invoice_payment: ~6 rows (approximately) -/*!40000 ALTER TABLE `invoice_payment` DISABLE KEYS */; -INSERT INTO `invoice_payment` (`inv_no`, `invoice_payment_type`, `invoice_amount`, `payment_date`, `invoice_payment_id`, `description`) VALUES - ('VDO-01_0927_1', 2, 900, '2018-09-29', 1, 'VDO-01_0927_1 FIrst Payment'), - ('VDO-01_0927_1', 2, 980, '2018-09-27', 2, NULL), - ('VDO-01_0927_1', 2, 1000, '2018-09-27', 3, NULL), - ('VDO-01_0927_1', 2, 1000, '2018-09-27', 4, NULL), - ('VDO-01_0927_1', 2, 1000, '2018-09-27', 5, NULL), - ('VDO-01_0927_1', 2, 200, '2018-09-28', 12, NULL); -/*!40000 ALTER TABLE `invoice_payment` ENABLE KEYS */; - --- Dumping structure for table astute.invoice_status -CREATE TABLE IF NOT EXISTS `invoice_status` ( - `inv_status_id` int(11) NOT NULL, - `inv_status_desc` varchar(20) NOT NULL, - PRIMARY KEY (`inv_status_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.invoice_status: ~3 rows (approximately) -/*!40000 ALTER TABLE `invoice_status` DISABLE KEYS */; -INSERT INTO `invoice_status` (`inv_status_id`, `inv_status_desc`) VALUES - (1, 'Draft'), - (2, 'Submitted'), - (3, 'Void'); -/*!40000 ALTER TABLE `invoice_status` ENABLE KEYS */; - --- Dumping structure for table astute.payment_status -CREATE TABLE IF NOT EXISTS `payment_status` ( - `payment_status_id` int(11) NOT NULL, - `payment_status_desc` varchar(20) NOT NULL, - PRIMARY KEY (`payment_status_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.payment_status: ~3 rows (approximately) -/*!40000 ALTER TABLE `payment_status` DISABLE KEYS */; -INSERT INTO `payment_status` (`payment_status_id`, `payment_status_desc`) VALUES - (1, 'Outstanding'), - (2, 'Partially paid'), - (3, 'Paid'); -/*!40000 ALTER TABLE `payment_status` ENABLE KEYS */; - --- Dumping structure for table astute.payment_type -CREATE TABLE IF NOT EXISTS `payment_type` ( - `payment_type_id` int(11) NOT NULL, - `payment_type_name` varchar(20) NOT NULL, - PRIMARY KEY (`payment_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.payment_type: ~3 rows (approximately) -/*!40000 ALTER TABLE `payment_type` DISABLE KEYS */; -INSERT INTO `payment_type` (`payment_type_id`, `payment_type_name`) VALUES - (1, 'Credit Card'), - (2, 'Check'), - (3, 'ACH'); -/*!40000 ALTER TABLE `payment_type` ENABLE KEYS */; - --- Dumping structure for table astute.po -CREATE TABLE IF NOT EXISTS `po` ( - `PO_num` varchar(40) NOT NULL COMMENT 'Alpha numeric, auto generated in frontend', - `contract_num` varchar(20) DEFAULT NULL, - `PO_date` date DEFAULT NULL, - `contract_amt` double(10,2) DEFAULT NULL, - `customer_id` varchar(11) NOT NULL, - `astute_project_num` varchar(20) NOT NULL, - `po_id` int(11) NOT NULL, - `title` varchar(200) DEFAULT NULL, - `inv_seq` int(3) NOT NULL DEFAULT '0', - PRIMARY KEY (`PO_num`), - KEY `ind_pomaster_contractno` (`contract_num`), - KEY `ind_pomaster_podate` (`PO_date`), - KEY `po_customer_id` (`customer_id`), - CONSTRAINT `po_customer_id_fk` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.po: ~2 rows (approximately) -/*!40000 ALTER TABLE `po` DISABLE KEYS */; -INSERT INTO `po` (`PO_num`, `contract_num`, `PO_date`, `contract_amt`, `customer_id`, `astute_project_num`, `po_id`, `title`, `inv_seq`) VALUES - ('ABC-123', 'ABC-123', '2018-09-23', 5000.00, 'VDOT', 'ABC-123', 2, 'ABC-123', 0), - ('VDOT-54321', 'VDOT-54321', '2018-09-22', 10000.00, 'VDOT', 'VDOTProj', 1, 'Supervisor', 1); -/*!40000 ALTER TABLE `po` ENABLE KEYS */; - --- Dumping structure for table astute.po_detail -CREATE TABLE IF NOT EXISTS `po_detail` ( - `PO_num` varchar(40) NOT NULL, - `line_item_no` int(11) NOT NULL, - `service_desc` varchar(500) DEFAULT NULL, - `fee_type_id` int(11) DEFAULT '1' COMMENT '1-fixed fee, 2-hourly', - `qty` double DEFAULT NULL, - `service_type_id` int(1) DEFAULT '1' COMMENT '1-studies, 2-supplemental service, 3-out of pocket, 4-reimbursement, 5-', - `fee` double DEFAULT NULL, - `remaining_qty` double DEFAULT NULL, - PRIMARY KEY (`PO_num`,`line_item_no`), - KEY `fk_PODetail_ServType` (`service_type_id`), - CONSTRAINT `fk_PODetail_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`), - CONSTRAINT `fk_PODetail_ServType` FOREIGN KEY (`service_type_id`) REFERENCES `service_type` (`service_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.po_detail: ~5 rows (approximately) -/*!40000 ALTER TABLE `po_detail` DISABLE KEYS */; -INSERT INTO `po_detail` (`PO_num`, `line_item_no`, `service_desc`, `fee_type_id`, `qty`, `service_type_id`, `fee`, `remaining_qty`) VALUES - ('ABC-123', 1, 'Design', 1, 1, 2, 5000, 1), - ('VDOT-54321', 1, 'Study existing designs', 1, 1, 1, 1000, 1), - ('VDOT-54321', 2, 'Modify design', 1, 1, 2, 2000, 1), - ('VDOT-54321', 3, 'Cost estimation', 1, 1, 4, 1000, 1), - ('VDOT-54321', 4, 'Peer Review', 2, 100, 3, 100, 50); -/*!40000 ALTER TABLE `po_detail` ENABLE KEYS */; - --- Dumping structure for table astute.service_type -CREATE TABLE IF NOT EXISTS `service_type` ( - `service_type_id` int(11) NOT NULL, - `desc` varchar(40) NOT NULL, - PRIMARY KEY (`service_type_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.service_type: ~5 rows (approximately) -/*!40000 ALTER TABLE `service_type` DISABLE KEYS */; -INSERT INTO `service_type` (`service_type_id`, `desc`) VALUES - (1, 'Study'), - (2, 'Design'), - (3, 'Peer Review'), - (4, 'Cost Estimation'), - (5, 'Forensic Investigation'), - (6, 'Out-of-pocket Expense'); -/*!40000 ALTER TABLE `service_type` ENABLE KEYS */; - --- Dumping structure for table astute.session -CREATE TABLE IF NOT EXISTS `session` ( - `session_id` varchar(200) NOT NULL, - `user_id` int(11) NOT NULL, - `session_start_date` date DEFAULT NULL, - `session_end_date` date DEFAULT NULL, - PRIMARY KEY (`session_id`), - KEY `fk_session_user_id` (`user_id`), - CONSTRAINT `fk_session_user_id` FOREIGN KEY (`user_id`) REFERENCES `user` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.session: ~10 rows (approximately) -/*!40000 ALTER TABLE `session` DISABLE KEYS */; -INSERT INTO `session` (`session_id`, `user_id`, `session_start_date`, `session_end_date`) VALUES - ('058cdb87447645da9ec265e566af834c', 1, NULL, NULL), - ('4f48b60481ab4729a26b809c077fc7c0', 1, NULL, NULL), - ('66ed2bccbaf34b1e96b2b81393996cf9', 1, NULL, NULL), - ('8f8991185a174b87adb7d0b1b40c1475', 1, NULL, NULL), - ('92cd1d01085c4ead892a1c7c137631dd', 1, NULL, NULL), - ('abeefc05fe8e48e5bac7ffab65c85ca6', 1, NULL, NULL), - ('b356aab1dbe84d4f9eea9c1cd965c9a4', 1, NULL, NULL), - ('d6387d93d84341fc91a0c4a5cbf266db', 1, NULL, NULL), - ('dcb4b261f925464bb69ff685c1c6134d', 1, NULL, NULL), - ('fea623a6ff3148899214750707f4f52e', 1, NULL, NULL); -/*!40000 ALTER TABLE `session` ENABLE KEYS */; - --- Dumping structure for procedure astute.submit_invoice -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `submit_invoice`(invNo varchar(20)) -BEGIN -DECLARE po_no varchar(20); -UPDATE INVOICE SET INV_STATUS = 2 WHERE INV_NO = invNo; -SELECT PO_NUM INTO po_no FROM INVOICE WHERE INV_NO = invNo; - UPDATE INVOICE SET INV_NO = generate_final_inv_number(po_no), INV_STATUS = 2 WHERE INV_NO = invNo; -UPDATE PO SET INV_SEQ = INV_SEQ + 1 WHERE PO_NUM = po_no; -Commit; -END// -DELIMITER ; - --- Dumping structure for procedure astute.update_all_remaining_quantities -DELIMITER // -CREATE DEFINER=`root`@`localhost` PROCEDURE `update_all_remaining_quantities`(invNo varchar(20)) -BEGIN - -DECLARE po_line_item_no int; -DECLARE remaining_qty double; -DECLARE finished INTEGER DEFAULT 0; -DECLARE p_finished INTEGER DEFAULT 0; -DECLARE done boolean DEFAULT FALSE; - -DECLARE po_line_items CURSOR FOR select distinct po_line_item_num from invoice_detail where inv_num = invNo; -DECLARE CONTINUE HANDLER FOR NOT FOUND SET p_finished = 1; - OPEN po_line_items; - po_loop: LOOP - FETCH po_line_items INTO po_line_item_no; - IF p_finished = 1 THEN - LEAVE po_loop; - END IF; - BEGIN - SET remaining_qty = update_remaining_qty_fun('',invNo,po_line_item_no); - END; - END LOOP po_loop; - CLOSE po_line_items; -END// -DELIMITER ; - --- Dumping structure for function astute.update_remaining_qty_fun -DELIMITER // -CREATE DEFINER=`root`@`localhost` FUNCTION `update_remaining_qty_fun`(po_no_in varchar(40), inv_num_in varchar(40), item_no_in int) RETURNS double -BEGIN -DECLARE rem_qty double; -DECLARE po_no varchar(40); -if inv_num_in <> null or inv_num_in <> '' THEN - SELECT po_num INTO po_no FROM invoice where inv_no = inv_num_in; -else - set po_no = po_no_in; -end if; - -select po_detail.qty - ifnull(sum(invoice_detail.qty),0) into rem_qty from invoice_detail, invoice, po_detail -where invoice_detail.inv_num in (select inv_no from invoice where invoice.PO_num = po_no) -and invoice_detail.po_line_item_num = item_no_in -and po_detail.PO_num = po_no -and invoice.PO_num = po_detail.PO_num -and invoice.inv_no = invoice_detail.inv_num -and invoice.inv_status <> 3 -and invoice_detail.po_line_item_num = po_detail.line_item_no; - -update po_detail set remaining_qty = rem_qty where PO_num = po_no and line_item_no = item_no_in; -return rem_qty; -END// -DELIMITER ; - --- Dumping structure for table astute.user -CREATE TABLE IF NOT EXISTS `user` ( - `user_id` int(5) NOT NULL, - `username` varchar(20) DEFAULT NULL, - `password` varchar(20) DEFAULT NULL, - `first_name` varchar(20) DEFAULT NULL, - `middle_name` varchar(20) DEFAULT NULL, - `last_name` varchar(20) DEFAULT NULL, - `role` varchar(20) DEFAULT NULL, - `email` varchar(40) DEFAULT NULL, - `office_phone_ext` int(3) DEFAULT NULL, - `cell_phone` bigint(20) DEFAULT NULL, - PRIMARY KEY (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- Dumping data for table astute.user: ~2 rows (approximately) -/*!40000 ALTER TABLE `user` DISABLE KEYS */; -INSERT INTO `user` (`user_id`, `username`, `password`, `first_name`, `middle_name`, `last_name`, `role`, `email`, `office_phone_ext`, `cell_phone`) VALUES - (1, 'sparikh', 'sparikh', 'Saurin', NULL, 'Parikh', 'Owner', 'sparikh@Astuteng.com', 2024002004, 3014616485), - (2, 'humarethiya', 'humarethiya', 'Haresh', NULL, 'Umaretiya', 'Owner', 'Humaretiya@astuteng.com', 2024002004, 0); -/*!40000 ALTER TABLE `user` ENABLE KEYS */; - -/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; -/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +-- -------------------------------------------------------- +-- Host: 127.0.0.1 +-- Server version: 5.7.12-log - MySQL Community Server (GPL) +-- Server OS: Win64 +-- HeidiSQL Version: 9.5.0.5196 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; + + +-- Dumping database structure for astute +DROP DATABASE IF EXISTS `astute`; +CREATE DATABASE IF NOT EXISTS `astute` /*!40100 DEFAULT CHARACTER SET utf8 */; +USE `astute`; + +-- Dumping structure for table astute.change_order +CREATE TABLE IF NOT EXISTS `change_order` ( + `PO_num` varchar(20) NOT NULL, + `change_order_num` int(20) NOT NULL, + `change_order_date` date DEFAULT NULL, + `change_order_amt` double NOT NULL, + `description` varchar(500) DEFAULT NULL, + PRIMARY KEY (`PO_num`,`change_order_num`), + CONSTRAINT `fk_PO_CO_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.change_order: ~0 rows (approximately) +/*!40000 ALTER TABLE `change_order` DISABLE KEYS */; +/*!40000 ALTER TABLE `change_order` ENABLE KEYS */; + +-- Dumping structure for function astute.create_customer_fun +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `create_customer_fun`(customerid varchar(20), customerName varchar(100), billToDept varchar(100), add1In varchar(100), add2In varchar(100), cityIn varchar(50), stateIn varchar(20), zipIn int(5), zipLast4In int(4), emailIn varchar(50), phoneIn varchar(20), faxIn varchar(20)) RETURNS varchar(20) CHARSET utf8 +BEGIN +DECLARE last_inserted_id varchar(20); +INSERT INTO customer (customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax) +VALUES (customerid, customerName, billToDept, add1In, add2In, cityIn, stateIn, zipIn, ziplast4In, emailIn, phoneIn, faxIn); +SELECT LAST_INSERT_ID() into last_inserted_id; +return last_inserted_id; +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_invoice +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice`(invNo varchar(20),invDate date,PONo varchar(20),paymentStatus int,billAmt double,specialNotes varchar(500), certClause Varchar(500), invoiceStatus int) +BEGIN +INSERT INTO invoice (inv_no,inv_date,PO_num,pmt_status,bill_amt,special_notes,certification,inv_status) +VALUES (invNo, invDate, PONo, 1, billAmt, specialNotes, certClause, invoiceStatus); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_invoice_detail +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice_detail`(invoiceNum varchar(20), lineItemNum int, POLineItemNum varchar(20), serviceTypeId int, description varchar(500), qty_in double, fee_in double, fee_type_id_in int) +BEGIN +INSERT INTO INVOICE_DETAIL (inv_num, line_item_num, PO_line_item_num, service_type_id, description, qty, fee, fee_type_id) +VALUES (invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, description, qty_in, fee_in, fee_type_id_in); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_po +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po`(PONum varchar(40), contractNum varchar(20), PODate date, contractAmt double(10,2), customerid varchar(20), astute_project_num_in varchar(20), title_in varchar(200)) +BEGIN +DECLARE next_po_id int(11); +SELECT count(*) + 1 INTO next_po_id FROM PO WHERE customer_id = customerid; +INSERT INTO PO (po_id, PO_num, contract_num, PO_date, contract_amt, customer_id,astute_project_num, title ) +VALUES (next_po_id, PONum, contractNum, PODate, contractAmt, customerId,astute_project_num_in, title_in); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_po_detail +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po_detail`(PONum varchar(40), lineItemNo int, servicedesc varchar(500), feetypeid int(11), quantity double, fee_in double, servicetypeid int(1), remaining_qty double) +BEGIN +INSERT INTO PO_DETAIL (PO_num,line_item_no,service_desc,fee_type_id,qty,fee,service_type_id, remaining_qty) +VALUES (POnum,lineitemno,servicedesc,feetypeid,quantity,fee_in, servicetypeid, remaining_qty); +END// +DELIMITER ; + +-- Dumping structure for table astute.customer +CREATE TABLE IF NOT EXISTS `customer` ( + `customer_id` varchar(10) NOT NULL, + `customer_name` varchar(100) DEFAULT NULL, + `bill_to_dept` varchar(50) DEFAULT NULL, + `add1` varchar(50) DEFAULT NULL, + `add2` varchar(50) DEFAULT NULL, + `city` varchar(50) DEFAULT NULL, + `state` varchar(2) DEFAULT NULL, + `zip` int(5) DEFAULT NULL, + `zip_last_4` int(4) DEFAULT NULL, + `email` varchar(50) DEFAULT NULL, + `phone` varchar(20) DEFAULT NULL, + `fax` varchar(20) DEFAULT NULL, + PRIMARY KEY (`customer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.customer: ~1 rows (approximately) +/*!40000 ALTER TABLE `customer` DISABLE KEYS */; +INSERT INTO `customer` (`customer_id`, `customer_name`, `bill_to_dept`, `add1`, `add2`, `city`, `state`, `zip`, `zip_last_4`, `email`, `phone`, `fax`) VALUES + ('MDOT', 'Maryland Department of Transportation', 'Billing Department', '123123 Test Drive', '104', 'Germantown', 'MD', 20874, 0, 'Test@MDOT.gov', '(123) 123-1233', '(121) 231-233'), + ('VDOT', 'Virginia Depart of Transportation', 'Billing Department', '13134 Saturn Drive', 'Unit 100', 'McLean', 'VA', 22043, 0, 'Billing@vdot.gov', '(703) 122-1234', '(703) 122-1212'); +/*!40000 ALTER TABLE `customer` ENABLE KEYS */; + +-- Dumping structure for function astute.delete_invoice +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `delete_invoice`(inv_no_in varchar(20)) RETURNS varchar(40) CHARSET utf8 +BEGIN + + DECLARE inv_status_in int; + + SELECT inv_status + INTO inv_status_in + FROM invoice + WHERE inv_no = inv_no_in; + + IF inv_status_in <> 1 THEN + RETURN 'ERROR - ONLY DRAFT INVOICE CAN BE DELETED'; + END IF; + + UPDATE INVOICE_DETAIL SET QTY = 0 WHERE inv_num = inv_no_in; + CALL update_all_remaining_quantities(inv_no_in); + DELETE FROM INVOICE WHERE inv_no = inv_no_in; + + RETURN 'SUCCESS'; + +END// +DELIMITER ; + +-- Dumping structure for function astute.duplicate_invoice +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `duplicate_invoice`(inv_no_in varchar(20)) RETURNS varchar(20) CHARSET utf8 +BEGIN + DECLARE generated_inv_number varchar(20); + DECLARE po_num_in varchar(20); + + SELECT po_num + INTO po_num_in + FROM invoice + WHERE inv_no = inv_no_in; + + SELECT generate_inv_number(po_num_in) + INTO generated_inv_number; + + INSERT INTO invoice + (inv_no,inv_date,PO_num,change_order_num,bill_amt,special_notes,certification,inv_status,pmt_status) + (SELECT generated_inv_number, CURDATE(), PO_num, change_order_num, bill_amt, special_notes, certification, inv_status, pmt_status + FROM invoice + WHERE inv_no = inv_no_in); + + INSERT INTO invoice_detail + (inv_num,line_item_num,PO_line_item_num,service_type_id,description,qty,fee,fee_type_id) + (SELECT generated_inv_number, line_item_num, PO_line_item_num, service_type_id, description, 0, fee, fee_type_id + FROM invoice_detail + WHERE inv_num = inv_no_in); + + return generated_inv_number; + +END// +DELIMITER ; + +-- Dumping structure for table astute.fee_type +CREATE TABLE IF NOT EXISTS `fee_type` ( + `fee_type_id` int(11) NOT NULL, + `fee_type_desc` varchar(40) NOT NULL, + PRIMARY KEY (`fee_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.fee_type: ~2 rows (approximately) +/*!40000 ALTER TABLE `fee_type` DISABLE KEYS */; +INSERT INTO `fee_type` (`fee_type_id`, `fee_type_desc`) VALUES + (1, 'Fixed fee'), + (2, 'Hourly'); +/*!40000 ALTER TABLE `fee_type` ENABLE KEYS */; + +-- Dumping structure for function astute.generate_final_inv_number +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `generate_final_inv_number`(po_num_in varchar(20)) RETURNS varchar(40) CHARSET utf8 +BEGIN + DECLARE customer_id_in varchar(10); + DECLARE customer_code varchar(4); + DECLARE po_count int; + DECLARE inv_count int; + DECLARE inv_number varchar(40); + + SELECT customer_id + INTO customer_id_in + FROM po + WHERE po.po_num = po_num_in; + + SELECT substr(customer_id_in, 1, 3) INTO customer_code; + + SELECT po_id + INTO po_count + FROM po + WHERE PO_num = po_num_in; + + SELECT inv_seq+1 + INTO inv_count + FROM po + WHERE po.PO_num = po_num_in; + + SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_', date_format(now(),'%m%d'),'_',inv_count) INTO inv_number; + RETURN inv_number; + +END// +DELIMITER ; + +-- Dumping structure for function astute.generate_inv_number +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `generate_inv_number`(po_num_in varchar(20)) RETURNS varchar(40) CHARSET utf8 +BEGIN + DECLARE customer_id_in varchar(20); + DECLARE customer_code varchar(4); + DECLARE po_count int; + DECLARE inv_count int; + DECLARE inv_number varchar(40); + + SELECT customer_id + INTO customer_id_in + FROM po + WHERE po.po_num = po_num_in; + + SELECT substr(customer.customer_id, 1, 3) + INTO customer_code + FROM customer + WHERE customer_id = customer_id_in; + + SELECT po_id + INTO po_count + FROM po + WHERE PO_num = po_num_in; + + SELECT inv_seq + 1 + INTO inv_count + FROM PO + WHERE PO.PO_num = po_num_in; + + SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_DRAFT_',FLOOR(RAND()*(999))) INTO inv_number; + RETURN inv_number; + +END// +DELIMITER ; + +-- Dumping structure for function astute.get_customer_from_po +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_customer_from_po`(ponum varchar(20)) RETURNS varchar(20) CHARSET utf8 +BEGIN +declare customer_id_out varchar(20); + SELECT customer_id INTO customer_id_out FROM po WHERE po_num = ponum; + return customer_id_out; +END// +DELIMITER ; + +-- Dumping structure for function astute.get_payment_status_name +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_payment_status_name`(pmt_status int) RETURNS varchar(20) CHARSET utf8 +BEGIN + declare payment_status_name VARCHAR(20); + SELECT payment_status_desc INTO payment_status_name FROM payment_status WHERE payment_status_id = pmt_status; + return payment_status_name; +END// +DELIMITER ; + +-- Dumping structure for function astute.get_payment_type +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_payment_type`(pmt_type int) RETURNS varchar(20) CHARSET utf8 +BEGIN + declare payment_type VARCHAR(20); + SELECT payment_type_name INTO payment_type FROM payment_type WHERE payment_type_id = pmt_type; + return payment_type; +END// +DELIMITER ; + +-- Dumping structure for function astute.get_previously_billed_amt +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_previously_billed_amt`(po_no varchar(20)) RETURNS double(10,2) +BEGIN + declare billed_amt double(10,2); + SELECT sum(bill_amt) INTO billed_amt FROM invoice WHERE invoice.PO_num = po_no and inv_status <> 3; + return billed_amt; +END// +DELIMITER ; + +-- Dumping structure for table astute.invoice +CREATE TABLE IF NOT EXISTS `invoice` ( + `inv_no` varchar(20) NOT NULL, + `inv_date` date NOT NULL, + `PO_num` varchar(40) NOT NULL, + `bill_amt` double NOT NULL, + `special_notes` varchar(500) DEFAULT NULL, + `certification` varchar(500) DEFAULT 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', + `inv_status` int(2) DEFAULT '1', + `pmt_status` int(11) NOT NULL DEFAULT '1', + PRIMARY KEY (`inv_no`), + KEY `fk_InvMaster_POnum` (`PO_num`), + CONSTRAINT `fk_InvMaster_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice: ~3 rows (approximately) +/*!40000 ALTER TABLE `invoice` DISABLE KEYS */; +INSERT INTO `invoice` (`inv_no`, `inv_date`, `PO_num`, `bill_amt`, `special_notes`, `certification`, `inv_status`, `pmt_status`) VALUES + ('MDO-01_0108_1', '2019-01-08', 'MDOT-123', 30250, 'Test', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned', 3, 1), + ('VDO-02_0107_2', '2019-01-07', 'ABC-123', 1450, 'Test', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned', 3, 1), + ('VDO-02_0108_3', '2019-01-08', 'ABC-123', 5250, 'Test', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned', 2, 1); +/*!40000 ALTER TABLE `invoice` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_detail +CREATE TABLE IF NOT EXISTS `invoice_detail` ( + `inv_num` varchar(20) NOT NULL, + `line_item_num` int(11) NOT NULL, + `PO_line_item_num` int(11) DEFAULT NULL, + `service_type_id` int(11) DEFAULT NULL, + `description` varchar(500) DEFAULT NULL, + `qty` double DEFAULT NULL, + `fee` double DEFAULT NULL, + `fee_type_id` int(11) DEFAULT NULL, + PRIMARY KEY (`inv_num`,`line_item_num`), + KEY `fk_InvDetail_FeeType` (`fee_type_id`), + CONSTRAINT `fk_InvDetail_FeeType` FOREIGN KEY (`fee_type_id`) REFERENCES `fee_type` (`fee_type_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_InvDetail_InvNum` FOREIGN KEY (`inv_num`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_detail: ~10 rows (approximately) +/*!40000 ALTER TABLE `invoice_detail` DISABLE KEYS */; +INSERT INTO `invoice_detail` (`inv_num`, `line_item_num`, `PO_line_item_num`, `service_type_id`, `description`, `qty`, `fee`, `fee_type_id`) VALUES + ('MDO-01_0108_1', 1, 1, 2, 'Design', 0.5, 2500, 1), + ('MDO-01_0108_1', 2, 2, 1, 'Study', 5, 100, 2), + ('MDO-01_0108_1', 3, 3, 3, 'Peer Review', 50, 250, 2), + ('MDO-01_0108_1', 4, 4, 4, 'Cost Estimation', 50, 250, 2), + ('MDO-01_0108_1', 5, 5, 5, 'Forensic Investigation', 0.5, 5000, 1), + ('MDO-01_0108_1', 6, -1, 1, 'Out of Pocket Expenses - gas', 50, 20, 1), + ('VDO-02_0107_2', 1, 1, 2, 'Design', 0.25, 5000, 1), + ('VDO-02_0107_2', 2, -1, 1, 'Out of Pocket Expenses', 20, 10, 1), + ('VDO-02_0108_3', 1, 1, 2, 'Design', 0.25, 5000, 1), + ('VDO-02_0108_3', 2, 3, 1, 'Study', 200, 20, 1); +/*!40000 ALTER TABLE `invoice_detail` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_notes +CREATE TABLE IF NOT EXISTS `invoice_notes` ( + `inv_no` varchar(20) NOT NULL, + `inv_note` varchar(500) NOT NULL, + PRIMARY KEY (`inv_no`), + CONSTRAINT `fk_inv_notes_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_notes: ~0 rows (approximately) +/*!40000 ALTER TABLE `invoice_notes` DISABLE KEYS */; +/*!40000 ALTER TABLE `invoice_notes` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_payment +CREATE TABLE IF NOT EXISTS `invoice_payment` ( + `inv_no` varchar(20) NOT NULL, + `invoice_payment_type` int(11) NOT NULL, + `invoice_amount` double NOT NULL, + `payment_date` date NOT NULL, + `invoice_payment_id` int(11) NOT NULL AUTO_INCREMENT, + `check_transaction_no` varchar(50) NOT NULL, + `void_payment_status` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`invoice_payment_id`), + KEY `fk_inv_pmt_inv_no` (`inv_no`), + KEY `fk_pinv_pmt_type` (`invoice_payment_type`), + CONSTRAINT `fk_inv_pmt_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_pinv_pmt_type` FOREIGN KEY (`invoice_payment_type`) REFERENCES `payment_type` (`payment_type_id`) +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_payment: ~1 rows (approximately) +/*!40000 ALTER TABLE `invoice_payment` DISABLE KEYS */; +INSERT INTO `invoice_payment` (`inv_no`, `invoice_payment_type`, `invoice_amount`, `payment_date`, `invoice_payment_id`, `check_transaction_no`, `void_payment_status`) VALUES + ('VDO-02_0107_2', 2, 5000, '2019-01-09', 13, '123456', 0), + ('VDO-02_0107_2', 2, 5000, '2019-01-08', 15, '123123', 0); +/*!40000 ALTER TABLE `invoice_payment` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_status +CREATE TABLE IF NOT EXISTS `invoice_status` ( + `inv_status_id` int(11) NOT NULL, + `inv_status_desc` varchar(20) NOT NULL, + PRIMARY KEY (`inv_status_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_status: ~3 rows (approximately) +/*!40000 ALTER TABLE `invoice_status` DISABLE KEYS */; +INSERT INTO `invoice_status` (`inv_status_id`, `inv_status_desc`) VALUES + (1, 'Draft'), + (2, 'Submitted'), + (3, 'Void'); +/*!40000 ALTER TABLE `invoice_status` ENABLE KEYS */; + +-- Dumping structure for table astute.payment_status +CREATE TABLE IF NOT EXISTS `payment_status` ( + `payment_status_id` int(11) NOT NULL, + `payment_status_desc` varchar(20) NOT NULL, + PRIMARY KEY (`payment_status_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.payment_status: ~3 rows (approximately) +/*!40000 ALTER TABLE `payment_status` DISABLE KEYS */; +INSERT INTO `payment_status` (`payment_status_id`, `payment_status_desc`) VALUES + (1, 'Outstanding'), + (2, 'Partially paid'), + (3, 'Paid'); +/*!40000 ALTER TABLE `payment_status` ENABLE KEYS */; + +-- Dumping structure for table astute.payment_type +CREATE TABLE IF NOT EXISTS `payment_type` ( + `payment_type_id` int(11) NOT NULL, + `payment_type_name` varchar(20) NOT NULL, + PRIMARY KEY (`payment_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.payment_type: ~4 rows (approximately) +/*!40000 ALTER TABLE `payment_type` DISABLE KEYS */; +INSERT INTO `payment_type` (`payment_type_id`, `payment_type_name`) VALUES + (1, 'Credit Card'), + (2, 'Check'), + (3, 'ACH'), + (4, 'Wire Transfer'); +/*!40000 ALTER TABLE `payment_type` ENABLE KEYS */; + +-- Dumping structure for table astute.po +CREATE TABLE IF NOT EXISTS `po` ( + `PO_num` varchar(40) NOT NULL COMMENT 'Alpha numeric, auto generated in frontend', + `contract_num` varchar(20) DEFAULT NULL, + `PO_date` date DEFAULT NULL, + `contract_amt` double(10,2) DEFAULT NULL, + `customer_id` varchar(11) NOT NULL, + `astute_project_num` varchar(20) NOT NULL, + `po_id` int(11) NOT NULL, + `title` varchar(200) DEFAULT NULL, + `inv_seq` int(3) NOT NULL DEFAULT '0', + PRIMARY KEY (`PO_num`), + KEY `ind_pomaster_contractno` (`contract_num`), + KEY `ind_pomaster_podate` (`PO_date`), + KEY `po_customer_id` (`customer_id`), + CONSTRAINT `po_customer_id_fk` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.po: ~3 rows (approximately) +/*!40000 ALTER TABLE `po` DISABLE KEYS */; +INSERT INTO `po` (`PO_num`, `contract_num`, `PO_date`, `contract_amt`, `customer_id`, `astute_project_num`, `po_id`, `title`, `inv_seq`) VALUES + ('ABC-123', 'ABC-123', '2018-09-23', 27000.00, 'VDOT', 'ABC-123', 2, 'ABC-123', 3), + ('MDOT-123', 'MDOT-123 ContractNo', '2019-01-08', 58500.00, 'MDOT', 'MDOT-123 ProjNo', 1, 'MDOT-123 SO Title', 1), + ('VDOT-54321', 'VDOT-54321', '2018-09-22', 10000.00, 'VDOT', 'VDOTProj', 1, 'Supervisor', 1); +/*!40000 ALTER TABLE `po` ENABLE KEYS */; + +-- Dumping structure for table astute.po_detail +CREATE TABLE IF NOT EXISTS `po_detail` ( + `PO_num` varchar(40) NOT NULL, + `line_item_no` int(11) NOT NULL, + `service_desc` varchar(500) DEFAULT NULL, + `fee_type_id` int(11) DEFAULT '1' COMMENT '1-fixed fee, 2-hourly', + `qty` double DEFAULT NULL, + `service_type_id` int(1) DEFAULT '1' COMMENT '1-studies, 2-supplemental service, 3-out of pocket, 4-reimbursement, 5-', + `fee` double DEFAULT NULL, + `remaining_qty` double DEFAULT NULL, + PRIMARY KEY (`PO_num`,`line_item_no`), + KEY `fk_PODetail_ServType` (`service_type_id`), + CONSTRAINT `fk_PODetail_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`), + CONSTRAINT `fk_PODetail_ServType` FOREIGN KEY (`service_type_id`) REFERENCES `service_type` (`service_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.po_detail: ~12 rows (approximately) +/*!40000 ALTER TABLE `po_detail` DISABLE KEYS */; +INSERT INTO `po_detail` (`PO_num`, `line_item_no`, `service_desc`, `fee_type_id`, `qty`, `service_type_id`, `fee`, `remaining_qty`) VALUES + ('ABC-123', 1, 'Design', 1, 1, 2, 5000, 0.75), + ('ABC-123', 2, 'Out of Expense', 1, 100, 6, 20, 100), + ('ABC-123', 3, 'Study', 1, 1000, 1, 20, 800), + ('MDOT-123', 1, 'Design', 1, 1, 2, 2500, 1), + ('MDOT-123', 2, 'Study', 2, 10, 1, 100, 10), + ('MDOT-123', 3, 'Peer Review', 2, 100, 3, 250, 100), + ('MDOT-123', 4, 'Cost Estimation', 2, 100, 4, 250, 100), + ('MDOT-123', 5, 'Forensic Investigation', 1, 1, 5, 5000, 1), + ('VDOT-54321', 1, 'Study existing designs', 1, 1, 1, 1000, 1), + ('VDOT-54321', 2, 'Modify design', 1, 1, 2, 2000, 1), + ('VDOT-54321', 3, 'Cost estimation', 1, 1, 4, 1000, 1), + ('VDOT-54321', 4, 'Peer Review', 2, 100, 3, 100, 100); +/*!40000 ALTER TABLE `po_detail` ENABLE KEYS */; + +-- Dumping structure for table astute.service_type +CREATE TABLE IF NOT EXISTS `service_type` ( + `service_type_id` int(11) NOT NULL, + `desc` varchar(40) NOT NULL, + PRIMARY KEY (`service_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.service_type: ~6 rows (approximately) +/*!40000 ALTER TABLE `service_type` DISABLE KEYS */; +INSERT INTO `service_type` (`service_type_id`, `desc`) VALUES + (1, 'Study'), + (2, 'Design'), + (3, 'Peer Review'), + (4, 'Cost Estimation'), + (5, 'Forensic Investigation'), + (6, 'Out-of-pocket Expense'); +/*!40000 ALTER TABLE `service_type` ENABLE KEYS */; + +-- Dumping structure for table astute.session +CREATE TABLE IF NOT EXISTS `session` ( + `session_id` varchar(200) NOT NULL, + `user_id` int(11) NOT NULL, + `session_start_date` date DEFAULT NULL, + `session_end_date` date DEFAULT NULL, + PRIMARY KEY (`session_id`), + KEY `fk_session_user_id` (`user_id`), + CONSTRAINT `fk_session_user_id` FOREIGN KEY (`user_id`) REFERENCES `user` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.session: ~16 rows (approximately) +/*!40000 ALTER TABLE `session` DISABLE KEYS */; +INSERT INTO `session` (`session_id`, `user_id`, `session_start_date`, `session_end_date`) VALUES + ('042ef08346f84d52b98a22dab48c7b1c', 1, NULL, NULL), + ('058cdb87447645da9ec265e566af834c', 1, NULL, NULL), + ('46d91a474f4544a2ab60002f799383a7', 1, NULL, NULL), + ('4f48b60481ab4729a26b809c077fc7c0', 1, NULL, NULL), + ('5df808bb502044ccb6e9da1bce0c63d4', 2, NULL, NULL), + ('66ed2bccbaf34b1e96b2b81393996cf9', 1, NULL, NULL), + ('8f8991185a174b87adb7d0b1b40c1475', 1, NULL, NULL), + ('92cd1d01085c4ead892a1c7c137631dd', 1, NULL, NULL), + ('9c0a7444f67f4de5a789014413445458', 1, NULL, NULL), + ('abeefc05fe8e48e5bac7ffab65c85ca6', 1, NULL, NULL), + ('b356aab1dbe84d4f9eea9c1cd965c9a4', 1, NULL, NULL), + ('d6387d93d84341fc91a0c4a5cbf266db', 1, NULL, NULL), + ('d98f7e0c9a934afaa89f0f0545c1c81c', 1, NULL, NULL), + ('dcb4b261f925464bb69ff685c1c6134d', 1, NULL, NULL), + ('f6546dbfa5454a339f2093b2ac1f3b54', 1, NULL, NULL), + ('fea623a6ff3148899214750707f4f52e', 1, NULL, NULL); +/*!40000 ALTER TABLE `session` ENABLE KEYS */; + +-- Dumping structure for procedure astute.submit_invoice +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `submit_invoice`(invNo varchar(20)) +BEGIN +DECLARE po_no varchar(20); +UPDATE INVOICE SET INV_STATUS = 2 WHERE INV_NO = invNo; +SELECT PO_NUM INTO po_no FROM INVOICE WHERE INV_NO = invNo; + UPDATE INVOICE SET INV_NO = generate_final_inv_number(po_no), INV_STATUS = 2 WHERE INV_NO = invNo; +UPDATE PO SET INV_SEQ = INV_SEQ + 1 WHERE PO_NUM = po_no; +Commit; +END// +DELIMITER ; + +-- Dumping structure for procedure astute.update_all_remaining_quantities +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `update_all_remaining_quantities`(invNo varchar(20)) +BEGIN + +DECLARE po_line_item_no int; +DECLARE remaining_qty double; +DECLARE finished INTEGER DEFAULT 0; +DECLARE p_finished INTEGER DEFAULT 0; +DECLARE done boolean DEFAULT FALSE; + +DECLARE po_line_items CURSOR FOR select distinct po_line_item_num from invoice_detail where inv_num = invNo; +DECLARE CONTINUE HANDLER FOR NOT FOUND SET p_finished = 1; + OPEN po_line_items; + po_loop: LOOP + FETCH po_line_items INTO po_line_item_no; + IF p_finished = 1 THEN + LEAVE po_loop; + END IF; + BEGIN + SET remaining_qty = update_remaining_qty_fun('',invNo,po_line_item_no); + END; + END LOOP po_loop; + CLOSE po_line_items; +END// +DELIMITER ; + +-- Dumping structure for function astute.update_remaining_qty_fun +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `update_remaining_qty_fun`(po_no_in varchar(40), inv_num_in varchar(40), item_no_in int) RETURNS double +BEGIN +DECLARE rem_qty double; +DECLARE po_no varchar(40); +if inv_num_in <> null or inv_num_in <> '' THEN + SELECT po_num INTO po_no FROM invoice where inv_no = inv_num_in; +else + set po_no = po_no_in; +end if; + +select po_detail.qty - ifnull(sum(invoice_detail.qty),0) into rem_qty from invoice_detail, invoice, po_detail +where invoice_detail.inv_num in (select inv_no from invoice where invoice.PO_num = po_no) +and invoice_detail.po_line_item_num = item_no_in +and po_detail.PO_num = po_no +and invoice.PO_num = po_detail.PO_num +and invoice.inv_no = invoice_detail.inv_num +and invoice.inv_status <> 3 +and invoice_detail.po_line_item_num = po_detail.line_item_no; + +update po_detail set remaining_qty = rem_qty where PO_num = po_no and line_item_no = item_no_in; +return rem_qty; +END// +DELIMITER ; + +-- Dumping structure for table astute.user +CREATE TABLE IF NOT EXISTS `user` ( + `user_id` int(5) NOT NULL, + `username` varchar(20) DEFAULT NULL, + `password` varchar(20) DEFAULT NULL, + `first_name` varchar(20) DEFAULT NULL, + `middle_name` varchar(20) DEFAULT NULL, + `last_name` varchar(20) DEFAULT NULL, + `role` varchar(20) DEFAULT NULL, + `email` varchar(40) DEFAULT NULL, + `office_phone_ext` int(3) DEFAULT NULL, + `cell_phone` bigint(20) DEFAULT NULL, + PRIMARY KEY (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.user: ~2 rows (approximately) +/*!40000 ALTER TABLE `user` DISABLE KEYS */; +INSERT INTO `user` (`user_id`, `username`, `password`, `first_name`, `middle_name`, `last_name`, `role`, `email`, `office_phone_ext`, `cell_phone`) VALUES + (1, 'sparikh', 'sparikh', 'Saurin', NULL, 'Parikh', 'Owner', 'sparikh@Astuteng.com', 2024002004, 3014616485), + (2, 'humarethiya', 'humarethiya', 'Haresh', NULL, 'Umaretiya', 'Owner', 'Humaretiya@astuteng.com', 2024002004, 0); +/*!40000 ALTER TABLE `user` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java index 7c21e00..92a9c9c 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/DAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java @@ -46,13 +46,7 @@ public abstract class DAO { * @throws AstuteException */ public static void init() throws AstuteException { - try { - File configDir = new File(System.getProperty("catalina.base"), "conf"); - File configFile = new File(configDir, "db.config"); - InputStream stream = new FileInputStream(configFile); - Properties props = new Properties(); - props.load(stream); - +// try { // Properties props = new Properties(); // InputStream input = new FileInputStream("db.config"); @@ -60,12 +54,18 @@ public abstract class DAO { // props.load(input); //get properties - database = props.getProperty("database"); - host = props.getProperty("host"); - port = Integer.parseInt(props.getProperty("port")); - schema = props.getProperty("schema"); - username = props.getProperty("username"); - password = props.getProperty("password"); +// database = props.getProperty("database"); +// host = props.getProperty("host"); +// port = Integer.parseInt(props.getProperty("port")); +// schema = props.getProperty("schema"); +// username = props.getProperty("username"); +// password = props.getProperty("password"); + database = "sql"; + host = "localhost"; + port = 3306; + schema = "astute"; + username = "root"; + password = "password"; System.out.println("============================================="); System.out.println("host is " + host); System.out.println("port is " + port); @@ -74,9 +74,9 @@ public abstract class DAO { System.out.println("password is " + password); System.out.println("============================================="); dao = new SqlDAO(); - } catch (IOException e) { - e.printStackTrace(); - } +// } catch (IOException e) { +// e.printStackTrace(); +// } } public Connection conn; @@ -166,9 +166,9 @@ public abstract class DAO { public abstract List getInvoicePayments(String invoiceNum) throws AstuteException; - public abstract void updateInvoicePayment(String invoiceNum, int invoicePaymentId, Double paymentAmount, Date paymentDate) throws AstuteException; + public abstract void updateInvoicePayment(String invoiceNum, int invoicePaymentId, int InvoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) throws AstuteException; - public abstract void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate) throws AstuteException; + public abstract void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) throws AstuteException; public abstract List getPaymentTypes() throws AstuteException; } \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java index 500d789..3e1dd0e 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java @@ -1,1094 +1,1095 @@ -package com.astute.dao; - -import com.astute.exceptions.AstuteException; -import com.astute.model.*; - -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; -import java.math.BigInteger; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.security.spec.InvalidKeySpecException; -import java.sql.*; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.text.SimpleDateFormat; - -import static com.astute.exceptions.AstuteException.DB_ERROR; - -public class SqlDAO extends DAO { - - public SqlDAO() throws AstuteException { - } - - @Override - public void connect() throws AstuteException { - try { - Class.forName("com.mysql.cj.jdbc.Driver"); - conn = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + schema, username, password); - System.out.println("Connected to MySQL"); - } catch (Exception e) { - throw new AstuteException(e.hashCode(), e.getMessage()); - } - } - - /* - =============================== PO Methods =============================================== - */ - - public List getPOMaster(String PONum, String contractNum, String PODate, String astuteProjectNumber) throws AstuteException { - try { - List pos = new ArrayList<>(); - Statement stmt = conn.createStatement(); - String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title, get_previously_billed_amt(PO_num), inv_seq FROM PO "; - if (PONum != null && !PONum.isEmpty()) { - sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; - } else if (contractNum != null && !contractNum.isEmpty()) { - sql += "WHERE UPPER(contract_num) = '" + contractNum.toUpperCase()+ "'"; - } else if (PODate != null) { - sql += "WHERE PO_date = STR_TO_DATE('" + PODate + "', '%Y-%m-%d')"; - } else if (astuteProjectNumber!= null && !astuteProjectNumber.isEmpty() ) { - sql += "WHERE UPPER(astute_project_num) = '" + astuteProjectNumber.toUpperCase()+ "'"; - } - - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String poNum = rs.getString(1); - String cntrctNum = rs.getString(2); - Date poDate = rs.getDate(3); - String customerId = rs.getString(4); - Double contractAmt = rs.getDouble(5); - String astuteProjectNum = rs.getString(6); - String title = rs.getString(7); - Double previouslyBilledAmount = rs.getDouble(8); - int invoiceSequence = rs.getInt(8); - String date = null; - if (poDate != null) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - date = formatter.format(poDate); - } - PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence); - pos.add(po); - } - return pos; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getPODetail(String PONum, int lineItemNo) throws AstuteException { - try { - List poDetails = new ArrayList<>(); - Statement stmt = conn.createStatement(); - String whereClause = " WHERE "; - boolean whereClauseCriteria = false; - String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, fee, service_type_id, remaining_qty FROM PO_DETAIL "; - if (PONum != null) { - whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; - whereClauseCriteria = true; - } - if (lineItemNo > 0) { - if (whereClauseCriteria) { - whereClause += " AND "; - } - whereClause = whereClause + " line_item_no = " + lineItemNo; - } - sql += whereClause; - System.out.println(sql); - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String poNum = rs.getString(1); - int lineItemNum = rs.getInt(2); - String serviceDesc = rs.getString(3); - int feeTypeId = rs.getInt(4); - Double qty = rs.getDouble(5); - Double fee = rs.getDouble(6); - int serviceTypeId = rs.getInt(7); - double remainingQty = rs.getDouble(8); - PODetail poDetail = new PODetail(poNum, lineItemNum, serviceDesc, feeTypeId, qty, fee, serviceTypeId, remainingQty); - poDetails.add(poDetail); - } - return poDetails; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException { - try { - System.out.println("PODate in SQLDAO is "+ PODate); - - String sql = "UPDATE PO "; - String updateClause = " SET "; - String whereClause = ""; - if (PONum == null || PONum.isEmpty()) { - throw new AstuteException(0, "PO Number null."); - } else { - whereClause = " WHERE UPPER(PO_num) ='" + PONum.toUpperCase() + "'"; - } - - updateClause = updateClause + " contract_num = '" + contractNum + "',"; - updateClause = updateClause + " PO_Date = STR_TO_DATE('" + PODate + "', '%Y-%m-%d')" + ","; - updateClause = updateClause + " contract_amt = " + contractAmt+ ","; - updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"',"; - updateClause = updateClause + " title = '" + title +"'"; - sql = sql+ updateClause + whereClause; - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public String trimLastCharacter(String sql, String character) { - sql = sql.trim(); - if (sql.endsWith(character)) { - sql = sql.substring(0, sql.length() - 1); - } - return sql; - - } - - public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException { - try { - // remainingQuantity is not used , need to take it out from signature eventually - String sql = "UPDATE PO_DETAIL "; - String updateClause = " SET "; - String whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; - if (POnum == null || POnum.isEmpty() || lineItemNo < 0) { - throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0."); - } else { - whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; - } - if (lineItemNo < 0) { - throw new AstuteException(0, "Line item Number must be greater than 0."); - } - - List lineItem = getPODetail(POnum, lineItemNo); - if (lineItem.size() == 0) { - // new line item - createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId, qty); - } else { - updateClause += " service_desc = '" + serviceDesc + "',"; - updateClause += " fee_type_id = " + feeTypeId + ","; - updateClause += " qty = " + qty + ","; - updateClause += " fee = " + fee + ","; - updateClause += " service_type_id = " + serviceTypeId; - - if (!updateClause.equalsIgnoreCase(" SET ")) { - sql = sql + trimLastCharacter(updateClause, ",") + whereClause; - - } else { - throw new AstuteException(0, "No values to update."); - } - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - updateRemainingQty(POnum,null, lineItemNo); } - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException, ParseException { - try { - java.util.Date date = null; - java.sql.Date poDate = null; - if (PODate!= null && !PODate.isEmpty()) { - date = new SimpleDateFormat("yyyy-MM-dd").parse(PODate); - poDate = new java.sql.Date(date.getTime()); - } - CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?,?)}"); - stmt.setString(1, PONum); - stmt.setString(2, contractNum); - stmt.setDate(3, poDate); - stmt.setDouble(4, contractAmt); - stmt.setString(5, customerId); - stmt.setString(6, astuteProjectNumber); - stmt.setString(7, title); - stmt.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException { - try { - // TODO remainingQuantity not used, need to take it out from signature - System.out.println("Calling create_po_detail Procedure"); - System.out.println("POnum is " + POnum); - CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}"); - stmt.setString(1, POnum); - stmt.setInt(2, lineItemNo); - stmt.setString(3, serviceDesc); - stmt.setInt(4, feeTypeId); - stmt.setDouble(5, qty); - stmt.setDouble(6, fee); - stmt.setInt(7, serviceTypeId); - stmt.setDouble(8, qty); - - stmt.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getServiceTypes() throws AstuteException { - try { - List serviceTypes = new ArrayList(); - Statement stmt = conn.createStatement(); - String sql = "SELECT SERVICE_TYPE_ID, SERVICE_TYPE.DESC FROM SERVICE_TYPE ORDER BY 1 "; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int serviceTypeId = rs.getInt(1); - String desc = rs.getString(2); - ServiceType serviceType = new ServiceType(serviceTypeId, desc); - serviceTypes.add(serviceType); - } - return serviceTypes; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - /* - =============================== Invoice Methods =============================================== - */ - - public Double getPreviouslyBilledAmount(String poNum) throws AstuteException { - try { - Double billedAmt = new Double(0); - Statement stmt = conn.createStatement(); - String sql = "SELECT sum(bill_amt) FROM invoice WHERE invoice.PO_num = '" + poNum + "'"; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - billedAmt = rs.getDouble(1); - } - return billedAmt; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public String generateInvoiceNumber(String poNum) throws AstuteException { - try { - String generatedInvoiceNumber; - System.out.println("Calling generate_inv_number DB function"); - System.out.println("poNum is " + poNum); - CallableStatement stmt = conn.prepareCall("{? = call generate_inv_number(?)}"); - stmt.registerOutParameter(1, Types.VARCHAR); - - stmt.setString(2, poNum); - stmt.execute(); - generatedInvoiceNumber = stmt.getString(1); - return generatedInvoiceNumber; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getPaymentStatuses() throws AstuteException { - try { - List paymentStatuses = new ArrayList(); - Statement stmt = conn.createStatement(); - String sql = "SELECT payment_status_id, payment_status_desc FROM payment_status ORDER BY 1 "; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int paymentStatusId = rs.getInt(1); - String desc = rs.getString(2); - PaymentStatus paymentStatus = new PaymentStatus(paymentStatusId, desc); - paymentStatuses.add(paymentStatus); - } - return paymentStatuses; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) throws AstuteException{ - GeneratedInvoice generatedInvoice = null; - Invoice invoice = getInvoiceMaster(invoiceNumber, 0).get(0); - String PONo = invoice.getPoNum(); - List invoiceDetail = getInvoiceDetail(invoiceNumber, 0); - PO po = getPOMaster(PONo, null, null, null).get(0); - String customerId = po.getCustomerId(); - Customer customer = getCustomers(customerId).get(0); - Double previouslyBilledAmt = getPreviouslyBilledAmount(PONo); - Double toBeBilledAmt = po.getContractAmt() - previouslyBilledAmt - invoice.getBillAmt(); - generatedInvoice = new GeneratedInvoice(invoice, invoiceDetail, po, customer, previouslyBilledAmt, toBeBilledAmt ); - return generatedInvoice; - } - - - public List getInvoiceMaster(String invoiceNumber, int pmtStatus)throws AstuteException { - try { - List invoices = new ArrayList<>(); - Statement stmt = conn.createStatement(); - String whereClause = " WHERE "; - boolean whereClauseIndicator = false; - String sql = "SELECT inv_no, inv_date, PO_num, pmt_status, bill_amt, special_notes, certification, inv_status FROM INVOICE "; - if (invoiceNumber != null && !invoiceNumber.isEmpty()) { - whereClause = whereClause + " UPPER(inv_no) = '"+ invoiceNumber.toUpperCase() +"'"; - whereClauseIndicator = true; - } - if (pmtStatus > 0) { - if (whereClauseIndicator) { - whereClause += " AND "; - } - whereClause = whereClause + " pmt_status = "+ pmtStatus; - } - if (!whereClause.equals(" WHERE ")) { - - sql += whereClause; - } - System.out.println(sql); - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String invNo = rs.getString(1); - String invdDate = rs.getString(2); - String PONo = rs.getString(3); - int paymentStatus = rs.getInt(4); - Double billAmt = rs.getDouble(5); - String specialNotes = rs.getString(6); - String certification = rs.getString(7); - int invoiceStatus = rs.getInt(8); - - Invoice invoice = new Invoice(invNo, invdDate, PONo, paymentStatus, billAmt, specialNotes, certification, invoiceStatus); - invoices.add(invoice); - } - return invoices; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getInvoiceDetail(String invoiceNum, int lineItemNo)throws AstuteException { - try { - List services = new ArrayList<>(); - Statement stmt = conn.createStatement(); - String sql = "SELECT inv_num, line_item_num, PO_line_item_num, service_type_id, description, fee_type_id, fee, qty FROM INVOICE_DETAIL "; - - String whereClause = " WHERE "; - boolean whereClauseIndicator = false; - if (invoiceNum != null) { - whereClause = whereClause + " UPPER(inv_num) = '"+ invoiceNum.toUpperCase() +"'"; - whereClauseIndicator = true; - } - if (lineItemNo > 0) { - if (whereClauseIndicator) { - whereClause += " AND "; - } - whereClause = whereClause + " line_item_num = "+ lineItemNo; - } - - sql += whereClause; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String invNo = rs.getString(1); - int lineItemNum = rs.getInt(2); - int POLineItemNum = rs.getInt(3); - int serviceTypeId = rs.getInt(4); - String desc = rs.getString(5); - int feeTypeId = rs.getInt(6); - Double fee = rs.getDouble(7); - Double qty = rs.getDouble(8); - InvoiceDetail service = new InvoiceDetail(invNo, lineItemNum, POLineItemNum, serviceTypeId, desc, qty, fee, feeTypeId); - services.add(service); - } - return services; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void updateInvoiceMaster(String invoiceNum, String invoiceDate, String PONum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus)throws AstuteException { - try { - String sql = "UPDATE INVOICE "; - String updateClause = " SET "; - String whereClause = ""; - if (invoiceNum == null || invoiceNum.isEmpty()) { - throw new AstuteException(0, "Invoice Number can't be null."); - } else { - whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "'"; - } - updateClause = updateClause + " inv_date = STR_TO_DATE('" + invoiceDate + "', '%Y-%m-%d')" + ","; - updateClause = updateClause + " PO_num = '" + PONum + "',"; - updateClause = updateClause + " pmt_status = " + pmtStatus + ","; - updateClause = updateClause + " bill_amt = " + billAmt + ","; - updateClause = updateClause + " special_notes = '" + specialNotes + "',"; - updateClause = updateClause + " certification = '" + certification + "',"; - updateClause = updateClause + " inv_status = " + invoiceStatus; - sql = sql + updateClause + whereClause; - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void deleteInvoice(String invoiceNum) throws AstuteException { - String result = ""; - try { - System.out.println("Calling delete_invoice DB function"); - CallableStatement stmt = conn.prepareCall("{? = call delete_invoice(?)}"); - stmt.registerOutParameter(1, Types.VARCHAR); - stmt.setString(2, invoiceNum); - stmt.executeUpdate(); - result = stmt.getString(1); - System.out.println(result); - if (!result.equals("SUCCESS")) { - throw new AstuteException(DB_ERROR,result); - } - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } -} - - - public void updateAllRemainingQuantities(String invNo) throws AstuteException { - try { - System.out.println("Calling update_all_remaining_quantities DB procedure"); - CallableStatement stmt = conn.prepareCall("{call update_all_remaining_quantities(?)}"); - stmt.setString(1, invNo); - stmt.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public Double updateRemainingQty(String poNum, String invNo, int lineItemNo) throws AstuteException { - Double remainingQty; - try { - System.out.println("Calling update_remaining_qty DB procedure"); - System.out.println("poNum is " + poNum); - CallableStatement stmt = conn.prepareCall("{? = call update_remaining_qty_fun(?,?,?)}"); - stmt.registerOutParameter(1, Types.VARCHAR); - stmt.setString(2, poNum); - stmt.setString(3, invNo); - stmt.setInt(4, lineItemNo); - stmt.executeUpdate(); - remainingQty = stmt.getDouble(1); - System.out.println("remaining qty is updated to " + remainingQty); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - return remainingQty; - } - public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double qty, double fee, int feeTypeId)throws AstuteException { - try { - String sql = "UPDATE INVOICE_DETAIL "; - String updateClause = " SET "; - String whereClause = ""; - if(invoiceNum == null || invoiceNum.isEmpty() || lineItemNum < 0) { - throw new AstuteException(0, "Invoice Number should not be null and line item number must be greater than 0."); - } else { - whereClause = " WHERE UPPER(inv_num) = '" + invoiceNum.toUpperCase() + "' AND line_item_num = " + lineItemNum; - } - updateClause += " service_type_id = " + serviceTypeId + ","; - updateClause += " description = '" + desc + "',"; - updateClause += " qty = " + qty + ","; - updateClause += " fee = " + fee + ","; - updateClause += " fee_type_id = " + feeTypeId + ","; - if (!updateClause.equalsIgnoreCase(" SET ")) { - sql = sql + trimLastCharacter(updateClause,",") + whereClause; - - } else { - throw new AstuteException(0, "No values to update."); - } - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - updateRemainingQty("",invoiceNum, POLineItemNum); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - public void createInvoiceMaster(String invoiceNum, String invoiceDate, String PONum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus) throws AstuteException, ParseException { - try { - java.util.Date date = null; - java.sql.Date invDate = null; - if (invoiceDate != null) { - date= new SimpleDateFormat("yyyy-MM-dd").parse(invoiceDate); - invDate = new java.sql.Date(date.getTime()); - } - System.out.println("Calling create_invoice Procedure"); - System.out.println("invoiceNum is "+invoiceNum); - CallableStatement stmt = conn.prepareCall("{call create_invoice(?,?,?,?,?,?,?,?)}"); - stmt.setString(1, invoiceNum); - stmt.setDate(2, invDate); - stmt.setString(3, PONum); - stmt.setInt(4, pmtStatus); - stmt.setDouble(5, billAmt); - stmt.setString(6, specialNotes); - stmt.setString(7, certification); - stmt.setInt(8, invoiceStatus); - stmt.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - - public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double qty, double fee, int feeTypeId)throws AstuteException { - try { - System.out.println("Calling create_invoice_detail Procedure"); - System.out.println("invoiceNum is "+invoiceNum); - CallableStatement stmt = conn.prepareCall("{call create_invoice_detail(?,?,?,?,?,?,?,?)}"); - stmt.setString(1, invoiceNum); - stmt.setInt(2, lineItemNum); - stmt.setInt(3, POLineItemNum); - stmt.setInt(4, serviceTypeId); - stmt.setString(5, desc); - stmt.setDouble(6, qty); - stmt.setDouble(7, fee); - stmt.setInt(8, feeTypeId); - stmt.executeUpdate(); - System.out.println("invoiceNum is " + invoiceNum); - System.out.println("POLineItemNum is " + POLineItemNum); - updateRemainingQty(null,invoiceNum, POLineItemNum); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void submitInvoice(String InvoiceNumber) throws AstuteException { - try { - System.out.println("Calling submit_invoice Procedure "); - System.out.println("invoiceNum is "+InvoiceNumber); - CallableStatement stmt = conn.prepareCall("{call submit_invoice(?)}"); - stmt.setString(1, InvoiceNumber); - stmt.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void voidInvoice(String InvoiceNumber) throws AstuteException { - try { - if (InvoiceNumber == null || InvoiceNumber.isEmpty()) { - throw new AstuteException(0, "Invoice Number should not be null!"); - } else { - String sql = "UPDATE INVOICE SET INV_STATUS = 3 WHERE UPPER(INV_NO) = UPPER('" + InvoiceNumber + "') AND PMT_STATUS = 1"; - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - System.out.println("Updating all remaining quantities"); - updateAllRemainingQuantities(InvoiceNumber); - } - } catch(SQLException e){ - e.printStackTrace(); - throw new AstuteException(DB_ERROR, e.getMessage()); - } - } - - public String dupliateInvoice(String InvoiceNumber) throws AstuteException { - try { - String generatedInvoiceNumber; - CallableStatement stmt = conn.prepareCall("{? = call duplicate_invoice(?)}"); - stmt.registerOutParameter(1, Types.VARCHAR); - stmt.setString(2, InvoiceNumber); - stmt.execute(); - generatedInvoiceNumber = stmt.getString(1); - return generatedInvoiceNumber; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getSubmittedInvoiceNumbers() throws AstuteException { - String sql = "select inv_no from invoice where inv_status = 2"; - String invoiceNumber = null; - Invoice invoice = null; - List invoices = new ArrayList(); - try { - Statement stmt = conn.createStatement(); - ResultSet resultSet = stmt.executeQuery(sql); - - while (resultSet.next()) { - invoiceNumber = resultSet.getString(1); - invoice = new Invoice(invoiceNumber,null,null,0,null,null,null,0); - invoices.add(invoice); - } - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - System.out.println("Returning invoices " + invoices.size()); - return invoices; - } - /* -=============================== Customer Methods =============================================== - */ - - public List getCustomers(String customerId) throws AstuteException { - try { - List customers = new ArrayList<>(); - Statement stmt = conn.createStatement(); - String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax FROM customer "; - if (customerId!=null && !customerId.isEmpty()) { - sql += " WHERE customer_id = '" + customerId + "'"; - } - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String customerID = rs.getString(1); - String customerName = rs.getString(2); - String billToDept = rs.getString(3); - String add1 = rs.getString(4); - String add2 = rs.getString(5); - String city = rs.getString(6); - String state = rs.getString(7); - int zip = rs.getInt(8); - int ziplast4 = rs.getInt(9); - String email = rs.getString(10); - String phone = rs.getString(11); - String fax = rs.getString(12); - Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); - customers.add(customer); - } - return customers; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public String getCustomerId(String poNumber) throws AstuteException { - String sql = "select po.customer_id from po " + - "where po.po_num = '" + poNumber + "'"; - String custId = null; - try { - Statement stmt = conn.createStatement(); - ResultSet resultSet = stmt.executeQuery(sql); - - if(resultSet.next()) { - custId = resultSet.getString(1); - } - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - return custId; - } - public Customer getCustomer(String poNumber) throws AstuteException { - String customerId = getCustomerId(poNumber); - List customers = getCustomers(customerId); - return customers.get(0); - } - - - public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) throws AstuteException { - try { - CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}"); - stmt.registerOutParameter(1, Types.INTEGER); - stmt.setString(2, customerId); - stmt.setString(3, customerName); - stmt.setString(4, billToDept); - stmt.setString(5, add1); - stmt.setString(6, add2); - stmt.setString(7, city); - stmt.setString(8, state); - stmt.setInt(9, zip); - stmt.setInt(10, ziplast4); - stmt.setString(11, email); - stmt.setString(12, phone); - stmt.setString(13, fax); - stmt.executeUpdate(); - String customerIdOut = stmt.getString(1); - return customerIdOut; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String - add2, String city, String state, int zip, int ziplast4, String email,String phone, String fax) throws - AstuteException { - try { - String sql = "UPDATE CUSTOMER "; - String updateClause = " SET "; - String whereClause = ""; - if (customerId==null || customerId.isEmpty()) { - throw new AstuteException(0, "CustomerId can't be null."); - } else { - whereClause = " WHERE customer_id ='" + customerId + "'"; - } - - updateClause = updateClause + " customer_name = '" + customerName + "',"; - updateClause = updateClause + " bill_to_dept = '" + billToDept + "',"; - updateClause = updateClause + " add1 = '" + add1 + "',"; - updateClause = updateClause + " add2 = '" + add2 + "',"; - updateClause = updateClause + " city = '" + city + "',"; - updateClause = updateClause + " state = '" + state + "',"; - updateClause = updateClause + " zip = " + zip + ","; - updateClause = updateClause + " zip_last_4 = " + ziplast4 + ","; - updateClause = updateClause + " email = '" + email + "',"; - updateClause = updateClause + " phone = '" + phone + "',"; - updateClause = updateClause + " fax = '" + fax + "',"; - if (!updateClause.equalsIgnoreCase(" SET ")) { - sql = sql + trimLastCharacter(updateClause, ",") + whereClause; - - } else { - System.out.println(updateClause); - throw new AstuteException(0, "No values to update."); - } - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } -/* -=============================== User/Session Methods =============================================== - */ - - // user and session methods - public ResultSet executeQuery(String sessionId, String sql) throws AstuteException { - String username = getSessionUsername(sessionId); - - Statement stmt = null; - try { - stmt = conn.createStatement(); - return stmt.executeQuery("/*user=" + username + "*/ " + sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public User getUser(String username) throws AstuteException { - String sql = "select user_id, username, password, CONCAT(first_name, ' ', last_name) as name from user where username='" + username + "'"; - - try { - Statement stmt = conn.createStatement(); - ResultSet resultSet = stmt.executeQuery(sql); - - User user = null; - if(resultSet.next()) { - user = new User(resultSet.getInt(1), - resultSet.getString(2), - resultSet.getString(3), - resultSet.getString(4),null - ); - } -// conn.close(); - - return user; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void createSession(int userId, String sessionId) throws AstuteException { - try { - String sql = "insert into session (user_id, session_id) values (" + userId + ", '" + sessionId + "')"; - - Statement stmt = conn.createStatement(); - stmt.execute(sql); - - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public void deleteSession(String sessionId) { - } - - public String getSessionUsername(String sessionId) throws AstuteException { - try { - String sql = "select username from users join sessions on users.user_id = sessions.user_id where sessions.session_id = '" + sessionId + "'"; - - Statement stmt = conn.createStatement(); - ResultSet resultSet = stmt.executeQuery(sql); - resultSet.next(); - String sessionUserName = resultSet.getString(1); - - conn.close(); - - return sessionUserName; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - /* - =============================== Change Order =============================================== - */ - - - public List getChangeOrders(String poNum) throws AstuteException { - try { - List changeOrders = new ArrayList(); - Statement stmt = conn.createStatement(); - String sql = "SELECT PO_num, change_order_num, change_order_date, change_order_amt, description FROM change_order; "; - if (poNum != null) { - sql += " WHERE po_num = '" + poNum + "'"; - } - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - String PONum = rs.getString(1); - int changeOrderNum = rs.getInt(2); - Date changeOrderDate = rs.getDate(3); - Double changeOrderAmt = rs.getDouble(4); - String description = rs.getString(5); - ChangeOrder changeOrder = new ChangeOrder(changeOrderNum, PONum, changeOrderDate, changeOrderAmt, description); - changeOrders.add(changeOrder); - } - return changeOrders; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - }; - - public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException { - try { - String sql = "UPDATE CHANGE_ORDER "; - String updateClause = " SET "; - String whereClause = ""; - if (poNum == null || poNum.isEmpty() || changeOrderNum <=0 ) { - throw new AstuteException(DB_ERROR,"PO Number can't be null and Change Order Number should be a positive number! "); - } else { - whereClause = " WHERE UPPER(PO_num) ='" + poNum.toUpperCase() + "' and change_order_num = " + changeOrderNum; - } - - updateClause = updateClause + " changeOrderAmt = " + changeOrderAmt ; - if (changeOrderDate != null) { - updateClause = updateClause + ", changeOrderDate = STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')" + ","; - } - if (description != null) { - updateClause = updateClause + ", description = '" + description + "'"; - } - sql = sql + updateClause + whereClause; - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - - } - - public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException{ - try { - String dateString = "STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')"; - String sql = "insert into change_order (po_num, change_order_num, change_order_amt, change_order_date, description) values ('" + poNum + "', " + changeOrderNum + ", " + changeOrderAmt + ", " + dateString + ", '" + description + "')"; - Statement stmt = conn.createStatement(); - stmt.execute(sql); - return changeOrderNum; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - /* - =============================== Invoice Payment =============================================== - */ - - - public List getInvoicePayments(String invoiceNum) throws AstuteException { - try { - List invoicePayments = new ArrayList(); - Statement stmt = conn.createStatement(); - String sql = "SELECT invoice_payment_id, invoice_payment_type, get_payment_type(invoice_payment_type), invoice_amount, payment_date, inv_no FROM invoice_payment "; - if (invoiceNum != null) { - sql += " WHERE inv_no = '" + invoiceNum + "'"; - } - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int invoicePaymentId = rs.getInt(1); - int invoicePaymentTypeId = rs.getInt(2); - String invoicePaymentType = rs.getString(3); - Double paymentAmount = rs.getDouble(4); - Date paymentDate = rs.getDate(5); - String invNo = rs.getString(6); - InvoicePayment invoicePayment = new InvoicePayment(invNo, invoicePaymentId, invoicePaymentTypeId, invoicePaymentType, paymentDate, paymentAmount); - invoicePayments.add(invoicePayment); - } - return invoicePayments; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - }; - - public void updateInvoicePayment(String invoiceNum, int invoicePaymentId, Double paymentAmount, Date paymentDate) throws AstuteException { - try { - String sql = "UPDATE INVOICE_PAYMENT "; - String updateClause = " SET "; - String whereClause = ""; - if (invoiceNum == null || invoiceNum.isEmpty() || invoicePaymentId <=0 ) { - throw new AstuteException(DB_ERROR,"Invoice Number can't be null and Invoice Payment Id should be a positive number! "); - } - - - updateClause = updateClause + " invoice_amount = " + paymentAmount ; -// if (paymentDate != null) { - updateClause = updateClause + ", payment_date = STR_TO_DATE('" + paymentDate + "', '%Y-%m-%d')"; -// } - whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "' and invoice_payment_id = " + invoicePaymentId; - - sql = sql + updateClause + whereClause; - System.out.println(sql); - Statement stmt = conn.createStatement(); - stmt.executeUpdate(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - - } - - public void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate) throws AstuteException{ - try { - String dateString = "STR_TO_DATE('" + paymentDate + "', '%Y-%m-%d')"; - String sql = "insert into invoice_payment (inv_no, invoice_payment_type, invoice_amount, payment_date) values ('" + invoiceNum + "', " + invoicePaymentTypeId + ", " + paymentAmount + ", " + dateString + ")"; - Statement stmt = conn.createStatement(); - System.out.println(sql); - stmt.execute(sql); - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - } - - public List getPaymentTypes() throws AstuteException { - try { - List paymentTypes = new ArrayList(); - Statement stmt = conn.createStatement(); - String sql = "SELECT payment_type_id, payment_type_name FROM payment_type ORDER BY 1 "; - ResultSet rs = stmt.executeQuery(sql); - while (rs.next()) { - int paymentTypeId = rs.getInt(1); - String paymentTypeName = rs.getString(2); - PaymentType paymentType = new PaymentType(paymentTypeId, paymentTypeName); - paymentTypes.add(paymentType); - } - return paymentTypes; - } catch (SQLException e) { - e.printStackTrace(); - throw new AstuteException(DB_ERROR,e.getMessage()); - } - - }; - /* - =============================== Utility Methods =============================================== - */ - public User login(String username, String password) throws AstuteException{ - User user = getUser(username); - boolean check = false; - if (password.equals(user.getPassword())) { - check = true; - } -// try { -// check = checkPasswordHash(user.getPassword(), password); -// } catch (NoSuchAlgorithmException e) { -// -// } catch (InvalidKeySpecException e) { -// -// } - if(check) { - //create session - String sessionId = UUID.randomUUID().toString().replaceAll("-", ""); - - createSession(user.getUserId(), sessionId); - user.setSessionId(sessionId); - return user; - }else{ - return null; //"Username or password was not correct"; - } - } - - private String generatePasswordHash(String password) throws InvalidKeySpecException, NoSuchAlgorithmException { - int iterations = 100; - char[] chars = password.toCharArray(); - SecureRandom sr = SecureRandom.getInstance("SHA1PRNG"); - byte[] salt = new byte[16]; - sr.nextBytes(salt); - - PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 64 * 8); - SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); - byte[] hash = skf.generateSecret(spec).getEncoded(); - return iterations /*+ PM_FIELD_DELIM*/ + toHex(salt) + /*PM_FIELD_DELIM +*/ toHex(hash); - } - - private boolean checkPasswordHash(String stored, String toCheck) throws NoSuchAlgorithmException, InvalidKeySpecException{ - String part0 = stored.substring(0, 3); - String part1 = stored.substring(3, 35); - String part2 = stored.substring(35); - //String[] parts = stored.split(PM_FIELD_DELIM); - int iterations = Integer.parseInt(part0); - byte[] salt = fromHex(part1); - byte[] hash = fromHex(part2); - - PBEKeySpec spec = new PBEKeySpec(toCheck.toCharArray(), salt, iterations, hash.length * 8); - SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); - byte[] testHash = skf.generateSecret(spec).getEncoded(); - - String x = toHex(testHash); - - int diff = hash.length ^ testHash.length; - for(int i = 0; i < hash.length && i < testHash.length; i++) - { - diff |= hash[i] ^ testHash[i]; - if(hash[i] != testHash[i]){ - int cx = 0; - } - } - return diff == 0; - } - - private static byte[] fromHex(String hex) throws NoSuchAlgorithmException - { - byte[] bytes = new byte[hex.length() / 2]; - for(int i = 0; i 0) - { - return String.format("%0" +paddingLength + "d", 0) + hex; - }else{ - return hex; - } - } - - } +package com.astute.dao; + +import com.astute.exceptions.AstuteException; +import com.astute.model.*; + +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.spec.InvalidKeySpecException; +import java.sql.*; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.text.SimpleDateFormat; + +import static com.astute.exceptions.AstuteException.DB_ERROR; + +public class SqlDAO extends DAO { + + public SqlDAO() throws AstuteException { + } + + @Override + public void connect() throws AstuteException { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + conn = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + schema, username, password); + System.out.println("Connected to MySQL"); + } catch (Exception e) { + throw new AstuteException(e.hashCode(), e.getMessage()); + } + } + + /* + =============================== PO Methods =============================================== + */ + + public List getPOMaster(String PONum, String contractNum, String PODate, String astuteProjectNumber) throws AstuteException { + try { + List pos = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title, get_previously_billed_amt(PO_num), inv_seq FROM PO "; + if (PONum != null && !PONum.isEmpty()) { + sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; + } else if (contractNum != null && !contractNum.isEmpty()) { + sql += "WHERE UPPER(contract_num) = '" + contractNum.toUpperCase()+ "'"; + } else if (PODate != null) { + sql += "WHERE PO_date = STR_TO_DATE('" + PODate + "', '%Y-%m-%d')"; + } else if (astuteProjectNumber!= null && !astuteProjectNumber.isEmpty() ) { + sql += "WHERE UPPER(astute_project_num) = '" + astuteProjectNumber.toUpperCase()+ "'"; + } + + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String poNum = rs.getString(1); + String cntrctNum = rs.getString(2); + Date poDate = rs.getDate(3); + String customerId = rs.getString(4); + Double contractAmt = rs.getDouble(5); + String astuteProjectNum = rs.getString(6); + String title = rs.getString(7); + Double previouslyBilledAmount = rs.getDouble(8); + int invoiceSequence = rs.getInt(8); + String date = null; + if (poDate != null) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + date = formatter.format(poDate); + } + PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence); + pos.add(po); + } + return pos; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getPODetail(String PONum, int lineItemNo) throws AstuteException { + try { + List poDetails = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String whereClause = " WHERE "; + boolean whereClauseCriteria = false; + String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, fee, service_type_id, remaining_qty FROM PO_DETAIL "; + if (PONum != null) { + whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; + whereClauseCriteria = true; + } + if (lineItemNo > 0) { + if (whereClauseCriteria) { + whereClause += " AND "; + } + whereClause = whereClause + " line_item_no = " + lineItemNo; + } + sql += whereClause; + System.out.println(sql); + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String poNum = rs.getString(1); + int lineItemNum = rs.getInt(2); + String serviceDesc = rs.getString(3); + int feeTypeId = rs.getInt(4); + Double qty = rs.getDouble(5); + Double fee = rs.getDouble(6); + int serviceTypeId = rs.getInt(7); + double remainingQty = rs.getDouble(8); + PODetail poDetail = new PODetail(poNum, lineItemNum, serviceDesc, feeTypeId, qty, fee, serviceTypeId, remainingQty); + poDetails.add(poDetail); + } + return poDetails; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException { + try { + System.out.println("PODate in SQLDAO is "+ PODate); + + String sql = "UPDATE PO "; + String updateClause = " SET "; + String whereClause = ""; + if (PONum == null || PONum.isEmpty()) { + throw new AstuteException(0, "PO Number null."); + } else { + whereClause = " WHERE UPPER(PO_num) ='" + PONum.toUpperCase() + "'"; + } + + updateClause = updateClause + " contract_num = '" + contractNum + "',"; + updateClause = updateClause + " PO_Date = STR_TO_DATE('" + PODate + "', '%Y-%m-%d')" + ","; + updateClause = updateClause + " contract_amt = " + contractAmt+ ","; + updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"',"; + updateClause = updateClause + " title = '" + title +"'"; + sql = sql+ updateClause + whereClause; + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public String trimLastCharacter(String sql, String character) { + sql = sql.trim(); + if (sql.endsWith(character)) { + sql = sql.substring(0, sql.length() - 1); + } + return sql; + + } + + public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException { + try { + // remainingQuantity is not used , need to take it out from signature eventually + String sql = "UPDATE PO_DETAIL "; + String updateClause = " SET "; + String whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; + if (POnum == null || POnum.isEmpty() || lineItemNo < 0) { + throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0."); + } else { + whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; + } + if (lineItemNo < 0) { + throw new AstuteException(0, "Line item Number must be greater than 0."); + } + + List lineItem = getPODetail(POnum, lineItemNo); + if (lineItem.size() == 0) { + // new line item + createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId, qty); + } else { + updateClause += " service_desc = '" + serviceDesc + "',"; + updateClause += " fee_type_id = " + feeTypeId + ","; + updateClause += " qty = " + qty + ","; + updateClause += " fee = " + fee + ","; + updateClause += " service_type_id = " + serviceTypeId; + + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause, ",") + whereClause; + + } else { + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + updateRemainingQty(POnum,null, lineItemNo); } + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException, ParseException { + try { + java.util.Date date = null; + java.sql.Date poDate = null; + if (PODate!= null && !PODate.isEmpty()) { + date = new SimpleDateFormat("yyyy-MM-dd").parse(PODate); + poDate = new java.sql.Date(date.getTime()); + } + CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?,?)}"); + stmt.setString(1, PONum); + stmt.setString(2, contractNum); + stmt.setDate(3, poDate); + stmt.setDouble(4, contractAmt); + stmt.setString(5, customerId); + stmt.setString(6, astuteProjectNumber); + stmt.setString(7, title); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException { + try { + // TODO remainingQuantity not used, need to take it out from signature + System.out.println("Calling create_po_detail Procedure"); + System.out.println("POnum is " + POnum); + CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}"); + stmt.setString(1, POnum); + stmt.setInt(2, lineItemNo); + stmt.setString(3, serviceDesc); + stmt.setInt(4, feeTypeId); + stmt.setDouble(5, qty); + stmt.setDouble(6, fee); + stmt.setInt(7, serviceTypeId); + stmt.setDouble(8, qty); + + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getServiceTypes() throws AstuteException { + try { + List serviceTypes = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT SERVICE_TYPE_ID, SERVICE_TYPE.DESC FROM SERVICE_TYPE ORDER BY 1 "; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + int serviceTypeId = rs.getInt(1); + String desc = rs.getString(2); + ServiceType serviceType = new ServiceType(serviceTypeId, desc); + serviceTypes.add(serviceType); + } + return serviceTypes; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + /* + =============================== Invoice Methods =============================================== + */ + + public Double getPreviouslyBilledAmount(String poNum) throws AstuteException { + try { + Double billedAmt = new Double(0); + Statement stmt = conn.createStatement(); + String sql = "SELECT sum(bill_amt) FROM invoice WHERE invoice.PO_num = '" + poNum + "'"; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + billedAmt = rs.getDouble(1); + } + return billedAmt; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public String generateInvoiceNumber(String poNum) throws AstuteException { + try { + String generatedInvoiceNumber; + System.out.println("Calling generate_inv_number DB function"); + System.out.println("poNum is " + poNum); + CallableStatement stmt = conn.prepareCall("{? = call generate_inv_number(?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + + stmt.setString(2, poNum); + stmt.execute(); + generatedInvoiceNumber = stmt.getString(1); + return generatedInvoiceNumber; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getPaymentStatuses() throws AstuteException { + try { + List paymentStatuses = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT payment_status_id, payment_status_desc FROM payment_status ORDER BY 1 "; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + int paymentStatusId = rs.getInt(1); + String desc = rs.getString(2); + PaymentStatus paymentStatus = new PaymentStatus(paymentStatusId, desc); + paymentStatuses.add(paymentStatus); + } + return paymentStatuses; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) throws AstuteException{ + GeneratedInvoice generatedInvoice = null; + Invoice invoice = getInvoiceMaster(invoiceNumber, 0).get(0); + String PONo = invoice.getPoNum(); + List invoiceDetail = getInvoiceDetail(invoiceNumber, 0); + PO po = getPOMaster(PONo, null, null, null).get(0); + String customerId = po.getCustomerId(); + Customer customer = getCustomers(customerId).get(0); + Double previouslyBilledAmt = getPreviouslyBilledAmount(PONo); + Double toBeBilledAmt = po.getContractAmt() - previouslyBilledAmt - invoice.getBillAmt(); + generatedInvoice = new GeneratedInvoice(invoice, invoiceDetail, po, customer, previouslyBilledAmt, toBeBilledAmt ); + return generatedInvoice; + } + + + public List getInvoiceMaster(String invoiceNumber, int pmtStatus)throws AstuteException { + try { + List invoices = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String whereClause = " WHERE "; + boolean whereClauseIndicator = false; + String sql = "SELECT inv_no, inv_date, PO_num, pmt_status, bill_amt, special_notes, certification, inv_status, get_payment_status_name(pmt_status), get_customer_from_po(PO_num) FROM INVOICE "; + if (invoiceNumber != null && !invoiceNumber.isEmpty()) { + whereClause = whereClause + " UPPER(inv_no) = '"+ invoiceNumber.toUpperCase() +"'"; + whereClauseIndicator = true; + } + if (pmtStatus > 0) { + if (whereClauseIndicator) { + whereClause += " AND "; + } + whereClause = whereClause + " pmt_status = "+ pmtStatus; + } + if (!whereClause.equals(" WHERE ")) { + + sql += whereClause; + } + System.out.println(sql); + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String invNo = rs.getString(1); + String invdDate = rs.getString(2); + String PONo = rs.getString(3); + int paymentStatus = rs.getInt(4); + Double billAmt = rs.getDouble(5); + String specialNotes = rs.getString(6); + String certification = rs.getString(7); + int invoiceStatus = rs.getInt(8); + String paymentStatusDesc = rs.getString(9); + String customerId = rs.getString(10); + Invoice invoice = new Invoice(invNo, invdDate, PONo, paymentStatus, billAmt, specialNotes, certification, invoiceStatus, paymentStatusDesc, customerId); + invoices.add(invoice); + } + return invoices; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getInvoiceDetail(String invoiceNum, int lineItemNo)throws AstuteException { + try { + List services = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT inv_num, line_item_num, PO_line_item_num, service_type_id, description, fee_type_id, fee, qty FROM INVOICE_DETAIL "; + + String whereClause = " WHERE "; + boolean whereClauseIndicator = false; + if (invoiceNum != null) { + whereClause = whereClause + " UPPER(inv_num) = '"+ invoiceNum.toUpperCase() +"'"; + whereClauseIndicator = true; + } + if (lineItemNo > 0) { + if (whereClauseIndicator) { + whereClause += " AND "; + } + whereClause = whereClause + " line_item_num = "+ lineItemNo; + } + + sql += whereClause; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String invNo = rs.getString(1); + int lineItemNum = rs.getInt(2); + int POLineItemNum = rs.getInt(3); + int serviceTypeId = rs.getInt(4); + String desc = rs.getString(5); + int feeTypeId = rs.getInt(6); + Double fee = rs.getDouble(7); + Double qty = rs.getDouble(8); + InvoiceDetail service = new InvoiceDetail(invNo, lineItemNum, POLineItemNum, serviceTypeId, desc, qty, fee, feeTypeId); + services.add(service); + } + return services; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void updateInvoiceMaster(String invoiceNum, String invoiceDate, String PONum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus)throws AstuteException { + try { + String sql = "UPDATE INVOICE "; + String updateClause = " SET "; + String whereClause = ""; + if (invoiceNum == null || invoiceNum.isEmpty()) { + throw new AstuteException(0, "Invoice Number can't be null."); + } else { + whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "'"; + } + updateClause = updateClause + " inv_date = STR_TO_DATE('" + invoiceDate + "', '%Y-%m-%d')" + ","; + updateClause = updateClause + " PO_num = '" + PONum + "',"; + updateClause = updateClause + " bill_amt = " + billAmt + ","; + updateClause = updateClause + " special_notes = '" + specialNotes + "',"; + updateClause = updateClause + " certification = '" + certification + "',"; + updateClause = updateClause + " inv_status = " + invoiceStatus; + sql = sql + updateClause + whereClause; + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void deleteInvoice(String invoiceNum) throws AstuteException { + String result = ""; + try { + System.out.println("Calling delete_invoice DB function"); + CallableStatement stmt = conn.prepareCall("{? = call delete_invoice(?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + stmt.setString(2, invoiceNum); + stmt.executeUpdate(); + result = stmt.getString(1); + System.out.println(result); + if (!result.equals("SUCCESS")) { + throw new AstuteException(DB_ERROR,result); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } +} + + + public void updateAllRemainingQuantities(String invNo) throws AstuteException { + try { + System.out.println("Calling update_all_remaining_quantities DB procedure"); + CallableStatement stmt = conn.prepareCall("{call update_all_remaining_quantities(?)}"); + stmt.setString(1, invNo); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public Double updateRemainingQty(String poNum, String invNo, int lineItemNo) throws AstuteException { + Double remainingQty; + try { + System.out.println("Calling update_remaining_qty DB procedure"); + System.out.println("poNum is " + poNum); + CallableStatement stmt = conn.prepareCall("{? = call update_remaining_qty_fun(?,?,?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + stmt.setString(2, poNum); + stmt.setString(3, invNo); + stmt.setInt(4, lineItemNo); + stmt.executeUpdate(); + remainingQty = stmt.getDouble(1); + System.out.println("remaining qty is updated to " + remainingQty); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + return remainingQty; + } + public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double qty, double fee, int feeTypeId)throws AstuteException { + try { + String sql = "UPDATE INVOICE_DETAIL "; + String updateClause = " SET "; + String whereClause = ""; + if(invoiceNum == null || invoiceNum.isEmpty() || lineItemNum < 0) { + throw new AstuteException(0, "Invoice Number should not be null and line item number must be greater than 0."); + } else { + whereClause = " WHERE UPPER(inv_num) = '" + invoiceNum.toUpperCase() + "' AND line_item_num = " + lineItemNum; + } + updateClause += " service_type_id = " + serviceTypeId + ","; + updateClause += " description = '" + desc + "',"; + updateClause += " qty = " + qty + ","; + updateClause += " fee = " + fee + ","; + updateClause += " fee_type_id = " + feeTypeId + ","; + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause,",") + whereClause; + + } else { + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + updateRemainingQty("",invoiceNum, POLineItemNum); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + public void createInvoiceMaster(String invoiceNum, String invoiceDate, String PONum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus) throws AstuteException, ParseException { + try { + java.util.Date date = null; + java.sql.Date invDate = null; + if (invoiceDate != null) { + date= new SimpleDateFormat("yyyy-MM-dd").parse(invoiceDate); + invDate = new java.sql.Date(date.getTime()); + } + System.out.println("Calling create_invoice Procedure"); + System.out.println("invoiceNum is "+invoiceNum); + CallableStatement stmt = conn.prepareCall("{call create_invoice(?,?,?,?,?,?,?,?)}"); + stmt.setString(1, invoiceNum); + stmt.setDate(2, invDate); + stmt.setString(3, PONum); + stmt.setInt(4, pmtStatus); + stmt.setDouble(5, billAmt); + stmt.setString(6, specialNotes); + stmt.setString(7, certification); + stmt.setInt(8, invoiceStatus); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + + public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double qty, double fee, int feeTypeId)throws AstuteException { + try { + System.out.println("Calling create_invoice_detail Procedure"); + System.out.println("invoiceNum is "+invoiceNum); + CallableStatement stmt = conn.prepareCall("{call create_invoice_detail(?,?,?,?,?,?,?,?)}"); + stmt.setString(1, invoiceNum); + stmt.setInt(2, lineItemNum); + stmt.setInt(3, POLineItemNum); + stmt.setInt(4, serviceTypeId); + stmt.setString(5, desc); + stmt.setDouble(6, qty); + stmt.setDouble(7, fee); + stmt.setInt(8, feeTypeId); + stmt.executeUpdate(); + System.out.println("invoiceNum is " + invoiceNum); + System.out.println("POLineItemNum is " + POLineItemNum); + updateRemainingQty(null,invoiceNum, POLineItemNum); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void submitInvoice(String InvoiceNumber) throws AstuteException { + try { + System.out.println("Calling submit_invoice Procedure "); + System.out.println("invoiceNum is "+InvoiceNumber); + CallableStatement stmt = conn.prepareCall("{call submit_invoice(?)}"); + stmt.setString(1, InvoiceNumber); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void voidInvoice(String InvoiceNumber) throws AstuteException { + try { + if (InvoiceNumber == null || InvoiceNumber.isEmpty()) { + throw new AstuteException(0, "Invoice Number should not be null!"); + } else { + String sql = "UPDATE INVOICE SET INV_STATUS = 3 WHERE UPPER(INV_NO) = UPPER('" + InvoiceNumber + "') AND PMT_STATUS = 1"; + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + System.out.println("Updating all remaining quantities"); + updateAllRemainingQuantities(InvoiceNumber); + } + } catch(SQLException e){ + e.printStackTrace(); + throw new AstuteException(DB_ERROR, e.getMessage()); + } + } + + public String dupliateInvoice(String InvoiceNumber) throws AstuteException { + try { + String generatedInvoiceNumber; + CallableStatement stmt = conn.prepareCall("{? = call duplicate_invoice(?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + stmt.setString(2, InvoiceNumber); + stmt.execute(); + generatedInvoiceNumber = stmt.getString(1); + return generatedInvoiceNumber; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getSubmittedInvoiceNumbers() throws AstuteException { + String sql = "select inv_no from invoice where inv_status = 2"; + String invoiceNumber = null; + Invoice invoice = null; + List invoices = new ArrayList(); + try { + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + + while (resultSet.next()) { + invoiceNumber = resultSet.getString(1); + invoice = new Invoice(invoiceNumber,null,null,1,null,null,null,0, "Outstanding",""); + invoices.add(invoice); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + System.out.println("Returning invoices " + invoices.size()); + return invoices; + } + /* +=============================== Customer Methods =============================================== + */ + + public List getCustomers(String customerId) throws AstuteException { + try { + List customers = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax FROM customer "; + if (customerId!=null && !customerId.isEmpty()) { + sql += " WHERE customer_id = '" + customerId + "'"; + } + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String customerID = rs.getString(1); + String customerName = rs.getString(2); + String billToDept = rs.getString(3); + String add1 = rs.getString(4); + String add2 = rs.getString(5); + String city = rs.getString(6); + String state = rs.getString(7); + int zip = rs.getInt(8); + int ziplast4 = rs.getInt(9); + String email = rs.getString(10); + String phone = rs.getString(11); + String fax = rs.getString(12); + Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + customers.add(customer); + } + return customers; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public String getCustomerId(String poNumber) throws AstuteException { + String sql = "select po.customer_id from po " + + "where po.po_num = '" + poNumber + "'"; + String custId = null; + try { + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + + if(resultSet.next()) { + custId = resultSet.getString(1); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + return custId; + } + public Customer getCustomer(String poNumber) throws AstuteException { + String customerId = getCustomerId(poNumber); + List customers = getCustomers(customerId); + return customers.get(0); + } + + + public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) throws AstuteException { + try { + CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}"); + stmt.registerOutParameter(1, Types.INTEGER); + stmt.setString(2, customerId); + stmt.setString(3, customerName); + stmt.setString(4, billToDept); + stmt.setString(5, add1); + stmt.setString(6, add2); + stmt.setString(7, city); + stmt.setString(8, state); + stmt.setInt(9, zip); + stmt.setInt(10, ziplast4); + stmt.setString(11, email); + stmt.setString(12, phone); + stmt.setString(13, fax); + stmt.executeUpdate(); + String customerIdOut = stmt.getString(1); + return customerIdOut; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String + add2, String city, String state, int zip, int ziplast4, String email,String phone, String fax) throws + AstuteException { + try { + String sql = "UPDATE CUSTOMER "; + String updateClause = " SET "; + String whereClause = ""; + if (customerId==null || customerId.isEmpty()) { + throw new AstuteException(0, "CustomerId can't be null."); + } else { + whereClause = " WHERE customer_id ='" + customerId + "'"; + } + + updateClause = updateClause + " customer_name = '" + customerName + "',"; + updateClause = updateClause + " bill_to_dept = '" + billToDept + "',"; + updateClause = updateClause + " add1 = '" + add1 + "',"; + updateClause = updateClause + " add2 = '" + add2 + "',"; + updateClause = updateClause + " city = '" + city + "',"; + updateClause = updateClause + " state = '" + state + "',"; + updateClause = updateClause + " zip = " + zip + ","; + updateClause = updateClause + " zip_last_4 = " + ziplast4 + ","; + updateClause = updateClause + " email = '" + email + "',"; + updateClause = updateClause + " phone = '" + phone + "',"; + updateClause = updateClause + " fax = '" + fax + "',"; + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause, ",") + whereClause; + + } else { + System.out.println(updateClause); + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } +/* +=============================== User/Session Methods =============================================== + */ + + // user and session methods + public ResultSet executeQuery(String sessionId, String sql) throws AstuteException { + String username = getSessionUsername(sessionId); + + Statement stmt = null; + try { + stmt = conn.createStatement(); + return stmt.executeQuery("/*user=" + username + "*/ " + sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public User getUser(String username) throws AstuteException { + String sql = "select user_id, username, password, CONCAT(first_name, ' ', last_name) as name from user where username='" + username + "'"; + + try { + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + + User user = null; + if(resultSet.next()) { + user = new User(resultSet.getInt(1), + resultSet.getString(2), + resultSet.getString(3), + resultSet.getString(4),null + ); + } +// conn.close(); + + return user; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createSession(int userId, String sessionId) throws AstuteException { + try { + String sql = "insert into session (user_id, session_id) values (" + userId + ", '" + sessionId + "')"; + + Statement stmt = conn.createStatement(); + stmt.execute(sql); + + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void deleteSession(String sessionId) { + } + + public String getSessionUsername(String sessionId) throws AstuteException { + try { + String sql = "select username from users join sessions on users.user_id = sessions.user_id where sessions.session_id = '" + sessionId + "'"; + + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + resultSet.next(); + String sessionUserName = resultSet.getString(1); + + conn.close(); + + return sessionUserName; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + /* + =============================== Change Order =============================================== + */ + + + public List getChangeOrders(String poNum) throws AstuteException { + try { + List changeOrders = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT PO_num, change_order_num, change_order_date, change_order_amt, description FROM change_order; "; + if (poNum != null) { + sql += " WHERE po_num = '" + poNum + "'"; + } + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String PONum = rs.getString(1); + int changeOrderNum = rs.getInt(2); + Date changeOrderDate = rs.getDate(3); + Double changeOrderAmt = rs.getDouble(4); + String description = rs.getString(5); + ChangeOrder changeOrder = new ChangeOrder(changeOrderNum, PONum, changeOrderDate, changeOrderAmt, description); + changeOrders.add(changeOrder); + } + return changeOrders; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + }; + + public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException { + try { + String sql = "UPDATE CHANGE_ORDER "; + String updateClause = " SET "; + String whereClause = ""; + if (poNum == null || poNum.isEmpty() || changeOrderNum <=0 ) { + throw new AstuteException(DB_ERROR,"PO Number can't be null and Change Order Number should be a positive number! "); + } else { + whereClause = " WHERE UPPER(PO_num) ='" + poNum.toUpperCase() + "' and change_order_num = " + changeOrderNum; + } + + updateClause = updateClause + " changeOrderAmt = " + changeOrderAmt ; + if (changeOrderDate != null) { + updateClause = updateClause + ", changeOrderDate = STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')" + ","; + } + if (description != null) { + updateClause = updateClause + ", description = '" + description + "'"; + } + sql = sql + updateClause + whereClause; + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + + } + + public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException{ + try { + String dateString = "STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')"; + String sql = "insert into change_order (po_num, change_order_num, change_order_amt, change_order_date, description) values ('" + poNum + "', " + changeOrderNum + ", " + changeOrderAmt + ", " + dateString + ", '" + description + "')"; + Statement stmt = conn.createStatement(); + stmt.execute(sql); + return changeOrderNum; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + /* + =============================== Invoice Payment =============================================== + */ + + + public List getInvoicePayments(String invoiceNum) throws AstuteException { + try { + List invoicePayments = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT invoice_payment_id, invoice_payment_type, get_payment_type(invoice_payment_type), invoice_amount, payment_date, inv_no, check_transaction_no FROM invoice_payment "; + if (invoiceNum != null) { + sql += " WHERE inv_no = '" + invoiceNum + "'"; + } + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + int invoicePaymentId = rs.getInt(1); + int invoicePaymentTypeId = rs.getInt(2); + String invoicePaymentType = rs.getString(3); + Double paymentAmount = rs.getDouble(4); + Date paymentDate = rs.getDate(5); + String invNo = rs.getString(6); + String checkTransactionNo = rs.getString(7); + InvoicePayment invoicePayment = new InvoicePayment(invNo, invoicePaymentId, invoicePaymentTypeId, invoicePaymentType, paymentDate, paymentAmount, checkTransactionNo); + invoicePayments.add(invoicePayment); + } + return invoicePayments; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + }; + + public void updateInvoicePayment(String invoiceNum, int invoicePaymentId, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) throws AstuteException { + try { + String sql = "UPDATE INVOICE_PAYMENT "; + String updateClause = " SET "; + String whereClause = ""; + if (invoiceNum == null || invoiceNum.isEmpty() || invoicePaymentId <=0 ) { + throw new AstuteException(DB_ERROR,"Invoice Number can't be null and Invoice Payment Id should be a positive number! "); + } + + + updateClause = updateClause + " invoice_payment_type = " + invoicePaymentTypeId + ", invoice_amount = " + paymentAmount + ", check_Transaction_No = '" + checkTransactionNo + "'"; +// if (paymentDate != null) { + updateClause = updateClause + ", payment_date = STR_TO_DATE('" + paymentDate + "', '%Y-%m-%d')"; +// } + whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "' and invoice_payment_id = " + invoicePaymentId; + + sql = sql + updateClause + whereClause; + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + + } + + public void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) throws AstuteException{ + try { + 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_transaction_no) values ('" + invoiceNum + "', " + invoicePaymentTypeId + ", " + paymentAmount + ", " + dateString + ", " + checkTransactionNo +")"; + Statement stmt = conn.createStatement(); + System.out.println(sql); + stmt.execute(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getPaymentTypes() throws AstuteException { + try { + List paymentTypes = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT payment_type_id, payment_type_name FROM payment_type ORDER BY 1 "; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + int paymentTypeId = rs.getInt(1); + String paymentTypeName = rs.getString(2); + PaymentType paymentType = new PaymentType(paymentTypeId, paymentTypeName); + paymentTypes.add(paymentType); + } + return paymentTypes; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + + }; + /* + =============================== Utility Methods =============================================== + */ + public User login(String username, String password) throws AstuteException{ + User user = getUser(username); + boolean check = false; + if (password.equals(user.getPassword())) { + check = true; + } +// try { +// check = checkPasswordHash(user.getPassword(), password); +// } catch (NoSuchAlgorithmException e) { +// +// } catch (InvalidKeySpecException e) { +// +// } + if(check) { + //create session + String sessionId = UUID.randomUUID().toString().replaceAll("-", ""); + + createSession(user.getUserId(), sessionId); + user.setSessionId(sessionId); + return user; + }else{ + return null; //"Username or password was not correct"; + } + } + + private String generatePasswordHash(String password) throws InvalidKeySpecException, NoSuchAlgorithmException { + int iterations = 100; + char[] chars = password.toCharArray(); + SecureRandom sr = SecureRandom.getInstance("SHA1PRNG"); + byte[] salt = new byte[16]; + sr.nextBytes(salt); + + PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 64 * 8); + SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); + byte[] hash = skf.generateSecret(spec).getEncoded(); + return iterations /*+ PM_FIELD_DELIM*/ + toHex(salt) + /*PM_FIELD_DELIM +*/ toHex(hash); + } + + private boolean checkPasswordHash(String stored, String toCheck) throws NoSuchAlgorithmException, InvalidKeySpecException{ + String part0 = stored.substring(0, 3); + String part1 = stored.substring(3, 35); + String part2 = stored.substring(35); + //String[] parts = stored.split(PM_FIELD_DELIM); + int iterations = Integer.parseInt(part0); + byte[] salt = fromHex(part1); + byte[] hash = fromHex(part2); + + PBEKeySpec spec = new PBEKeySpec(toCheck.toCharArray(), salt, iterations, hash.length * 8); + SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); + byte[] testHash = skf.generateSecret(spec).getEncoded(); + + String x = toHex(testHash); + + int diff = hash.length ^ testHash.length; + for(int i = 0; i < hash.length && i < testHash.length; i++) + { + diff |= hash[i] ^ testHash[i]; + if(hash[i] != testHash[i]){ + int cx = 0; + } + } + return diff == 0; + } + + private static byte[] fromHex(String hex) throws NoSuchAlgorithmException + { + byte[] bytes = new byte[hex.length() / 2]; + for(int i = 0; i 0) + { + return String.format("%0" +paddingLength + "d", 0) + hex; + }else{ + return hex; + } + } + + } diff --git a/AstuteSystem/src/main/java/com/astute/model/Invoice.java b/AstuteSystem/src/main/java/com/astute/model/Invoice.java index de32895..f0829e3 100644 --- a/AstuteSystem/src/main/java/com/astute/model/Invoice.java +++ b/AstuteSystem/src/main/java/com/astute/model/Invoice.java @@ -1,99 +1,117 @@ -package com.astute.model; - -import java.util.Date; - -public class Invoice { - String invoiceNumber; - String invoiceDate; - String poNum; - String changeOrderNum; - int pmtStatus; - Double billAmt; - String specialNotes; - String certification; - int invoiceStatus; - - public Invoice(String invoiceNumber, String invoiceDate, String poNum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus) { - this.invoiceNumber = invoiceNumber; - this.invoiceDate = invoiceDate; - this.poNum = poNum; - this.pmtStatus = pmtStatus; - this.billAmt = billAmt; - this.specialNotes = specialNotes; - this.certification = certification; - this.invoiceStatus = invoiceStatus; - } - - public String getInvoiceNumber() { - - return invoiceNumber; - } - - public void setInvoiceNumber(String invoiceNumber) { - this.invoiceNumber = invoiceNumber; - } - - public String getInvoiceDate() { - return invoiceDate; - } - - public void setInvoiceDate(String invoiceDate) { - this.invoiceDate = invoiceDate; - } - - public String getPoNum() { - return poNum; - } - - public void setPoNum(String poNum) { - this.poNum = poNum; - } - - public String getChangeOrderNum() { - return changeOrderNum; - } - - public void setChangeOrderNum(String changeOrderNum) { - this.changeOrderNum = changeOrderNum; - } - - public int getPmtStatus() { - return pmtStatus; - } - - public void setPmtStatus(int pmtStatus) { - this.pmtStatus = pmtStatus; - } - - public Double getBillAmt() { - return billAmt; - } - - public void setBillAmt(Double billAmt) { - this.billAmt = billAmt; - } - - public String getSpecialNotes() { - return specialNotes; - } - - public void setSpecialNotes(String specialNotes) { - this.specialNotes = specialNotes; - } - - public String getCertification() { - return certification; - } - - public void setCertification(String certification) { - this.certification = certification; - } - - public int getInvoiceStatus() { - return invoiceStatus; - } - - public void setInvoiceStatus(int invoiceStatus) { - this.invoiceStatus = invoiceStatus; - } -} +package com.astute.model; + +public class Invoice { + String invoiceNumber; + String invoiceDate; + String poNum; + String changeOrderNum; + String pmtStatusDesc; + int pmtStatus; + Double billAmt; + String specialNotes; + String certification; + int invoiceStatus; + String customerId; + + public Invoice(String invoiceNumber, String invoiceDate, String poNum, int pmtStatus, Double billAmt, String specialNotes, String certification, int invoiceStatus, String pmtStatusDesc, String customerId) { + this.invoiceNumber = invoiceNumber; + this.invoiceDate = invoiceDate; + this.poNum = poNum; + this.pmtStatus = pmtStatus; + this.billAmt = billAmt; + this.specialNotes = specialNotes; + this.certification = certification; + this.invoiceStatus = invoiceStatus; + this.pmtStatusDesc = pmtStatusDesc; + this.customerId = customerId; + } + + public String getInvoiceNumber() { + + return invoiceNumber; + } + + public void setInvoiceNumber(String invoiceNumber) { + this.invoiceNumber = invoiceNumber; + } + + public String getInvoiceDate() { + return invoiceDate; + } + + public void setInvoiceDate(String invoiceDate) { + this.invoiceDate = invoiceDate; + } + + public String getPoNum() { + return poNum; + } + + public void setPoNum(String poNum) { + this.poNum = poNum; + } + + public String getChangeOrderNum() { + return changeOrderNum; + } + + public void setChangeOrderNum(String changeOrderNum) { + this.changeOrderNum = changeOrderNum; + } + + public String getPmtStatusDesc() { + return pmtStatusDesc; + } + + public void setPmtStatusDesc(String pmtStatusDesc) { + this.pmtStatusDesc = pmtStatusDesc; + } + + public int getPmtStatus() { + return pmtStatus; + } + + public void setPmtStatus(int pmtStatus) { + this.pmtStatus = pmtStatus; + } + + public Double getBillAmt() { + return billAmt; + } + + public void setBillAmt(Double billAmt) { + this.billAmt = billAmt; + } + + public String getSpecialNotes() { + return specialNotes; + } + + public void setSpecialNotes(String specialNotes) { + this.specialNotes = specialNotes; + } + + public String getCertification() { + return certification; + } + + public void setCertification(String certification) { + this.certification = certification; + } + + public int getInvoiceStatus() { + return invoiceStatus; + } + + public void setInvoiceStatus(int invoiceStatus) { + this.invoiceStatus = invoiceStatus; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/model/InvoicePayment.java b/AstuteSystem/src/main/java/com/astute/model/InvoicePayment.java index 946c162..a8f70cd 100644 --- a/AstuteSystem/src/main/java/com/astute/model/InvoicePayment.java +++ b/AstuteSystem/src/main/java/com/astute/model/InvoicePayment.java @@ -1,69 +1,78 @@ -package com.astute.model; - -import java.sql.Date; - -public class InvoicePayment { - String invoiceNum; - int invoicePaymentId; - int paymentTypeId; - String paymentType; - Date paymentDate; - Double invoiceAmount; - - public InvoicePayment(String invoiceNum, int invoicePaymentId, int paymentTypeId, String paymentType, Date paymentDate, Double invoiceAmount) { - this.invoiceNum = invoiceNum; - this.invoicePaymentId = invoicePaymentId; - this.paymentTypeId = paymentTypeId; - this.paymentType = paymentType; - this.paymentDate = paymentDate; - this.invoiceAmount = invoiceAmount; - } - - public String getInvoiceNum() { - return invoiceNum; - } - - public void setInvoiceNum(String invoiceNum) { - this.invoiceNum = invoiceNum; - } - - public int getInvoicePaymentId() { - return invoicePaymentId; - } - - public void setInvoicePaymentId(int invoicePaymentId) { - this.invoicePaymentId = invoicePaymentId; - } - - public int getPaymentTypeId() { - return paymentTypeId; - } - - public void setPaymentTypeId(int paymentTypeId) { - this.paymentTypeId = paymentTypeId; - } - - public String getPaymentType() { - return paymentType; - } - - public void setPaymentType(String paymentType) { - this.paymentType = paymentType; - } - - public Date getPaymentDate() { - return paymentDate; - } - - public void setPaymentDate(Date paymentDate) { - this.paymentDate = paymentDate; - } - - public Double getInvoiceAmount() { - return invoiceAmount; - } - - public void setInvoiceAmount(Double invoiceAmount) { - this.invoiceAmount = invoiceAmount; - } -} +package com.astute.model; + +import java.sql.Date; + +public class InvoicePayment { + String invoiceNum; + int invoicePaymentId; + int paymentTypeId; + String paymentType; + Date paymentDate; + Double invoiceAmount; + String checkTransactionNo; + public InvoicePayment(String invoiceNum, int invoicePaymentId, int paymentTypeId, String paymentType, Date paymentDate, Double invoiceAmount, String checkTransactionNo) { + this.invoiceNum = invoiceNum; + this.invoicePaymentId = invoicePaymentId; + this.paymentTypeId = paymentTypeId; + this.paymentType = paymentType; + this.paymentDate = paymentDate; + this.invoiceAmount = invoiceAmount; + this.checkTransactionNo = checkTransactionNo; + } + + public String getInvoiceNum() { + return invoiceNum; + } + + public void setInvoiceNum(String invoiceNum) { + this.invoiceNum = invoiceNum; + } + + public int getInvoicePaymentId() { + return invoicePaymentId; + } + + public void setInvoicePaymentId(int invoicePaymentId) { + this.invoicePaymentId = invoicePaymentId; + } + + public int getPaymentTypeId() { + return paymentTypeId; + } + + public void setPaymentTypeId(int paymentTypeId) { + this.paymentTypeId = paymentTypeId; + } + + public String getPaymentType() { + return paymentType; + } + + public void setPaymentType(String paymentType) { + this.paymentType = paymentType; + } + + public Date getPaymentDate() { + return paymentDate; + } + + public void setPaymentDate(Date paymentDate) { + this.paymentDate = paymentDate; + } + + public Double getInvoiceAmount() { + return invoiceAmount; + } + + public void setInvoiceAmount(Double invoiceAmount) { + this.invoiceAmount = invoiceAmount; + } + + public String getCheckTransactionNo() { + return checkTransactionNo; + } + + public void setCheckTransactionNo(String checkTransactionNo) { + this.checkTransactionNo = checkTransactionNo; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/InvoicePaymentRequest.java b/AstuteSystem/src/main/java/com/astute/requests/InvoicePaymentRequest.java index e011eec..ad1c192 100644 --- a/AstuteSystem/src/main/java/com/astute/requests/InvoicePaymentRequest.java +++ b/AstuteSystem/src/main/java/com/astute/requests/InvoicePaymentRequest.java @@ -1,72 +1,82 @@ -package com.astute.requests; - - -public class InvoicePaymentRequest { - String invoiceNum; - int invoicePaymentId; - int paymentTypeId; - String paymentType; - String paymentDate; - Double invoiceAmount; - - public InvoicePaymentRequest(String invoiceNum, int invoicePaymentId, int paymentTypeId, String paymentType, String paymentDate, Double invoiceAmount) { - this.invoiceNum = invoiceNum; - this.invoicePaymentId = invoicePaymentId; - this.paymentTypeId = paymentTypeId; - this.paymentType = paymentType; - this.paymentDate = paymentDate; - this.invoiceAmount = invoiceAmount; - } - - public InvoicePaymentRequest() { - - } - - public String getInvoiceNum() { - return invoiceNum; - } - - public void setInvoiceNum(String invoiceNum) { - this.invoiceNum = invoiceNum; - } - - public int getInvoicePaymentId() { - return invoicePaymentId; - } - - public void setInvoicePaymentId(int invoicePaymentId) { - this.invoicePaymentId = invoicePaymentId; - } - - public int getPaymentTypeId() { - return paymentTypeId; - } - - public void setPaymentTypeId(int paymentTypeId) { - this.paymentTypeId = paymentTypeId; - } - - public String getPaymentType() { - return paymentType; - } - - public void setPaymentType(String paymentType) { - this.paymentType = paymentType; - } - - public String getPaymentDate() { - return paymentDate; - } - - public void setPaymentDate(String paymentDate) { - this.paymentDate = paymentDate; - } - - public Double getInvoiceAmount() { - return invoiceAmount; - } - - public void setInvoiceAmount(Double invoiceAmount) { - this.invoiceAmount = invoiceAmount; - } -} +package com.astute.requests; + + +public class InvoicePaymentRequest { + String invoiceNum; + int invoicePaymentId; + int paymentTypeId; + String paymentType; + String paymentDate; + Double invoiceAmount; + String checkTransactionNo; + + public InvoicePaymentRequest(String invoiceNum, int invoicePaymentId, int paymentTypeId, String paymentType, String paymentDate, Double invoiceAmount, String checkTransactionNo) { + this.invoiceNum = invoiceNum; + this.invoicePaymentId = invoicePaymentId; + this.paymentTypeId = paymentTypeId; + this.paymentType = paymentType; + this.paymentDate = paymentDate; + this.invoiceAmount = invoiceAmount; + this.checkTransactionNo = checkTransactionNo; + } + + public InvoicePaymentRequest() { + + } + + public String getInvoiceNum() { + return invoiceNum; + } + + public void setInvoiceNum(String invoiceNum) { + this.invoiceNum = invoiceNum; + } + + public int getInvoicePaymentId() { + return invoicePaymentId; + } + + public void setInvoicePaymentId(int invoicePaymentId) { + this.invoicePaymentId = invoicePaymentId; + } + + public int getPaymentTypeId() { + return paymentTypeId; + } + + public void setPaymentTypeId(int paymentTypeId) { + this.paymentTypeId = paymentTypeId; + } + + public String getPaymentType() { + return paymentType; + } + + public void setPaymentType(String paymentType) { + this.paymentType = paymentType; + } + + public String getPaymentDate() { + return paymentDate; + } + + public void setPaymentDate(String paymentDate) { + this.paymentDate = paymentDate; + } + + public Double getInvoiceAmount() { + return invoiceAmount; + } + + public void setInvoiceAmount(Double invoiceAmount) { + this.invoiceAmount = invoiceAmount; + } + + public String getCheckTransactionNo() { + return checkTransactionNo; + } + + public void setCheckTransactionNo(String checkTransactionNo) { + this.checkTransactionNo = checkTransactionNo; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/InvoicePaymentResource.java b/AstuteSystem/src/main/java/com/astute/resources/InvoicePaymentResource.java index 8414f31..fb85016 100644 --- a/AstuteSystem/src/main/java/com/astute/resources/InvoicePaymentResource.java +++ b/AstuteSystem/src/main/java/com/astute/resources/InvoicePaymentResource.java @@ -1,59 +1,59 @@ -package com.astute.resources; - -import com.astute.exceptions.AstuteException; -import com.astute.requests.InvoicePaymentRequest; -import com.astute.response.ApiResponse; -import com.astute.service.InvoicePaymentService; - -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.sql.Date; -import java.text.ParseException; -import java.text.SimpleDateFormat; - -@Path("/invoicePayment") -@Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) -public class InvoicePaymentResource { - - private com.astute.service.InvoicePaymentService service = new InvoicePaymentService(); - - public InvoicePaymentResource() { - } - - @GET - public Response getInvoicePayments(@QueryParam("invoiceNum") String invoiceNum) - throws AstuteException { - return new ApiResponse(service.getInvoicePayments(invoiceNum)).toResponse(); - } - - @Path("/{invoiceNum}/{invoicePaymentId}") - @PUT - public Response updateInvoicePayment(InvoicePaymentRequest request, @PathParam("invoiceNum") String invoiceNum, @PathParam("invoicePaymentId") int invoicePaymentId) - throws AstuteException, ParseException { - - String dateStr = request.getPaymentDate(); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new java.sql.Date(df.parse(dateStr).getTime()); - service.updateInvoicePayment(invoiceNum,invoicePaymentId, request.getInvoiceAmount(), date); - return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); - } - - @POST - public Response createInvoicePayment(InvoicePaymentRequest request) - throws AstuteException, ParseException { - String dateStr = request.getPaymentDate(); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new java.sql.Date(df.parse(dateStr).getTime()); - service.createInvoicePayment(request.getInvoiceNum(), request.getPaymentTypeId(), request.getInvoiceAmount(),date); - return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); - } - - @GET - @Path("/paymentTypes") - public Response getInvoicePaymentTypes() throws AstuteException { - return new ApiResponse(service.getPaymentTypes()).toResponse(); - } - -} +package com.astute.resources; + +import com.astute.exceptions.AstuteException; +import com.astute.requests.InvoicePaymentRequest; +import com.astute.response.ApiResponse; +import com.astute.service.InvoicePaymentService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.Date; +import java.text.ParseException; +import java.text.SimpleDateFormat; + +@Path("/invoicePayment") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class InvoicePaymentResource { + + private com.astute.service.InvoicePaymentService service = new InvoicePaymentService(); + + public InvoicePaymentResource() { + } + + @GET + public Response getInvoicePayments(@QueryParam("invoiceNum") String invoiceNum) + throws AstuteException { + return new ApiResponse(service.getInvoicePayments(invoiceNum)).toResponse(); + } + + @Path("/{invoiceNum}/{invoicePaymentId}") + @PUT + public Response updateInvoicePayment(InvoicePaymentRequest request, @PathParam("invoiceNum") String invoiceNum, @PathParam("invoicePaymentId") int invoicePaymentId, @PathParam("checkTransactionNo")String checkTransactionNo) + throws AstuteException, ParseException { + + String dateStr = request.getPaymentDate(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new java.sql.Date(df.parse(dateStr).getTime()); + service.updateInvoicePayment(invoiceNum,invoicePaymentId, request.getPaymentTypeId(), request.getInvoiceAmount(), date, request.getCheckTransactionNo()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @POST + public Response createInvoicePayment(InvoicePaymentRequest request) + throws AstuteException, ParseException { + String dateStr = request.getPaymentDate(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new java.sql.Date(df.parse(dateStr).getTime()); + service.createInvoicePayment(request.getInvoiceNum(), request.getPaymentTypeId(), request.getInvoiceAmount(),date,request.getCheckTransactionNo()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @GET + @Path("/paymentTypes") + public Response getInvoicePaymentTypes() throws AstuteException { + return new ApiResponse(service.getPaymentTypes()).toResponse(); + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/InvoicePaymentService.java b/AstuteSystem/src/main/java/com/astute/service/InvoicePaymentService.java index cbe0dbe..f498ae9 100644 --- a/AstuteSystem/src/main/java/com/astute/service/InvoicePaymentService.java +++ b/AstuteSystem/src/main/java/com/astute/service/InvoicePaymentService.java @@ -1,36 +1,36 @@ -package com.astute.service; - -import com.astute.exceptions.AstuteException; -import com.astute.model.InvoicePayment; -import com.astute.model.PaymentType; - -import java.sql.Date; -import java.util.List; - -import static com.astute.dao.DAO.getDao; - -public class InvoicePaymentService extends Service{ - public InvoicePaymentService(){ - super(); - } - - public List getInvoicePayments(String invoiceNum) - throws AstuteException { - return getDao().getInvoicePayments(invoiceNum); - } - - public void updateInvoicePayment(String invoiceNum, int invoicePaymentId, Double paymentAmount, Date paymentDate) - throws AstuteException { - getDao().updateInvoicePayment(invoiceNum, invoicePaymentId, paymentAmount, paymentDate); - } - - - public void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate) - throws AstuteException { - getDao().createInvoicePayment(invoiceNum, invoicePaymentTypeId, paymentAmount, paymentDate); - } - - public List getPaymentTypes() throws AstuteException { - return getDao().getPaymentTypes(); - } -} +package com.astute.service; + +import com.astute.exceptions.AstuteException; +import com.astute.model.InvoicePayment; +import com.astute.model.PaymentType; + +import java.sql.Date; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class InvoicePaymentService extends Service{ + public InvoicePaymentService(){ + super(); + } + + public List getInvoicePayments(String invoiceNum) + throws AstuteException { + return getDao().getInvoicePayments(invoiceNum); + } + + public void updateInvoicePayment(String invoiceNum, int invoicePaymentId, int InvoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) + throws AstuteException { + getDao().updateInvoicePayment(invoiceNum, invoicePaymentId, InvoicePaymentTypeId, paymentAmount, paymentDate, checkTransactionNo); + } + + + public void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate, String checkTransactionNo) + throws AstuteException { + getDao().createInvoicePayment(invoiceNum, invoicePaymentTypeId, paymentAmount, paymentDate, checkTransactionNo); + } + + public List getPaymentTypes() throws AstuteException { + return getDao().getPaymentTypes(); + } +}