uaxi-shared-entities 1.0.212 → 1.0.214
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/payments.entity.d.ts +3 -0
- package/dist/entities/payments.entity.d.ts.map +1 -1
- package/dist/entities/payments.entity.js +11 -0
- package/dist/entities/payments.entity.js.map +1 -1
- package/dist/entities/trip-accepted-driver.entity.d.ts +4 -0
- package/dist/entities/trip-accepted-driver.entity.d.ts.map +1 -1
- package/dist/entities/trip-accepted-driver.entity.js +8 -0
- package/dist/entities/trip-accepted-driver.entity.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/payments.entity.ts +12 -0
- package/src/entities/trip-accepted-driver.entity.ts +10 -0
|
@@ -13,6 +13,8 @@ export interface PaymentAttributes {
|
|
|
13
13
|
amount: number;
|
|
14
14
|
/** Total acumulado reembolsado sobre `amount` */
|
|
15
15
|
refundedAmount?: number;
|
|
16
|
+
/** Saldo restante tras reembolsos (amount - refundedAmount), calculado */
|
|
17
|
+
remainingAmount?: number;
|
|
16
18
|
paymentMethod: PaymentMethod;
|
|
17
19
|
status: PaymentStatus;
|
|
18
20
|
cardId: string;
|
|
@@ -60,6 +62,7 @@ export declare class Payment extends Model<PaymentAttributes, CreatePaymentData>
|
|
|
60
62
|
userId: string;
|
|
61
63
|
amount: number;
|
|
62
64
|
refundedAmount: number;
|
|
65
|
+
remainingAmount: number;
|
|
63
66
|
paymentMethod: PaymentMethod;
|
|
64
67
|
status: PaymentStatus;
|
|
65
68
|
cardId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payments.entity.d.ts","sourceRoot":"","sources":["../../src/entities/payments.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,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,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGxD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,GAAG,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,IAAI,CAAC;IAClB,2FAA2F;IAC3F,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,oFAAoF;IACpF,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAGD,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,qBAIa,OAAQ,SAAQ,KAAK,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAM9D,EAAE,EAAE,MAAM,CAAC;IAOnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAOhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAMf,MAAM,EAAE,MAAM,CAAC;IAQf,cAAc,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"payments.entity.d.ts","sourceRoot":"","sources":["../../src/entities/payments.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,17 @@ __decorate([
|
|
|
76
76
|
}),
|
|
77
77
|
__metadata("design:type", Number)
|
|
78
78
|
], Payment.prototype, "refundedAmount", void 0);
|
|
79
|
+
__decorate([
|
|
80
|
+
(0, sequelize_typescript_1.Column)({
|
|
81
|
+
type: sequelize_typescript_1.DataType.VIRTUAL,
|
|
82
|
+
get() {
|
|
83
|
+
const amount = Number(this.getDataValue('amount') ?? 0);
|
|
84
|
+
const refunded = Number(this.getDataValue('refundedAmount') ?? 0);
|
|
85
|
+
return Math.max(0, Math.round((amount - refunded) * 100) / 100);
|
|
86
|
+
},
|
|
87
|
+
}),
|
|
88
|
+
__metadata("design:type", Number)
|
|
89
|
+
], Payment.prototype, "remainingAmount", void 0);
|
|
79
90
|
__decorate([
|
|
80
91
|
(0, sequelize_typescript_1.Column)({
|
|
81
92
|
type: sequelize_typescript_1.DataType.ENUM(...Object.values(enums_1.PaymentMethod)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payments.entity.js","sourceRoot":"","sources":["../../src/entities/payments.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAQ8B;AAC9B,iDAAsC;AACtC,qDAA2C;AAC3C,+CAAqC;AACrC,uDAA6C;AAC7C,yEAA+D;AAC/D,oCAAwD;
|
|
1
|
+
{"version":3,"file":"payments.entity.js","sourceRoot":"","sources":["../../src/entities/payments.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ export interface TripAcceptedDriverAttributes {
|
|
|
14
14
|
/** Si después canceló: true; si sigue siendo el conductor del viaje: false */
|
|
15
15
|
cancelledAfterAccept: boolean;
|
|
16
16
|
cancelledAt: Date | null;
|
|
17
|
+
/** Motivo de liberación/cancelación tras aceptar (ej. ocupado en otro viaje al activar programado). */
|
|
18
|
+
cancelledReason: string | null;
|
|
17
19
|
/** Usuario admin que forzó la aceptación desde panel; null si aceptó el conductor en app. */
|
|
18
20
|
adminAcceptedId: string | null;
|
|
19
21
|
createdAt: Date;
|
|
@@ -27,6 +29,7 @@ export interface CreateTripAcceptedDriverData {
|
|
|
27
29
|
driverLongitude?: number | null;
|
|
28
30
|
cancelledAfterAccept?: boolean;
|
|
29
31
|
cancelledAt?: Date | null;
|
|
32
|
+
cancelledReason?: string | null;
|
|
30
33
|
adminAcceptedId?: string | null;
|
|
31
34
|
}
|
|
32
35
|
export declare class TripAcceptedDriver extends Model<TripAcceptedDriverAttributes, CreateTripAcceptedDriverData> {
|
|
@@ -38,6 +41,7 @@ export declare class TripAcceptedDriver extends Model<TripAcceptedDriverAttribut
|
|
|
38
41
|
driverLongitude: number | null;
|
|
39
42
|
cancelledAfterAccept: boolean;
|
|
40
43
|
cancelledAt: Date | null;
|
|
44
|
+
cancelledReason: string | null;
|
|
41
45
|
adminAcceptedId: string | null;
|
|
42
46
|
adminAcceptedBy: User | null;
|
|
43
47
|
trip: Trip;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-accepted-driver.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,+DAA+D;IAC/D,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,8EAA8E;IAC9E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,6FAA6F;IAC7F,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,qBAQa,kBAAmB,SAAQ,KAAK,CAC3C,4BAA4B,EAC5B,4BAA4B,CAC7B;IAMS,EAAE,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAOf,QAAQ,EAAE,MAAM,CAAC;IAOjB,UAAU,EAAE,IAAI,CAAC;IAOjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAO9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAM/B,oBAAoB,EAAE,OAAO,CAAC;IAM9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"trip-accepted-driver.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,+DAA+D;IAC/D,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,8EAA8E;IAC9E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,uGAAuG;IACvG,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,6FAA6F;IAC7F,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,qBAQa,kBAAmB,SAAQ,KAAK,CAC3C,4BAA4B,EAC5B,4BAA4B,CAC7B;IAMS,EAAE,EAAE,MAAM,CAAC;IAOnB,MAAM,EAAE,MAAM,CAAC;IAOf,QAAQ,EAAE,MAAM,CAAC;IAOjB,UAAU,EAAE,IAAI,CAAC;IAOjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAO9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAM/B,oBAAoB,EAAE,OAAO,CAAC;IAM9B,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IAOzB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAS/B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAG/B,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;IAG7B,IAAI,EAAE,IAAI,CAAC;IAGX,MAAM,EAAE,aAAa,CAAC;CACvB"}
|
|
@@ -83,6 +83,14 @@ __decorate([
|
|
|
83
83
|
}),
|
|
84
84
|
__metadata("design:type", Object)
|
|
85
85
|
], TripAcceptedDriver.prototype, "cancelledAt", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, sequelize_typescript_1.Column)({
|
|
88
|
+
type: sequelize_typescript_1.DataType.STRING,
|
|
89
|
+
allowNull: true,
|
|
90
|
+
field: 'cancelled_reason',
|
|
91
|
+
}),
|
|
92
|
+
__metadata("design:type", Object)
|
|
93
|
+
], TripAcceptedDriver.prototype, "cancelledReason", void 0);
|
|
86
94
|
__decorate([
|
|
87
95
|
(0, sequelize_typescript_1.ForeignKey)(() => user_entity_1.User),
|
|
88
96
|
(0, sequelize_typescript_1.Column)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-accepted-driver.entity.js","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,sFAAsF;AACtF,gDAAgD;AAChD,8EAA8E;;;;;;;;;;;;AAE9E,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,+CAAqC;
|
|
1
|
+
{"version":3,"file":"trip-accepted-driver.entity.js","sourceRoot":"","sources":["../../src/entities/trip-accepted-driver.entity.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,sFAAsF;AACtF,gDAAgD;AAChD,8EAA8E;;;;;;;;;;;;AAE9E,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,+CAAqC;AA0C9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4BAGvC;CA+EA,CAAA;AAlFY,gDAAkB;AASrB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;8CACiB;AAOnB;IALC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;kDACa;AAOf;IALC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;IAC/B,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;oDACe;AAOjB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,+BAAQ,CAAC,GAAG;KAC3B,CAAC;8BACU,IAAI;sDAAC;AAOjB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,yDAAyD;KACnE,CAAC;;0DAC4B;AAO9B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,0DAA0D;KACpE,CAAC;;2DAC6B;AAM/B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;KACpB,CAAC;;gEAC4B;AAM9B;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;KAChB,CAAC;;uDACuB;AAOzB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,SAAS,EAAE,IAAI;QACf,KAAK,EAAE,kBAAkB;KAC1B,CAAC;;2DAC6B;AAS/B;IAPC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,kBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,OAAO,EACL,+FAA+F;KAClG,CAAC;;2DAC6B;AAG/B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,kBAAI,EAAE,iBAAiB,CAAC;;2DACZ;AAG7B;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;8BAChB,mBAAI;gDAAC;AAGX;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,6BAAa,CAAC;8BACvB,6BAAa;kDAAC;6BAjFX,kBAAkB;IAR9B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,uBAAuB;QAClC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,gCAAgC,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE;YAC9D,EAAE,IAAI,EAAE,kCAAkC,EAAE,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE;SACnE;KACF,CAAC;GACW,kBAAkB,CAkF9B"}
|
package/package.json
CHANGED
|
@@ -23,6 +23,8 @@ export interface PaymentAttributes {
|
|
|
23
23
|
amount: number;
|
|
24
24
|
/** Total acumulado reembolsado sobre `amount` */
|
|
25
25
|
refundedAmount?: number;
|
|
26
|
+
/** Saldo restante tras reembolsos (amount - refundedAmount), calculado */
|
|
27
|
+
remainingAmount?: number;
|
|
26
28
|
paymentMethod: PaymentMethod;
|
|
27
29
|
status: PaymentStatus;
|
|
28
30
|
cardId: string;
|
|
@@ -113,6 +115,16 @@ export class Payment extends Model<PaymentAttributes, CreatePaymentData> {
|
|
|
113
115
|
})
|
|
114
116
|
refundedAmount: number;
|
|
115
117
|
|
|
118
|
+
@Column({
|
|
119
|
+
type: DataType.VIRTUAL,
|
|
120
|
+
get(this: Payment) {
|
|
121
|
+
const amount = Number(this.getDataValue('amount') ?? 0);
|
|
122
|
+
const refunded = Number(this.getDataValue('refundedAmount') ?? 0);
|
|
123
|
+
return Math.max(0, Math.round((amount - refunded) * 100) / 100);
|
|
124
|
+
},
|
|
125
|
+
})
|
|
126
|
+
remainingAmount: number;
|
|
127
|
+
|
|
116
128
|
@Column({
|
|
117
129
|
type: DataType.ENUM(...Object.values(PaymentMethod)),
|
|
118
130
|
allowNull: false,
|
|
@@ -27,6 +27,8 @@ export interface TripAcceptedDriverAttributes {
|
|
|
27
27
|
/** Si después canceló: true; si sigue siendo el conductor del viaje: false */
|
|
28
28
|
cancelledAfterAccept: boolean;
|
|
29
29
|
cancelledAt: Date | null;
|
|
30
|
+
/** Motivo de liberación/cancelación tras aceptar (ej. ocupado en otro viaje al activar programado). */
|
|
31
|
+
cancelledReason: string | null;
|
|
30
32
|
/** Usuario admin que forzó la aceptación desde panel; null si aceptó el conductor en app. */
|
|
31
33
|
adminAcceptedId: string | null;
|
|
32
34
|
createdAt: Date;
|
|
@@ -41,6 +43,7 @@ export interface CreateTripAcceptedDriverData {
|
|
|
41
43
|
driverLongitude?: number | null;
|
|
42
44
|
cancelledAfterAccept?: boolean;
|
|
43
45
|
cancelledAt?: Date | null;
|
|
46
|
+
cancelledReason?: string | null;
|
|
44
47
|
adminAcceptedId?: string | null;
|
|
45
48
|
}
|
|
46
49
|
|
|
@@ -110,6 +113,13 @@ export class TripAcceptedDriver extends Model<
|
|
|
110
113
|
})
|
|
111
114
|
cancelledAt: Date | null;
|
|
112
115
|
|
|
116
|
+
@Column({
|
|
117
|
+
type: DataType.STRING,
|
|
118
|
+
allowNull: true,
|
|
119
|
+
field: 'cancelled_reason',
|
|
120
|
+
})
|
|
121
|
+
cancelledReason: string | null;
|
|
122
|
+
|
|
113
123
|
@ForeignKey(() => User)
|
|
114
124
|
@Column({
|
|
115
125
|
type: DataType.UUID,
|