uaxi-shared-entities 1.0.93 → 1.0.95

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.
@@ -4,6 +4,10 @@ import { Trip } from "./trips.entity";
4
4
  import { Package } from "./package.entity";
5
5
  import { User } from "./user.entity";
6
6
  import { Coupon } from "./coupon.entity";
7
+ export declare enum AdminEarningsType {
8
+ GANANCIA = "ganancia",// Ganancias normales de viajes/paquetes
9
+ DESCUENTO = "descuento"
10
+ }
7
11
  export interface AdminEarningsAttributes {
8
12
  id: string;
9
13
  paymentId: string;
@@ -27,6 +31,12 @@ export interface AdminEarningsAttributes {
27
31
  isTransferred: boolean;
28
32
  transferredAt: Date;
29
33
  transferId: string;
34
+ earningsType: AdminEarningsType;
35
+ isBonusPayment: boolean;
36
+ bonusAmountPaid: number;
37
+ bonusGrossAmount: number;
38
+ bonusPercentage: number;
39
+ bonusCategory: string;
30
40
  createdAt: Date;
31
41
  updatedAt: Date;
32
42
  deletedAt: Date;
@@ -53,6 +63,12 @@ export interface CreateAdminEarningsData {
53
63
  isTransferred?: boolean;
54
64
  transferredAt?: Date;
55
65
  transferId?: string;
66
+ earningsType?: AdminEarningsType;
67
+ isBonusPayment?: boolean;
68
+ bonusAmountPaid?: number;
69
+ bonusGrossAmount?: number;
70
+ bonusPercentage?: number;
71
+ bonusCategory?: string;
56
72
  }
57
73
  export declare class AdminEarnings extends Model<AdminEarningsAttributes, CreateAdminEarningsData> {
58
74
  id: string;
@@ -77,6 +93,12 @@ export declare class AdminEarnings extends Model<AdminEarningsAttributes, Create
77
93
  isTransferred: boolean;
78
94
  transferredAt: Date;
79
95
  transferId: string;
96
+ earningsType?: AdminEarningsType;
97
+ isBonusPayment?: boolean;
98
+ bonusAmountPaid?: number;
99
+ bonusGrossAmount?: number;
100
+ bonusPercentage?: number;
101
+ bonusCategory?: string;
80
102
  deletedAt: Date;
81
103
  payment: Payment;
82
104
  trip?: Trip;
@@ -91,5 +113,10 @@ export declare class AdminEarnings extends Model<AdminEarningsAttributes, Create
91
113
  get platformLossFromCoupon(): number;
92
114
  get adminEarningsBeforeDiscount(): number;
93
115
  get adminLossFromCoupon(): number;
116
+ get isNormalEarning(): boolean;
117
+ get isBonusEarning(): boolean;
118
+ get earningsTypeDescription(): string;
119
+ get bonusDeductionFromEarnings(): number;
120
+ get totalBonusPaidToDriver(): number;
94
121
  }
95
122
  //# sourceMappingURL=admin-earnings.entity.d.ts.map
@@ -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,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yBAAyB,EAAE,MAAM,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,4BAA4B,EAAE,MAAM,CAAC;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,IAAI,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yBAAyB,EAAE,MAAM,CAAC;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,4BAA4B,EAAE,MAAM,CAAC;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAKa,aAAc,SAAQ,KAAK,CACtC,uBAAuB,EACvB,uBAAuB,CACxB;IAMS,EAAE,EAAE,MAAM,CAAC;IAQnB,SAAS,EAAE,MAAM,CAAC;IAQlB,MAAM,CAAC,EAAE,MAAM,CAAC;IAQhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAQnB,MAAM,EAAE,MAAM,CAAC;IAOf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAOlB,UAAU,EAAE,MAAM,CAAC;IAOnB,SAAS,EAAE,MAAM,CAAC;IAQlB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAOlB,cAAc,EAAE,MAAM,CAAC;IAOvB,mBAAmB,EAAE,MAAM,CAAC;IAO5B,kBAAkB,EAAE,MAAM,CAAC;IAO3B,yBAAyB,EAAE,MAAM,CAAC;IAQlC,aAAa,EAAE,MAAM,CAAC;IAOtB,4BAA4B,EAAE,MAAM,CAAC;IAOrC,cAAc,EAAE,MAAM,CAAC;IAOvB,aAAa,EAAE,MAAM,CAAC;IAOtB,aAAa,EAAE,MAAM,CAAC;IAOtB,WAAW,EAAE,IAAI,CAAC;IAOlB,aAAa,EAAE,OAAO,CAAC;IAOvB,aAAa,EAAE,IAAI,CAAC;IAOpB,UAAU,EAAE,MAAM,CAAC;IAGX,SAAS,EAAE,IAAI,CAAC;IAIxB,OAAO,EAAE,OAAO,CAAC;IAGjB,IAAI,CAAC,EAAE,IAAI,CAAC;IAGZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAGlB,IAAI,EAAE,IAAI,CAAC;IAGX,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,sBAAsB,IAAI,MAAM,CAEnC;IAED,IAAI,2BAA2B,IAAI,MAAM,CAGxC;IAED,IAAI,mBAAmB,IAAI,MAAM,CAGhC;CACF"}
1
+ {"version":3,"file":"admin-earnings.entity.d.ts","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
@@ -9,13 +9,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.AdminEarnings = void 0;
12
+ exports.AdminEarnings = exports.AdminEarningsType = void 0;
13
13
  const sequelize_typescript_1 = require("sequelize-typescript");
14
14
  const payments_entity_1 = require("./payments.entity");
15
15
  const trips_entity_1 = require("./trips.entity");
16
16
  const package_entity_1 = require("./package.entity");
17
17
  const user_entity_1 = require("./user.entity");
18
18
  const coupon_entity_1 = require("./coupon.entity");
19
+ // Enum para el tipo de registro de ganancias del admin
20
+ var AdminEarningsType;
21
+ (function (AdminEarningsType) {
22
+ AdminEarningsType["GANANCIA"] = "ganancia";
23
+ AdminEarningsType["DESCUENTO"] = "descuento";
24
+ })(AdminEarningsType || (exports.AdminEarningsType = AdminEarningsType = {}));
19
25
  let AdminEarnings = class AdminEarnings extends sequelize_typescript_1.Model {
20
26
  // Métodos de conveniencia
21
27
  get commissionRate() {
@@ -44,6 +50,28 @@ let AdminEarnings = class AdminEarnings extends sequelize_typescript_1.Model {
44
50
  // Pérdida del admin por el cupón
45
51
  return this.adminEarningsWithoutDiscount - this.adminEarnings;
46
52
  }
53
+ // Métodos de conveniencia para bonos
54
+ get isNormalEarning() {
55
+ return this.isBonusPayment === false || this.isBonusPayment === undefined;
56
+ }
57
+ get isBonusEarning() {
58
+ return this.isBonusPayment === true;
59
+ }
60
+ get earningsTypeDescription() {
61
+ return (this.earningsType ||
62
+ (this.isBonusPayment
63
+ ? AdminEarningsType.DESCUENTO
64
+ : AdminEarningsType.GANANCIA));
65
+ }
66
+ get bonusDeductionFromEarnings() {
67
+ // Monto que se descuenta de las ganancias del admin por el pago del bono
68
+ // Es el monto bruto del bono (lo que se paga al conductor antes de retenciones)
69
+ return this.bonusGrossAmount || 0;
70
+ }
71
+ get totalBonusPaidToDriver() {
72
+ // Monto total del bono pagado al conductor (neto después de retenciones)
73
+ return this.bonusAmountPaid || 0;
74
+ }
47
75
  };
48
76
  exports.AdminEarnings = AdminEarnings;
49
77
  __decorate([
@@ -227,6 +255,52 @@ __decorate([
227
255
  }),
228
256
  __metadata("design:type", String)
229
257
  ], AdminEarnings.prototype, "transferId", void 0);
258
+ __decorate([
259
+ (0, sequelize_typescript_1.Column)({
260
+ type: sequelize_typescript_1.DataType.ENUM(...Object.values(AdminEarningsType)),
261
+ allowNull: true,
262
+ defaultValue: AdminEarningsType.GANANCIA,
263
+ }),
264
+ __metadata("design:type", String)
265
+ ], AdminEarnings.prototype, "earningsType", void 0);
266
+ __decorate([
267
+ (0, sequelize_typescript_1.Column)({
268
+ type: sequelize_typescript_1.DataType.BOOLEAN,
269
+ defaultValue: false,
270
+ allowNull: true,
271
+ }),
272
+ __metadata("design:type", Boolean)
273
+ ], AdminEarnings.prototype, "isBonusPayment", void 0);
274
+ __decorate([
275
+ (0, sequelize_typescript_1.Column)({
276
+ type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
277
+ allowNull: true,
278
+ defaultValue: 0.0,
279
+ }),
280
+ __metadata("design:type", Number)
281
+ ], AdminEarnings.prototype, "bonusAmountPaid", void 0);
282
+ __decorate([
283
+ (0, sequelize_typescript_1.Column)({
284
+ type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
285
+ allowNull: true,
286
+ defaultValue: 0.0,
287
+ }),
288
+ __metadata("design:type", Number)
289
+ ], AdminEarnings.prototype, "bonusGrossAmount", void 0);
290
+ __decorate([
291
+ (0, sequelize_typescript_1.Column)({
292
+ type: sequelize_typescript_1.DataType.DECIMAL(5, 2),
293
+ allowNull: true,
294
+ }),
295
+ __metadata("design:type", Number)
296
+ ], AdminEarnings.prototype, "bonusPercentage", void 0);
297
+ __decorate([
298
+ (0, sequelize_typescript_1.Column)({
299
+ type: sequelize_typescript_1.DataType.STRING,
300
+ allowNull: true,
301
+ }),
302
+ __metadata("design:type", String)
303
+ ], AdminEarnings.prototype, "bonusCategory", void 0);
230
304
  __decorate([
231
305
  sequelize_typescript_1.DeletedAt,
232
306
  __metadata("design:type", Date)
@@ -1 +1 @@
1
- {"version":3,"file":"admin-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"admin-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,6 @@ import { DriverProfile } from "./driver.entity";
3
3
  import { Trip } from "./trips.entity";
4
4
  import { Package } from "./package.entity";
5
5
  import { DriverDeductions } from "./driver-deductions.entity";
6
- import { DriverClassification } from "../enums";
7
6
  export interface DriverEarningsAttributes {
8
7
  id: string;
9
8
  driverId: string;
@@ -12,8 +11,6 @@ export interface DriverEarningsAttributes {
12
11
  grossEarnings: number;
13
12
  netEarnings: number;
14
13
  totalDeductions: number;
15
- bono: number;
16
- driverClassification: DriverClassification | null;
17
14
  isProcessed: boolean;
18
15
  processedAt: Date;
19
16
  stripeTransferId: string;
@@ -29,8 +26,6 @@ export interface CreateDriverEarningsData {
29
26
  grossEarnings: number;
30
27
  netEarnings?: number;
31
28
  totalDeductions?: number;
32
- bono?: number;
33
- driverClassification?: DriverClassification | null;
34
29
  isProcessed?: boolean;
35
30
  processedAt?: Date;
36
31
  stripeTransferId?: string;
@@ -44,8 +39,6 @@ export declare class DriverEarnings extends Model<DriverEarningsAttributes, Crea
44
39
  grossEarnings: number;
45
40
  netEarnings: number;
46
41
  totalDeductions: number;
47
- bono: number;
48
- driverClassification: DriverClassification | null;
49
42
  isProcessed: boolean;
50
43
  processedAt: Date;
51
44
  stripeTransferId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"driver-earnings.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-earnings.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGhD,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAClD,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,IAAI,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAKa,cAAe,SAAQ,KAAK,CACvC,wBAAwB,EACxB,wBAAwB,CACzB;IAMS,EAAE,EAAE,MAAM,CAAC;IAOnB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,CAAC;IAOf,SAAS,EAAE,MAAM,CAAC;IAOlB,aAAa,EAAE,MAAM,CAAC;IAOtB,WAAW,EAAE,MAAM,CAAC;IAOpB,eAAe,EAAE,MAAM,CAAC;IAOxB,IAAI,EAAE,MAAM,CAAC;IAMb,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAOlD,WAAW,EAAE,OAAO,CAAC;IAOrB,WAAW,EAAE,IAAI,CAAC;IAQlB,gBAAgB,EAAE,MAAM,CAAC;IAOzB,UAAU,EAAE,MAAM,CAAC;IAGX,SAAS,EAAE,IAAI,CAAC;IAIxB,MAAM,EAAE,aAAa,CAAC;IAGtB,IAAI,EAAE,IAAI,CAAC;IAGX,OAAO,EAAE,OAAO,CAAC;IAGjB,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAChC"}
1
+ {"version":3,"file":"driver-earnings.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-earnings.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,IAAI,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAKa,cAAe,SAAQ,KAAK,CACvC,wBAAwB,EACxB,wBAAwB,CACzB;IAMS,EAAE,EAAE,MAAM,CAAC;IAOnB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,CAAC;IAOf,SAAS,EAAE,MAAM,CAAC;IAOlB,aAAa,EAAE,MAAM,CAAC;IAOtB,WAAW,EAAE,MAAM,CAAC;IAOpB,eAAe,EAAE,MAAM,CAAC;IAOxB,WAAW,EAAE,OAAO,CAAC;IAOrB,WAAW,EAAE,IAAI,CAAC;IAQlB,gBAAgB,EAAE,MAAM,CAAC;IAOzB,UAAU,EAAE,MAAM,CAAC;IAGX,SAAS,EAAE,IAAI,CAAC;IAIxB,MAAM,EAAE,aAAa,CAAC;IAGtB,IAAI,EAAE,IAAI,CAAC;IAGX,OAAO,EAAE,OAAO,CAAC;IAGjB,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAChC"}
@@ -15,7 +15,6 @@ const driver_entity_1 = require("./driver.entity");
15
15
  const trips_entity_1 = require("./trips.entity");
16
16
  const package_entity_1 = require("./package.entity");
17
17
  const driver_deductions_entity_1 = require("./driver-deductions.entity");
18
- const enums_1 = require("../enums");
19
18
  let DriverEarnings = class DriverEarnings extends sequelize_typescript_1.Model {
20
19
  };
21
20
  exports.DriverEarnings = DriverEarnings;
@@ -75,21 +74,6 @@ __decorate([
75
74
  }),
76
75
  __metadata("design:type", Number)
77
76
  ], DriverEarnings.prototype, "totalDeductions", void 0);
78
- __decorate([
79
- (0, sequelize_typescript_1.Column)({
80
- type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
81
- defaultValue: 0.0,
82
- allowNull: true,
83
- }),
84
- __metadata("design:type", Number)
85
- ], DriverEarnings.prototype, "bono", void 0);
86
- __decorate([
87
- (0, sequelize_typescript_1.Column)({
88
- type: sequelize_typescript_1.DataType.ENUM(...Object.values(enums_1.DriverClassification)),
89
- allowNull: true,
90
- }),
91
- __metadata("design:type", Object)
92
- ], DriverEarnings.prototype, "driverClassification", void 0);
93
77
  __decorate([
94
78
  (0, sequelize_typescript_1.Column)({
95
79
  type: sequelize_typescript_1.DataType.BOOLEAN,
@@ -1 +1 @@
1
- {"version":3,"file":"driver-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/driver-earnings.entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/driver-earnings.entity.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,11 @@ export interface DriverTransfersAttributes {
14
14
  status: DriverTransferStatus;
15
15
  failureReason: string;
16
16
  processedAt: Date;
17
+ hasBonus: boolean;
18
+ bonusGrossAmount: number;
19
+ bonusNetAmount: number;
20
+ bonusPercentage: number;
21
+ bonusCategory: string;
17
22
  createdAt: Date;
18
23
  updatedAt: Date;
19
24
  deletedAt: Date;
@@ -29,6 +34,11 @@ export interface CreateDriverTransfersData {
29
34
  status?: DriverTransferStatus;
30
35
  failureReason?: string;
31
36
  processedAt?: Date;
37
+ hasBonus?: boolean;
38
+ bonusGrossAmount?: number;
39
+ bonusNetAmount?: number;
40
+ bonusPercentage?: number;
41
+ bonusCategory?: string;
32
42
  }
33
43
  export declare class DriverTransfers extends Model<DriverTransfersAttributes, CreateDriverTransfersData> {
34
44
  id: string;
@@ -42,8 +52,16 @@ export declare class DriverTransfers extends Model<DriverTransfersAttributes, Cr
42
52
  status: DriverTransferStatus;
43
53
  failureReason: string;
44
54
  processedAt: Date;
55
+ hasBonus?: boolean;
56
+ bonusGrossAmount?: number;
57
+ bonusNetAmount?: number;
58
+ bonusPercentage?: number;
59
+ bonusCategory?: string;
45
60
  deletedAt: Date;
46
61
  driver: DriverProfile;
47
62
  earnings: DriverEarnings;
63
+ get includesBonus(): boolean;
64
+ get totalBonusDeductions(): number;
65
+ get bonusDescription(): string;
48
66
  }
49
67
  //# sourceMappingURL=driver-transfers.entity.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"driver-transfers.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-transfers.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG9D,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,IAAI,CAAC;CACpB;AAED,qBAKa,eAAgB,SAAQ,KAAK,CACxC,yBAAyB,EACzB,yBAAyB,CAC1B;IAMS,EAAE,EAAE,MAAM,CAAC;IAQnB,QAAQ,EAAE,MAAM,CAAC;IAOjB,UAAU,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAOf,gBAAgB,EAAE,MAAM,CAAC;IAMzB,cAAc,EAAE,MAAM,CAAC;IAOvB,eAAe,EAAE,MAAM,CAAC;IAMxB,YAAY,EAAE,YAAY,CAAC;IAM3B,MAAM,EAAE,oBAAoB,CAAC;IAO7B,aAAa,EAAE,MAAM,CAAC;IAOtB,WAAW,EAAE,IAAI,CAAC;IAGV,SAAS,EAAE,IAAI,CAAC;IAIxB,MAAM,EAAE,aAAa,CAAC;IAGtB,QAAQ,EAAE,cAAc,CAAC;CAC1B"}
1
+ {"version":3,"file":"driver-transfers.entity.d.ts","sourceRoot":"","sources":["../../src/entities/driver-transfers.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG9D,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,IAAI,CAAC;IAElB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,IAAI,CAAC;IAEnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAKa,eAAgB,SAAQ,KAAK,CACxC,yBAAyB,EACzB,yBAAyB,CAC1B;IAMS,EAAE,EAAE,MAAM,CAAC;IAQnB,QAAQ,EAAE,MAAM,CAAC;IAOjB,UAAU,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAOf,gBAAgB,EAAE,MAAM,CAAC;IAMzB,cAAc,EAAE,MAAM,CAAC;IAOvB,eAAe,EAAE,MAAM,CAAC;IAMxB,YAAY,EAAE,YAAY,CAAC;IAM3B,MAAM,EAAE,oBAAoB,CAAC;IAO7B,aAAa,EAAE,MAAM,CAAC;IAOtB,WAAW,EAAE,IAAI,CAAC;IASlB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAOnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAO1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAMxB,eAAe,CAAC,EAAE,MAAM,CAAC;IAMzB,aAAa,CAAC,EAAE,MAAM,CAAC;IAGf,SAAS,EAAE,IAAI,CAAC;IAIxB,MAAM,EAAE,aAAa,CAAC;IAGtB,QAAQ,EAAE,cAAc,CAAC;IAGzB,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,IAAI,oBAAoB,IAAI,MAAM,CAGjC;IAED,IAAI,gBAAgB,IAAI,MAAM,CAS7B;CACF"}
@@ -15,6 +15,20 @@ const driver_entity_1 = require("./driver.entity");
15
15
  const driver_earnings_entity_1 = require("./driver-earnings.entity");
16
16
  const enums_1 = require("../enums");
17
17
  let DriverTransfers = class DriverTransfers extends sequelize_typescript_1.Model {
18
+ // Métodos de conveniencia para bono
19
+ get includesBonus() {
20
+ return this.hasBonus === true;
21
+ }
22
+ get totalBonusDeductions() {
23
+ // Total de retenciones aplicadas al bono
24
+ return (this.bonusGrossAmount || 0) - (this.bonusNetAmount || 0);
25
+ }
26
+ get bonusDescription() {
27
+ if (!this.hasBonus) {
28
+ return "Sin bono";
29
+ }
30
+ return `Bono ${this.bonusCategory || "N/A"} (${this.bonusPercentage || 0}%) - Bruto: $${this.bonusGrossAmount || 0}, Neto: $${this.bonusNetAmount || 0}`;
31
+ }
18
32
  };
19
33
  exports.DriverTransfers = DriverTransfers;
20
34
  __decorate([
@@ -103,6 +117,45 @@ __decorate([
103
117
  }),
104
118
  __metadata("design:type", Date)
105
119
  ], DriverTransfers.prototype, "processedAt", void 0);
120
+ __decorate([
121
+ (0, sequelize_typescript_1.Column)({
122
+ type: sequelize_typescript_1.DataType.BOOLEAN,
123
+ defaultValue: false,
124
+ allowNull: true,
125
+ comment: "Indica si esta transferencia incluye un bono semanal pagado al conductor. Por defecto es false",
126
+ }),
127
+ __metadata("design:type", Boolean)
128
+ ], DriverTransfers.prototype, "hasBonus", void 0);
129
+ __decorate([
130
+ (0, sequelize_typescript_1.Column)({
131
+ type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
132
+ allowNull: true,
133
+ defaultValue: 0.0,
134
+ }),
135
+ __metadata("design:type", Number)
136
+ ], DriverTransfers.prototype, "bonusGrossAmount", void 0);
137
+ __decorate([
138
+ (0, sequelize_typescript_1.Column)({
139
+ type: sequelize_typescript_1.DataType.DECIMAL(10, 2),
140
+ allowNull: true,
141
+ defaultValue: 0.0,
142
+ }),
143
+ __metadata("design:type", Number)
144
+ ], DriverTransfers.prototype, "bonusNetAmount", void 0);
145
+ __decorate([
146
+ (0, sequelize_typescript_1.Column)({
147
+ type: sequelize_typescript_1.DataType.DECIMAL(5, 2),
148
+ allowNull: true,
149
+ }),
150
+ __metadata("design:type", Number)
151
+ ], DriverTransfers.prototype, "bonusPercentage", void 0);
152
+ __decorate([
153
+ (0, sequelize_typescript_1.Column)({
154
+ type: sequelize_typescript_1.DataType.STRING,
155
+ allowNull: true,
156
+ }),
157
+ __metadata("design:type", String)
158
+ ], DriverTransfers.prototype, "bonusCategory", void 0);
106
159
  __decorate([
107
160
  sequelize_typescript_1.DeletedAt,
108
161
  __metadata("design:type", Date)
@@ -1 +1 @@
1
- {"version":3,"file":"driver-transfers.entity.js","sourceRoot":"","sources":["../../src/entities/driver-transfers.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAQ8B;AAC9B,mDAAgD;AAChD,qEAA0D;AAC1D,oCAA8D;AAuCvD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,4BAGpC;CAqFA,CAAA;AAxFY,0CAAe;AASlB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;2CACiB;AAQnB;IANC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;IAC/B,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,oCAAoC;KAC9C,CAAC;;iDACe;AAOjB;IALC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,uCAAc,CAAC;IAChC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;KAChB,CAAC;;mDACiB;AAOnB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,6BAA6B;KACvC,CAAC;;+CACa;AAOf;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE,IAAI;KACb,CAAC;;yDACuB;AAMzB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;KAChB,CAAC;;uDACqB;AAOvB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,gDAAgD;KAC1D,CAAC;;wDACsB;AAMxB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC;QACnD,SAAS,EAAE,KAAK;KACjB,CAAC;;qDACyB;AAM3B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,4BAAoB,CAAC,CAAC;QAC3D,YAAY,EAAE,4BAAoB,CAAC,OAAO;KAC3C,CAAC;;+CAC2B;AAO7B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,2CAA2C;KACrD,CAAC;;sDACoB;AAOtB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,iDAAiD;KAC3D,CAAC;8BACW,IAAI;oDAAC;AAGV;IADP,gCAAS;8BACS,IAAI;kDAAC;AAIxB;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;8BACvB,6BAAa;+CAAC;AAGtB;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,CAAC;8BACtB,uCAAc;iDAAC;0BAvFd,eAAe;IAL3B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,kBAAkB;QAC7B,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI,EAAE,uBAAuB;KACxC,CAAC;GACW,eAAe,CAwF3B"}
1
+ {"version":3,"file":"driver-transfers.entity.js","sourceRoot":"","sources":["../../src/entities/driver-transfers.entity.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ export interface SystemConfigurationAttributes {
6
6
  driverCancelWithoutPenaltyMinutes?: number;
7
7
  autoCancelTimeoutMinutes?: number;
8
8
  maxSearchRadiusKm?: number;
9
+ baseMultiplier?: number;
9
10
  priceService?: any;
10
11
  createdAt: Date;
11
12
  updatedAt: Date;
@@ -18,6 +19,7 @@ export interface CreateSystemConfigurationData {
18
19
  driverCancelWithoutPenaltyMinutes?: number;
19
20
  autoCancelTimeoutMinutes?: number;
20
21
  maxSearchRadiusKm?: number;
22
+ baseMultiplier?: number;
21
23
  priceService?: any;
22
24
  }
23
25
  export declare class SystemConfiguration extends Model<SystemConfigurationAttributes, CreateSystemConfigurationData> {
@@ -27,6 +29,7 @@ export declare class SystemConfiguration extends Model<SystemConfigurationAttrib
27
29
  driverCancelWithoutPenaltyMinutes?: number;
28
30
  autoCancelTimeoutMinutes?: number;
29
31
  maxSearchRadiusKm?: number;
32
+ baseMultiplier?: number;
30
33
  priceService?: any;
31
34
  createdAt: Date;
32
35
  updatedAt: Date;
@@ -1 +1 @@
1
- {"version":3,"file":"system-configuration.entity.d.ts","sourceRoot":"","sources":["../../src/entities/system-configuration.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAKN,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,qBAWa,mBAAoB,SAAQ,KAAK,CAC5C,6BAA6B,EAC7B,6BAA6B,CAC9B;IAMS,EAAE,EAAE,MAAM,CAAC;IAMnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAM3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAMrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAM3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAMlC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAM3B,YAAY,CAAC,EAAE,GAAG,CAAC;IAGnB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACzB"}
1
+ {"version":3,"file":"system-configuration.entity.d.ts","sourceRoot":"","sources":["../../src/entities/system-configuration.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAKN,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,qBAWa,mBAAoB,SAAQ,KAAK,CAC5C,6BAA6B,EAC7B,6BAA6B,CAC9B;IAMS,EAAE,EAAE,MAAM,CAAC;IAMnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAM3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAMrC,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAM3C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAMlC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAO3B,cAAc,CAAC,EAAE,MAAM,CAAC;IAMxB,YAAY,CAAC,EAAE,GAAG,CAAC;IAGnB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACzB"}
@@ -57,6 +57,14 @@ __decorate([
57
57
  }),
58
58
  __metadata("design:type", Number)
59
59
  ], SystemConfiguration.prototype, "maxSearchRadiusKm", void 0);
60
+ __decorate([
61
+ (0, sequelize_typescript_1.Column)({
62
+ type: sequelize_typescript_1.DataType.DECIMAL(5, 2),
63
+ allowNull: true,
64
+ defaultValue: 1.3,
65
+ }),
66
+ __metadata("design:type", Number)
67
+ ], SystemConfiguration.prototype, "baseMultiplier", void 0);
60
68
  __decorate([
61
69
  (0, sequelize_typescript_1.Column)({
62
70
  type: sequelize_typescript_1.DataType.JSON,
@@ -1 +1 @@
1
- {"version":3,"file":"system-configuration.entity.js","sourceRoot":"","sources":["../../src/entities/system-configuration.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAQ8B;AAoCvB,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAGxC;CAoDA,CAAA;AAvDY,kDAAmB;AAStB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;+CACiB;AAMnB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;;8DACyB;AAM3B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;wEACmC;AAMrC;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;8EACyC;AAM3C;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;qEACgC;AAMlC;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;;8DACyB;AAM3B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;KAChB,CAAC;;yDACiB;AAGnB;IADC,gCAAS;8BACC,IAAI;sDAAC;AAGhB;IADC,gCAAS;8BACC,IAAI;sDAAC;AAGhB;IADC,gCAAS;;sDACc;8BAtDb,mBAAmB;IAX/B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,uBAAuB;QAClC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE;YACP;gBACE,MAAM,EAAE,CAAC,WAAW,CAAC;gBACrB,IAAI,EAAE,sCAAsC;aAC7C;SACF;KACF,CAAC;GACW,mBAAmB,CAuD/B"}
1
+ {"version":3,"file":"system-configuration.entity.js","sourceRoot":"","sources":["../../src/entities/system-configuration.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAQ8B;AAsCvB,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAGxC;CA2DA,CAAA;AA9DY,kDAAmB;AAStB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;+CACiB;AAMnB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;;8DACyB;AAM3B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;wEACmC;AAMrC;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;8EACyC;AAM3C;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,IAAI;KAChB,CAAC;;qEACgC;AAMlC;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;;8DACyB;AAO3B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI;QACf,YAAY,EAAE,GAAG;KAClB,CAAC;;2DACsB;AAMxB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;KAChB,CAAC;;yDACiB;AAGnB;IADC,gCAAS;8BACC,IAAI;sDAAC;AAGhB;IADC,gCAAS;8BACC,IAAI;sDAAC;AAGhB;IADC,gCAAS;;sDACc;8BA7Db,mBAAmB;IAX/B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,uBAAuB;QAClC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE;YACP;gBACE,MAAM,EAAE,CAAC,WAAW,CAAC;gBACrB,IAAI,EAAE,sCAAsC;aAC7C;SACF;KACF,CAAC;GACW,mBAAmB,CA8D/B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "uaxi-shared-entities",
3
- "version": "1.0.93",
3
+ "version": "1.0.95",
4
4
  "description": "Entidades compartidas para microservicios UAXI",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -13,6 +13,12 @@ import { Package } from "./package.entity";
13
13
  import { User } from "./user.entity";
14
14
  import { Coupon } from "./coupon.entity";
15
15
 
16
+ // Enum para el tipo de registro de ganancias del admin
17
+ export enum AdminEarningsType {
18
+ GANANCIA = "ganancia", // Ganancias normales de viajes/paquetes
19
+ DESCUENTO = "descuento", // Descuentos por pagos de bonos al conductor
20
+ }
21
+
16
22
  // Interface para los atributos de la entidad
17
23
  export interface AdminEarningsAttributes {
18
24
  id: string;
@@ -37,6 +43,13 @@ export interface AdminEarningsAttributes {
37
43
  isTransferred: boolean; // Si ya se transfirió a la cuenta del admin
38
44
  transferredAt: Date; // Fecha de transferencia
39
45
  transferId: string; // ID de la transferencia bancaria
46
+ // Campos para registro de bonos pagados al conductor
47
+ earningsType: AdminEarningsType; // Tipo de registro: "ganancia" (por defecto) o "descuento" (para bonos)
48
+ isBonusPayment: boolean; // Indica si este registro es un pago de bono al conductor (true) o una ganancia normal (false, por defecto)
49
+ bonusAmountPaid: number; // Monto neto del bono pagado al conductor después de aplicar retenciones (IVA, ISR, IMSS Obrero)
50
+ bonusGrossAmount: number; // Monto bruto del bono antes de aplicar retenciones (GananciasBrutasSemana * PorcentajeBono)
51
+ bonusPercentage: number; // 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
52
+ bonusCategory: string; // Categoría del conductor que determina el porcentaje del bono: "A" (13%), "B" (7%) o "C" (0%)
40
53
  createdAt: Date;
41
54
  updatedAt: Date;
42
55
  deletedAt: Date;
@@ -65,6 +78,13 @@ export interface CreateAdminEarningsData {
65
78
  isTransferred?: boolean;
66
79
  transferredAt?: Date;
67
80
  transferId?: string;
81
+ // Campos para registro de bonos pagados al conductor
82
+ earningsType?: AdminEarningsType; // Tipo de registro: "ganancia" (por defecto) o "descuento" (para bonos)
83
+ isBonusPayment?: boolean; // Indica si este registro es un pago de bono al conductor (true) o una ganancia normal (false, por defecto)
84
+ bonusAmountPaid?: number; // Monto neto del bono pagado al conductor después de aplicar retenciones (IVA, ISR, IMSS Obrero)
85
+ bonusGrossAmount?: number; // Monto bruto del bono antes de aplicar retenciones (GananciasBrutasSemana * PorcentajeBono)
86
+ bonusPercentage?: number; // 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
87
+ bonusCategory?: string; // Categoría del conductor que determina el porcentaje del bono: "A" (13%), "B" (7%) o "C" (0%)
68
88
  }
69
89
 
70
90
  @Table({
@@ -236,6 +256,46 @@ export class AdminEarnings extends Model<
236
256
  })
237
257
  transferId: string;
238
258
 
259
+ @Column({
260
+ type: DataType.ENUM(...Object.values(AdminEarningsType)),
261
+ allowNull: true,
262
+ defaultValue: AdminEarningsType.GANANCIA,
263
+ })
264
+ earningsType?: AdminEarningsType;
265
+
266
+ @Column({
267
+ type: DataType.BOOLEAN,
268
+ defaultValue: false,
269
+ allowNull: true,
270
+ })
271
+ isBonusPayment?: boolean;
272
+
273
+ @Column({
274
+ type: DataType.DECIMAL(10, 2),
275
+ allowNull: true,
276
+ defaultValue: 0.0,
277
+ })
278
+ bonusAmountPaid?: number;
279
+
280
+ @Column({
281
+ type: DataType.DECIMAL(10, 2),
282
+ allowNull: true,
283
+ defaultValue: 0.0,
284
+ })
285
+ bonusGrossAmount?: number;
286
+
287
+ @Column({
288
+ type: DataType.DECIMAL(5, 2),
289
+ allowNull: true,
290
+ })
291
+ bonusPercentage?: number;
292
+
293
+ @Column({
294
+ type: DataType.STRING,
295
+ allowNull: true,
296
+ })
297
+ bonusCategory?: string;
298
+
239
299
  @DeletedAt
240
300
  declare deletedAt: Date;
241
301
 
@@ -289,4 +349,33 @@ export class AdminEarnings extends Model<
289
349
  // Pérdida del admin por el cupón
290
350
  return this.adminEarningsWithoutDiscount - this.adminEarnings;
291
351
  }
352
+
353
+ // Métodos de conveniencia para bonos
354
+ get isNormalEarning(): boolean {
355
+ return this.isBonusPayment === false || this.isBonusPayment === undefined;
356
+ }
357
+
358
+ get isBonusEarning(): boolean {
359
+ return this.isBonusPayment === true;
360
+ }
361
+
362
+ get earningsTypeDescription(): string {
363
+ return (
364
+ this.earningsType ||
365
+ (this.isBonusPayment
366
+ ? AdminEarningsType.DESCUENTO
367
+ : AdminEarningsType.GANANCIA)
368
+ );
369
+ }
370
+
371
+ get bonusDeductionFromEarnings(): number {
372
+ // Monto que se descuenta de las ganancias del admin por el pago del bono
373
+ // Es el monto bruto del bono (lo que se paga al conductor antes de retenciones)
374
+ return this.bonusGrossAmount || 0;
375
+ }
376
+
377
+ get totalBonusPaidToDriver(): number {
378
+ // Monto total del bono pagado al conductor (neto después de retenciones)
379
+ return this.bonusAmountPaid || 0;
380
+ }
292
381
  }
@@ -12,7 +12,6 @@ import { DriverProfile } from "./driver.entity";
12
12
  import { Trip } from "./trips.entity";
13
13
  import { Package } from "./package.entity";
14
14
  import { DriverDeductions } from "./driver-deductions.entity";
15
- import { DriverClassification } from "../enums";
16
15
 
17
16
  // Interface para los atributos de la entidad
18
17
  export interface DriverEarningsAttributes {
@@ -23,8 +22,6 @@ export interface DriverEarningsAttributes {
23
22
  grossEarnings: number; // Ingresos brutos del viaje/paquete
24
23
  netEarnings: number; // Ingresos netos después de descuentos
25
24
  totalDeductions: number; // Total de descuentos aplicados
26
- bono: number; // Bono otorgado al conductor según su clasificación
27
- driverClassification: DriverClassification | null; // Clasificación del conductor al momento de calcular las ganancias
28
25
  isProcessed: boolean; // Si ya se procesó el pago
29
26
  processedAt: Date; // Fecha de procesamiento
30
27
  stripeTransferId: string; // ID de la transferencia en Stripe (deprecated - usar DriverTransfers)
@@ -42,8 +39,6 @@ export interface CreateDriverEarningsData {
42
39
  grossEarnings: number;
43
40
  netEarnings?: number;
44
41
  totalDeductions?: number;
45
- bono?: number;
46
- driverClassification?: DriverClassification | null;
47
42
  isProcessed?: boolean;
48
43
  processedAt?: Date;
49
44
  stripeTransferId?: string;
@@ -108,19 +103,6 @@ export class DriverEarnings extends Model<
108
103
  })
109
104
  totalDeductions: number;
110
105
 
111
- @Column({
112
- type: DataType.DECIMAL(10, 2),
113
- defaultValue: 0.0,
114
- allowNull: true,
115
- })
116
- bono: number;
117
-
118
- @Column({
119
- type: DataType.ENUM(...Object.values(DriverClassification)),
120
- allowNull: true,
121
- })
122
- driverClassification: DriverClassification | null;
123
-
124
106
  @Column({
125
107
  type: DataType.BOOLEAN,
126
108
  defaultValue: false,
@@ -24,6 +24,12 @@ export interface DriverTransfersAttributes {
24
24
  status: DriverTransferStatus; // Estado de la transferencia
25
25
  failureReason: string; // Razón del fallo si aplica
26
26
  processedAt: Date; // Fecha de procesamiento
27
+ // Campos para bono semanal
28
+ hasBonus: boolean; // Indica si esta transferencia incluye un bono semanal
29
+ bonusGrossAmount: number; // Monto bruto del bono antes de aplicar retenciones (GananciasBrutasSemana * PorcentajeBono)
30
+ bonusNetAmount: number; // Monto neto del bono después de aplicar retenciones (IVA, ISR, IMSS Obrero)
31
+ bonusPercentage: number; // 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
32
+ bonusCategory: string; // Categoría del conductor que determina el porcentaje del bono: "A" (13%), "B" (7%) o "C" (0%)
27
33
  createdAt: Date;
28
34
  updatedAt: Date;
29
35
  deletedAt: Date;
@@ -41,6 +47,12 @@ export interface CreateDriverTransfersData {
41
47
  status?: DriverTransferStatus;
42
48
  failureReason?: string;
43
49
  processedAt?: Date;
50
+ // Campos para bono semanal
51
+ hasBonus?: boolean; // Indica si esta transferencia incluye un bono semanal
52
+ bonusGrossAmount?: number; // Monto bruto del bono antes de aplicar retenciones (GananciasBrutasSemana * PorcentajeBono)
53
+ bonusNetAmount?: number; // Monto neto del bono después de aplicar retenciones (IVA, ISR, IMSS Obrero)
54
+ bonusPercentage?: number; // 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
55
+ bonusCategory?: string; // Categoría del conductor que determina el porcentaje del bono: "A" (13%), "B" (7%) o "C" (0%)
44
56
  }
45
57
 
46
58
  @Table({
@@ -127,6 +139,41 @@ export class DriverTransfers extends Model<
127
139
  })
128
140
  processedAt: Date;
129
141
 
142
+ @Column({
143
+ type: DataType.BOOLEAN,
144
+ defaultValue: false,
145
+ allowNull: true,
146
+ comment:
147
+ "Indica si esta transferencia incluye un bono semanal pagado al conductor. Por defecto es false",
148
+ })
149
+ hasBonus?: boolean;
150
+
151
+ @Column({
152
+ type: DataType.DECIMAL(10, 2),
153
+ allowNull: true,
154
+ defaultValue: 0.0,
155
+ })
156
+ bonusGrossAmount?: number;
157
+
158
+ @Column({
159
+ type: DataType.DECIMAL(10, 2),
160
+ allowNull: true,
161
+ defaultValue: 0.0,
162
+ })
163
+ bonusNetAmount?: number;
164
+
165
+ @Column({
166
+ type: DataType.DECIMAL(5, 2),
167
+ allowNull: true,
168
+ })
169
+ bonusPercentage?: number;
170
+
171
+ @Column({
172
+ type: DataType.STRING,
173
+ allowNull: true,
174
+ })
175
+ bonusCategory?: string;
176
+
130
177
  @DeletedAt
131
178
  declare deletedAt: Date;
132
179
 
@@ -136,4 +183,25 @@ export class DriverTransfers extends Model<
136
183
 
137
184
  @BelongsTo(() => DriverEarnings)
138
185
  earnings: DriverEarnings;
186
+
187
+ // Métodos de conveniencia para bono
188
+ get includesBonus(): boolean {
189
+ return this.hasBonus === true;
190
+ }
191
+
192
+ get totalBonusDeductions(): number {
193
+ // Total de retenciones aplicadas al bono
194
+ return (this.bonusGrossAmount || 0) - (this.bonusNetAmount || 0);
195
+ }
196
+
197
+ get bonusDescription(): string {
198
+ if (!this.hasBonus) {
199
+ return "Sin bono";
200
+ }
201
+ return `Bono ${this.bonusCategory || "N/A"} (${
202
+ this.bonusPercentage || 0
203
+ }%) - Bruto: $${this.bonusGrossAmount || 0}, Neto: $${
204
+ this.bonusNetAmount || 0
205
+ }`;
206
+ }
139
207
  }
@@ -15,6 +15,7 @@ export interface SystemConfigurationAttributes {
15
15
  driverCancelWithoutPenaltyMinutes?: number;
16
16
  autoCancelTimeoutMinutes?: number;
17
17
  maxSearchRadiusKm?: number;
18
+ baseMultiplier?: number; // Factor R: Multiplicador base aplicado a todas las tarifas (por defecto 1.30)
18
19
  priceService?: any;
19
20
  createdAt: Date;
20
21
  updatedAt: Date;
@@ -28,6 +29,7 @@ export interface CreateSystemConfigurationData {
28
29
  driverCancelWithoutPenaltyMinutes?: number;
29
30
  autoCancelTimeoutMinutes?: number;
30
31
  maxSearchRadiusKm?: number;
32
+ baseMultiplier?: number; // Factor R: Multiplicador base aplicado a todas las tarifas (por defecto 1.30)
31
33
  priceService?: any;
32
34
  }
33
35
 
@@ -83,6 +85,13 @@ export class SystemConfiguration extends Model<
83
85
  })
84
86
  maxSearchRadiusKm?: number;
85
87
 
88
+ @Column({
89
+ type: DataType.DECIMAL(5, 2),
90
+ allowNull: true,
91
+ defaultValue: 1.3,
92
+ })
93
+ baseMultiplier?: number;
94
+
86
95
  @Column({
87
96
  type: DataType.JSON,
88
97
  allowNull: true,