uaxi-shared-entities 1.0.71 → 1.0.72
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.js +1 -1
- package/dist/entities/admin-earnings.entity.js.map +1 -1
- package/dist/enums/package.enum.d.ts +1 -0
- package/dist/enums/package.enum.d.ts.map +1 -1
- package/dist/enums/package.enum.js +1 -0
- package/dist/enums/package.enum.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/admin-earnings.entity.ts +1 -1
- package/src/enums/package.enum.ts +1 -0
|
@@ -25,7 +25,7 @@ let AdminEarnings = class AdminEarnings extends sequelize_typescript_1.Model {
|
|
|
25
25
|
return this.isTransferred && this.transferredAt !== null;
|
|
26
26
|
}
|
|
27
27
|
get canBeTransferred() {
|
|
28
|
-
return this.paymentStatus === "
|
|
28
|
+
return this.paymentStatus === "authorized" && !this.isTransferred;
|
|
29
29
|
}
|
|
30
30
|
get hasCouponDiscount() {
|
|
31
31
|
return this.couponDiscount > 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;AA6DlC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAGlC;IAoLC,0BAA0B;IAC1B,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;IAC9C,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;IAC3D,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,aAAa,KAAK,
|
|
1
|
+
{"version":3,"file":"admin-earnings.entity.js","sourceRoot":"","sources":["../../src/entities/admin-earnings.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare enum PackageStatus {
|
|
2
2
|
REQUESTED = "requested",// Solicitud creada
|
|
3
|
+
PENDING_PAYMENT = "pending_payment",// Pago pendiente de confirmación 3DS
|
|
3
4
|
ACCEPTED = "accepted",// Conductor aceptó el envío
|
|
4
5
|
SCHEDULED_ASSIGNED = "scheduled_assigned",// Conductor asignado pero envío programado aún no inicia
|
|
5
6
|
DRIVER_ARRIVED = "driver_arrived",// Conductor llegó al punto de recogida
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.enum.d.ts","sourceRoot":"","sources":["../../src/enums/package.enum.ts"],"names":[],"mappings":"AAIA,oBAAY,aAAa;IACvB,SAAS,cAAc,CAAE,mBAAmB;IAC5C,QAAQ,aAAa,CAAE,4BAA4B;IACnD,kBAAkB,uBAAuB,CAAE,yDAAyD;IACpG,cAAc,mBAAmB,CAAE,uCAAuC;IAC1E,SAAS,cAAc,CAAE,mBAAmB;IAC5C,UAAU,eAAe,CAAE,cAAc;IACzC,SAAS,cAAc,CAAE,YAAY;IACrC,SAAS,cAAc;CACxB;AAED,oBAAY,WAAW;IACrB,QAAQ,aAAa,CAAE,aAAa;IACpC,KAAK,UAAU,CAAE,0BAA0B;IAC3C,MAAM,WAAW,CAAE,2BAA2B;IAC9C,KAAK,UAAU,CAAE,2BAA2B;IAC5C,OAAO,YAAY,CAAE,qCAAqC;IAC1D,IAAI,SAAS,CAAE,SAAS;IACxB,UAAU,eAAe;CAC1B;AAED,oBAAY,eAAe;IACzB,QAAQ,aAAa,CAAE,mBAAmB;IAC1C,OAAO,YAAY,CAAE,+BAA+B;IACpD,QAAQ,aAAa,CAAE,YAAY;IACnC,SAAS,cAAc;CACxB;AAED,oBAAY,WAAW;IACrB,WAAW,gBAAgB,CAAE,kBAAkB;IAC/C,KAAK,UAAU,CAAE,eAAe;IAChC,MAAM,WAAW,CAAE,eAAe;IAClC,KAAK,UAAU,CAAE,cAAc;IAC/B,WAAW,gBAAgB;CAC5B"}
|
|
1
|
+
{"version":3,"file":"package.enum.d.ts","sourceRoot":"","sources":["../../src/enums/package.enum.ts"],"names":[],"mappings":"AAIA,oBAAY,aAAa;IACvB,SAAS,cAAc,CAAE,mBAAmB;IAC5C,eAAe,oBAAoB,CAAE,qCAAqC;IAC1E,QAAQ,aAAa,CAAE,4BAA4B;IACnD,kBAAkB,uBAAuB,CAAE,yDAAyD;IACpG,cAAc,mBAAmB,CAAE,uCAAuC;IAC1E,SAAS,cAAc,CAAE,mBAAmB;IAC5C,UAAU,eAAe,CAAE,cAAc;IACzC,SAAS,cAAc,CAAE,YAAY;IACrC,SAAS,cAAc;CACxB;AAED,oBAAY,WAAW;IACrB,QAAQ,aAAa,CAAE,aAAa;IACpC,KAAK,UAAU,CAAE,0BAA0B;IAC3C,MAAM,WAAW,CAAE,2BAA2B;IAC9C,KAAK,UAAU,CAAE,2BAA2B;IAC5C,OAAO,YAAY,CAAE,qCAAqC;IAC1D,IAAI,SAAS,CAAE,SAAS;IACxB,UAAU,eAAe;CAC1B;AAED,oBAAY,eAAe;IACzB,QAAQ,aAAa,CAAE,mBAAmB;IAC1C,OAAO,YAAY,CAAE,+BAA+B;IACpD,QAAQ,aAAa,CAAE,YAAY;IACnC,SAAS,cAAc;CACxB;AAED,oBAAY,WAAW;IACrB,WAAW,gBAAgB,CAAE,kBAAkB;IAC/C,KAAK,UAAU,CAAE,eAAe;IAChC,MAAM,WAAW,CAAE,eAAe;IAClC,KAAK,UAAU,CAAE,cAAc;IAC/B,WAAW,gBAAgB;CAC5B"}
|
|
@@ -7,6 +7,7 @@ exports.PackageSize = exports.PackagePriority = exports.PackageType = exports.Pa
|
|
|
7
7
|
var PackageStatus;
|
|
8
8
|
(function (PackageStatus) {
|
|
9
9
|
PackageStatus["REQUESTED"] = "requested";
|
|
10
|
+
PackageStatus["PENDING_PAYMENT"] = "pending_payment";
|
|
10
11
|
PackageStatus["ACCEPTED"] = "accepted";
|
|
11
12
|
PackageStatus["SCHEDULED_ASSIGNED"] = "scheduled_assigned";
|
|
12
13
|
PackageStatus["DRIVER_ARRIVED"] = "driver_arrived";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.enum.js","sourceRoot":"","sources":["../../src/enums/package.enum.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,gBAAgB;AAChB,gDAAgD;;;AAEhD,IAAY,
|
|
1
|
+
{"version":3,"file":"package.enum.js","sourceRoot":"","sources":["../../src/enums/package.enum.ts"],"names":[],"mappings":";AAAA,gDAAgD;AAChD,gBAAgB;AAChB,gDAAgD;;;AAEhD,IAAY,aAUX;AAVD,WAAY,aAAa;IACvB,wCAAuB,CAAA;IACvB,oDAAmC,CAAA;IACnC,sCAAqB,CAAA;IACrB,0DAAyC,CAAA;IACzC,kDAAiC,CAAA;IACjC,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,wCAAuB,CAAA;AACzB,CAAC,EAVW,aAAa,6BAAb,aAAa,QAUxB;AAED,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,gCAAiB,CAAA;IACjB,8BAAe,CAAA;IACf,kCAAmB,CAAA;IACnB,4BAAa,CAAA;IACb,wCAAyB,CAAA;AAC3B,CAAC,EARW,WAAW,2BAAX,WAAW,QAQtB;AAED,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,wCAAqB,CAAA;IACrB,sCAAmB,CAAA;IACnB,wCAAqB,CAAA;IACrB,0CAAuB,CAAA;AACzB,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAED,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,0CAA2B,CAAA;IAC3B,8BAAe,CAAA;IACf,gCAAiB,CAAA;IACjB,8BAAe,CAAA;IACf,0CAA2B,CAAA;AAC7B,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB"}
|
package/package.json
CHANGED
|
@@ -265,7 +265,7 @@ export class AdminEarnings extends Model<
|
|
|
265
265
|
}
|
|
266
266
|
|
|
267
267
|
get canBeTransferred(): boolean {
|
|
268
|
-
return this.paymentStatus === "
|
|
268
|
+
return this.paymentStatus === "authorized" && !this.isTransferred;
|
|
269
269
|
}
|
|
270
270
|
|
|
271
271
|
get hasCouponDiscount(): boolean {
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
export enum PackageStatus {
|
|
6
6
|
REQUESTED = "requested", // Solicitud creada
|
|
7
|
+
PENDING_PAYMENT = "pending_payment", // Pago pendiente de confirmación 3DS
|
|
7
8
|
ACCEPTED = "accepted", // Conductor aceptó el envío
|
|
8
9
|
SCHEDULED_ASSIGNED = "scheduled_assigned", // Conductor asignado pero envío programado aún no inicia
|
|
9
10
|
DRIVER_ARRIVED = "driver_arrived", // Conductor llegó al punto de recogida
|