@managesome/eposmatic-toolkit 0.4.11 → 0.4.13
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/esm/helpers/materialized-reports/materialized-delivery-classification-helpers.js +5 -9
- package/esm/helpers/materialized-reports/materialized-delivery-compile-helpers.js +3 -7
- package/esm/helpers/rider-reports/rider-daily-report.js +1 -4
- package/esm/helpers/utils/delivery-helpers.js +5 -2
- package/esm/schemas/models/deliveries.js +0 -5
- package/esm/schemas/models/materialized_rider_daily_reports.js +10 -2
- package/esm/schemas/models/warehouse_communications.js +5 -0
- package/lib/helpers/materialized-reports/materialized-delivery-classification-helpers.d.ts +4 -1
- package/lib/helpers/materialized-reports/materialized-delivery-classification-helpers.js +5 -9
- package/lib/helpers/materialized-reports/materialized-delivery-compile-helpers.js +3 -7
- package/lib/helpers/rider-reports/rider-daily-report.d.ts +0 -1
- package/lib/helpers/rider-reports/rider-daily-report.js +1 -4
- package/lib/helpers/utils/delivery-helpers.js +5 -2
- package/lib/schemas/models/deliveries.d.ts +0 -3
- package/lib/schemas/models/deliveries.js +0 -5
- package/lib/schemas/models/materialized_rider_daily_reports.d.ts +12 -2
- package/lib/schemas/models/materialized_rider_daily_reports.js +11 -3
- package/lib/schemas/models/warehouse_communications.d.ts +3 -0
- package/lib/schemas/models/warehouse_communications.js +5 -0
- package/lib/schemas/types/deliveries.d.ts +8 -6
- package/lib/schemas/types/dinein_tables_fingerprints.d.ts +1 -1
- package/lib/schemas/types/reviews.d.ts +1 -1
- package/lib/schemas/types/tenant-activity-logs.d.ts +1 -1
- package/lib/schemas/types/tenant_hr_employees.d.ts +1 -1
- package/lib/schemas/types/warehouse-activity-logs.d.ts +1 -1
- package/lib/tests/deliveries-schema.test.js +3 -1
- package/lib/tests/materialized-reports/materialized-delivery-accumulation.test.js +2 -1
- package/lib/tests/materialized-reports/materialized-delivery-compile.test.js +4 -4
- package/lib/tests/materialized-reports/materialized-delivery-fold.test.js +2 -1
- package/lib/tests/materialized-reports/materialized-delivery-formatter.test.js +2 -1
- package/lib/tests/materialized-reports/materialized-delivery-plan.test.js +2 -1
- package/lib/tests/rider-daily-report.test.js +0 -3
- package/package.json +1 -1
|
@@ -259,13 +259,9 @@ export function addDelivery(acc, delivery, order, key) {
|
|
|
259
259
|
// Only a FINAL snapshot is payout. A PENDING snapshot is an estimate shown to
|
|
260
260
|
// the rider before completion and must not inflate the materialized report.
|
|
261
261
|
const earnings = delivery.rider_earnings;
|
|
262
|
-
const
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
: 0
|
|
266
|
-
: delivery.rider_revenue);
|
|
267
|
-
const hasRevenue = Number.isFinite(revenue);
|
|
268
|
-
if (hasRevenue) {
|
|
262
|
+
const isFinalPayout = earnings?.status === RIDER_EARNINGS_STATUS_ENUM.FINAL;
|
|
263
|
+
const revenue = isFinalPayout ? Number(earnings.amount) || 0 : 0;
|
|
264
|
+
if (isFinalPayout) {
|
|
269
265
|
counters.money.rider_revenue_amount += revenue;
|
|
270
266
|
counters.money.rider_revenue_count += 1;
|
|
271
267
|
}
|
|
@@ -287,7 +283,7 @@ export function addDelivery(acc, delivery, order, key) {
|
|
|
287
283
|
row.cancelled_count += 1;
|
|
288
284
|
else if (status === DELIVERY_STATUS_ENUM.IN_PROGRESS)
|
|
289
285
|
row.in_progress_count += 1;
|
|
290
|
-
if (
|
|
286
|
+
if (isFinalPayout)
|
|
291
287
|
row.rider_revenue_amount += revenue;
|
|
292
288
|
row.distance_sum_meters += meters;
|
|
293
289
|
row.first_delivery_at = earlierOf(row.first_delivery_at, delivery.createdAt);
|
|
@@ -303,7 +299,7 @@ export function addDelivery(acc, delivery, order, key) {
|
|
|
303
299
|
area.completed_count += 1;
|
|
304
300
|
else if (status === DELIVERY_STATUS_ENUM.CANCELLED)
|
|
305
301
|
area.cancelled_count += 1;
|
|
306
|
-
if (
|
|
302
|
+
if (isFinalPayout)
|
|
307
303
|
area.rider_revenue_amount += revenue;
|
|
308
304
|
area.distance_sum_meters += meters;
|
|
309
305
|
const hour = hourKeyOf(delivery);
|
|
@@ -173,13 +173,9 @@ function buildEntryRow(delivery, order, details) {
|
|
|
173
173
|
status: status,
|
|
174
174
|
cancel_reason: delivery?.cancel_reason == null ? null : String(delivery.cancel_reason),
|
|
175
175
|
distance_meters: Number(delivery?.distance_in_meters_from_store) || 0,
|
|
176
|
-
rider_revenue: delivery?.rider_earnings
|
|
177
|
-
? delivery.rider_earnings.
|
|
178
|
-
|
|
179
|
-
: null
|
|
180
|
-
: delivery?.rider_revenue == null
|
|
181
|
-
? null
|
|
182
|
-
: Number(delivery.rider_revenue) || 0,
|
|
176
|
+
rider_revenue: delivery?.rider_earnings?.status === RIDER_EARNINGS_STATUS_ENUM.FINAL
|
|
177
|
+
? Number(delivery.rider_earnings.amount) || 0
|
|
178
|
+
: null,
|
|
183
179
|
tracking_enabled: delivery?.tracking_enabled === true,
|
|
184
180
|
has_pickup_proof: delivery?.pickup_food_image_url != null,
|
|
185
181
|
has_dropoff_proof: delivery?.dropoff_food_image_url != null,
|
|
@@ -3,10 +3,7 @@ import { MATERIALIZED_RIDER_DAILY_REPORTS_SCHEMA_VERSION } from '../../schemas/m
|
|
|
3
3
|
const completedOrCancelled = (status) => status === DELIVERY_STATUS_ENUM.COMPLETED || status === DELIVERY_STATUS_ENUM.CANCELLED;
|
|
4
4
|
const finalEarnings = (delivery) => {
|
|
5
5
|
const earnings = delivery.rider_earnings;
|
|
6
|
-
|
|
7
|
-
return earnings.status === RIDER_EARNINGS_STATUS_ENUM.FINAL ? Number(earnings.amount) || 0 : 0;
|
|
8
|
-
}
|
|
9
|
-
return Number(delivery.rider_revenue) || 0;
|
|
6
|
+
return earnings?.status === RIDER_EARNINGS_STATUS_ENUM.FINAL ? Number(earnings.amount) || 0 : 0;
|
|
10
7
|
};
|
|
11
8
|
export function buildRiderDailyReport({ rider_id, local_date, deliveries, computedAt = new Date(), }) {
|
|
12
9
|
if (rider_id.trim() === '' || local_date.trim() === '')
|
|
@@ -5,9 +5,12 @@ export function getDeliveryWithPrice(delivery, writeable) {
|
|
|
5
5
|
const convertToPrice = writeable ? convertPriceToCents : convertPriceFromCents;
|
|
6
6
|
return {
|
|
7
7
|
...delivery,
|
|
8
|
-
...(delivery.
|
|
8
|
+
...(delivery.rider_earnings != null
|
|
9
9
|
? {
|
|
10
|
-
|
|
10
|
+
rider_earnings: {
|
|
11
|
+
...delivery.rider_earnings,
|
|
12
|
+
amount: convertToPrice(delivery.rider_earnings.amount),
|
|
13
|
+
},
|
|
11
14
|
}
|
|
12
15
|
: {}),
|
|
13
16
|
};
|
|
@@ -29,10 +29,18 @@ export const MaterializedRiderDailyReportSchema = new Schema({
|
|
|
29
29
|
source_watermark: { type: Schema.Types.Date, required: true },
|
|
30
30
|
computed_at: { type: Schema.Types.Date, required: true },
|
|
31
31
|
}, { timestamps: true, versionKey: false, minimize: false });
|
|
32
|
-
|
|
32
|
+
/** Index patterns for `.hint()` reads. */
|
|
33
|
+
export const MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES = {
|
|
34
|
+
_id: { _id: 1 },
|
|
35
|
+
rider_id__local_date: { rider_id: 1, local_date: 1 },
|
|
36
|
+
};
|
|
37
|
+
MaterializedRiderDailyReportSchema.index(MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES.rider_id__local_date, {
|
|
38
|
+
unique: true,
|
|
39
|
+
name: 'rider_id__local_date',
|
|
40
|
+
});
|
|
33
41
|
export const MATERIALIZED_RIDER_DAILY_REPORTS_INDEX_OPTIONS = [
|
|
34
42
|
{
|
|
35
|
-
key:
|
|
43
|
+
key: MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES.rider_id__local_date,
|
|
36
44
|
name: 'rider_id__local_date',
|
|
37
45
|
unique: true,
|
|
38
46
|
},
|
|
@@ -142,6 +142,11 @@ const WarehouseCommunicationMetadataSchema = new Schema({
|
|
|
142
142
|
type: [WarehouseCommunicationActionButtonSchema],
|
|
143
143
|
default: [],
|
|
144
144
|
},
|
|
145
|
+
theme_color: {
|
|
146
|
+
type: String,
|
|
147
|
+
required: false,
|
|
148
|
+
default: null,
|
|
149
|
+
},
|
|
145
150
|
}, {
|
|
146
151
|
_id: false,
|
|
147
152
|
minimize: false,
|
|
@@ -74,8 +74,11 @@ export interface IDeliveryOrderSource {
|
|
|
74
74
|
}) | null;
|
|
75
75
|
}
|
|
76
76
|
/** Raw delivery fields this classifier reads (all optional at the boundary). */
|
|
77
|
-
export type TDeliverySource = Partial<Omit<IDelivery, 'status'>> & {
|
|
77
|
+
export type TDeliverySource = Partial<Omit<IDelivery, 'status' | '_id' | 'order_id' | 'rider_earnings'>> & {
|
|
78
|
+
_id?: string;
|
|
79
|
+
order_id?: string;
|
|
78
80
|
status?: DELIVERY_STATUS_ENUM | string;
|
|
81
|
+
rider_earnings?: Partial<NonNullable<IDelivery['rider_earnings']>> | null;
|
|
79
82
|
localHour?: number | null;
|
|
80
83
|
};
|
|
81
84
|
export interface IDeliveryAccumulator {
|
|
@@ -271,13 +271,9 @@ function addDelivery(acc, delivery, order, key) {
|
|
|
271
271
|
// Only a FINAL snapshot is payout. A PENDING snapshot is an estimate shown to
|
|
272
272
|
// the rider before completion and must not inflate the materialized report.
|
|
273
273
|
const earnings = delivery.rider_earnings;
|
|
274
|
-
const
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
: 0
|
|
278
|
-
: delivery.rider_revenue);
|
|
279
|
-
const hasRevenue = Number.isFinite(revenue);
|
|
280
|
-
if (hasRevenue) {
|
|
274
|
+
const isFinalPayout = earnings?.status === delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL;
|
|
275
|
+
const revenue = isFinalPayout ? Number(earnings.amount) || 0 : 0;
|
|
276
|
+
if (isFinalPayout) {
|
|
281
277
|
counters.money.rider_revenue_amount += revenue;
|
|
282
278
|
counters.money.rider_revenue_count += 1;
|
|
283
279
|
}
|
|
@@ -299,7 +295,7 @@ function addDelivery(acc, delivery, order, key) {
|
|
|
299
295
|
row.cancelled_count += 1;
|
|
300
296
|
else if (status === delivery_1.DELIVERY_STATUS_ENUM.IN_PROGRESS)
|
|
301
297
|
row.in_progress_count += 1;
|
|
302
|
-
if (
|
|
298
|
+
if (isFinalPayout)
|
|
303
299
|
row.rider_revenue_amount += revenue;
|
|
304
300
|
row.distance_sum_meters += meters;
|
|
305
301
|
row.first_delivery_at = earlierOf(row.first_delivery_at, delivery.createdAt);
|
|
@@ -315,7 +311,7 @@ function addDelivery(acc, delivery, order, key) {
|
|
|
315
311
|
area.completed_count += 1;
|
|
316
312
|
else if (status === delivery_1.DELIVERY_STATUS_ENUM.CANCELLED)
|
|
317
313
|
area.cancelled_count += 1;
|
|
318
|
-
if (
|
|
314
|
+
if (isFinalPayout)
|
|
319
315
|
area.rider_revenue_amount += revenue;
|
|
320
316
|
area.distance_sum_meters += meters;
|
|
321
317
|
const hour = hourKeyOf(delivery);
|
|
@@ -177,13 +177,9 @@ function buildEntryRow(delivery, order, details) {
|
|
|
177
177
|
status: status,
|
|
178
178
|
cancel_reason: delivery?.cancel_reason == null ? null : String(delivery.cancel_reason),
|
|
179
179
|
distance_meters: Number(delivery?.distance_in_meters_from_store) || 0,
|
|
180
|
-
rider_revenue: delivery?.rider_earnings
|
|
181
|
-
? delivery.rider_earnings.
|
|
182
|
-
|
|
183
|
-
: null
|
|
184
|
-
: delivery?.rider_revenue == null
|
|
185
|
-
? null
|
|
186
|
-
: Number(delivery.rider_revenue) || 0,
|
|
180
|
+
rider_revenue: delivery?.rider_earnings?.status === delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL
|
|
181
|
+
? Number(delivery.rider_earnings.amount) || 0
|
|
182
|
+
: null,
|
|
187
183
|
tracking_enabled: delivery?.tracking_enabled === true,
|
|
188
184
|
has_pickup_proof: delivery?.pickup_food_image_url != null,
|
|
189
185
|
has_dropoff_proof: delivery?.dropoff_food_image_url != null,
|
|
@@ -14,7 +14,6 @@ export interface IRiderDailySourceDelivery {
|
|
|
14
14
|
distance_in_meters_from_store?: number | null;
|
|
15
15
|
expected_delivery_at?: Date | string | null;
|
|
16
16
|
delivered_at?: Date | string | null;
|
|
17
|
-
rider_revenue?: number | null;
|
|
18
17
|
rider_earnings?: {
|
|
19
18
|
amount?: number | null;
|
|
20
19
|
status?: RIDER_EARNINGS_STATUS_ENUM | null;
|
|
@@ -6,10 +6,7 @@ const materialized_rider_daily_reports_1 = require("../../schemas/models/materia
|
|
|
6
6
|
const completedOrCancelled = (status) => status === delivery_1.DELIVERY_STATUS_ENUM.COMPLETED || status === delivery_1.DELIVERY_STATUS_ENUM.CANCELLED;
|
|
7
7
|
const finalEarnings = (delivery) => {
|
|
8
8
|
const earnings = delivery.rider_earnings;
|
|
9
|
-
|
|
10
|
-
return earnings.status === delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL ? Number(earnings.amount) || 0 : 0;
|
|
11
|
-
}
|
|
12
|
-
return Number(delivery.rider_revenue) || 0;
|
|
9
|
+
return earnings?.status === delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL ? Number(earnings.amount) || 0 : 0;
|
|
13
10
|
};
|
|
14
11
|
function buildRiderDailyReport({ rider_id, local_date, deliveries, computedAt = new Date(), }) {
|
|
15
12
|
if (rider_id.trim() === '' || local_date.trim() === '')
|
|
@@ -12,9 +12,12 @@ function getDeliveryWithPrice(delivery, writeable) {
|
|
|
12
12
|
const convertToPrice = writeable ? price_conversion_1.convertPriceToCents : price_conversion_1.convertPriceFromCents;
|
|
13
13
|
return {
|
|
14
14
|
...delivery,
|
|
15
|
-
...(delivery.
|
|
15
|
+
...(delivery.rider_earnings != null
|
|
16
16
|
? {
|
|
17
|
-
|
|
17
|
+
rider_earnings: {
|
|
18
|
+
...delivery.rider_earnings,
|
|
19
|
+
amount: convertToPrice(delivery.rider_earnings.amount),
|
|
20
|
+
},
|
|
18
21
|
}
|
|
19
22
|
: {}),
|
|
20
23
|
};
|
|
@@ -40,7 +40,6 @@ export declare const DeliveriesSchema: Schema<any, import("mongoose").Model<any,
|
|
|
40
40
|
}>;
|
|
41
41
|
localDate?: string | null | undefined;
|
|
42
42
|
cancel_reason?: string | null | undefined;
|
|
43
|
-
rider_revenue?: number | null | undefined;
|
|
44
43
|
pickup_food_image_url?: string | null | undefined;
|
|
45
44
|
dropoff_food_image_url?: string | null | undefined;
|
|
46
45
|
tracking_enabled?: boolean | null | undefined;
|
|
@@ -98,7 +97,6 @@ export declare const DeliveriesSchema: Schema<any, import("mongoose").Model<any,
|
|
|
98
97
|
}>;
|
|
99
98
|
localDate?: string | null | undefined;
|
|
100
99
|
cancel_reason?: string | null | undefined;
|
|
101
|
-
rider_revenue?: number | null | undefined;
|
|
102
100
|
pickup_food_image_url?: string | null | undefined;
|
|
103
101
|
dropoff_food_image_url?: string | null | undefined;
|
|
104
102
|
tracking_enabled?: boolean | null | undefined;
|
|
@@ -156,7 +154,6 @@ export declare const DeliveriesSchema: Schema<any, import("mongoose").Model<any,
|
|
|
156
154
|
}>;
|
|
157
155
|
localDate?: string | null | undefined;
|
|
158
156
|
cancel_reason?: string | null | undefined;
|
|
159
|
-
rider_revenue?: number | null | undefined;
|
|
160
157
|
pickup_food_image_url?: string | null | undefined;
|
|
161
158
|
dropoff_food_image_url?: string | null | undefined;
|
|
162
159
|
tracking_enabled?: boolean | null | undefined;
|
|
@@ -17,10 +17,20 @@ export declare const MaterializedRiderDailyReportSchema: Schema<IMaterializedRid
|
|
|
17
17
|
}> & {
|
|
18
18
|
__v: number;
|
|
19
19
|
}>;
|
|
20
|
+
/** Index patterns for `.hint()` reads. */
|
|
21
|
+
export declare const MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES: {
|
|
22
|
+
readonly _id: {
|
|
23
|
+
readonly _id: 1;
|
|
24
|
+
};
|
|
25
|
+
readonly rider_id__local_date: {
|
|
26
|
+
readonly rider_id: 1;
|
|
27
|
+
readonly local_date: 1;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
20
30
|
export declare const MATERIALIZED_RIDER_DAILY_REPORTS_INDEX_OPTIONS: {
|
|
21
31
|
key: {
|
|
22
|
-
rider_id:
|
|
23
|
-
local_date:
|
|
32
|
+
readonly rider_id: 1;
|
|
33
|
+
readonly local_date: 1;
|
|
24
34
|
};
|
|
25
35
|
name: string;
|
|
26
36
|
unique: boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MATERIALIZED_RIDER_DAILY_REPORTS_INDEX_OPTIONS = exports.MaterializedRiderDailyReportSchema = exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_NAME = exports.MATERIALIZED_RIDER_DAILY_REPORTS_SCHEMA_VERSION = void 0;
|
|
3
|
+
exports.MATERIALIZED_RIDER_DAILY_REPORTS_INDEX_OPTIONS = exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES = exports.MaterializedRiderDailyReportSchema = exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_NAME = exports.MATERIALIZED_RIDER_DAILY_REPORTS_SCHEMA_VERSION = void 0;
|
|
4
4
|
const mongoose_1 = require("mongoose");
|
|
5
5
|
/**
|
|
6
6
|
* Mongoose schema for `materialized_rider_daily_reports`.
|
|
@@ -32,10 +32,18 @@ exports.MaterializedRiderDailyReportSchema = new mongoose_1.Schema({
|
|
|
32
32
|
source_watermark: { type: mongoose_1.Schema.Types.Date, required: true },
|
|
33
33
|
computed_at: { type: mongoose_1.Schema.Types.Date, required: true },
|
|
34
34
|
}, { timestamps: true, versionKey: false, minimize: false });
|
|
35
|
-
|
|
35
|
+
/** Index patterns for `.hint()` reads. */
|
|
36
|
+
exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES = {
|
|
37
|
+
_id: { _id: 1 },
|
|
38
|
+
rider_id__local_date: { rider_id: 1, local_date: 1 },
|
|
39
|
+
};
|
|
40
|
+
exports.MaterializedRiderDailyReportSchema.index(exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES.rider_id__local_date, {
|
|
41
|
+
unique: true,
|
|
42
|
+
name: 'rider_id__local_date',
|
|
43
|
+
});
|
|
36
44
|
exports.MATERIALIZED_RIDER_DAILY_REPORTS_INDEX_OPTIONS = [
|
|
37
45
|
{
|
|
38
|
-
key:
|
|
46
|
+
key: exports.MATERIALIZED_RIDER_DAILY_REPORTS_COLLECTION_INDEXES.rider_id__local_date,
|
|
39
47
|
name: 'rider_id__local_date',
|
|
40
48
|
unique: true,
|
|
41
49
|
},
|
|
@@ -74,6 +74,7 @@ export declare const WarehouseCommunicationsSchema: Schema<any, import("mongoose
|
|
|
74
74
|
expected_deadline?: string | null | undefined;
|
|
75
75
|
notes?: string | null | undefined;
|
|
76
76
|
payment_terms_days?: number | null | undefined;
|
|
77
|
+
theme_color?: string | null | undefined;
|
|
77
78
|
};
|
|
78
79
|
sent_at?: NativeDate | null | undefined;
|
|
79
80
|
}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
|
|
@@ -146,6 +147,7 @@ export declare const WarehouseCommunicationsSchema: Schema<any, import("mongoose
|
|
|
146
147
|
expected_deadline?: string | null | undefined;
|
|
147
148
|
notes?: string | null | undefined;
|
|
148
149
|
payment_terms_days?: number | null | undefined;
|
|
150
|
+
theme_color?: string | null | undefined;
|
|
149
151
|
};
|
|
150
152
|
sent_at?: NativeDate | null | undefined;
|
|
151
153
|
}>> & import("mongoose").FlatRecord<{
|
|
@@ -218,6 +220,7 @@ export declare const WarehouseCommunicationsSchema: Schema<any, import("mongoose
|
|
|
218
220
|
expected_deadline?: string | null | undefined;
|
|
219
221
|
notes?: string | null | undefined;
|
|
220
222
|
payment_terms_days?: number | null | undefined;
|
|
223
|
+
theme_color?: string | null | undefined;
|
|
221
224
|
};
|
|
222
225
|
sent_at?: NativeDate | null | undefined;
|
|
223
226
|
}> & Required<{
|
|
@@ -145,6 +145,11 @@ const WarehouseCommunicationMetadataSchema = new mongoose_1.Schema({
|
|
|
145
145
|
type: [WarehouseCommunicationActionButtonSchema],
|
|
146
146
|
default: [],
|
|
147
147
|
},
|
|
148
|
+
theme_color: {
|
|
149
|
+
type: String,
|
|
150
|
+
required: false,
|
|
151
|
+
default: null,
|
|
152
|
+
},
|
|
148
153
|
}, {
|
|
149
154
|
_id: false,
|
|
150
155
|
minimize: false,
|
|
@@ -15,11 +15,13 @@ export interface IDelivery {
|
|
|
15
15
|
tenant_phone_numbers: string[];
|
|
16
16
|
status: DELIVERY_STATUS_ENUM;
|
|
17
17
|
cancel_reason?: string | null;
|
|
18
|
-
/**
|
|
18
|
+
/**
|
|
19
|
+
* Tenant-local business date resolved from `track_order_numbers.runningLocalDate`
|
|
20
|
+
* at creation (order.localDate is the fallback when the tracker is absent).
|
|
21
|
+
*/
|
|
19
22
|
localDate?: string | null;
|
|
20
23
|
polyline: [number, number][];
|
|
21
24
|
distance_in_meters_from_store: number;
|
|
22
|
-
rider_revenue?: number | null;
|
|
23
25
|
pickup_food_image_url?: string | null;
|
|
24
26
|
dropoff_food_image_url?: string | null;
|
|
25
27
|
tracking_enabled?: boolean;
|
|
@@ -38,10 +40,10 @@ export interface IDelivery {
|
|
|
38
40
|
/** Stored duration at COMPLETED (minutes). */
|
|
39
41
|
delivery_minutes?: number | null;
|
|
40
42
|
/**
|
|
41
|
-
* Server-owned rider payout snapshot
|
|
42
|
-
* number: for distance-based rules the
|
|
43
|
-
*
|
|
44
|
-
*
|
|
43
|
+
* Server-owned rider payout snapshot — the SINGLE stored payout value.
|
|
44
|
+
* The customer delivery fee is NOT this number: for distance-based rules the
|
|
45
|
+
* rider fee is independent of the order. API/report surfaces that still expose
|
|
46
|
+
* `rider_revenue` derive it from this snapshot.
|
|
45
47
|
*/
|
|
46
48
|
rider_earnings?: IRiderEarningsSnapshot | null;
|
|
47
49
|
createdAt_mins: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TENANT_ACTIVITY_LOG_ACTION_ENUM, TENANT_ACTIVITY_LOG_ENTITY_TYPE_ENUM, TENANT_ACTIVITY_LOG_SEVERITY_ENUM } from '../../constants';
|
|
2
2
|
export interface ITenantActivityLogActor {
|
|
3
|
-
staff_id: string;
|
|
3
|
+
staff_id: string | null;
|
|
4
4
|
staff_name: string | null;
|
|
5
5
|
staff_email: string | null;
|
|
6
6
|
staff_mobile: string | null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WAREHOUSE_ACTIVITY_LOG_ACTION_ENUM, WAREHOUSE_ACTIVITY_LOG_ENTITY_TYPE_ENUM, WAREHOUSE_ACTIVITY_LOG_SEVERITY_ENUM } from '../../constants';
|
|
2
2
|
export interface IWarehouseActivityLogActor {
|
|
3
|
-
staff_id: string;
|
|
3
|
+
staff_id: string | null;
|
|
4
4
|
staff_name: string | null;
|
|
5
5
|
staff_email: string | null;
|
|
6
6
|
staff_mobile: string | null;
|
|
@@ -23,7 +23,6 @@ const IDELIVERY_TOP_LEVEL_FIELDS = [
|
|
|
23
23
|
'localDate',
|
|
24
24
|
'polyline',
|
|
25
25
|
'distance_in_meters_from_store',
|
|
26
|
-
'rider_revenue',
|
|
27
26
|
'pickup_food_image_url',
|
|
28
27
|
'dropoff_food_image_url',
|
|
29
28
|
'tracking_enabled',
|
|
@@ -56,6 +55,9 @@ describe('IDelivery / DeliveriesSchema sync', () => {
|
|
|
56
55
|
expect(deliveries_1.DeliveriesSchema.path(field)).toBeDefined();
|
|
57
56
|
}
|
|
58
57
|
});
|
|
58
|
+
it('does not retain the removed raw rider_revenue field', () => {
|
|
59
|
+
expect(deliveries_1.DeliveriesSchema.path('rider_revenue')).toBeUndefined();
|
|
60
|
+
});
|
|
59
61
|
it('defines every rider_earnings field on the nested model', () => {
|
|
60
62
|
const nested = deliveries_1.DeliveriesSchema.path('rider_earnings');
|
|
61
63
|
expect(nested).toBeDefined();
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const delivery_1 = require("../../constants/enums/delivery");
|
|
3
4
|
const materialized_delivery_classification_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-classification-helpers");
|
|
4
5
|
/**
|
|
5
6
|
* M4 delivery accumulation.
|
|
@@ -30,7 +31,7 @@ const delivery = (over = {}) => ({
|
|
|
30
31
|
updatedAt: new Date('2026-09-14T10:35:00.000Z'),
|
|
31
32
|
delivered_at: null,
|
|
32
33
|
distance_in_meters_from_store: 3000,
|
|
33
|
-
|
|
34
|
+
rider_earnings: { amount: 700, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
34
35
|
tracking_enabled: false,
|
|
35
36
|
localHour: 10,
|
|
36
37
|
...over,
|
|
@@ -36,7 +36,7 @@ const delivery = (over = {}) => ({
|
|
|
36
36
|
updatedAt: new Date('2026-09-14T10:35:00.000Z'),
|
|
37
37
|
delivered_at: new Date('2026-09-14T10:32:00.000Z'),
|
|
38
38
|
distance_in_meters_from_store: 3000,
|
|
39
|
-
|
|
39
|
+
rider_earnings: { amount: 700, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
40
40
|
polyline: [
|
|
41
41
|
[1, 2],
|
|
42
42
|
[3, 4],
|
|
@@ -205,7 +205,7 @@ describe('M4 day compile', () => {
|
|
|
205
205
|
});
|
|
206
206
|
const rowFor = (status) => {
|
|
207
207
|
const compiled = compile({
|
|
208
|
-
deliveries: [delivery({
|
|
208
|
+
deliveries: [delivery({ rider_earnings: snapshot(status) })],
|
|
209
209
|
});
|
|
210
210
|
return Object.values(compiled.entries[0].delivery_entries).flatMap((section) => section.rows)[0];
|
|
211
211
|
};
|
|
@@ -225,11 +225,11 @@ describe('M4 day compile', () => {
|
|
|
225
225
|
version: 1,
|
|
226
226
|
});
|
|
227
227
|
const pending = compile({
|
|
228
|
-
deliveries: [delivery({
|
|
228
|
+
deliveries: [delivery({ rider_earnings: snapshot(delivery_1.RIDER_EARNINGS_STATUS_ENUM.PENDING) })],
|
|
229
229
|
});
|
|
230
230
|
expect(Object.values(pending.reports[0].delivery_counters)[0].money.rider_revenue_amount).toBe(0);
|
|
231
231
|
const final = compile({
|
|
232
|
-
deliveries: [delivery({
|
|
232
|
+
deliveries: [delivery({ rider_earnings: snapshot(delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL) })],
|
|
233
233
|
});
|
|
234
234
|
expect(Object.values(final.reports[0].delivery_counters)[0].money.rider_revenue_amount).toBe(900);
|
|
235
235
|
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const delivery_1 = require("../../constants/enums/delivery");
|
|
3
4
|
const materialized_delivery_classification_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-classification-helpers");
|
|
4
5
|
const materialized_delivery_accumulator_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-accumulator-helpers");
|
|
5
6
|
/**
|
|
@@ -26,7 +27,7 @@ const delivery = (over = {}) => ({
|
|
|
26
27
|
createdAt: new Date('2026-09-14T10:00:00.000Z'),
|
|
27
28
|
updatedAt: new Date('2026-09-14T10:30:00.000Z'),
|
|
28
29
|
distance_in_meters_from_store: 3000,
|
|
29
|
-
|
|
30
|
+
rider_earnings: { amount: 700, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
30
31
|
localHour: 10,
|
|
31
32
|
...over,
|
|
32
33
|
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const delivery_1 = require("../../constants/enums/delivery");
|
|
3
4
|
const ENUMS_1 = require("../../constants/ENUMS");
|
|
4
5
|
const materialized_delivery_compile_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-compile-helpers");
|
|
5
6
|
const tenant_delivery_formatter_1 = require("../../helpers/materialized-reports/tenant-delivery-formatter");
|
|
@@ -38,7 +39,7 @@ const delivery = (orderId, over = {}) => ({
|
|
|
38
39
|
updatedAt: new Date(DAY + 'T10:35:00.000Z'),
|
|
39
40
|
delivered_at: over.delivered_at === undefined ? new Date(DAY + 'T10:32:00.000Z') : over.delivered_at,
|
|
40
41
|
distance_in_meters_from_store: over.distance ?? 3000,
|
|
41
|
-
|
|
42
|
+
rider_earnings: { amount: over.revenue === undefined ? 700 : over.revenue, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
42
43
|
localHour: 10,
|
|
43
44
|
localDate: DAY,
|
|
44
45
|
...over,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const delivery_1 = require("../../constants/enums/delivery");
|
|
3
4
|
const materialized_delivery_close_day_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-close-day-helpers");
|
|
4
5
|
const materialized_delivery_compile_helpers_1 = require("../../helpers/materialized-reports/materialized-delivery-compile-helpers");
|
|
5
6
|
/**
|
|
@@ -42,7 +43,7 @@ const delivery = (over = {}) => ({
|
|
|
42
43
|
updatedAt: new Date((over.localDate ?? DAY_ONE) + 'T10:35:00.000Z'),
|
|
43
44
|
delivered_at: new Date((over.localDate ?? DAY_ONE) + 'T10:32:00.000Z'),
|
|
44
45
|
distance_in_meters_from_store: 3000,
|
|
45
|
-
|
|
46
|
+
rider_earnings: { amount: 700, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
46
47
|
localHour: 10,
|
|
47
48
|
localDate: DAY_ONE,
|
|
48
49
|
...over,
|
|
@@ -9,7 +9,6 @@ const delivery = (over = {}) => ({
|
|
|
9
9
|
distance_in_meters_from_store: 3000,
|
|
10
10
|
expected_delivery_at: '2026-10-19T11:00:00.000Z',
|
|
11
11
|
delivered_at: '2026-10-19T10:50:00.000Z',
|
|
12
|
-
rider_revenue: 900,
|
|
13
12
|
rider_earnings: { amount: 900, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.FINAL },
|
|
14
13
|
...over,
|
|
15
14
|
});
|
|
@@ -31,7 +30,6 @@ describe('buildRiderDailyReport', () => {
|
|
|
31
30
|
delivery({
|
|
32
31
|
_id: 'c',
|
|
33
32
|
status: delivery_1.DELIVERY_STATUS_ENUM.CANCELLED,
|
|
34
|
-
rider_revenue: 0,
|
|
35
33
|
rider_earnings: { amount: 0, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.VOID },
|
|
36
34
|
}),
|
|
37
35
|
],
|
|
@@ -51,7 +49,6 @@ describe('buildRiderDailyReport', () => {
|
|
|
51
49
|
local_date: '2026-10-19',
|
|
52
50
|
deliveries: [
|
|
53
51
|
delivery({
|
|
54
|
-
rider_revenue: 900,
|
|
55
52
|
rider_earnings: { amount: 900, status: delivery_1.RIDER_EARNINGS_STATUS_ENUM.PENDING },
|
|
56
53
|
}),
|
|
57
54
|
],
|