uaxi-shared-entities 1.0.94 → 1.0.96
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/admin-earnings.entity.d.ts +3 -3
- package/dist/entities/admin-earnings.entity.d.ts.map +1 -1
- package/dist/entities/admin-earnings.entity.js +3 -8
- package/dist/entities/admin-earnings.entity.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/admin-earnings.entity.ts +6 -17
|
@@ -10,7 +10,7 @@ export declare enum AdminEarningsType {
|
|
|
10
10
|
}
|
|
11
11
|
export interface AdminEarningsAttributes {
|
|
12
12
|
id: string;
|
|
13
|
-
paymentId
|
|
13
|
+
paymentId?: string;
|
|
14
14
|
tripId?: string;
|
|
15
15
|
packageId?: string;
|
|
16
16
|
userId: string;
|
|
@@ -42,7 +42,7 @@ export interface AdminEarningsAttributes {
|
|
|
42
42
|
deletedAt: Date;
|
|
43
43
|
}
|
|
44
44
|
export interface CreateAdminEarningsData {
|
|
45
|
-
paymentId
|
|
45
|
+
paymentId?: string;
|
|
46
46
|
tripId?: string;
|
|
47
47
|
packageId?: string;
|
|
48
48
|
userId: string;
|
|
@@ -72,7 +72,7 @@ export interface CreateAdminEarningsData {
|
|
|
72
72
|
}
|
|
73
73
|
export declare class AdminEarnings extends Model<AdminEarningsAttributes, CreateAdminEarningsData> {
|
|
74
74
|
id: string;
|
|
75
|
-
paymentId
|
|
75
|
+
paymentId?: string;
|
|
76
76
|
tripId?: string;
|
|
77
77
|
packageId?: string;
|
|
78
78
|
userId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-earnings.entity.d.ts","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,oBAAY,iBAAiB;IAC3B,QAAQ,aAAa,CAAE,wCAAwC;IAC/D,SAAS,cAAc;CACxB;AAGD,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"admin-earnings.entity.d.ts","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,8 +86,9 @@ __decorate([
|
|
|
86
86
|
(0, sequelize_typescript_1.ForeignKey)(() => payments_entity_1.Payment),
|
|
87
87
|
(0, sequelize_typescript_1.Column)({
|
|
88
88
|
type: sequelize_typescript_1.DataType.UUID,
|
|
89
|
-
allowNull:
|
|
90
|
-
unique:
|
|
89
|
+
allowNull: true, // Opcional para registros de bono que no tienen pago asociado
|
|
90
|
+
unique: false, // Ya no puede ser único porque múltiples registros de bono tendrían null
|
|
91
|
+
comment: "ID del pago asociado (opcional para registros de bono)",
|
|
91
92
|
}),
|
|
92
93
|
__metadata("design:type", String)
|
|
93
94
|
], AdminEarnings.prototype, "paymentId", void 0);
|
|
@@ -260,7 +261,6 @@ __decorate([
|
|
|
260
261
|
type: sequelize_typescript_1.DataType.ENUM(...Object.values(AdminEarningsType)),
|
|
261
262
|
allowNull: true,
|
|
262
263
|
defaultValue: AdminEarningsType.GANANCIA,
|
|
263
|
-
comment: "Tipo de registro: 'ganancia' para ganancias normales de viajes/paquetes, 'descuento' para pagos de bonos semanales al conductor (que son descuentos de las ganancias). Por defecto siempre es 'ganancia'",
|
|
264
264
|
}),
|
|
265
265
|
__metadata("design:type", String)
|
|
266
266
|
], AdminEarnings.prototype, "earningsType", void 0);
|
|
@@ -269,7 +269,6 @@ __decorate([
|
|
|
269
269
|
type: sequelize_typescript_1.DataType.BOOLEAN,
|
|
270
270
|
defaultValue: false,
|
|
271
271
|
allowNull: true,
|
|
272
|
-
comment: "Indica si este registro es un pago de bono semanal al conductor (true) o una ganancia normal de un viaje/paquete (false). Por defecto siempre es false (ganancia normal)",
|
|
273
272
|
}),
|
|
274
273
|
__metadata("design:type", Boolean)
|
|
275
274
|
], AdminEarnings.prototype, "isBonusPayment", void 0);
|
|
@@ -278,7 +277,6 @@ __decorate([
|
|
|
278
277
|
type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
|
|
279
278
|
allowNull: true,
|
|
280
279
|
defaultValue: 0.0,
|
|
281
|
-
comment: "Monto neto del bono pagado al conductor después de aplicar todas las retenciones (IVA 8%, ISR 2.1%, IMSS Obrero 2.5%). Solo tiene valor cuando isBonusPayment es true",
|
|
282
280
|
}),
|
|
283
281
|
__metadata("design:type", Number)
|
|
284
282
|
], AdminEarnings.prototype, "bonusAmountPaid", void 0);
|
|
@@ -287,7 +285,6 @@ __decorate([
|
|
|
287
285
|
type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
|
|
288
286
|
allowNull: true,
|
|
289
287
|
defaultValue: 0.0,
|
|
290
|
-
comment: "Monto bruto del bono antes de aplicar retenciones. Se calcula como: GananciasBrutasSemana * PorcentajeBono. Solo tiene valor cuando isBonusPayment es true",
|
|
291
288
|
}),
|
|
292
289
|
__metadata("design:type", Number)
|
|
293
290
|
], AdminEarnings.prototype, "bonusGrossAmount", void 0);
|
|
@@ -295,7 +292,6 @@ __decorate([
|
|
|
295
292
|
(0, sequelize_typescript_1.Column)({
|
|
296
293
|
type: sequelize_typescript_1.DataType.DECIMAL(5, 2),
|
|
297
294
|
allowNull: true,
|
|
298
|
-
comment: "Porcentaje del bono aplicado según la categoría del conductor: 13.00 para categoría A, 7.00 para categoría B, 0.00 para categoría C. Solo tiene valor cuando isBonusPayment es true",
|
|
299
295
|
}),
|
|
300
296
|
__metadata("design:type", Number)
|
|
301
297
|
], AdminEarnings.prototype, "bonusPercentage", void 0);
|
|
@@ -303,7 +299,6 @@ __decorate([
|
|
|
303
299
|
(0, sequelize_typescript_1.Column)({
|
|
304
300
|
type: sequelize_typescript_1.DataType.STRING,
|
|
305
301
|
allowNull: true,
|
|
306
|
-
comment: "Categoría del conductor que determina el porcentaje del bono: 'A' (13% de bono), 'B' (7% de bono) o 'C' (0% de bono). Solo tiene valor cuando isBonusPayment es true",
|
|
307
302
|
}),
|
|
308
303
|
__metadata("design:type", String)
|
|
309
304
|
], AdminEarnings.prototype, "bonusCategory", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAQ8B;AAC9B,uDAA4C;AAC5C,iDAAsC;AACtC,qDAA2C;AAC3C,+CAAqC;AACrC,mDAAyC;AAEzC,uDAAuD;AACvD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,0CAAqB,CAAA;IACrB,4CAAuB,CAAA;AACzB,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B;AA2EM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAGlC;
|
|
1
|
+
{"version":3,"file":"admin-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -22,7 +22,7 @@ export enum AdminEarningsType {
|
|
|
22
22
|
// Interface para los atributos de la entidad
|
|
23
23
|
export interface AdminEarningsAttributes {
|
|
24
24
|
id: string;
|
|
25
|
-
paymentId
|
|
25
|
+
paymentId?: string; // Referencia al pago del usuario (opcional para registros de bono)
|
|
26
26
|
tripId?: string; // ID del viaje (opcional)
|
|
27
27
|
packageId?: string; // ID del paquete (opcional)
|
|
28
28
|
userId: string; // Usuario que realizó el pago
|
|
@@ -57,7 +57,7 @@ export interface AdminEarningsAttributes {
|
|
|
57
57
|
|
|
58
58
|
// Interface para crear nuevas ganancias de admin
|
|
59
59
|
export interface CreateAdminEarningsData {
|
|
60
|
-
paymentId
|
|
60
|
+
paymentId?: string; // Opcional para registros de bono
|
|
61
61
|
tripId?: string;
|
|
62
62
|
packageId?: string;
|
|
63
63
|
userId: string;
|
|
@@ -106,10 +106,11 @@ export class AdminEarnings extends Model<
|
|
|
106
106
|
@ForeignKey(() => Payment)
|
|
107
107
|
@Column({
|
|
108
108
|
type: DataType.UUID,
|
|
109
|
-
allowNull:
|
|
110
|
-
unique:
|
|
109
|
+
allowNull: true, // Opcional para registros de bono que no tienen pago asociado
|
|
110
|
+
unique: false, // Ya no puede ser único porque múltiples registros de bono tendrían null
|
|
111
|
+
comment: "ID del pago asociado (opcional para registros de bono)",
|
|
111
112
|
})
|
|
112
|
-
paymentId
|
|
113
|
+
paymentId?: string;
|
|
113
114
|
|
|
114
115
|
@ForeignKey(() => Trip)
|
|
115
116
|
@Column({
|
|
@@ -260,8 +261,6 @@ export class AdminEarnings extends Model<
|
|
|
260
261
|
type: DataType.ENUM(...Object.values(AdminEarningsType)),
|
|
261
262
|
allowNull: true,
|
|
262
263
|
defaultValue: AdminEarningsType.GANANCIA,
|
|
263
|
-
comment:
|
|
264
|
-
"Tipo de registro: 'ganancia' para ganancias normales de viajes/paquetes, 'descuento' para pagos de bonos semanales al conductor (que son descuentos de las ganancias). Por defecto siempre es 'ganancia'",
|
|
265
264
|
})
|
|
266
265
|
earningsType?: AdminEarningsType;
|
|
267
266
|
|
|
@@ -269,8 +268,6 @@ export class AdminEarnings extends Model<
|
|
|
269
268
|
type: DataType.BOOLEAN,
|
|
270
269
|
defaultValue: false,
|
|
271
270
|
allowNull: true,
|
|
272
|
-
comment:
|
|
273
|
-
"Indica si este registro es un pago de bono semanal al conductor (true) o una ganancia normal de un viaje/paquete (false). Por defecto siempre es false (ganancia normal)",
|
|
274
271
|
})
|
|
275
272
|
isBonusPayment?: boolean;
|
|
276
273
|
|
|
@@ -278,8 +275,6 @@ export class AdminEarnings extends Model<
|
|
|
278
275
|
type: DataType.DECIMAL(10, 2),
|
|
279
276
|
allowNull: true,
|
|
280
277
|
defaultValue: 0.0,
|
|
281
|
-
comment:
|
|
282
|
-
"Monto neto del bono pagado al conductor después de aplicar todas las retenciones (IVA 8%, ISR 2.1%, IMSS Obrero 2.5%). Solo tiene valor cuando isBonusPayment es true",
|
|
283
278
|
})
|
|
284
279
|
bonusAmountPaid?: number;
|
|
285
280
|
|
|
@@ -287,24 +282,18 @@ export class AdminEarnings extends Model<
|
|
|
287
282
|
type: DataType.DECIMAL(10, 2),
|
|
288
283
|
allowNull: true,
|
|
289
284
|
defaultValue: 0.0,
|
|
290
|
-
comment:
|
|
291
|
-
"Monto bruto del bono antes de aplicar retenciones. Se calcula como: GananciasBrutasSemana * PorcentajeBono. Solo tiene valor cuando isBonusPayment es true",
|
|
292
285
|
})
|
|
293
286
|
bonusGrossAmount?: number;
|
|
294
287
|
|
|
295
288
|
@Column({
|
|
296
289
|
type: DataType.DECIMAL(5, 2),
|
|
297
290
|
allowNull: true,
|
|
298
|
-
comment:
|
|
299
|
-
"Porcentaje del bono aplicado según la categoría del conductor: 13.00 para categoría A, 7.00 para categoría B, 0.00 para categoría C. Solo tiene valor cuando isBonusPayment es true",
|
|
300
291
|
})
|
|
301
292
|
bonusPercentage?: number;
|
|
302
293
|
|
|
303
294
|
@Column({
|
|
304
295
|
type: DataType.STRING,
|
|
305
296
|
allowNull: true,
|
|
306
|
-
comment:
|
|
307
|
-
"Categoría del conductor que determina el porcentaje del bono: 'A' (13% de bono), 'B' (7% de bono) o 'C' (0% de bono). Solo tiene valor cuando isBonusPayment es true",
|
|
308
297
|
})
|
|
309
298
|
bonusCategory?: string;
|
|
310
299
|
|