test-entity-library-asm 3.9.34 → 3.9.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entities/CodeRedemptionHistoryUser.d.ts +1 -1
- package/dist/entities/CodeRedemptionHistoryUser.js +3 -3
- package/dist/entities/Company.js +2 -3
- package/dist/entities/CountryHoliday.js +1 -1
- package/dist/entities/DiscountCodeUser.js +2 -3
- package/dist/entities/Local.js +2 -2
- package/dist/entities/LocalPlan.js +2 -2
- package/dist/entities/LocalQualification.d.ts +1 -1
- package/dist/entities/LocalQualification.js +2 -3
- package/dist/entities/LocalReserve.js +2 -3
- package/dist/entities/LocalReserveStatus.d.ts +1 -1
- package/dist/entities/LocalReserveStatus.js +2 -3
- package/dist/entities/LocalTable.js +2 -3
- package/dist/entities/LocalTableZone.js +2 -3
- package/dist/entities/Master.js +3 -3
- package/dist/entities/Partner.js +2 -2
- package/dist/entities/Plan.js +2 -2
- package/dist/entities/PosSystem.d.ts +4 -1
- package/dist/entities/PosSystem.js +30 -2
- package/dist/entities/RequestLocal.d.ts +1 -1
- package/dist/entities/RequestLocal.js +3 -5
- package/dist/entities/RequestLocalHistory.js +2 -2
- package/dist/entities/RequestLocalPayment.js +2 -3
- package/dist/entities/User.js +4 -4
- package/dist/views/DiscountsCodeUser.d.ts +2 -2
- package/dist/views/DiscountsCodeUser.js +6 -16
- package/dist/views/LocalReserves.d.ts +3 -3
- package/dist/views/LocalReserves.js +4 -14
- package/dist/views/LocalTableZonesFilter.d.ts +2 -2
- package/dist/views/LocalTableZonesFilter.js +3 -13
- package/dist/views/LocalsCompany.d.ts +10 -10
- package/dist/views/LocalsCompany.js +8 -18
- package/dist/views/LocalsCompanyInformationForTheTable.js +0 -8
- package/dist/views/MasterNotifications.js +1 -11
- package/package.json +1 -1
- package/src/entities/CodeRedemptionHistoryUser.ts +5 -5
- package/src/entities/Company.ts +2 -3
- package/src/entities/CountryHoliday.ts +1 -1
- package/src/entities/DiscountCodeUser.ts +3 -4
- package/src/entities/Local.ts +2 -2
- package/src/entities/LocalPlan.ts +2 -2
- package/src/entities/LocalQualification.ts +2 -3
- package/src/entities/LocalReserve.ts +6 -7
- package/src/entities/LocalReserveStatus.ts +2 -3
- package/src/entities/LocalTable.ts +5 -6
- package/src/entities/LocalTableZone.ts +2 -3
- package/src/entities/Master.ts +13 -8
- package/src/entities/Partner.ts +2 -2
- package/src/entities/Plan.ts +2 -2
- package/src/entities/PosSystem.ts +30 -4
- package/src/entities/RequestLocal.ts +8 -10
- package/src/entities/RequestLocalHistory.ts +3 -3
- package/src/entities/RequestLocalPayment.ts +4 -5
- package/src/entities/User.ts +10 -10
- package/src/views/DiscountsCodeUser.ts +34 -45
- package/src/views/LocalReserves.ts +6 -17
- package/src/views/LocalTableZonesFilter.ts +4 -15
- package/src/views/LocalsCompany.ts +44 -55
- package/src/views/LocalsCompanyInformationForTheTable.ts +0 -9
- package/src/views/MasterNotifications.ts +1 -12
|
@@ -56,17 +56,43 @@ export class PosSystem {
|
|
|
56
56
|
{
|
|
57
57
|
onDelete: "RESTRICT",
|
|
58
58
|
onUpdate: "NO ACTION",
|
|
59
|
-
|
|
59
|
+
nullable: true,
|
|
60
|
+
},
|
|
60
61
|
)
|
|
61
62
|
@JoinColumn({ name: "authentication_credentials" })
|
|
62
|
-
authentication_credentials: AuthenticationCredential;
|
|
63
|
+
authentication_credentials: AuthenticationCredential | null;
|
|
64
|
+
|
|
65
|
+
@Column({
|
|
66
|
+
type: "mediumtext",
|
|
67
|
+
transformer: jsonTransformer,
|
|
68
|
+
nullable: true,
|
|
69
|
+
default: null,
|
|
70
|
+
comment:
|
|
71
|
+
"Configuración adicional que va a tener el sistema POS, si es necesario, este se guarda como JSON.",
|
|
72
|
+
})
|
|
73
|
+
settings: any | null;
|
|
74
|
+
|
|
75
|
+
@Column({
|
|
76
|
+
type: "datetime",
|
|
77
|
+
comment: "Fecha de creación del sistema POS.",
|
|
78
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
79
|
+
})
|
|
80
|
+
created: Date;
|
|
81
|
+
|
|
82
|
+
@Column({
|
|
83
|
+
type: "date",
|
|
84
|
+
nullable: true,
|
|
85
|
+
default: null,
|
|
86
|
+
comment:
|
|
87
|
+
"Fecha de expiración si es necesaria, si no se necesita se agrega como null.",
|
|
88
|
+
})
|
|
89
|
+
expiration: string | null;
|
|
63
90
|
|
|
64
91
|
@Column({
|
|
65
92
|
default: 1,
|
|
66
93
|
type: "int",
|
|
67
94
|
width: 1,
|
|
68
|
-
comment:
|
|
69
|
-
"Estado del registro, es decir:\r\n1. Activo: Es visible en la plataforma.\r\n0. Inactivo: No será visible en la plataforma.",
|
|
95
|
+
comment: "Estado del sistema POS de negocio:\n0: Inactivo.\n1: Activo.",
|
|
70
96
|
})
|
|
71
97
|
status: number;
|
|
72
98
|
|
|
@@ -17,7 +17,6 @@ import {
|
|
|
17
17
|
RequestProduct,
|
|
18
18
|
RequestProductGroupComplement,
|
|
19
19
|
} from "..";
|
|
20
|
-
import { DateTransformer } from "../transformers/dateTransformer";
|
|
21
20
|
|
|
22
21
|
@Entity({
|
|
23
22
|
comment: "Tabla para guardar las relaciones de un pedido y los locales",
|
|
@@ -84,13 +83,12 @@ export class RequestLocal {
|
|
|
84
83
|
|
|
85
84
|
@Column({
|
|
86
85
|
type: "datetime",
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
87
|
+
onUpdate: "CURRENT_TIMESTAMP",
|
|
89
88
|
comment:
|
|
90
89
|
"Columna donde almacenamos la fecha de actualización del registro, este campo nos sirve para saber cuánto tiempo llevamos desde qué se actualizó hasta la hora actual.",
|
|
91
|
-
transformer: new DateTransformer(),
|
|
92
90
|
})
|
|
93
|
-
updated: Date
|
|
91
|
+
updated: Date;
|
|
94
92
|
|
|
95
93
|
@Column({
|
|
96
94
|
type: "int",
|
|
@@ -113,7 +111,7 @@ export class RequestLocal {
|
|
|
113
111
|
onDelete: "SET NULL",
|
|
114
112
|
onUpdate: "NO ACTION",
|
|
115
113
|
nullable: true,
|
|
116
|
-
}
|
|
114
|
+
},
|
|
117
115
|
)
|
|
118
116
|
@JoinColumn({ name: "discount_redemption" })
|
|
119
117
|
discount_redemption: CodeRedemptionHistoryUser | null;
|
|
@@ -155,19 +153,19 @@ export class RequestLocal {
|
|
|
155
153
|
|
|
156
154
|
@OneToMany(
|
|
157
155
|
() => RequestLocalHistory,
|
|
158
|
-
(requestLocalHistory) => requestLocalHistory.request_local
|
|
156
|
+
(requestLocalHistory) => requestLocalHistory.request_local,
|
|
159
157
|
)
|
|
160
158
|
requests_local_history: RequestLocalHistory[];
|
|
161
159
|
|
|
162
160
|
@OneToMany(
|
|
163
161
|
() => RequestLocalPayment,
|
|
164
|
-
(requestLocalPayment) => requestLocalPayment.request_local
|
|
162
|
+
(requestLocalPayment) => requestLocalPayment.request_local,
|
|
165
163
|
)
|
|
166
164
|
payments_made: RequestLocalPayment[];
|
|
167
165
|
|
|
168
166
|
@OneToMany(
|
|
169
167
|
() => RequestLocalTable,
|
|
170
|
-
(requestLocalTable) => requestLocalTable.request_local
|
|
168
|
+
(requestLocalTable) => requestLocalTable.request_local,
|
|
171
169
|
)
|
|
172
170
|
request_locals_table: RequestLocalTable[];
|
|
173
171
|
|
|
@@ -176,7 +174,7 @@ export class RequestLocal {
|
|
|
176
174
|
|
|
177
175
|
@OneToMany(
|
|
178
176
|
() => RequestProductGroupComplement,
|
|
179
|
-
(requestProduct) => requestProduct.request
|
|
177
|
+
(requestProduct) => requestProduct.request,
|
|
180
178
|
)
|
|
181
179
|
request_product_group_complements: RequestProductGroupComplement[];
|
|
182
180
|
}
|
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
PrimaryGeneratedColumn,
|
|
7
7
|
} from "typeorm";
|
|
8
8
|
import { Partner, RequestLocal } from "..";
|
|
9
|
-
import { DateTransformer } from "../transformers/dateTransformer";
|
|
10
9
|
|
|
11
10
|
@Entity({
|
|
12
11
|
comment:
|
|
@@ -26,7 +25,7 @@ export class RequestLocalHistory {
|
|
|
26
25
|
{
|
|
27
26
|
onDelete: "CASCADE",
|
|
28
27
|
onUpdate: "NO ACTION",
|
|
29
|
-
}
|
|
28
|
+
},
|
|
30
29
|
)
|
|
31
30
|
@JoinColumn({ name: "request_local" })
|
|
32
31
|
request_local: RequestLocal;
|
|
@@ -58,7 +57,8 @@ export class RequestLocalHistory {
|
|
|
58
57
|
@Column({
|
|
59
58
|
type: "datetime",
|
|
60
59
|
comment: "Fecha en la que realizó el cambio.",
|
|
61
|
-
|
|
60
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
61
|
+
onUpdate: "CURRENT_TIMESTAMP",
|
|
62
62
|
})
|
|
63
63
|
updated: Date;
|
|
64
64
|
}
|
|
@@ -10,9 +10,8 @@ import {
|
|
|
10
10
|
Partner,
|
|
11
11
|
RequestLocal,
|
|
12
12
|
User,
|
|
13
|
-
UserPaymentMethod
|
|
13
|
+
UserPaymentMethod,
|
|
14
14
|
} from "..";
|
|
15
|
-
import { DateTransformer } from "../transformers/dateTransformer";
|
|
16
15
|
|
|
17
16
|
@Entity({
|
|
18
17
|
comment:
|
|
@@ -55,7 +54,7 @@ export class RequestLocalPayment {
|
|
|
55
54
|
{
|
|
56
55
|
onDelete: "RESTRICT",
|
|
57
56
|
onUpdate: "NO ACTION",
|
|
58
|
-
}
|
|
57
|
+
},
|
|
59
58
|
)
|
|
60
59
|
@JoinColumn({ name: "payment_method" })
|
|
61
60
|
payment_method: LocalPaymentMethod;
|
|
@@ -124,7 +123,7 @@ export class RequestLocalPayment {
|
|
|
124
123
|
|
|
125
124
|
@Column({
|
|
126
125
|
type: "datetime",
|
|
127
|
-
|
|
126
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
128
127
|
comment: "Fecha de creación del registro.",
|
|
129
128
|
})
|
|
130
129
|
created: Date;
|
|
@@ -133,7 +132,7 @@ export class RequestLocalPayment {
|
|
|
133
132
|
type: "datetime",
|
|
134
133
|
nullable: true,
|
|
135
134
|
default: null,
|
|
136
|
-
|
|
135
|
+
onUpdate: "CURRENT_TIMESTAMP",
|
|
137
136
|
comment: "Fecha de actualización del registro.",
|
|
138
137
|
})
|
|
139
138
|
updated: Date | null;
|
package/src/entities/User.ts
CHANGED
|
@@ -15,7 +15,6 @@ import {
|
|
|
15
15
|
RequestLocalPayment,
|
|
16
16
|
UserPaymentMethod,
|
|
17
17
|
} from "..";
|
|
18
|
-
import { DateTransformer } from "../transformers/dateTransformer";
|
|
19
18
|
import { jsonTransformer } from "../transformers/jsonTransformer";
|
|
20
19
|
import { City } from "./City";
|
|
21
20
|
import { CodeRedemptionHistoryUser } from "./CodeRedemptionHistoryUser";
|
|
@@ -100,15 +99,16 @@ export class User {
|
|
|
100
99
|
|
|
101
100
|
@Column({
|
|
102
101
|
type: "datetime",
|
|
103
|
-
transformer: new DateTransformer(),
|
|
104
102
|
comment: "Fecha de creación del registro.",
|
|
103
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
105
104
|
})
|
|
106
105
|
created: Date;
|
|
107
106
|
|
|
108
107
|
@Column({
|
|
109
108
|
type: "datetime",
|
|
110
|
-
transformer: new DateTransformer(),
|
|
111
109
|
comment: "Fecha de actualización del registro.",
|
|
110
|
+
default: () => "CURRENT_TIMESTAMP",
|
|
111
|
+
onUpdate: "CURRENT_TIMESTAMP",
|
|
112
112
|
})
|
|
113
113
|
updated: Date;
|
|
114
114
|
|
|
@@ -125,19 +125,19 @@ export class User {
|
|
|
125
125
|
type: "int",
|
|
126
126
|
width: 1,
|
|
127
127
|
default: 1,
|
|
128
|
-
comment: "Es el estado para verificar si se
|
|
128
|
+
comment: "Es el estado para verificar si se envía en la papelera o no.",
|
|
129
129
|
})
|
|
130
130
|
visible: number;
|
|
131
131
|
|
|
132
132
|
@OneToMany(
|
|
133
133
|
() => CodeRedemptionHistoryUser,
|
|
134
|
-
(codeRedemptionHistoryUser) => codeRedemptionHistoryUser.user
|
|
134
|
+
(codeRedemptionHistoryUser) => codeRedemptionHistoryUser.user,
|
|
135
135
|
)
|
|
136
136
|
code_redemption_history_users: CodeRedemptionHistoryUser[];
|
|
137
137
|
|
|
138
138
|
@OneToMany(
|
|
139
139
|
() => LocalQualification,
|
|
140
|
-
(localQualification) => localQualification.user
|
|
140
|
+
(localQualification) => localQualification.user,
|
|
141
141
|
)
|
|
142
142
|
qualifications: LocalQualification[];
|
|
143
143
|
|
|
@@ -163,7 +163,7 @@ export class User {
|
|
|
163
163
|
|
|
164
164
|
@OneToMany(
|
|
165
165
|
() => RequestProductGroupComplement,
|
|
166
|
-
(requestProduct) => requestProduct.user
|
|
166
|
+
(requestProduct) => requestProduct.user,
|
|
167
167
|
)
|
|
168
168
|
request_product_group_complements: RequestProductGroupComplement[];
|
|
169
169
|
|
|
@@ -172,13 +172,13 @@ export class User {
|
|
|
172
172
|
|
|
173
173
|
@OneToMany(
|
|
174
174
|
() => UserPaymentMethod,
|
|
175
|
-
(userPaymentMethods) => userPaymentMethods.user
|
|
175
|
+
(userPaymentMethods) => userPaymentMethods.user,
|
|
176
176
|
)
|
|
177
177
|
payment_methods: UserPaymentMethod[];
|
|
178
178
|
|
|
179
179
|
@OneToMany(
|
|
180
180
|
() => RequestLocalPayment,
|
|
181
|
-
(requestLocalPayment) => requestLocalPayment.user
|
|
181
|
+
(requestLocalPayment) => requestLocalPayment.user,
|
|
182
182
|
)
|
|
183
183
|
payments_made: RequestLocalPayment[];
|
|
184
184
|
|
|
@@ -232,7 +232,7 @@ export class User {
|
|
|
232
232
|
|
|
233
233
|
@OneToMany(
|
|
234
234
|
() => LocalTableReservePayment,
|
|
235
|
-
(localTableReservePayment) => localTableReservePayment.user
|
|
235
|
+
(localTableReservePayment) => localTableReservePayment.user,
|
|
236
236
|
)
|
|
237
237
|
local_table_reserve_payments: LocalTableReservePayment[];
|
|
238
238
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import moment = require('moment-timezone')
|
|
3
|
-
import { getTimeZone } from '..'
|
|
1
|
+
import { ViewColumn, ViewEntity } from "typeorm";
|
|
4
2
|
|
|
5
3
|
// JSON Transformer
|
|
6
4
|
const jsonTransformer = {
|
|
@@ -8,102 +6,93 @@ const jsonTransformer = {
|
|
|
8
6
|
|
|
9
7
|
from: (value: string) => {
|
|
10
8
|
try {
|
|
11
|
-
return JSON.parse(value)
|
|
9
|
+
return JSON.parse(value);
|
|
12
10
|
} catch (error) {
|
|
13
|
-
console.log(error,
|
|
14
|
-
return null
|
|
11
|
+
console.log(error, "Transformer error");
|
|
12
|
+
return null;
|
|
15
13
|
}
|
|
16
14
|
},
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
const DateTransformer = {
|
|
20
|
-
to(value: Date | string): string {
|
|
21
|
-
return moment.utc(value).format('YYYY-MM-DD HH:mm:ss')
|
|
22
|
-
},
|
|
23
|
-
from(value: string): string {
|
|
24
|
-
return moment.utc(value).tz(getTimeZone()).format('YYYY-MM-DD HH:mm:ss')
|
|
25
|
-
},
|
|
26
|
-
}
|
|
15
|
+
};
|
|
27
16
|
|
|
28
17
|
@ViewEntity({
|
|
29
|
-
name:
|
|
18
|
+
name: "discounts_code_user",
|
|
30
19
|
})
|
|
31
20
|
export class DiscountsCodeUser {
|
|
32
21
|
@ViewColumn()
|
|
33
|
-
id: number
|
|
22
|
+
id: number;
|
|
34
23
|
|
|
35
24
|
@ViewColumn()
|
|
36
|
-
company: number
|
|
25
|
+
company: number;
|
|
37
26
|
|
|
38
27
|
@ViewColumn()
|
|
39
|
-
local: number
|
|
28
|
+
local: number;
|
|
40
29
|
|
|
41
30
|
@ViewColumn()
|
|
42
|
-
code: string
|
|
31
|
+
code: string;
|
|
43
32
|
|
|
44
33
|
@ViewColumn()
|
|
45
|
-
discount: string
|
|
34
|
+
discount: string;
|
|
46
35
|
|
|
47
36
|
@ViewColumn()
|
|
48
|
-
type: number
|
|
37
|
+
type: number;
|
|
49
38
|
|
|
50
39
|
@ViewColumn()
|
|
51
|
-
single_use: number
|
|
40
|
+
single_use: number;
|
|
52
41
|
|
|
53
42
|
@ViewColumn()
|
|
54
|
-
use_limit: number
|
|
43
|
+
use_limit: number;
|
|
55
44
|
|
|
56
|
-
@ViewColumn(
|
|
57
|
-
created:
|
|
45
|
+
@ViewColumn()
|
|
46
|
+
created: Date;
|
|
58
47
|
|
|
59
48
|
@ViewColumn()
|
|
60
|
-
start: string
|
|
49
|
+
start: string;
|
|
61
50
|
|
|
62
51
|
@ViewColumn()
|
|
63
|
-
expiration: string
|
|
52
|
+
expiration: string;
|
|
64
53
|
|
|
65
54
|
@ViewColumn({ transformer: jsonTransformer })
|
|
66
|
-
repeat_days: any
|
|
55
|
+
repeat_days: any;
|
|
67
56
|
|
|
68
57
|
@ViewColumn()
|
|
69
|
-
updated_by: number
|
|
58
|
+
updated_by: number;
|
|
70
59
|
|
|
71
|
-
@ViewColumn(
|
|
72
|
-
updated:
|
|
60
|
+
@ViewColumn()
|
|
61
|
+
updated: Date;
|
|
73
62
|
|
|
74
63
|
@ViewColumn()
|
|
75
|
-
status: number
|
|
64
|
+
status: number;
|
|
76
65
|
|
|
77
66
|
@ViewColumn()
|
|
78
|
-
local_id: number
|
|
67
|
+
local_id: number;
|
|
79
68
|
|
|
80
69
|
@ViewColumn()
|
|
81
|
-
local_name: string
|
|
70
|
+
local_name: string;
|
|
82
71
|
|
|
83
72
|
@ViewColumn()
|
|
84
|
-
local_address: string
|
|
73
|
+
local_address: string;
|
|
85
74
|
|
|
86
75
|
@ViewColumn()
|
|
87
|
-
local_status: number
|
|
76
|
+
local_status: number;
|
|
88
77
|
|
|
89
78
|
@ViewColumn()
|
|
90
|
-
partner_id: number
|
|
79
|
+
partner_id: number;
|
|
91
80
|
|
|
92
81
|
@ViewColumn()
|
|
93
|
-
partner_code: string
|
|
82
|
+
partner_code: string;
|
|
94
83
|
|
|
95
84
|
@ViewColumn()
|
|
96
|
-
partner_name: string
|
|
85
|
+
partner_name: string;
|
|
97
86
|
|
|
98
87
|
@ViewColumn()
|
|
99
|
-
partner_surname: string
|
|
88
|
+
partner_surname: string;
|
|
100
89
|
|
|
101
90
|
@ViewColumn({ transformer: jsonTransformer })
|
|
102
|
-
partner_profile: any
|
|
91
|
+
partner_profile: any;
|
|
103
92
|
|
|
104
93
|
@ViewColumn()
|
|
105
|
-
partner_status: number
|
|
94
|
+
partner_status: number;
|
|
106
95
|
|
|
107
96
|
@ViewColumn()
|
|
108
|
-
number_of_times_used: number
|
|
97
|
+
number_of_times_used: number;
|
|
109
98
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import { ViewColumn, ViewEntity } from "typeorm";
|
|
2
|
-
import moment = require("moment-timezone");
|
|
3
|
-
import { getTimeZone } from "..";
|
|
4
2
|
|
|
5
3
|
// JSON Transformer
|
|
6
4
|
const jsonTransformer = {
|
|
@@ -15,15 +13,6 @@ const jsonTransformer = {
|
|
|
15
13
|
},
|
|
16
14
|
};
|
|
17
15
|
|
|
18
|
-
const DateTransformer = {
|
|
19
|
-
to(value: Date | string): string {
|
|
20
|
-
return moment.utc(value).format("YYYY-MM-DD HH:mm:ss");
|
|
21
|
-
},
|
|
22
|
-
from(value: string): string {
|
|
23
|
-
return moment.utc(value).tz(getTimeZone()).format("YYYY-MM-DD HH:mm:ss");
|
|
24
|
-
},
|
|
25
|
-
};
|
|
26
|
-
|
|
27
16
|
@ViewEntity({
|
|
28
17
|
name: "local_reserves",
|
|
29
18
|
})
|
|
@@ -70,11 +59,11 @@ export class LocalReserves {
|
|
|
70
59
|
@ViewColumn()
|
|
71
60
|
persons: number;
|
|
72
61
|
|
|
73
|
-
@ViewColumn(
|
|
74
|
-
created:
|
|
62
|
+
@ViewColumn()
|
|
63
|
+
created: Date;
|
|
75
64
|
|
|
76
|
-
@ViewColumn(
|
|
77
|
-
updated:
|
|
65
|
+
@ViewColumn()
|
|
66
|
+
updated: Date | null;
|
|
78
67
|
|
|
79
68
|
@ViewColumn()
|
|
80
69
|
partner: number | null;
|
|
@@ -94,8 +83,8 @@ export class LocalReserves {
|
|
|
94
83
|
@ViewColumn()
|
|
95
84
|
local_reserve_status_description: string | null;
|
|
96
85
|
|
|
97
|
-
@ViewColumn(
|
|
98
|
-
local_reserve_status_updated:
|
|
86
|
+
@ViewColumn()
|
|
87
|
+
local_reserve_status_updated: Date | null;
|
|
99
88
|
|
|
100
89
|
@ViewColumn()
|
|
101
90
|
local_reserve_status_updated_by: number | null;
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import { ViewColumn, ViewEntity } from "typeorm";
|
|
2
|
-
import moment = require("moment-timezone");
|
|
3
|
-
import { getTimeZone } from "..";
|
|
4
2
|
|
|
5
3
|
// JSON Transformer
|
|
6
4
|
const jsonTransformer = {
|
|
@@ -15,15 +13,6 @@ const jsonTransformer = {
|
|
|
15
13
|
},
|
|
16
14
|
};
|
|
17
15
|
|
|
18
|
-
const DateTransformer = {
|
|
19
|
-
to(value: Date | string): string {
|
|
20
|
-
return moment.utc(value).format("YYYY-MM-DD HH:mm:ss");
|
|
21
|
-
},
|
|
22
|
-
from(value: string): string {
|
|
23
|
-
return moment.utc(value).tz(getTimeZone()).format("YYYY-MM-DD HH:mm:ss");
|
|
24
|
-
},
|
|
25
|
-
};
|
|
26
|
-
|
|
27
16
|
@ViewEntity({
|
|
28
17
|
name: "local_table_zones_filter",
|
|
29
18
|
})
|
|
@@ -37,8 +26,8 @@ export class LocalTableZonesFilter {
|
|
|
37
26
|
@ViewColumn()
|
|
38
27
|
local: number | null;
|
|
39
28
|
|
|
40
|
-
@ViewColumn(
|
|
41
|
-
created:
|
|
29
|
+
@ViewColumn()
|
|
30
|
+
created: Date;
|
|
42
31
|
|
|
43
32
|
@ViewColumn()
|
|
44
33
|
name: string;
|
|
@@ -46,8 +35,8 @@ export class LocalTableZonesFilter {
|
|
|
46
35
|
@ViewColumn()
|
|
47
36
|
status: number;
|
|
48
37
|
|
|
49
|
-
@ViewColumn(
|
|
50
|
-
updated:
|
|
38
|
+
@ViewColumn()
|
|
39
|
+
updated: Date | null;
|
|
51
40
|
|
|
52
41
|
@ViewColumn()
|
|
53
42
|
updated_by: number | null;
|
|
@@ -1,140 +1,129 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { ViewEntity, ViewColumn } from 'typeorm'
|
|
3
|
-
import { getTimeZone } from '..'
|
|
1
|
+
import { ViewColumn, ViewEntity } from "typeorm";
|
|
4
2
|
|
|
5
3
|
// JSON Transformer
|
|
6
4
|
const jsonTransformer = {
|
|
7
5
|
to: (value: any) => JSON.stringify(value),
|
|
8
6
|
from: (value: string) => JSON.parse(value),
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
const DateTransformer = {
|
|
12
|
-
to(value: Date | string): string {
|
|
13
|
-
return moment.utc(value).format('YYYY-MM-DD HH:mm:ss')
|
|
14
|
-
},
|
|
15
|
-
from(value: string): string {
|
|
16
|
-
return moment.utc(value).tz(getTimeZone()).format('YYYY-MM-DD HH:mm:ss')
|
|
17
|
-
},
|
|
18
|
-
}
|
|
7
|
+
};
|
|
19
8
|
|
|
20
9
|
@ViewEntity({
|
|
21
|
-
name:
|
|
10
|
+
name: "locals_company",
|
|
22
11
|
})
|
|
23
12
|
export class LocalsCompany {
|
|
24
13
|
@ViewColumn()
|
|
25
|
-
id: number
|
|
14
|
+
id: number;
|
|
26
15
|
|
|
27
16
|
@ViewColumn()
|
|
28
|
-
company: number
|
|
17
|
+
company: number;
|
|
29
18
|
|
|
30
19
|
@ViewColumn()
|
|
31
|
-
name: string
|
|
20
|
+
name: string;
|
|
32
21
|
|
|
33
22
|
@ViewColumn()
|
|
34
|
-
address: string
|
|
23
|
+
address: string;
|
|
35
24
|
|
|
36
25
|
@ViewColumn()
|
|
37
|
-
latitude: string
|
|
26
|
+
latitude: string;
|
|
38
27
|
|
|
39
28
|
@ViewColumn()
|
|
40
|
-
longitude: string
|
|
29
|
+
longitude: string;
|
|
41
30
|
|
|
42
31
|
@ViewColumn({ transformer: jsonTransformer })
|
|
43
|
-
details:
|
|
32
|
+
details: any | null;
|
|
44
33
|
|
|
45
34
|
@ViewColumn()
|
|
46
|
-
created:
|
|
35
|
+
created: Date;
|
|
47
36
|
|
|
48
37
|
@ViewColumn()
|
|
49
|
-
updated:
|
|
38
|
+
updated: Date;
|
|
50
39
|
|
|
51
40
|
@ViewColumn()
|
|
52
|
-
status: number
|
|
41
|
+
status: number;
|
|
53
42
|
|
|
54
43
|
@ViewColumn()
|
|
55
|
-
city_id: number
|
|
44
|
+
city_id: number;
|
|
56
45
|
|
|
57
46
|
@ViewColumn()
|
|
58
|
-
city_name: string
|
|
47
|
+
city_name: string;
|
|
59
48
|
|
|
60
49
|
@ViewColumn()
|
|
61
|
-
city_status: number
|
|
50
|
+
city_status: number;
|
|
62
51
|
|
|
63
52
|
@ViewColumn()
|
|
64
|
-
region_id: number
|
|
53
|
+
region_id: number;
|
|
65
54
|
|
|
66
55
|
@ViewColumn()
|
|
67
|
-
region_name: string
|
|
56
|
+
region_name: string;
|
|
68
57
|
|
|
69
58
|
@ViewColumn()
|
|
70
|
-
region_status: number
|
|
59
|
+
region_status: number;
|
|
71
60
|
|
|
72
61
|
@ViewColumn()
|
|
73
|
-
country_id: number
|
|
62
|
+
country_id: number;
|
|
74
63
|
|
|
75
64
|
@ViewColumn()
|
|
76
|
-
country_code: string
|
|
65
|
+
country_code: string;
|
|
77
66
|
|
|
78
67
|
@ViewColumn()
|
|
79
|
-
country_name: string
|
|
68
|
+
country_name: string;
|
|
80
69
|
|
|
81
70
|
@ViewColumn()
|
|
82
|
-
country_status: number
|
|
71
|
+
country_status: number;
|
|
83
72
|
|
|
84
73
|
@ViewColumn({ transformer: jsonTransformer })
|
|
85
|
-
country_details:
|
|
74
|
+
country_details: any | null;
|
|
86
75
|
|
|
87
76
|
@ViewColumn()
|
|
88
|
-
average_rating: number
|
|
77
|
+
average_rating: number;
|
|
89
78
|
|
|
90
79
|
@ViewColumn()
|
|
91
|
-
rating_count: number
|
|
80
|
+
rating_count: number;
|
|
92
81
|
|
|
93
82
|
@ViewColumn()
|
|
94
|
-
square_id: number
|
|
83
|
+
square_id: number;
|
|
95
84
|
|
|
96
85
|
@ViewColumn()
|
|
97
|
-
square_name: string
|
|
86
|
+
square_name: string;
|
|
98
87
|
|
|
99
88
|
@ViewColumn()
|
|
100
|
-
square_address: string
|
|
89
|
+
square_address: string;
|
|
101
90
|
|
|
102
91
|
@ViewColumn()
|
|
103
|
-
square_status: number
|
|
92
|
+
square_status: number;
|
|
104
93
|
|
|
105
94
|
@ViewColumn()
|
|
106
|
-
partners_count: number
|
|
95
|
+
partners_count: number;
|
|
107
96
|
|
|
108
97
|
@ViewColumn()
|
|
109
|
-
request_count: number
|
|
98
|
+
request_count: number;
|
|
110
99
|
|
|
111
100
|
@ViewColumn()
|
|
112
|
-
pos_system_id: number
|
|
101
|
+
pos_system_id: number;
|
|
113
102
|
|
|
114
103
|
@ViewColumn()
|
|
115
|
-
pos_system_name: string
|
|
104
|
+
pos_system_name: string;
|
|
116
105
|
|
|
117
106
|
@ViewColumn()
|
|
118
|
-
pos_system_description: string
|
|
107
|
+
pos_system_description: string;
|
|
119
108
|
|
|
120
109
|
@ViewColumn({ transformer: jsonTransformer })
|
|
121
|
-
pos_system_endpoint_products:
|
|
110
|
+
pos_system_endpoint_products: any;
|
|
122
111
|
|
|
123
112
|
@ViewColumn({ transformer: jsonTransformer })
|
|
124
|
-
pos_system_endpoint_order:
|
|
113
|
+
pos_system_endpoint_order: any;
|
|
125
114
|
|
|
126
115
|
@ViewColumn()
|
|
127
|
-
pos_system_authentication_credentials: number
|
|
116
|
+
pos_system_authentication_credentials: number | null;
|
|
128
117
|
|
|
129
118
|
@ViewColumn({ transformer: jsonTransformer })
|
|
130
|
-
pos_system_settings:
|
|
119
|
+
pos_system_settings: any | null;
|
|
131
120
|
|
|
132
|
-
@ViewColumn(
|
|
133
|
-
pos_system_created:
|
|
121
|
+
@ViewColumn()
|
|
122
|
+
pos_system_created: Date;
|
|
134
123
|
|
|
135
|
-
@ViewColumn(
|
|
136
|
-
pos_system_expiration: string
|
|
124
|
+
@ViewColumn()
|
|
125
|
+
pos_system_expiration: string | null;
|
|
137
126
|
|
|
138
127
|
@ViewColumn()
|
|
139
|
-
pos_system_status: number
|
|
128
|
+
pos_system_status: number;
|
|
140
129
|
}
|
|
@@ -12,15 +12,6 @@ const jsonTransformer = {
|
|
|
12
12
|
},
|
|
13
13
|
};
|
|
14
14
|
|
|
15
|
-
// const DateTransformer = {
|
|
16
|
-
// to(value: Date | string): string {
|
|
17
|
-
// return moment.utc(value).format("YYYY-MM-DD HH:mm:ss");
|
|
18
|
-
// },
|
|
19
|
-
// from(value: string): string {
|
|
20
|
-
// return moment.utc(value).tz(getTimeZone()).format("YYYY-MM-DD HH:mm:ss");
|
|
21
|
-
// },
|
|
22
|
-
// };
|
|
23
|
-
|
|
24
15
|
@ViewEntity({
|
|
25
16
|
name: "locals_company_information_for_the_table",
|
|
26
17
|
})
|