@lodashventure/medusa-parcel-shipping 0.0.6 → 0.2.0

package/.medusa/server/providers/private-carrier/service.js

@@ -0,0 +1,392 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrivateCarrierFulfillmentProvider = void 0;
+const utils_1 = require("@medusajs/framework/utils");
+const utils_2 = require("@medusajs/framework/utils");
+const parcel_box_1 = require("./models/parcel-box");
+const private_carrier_rate_1 = require("./models/private-carrier-rate");
+const osrm_client_1 = require("../../common/utils/osrm-client");
+const packing_1 = require("../../common/utils/packing");
+const CACHE_TTL_MS = 60_000;
+// Inner data service class
+class PrivateCarrierDataService extends (0, utils_2.MedusaService)({
+    ParcelBox: parcel_box_1.ParcelBox,
+    PrivateCarrierRate: private_carrier_rate_1.PrivateCarrierRate,
+}) {
+    constructor() {
+        super(...arguments);
+        this.cache = {
+            boxes: { data: null, expiresAt: 0 },
+            rates: { data: null, expiresAt: 0 },
+        };
+    }
+    invalidateCache(keys) {
+        if (!keys || keys.length === 0) {
+            Object.keys(this.cache).forEach((key) => {
+                this.cache[key] = { data: null, expiresAt: 0 };
+            });
+            return;
+        }
+        for (const key of keys) {
+            this.cache[key] = { data: null, expiresAt: 0 };
+        }
+    }
+    async findParcelBoxes(filters = {}, config = {}) {
+        const cacheKey = "boxes";
+        const now = Date.now();
+        if (this.cache[cacheKey].data &&
+            this.cache[cacheKey].expiresAt > now &&
+            Object.keys(filters).length === 0) {
+            return this.cache[cacheKey].data;
+        }
+        const boxes = await this.listParcelBoxes(filters, config);
+        if (Object.keys(filters).length === 0) {
+            this.cache[cacheKey] = { data: boxes, expiresAt: now + CACHE_TTL_MS };
+        }
+        return boxes;
+    }
+    async findPrivateCarrierRates(filters = {}, config = {}) {
+        const cacheKey = "rates";
+        const now = Date.now();
+        if (this.cache[cacheKey].data &&
+            this.cache[cacheKey].expiresAt > now &&
+            Object.keys(filters).length === 0) {
+            return this.cache[cacheKey].data;
+        }
+        const rates = await this.listPrivateCarrierRates(filters, config);
+        if (Object.keys(filters).length === 0) {
+            this.cache[cacheKey] = { data: rates, expiresAt: now + CACHE_TTL_MS };
+        }
+        return rates;
+    }
+    async saveParcelBoxes(data) {
+        const result = await this.createParcelBoxes(data);
+        this.invalidateCache(["boxes"]);
+        return result;
+    }
+    async modifyParcelBox(id, data) {
+        const result = await this.updateParcelBoxes({ id, ...data });
+        this.invalidateCache(["boxes"]);
+        return result;
+    }
+    async removeParcelBox(id) {
+        const result = await this.deleteParcelBoxes([id]);
+        this.invalidateCache(["boxes"]);
+        return result;
+    }
+    async savePrivateCarrierRates(data) {
+        const result = await this.createPrivateCarrierRates(data);
+        this.invalidateCache(["rates"]);
+        return result;
+    }
+    async modifyPrivateCarrierRate(id, data) {
+        const result = await this.updatePrivateCarrierRates({ id, ...data });
+        this.invalidateCache(["rates"]);
+        return result;
+    }
+    async removePrivateCarrierRate(id) {
+        const result = await this.deletePrivateCarrierRates([id]);
+        this.invalidateCache(["rates"]);
+        return result;
+    }
+}
+class PrivateCarrierFulfillmentProvider extends utils_1.AbstractFulfillmentProviderService {
+    constructor(container, options = {}) {
+        super();
+        this.dataService = new PrivateCarrierDataService(container);
+        this.weightUnit = options.weight_unit ?? "g";
+        this.osrmClient = new osrm_client_1.OSRMClient();
+    }
+    getDataService() {
+        return this.dataService;
+    }
+    async getFulfillmentOptions() {
+        return [
+            {
+                id: "private-carrier",
+                name: "Company Truck Delivery",
+            },
+        ];
+    }
+    async validateFulfillmentData(optionData, data, context) {
+        const address = this.normalizeAddress(context?.shipping_address);
+        const quoteItems = this.convertToQuoteItems(context);
+        if (!quoteItems.length) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "cart_items_missing_dimensions");
+        }
+        const result = await this.quote({
+            items: quoteItems,
+            shipping_address: address,
+        });
+        if (!result.success) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, result.failure.message || "Unable to calculate box size for items");
+        }
+        return {
+            ...data,
+            shipping_quote: result.shipping_quote,
+            total_weight_kg: result.packing.totalWeightKg,
+            destination: address,
+            box: result.best_box,
+            packing: result.packing,
+        };
+    }
+    async validateOption(data) {
+        return true;
+    }
+    async canCalculate() {
+        return true;
+    }
+    async calculatePrice(optionData, data, context) {
+        const address = this.normalizeAddress(context?.shipping_address);
+        const totalWeightKg = this.calculateTotalWeightKg(context);
+        if (!totalWeightKg) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "cart_items_missing_weight");
+        }
+        const quote = await this.quoteShippingOnly(address, totalWeightKg);
+        return {
+            calculated_amount: quote.price,
+            is_calculated_price_tax_inclusive: false,
+        };
+    }
+    async createFulfillment(data) {
+        const fulfillmentId = `CT-${Date.now()}`;
+        return {
+            data: {
+                carrier: "PRIVATE_CARRIER",
+                box: data.box,
+                packing: data.packing,
+                shipping_quote: data.shipping_quote,
+                total_weight_kg: data.total_weight_kg,
+                destination: data.destination,
+                tracking_number: null,
+                tracking_url: null,
+                label_url: null,
+                fulfillment_id: fulfillmentId,
+                created_at: new Date().toISOString(),
+                metadata: {
+                    carrier_name: "Company Truck Delivery",
+                    estimated_delivery_days: 1,
+                },
+            },
+            labels: [],
+        };
+    }
+    async cancelFulfillment() {
+        return {
+            status: "cancelled",
+        };
+    }
+    async createReturnFulfillment() {
+        return {
+            data: {
+                carrier: "PRIVATE_CARRIER",
+                return: true,
+            },
+            labels: [],
+        };
+    }
+    convertToQuoteItems(context) {
+        const items = context?.items ?? [];
+        const quoteItems = [];
+        for (const item of items) {
+            const lineItem = item;
+            const quantity = Number(item.quantity ?? 0);
+            if (!quantity) {
+                continue;
+            }
+            const rawWeight = Number(lineItem?.variant?.weight ??
+                lineItem?.weight ??
+                lineItem?.raw_weight ??
+                0) || 0;
+            const weight = this.normalizeWeight(rawWeight);
+            const width = Number(lineItem?.variant?.width ??
+                lineItem?.width ??
+                lineItem?.raw_width ??
+                0) || 0;
+            const length = Number(lineItem?.variant?.length ??
+                lineItem?.length ??
+                lineItem?.raw_length ??
+                0) || 0;
+            const height = Number(lineItem?.variant?.height ??
+                lineItem?.height ??
+                lineItem?.raw_height ??
+                0) || 0;
+            if (!width || !length || !height || !weight) {
+                continue;
+            }
+            const noStack = Boolean(lineItem?.variant?.metadata?.noStack ?? lineItem?.metadata?.noStack);
+            const stackable = lineItem?.variant?.metadata?.stackable ?? lineItem?.metadata?.stackable;
+            const attributes = {};
+            if (noStack) {
+                attributes.noStack = true;
+            }
+            if (stackable !== undefined && stackable !== null) {
+                attributes.stackable = Number(stackable);
+            }
+            quoteItems.push({
+                sku: lineItem?.variant?.sku || lineItem?.sku || "unknown",
+                width,
+                length,
+                height,
+                weight,
+                quantity,
+                attributes: Object.keys(attributes).length > 0 ? attributes : undefined,
+            });
+        }
+        return quoteItems;
+    }
+    calculateTotalWeightKg(context) {
+        const items = context?.items ?? [];
+        const total = items.reduce((acc, item) => {
+            const lineItem = item;
+            const quantity = Number(item.quantity ?? 0);
+            if (!quantity) {
+                return acc;
+            }
+            const rawWeight = Number(lineItem?.variant?.weight ??
+                lineItem?.weight ??
+                lineItem?.raw_weight ??
+                0) || 0;
+            const normalized = this.normalizeWeight(rawWeight);
+            if (!normalized) {
+                return acc;
+            }
+            return acc + normalized * quantity;
+        }, 0);
+        return Number(total.toFixed(4));
+    }
+    normalizeWeight(weight) {
+        if (!weight || !Number.isFinite(weight)) {
+            return 0;
+        }
+        if (this.weightUnit === "kg") {
+            return Math.max(weight, 0);
+        }
+        if (this.weightUnit === "g" || weight > 50) {
+            return Math.max(weight / 1000, 0);
+        }
+        return Math.max(weight, 0);
+    }
+    normalizeAddress(address) {
+        if (!address) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "shipping_address_required");
+        }
+        const province = String(address.province ??
+            address.province_code ??
+            address.state ??
+            address.city ??
+            "").trim() || "";
+        const postcode = String(address.postal_code ??
+            address.postcode ??
+            address.zipcode ??
+            address.zip ??
+            "").trim() || "";
+        const country = String(address.country_code ?? address.country ?? "").toUpperCase();
+        if (!province && !postcode) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "shipping_address_missing_destination");
+        }
+        if (!country) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "shipping_address_missing_country");
+        }
+        return {
+            province,
+            postcode,
+            country,
+        };
+    }
+    async quote(input) {
+        const country = (input.shipping_address?.country || "").toUpperCase();
+        if (country !== "TH") {
+            return {
+                success: false,
+                code: "country_not_supported",
+                message: `Country ${country} is not supported. Only Thailand (TH) is supported.`,
+            };
+        }
+        const boxes = await this.dataService.findParcelBoxes({ active: true });
+        if (!boxes || boxes.length === 0) {
+            return {
+                success: false,
+                code: "no_boxes_configured",
+                message: "No active parcel boxes are configured.",
+            };
+        }
+        const boxCandidates = boxes.map((box) => ({
+            id: box.id,
+            name: box.name,
+            width_cm: box.width_cm,
+            length_cm: box.length_cm,
+            height_cm: box.height_cm,
+            max_weight_kg: box.max_weight_kg,
+            price_thb: box.price_thb,
+        }));
+        const packingResult = (0, packing_1.selectBestPacking)(input.items, boxCandidates);
+        if (!packingResult.success) {
+            return {
+                success: false,
+                code: packingResult.code,
+                message: packingResult.message,
+                alternatives: packingResult.alternatives?.map((alt) => ({
+                    box: alt.box,
+                    packing: alt.metrics,
+                })),
+            };
+        }
+        const totalWeightKg = packingResult.result.metrics.totalWeightKg;
+        const shippingQuote = await this.quoteShippingOnly(input.shipping_address, totalWeightKg);
+        return {
+            success: true,
+            best_box: packingResult.result.box,
+            packing: packingResult.result.metrics,
+            shipping_quote: shippingQuote,
+        };
+    }
+    async quoteShippingOnly(address, weight) {
+        const method = "PRIVATE_CARRIER";
+        const area = "OUT_OF_AREA";
+        const rate = await this.findRateForWeight(weight);
+        if (!rate) {
+            return {
+                method,
+                area,
+                weightKg: weight,
+                price: 0,
+                currency: "THB",
+                error: "No shipping rate configured for this weight",
+            };
+        }
+        return {
+            method,
+            area,
+            weightKg: weight,
+            price: rate.price_thb,
+            currency: rate.currency || "THB",
+        };
+    }
+    async quoteShippingWithDistance(origin, destination, address, weight) {
+        const distanceKm = await this.osrmClient.calculateRouteDistance(origin, destination);
+        const baseQuote = await this.quoteShippingOnly(address, weight);
+        const distanceCharge = distanceKm * 15;
+        return {
+            ...baseQuote,
+            price: baseQuote.price + distanceCharge,
+            distance_km: distanceKm,
+        };
+    }
+    async findRateForWeight(weightKg) {
+        const rates = await this.dataService.findPrivateCarrierRates({
+            active: true,
+        });
+        const sortedRates = rates.sort((a, b) => a.max_weight_kg - b.max_weight_kg);
+        for (const rate of sortedRates) {
+            if (weightKg <= rate.max_weight_kg) {
+                return rate;
+            }
+        }
+        return null;
+    }
+}
+exports.PrivateCarrierFulfillmentProvider = PrivateCarrierFulfillmentProvider;
+PrivateCarrierFulfillmentProvider.identifier = "private-carrier";
+exports.default = PrivateCarrierFulfillmentProvider;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/providers/private-carrier/service.ts"],"names":[],"mappings":"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"}

