+
-
+
| Order Total: |
@@ -22,17 +16,13 @@
>{{(total/price) | number: '1.0-6'}}
|
-
+
 1.0 ≅ {{ price | currency: getCurrency()}}
-
|
{{total | currency: getCurrency()}}
@@ -41,69 +31,97 @@
|
-
-
+
+
- | Item
+ |
- Qty.
+ |
-
+ |
-
-
-
- |
+ |
+ | {{item.name}}
+ width="50%">{{item.name}}
|
- {{item.qty}}
+ width="15%">{{item.qty}}
|
- {{item.qty * item.cost | number:'1.02' | currency: getCurrency() }}
|
+
+
+
+
+
+ |
+
+
+
+
|
-
+
|
-
+
|
-
+ |
+
+
+
|
+
+
> line_id: " + nl.line_id +
+// " name: " + nl.name +
+// " qty: " + nl.qty +
+// " cost: " + nl.cost + " <<"
+// )
+ this.oLines.push(nl);
+ // this.oLines[i].cost = this.myLines[i].cost;
+ }
+// ------------------------------------------------
});
this.totalUpdate = orderService.totalUpdate;
this.totalUpdate.subscribe((total) => {
this.total = total;
});
+
}
ngOnInit() {
@@ -82,6 +124,7 @@ export class OrderComponent implements OnInit{
console.log('Returning to page');
}
this.orderService.getOrder();
+ this.oLines = [];
});
}
@@ -113,6 +156,7 @@ export class OrderComponent implements OnInit{
dialogRef2.afterClosed().subscribe( val => {
if (val) {
console.log('Receipt closed.');
+ this.oLines = [];
}
});
} else {
@@ -136,6 +180,7 @@ export class OrderComponent implements OnInit{
dialogRef.afterClosed().subscribe((val) => {
if (val) {
this.orderService.closeOrder(false);
+ this.oLines = [];
} else {
console.log('Returning to order');
}
@@ -145,4 +190,44 @@ export class OrderComponent implements OnInit{
getCurrency(){
return this.order.currency.toUpperCase();
}
+
+
+ fillLineData(i: number,
+ iname: string,
+ iqty: number,
+ icost: number) : newLineItem {
+
+ const a = { line_id: i,
+ name: iname,
+ qty: iqty,
+ cost: icost } as newLineItem;
+ return a;
+ }
+
+ trashCanClicked(item : newLineItem, lines: newLineItem[]) {
+
+ const dialogConfig = new MatDialogConfig();
+
+ dialogConfig.disableClose = true;
+ dialogConfig.autoFocus = true;
+ dialogConfig.data = {title: 'Remove Item?',
+ msg: 'Are you sure you want to remove <<' +
+ item.name + ' x ' + item.qty +
+ '>> from this order?'};
+ const dialogRef = this.dialog.open(CancelComponent, dialogConfig);
+ dialogRef.afterClosed().subscribe((val) => {
+ if (val) {
+// console.log('Deleting item at line: '
+// + (item.line_id +1)
+// + " => (" + item.name +")");
+ this.orderService.updateOrder(item.line_id,lines);
+ this.orderService.getOrder();
+
+ } else {
+ console.log('Returning to order');
+ }
+ });
+
+
+ }
}
diff --git a/src/app/order/order.service.ts b/src/app/order/order.service.ts
index fe3e567..e620219 100644
--- a/src/app/order/order.service.ts
+++ b/src/app/order/order.service.ts
@@ -6,7 +6,8 @@ import { UserService } from '../user.service';
import { FullnodeService } from '../fullnode.service';
import { User } from '../user.model';
import { Owner } from '../owner.model';
-import { LineItem} from '../items/lineitem.model';
+import { LineItem } from '../items/lineitem.model';
+import { newLineItem } from '../items/newlineitem.model';
import { ConfigData } from '../configdata';
@@ -235,4 +236,34 @@ export class OrderService {
return obs;
}
+ updateOrder(itemid: number, iLines : newLineItem[]) {
+ if(this.dataStore.order._id != null) {
+
+ var item = {} as LineItem;
+ this.dataStore.order.lines = [];
+ for ( let i = 0; i < iLines.length; i++)
+ {
+ if ( i !== itemid )
+ {
+ item = this.fillItemData(iLines[i].name, iLines[i].qty, iLines[i].cost);
+// console.log("Push => ", item);
+ this.dataStore.order.lines.push(item);
+ }
+ }
+ let obs = this.http.post(this.beUrl+'api/order', { payload: this.dataStore.order }, { headers: this.reqHeaders });
+ obs.subscribe((orderData) => {
+ this.getOrder();
+ });
+ }
+ }
+
+ fillItemData(iname:string, iqty: number, icost: number) : LineItem {
+
+ const a = { name: iname,
+ qty: iqty,
+ cost: icost } as LineItem;
+ return a;
+ }
+
+
}