tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Done upto reconcile

Browse Source 
Pending:
 stock movement
 trial balance
 unposted
This commit is contained in:
tanshu
2020-05-12 03:52:25 +05:30
parent 85d05392b8
commit 2b2430c5b2
16 changed files with 406 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overlord/src/app/cash-flow/cash-flow.service.ts
View File

@ -21,7 +21,6 @@ export class CashFlowService {
}
list(id: string, startDate: string, finishDate: string): Observable<CashFlow> {
const listUrl = (id === null) ? url : `${url}/${id}`;
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
@ -29,6 +28,7 @@ export class CashFlowService {
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
const listUrl = (id === null) ? ( (startDate || finishDate) ? `${url}/data` : url) : `${url}/${id}`;
return <Observable<CashFlow>>this.http.get<CashFlow>(listUrl, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))

11
overlord/src/app/daybook/daybook.service.ts
View File

@ -21,14 +21,9 @@ export class DaybookService {
}
list(startDate: string, finishDate): Observable<Daybook> {
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
}
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
return <Observable<Daybook>>this.http.get<Daybook>(url, options)
startDate = startDate ? `/${startDate}` : '';
finishDate = finishDate ? `/${finishDate}` : '';
return <Observable<Daybook>>this.http.get<Daybook>(`${url}${startDate}${finishDate}`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);

11
overlord/src/app/net-transactions/net-transactions.service.ts
View File

@ -21,14 +21,9 @@ export class NetTransactionsService {
}
list(startDate: string, finishDate): Observable<NetTransactions> {
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
}
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
return <Observable<NetTransactions>>this.http.get<NetTransactions>(url, options)
startDate = startDate ? `/${startDate}` : '';
finishDate = finishDate ? `/${finishDate}` : '';
return <Observable<NetTransactions>>this.http.get<NetTransactions>(`${url}${startDate}${finishDate}`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);

11
overlord/src/app/purchase-entries/purchase-entries.service.ts
View File

@ -21,14 +21,9 @@ export class PurchaseEntriesService {
}
list(startDate: string, finishDate): Observable<PurchaseEntries> {
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
}
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
return <Observable<PurchaseEntries>>this.http.get<PurchaseEntries>(url, options)
startDate = startDate ? `/${startDate}` : '';
finishDate = finishDate ? `/${finishDate}` : '';
return <Observable<PurchaseEntries>>this.http.get<PurchaseEntries>(`${url}${startDate}${finishDate}`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);

11
overlord/src/app/purchases/purchases.service.ts
View File

@ -21,14 +21,9 @@ export class PurchasesService {
}
list(startDate: string, finishDate): Observable<Purchases> {
const options = {params: new HttpParams()};
if (startDate !== null) {
options.params = options.params.set('s', startDate);
}
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
return <Observable<Purchases>>this.http.get<Purchases>(url, options)
startDate = startDate ? `/${startDate}` : '';
finishDate = finishDate ? `/${finishDate}` : '';
return <Observable<Purchases>>this.http.get<Purchases>(`${url}${startDate}${finishDate}`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);