rushilwiz/astute
1
0
Fork 0
mirror of https://github.com/dyiop/astute.git synced 2025-04-05 21:10:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed defects.

Browse Source
This commit is contained in:
gopi17701 2019-05-05 21:39:15 -04:00
parent 6fb3faeade
commit 4427570291
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
AstuteClient2/src/app/invoice/invoice.component.html
View File

@ -199,23 +199,23 @@
(change)="onSelectedCellChange(i, 'qty', qty.value); updateSelectedBillAmt()" #qty [disabled]="chosenInv.invoiceStatus !== 1"> (change)="onSelectedCellChange(i, 'qty', qty.value); updateSelectedBillAmt()" #qty [disabled]="chosenInv.invoiceStatus !== 1">
</td> </td>
</tr> </tr>
<!--<tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1">--> <tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1">
<!--<th class="align-content-center">--> <th class="align-content-center">
<!--<p>{{getPerc(qty.value, inDet.remainingQty)}}%</p>--> <p>{{getPerc(qty.value, inDet.remainingQty)}}%</p>
<!--</th>--> </th>
<!--<td colspan="4">--> <td colspan="4">
<!--<div class="progress" style="height: 25px;">--> <div class="progress" style="height: 25px;">
<!--<div class="progress-bar bg-success" role="progressbar"--> <div class="progress-bar bg-success" role="progressbar"
<!--[ngStyle]="{'width': getPerc(qty.value, inDet.remainingQty) + '%'}">--> [ngStyle]="{'width': getPerc(qty.value, inDet.remainingQty) + '%'}">
<!--{{qty.value}}--> {{qty.value}}
<!--</div>--> </div>
<!--<div class="progress-bar bg-danger" role="progressbar"--> <div class="progress-bar bg-danger" role="progressbar"
<!--[ngStyle]="{'width': (100 - getPerc(qty.value, inDet.remainingQty)) + '%'}">--> [ngStyle]="{'width': (100 - getPerc(qty.value, inDet.remainingQty)) + '%'}">
<!--{{inDet.remainingQty - (qty.value)}}--> {{inDet.remainingQty - (qty.value)}}
<!--</div>--> </div>
<!--</div>--> </div>
<!--</td>--> </td>
<!--</tr>--> </tr>
<!--<tr class="p-0 m-0">--> <!--<tr class="p-0 m-0">-->
<!--&lt;!&ndash;INV Detail Items: invoiceNum, lineItemNum, poLineItemNum, serviceTypeId, desc, qty, fee&ndash;&gt;--> <!--&lt;!&ndash;INV Detail Items: invoiceNum, lineItemNum, poLineItemNum, serviceTypeId, desc, qty, fee&ndash;&gt;-->
<!--<td class="p-0 m-0"><input type="text" class="form-control cell" [value]="inDet.lineItemNum" disabled>--> <!--<td class="p-0 m-0"><input type="text" class="form-control cell" [value]="inDet.lineItemNum" disabled>-->

2
AstuteClient2/src/app/invoice/invoice.component.ts
View File

@ -497,7 +497,7 @@ export class InvoiceComponent implements OnInit {
setCorrespondingPos() { setCorrespondingPos() {
this.correspondingPos = this.pos.filter((po, index, array) => { this.correspondingPos = this.pos.filter((po, index, array) => {
return po.customerId === this.chosenCustomerID && !po.oneInvInDraft; return po.customerId === this.chosenCustomerID && !po.oneInvInDraft && po.final;
}); });
} }

4
AstuteClient2/src/app/sales-order/sales-order.component.html
View File

@ -23,10 +23,10 @@
<button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit</button> <button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit</button>
</div> </div>
<div class="col-3"> <div class="col-3">
<button class="btn btn-primary" style="width: 100%" (click)="finalizePO(selected.ponum)" [disabled]="selected.final === 1">Finalize</button> <button class="btn btn-primary" style="width: 100%" (click)="finalizePO(selected.ponum)" [disabled]="!selected?true:selected.final === 1">Finalize</button>
</div> </div>
<div class="col-3"> <div class="col-3">
<button class="btn btn-danger" style="width: 100%" (click)="deletePO(selected.ponum)" [disabled]="selected.final === 0">Delete</button> <button class="btn btn-danger" style="width: 100%" (click)="deletePO(selected.ponum)" [disabled]="!selected?true:selected.final === 0">Delete</button>
</div> </div>
</div> </div>
</div> </div>

3
AstuteSystem/src/main/java/com/astute/service/CustomerService.java
View File

@ -13,8 +13,9 @@ public class CustomerService extends Service{
super(); super();
} }
public List<Customer> getCustomers(String customerId) public List<Customer> getCustomers(String sessionId, String customerId)
throws AstuteException { throws AstuteException {
return getDao().getCustomers(customerId); return getDao().getCustomers(customerId);
} }