Skip to content

Commit d19dcbc

Browse files
committed
added list payments and edit/add payment pages
1 parent b526e73 commit d19dcbc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+609
-194
lines changed

src/Client/Logistics.OfficeApp/src/app/core/enums/permissions.ts

+21
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,25 @@ export namespace Permissions {
4444
Edit = 'Permissions.Customers.Edit',
4545
Delete = 'Permissions.Customers.Delete'
4646
}
47+
48+
export enum Payments {
49+
Create = 'Permissions.Payments.Create',
50+
View = 'Permissions.Payments.View',
51+
Edit = 'Permissions.Payments.Edit',
52+
Delete = 'Permissions.Payments.Delete'
53+
}
54+
55+
export enum Invoices {
56+
Create = 'Permissions.Invoices.Create',
57+
View = 'Permissions.Invoices.View',
58+
Edit = 'Permissions.Invoices.Edit',
59+
Delete = 'Permissions.Invoices.Delete'
60+
}
61+
62+
export enum Payroll {
63+
Create = 'Permissions.Payroll.Create',
64+
View = 'Permissions.Payroll.View',
65+
Edit = 'Permissions.Payroll.Edit',
66+
Delete = 'Permissions.Payroll.Delete'
67+
}
4768
}

src/Client/Logistics.OfficeApp/src/app/core/models/customer.ts src/Client/Logistics.OfficeApp/src/app/core/models/customer/customer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Invoice} from './invoice';
1+
import {Invoice} from '../payment/invoice';
22

33
export interface Customer {
44
id: string;
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
export * from './responseResult';
2-
export * from './employee';
3-
export * from './load';
2+
export * from './employee/employee';
3+
export * from './load/load';
44
export * from './pagedResponseResult';
55
export * from './tenant';
6-
export * from './truck';
6+
export * from './truck/truck';
77
export * from './user';
8-
export * from './role';
9-
export * from './createEmployee';
10-
export * from './updateEmployee';
11-
export * from './dailyGrosses';
12-
export * from './dailyGross';
13-
export * from './monthlyGrosses';
14-
export * from './monthlyGross';
15-
export * from './companyStats';
16-
export * from './removeEmployeeRole';
17-
export * from './truckDriver';
18-
export * from './updateTruck';
19-
export * from './createTruck';
20-
export * from './updateLoad';
21-
export * from './createLoad';
22-
export * from './truckGeolocation';
23-
export * from './truckStats';
24-
export * from './notification';
25-
export * from './updateNotification';
26-
export * from './customer';
27-
export * from './invoice';
28-
export * from './payment';
29-
export * from './payrollPayment';
30-
export * from './subscriptionPayment';
8+
export * from './employee/role';
9+
export * from './employee/createEmployee';
10+
export * from './employee/updateEmployee';
11+
export * from './stats/dailyGrosses';
12+
export * from './stats/dailyGross';
13+
export * from './stats/monthlyGrosses';
14+
export * from './stats/monthlyGross';
15+
export * from './stats/companyStats';
16+
export * from './employee/removeEmployeeRole';
17+
export * from './truck/truckDriver';
18+
export * from './truck/updateTruck';
19+
export * from './truck/createTruck';
20+
export * from './load/updateLoad';
21+
export * from './load/createLoad';
22+
export * from './truck/truckGeolocation';
23+
export * from './stats/truckStats';
24+
export * from './notification/notification';
25+
export * from './notification/updateNotification';
26+
export * from './customer/customer';
27+
export * from './payment/invoice';
28+
export * from './payment/payment';
29+
export * from './payment/payrollPayment';
30+
export * from './payment/subscriptionPayment';
3131
export * from './searchableQuery';
32-
export * from './createCustomer';
33-
export * from './updateCustomer';
32+
export * from './customer/createCustomer';
33+
export * from './customer/updateCustomer';
34+
export * from './payment/createPayment';
35+
export * from './payment/updatePayment';
36+
export * from './pagedQuery';
37+
export * from './pagedIntervalQuery';

src/Client/Logistics.OfficeApp/src/app/core/models/load.ts src/Client/Logistics.OfficeApp/src/app/core/models/load/load.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Customer} from './customer';
2-
import {Invoice} from './invoice';
1+
import {Customer} from '../customer/customer';
2+
import {Invoice} from '../payment/invoice';
33
import {LoadStatus} from '@core/enums';
44

55

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import {PagedQuery} from './pagedQuery';
2+
3+
export interface PagedIntervalQuery extends PagedQuery {
4+
startDate: Date;
5+
endDate?: Date;
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export interface PagedQuery {
2+
orderBy?: string;
3+
page?: number;
4+
pageSize?: number;
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import {PaymentFor, PaymentMethod} from '@core/enums';
2+
3+
export interface CreatePayment {
4+
method: PaymentMethod;
5+
amount: number;
6+
paymentFor: PaymentFor;
7+
comment?: string;
8+
}

src/Client/Logistics.OfficeApp/src/app/core/models/payrollPayment.ts src/Client/Logistics.OfficeApp/src/app/core/models/payment/payrollPayment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Employee} from './employee';
1+
import {Employee} from '../employee/employee';
22
import {Payment} from './payment';
33

44

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {PaymentFor, PaymentMethod, PaymentStatus} from '@core/enums';
2+
3+
export interface UpdatePayment {
4+
id: string;
5+
method?: PaymentMethod;
6+
amount?: number;
7+
paymentFor?: PaymentFor;
8+
status?: PaymentStatus;
9+
comment?: string;
10+
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
export interface SearchableQuery {
2-
search?: string;
3-
orderBy?: string;
4-
page?: number;
5-
pageSize?: number;
1+
import {PagedQuery} from './pagedQuery';
2+
3+
export interface SearchableQuery extends PagedQuery {
4+
search?: string;
65
}

src/Client/Logistics.OfficeApp/src/app/core/models/truckStats.ts src/Client/Logistics.OfficeApp/src/app/core/models/stats/truckStats.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Employee} from './employee';
1+
import {Employee} from '../employee/employee';
22

33
export interface TruckStats {
44
truckId: string;

src/Client/Logistics.OfficeApp/src/app/core/models/truck.ts src/Client/Logistics.OfficeApp/src/app/core/models/truck/truck.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Employee} from './employee';
2-
import {Load} from './load';
1+
import {Employee} from '../employee/employee';
2+
import {Load} from '../load/load';
33

44
export interface Truck {
55
id: string;

src/Client/Logistics.OfficeApp/src/app/core/models/truckDriver.ts src/Client/Logistics.OfficeApp/src/app/core/models/truck/truckDriver.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Employee} from './employee';
1+
import {Employee} from '../employee/employee';
22
import {Truck} from './truck';
33

44
export interface TruckDriver {

0 commit comments

Comments
 (0)