uaxi-shared-entities 1.0.248 → 1.0.250
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/trip-earnings-settlement.entity.d.ts +12 -0
- package/dist/entities/trip-earnings-settlement.entity.d.ts.map +1 -1
- package/dist/entities/trip-earnings-settlement.entity.js +44 -3
- package/dist/entities/trip-earnings-settlement.entity.js.map +1 -1
- 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/entities/uaxi-treasury-payout.entity.js +1 -1
- package/dist/entities/uaxi-treasury-payout.entity.js.map +1 -1
- package/dist/enums/trip-settlement.enum.d.ts +2 -1
- package/dist/enums/trip-settlement.enum.d.ts.map +1 -1
- package/dist/enums/trip-settlement.enum.js +1 -0
- package/dist/enums/trip-settlement.enum.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 +48 -3
- package/src/entities/uaxi-treasury-entry.entity.ts +15 -0
- package/src/entities/uaxi-treasury-payout.entity.ts +1 -1
- package/src/enums/trip-settlement.enum.ts +1 -0
- package/src/enums/uaxi-treasury.enum.ts +6 -0
|
@@ -22,6 +22,10 @@ export interface TripEarningsSettlementAttributes {
|
|
|
22
22
|
stripeToDriverAmount: number;
|
|
23
23
|
externalToDriverAmount: number;
|
|
24
24
|
stripeProcessingFee: number;
|
|
25
|
+
stripeFeeReallocatedAmount: number;
|
|
26
|
+
stripeNetToDriverAmount: number;
|
|
27
|
+
externalNetToDriverAmount: number;
|
|
28
|
+
stripeFeeAppliedAt: Date | null;
|
|
25
29
|
stripeChargeId: string | null;
|
|
26
30
|
paymentChannel: TripSettlementPaymentChannel;
|
|
27
31
|
isCorporateTrip: boolean;
|
|
@@ -48,6 +52,10 @@ export interface CreateTripEarningsSettlementData {
|
|
|
48
52
|
stripeToDriverAmount: number;
|
|
49
53
|
externalToDriverAmount: number;
|
|
50
54
|
stripeProcessingFee?: number;
|
|
55
|
+
stripeFeeReallocatedAmount?: number;
|
|
56
|
+
stripeNetToDriverAmount?: number;
|
|
57
|
+
externalNetToDriverAmount?: number;
|
|
58
|
+
stripeFeeAppliedAt?: Date | null;
|
|
51
59
|
stripeChargeId?: string | null;
|
|
52
60
|
paymentChannel: TripSettlementPaymentChannel;
|
|
53
61
|
isCorporateTrip?: boolean;
|
|
@@ -73,6 +81,10 @@ export declare class TripEarningsSettlement extends Model<TripEarningsSettlement
|
|
|
73
81
|
stripeToDriverAmount: number;
|
|
74
82
|
externalToDriverAmount: number;
|
|
75
83
|
stripeProcessingFee: number;
|
|
84
|
+
stripeFeeReallocatedAmount: number;
|
|
85
|
+
stripeNetToDriverAmount: number;
|
|
86
|
+
externalNetToDriverAmount: number;
|
|
87
|
+
stripeFeeAppliedAt: Date | null;
|
|
76
88
|
stripeChargeId: string | null;
|
|
77
89
|
paymentChannel: TripSettlementPaymentChannel;
|
|
78
90
|
isCorporateTrip: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-earnings-settlement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"trip-earnings-settlement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,11 +80,21 @@ __decorate([
|
|
|
80
80
|
__metadata("design:type", Number)
|
|
81
81
|
], TripEarningsSettlement.prototype, "uaxiRetainedFromCharge", void 0);
|
|
82
82
|
__decorate([
|
|
83
|
-
(0, sequelize_typescript_1.Column)({
|
|
83
|
+
(0, sequelize_typescript_1.Column)({
|
|
84
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
85
|
+
allowNull: false,
|
|
86
|
+
defaultValue: 0,
|
|
87
|
+
comment: "Asignación Stripe al conductor antes de reasignar el fee",
|
|
88
|
+
}),
|
|
84
89
|
__metadata("design:type", Number)
|
|
85
90
|
], TripEarningsSettlement.prototype, "stripeToDriverAmount", void 0);
|
|
86
91
|
__decorate([
|
|
87
|
-
(0, sequelize_typescript_1.Column)({
|
|
92
|
+
(0, sequelize_typescript_1.Column)({
|
|
93
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
94
|
+
allowNull: false,
|
|
95
|
+
defaultValue: 0,
|
|
96
|
+
comment: "Asignación externa al conductor antes de reasignar el fee",
|
|
97
|
+
}),
|
|
88
98
|
__metadata("design:type", Number)
|
|
89
99
|
], TripEarningsSettlement.prototype, "externalToDriverAmount", void 0);
|
|
90
100
|
__decorate([
|
|
@@ -92,10 +102,41 @@ __decorate([
|
|
|
92
102
|
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
93
103
|
allowNull: false,
|
|
94
104
|
defaultValue: 0,
|
|
95
|
-
comment: "Fee
|
|
105
|
+
comment: "Fee real cobrado por Stripe en el charge",
|
|
96
106
|
}),
|
|
97
107
|
__metadata("design:type", Number)
|
|
98
108
|
], TripEarningsSettlement.prototype, "stripeProcessingFee", void 0);
|
|
109
|
+
__decorate([
|
|
110
|
+
(0, sequelize_typescript_1.Column)({
|
|
111
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
112
|
+
allowNull: false,
|
|
113
|
+
defaultValue: 0,
|
|
114
|
+
comment: "Parte del fee movida del bucket Stripe al bucket externo",
|
|
115
|
+
}),
|
|
116
|
+
__metadata("design:type", Number)
|
|
117
|
+
], TripEarningsSettlement.prototype, "stripeFeeReallocatedAmount", void 0);
|
|
118
|
+
__decorate([
|
|
119
|
+
(0, sequelize_typescript_1.Column)({
|
|
120
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
121
|
+
allowNull: false,
|
|
122
|
+
defaultValue: 0,
|
|
123
|
+
comment: "Transfer Connect real al conductor después de reasignar el fee",
|
|
124
|
+
}),
|
|
125
|
+
__metadata("design:type", Number)
|
|
126
|
+
], TripEarningsSettlement.prototype, "stripeNetToDriverAmount", void 0);
|
|
127
|
+
__decorate([
|
|
128
|
+
(0, sequelize_typescript_1.Column)({
|
|
129
|
+
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
130
|
+
allowNull: false,
|
|
131
|
+
defaultValue: 0,
|
|
132
|
+
comment: "Pago externo final al conductor incluyendo el fee reasignado",
|
|
133
|
+
}),
|
|
134
|
+
__metadata("design:type", Number)
|
|
135
|
+
], TripEarningsSettlement.prototype, "externalNetToDriverAmount", void 0);
|
|
136
|
+
__decorate([
|
|
137
|
+
(0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.DATE, allowNull: true }),
|
|
138
|
+
__metadata("design:type", Object)
|
|
139
|
+
], TripEarningsSettlement.prototype, "stripeFeeAppliedAt", void 0);
|
|
99
140
|
__decorate([
|
|
100
141
|
(0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.STRING(120), allowNull: true }),
|
|
101
142
|
__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-earnings-settlement.entity.js","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAO8B;AAC9B,iDAAsC;AACtC,mDAAgD;AAChD,qEAA0D;AAC1D,uEAA4D;AAC5D,+EAAmE;AACnE,wEAGuC;
|
|
1
|
+
{"version":3,"file":"trip-earnings-settlement.entity.js","sourceRoot":"","sources":["../../src/entities/trip-earnings-settlement.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -43,7 +43,7 @@ __decorate([
|
|
|
43
43
|
type: sequelize_typescript_1.DataType.DECIMAL(12, 2),
|
|
44
44
|
allowNull: false,
|
|
45
45
|
defaultValue: 0,
|
|
46
|
-
comment: "Fee Stripe
|
|
46
|
+
comment: "Fee Stripe del periodo (informativo; ya no se descuenta del payout UAXI)",
|
|
47
47
|
}),
|
|
48
48
|
__metadata("design:type", Number)
|
|
49
49
|
], UaxiTreasuryPayout.prototype, "stripeFeeAbsorbed", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uaxi-treasury-payout.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-payout.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAM8B;AAC9B,oEAGqC;AAgD9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,4BAGvC;CAwEA,CAAA;AA3EY,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;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;;mDAC2B;AAO7B;IALC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,qDAAqD;KAC/D,CAAC;;4DACuB;AAQzB;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"uaxi-treasury-payout.entity.js","sourceRoot":"","sources":["../../src/entities/uaxi-treasury-payout.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare enum TripSettlementLedgerConcept {
|
|
|
16
16
|
STRIPE_TO_DRIVER = "STRIPE_TO_DRIVER",
|
|
17
17
|
EXTERNAL_TO_DRIVER = "EXTERNAL_TO_DRIVER",
|
|
18
18
|
UAXI_SUBSIDY = "UAXI_SUBSIDY",
|
|
19
|
-
STRIPE_PROCESSING_FEE = "STRIPE_PROCESSING_FEE"
|
|
19
|
+
STRIPE_PROCESSING_FEE = "STRIPE_PROCESSING_FEE",
|
|
20
|
+
STRIPE_FEE_REALLOCATED_TO_EXTERNAL = "STRIPE_FEE_REALLOCATED_TO_EXTERNAL"
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=trip-settlement.enum.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-settlement.enum.d.ts","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,4BAA4B;IACtC,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,aAAa,kBAAkB;CAChC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,oBAAY,2BAA2B;IACrC,gBAAgB,qBAAqB;IACrC,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,kBAAkB,uBAAuB;IACzC,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;
|
|
1
|
+
{"version":3,"file":"trip-settlement.enum.d.ts","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,4BAA4B;IACtC,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,aAAa,kBAAkB;CAChC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,oBAAY,2BAA2B;IACrC,gBAAgB,qBAAqB;IACrC,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,kBAAkB,uBAAuB;IACzC,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;IAC/C,kCAAkC,uCAAuC;CAC1E"}
|
|
@@ -23,5 +23,6 @@ var TripSettlementLedgerConcept;
|
|
|
23
23
|
TripSettlementLedgerConcept["EXTERNAL_TO_DRIVER"] = "EXTERNAL_TO_DRIVER";
|
|
24
24
|
TripSettlementLedgerConcept["UAXI_SUBSIDY"] = "UAXI_SUBSIDY";
|
|
25
25
|
TripSettlementLedgerConcept["STRIPE_PROCESSING_FEE"] = "STRIPE_PROCESSING_FEE";
|
|
26
|
+
TripSettlementLedgerConcept["STRIPE_FEE_REALLOCATED_TO_EXTERNAL"] = "STRIPE_FEE_REALLOCATED_TO_EXTERNAL";
|
|
26
27
|
})(TripSettlementLedgerConcept || (exports.TripSettlementLedgerConcept = TripSettlementLedgerConcept = {}));
|
|
27
28
|
//# sourceMappingURL=trip-settlement.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trip-settlement.enum.js","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACtC,2DAA2B,CAAA;IAC3B,iDAAiB,CAAA;IACjB,+DAA+B,CAAA;AACjC,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAED,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,uDAA+B,CAAA;IAC/B,2CAAmB,CAAA;AACrB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"trip-settlement.enum.js","sourceRoot":"","sources":["../../src/enums/trip-settlement.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACtC,2DAA2B,CAAA;IAC3B,iDAAiB,CAAA;IACjB,+DAA+B,CAAA;AACjC,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAED,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,uDAA+B,CAAA;IAC/B,2CAAmB,CAAA;AACrB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,2BASX;AATD,WAAY,2BAA2B;IACrC,oEAAqC,CAAA;IACrC,kEAAmC,CAAA;IACnC,8EAA+C,CAAA;IAC/C,oEAAqC,CAAA;IACrC,wEAAyC,CAAA;IACzC,4DAA6B,CAAA;IAC7B,8EAA+C,CAAA;IAC/C,wGAAyE,CAAA;AAC3E,CAAC,EATW,2BAA2B,2CAA3B,2BAA2B,QAStC"}
|
|
@@ -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
|
@@ -33,6 +33,10 @@ export interface TripEarningsSettlementAttributes {
|
|
|
33
33
|
stripeToDriverAmount: number;
|
|
34
34
|
externalToDriverAmount: number;
|
|
35
35
|
stripeProcessingFee: number;
|
|
36
|
+
stripeFeeReallocatedAmount: number;
|
|
37
|
+
stripeNetToDriverAmount: number;
|
|
38
|
+
externalNetToDriverAmount: number;
|
|
39
|
+
stripeFeeAppliedAt: Date | null;
|
|
36
40
|
stripeChargeId: string | null;
|
|
37
41
|
paymentChannel: TripSettlementPaymentChannel;
|
|
38
42
|
isCorporateTrip: boolean;
|
|
@@ -60,6 +64,10 @@ export interface CreateTripEarningsSettlementData {
|
|
|
60
64
|
stripeToDriverAmount: number;
|
|
61
65
|
externalToDriverAmount: number;
|
|
62
66
|
stripeProcessingFee?: number;
|
|
67
|
+
stripeFeeReallocatedAmount?: number;
|
|
68
|
+
stripeNetToDriverAmount?: number;
|
|
69
|
+
externalNetToDriverAmount?: number;
|
|
70
|
+
stripeFeeAppliedAt?: Date | null;
|
|
63
71
|
stripeChargeId?: string | null;
|
|
64
72
|
paymentChannel: TripSettlementPaymentChannel;
|
|
65
73
|
isCorporateTrip?: boolean;
|
|
@@ -129,20 +137,57 @@ export class TripEarningsSettlement extends Model<
|
|
|
129
137
|
@Column({ type: DataType.DECIMAL(12, 2), allowNull: false, defaultValue: 0 })
|
|
130
138
|
uaxiRetainedFromCharge: number;
|
|
131
139
|
|
|
132
|
-
@Column({
|
|
140
|
+
@Column({
|
|
141
|
+
type: DataType.DECIMAL(12, 2),
|
|
142
|
+
allowNull: false,
|
|
143
|
+
defaultValue: 0,
|
|
144
|
+
comment: "Asignación Stripe al conductor antes de reasignar el fee",
|
|
145
|
+
})
|
|
133
146
|
stripeToDriverAmount: number;
|
|
134
147
|
|
|
135
|
-
@Column({
|
|
148
|
+
@Column({
|
|
149
|
+
type: DataType.DECIMAL(12, 2),
|
|
150
|
+
allowNull: false,
|
|
151
|
+
defaultValue: 0,
|
|
152
|
+
comment: "Asignación externa al conductor antes de reasignar el fee",
|
|
153
|
+
})
|
|
136
154
|
externalToDriverAmount: number;
|
|
137
155
|
|
|
138
156
|
@Column({
|
|
139
157
|
type: DataType.DECIMAL(12, 2),
|
|
140
158
|
allowNull: false,
|
|
141
159
|
defaultValue: 0,
|
|
142
|
-
comment: "Fee
|
|
160
|
+
comment: "Fee real cobrado por Stripe en el charge",
|
|
143
161
|
})
|
|
144
162
|
stripeProcessingFee: number;
|
|
145
163
|
|
|
164
|
+
@Column({
|
|
165
|
+
type: DataType.DECIMAL(12, 2),
|
|
166
|
+
allowNull: false,
|
|
167
|
+
defaultValue: 0,
|
|
168
|
+
comment: "Parte del fee movida del bucket Stripe al bucket externo",
|
|
169
|
+
})
|
|
170
|
+
stripeFeeReallocatedAmount: number;
|
|
171
|
+
|
|
172
|
+
@Column({
|
|
173
|
+
type: DataType.DECIMAL(12, 2),
|
|
174
|
+
allowNull: false,
|
|
175
|
+
defaultValue: 0,
|
|
176
|
+
comment: "Transfer Connect real al conductor después de reasignar el fee",
|
|
177
|
+
})
|
|
178
|
+
stripeNetToDriverAmount: number;
|
|
179
|
+
|
|
180
|
+
@Column({
|
|
181
|
+
type: DataType.DECIMAL(12, 2),
|
|
182
|
+
allowNull: false,
|
|
183
|
+
defaultValue: 0,
|
|
184
|
+
comment: "Pago externo final al conductor incluyendo el fee reasignado",
|
|
185
|
+
})
|
|
186
|
+
externalNetToDriverAmount: number;
|
|
187
|
+
|
|
188
|
+
@Column({ type: DataType.DATE, allowNull: true })
|
|
189
|
+
stripeFeeAppliedAt: Date | null;
|
|
190
|
+
|
|
146
191
|
@Column({ type: DataType.STRING(120), allowNull: true })
|
|
147
192
|
stripeChargeId: string | null;
|
|
148
193
|
|
|
@@ -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
|
|
|
@@ -84,7 +84,7 @@ export class UaxiTreasuryPayout extends Model<
|
|
|
84
84
|
type: DataType.DECIMAL(12, 2),
|
|
85
85
|
allowNull: false,
|
|
86
86
|
defaultValue: 0,
|
|
87
|
-
comment: "Fee Stripe
|
|
87
|
+
comment: "Fee Stripe del periodo (informativo; ya no se descuenta del payout UAXI)",
|
|
88
88
|
})
|
|
89
89
|
stripeFeeAbsorbed: number;
|
|
90
90
|
|
|
@@ -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",
|