sahab-utils 1.8.9 → 1.9.1

package/dist/constants/types.d.ts

@@ -145,7 +145,7 @@ export type Order = {
     };
     providerPhoneNumber?: string;
     providerLogoUrl?: string;
-    paymentGateway?: 'PAYLINK' | 'CHECKOUT' | 'TAP';
+    paymentGateway?: 'CHECKOUT' | 'TAP';
     visitDates?: number[];
     /** Cloud Tasks ids for cancelling a scheduled job — mirrors cloudFun's local `Order`; added here
      *  because the customer app reads them too, against a type that previously didn't admit they exist. */
@@ -912,6 +912,8 @@ export type CheckoutToken = {
     name?: string;
 };
 export type SPECIFIED_TIME = 'anytime' | number;
+/** What the customer app sends to create an order: choices only. Who is paying, whether it is paid, the carwash's own
+ * details, the cash fee and every price are decided by the server, so none of them is in the payload. */
 export type PlaceOrder = {
     clientID: string;
     providerId: string;
@@ -922,31 +924,16 @@ export type PlaceOrder = {
     long: number;
     willClientBeThere: boolean;
     paymentType: OrderPaymentType;
-    isPaid: boolean;
-    /** Set once the charge succeeds, not when the payload is first built. */
-    paymentId?: string;
-    isProviderTest: boolean;
-    providerReceiveOrders: boolean;
     orderNote: string;
     /** Absent when no discount applies. */
     promoCode?: Discount;
     driverIds: string[];
-    providerName: {
-        ar: string;
-        en: string;
-    };
-    paymentAmount: number;
     usedBalance: number;
-    providerPhoneNumber: string;
     isAddonStructure: boolean;
     isMonthlyPackage: boolean;
-    sahabExtraPaymentAmount: number;
     orderId?: string;
-    paymentGateway?: 'PAYLINK' | 'CHECKOUT' | 'TAP';
     /** Explicit dates for a multi-visit package; the server derives them when omitted. */
     visitDates?: number[];
-    /** Mirrors Order economics for server-side Tap split; optional override of client fee % */
-    sahabClientPercentage?: number;
 };
 export type WeatherData = {
     date: string;

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export * from './ts/cashback';
 export * from './ts/gifts';
 export * from './ts/iban';
 export * from './ts/loyalty';
+export * from './ts/offerings';
 export * from './ts/orderActivity';
 export * from './ts/payLink';
 export * from './ts/push';

package/dist/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./ts/cashback"), exports);
 __exportStar(require("./ts/gifts"), exports);
 __exportStar(require("./ts/iban"), exports);
 __exportStar(require("./ts/loyalty"), exports);
+__exportStar(require("./ts/offerings"), exports);
 __exportStar(require("./ts/orderActivity"), exports);
 __exportStar(require("./ts/payLink"), exports);
 __exportStar(require("./ts/push"), exports);

package/dist/ts/offerings.d.ts

@@ -0,0 +1,54 @@
+import { Car, CarService, CarSize, Discount, Price, ProvidedAddon, ProvidedService, Provider, ProviderAddon, ProviderService } from '../constants/types';
+export declare function serviceVisitCount(service?: ProviderService): number;
+/** A package sold as several visits, rather than a single wash. */
+export declare function isMultipleVisitService(service?: ProviderService): boolean;
+/** Single-wash services the customer may browse. */
+export declare function normalServices(provider?: Provider): ProviderService[];
+/** Multi-visit packages the customer may browse. */
+export declare function multipleVisitServices(provider?: Provider): ProviderService[];
+/** Add-ons the customer may browse. */
+export declare function visibleAddons(provider?: Provider): ProviderAddon[];
+export declare function isAvailableForSize(prices?: Price[], size?: CarSize): boolean;
+export declare function startingPrice(provider?: Provider): number | null;
+/** The discounts that apply to one service. */
+export declare function discountsForService(discounts?: Discount[], serviceId?: string): Discount[];
+/** The discounts that apply to one add-on. */
+export declare function discountsForAddon(discounts?: Discount[], addonId?: string): Discount[];
+/** Why an offering cannot be selected right now, or `null` when it can. */
+export type OfferingBlockedReason = 'unavailable_for_size' | 'package_selected' | 'needs_service';
+export declare function hasPackageSelected(selectedServices: (ProviderService | undefined)[]): boolean;
+export declare function offeringBlockedReason(args: {
+    kind: 'service' | 'addon';
+    availableForSize: boolean;
+    packageSelected: boolean;
+    hasServiceSelected: boolean;
+}): OfferingBlockedReason | null;
+export declare function nextSelectionAfterToggle<T extends {
+    kind: 'service' | 'addon';
+    id: string;
+}>(current: T[], toggled: T, opts: {
+    isPackage: boolean;
+    packageSelected: boolean;
+}): T[];
+/** A provider price shown to the customer, less the first of `discounts`; never below zero. */
+export declare const getServicePrice: (prices?: Price[], size?: CarSize, discounts?: Discount[]) => number;
+/** The customer's price for a catalogue price at a car size, before any discount. */
+export declare const setServicePrice: (prices?: Price[], size?: CarSize) => number;
+/** An order line for a service, as the customer app builds it and as the server rebuilds it. */
+export declare const setProvidedService: (service: ProviderService, car: Pick<Car, "size">, discounts?: Discount[]) => ProvidedService;
+/** An order line for an add-on, as the customer app builds it and as the server rebuilds it. */
+export declare const setProvidedAddon: (addon: ProviderAddon, car: Pick<Car, "size">, discounts?: Discount[]) => ProvidedAddon;
+export type BasketRejection = 'empty_basket' | 'line_invalid' | 'line_unavailable' | 'line_not_priced' | 'package_not_alone';
+export type RepricedBasket = {
+    ok: true;
+    services: CarService[];
+} | {
+    ok: false;
+    reason: BasketRejection;
+    detail?: string;
+};
+export declare const withoutUndefined: <T extends object>(line: T) => T;
+/** A basket rebuilt from the provider's catalogue: every line's price at its car's size, duration, visit count and
+ * discount come from `provider` and `discounts` (the offers this customer may use now), whatever the basket carried.
+ * A line the provider does not sell, or not at that size, is refused rather than dropped. */
+export declare function repriceBasket(services: CarService[] | undefined, provider: Pick<Provider, 'services' | 'addons'>, discounts: Discount[]): RepricedBasket;

package/dist/ts/offerings.js

@@ -0,0 +1,216 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withoutUndefined = exports.setProvidedAddon = exports.setProvidedService = exports.setServicePrice = exports.getServicePrice = void 0;
+exports.serviceVisitCount = serviceVisitCount;
+exports.isMultipleVisitService = isMultipleVisitService;
+exports.normalServices = normalServices;
+exports.multipleVisitServices = multipleVisitServices;
+exports.visibleAddons = visibleAddons;
+exports.isAvailableForSize = isAvailableForSize;
+exports.startingPrice = startingPrice;
+exports.discountsForService = discountsForService;
+exports.discountsForAddon = discountsForAddon;
+exports.hasPackageSelected = hasPackageSelected;
+exports.offeringBlockedReason = offeringBlockedReason;
+exports.nextSelectionAfterToggle = nextSelectionAfterToggle;
+exports.repriceBasket = repriceBasket;
+const types_1 = require("../constants/types");
+const calcs_1 = require("./calcs");
+const utils_1 = require("./utils");
+// These rules used to live inline in the provider screen, so the gift flow re-derived a looser
+// copy and offered services the customer couldn't book. Read offerings from here, not `provider.services`.
+// The server prices an order with the same functions the app builds its lines with (`repriceBasket`).
+// Two field names exist in the wild: `numberOfVisits` is current, `numberOfServices` is what
+// older provider records carry — both are honoured so an old package isn't sold at one visit's price.
+function serviceVisitCount(service) {
+    var _a, _b;
+    const s = service;
+    return (_b = (_a = s === null || s === void 0 ? void 0 : s.numberOfVisits) !== null && _a !== void 0 ? _a : s === null || s === void 0 ? void 0 : s.numberOfServices) !== null && _b !== void 0 ? _b : 1;
+}
+/** A package sold as several visits, rather than a single wash. */
+function isMultipleVisitService(service) {
+    return serviceVisitCount(service) > 1;
+}
+/** Single-wash services the customer may browse. */
+function normalServices(provider) {
+    var _a;
+    return ((_a = provider === null || provider === void 0 ? void 0 : provider.services) !== null && _a !== void 0 ? _a : []).filter((s) => !(s === null || s === void 0 ? void 0 : s.hide) && !isMultipleVisitService(s));
+}
+/** Multi-visit packages the customer may browse. */
+function multipleVisitServices(provider) {
+    var _a;
+    return ((_a = provider === null || provider === void 0 ? void 0 : provider.services) !== null && _a !== void 0 ? _a : []).filter((s) => !(s === null || s === void 0 ? void 0 : s.hide) && isMultipleVisitService(s));
+}
+/** Add-ons the customer may browse. */
+function visibleAddons(provider) {
+    var _a;
+    return ((_a = provider === null || provider === void 0 ? void 0 : provider.addons) !== null && _a !== void 0 ? _a : []).filter((a) => !(a === null || a === void 0 ? void 0 : a.hide));
+}
+// A size with no price is not offered at all — "cannot be selected", not "costs nothing". Kept
+// local rather than calling `isCarAllowedToSelectService` since `ts/utils.ts` pulls in `expo-location`.
+function isAvailableForSize(prices, size) {
+    return (prices !== null && prices !== void 0 ? prices : []).some((p) => (p === null || p === void 0 ? void 0 : p.size) === size);
+}
+// X_SMALL is a motorbike, priced well below any car — quoting it as the starting price would
+// undercut what a customer with a car actually gets charged.
+const SIZES_EXCLUDED_FROM_STARTING_PRICE = [types_1.CarSize.X_SMALL];
+// The "starts from" figure — reads only what the customer can see (hidden services excluded) and
+// excludes multi-visit packages, whose price is a total for several visits, not one wash.
+function startingPrice(provider) {
+    const prices = normalServices(provider)
+        .reduce((all, s) => { var _a; return all.concat((_a = s === null || s === void 0 ? void 0 : s.prices) !== null && _a !== void 0 ? _a : []); }, [])
+        .filter((p) => !SIZES_EXCLUDED_FROM_STARTING_PRICE.includes(p === null || p === void 0 ? void 0 : p.size) && Number.isFinite(p === null || p === void 0 ? void 0 : p.price))
+        .map((p) => p.price);
+    return prices.length ? Math.min(...prices) : null;
+}
+/** The discounts that apply to one service. */
+function discountsForService(discounts, serviceId) {
+    if (!serviceId)
+        return [];
+    return (discounts !== null && discounts !== void 0 ? discounts : []).filter((d) => { var _a; return (_a = d === null || d === void 0 ? void 0 : d.servicesIds) === null || _a === void 0 ? void 0 : _a.includes(serviceId); });
+}
+/** The discounts that apply to one add-on. */
+function discountsForAddon(discounts, addonId) {
+    if (!addonId)
+        return [];
+    return (discounts !== null && discounts !== void 0 ? discounts : []).filter((d) => { var _a; return (_a = d === null || d === void 0 ? void 0 : d.addonsIds) === null || _a === void 0 ? void 0 : _a.includes(addonId); });
+}
+// A package is sold alone — exactly one selected line covering several visits. Two selected
+// lines never count, which stops a package plus an add-on from reading as a package basket.
+function hasPackageSelected(selectedServices) {
+    if (selectedServices.length !== 1)
+        return false;
+    return isMultipleVisitService(selectedServices[0]);
+}
+// The provider screen's rules, lifted here so the gift flow reaches the same verdict instead of
+// approximating it: size must be priced, no package + anything else, add-ons need a service.
+function offeringBlockedReason(args) {
+    if (!args.availableForSize)
+        return 'unavailable_for_size';
+    if (args.packageSelected)
+        return 'package_selected';
+    if (args.kind === 'addon' && !args.hasServiceSelected)
+        return 'needs_service';
+    return null;
+}
+// Matches `Services.tsx`'s add/remove rule (package replaces selection; nothing else while one is
+// selected) — never lifting this here is how the gift flow shipped holding both at once (see root CLAUDE.md).
+function nextSelectionAfterToggle(current, toggled, opts) {
+    const alreadySelected = current.some((s) => s.kind === toggled.kind && s.id === toggled.id);
+    if (alreadySelected) {
+        return current.filter((s) => !(s.kind === toggled.kind && s.id === toggled.id));
+    }
+    // A package can't coexist with anything else — selecting one replaces the whole basket,
+    // and selecting a normal service/addon while a package is selected does the same in reverse.
+    if (opts.isPackage || opts.packageSelected)
+        return [toggled];
+    return [...current, toggled];
+}
+/** A provider price shown to the customer, less the first of `discounts`; never below zero. */
+const getServicePrice = (prices, size, discounts) => {
+    const price = (prices || []).find((p) => p.size === size);
+    let total = (price === null || price === void 0 ? void 0 : price.price) || 0;
+    let discountsTotal = 0;
+    if (discounts === null || discounts === void 0 ? void 0 : discounts.length) {
+        const discount = discounts[0];
+        discountsTotal += (discount === null || discount === void 0 ? void 0 : discount.isPercentage) ? ((0, utils_1.preventNaN)(discount === null || discount === void 0 ? void 0 : discount.amount) / 100) * ((price === null || price === void 0 ? void 0 : price.price) || 0) : (0, utils_1.preventNaN)(discount === null || discount === void 0 ? void 0 : discount.amount);
+    }
+    total = total - discountsTotal > 0 ? total - discountsTotal : 0;
+    return (0, calcs_1.customerPriceFromProviderPrice)(total);
+};
+exports.getServicePrice = getServicePrice;
+/** The customer's price for a catalogue price at a car size, before any discount. */
+const setServicePrice = (prices, size) => {
+    const price = (prices || []).find((p) => p.size === size);
+    return (0, calcs_1.customerPriceFromProviderPrice)((price === null || price === void 0 ? void 0 : price.price) || 0);
+};
+exports.setServicePrice = setServicePrice;
+/** An order line for a service, as the customer app builds it and as the server rebuilds it. */
+const setProvidedService = (service, car, discounts) => {
+    const oneDiscount = (discounts === null || discounts === void 0 ? void 0 : discounts.length) ? discounts[0] : undefined;
+    return {
+        serviceId: service.serviceId,
+        name: service.name,
+        imageUrl: service.imageUrl,
+        providerId: service.providerId,
+        description: service.description,
+        price: {
+            size: car.size,
+            price: (0, exports.setServicePrice)(service.prices, car.size),
+        },
+        quantity: 1,
+        type: 'service',
+        time: service.time || 0,
+        includedServices: service.includedServices,
+        numberOfVisits: service.numberOfVisits || 1,
+        isDone: false,
+        discount: oneDiscount,
+    };
+};
+exports.setProvidedService = setProvidedService;
+/** An order line for an add-on, as the customer app builds it and as the server rebuilds it. */
+const setProvidedAddon = (addon, car, discounts) => {
+    const oneDiscount = (discounts === null || discounts === void 0 ? void 0 : discounts.length) ? discounts[0] : undefined;
+    return {
+        addonId: addon.addonId,
+        name: addon.name,
+        providerId: addon.providerId,
+        description: addon.description,
+        price: {
+            size: car.size,
+            price: (0, exports.setServicePrice)(addon.prices, car.size),
+        },
+        quantity: 1,
+        type: 'addon',
+        time: addon.time || 0,
+        isDone: false,
+        discount: oneDiscount,
+    };
+};
+exports.setProvidedAddon = setProvidedAddon;
+const withoutUndefined = (line) => {
+    const kept = {};
+    Object.keys(line).forEach((key) => {
+        const value = line[key];
+        if (value !== undefined)
+            kept[key] = value;
+    });
+    return kept;
+};
+exports.withoutUndefined = withoutUndefined;
+/** A basket rebuilt from the provider's catalogue: every line's price at its car's size, duration, visit count and
+ * discount come from `provider` and `discounts` (the offers this customer may use now), whatever the basket carried.
+ * A line the provider does not sell, or not at that size, is refused rather than dropped. */
+function repriceBasket(services, provider, discounts) {
+    var _a, _b, _c, _d, _e;
+    if (!Array.isArray(services) || !services.some((section) => Array.isArray(section === null || section === void 0 ? void 0 : section.services) && section.services.length > 0))
+        return { ok: false, reason: 'empty_basket' };
+    const sections = [];
+    for (const section of services) {
+        const size = (_a = section === null || section === void 0 ? void 0 : section.car) === null || _a === void 0 ? void 0 : _a.size;
+        if (!Array.isArray(section === null || section === void 0 ? void 0 : section.services) || size === undefined || size === null)
+            return { ok: false, reason: 'line_invalid', detail: 'car or size' };
+        const lines = [];
+        for (const line of section.services) {
+            const { serviceId, addonId } = line;
+            const offering = serviceId ? (_b = provider.services) === null || _b === void 0 ? void 0 : _b.find((s) => s.serviceId === serviceId) : addonId ? (_c = provider.addons) === null || _c === void 0 ? void 0 : _c.find((a) => a.addonId === addonId) : undefined;
+            if (!serviceId && !addonId)
+                return { ok: false, reason: 'line_invalid', detail: 'line has no serviceId or addonId' };
+            if (!offering || offering.hide)
+                return { ok: false, reason: 'line_unavailable', detail: serviceId !== null && serviceId !== void 0 ? serviceId : addonId };
+            if (!isAvailableForSize(offering.prices, size))
+                return { ok: false, reason: 'line_not_priced', detail: `${serviceId !== null && serviceId !== void 0 ? serviceId : addonId} size ${size}` };
+            const built = serviceId
+                ? (0, exports.setProvidedService)(offering, section.car, discountsForService(discounts, serviceId))
+                : (0, exports.setProvidedAddon)(offering, section.car, discountsForAddon(discounts, addonId));
+            const builtPrice = (_e = (_d = built.price) === null || _d === void 0 ? void 0 : _d.price) !== null && _e !== void 0 ? _e : 0;
+            if (!(builtPrice > 0) || !Number.isFinite(builtPrice))
+                return { ok: false, reason: 'line_not_priced', detail: `${serviceId !== null && serviceId !== void 0 ? serviceId : addonId} size ${size}` };
+            lines.push((0, exports.withoutUndefined)(built));
+        }
+        if (lines.length > 1 && lines.some((line) => { var _a; return line.type === 'service' && ((_a = line.numberOfVisits) !== null && _a !== void 0 ? _a : 1) > 1; }))
+            return { ok: false, reason: 'package_not_alone' };
+        sections.push(Object.assign(Object.assign({}, section), { services: lines }));
+    }
+    return { ok: true, services: sections };
+}

package/dist/ts/payLink.d.ts

@@ -14,8 +14,10 @@ export type PayLinkOrderFields<TTimestamp> = {
 export type CreatePayLinkOrderRequest = {
     clientUid: string;
     carId: string;
-    /** Index into the client's saved `locations`. */
-    locationIndex: number;
+    /** Index into the client's saved `locations` — send this or `coordinates`, not both. */
+    locationIndex?: number;
+    /** A spot typed in by staff, for a customer with no saved location that fits. */
+    coordinates?: LatLng;
     providerId: string;
     serviceIds: string[];
     addonIds?: string[];
@@ -42,6 +44,14 @@ export declare const payLinkMessage: (lang: string | undefined, url: string) =>
 export declare const payLinkCancelledMessage: (lang: string | undefined) => string;
 /** wa.me wants the international number as digits only; local 05… numbers are Saudi. */
 export declare function whatsAppShareUrl(phone: string | undefined, text: string): string;
+export type LatLng = {
+    lat: number;
+    lng: number;
+};
+export declare const isValidLatLng: (p?: Partial<LatLng> | null) => p is LatLng;
+/** "24.7136, 46.6753" (comma, space or both; a pasted Google Maps pair) → coordinates, or undefined when it does not
+ *  read as one valid point. 0,0 is refused: it is what an empty or failed lookup produces, never a real wash. */
+export declare function parseLatLng(text: string | undefined): LatLng | undefined;
 export declare const payLinkDeadlineMs: (createdMs: number) => number;
 /** Checkout amounts are integer minor units; rounding here keeps the link and the webhook check in agreement. */
 export declare const toMinorUnits: (sar: number) => number;

package/dist/ts/payLink.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNeverPaidPayLinkOrder = exports.isPayLinkAmountExact = exports.toMinorUnits = exports.payLinkDeadlineMs = exports.payLinkCancelledMessage = exports.payLinkMessage = exports.PAY_LINK_CANCEL_REASON = exports.PAY_LINK_WINDOW_MINUTES = void 0;
+exports.isNeverPaidPayLinkOrder = exports.isPayLinkAmountExact = exports.toMinorUnits = exports.payLinkDeadlineMs = exports.isValidLatLng = exports.payLinkCancelledMessage = exports.payLinkMessage = exports.PAY_LINK_CANCEL_REASON = exports.PAY_LINK_WINDOW_MINUTES = void 0;
 exports.whatsAppShareUrl = whatsAppShareUrl;
+exports.parseLatLng = parseLatLng;
 exports.buildPayLinkOrderLines = buildPayLinkOrderLines;
 const types_1 = require("../constants/types");
-const calcs_1 = require("./calcs");
+const offerings_1 = require("./offerings");
 /** Back-office orders paid by a link — the shared contract between sahab-website and cloudFun. */
 exports.PAY_LINK_WINDOW_MINUTES = 15;
 exports.PAY_LINK_CANCEL_REASON = 'payment not completed';
@@ -21,6 +22,24 @@ function whatsAppShareUrl(phone, text) {
     const international = digits.startsWith('0') ? `966${digits.slice(1)}` : digits;
     return `https://wa.me/${international}?text=${encodeURIComponent(text)}`;
 }
+const isValidLatLng = (p) => !!p &&
+    typeof p.lat === 'number' &&
+    typeof p.lng === 'number' &&
+    Number.isFinite(p.lat) &&
+    Number.isFinite(p.lng) &&
+    Math.abs(p.lat) <= 90 &&
+    Math.abs(p.lng) <= 180 &&
+    !(p.lat === 0 && p.lng === 0);
+exports.isValidLatLng = isValidLatLng;
+/** "24.7136, 46.6753" (comma, space or both; a pasted Google Maps pair) → coordinates, or undefined when it does not
+ *  read as one valid point. 0,0 is refused: it is what an empty or failed lookup produces, never a real wash. */
+function parseLatLng(text) {
+    const parts = (text !== null && text !== void 0 ? text : '').trim().replace(/[()]/g, '').split(/[\s,]+/).filter(Boolean);
+    if (parts.length !== 2 || !parts.every((x) => /^[-+]?\d+(\.\d+)?$/.test(x)))
+        return undefined;
+    const point = { lat: Number(parts[0]), lng: Number(parts[1]) };
+    return (0, exports.isValidLatLng)(point) ? point : undefined;
+}
 const payLinkDeadlineMs = (createdMs) => createdMs + exports.PAY_LINK_WINDOW_MINUTES * 60000;
 exports.payLinkDeadlineMs = payLinkDeadlineMs;
 /** Checkout amounts are integer minor units; rounding here keeps the link and the webhook check in agreement. */
@@ -32,7 +51,7 @@ exports.isPayLinkAmountExact = isPayLinkAmountExact;
 /** Order lines priced exactly as the customer app's setProvidedService/setProvidedAddon build them: the
  *  provider's price for this car size plus the client percentage. Hidden items and packages are refused. */
 function buildPayLinkOrderLines(provider, carSize, serviceIds, addonIds = []) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e;
     if (!serviceIds.length)
         return { ok: false, reason: 'NO_SERVICE' };
     const lines = [];
@@ -42,42 +61,19 @@ function buildPayLinkOrderLines(provider, carSize, serviceIds, addonIds = []) {
             return { ok: false, reason: 'UNKNOWN_ITEM' };
         if (((_b = service.numberOfVisits) !== null && _b !== void 0 ? _b : 1) > 1)
             return { ok: false, reason: 'PACKAGE_NOT_SUPPORTED' };
-        const price = (_d = (_c = service.prices) === null || _c === void 0 ? void 0 : _c.find((p) => p.size === carSize)) === null || _d === void 0 ? void 0 : _d.price;
-        if (!price)
+        const line = (0, offerings_1.setProvidedService)(service, { size: carSize });
+        if (!((_c = line.price) === null || _c === void 0 ? void 0 : _c.price))
             return { ok: false, reason: 'NO_PRICE_FOR_SIZE' };
-        lines.push({
-            serviceId: service.serviceId,
-            name: service.name,
-            imageUrl: service.imageUrl,
-            providerId: service.providerId,
-            description: service.description,
-            price: { size: carSize, price: (0, calcs_1.customerPriceFromProviderPrice)(price) },
-            quantity: 1,
-            type: 'service',
-            time: service.time || 0,
-            includedServices: service.includedServices,
-            numberOfVisits: 1,
-            isDone: false,
-        });
+        lines.push((0, offerings_1.withoutUndefined)(line));
     }
     for (const id of addonIds) {
-        const addon = (_e = provider.addons) === null || _e === void 0 ? void 0 : _e.find((a) => a.addonId === id && !a.hide);
+        const addon = (_d = provider.addons) === null || _d === void 0 ? void 0 : _d.find((a) => a.addonId === id && !a.hide);
         if (!addon)
             return { ok: false, reason: 'UNKNOWN_ITEM' };
-        const price = (_g = (_f = addon.prices) === null || _f === void 0 ? void 0 : _f.find((p) => p.size === carSize)) === null || _g === void 0 ? void 0 : _g.price;
-        if (!price)
+        const line = (0, offerings_1.setProvidedAddon)(addon, { size: carSize });
+        if (!((_e = line.price) === null || _e === void 0 ? void 0 : _e.price))
             return { ok: false, reason: 'NO_PRICE_FOR_SIZE' };
-        lines.push({
-            addonId: addon.addonId,
-            name: addon.name,
-            providerId: addon.providerId,
-            description: addon.description,
-            price: { size: carSize, price: (0, calcs_1.customerPriceFromProviderPrice)(price) },
-            quantity: 1,
-            type: 'addon',
-            time: addon.time || 0,
-            isDone: false,
-        });
+        lines.push((0, offerings_1.withoutUndefined)(line));
     }
     return { ok: true, lines };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sahab-utils",
-	"version": "1.8.9",
+	"version": "1.9.1",
 	"description": "This package contains types and utils functions",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
 		"build": "tsc",
 		"prepublishOnly": "npm run build",
 		"deploy": "npm run build && npm publish",
-		"test": "npm run build && node tests/loyalty.test.js && node tests/gifts.test.js && node tests/cashback.test.js && node tests/utils.test.js && node tests/wheel.test.js && node tests/calcs.test.js && node tests/orderActivity.test.js && node tests/push.test.js && node tests/broadcast.test.js && node tests/iban.test.js && node tests/cash.test.js && node tests/workingHours.test.js && node tests/payLink.test.js"
+		"test": "npm run build && node tests/loyalty.test.js && node tests/gifts.test.js && node tests/cashback.test.js && node tests/utils.test.js && node tests/wheel.test.js && node tests/calcs.test.js && node tests/orderActivity.test.js && node tests/push.test.js && node tests/broadcast.test.js && node tests/iban.test.js && node tests/cash.test.js && node tests/workingHours.test.js && node tests/payLink.test.js && node tests/offerings.test.js"
 	},
 	"repository": {
 		"type": "git",