sahab-utils 1.8.1 → 1.8.3

package/dist/ts/calcs.js

@@ -195,16 +195,16 @@ function cashSurcharge(order) {
     var _a;
     return (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH ? Math.max(0, (0, utils_1.preventNaN)((_a = order === null || order === void 0 ? void 0 : order.sahabExtraPaymentAmount) !== null && _a !== void 0 ? _a : 0)) : 0;
 }
-/** Cash `paymentAmount` includes Sahab's surcharge, which is Sahab's revenue not the provider's —
- *  it must come off before comparing to `minimumProviderAmount`, or it's double-counted in getSahabFees/getProviderProfits. */
-function cashSettlementBase(order) {
+/** What was actually collected: the washer's cash, which already includes Sahab's surcharge, or the online charge.
+ *  The provider holds all of the cash, so the surcharge must stay in this figure for the transfer to take it back. */
+function settledPaymentAmount(order) {
     var _a;
-    return Math.max(0, (0, utils_1.preventNaN)((_a = order === null || order === void 0 ? void 0 : order.paymentAmount) !== null && _a !== void 0 ? _a : 0) - cashSurcharge(order));
+    return (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH ? (0, utils_1.preventNaN)((_a = order === null || order === void 0 ? void 0 : order.paymentAmount) !== null && _a !== void 0 ? _a : 0) : getCustomerTotalToPay(order);
 }
 function getProviderTransferAmount(order) {
     var _a, _b;
     const orderTotal = getServicesTotal(order) - getProviderDiscountsAmount(order);
-    const paymentAmount = (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH ? cashSettlementBase(order) : getCustomerTotalToPay(order);
+    const paymentAmount = settledPaymentAmount(order);
     const originalPrice = orderTotal / (1 + (0, utils_1.preventNaN)((_a = order === null || order === void 0 ? void 0 : order.sahabClientPercentage) !== null && _a !== void 0 ? _a : 0));
     const minimumProviderAmount = originalPrice - originalPrice * ((_b = order === null || order === void 0 ? void 0 : order.sahabProviderPercentage) !== null && _b !== void 0 ? _b : 0);
     if ((order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH) {
@@ -217,9 +217,7 @@ function getProviderTransferAmount(order) {
     }
 }
 function getProviderProfits(order) {
-    return (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH
-        ? getCustomerTotalToPay(order) - cashSurcharge(order) + getProviderTransferAmount(order)
-        : getProviderTransferAmount(order);
+    return (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH ? getCustomerTotalToPay(order) + getProviderTransferAmount(order) : getProviderTransferAmount(order);
 }
 function getOnlineProcessingFees(order) {
     var _a;
@@ -232,12 +230,12 @@ function getOnlineProcessingFees(order) {
 function getSahabFees(order) {
     var _a, _b;
     const orderTotal = getServicesTotal(order) - getProviderDiscountsAmount(order);
-    const paymentAmount = (order === null || order === void 0 ? void 0 : order.paymentType) === types_1.OrderPaymentType.CASH ? cashSettlementBase(order) : getCustomerTotalToPay(order);
+    const paymentAmount = settledPaymentAmount(order);
     const originalPrice = orderTotal / (1 + (0, utils_1.preventNaN)((_a = order === null || order === void 0 ? void 0 : order.sahabClientPercentage) !== null && _a !== void 0 ? _a : 0));
     const minimumProviderAmount = originalPrice - originalPrice * ((_b = order === null || order === void 0 ? void 0 : order.sahabProviderPercentage) !== null && _b !== void 0 ? _b : 0);
     // When a Sahab-funded discount pushes the customer below the provider's entitlement, Sahab is
     // genuinely subsidising the order — reporting a floor of 0 here overstated margin, so the negative figure stands.
-    return paymentAmount - minimumProviderAmount + cashSurcharge(order);
+    return paymentAmount - minimumProviderAmount;
 }
 function calcOrdersData(orders) {
     var _a, _b, _c, _d, _e, _f, _g, _h;

package/dist/ts/cash.d.ts

@@ -11,5 +11,3 @@ export declare const isFreeOrder: (order?: Partial<Order>) => boolean;
 export declare function resolveCashFee(configs?: Pick<PaymentConfigs, 'cashFee'> | null): number;
 /** The fee this order would carry if paid in cash: none when there is nothing to collect. */
 export declare function cashFeeForOrder(order: Partial<Order> | undefined, configs?: Pick<PaymentConfigs, 'cashFee'> | null): number;
-/** A redeemed gift tops up its extras online only; cash is fine once the gift covers everything. */
-export declare function isCashAllowedForOrder(order?: Partial<Order>): boolean;

package/dist/ts/cash.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isFreeOrder = exports.getOrderTotalWithoutCashFee = exports.MAX_CASH_FEE = void 0;
 exports.resolveCashFee = resolveCashFee;
 exports.cashFeeForOrder = cashFeeForOrder;
-exports.isCashAllowedForOrder = isCashAllowedForOrder;
 const types_1 = require("../constants/types");
 const calcs_1 = require("./calcs");
-const gifts_1 = require("./gifts");
 /** Cash payment — the shared rules. The fee is set from `payment_methods/configs`; the app only shows it
  *  and cloudFun is what charges it, so both must reach the same number from the same config. */
 /** A fee above this is read as a typo (5000 for 5.00) and ignored rather than charged to customers. */
@@ -28,7 +26,3 @@ function resolveCashFee(configs) {
 function cashFeeForOrder(order, configs) {
     return (0, exports.isFreeOrder)(order) ? 0 : resolveCashFee(configs);
 }
-/** A redeemed gift tops up its extras online only; cash is fine once the gift covers everything. */
-function isCashAllowedForOrder(order) {
-    return !((0, gifts_1.isGiftRedemption)(order) && !(0, exports.isFreeOrder)(order));
-}

package/dist/ts/push.d.ts

@@ -49,6 +49,15 @@ export type RegisterActivityTokenBody = {
     activityId: string;
     pushToken: string;
 };
+/** `accepted` counts devices the provider took the message for; it is not proof the phone displayed it. */
+export type TestPushResult = {
+    status: 'sent' | 'no_device' | 'failed';
+    transport: 'fcm' | 'onesignal';
+    devices: number;
+    accepted: number;
+};
+export declare const TEST_PUSH_COOLDOWN_S = 30;
+export declare const TEST_PUSH_DAILY_LIMIT = 20;
 export declare const PUSH_TOKENS_COLLECTION = "pushTokens";
 export declare const ANDROID_CHANNEL: {
     readonly client: "orders";

package/dist/ts/push.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sanitizePushUids = exports.buildLiveNotificationData = exports.buildLiveNotification = exports.choosePushTransport = exports.pushTransportOf = exports.LIVE_NOTIFICATION_DATA_KEY = exports.APNS_LIVE_ACTIVITY_TOPIC_SUFFIX = exports.ANDROID_CHANNEL = exports.PUSH_TOKENS_COLLECTION = void 0;
+exports.sanitizePushUids = exports.buildLiveNotificationData = exports.buildLiveNotification = exports.choosePushTransport = exports.pushTransportOf = exports.LIVE_NOTIFICATION_DATA_KEY = exports.APNS_LIVE_ACTIVITY_TOPIC_SUFFIX = exports.ANDROID_CHANNEL = exports.PUSH_TOKENS_COLLECTION = exports.TEST_PUSH_DAILY_LIMIT = exports.TEST_PUSH_COOLDOWN_S = void 0;
 const orderActivity_1 = require("./orderActivity");
+exports.TEST_PUSH_COOLDOWN_S = 30;
+exports.TEST_PUSH_DAILY_LIMIT = 20;
 exports.PUSH_TOKENS_COLLECTION = 'pushTokens';
 exports.ANDROID_CHANNEL = { client: 'orders', providerNewOrder: 'new-orders', provider: 'general' };
 exports.APNS_LIVE_ACTIVITY_TOPIC_SUFFIX = '.push-type.liveactivity';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sahab-utils",
-	"version": "1.8.1",
+	"version": "1.8.3",
 	"description": "This package contains types and utils functions",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",