uaxi-shared-entities 1.0.248 → 1.0.249
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/uaxi-treasury-entry.entity.d.ts +4 -1
- package/dist/entities/uaxi-treasury-entry.entity.d.ts.map +1 -1
- package/dist/entities/uaxi-treasury-entry.entity.js +13 -0
- package/dist/entities/uaxi-treasury-entry.entity.js.map +1 -1
- package/dist/enums/uaxi-treasury.enum.d.ts +5 -0
- package/dist/enums/uaxi-treasury.enum.d.ts.map +1 -1
- package/dist/enums/uaxi-treasury.enum.js +7 -1
- package/dist/enums/uaxi-treasury.enum.js.map +1 -1
- package/package.json +1 -1
- package/src/entities/trip-earnings-settlement.entity.ts +1 -1
- package/src/entities/uaxi-treasury-entry.entity.ts +15 -0
- package/src/enums/uaxi-treasury.enum.ts +6 -0
|
@@ -3,10 +3,11 @@ import { Trip } from "./trips.entity";
|
|
|
3
3
|
import { TripEarningsSettlement } from "./trip-earnings-settlement.entity";
|
|
4
4
|
import { DriverPayoutCutoff } from "./driver-payout-cutoff.entity";
|
|
5
5
|
import { UaxiTreasuryPayout } from "./uaxi-treasury-payout.entity";
|
|
6
|
-
import { UaxiTreasuryConcept, UaxiTreasuryPayoutStatus } from "../enums/uaxi-treasury.enum";
|
|
6
|
+
import { UaxiTreasuryConcept, UaxiTreasuryFundingSource, UaxiTreasuryPayoutStatus } from "../enums/uaxi-treasury.enum";
|
|
7
7
|
export interface UaxiTreasuryEntryAttributes {
|
|
8
8
|
id: string;
|
|
9
9
|
concept: UaxiTreasuryConcept;
|
|
10
|
+
fundingSource: UaxiTreasuryFundingSource;
|
|
10
11
|
amount: number;
|
|
11
12
|
tripId: string | null;
|
|
12
13
|
settlementId: string | null;
|
|
@@ -20,6 +21,7 @@ export interface UaxiTreasuryEntryAttributes {
|
|
|
20
21
|
}
|
|
21
22
|
export interface CreateUaxiTreasuryEntryData {
|
|
22
23
|
concept: UaxiTreasuryConcept;
|
|
24
|
+
fundingSource?: UaxiTreasuryFundingSource;
|
|
23
25
|
amount: number;
|
|
24
26
|
tripId?: string | null;
|
|
25
27
|
settlementId?: string | null;
|
|
@@ -32,6 +34,7 @@ export interface CreateUaxiTreasuryEntryData {
|
|
|
32
34
|
export declare class UaxiTreasuryEntry extends Model<UaxiTreasuryEntryAttributes, CreateUaxiTreasuryEntryData> {
|
|
33
35
|
id: string;
|
|
34
36
|
concept: UaxiTreasuryConcept;
|
|
37
|
+
fundingSource: UaxiTreasuryFundingSource;
|
|
35
38
|
amount: number;
|
|
36
39
|
tripId: string | null;
|
|
37
40
|
settlementId: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury-entry.entity.d.ts","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-entry.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,wBAAwB,CAAC;IACvC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,wBAAwB,CAAC;CACzC;AAED,
|
|
1
|
+
{"version":3,"file":"uaxi-treasury-entry.entity.d.ts","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-entry.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,EAEN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAErC,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,mBAAmB,CAAC;IAC7B,aAAa,EAAE,yBAAyB,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,wBAAwB,CAAC;IACvC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,mBAAmB,CAAC;IAC7B,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,wBAAwB,CAAC;CACzC;AAED,qBAgBa,iBAAkB,SAAQ,KAAK,CAC1C,2BAA2B,EAC3B,2BAA2B,CAC5B;IAMS,EAAE,EAAE,MAAM,CAAC;IAMnB,OAAO,EAAE,mBAAmB,CAAC;IAQ7B,aAAa,EAAE,yBAAyB,CAAC;IAGzC,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAItB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAI5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IAIpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAGhC,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IAGzB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IAOvB,YAAY,EAAE,wBAAwB,CAAC;IAGvC,IAAI,EAAE,IAAI,CAAC;IAGX,UAAU,EAAE,sBAAsB,CAAC;IAGnC,kBAAkB,EAAE,kBAAkB,CAAC;IAGvC,cAAc,EAAE,kBAAkB,CAAC;CACpC"}
|
|
@@ -34,6 +34,15 @@ __decorate([
|
|
|
34
34
|
}),
|
|
35
35
|
__metadata("design:type", String)
|
|
36
36
|
], UaxiTreasuryEntry.prototype, "concept", void 0);
|
|
37
|
+
__decorate([
|
|
38
|
+
(0, sequelize_typescript_1.Column)({
|
|
39
|
+
type: sequelize_typescript_1.DataType.ENUM(...Object.values(uaxi_treasury_enum_1.UaxiTreasuryFundingSource)),
|
|
40
|
+
allowNull: false,
|
|
41
|
+
defaultValue: uaxi_treasury_enum_1.UaxiTreasuryFundingSource.STRIPE,
|
|
42
|
+
comment: "stripe = retenido del cobro Stripe; external = por cobrar/liquidar fuera",
|
|
43
|
+
}),
|
|
44
|
+
__metadata("design:type", String)
|
|
45
|
+
], UaxiTreasuryEntry.prototype, "fundingSource", void 0);
|
|
37
46
|
__decorate([
|
|
38
47
|
(0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.DECIMAL(12, 2), allowNull: false }),
|
|
39
48
|
__metadata("design:type", Number)
|
|
@@ -101,6 +110,10 @@ exports.UaxiTreasuryEntry = UaxiTreasuryEntry = __decorate([
|
|
|
101
110
|
name: "uaxi_treasury_entries_period_idx",
|
|
102
111
|
fields: ["periodStart", "periodEnd"],
|
|
103
112
|
},
|
|
113
|
+
{
|
|
114
|
+
name: "uaxi_treasury_entries_funding_idx",
|
|
115
|
+
fields: ["fundingSource", "payoutStatus"],
|
|
116
|
+
},
|
|
104
117
|
],
|
|
105
118
|
})
|
|
106
119
|
], UaxiTreasuryEntry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury-entry.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-entry.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,iDAAsC;AACtC,uFAA2E;AAC3E,+EAAmE;AACnE,+EAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"uaxi-treasury-entry.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-entry.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,iDAAsC;AACtC,uFAA2E;AAC3E,+EAAmE;AACnE,+EAAmE;AACnE,oEAIqC;AA+C9B,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAGtC;CAiEA,CAAA;AApEY,8CAAiB;AASpB;IALP,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI;QACnB,YAAY,EAAE,+BAAQ,CAAC,MAAM;QAC7B,UAAU,EAAE,IAAI;KACjB,CAAC;;6CACiB;AAMnB;IAJC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,wCAAmB,CAAC,CAAC;QAC1D,SAAS,EAAE,KAAK;KACjB,CAAC;;kDAC2B;AAQ7B;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,8CAAyB,CAAC,CAAC;QAChE,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,8CAAyB,CAAC,MAAM;QAC9C,OAAO,EAAE,0EAA0E;KACpF,CAAC;;wDACuC;AAGzC;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;;iDAC7C;AAIf;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;IACtB,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;iDAC3B;AAItB;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,wDAAsB,CAAC;IACxC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;uDACrB;AAI5B;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;IACpC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;+DACb;AAIpC;IAFC,IAAA,iCAAU,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;IACpC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;2DACjB;AAGhC;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;sDACxB;AAGzB;IADC,IAAA,6BAAM,EAAC,EAAE,IAAI,EAAE,+BAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;oDAC1B;AAOvB;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,6CAAwB,CAAC,CAAC;QAC/D,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,6CAAwB,CAAC,OAAO;KAC/C,CAAC;;uDACqC;AAGvC;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,mBAAI,CAAC;8BAChB,mBAAI;+CAAC;AAGX;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,wDAAsB,CAAC;8BAC5B,wDAAsB;qDAAC;AAGnC;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;8BAChB,gDAAkB;6DAAC;AAGvC;IADC,IAAA,gCAAS,EAAC,GAAG,EAAE,CAAC,gDAAkB,CAAC;8BACpB,gDAAkB;yDAAC;4BAnExB,iBAAiB;IAhB7B,IAAA,4BAAK,EAAC;QACL,SAAS,EAAE,uBAAuB;QAClC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,mCAAmC,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;YAClE,EAAE,IAAI,EAAE,kCAAkC,EAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,EAAE;YAC9E;gBACE,IAAI,EAAE,kCAAkC;gBACxC,MAAM,EAAE,CAAC,aAAa,EAAE,WAAW,CAAC;aACrC;YACD;gBACE,IAAI,EAAE,mCAAmC;gBACzC,MAAM,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC;aAC1C;SACF;KACF,CAAC;GACW,iBAAiB,CAoE7B"}
|
|
@@ -2,6 +2,11 @@ export declare enum UaxiTreasuryConcept {
|
|
|
2
2
|
UAXI_EARNINGS = "UAXI_EARNINGS",
|
|
3
3
|
DRIVER_RETENTIONS = "DRIVER_RETENTIONS"
|
|
4
4
|
}
|
|
5
|
+
/** Origen del monto en tesorería: cobrado en Stripe vs pendiente externo. */
|
|
6
|
+
export declare enum UaxiTreasuryFundingSource {
|
|
7
|
+
STRIPE = "stripe",
|
|
8
|
+
EXTERNAL = "external"
|
|
9
|
+
}
|
|
5
10
|
export declare enum UaxiTreasuryPayoutStatus {
|
|
6
11
|
PENDING = "pending",
|
|
7
12
|
REMITTED = "remitted",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury.enum.d.ts","sourceRoot":"","sources":["../../src/enums/uaxi-treasury.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,aAAa,kBAAkB;IAC/B,iBAAiB,sBAAsB;CACxC;AAED,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,uDAAuD;AACvD,oBAAY,8BAA8B;IACxC,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB"}
|
|
1
|
+
{"version":3,"file":"uaxi-treasury.enum.d.ts","sourceRoot":"","sources":["../../src/enums/uaxi-treasury.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,aAAa,kBAAkB;IAC/B,iBAAiB,sBAAsB;CACxC;AAED,6EAA6E;AAC7E,oBAAY,yBAAyB;IACnC,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,oBAAY,wBAAwB;IAClC,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,uDAAuD;AACvD,oBAAY,8BAA8B;IACxC,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB"}
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.UaxiTreasuryPayoutRecordStatus = exports.UaxiTreasuryPayoutStatus = exports.UaxiTreasuryConcept = void 0;
|
|
3
|
+
exports.UaxiTreasuryPayoutRecordStatus = exports.UaxiTreasuryPayoutStatus = exports.UaxiTreasuryFundingSource = exports.UaxiTreasuryConcept = void 0;
|
|
4
4
|
var UaxiTreasuryConcept;
|
|
5
5
|
(function (UaxiTreasuryConcept) {
|
|
6
6
|
UaxiTreasuryConcept["UAXI_EARNINGS"] = "UAXI_EARNINGS";
|
|
7
7
|
UaxiTreasuryConcept["DRIVER_RETENTIONS"] = "DRIVER_RETENTIONS";
|
|
8
8
|
})(UaxiTreasuryConcept || (exports.UaxiTreasuryConcept = UaxiTreasuryConcept = {}));
|
|
9
|
+
/** Origen del monto en tesorería: cobrado en Stripe vs pendiente externo. */
|
|
10
|
+
var UaxiTreasuryFundingSource;
|
|
11
|
+
(function (UaxiTreasuryFundingSource) {
|
|
12
|
+
UaxiTreasuryFundingSource["STRIPE"] = "stripe";
|
|
13
|
+
UaxiTreasuryFundingSource["EXTERNAL"] = "external";
|
|
14
|
+
})(UaxiTreasuryFundingSource || (exports.UaxiTreasuryFundingSource = UaxiTreasuryFundingSource = {}));
|
|
9
15
|
var UaxiTreasuryPayoutStatus;
|
|
10
16
|
(function (UaxiTreasuryPayoutStatus) {
|
|
11
17
|
UaxiTreasuryPayoutStatus["PENDING"] = "pending";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury.enum.js","sourceRoot":"","sources":["../../src/enums/uaxi-treasury.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,sDAA+B,CAAA;IAC/B,8DAAuC,CAAA;AACzC,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B;AAED,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,iDAAqB,CAAA;IACrB,mDAAuB,CAAA;AACzB,CAAC,EAJW,wBAAwB,wCAAxB,wBAAwB,QAInC;AAED,uDAAuD;AACvD,IAAY,8BAKX;AALD,WAAY,8BAA8B;IACxC,qDAAmB,CAAA;IACnB,+CAAa,CAAA;IACb,mDAAiB,CAAA;IACjB,qDAAmB,CAAA;AACrB,CAAC,EALW,8BAA8B,8CAA9B,8BAA8B,QAKzC"}
|
|
1
|
+
{"version":3,"file":"uaxi-treasury.enum.js","sourceRoot":"","sources":["../../src/enums/uaxi-treasury.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,sDAA+B,CAAA;IAC/B,8DAAuC,CAAA;AACzC,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B;AAED,6EAA6E;AAC7E,IAAY,yBAGX;AAHD,WAAY,yBAAyB;IACnC,8CAAiB,CAAA;IACjB,kDAAqB,CAAA;AACvB,CAAC,EAHW,yBAAyB,yCAAzB,yBAAyB,QAGpC;AAED,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,iDAAqB,CAAA;IACrB,mDAAuB,CAAA;AACzB,CAAC,EAJW,wBAAwB,wCAAxB,wBAAwB,QAInC;AAED,uDAAuD;AACvD,IAAY,8BAKX;AALD,WAAY,8BAA8B;IACxC,qDAAmB,CAAA;IACnB,+CAAa,CAAA;IACb,mDAAiB,CAAA;IACjB,qDAAmB,CAAA;AACrB,CAAC,EALW,8BAA8B,8CAA9B,8BAA8B,QAKzC"}
|
package/package.json
CHANGED
|
@@ -139,7 +139,7 @@ export class TripEarningsSettlement extends Model<
|
|
|
139
139
|
type: DataType.DECIMAL(12, 2),
|
|
140
140
|
allowNull: false,
|
|
141
141
|
defaultValue: 0,
|
|
142
|
-
comment: "Fee Stripe del charge;
|
|
142
|
+
comment: "Fee Stripe del charge; registrado en settlement (no se descuenta del payout UAXI)",
|
|
143
143
|
})
|
|
144
144
|
stripeProcessingFee: number;
|
|
145
145
|
|
|
@@ -12,12 +12,14 @@ import { DriverPayoutCutoff } from "./driver-payout-cutoff.entity";
|
|
|
12
12
|
import { UaxiTreasuryPayout } from "./uaxi-treasury-payout.entity";
|
|
13
13
|
import {
|
|
14
14
|
UaxiTreasuryConcept,
|
|
15
|
+
UaxiTreasuryFundingSource,
|
|
15
16
|
UaxiTreasuryPayoutStatus,
|
|
16
17
|
} from "../enums/uaxi-treasury.enum";
|
|
17
18
|
|
|
18
19
|
export interface UaxiTreasuryEntryAttributes {
|
|
19
20
|
id: string;
|
|
20
21
|
concept: UaxiTreasuryConcept;
|
|
22
|
+
fundingSource: UaxiTreasuryFundingSource;
|
|
21
23
|
amount: number;
|
|
22
24
|
tripId: string | null;
|
|
23
25
|
settlementId: string | null;
|
|
@@ -32,6 +34,7 @@ export interface UaxiTreasuryEntryAttributes {
|
|
|
32
34
|
|
|
33
35
|
export interface CreateUaxiTreasuryEntryData {
|
|
34
36
|
concept: UaxiTreasuryConcept;
|
|
37
|
+
fundingSource?: UaxiTreasuryFundingSource;
|
|
35
38
|
amount: number;
|
|
36
39
|
tripId?: string | null;
|
|
37
40
|
settlementId?: string | null;
|
|
@@ -52,6 +55,10 @@ export interface CreateUaxiTreasuryEntryData {
|
|
|
52
55
|
name: "uaxi_treasury_entries_period_idx",
|
|
53
56
|
fields: ["periodStart", "periodEnd"],
|
|
54
57
|
},
|
|
58
|
+
{
|
|
59
|
+
name: "uaxi_treasury_entries_funding_idx",
|
|
60
|
+
fields: ["fundingSource", "payoutStatus"],
|
|
61
|
+
},
|
|
55
62
|
],
|
|
56
63
|
})
|
|
57
64
|
export class UaxiTreasuryEntry extends Model<
|
|
@@ -71,6 +78,14 @@ export class UaxiTreasuryEntry extends Model<
|
|
|
71
78
|
})
|
|
72
79
|
concept: UaxiTreasuryConcept;
|
|
73
80
|
|
|
81
|
+
@Column({
|
|
82
|
+
type: DataType.ENUM(...Object.values(UaxiTreasuryFundingSource)),
|
|
83
|
+
allowNull: false,
|
|
84
|
+
defaultValue: UaxiTreasuryFundingSource.STRIPE,
|
|
85
|
+
comment: "stripe = retenido del cobro Stripe; external = por cobrar/liquidar fuera",
|
|
86
|
+
})
|
|
87
|
+
fundingSource: UaxiTreasuryFundingSource;
|
|
88
|
+
|
|
74
89
|
@Column({ type: DataType.DECIMAL(12, 2), allowNull: false })
|
|
75
90
|
amount: number;
|
|
76
91
|
|
|
@@ -3,6 +3,12 @@ export enum UaxiTreasuryConcept {
|
|
|
3
3
|
DRIVER_RETENTIONS = "DRIVER_RETENTIONS",
|
|
4
4
|
}
|
|
5
5
|
|
|
6
|
+
/** Origen del monto en tesorería: cobrado en Stripe vs pendiente externo. */
|
|
7
|
+
export enum UaxiTreasuryFundingSource {
|
|
8
|
+
STRIPE = "stripe",
|
|
9
|
+
EXTERNAL = "external",
|
|
10
|
+
}
|
|
11
|
+
|
|
6
12
|
export enum UaxiTreasuryPayoutStatus {
|
|
7
13
|
PENDING = "pending",
|
|
8
14
|
REMITTED = "remitted",
|