package/.medusa/server/providers/private-carrier/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3ByaXZhdGUtY2Fycmllci90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/.medusa/server/src/admin/index.js

@@ -10,7 +10,8 @@ const requestJson = async (url, method = "GET", body) => {
     headers: {
       "Content-Type": "application/json"
     },
-    body: body ? JSON.stringify(body) : void 0
+    body: body ? JSON.stringify(body) : void 0,
+    credentials: "include"
   });
   if (!response.ok) {
     let message = response.statusText;
@@ -456,7 +457,7 @@ const RatesSection = () => {
     var _a, _b, _c;
     setCurrenciesLoading(true);
     try {
-      const data = await requestJson("/admin/store");
+      const data = await requestJson("/admin/currencies");
       const supported = ((_b = (_a = data.store) == null ? void 0 : _a.supported_currencies) == null ? void 0 : _b.map(
         (item) => item.code.toUpperCase()
       )) ?? [];

package/.medusa/server/src/admin/index.mjs

@@ -9,7 +9,8 @@ const requestJson = async (url, method = "GET", body) => {
     headers: {
       "Content-Type": "application/json"
     },
-    body: body ? JSON.stringify(body) : void 0
+    body: body ? JSON.stringify(body) : void 0,
+    credentials: "include"
   });
   if (!response.ok) {
     let message = response.statusText;
@@ -455,7 +456,7 @@ const RatesSection = () => {
     var _a, _b, _c;
     setCurrenciesLoading(true);
     try {
-      const data = await requestJson("/admin/store");
+      const data = await requestJson("/admin/currencies");
       const supported = ((_b = (_a = data.store) == null ? void 0 : _a.supported_currencies) == null ? void 0 : _b.map(
         (item) => item.code.toUpperCase()
       )) ?? [];

package/.medusa/server/workflows/assign-packing-slip.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
+const core_flows_1 = require("@medusajs/medusa/core-flows");
+const utils_1 = require("@medusajs/framework/utils");
+const documents_1 = require("../modules/documents");
+const assignPackingSlipToOrderWorkflow = (0, workflows_sdk_1.createWorkflow)("assign-packing-slip-to-order", function (input) {
+    (0, workflows_sdk_1.when)(input, (input) => {
+        return input.oldPackingSlipId !== undefined;
+    }).then(() => {
+        (0, core_flows_1.dismissRemoteLinkStep)([{
+                [utils_1.Modules.ORDER]: {
+                    order_id: input.orderId
+                },
+                [documents_1.DOCUMENTS_MODULE]: {
+                    document_packing_slip_id: input.oldPackingSlipId
+                }
+            }]);
+    });
+    (0, core_flows_1.createRemoteLinkStep)([{
+            [utils_1.Modules.ORDER]: {
+                order_id: input.orderId
+            },
+            [documents_1.DOCUMENTS_MODULE]: {
+                document_packing_slip_id: input.newPackingSlipId
+            }
+        }]);
+    return new workflows_sdk_1.WorkflowResponse({});
+});
+exports.default = assignPackingSlipToOrderWorkflow;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzaWduLXBhY2tpbmctc2xpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy93b3JrZmxvd3MvYXNzaWduLXBhY2tpbmctc2xpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHFFQUkwQztBQUMxQyw0REFBMEY7QUFDMUYscURBQW9EO0FBQ3BELG9EQUF3RDtBQVF4RCxNQUFNLGdDQUFnQyxHQUFHLElBQUEsOEJBQWMsRUFDckQsOEJBQThCLEVBQzlCLFVBQVUsS0FBb0M7SUFFNUMsSUFBQSxvQkFBSSxFQUNGLEtBQUssRUFDTCxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQ1IsT0FBTyxLQUFLLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDO0lBQzlDLENBQUMsQ0FDRixDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDVixJQUFBLGtDQUFxQixFQUFDLENBQUM7Z0JBQ3JCLENBQUMsZUFBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO29CQUNmLFFBQVEsRUFBRSxLQUFLLENBQUMsT0FBTztpQkFDeEI7Z0JBQ0QsQ0FBQyw0QkFBZ0IsQ0FBQyxFQUFFO29CQUNsQix3QkFBd0IsRUFBRSxLQUFLLENBQUMsZ0JBQWdCO2lCQUNqRDthQUNGLENBQUMsQ0FBQyxDQUFBO0lBQ0wsQ0FBQyxDQUFDLENBQUE7SUFFRixJQUFBLGlDQUFvQixFQUFDLENBQUM7WUFDcEIsQ0FBQyxlQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ2YsUUFBUSxFQUFFLEtBQUssQ0FBQyxPQUFPO2FBQ3hCO1lBQ0QsQ0FBQyw0QkFBZ0IsQ0FBQyxFQUFFO2dCQUNsQix3QkFBd0IsRUFBRSxLQUFLLENBQUMsZ0JBQWdCO2FBQ2pEO1NBQ0YsQ0FBQyxDQUFDLENBQUE7SUFFSCxPQUFPLElBQUksZ0NBQWdCLENBQUMsRUFBRSxDQUFDLENBQUE7QUFDakMsQ0FBQyxDQUNGLENBQUE7QUFFRCxrQkFBZSxnQ0FBZ0MsQ0FBQSJ9

package/.medusa/server/workflows/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assignPackingSlipToOrderWorkflow = void 0;
+var assign_packing_slip_1 = require("./assign-packing-slip");
+Object.defineProperty(exports, "assignPackingSlipToOrderWorkflow", { enumerable: true, get: function () { return __importDefault(assign_packing_slip_1).default; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDZEQUFtRjtBQUExRSx3SkFBQSxPQUFPLE9BQW9DIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodashventure/medusa-parcel-shipping",
-  "version": "0.0.6",
+  "version": "0.2.0",
   "description": "Parcel box selection and Thailand shipping quotes for Medusa.",
   "author": "LodashVenture",
   "license": "MIT",
@@ -9,12 +9,13 @@
   ],
   "exports": {
     "./package.json": "./package.json",
-    "./workflows": "./.medusa/server/src/workflows/index.js",
-    "./.medusa/server/src/modules/*": "./.medusa/server/src/modules/*/index.js",
-    "./modules/*": "./.medusa/server/src/modules/*/index.js",
-    "./providers/*": "./.medusa/server/src/providers/*/index.js",
+    "./workflows": "./.medusa/server/workflows/index.js",
+    "./workflows/*": "./.medusa/server/workflows/*.js",
+    "./providers/*": "./.medusa/server/providers/*/index.js",
+    "./modules/*": "./.medusa/server/modules/*/index.js",
+    "./links/*": "./.medusa/server/links/*.js",
     "./admin": "./.medusa/server/src/admin/index.mjs",
-    "./*": "./.medusa/server/src/*.js"
+    "./*": "./.medusa/server/*.js"
   },
   "keywords": [
     "medusa",
@@ -28,24 +29,18 @@
     "prepublishOnly": "medusa plugin:build"
   },
   "devDependencies": {
-    "@medusajs/admin-sdk": "2.10.0",
-    "@medusajs/cli": "2.10.0",
-    "@medusajs/framework": "2.10.0",
-    "@medusajs/icons": "^2.10.0",
-    "@medusajs/medusa": "2.10.0",
-    "@medusajs/test-utils": "2.10.0",
+    "@medusajs/admin-sdk": "2.11.0",
+    "@medusajs/cli": "2.11.0",
+    "@medusajs/framework": "2.11.0",
+    "@medusajs/icons": "^2.11.0",
+    "@medusajs/js-sdk": "2.11.0",
+    "@medusajs/medusa": "2.11.0",
+    "@medusajs/test-utils": "2.11.0",
     "@medusajs/ui": "4.0.4",
-    "@mikro-orm/cli": "6.4.3",
-    "@mikro-orm/core": "6.4.3",
-    "@mikro-orm/knex": "6.4.3",
-    "@mikro-orm/migrations": "6.4.3",
-    "@mikro-orm/postgresql": "6.4.3",
     "@swc/core": "1.5.7",
     "@types/node": "^20.0.0",
     "@types/react": "^18.3.2",
     "@types/react-dom": "^18.2.25",
-    "awilix": "^8.0.1",
-    "pg": "^8.13.0",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -55,27 +50,23 @@
     "yalc": "^1.0.0-pre.53"
   },
   "peerDependencies": {
-    "@medusajs/admin-sdk": "2.10.0",
-    "@medusajs/cli": "2.10.0",
-    "@medusajs/framework": "2.10.0",
-    "@medusajs/icons": "^2.10.0",
-    "@medusajs/medusa": "2.10.0",
-    "@medusajs/test-utils": "2.10.0",
+    "@medusajs/admin-sdk": "2.11.0",
+    "@medusajs/cli": "2.11.0",
+    "@medusajs/framework": "2.11.0",
+    "@medusajs/icons": "^2.11.0",
+    "@medusajs/js-sdk": "2.11.0",
+    "@medusajs/medusa": "2.11.0",
+    "@medusajs/test-utils": "2.11.0",
     "@medusajs/ui": "4.0.3",
-    "@tanstack/react-query": "*",
-    "@mikro-orm/cli": "6.4.3",
-    "@mikro-orm/core": "6.4.3",
-    "@mikro-orm/knex": "6.4.3",
-    "@mikro-orm/migrations": "6.4.3",
-    "@mikro-orm/postgresql": "6.4.3",
-    "awilix": "^8.0.1",
-    "pg": "^8.13.0"
+    "@tanstack/react-query": "*"
   },
   "engines": {
     "node": ">=20"
   },
   "dependencies": {
     "thai-address-autocomplete-react": "^1.2.2",
-    "zod": "^4.1.5"
+    "zod": "^4.1.5",
+    "pdfkit": "0.15.0",
+    "@types/pdfkit": "^0.13.5"
   }
 }

package/.medusa/server/src/api/admin/parcel-boxes/[id]/route.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PUT = PUT;
-exports.DELETE = DELETE;
-const parcel_shipping_1 = require("../../../../modules/parcel-shipping");
-const zod_1 = require("zod");
-const updateBoxSchema = zod_1.z.object({
-    name: zod_1.z.string().min(1).optional(),
-    width_cm: zod_1.z.number().positive().optional(),
-    length_cm: zod_1.z.number().positive().optional(),
-    height_cm: zod_1.z.number().positive().optional(),
-    max_weight_kg: zod_1.z.number().positive().optional(),
-    price_thb: zod_1.z.number().nonnegative().optional(),
-    active: zod_1.z.boolean().optional(),
-});
-async function PUT(req, res) {
-    const { id } = req.params;
-    const moduleService = req.scope.resolve(parcel_shipping_1.PARCEL_SHIPPING_MODULE);
-    try {
-        const payload = updateBoxSchema.parse(req.body);
-        const updated = await moduleService.updateParcelBoxes([
-            {
-                id,
-                ...payload,
-            },
-        ]);
-        moduleService.invalidateCache(["boxes"]);
-        res.status(200).json({ box: updated[0] });
-    }
-    catch (error) {
-        if (error instanceof zod_1.ZodError) {
-            return res.status(400).json({
-                code: "invalid_payload",
-                issues: error.issues,
-            });
-        }
-        throw error;
-    }
-}
-async function DELETE(req, res) {
-    const { id } = req.params;
-    const moduleService = req.scope.resolve(parcel_shipping_1.PARCEL_SHIPPING_MODULE);
-    await moduleService.deleteParcelBoxes([id]);
-    moduleService.invalidateCache(["boxes"]);
-    res.status(204).send();
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3BhcmNlbC1ib3hlcy9baWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBZUEsa0JBZ0NDO0FBRUQsd0JBYUM7QUE1REQseUVBQTRFO0FBQzVFLDZCQUFpQztBQUVqQyxNQUFNLGVBQWUsR0FBRyxPQUFDLENBQUMsTUFBTSxDQUFDO0lBQy9CLElBQUksRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUNsQyxRQUFRLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMzQyxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMzQyxhQUFhLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMvQyxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUM5QyxNQUFNLEVBQUUsT0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsRUFBRTtDQUMvQixDQUFDLENBQUE7QUFFSyxLQUFLLFVBQVUsR0FBRyxDQUN2QixHQUFrQixFQUNsQixHQUFtQjtJQUVuQixNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUN6QixNQUFNLGFBQWEsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FDckMsd0NBQXNCLENBQ1EsQ0FBQTtJQUVoQyxJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sR0FBRyxlQUFlLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUUvQyxNQUFNLE9BQU8sR0FBRyxNQUFNLGFBQWEsQ0FBQyxpQkFBaUIsQ0FBQztZQUNwRDtnQkFDRSxFQUFFO2dCQUNGLEdBQUcsT0FBTzthQUNYO1NBQ0YsQ0FBQyxDQUFBO1FBRUYsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7UUFFeEMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUMzQyxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLElBQUksS0FBSyxZQUFZLGNBQVEsRUFBRSxDQUFDO1lBQzlCLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQzFCLElBQUksRUFBRSxpQkFBaUI7Z0JBQ3ZCLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTTthQUNyQixDQUFDLENBQUE7UUFDSixDQUFDO1FBRUQsTUFBTSxLQUFLLENBQUE7SUFDYixDQUFDO0FBQ0gsQ0FBQztBQUVNLEtBQUssVUFBVSxNQUFNLENBQzFCLEdBQWtCLEVBQ2xCLEdBQW1CO0lBRW5CLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFBO0lBQ3pCLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUNyQyx3Q0FBc0IsQ0FDUSxDQUFBO0lBRWhDLE1BQU0sYUFBYSxDQUFDLGlCQUFpQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUMzQyxhQUFhLENBQUMsZUFBZSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtJQUV4QyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFBO0FBQ3hCLENBQUMifQ==