Receive payment working.

TODO: Nested subscribe in Receive Payment in sales-home-component.ts should be refactored into something more readable.
This commit is contained in:
Amritanshu
2019-08-09 14:55:38 +05:30
parent 6503982897
commit ff8f4ffb16
16 changed files with 315 additions and 64 deletions

View File

@ -0,0 +1,16 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable, of as observableOf } from 'rxjs';
export class ReceivePaymentDatasource extends DataSource<{name: string, discount: number}> {
constructor(private data: {name: string, discount: number}[]) {
super();
}
connect(): Observable<{name: string, discount: number}[]> {
return observableOf(this.data);
}
disconnect() {
}
}

View File

@ -0,0 +1,7 @@
.right {
display: flex;
justify-content: flex-end;
}
.bold {
font-weight: bold;
}

View File

@ -0,0 +1,33 @@
<h2 mat-dialog-title>Receive Payment</h2>
<mat-dialog-content>
<form [formGroup]="form" fxLayout="column">
<mat-table #table [dataSource]="dataSource" formArrayName="amounts">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef class="bold">Amount</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
<mat-footer-cell *matFooterCellDef class="bold">Balance</mat-footer-cell>
</ng-container>
<!-- Discount Column -->
<ng-container matColumnDef="amount">
<mat-header-cell *matHeaderCellDef class="center bold" fxFlex>{{ amount | currency:'INR'}}</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" class="center" [formGroupName]="i" fxFlex>
<mat-form-field>
<input matInput type="number" formControlName="amount" autocomplete="off">
</mat-form-field>
</mat-cell>
<mat-footer-cell *matFooterCellDef class="bold">{{ balance | currency:'INR' }}</mat-footer-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
<mat-footer-row *matFooterRowDef="displayedColumns"></mat-footer-row>
</mat-table>
</form>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button mat-button [mat-dialog-close]="false">Cancel</button>
<button mat-button (click)="accept()" color="primary" [disabled]="!!balance">Ok</button>
</mat-dialog-actions>

View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ReceivePaymentComponent } from './receive-payment.component';
describe('ReceivePaymentComponent', () => {
let component: ReceivePaymentComponent;
let fixture: ComponentFixture<ReceivePaymentComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ReceivePaymentComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ReceivePaymentComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,104 @@
import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { FormArray, FormBuilder, FormGroup } from "@angular/forms";
import { distinctUntilChanged } from "rxjs/operators";
import { ReceivePaymentDatasource } from "./receive-payment-datasource";
import { PrintType } from "../bills/bill";
@Component({
selector: 'app-receive-payment',
templateUrl: './receive-payment.component.html',
styleUrls: ['./receive-payment.component.css']
})
export class ReceivePaymentComponent {
choices = {
REGULAR_BILL: [
{
id: 2,
name: "Cash",
amount: 0
},
{
id: 3,
name: "Credit Card",
amount: 0
},
{
id: 5,
name: "Bill To Company",
amount: 0
},
{
id: 6,
name: "Tip",
amount: 0
}
]
,
NO_CHARGE: [
{
id: 4,
name: "No Charge",
amount: 0
}
],
STAFF: [
{
id: 10,
name: "Staff Account",
amount: 0
}
]
};
type: PrintType;
amount: number;
balance: number;
form: FormGroup;
dataSource: ReceivePaymentDatasource;
displayedColumns = ['name', 'amount'];
constructor(
public dialogRef: MatDialogRef<ReceivePaymentComponent>,
private fb: FormBuilder,
@Inject(MAT_DIALOG_DATA) public data: {type: PrintType, amount: number}
) {
this.createForm();
this.type = data.type;
this.amount = data.amount;
this.balance = data.amount;
this.form.setControl('amounts', this.fb.array(
this.choices[this.type].map(
x => this.fb.group({
name: [x.name],
amount: [""]
})
)
));
this.dataSource = new ReceivePaymentDatasource(this.choices[this.type]);
this.listenToAmountChange();
}
createForm() {
this.form = this.fb.group({
amounts: ''
});
}
listenToAmountChange() {
const array = this.form.get('amounts') as FormArray;
this.choices[this.type].forEach(
(z, i) => array.controls[i].valueChanges.pipe(
distinctUntilChanged()
).subscribe(x => {
this.choices[this.type].find(s => s.name == x.name).amount = (x.amount === "" ? 0 : parseInt(x.amount, 10));
this.balance = this.amount - this.choices[this.type].reduce((a, c) => a + c.amount, 0);
})
);
}
accept(): void {
this.dialogRef.close(this.choices[this.type]);
}
}