medusa-pos-plugin 0.0.46 → 0.0.48

package/.medusa/server/src/api/admin/pos/pickup-orders/[id]/collect/route.js

@@ -60,6 +60,8 @@ async function POST(req, res) {
             "id",
             "metadata",
             "status",
+            "shipping_address.id",
+            "shipping_address.metadata",
             "items.id",
             "items.quantity",
             "items.detail.quantity",
@@ -83,40 +85,48 @@ async function POST(req, res) {
     if (parsed.data.capture_payment) {
         capture = await (0, pos_web_pickup_1.capturePayAtStorePayment)(req.scope, orderId);
     }
-    if (parsed.data.fulfill) {
-        const orderItems = (Array.isArray(order.items) ? order.items : [])
-            .map(itemFromUnknown)
-            .filter((i) => Boolean(i));
-        const selections = orderItems.map((item) => ({
-            id: item.id,
-            quantity: Math.max(1, Math.floor((0, pos_returns_1.toAmount)(item.quantity))),
-        }));
-        const fulfillItems = (0, pos_returns_1.getItemsToFulfill)(orderItems, selections);
-        if (fulfillItems.length) {
-            try {
-                await (0, fulfill_pos_items_1.fulfillAndDeliverPosOrderItems)({
-                    container: req.scope,
-                    query,
-                    orderId,
-                    items: fulfillItems,
-                    locationId,
-                    actorId: (0, fulfill_pos_items_1.actorIdFromRequest)(req),
-                });
-            }
-            catch (err) {
-                if (err instanceof fulfill_pos_items_1.PosManualFulfillmentMissingError) {
-                    res.status(400).json({ message: err.message, type: "FULFILLMENT_SETUP" });
-                    return;
-                }
-                res.status(500).json({
-                    message: (0, pos_returns_1.getThrownErrorMessage)(err, "Failed to fulfill pickup order"),
-                    type: "UNEXPECTED_ERROR",
-                });
+    // Capture-only: do not mark collected or fulfill.
+    if (!parsed.data.fulfill) {
+        const { data: refreshed = [] } = await query.graph({
+            entity: "order",
+            fields: ["id", "metadata", "payment_status", "fulfillment_status", "status"],
+            filters: { id: orderId },
+        });
+        res.status(200).json({ order: refreshed[0] ?? order, capture });
+        return;
+    }
+    const orderItems = (Array.isArray(order.items) ? order.items : [])
+        .map(itemFromUnknown)
+        .filter((i) => Boolean(i));
+    const selections = orderItems.map((item) => ({
+        id: item.id,
+        quantity: Math.max(1, Math.floor((0, pos_returns_1.toAmount)(item.quantity))),
+    }));
+    const fulfillItems = (0, pos_returns_1.getItemsToFulfill)(orderItems, selections);
+    if (fulfillItems.length) {
+        try {
+            await (0, fulfill_pos_items_1.fulfillAndDeliverPosOrderItems)({
+                container: req.scope,
+                query,
+                orderId,
+                items: fulfillItems,
+                locationId,
+                actorId: (0, fulfill_pos_items_1.actorIdFromRequest)(req),
+            });
+        }
+        catch (err) {
+            if (err instanceof fulfill_pos_items_1.PosManualFulfillmentMissingError) {
+                res.status(400).json({ message: err.message, type: "FULFILLMENT_SETUP" });
                 return;
             }
+            res.status(500).json({
+                message: (0, pos_returns_1.getThrownErrorMessage)(err, "Failed to fulfill pickup order"),
+                type: "UNEXPECTED_ERROR",
+            });
+            return;
         }
     }
     const updated = await (0, pos_web_pickup_1.setPickupStatus)(req.scope, orderId, "collected");
     res.status(200).json({ order: updated, capture });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Bvcy9waWNrdXAtb3JkZXJzL1tpZF0vY29sbGVjdC9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQXFEQSxvQkErRkM7QUFuSkQscURBQXFFO0FBQ3JFLDZCQUF1QjtBQUN2QixtRUFBa0U7QUFDbEUsMkVBSStDO0FBQy9DLHlFQUkwQztBQUMxQyxxRUFLNEM7QUFFNUMsTUFBTSxVQUFVLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUMxQixlQUFlLEVBQUUsT0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDckQsT0FBTyxFQUFFLE9BQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO0lBQzdDLFdBQVcsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0NBQ25DLENBQUMsQ0FBQTtBQVVGLFNBQVMsUUFBUSxDQUFDLEtBQWM7SUFDOUIsT0FBTyxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFBO0FBQ3BELENBQUM7QUFFRCxTQUFTLGVBQWUsQ0FBQyxLQUFjO0lBQ3JDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksT0FBTyxLQUFLLENBQUMsRUFBRSxLQUFLLFFBQVE7UUFBRSxPQUFPLElBQUksQ0FBQTtJQUNqRSxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7SUFDM0QsT0FBTztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtRQUNaLFFBQVEsRUFBRSxJQUFBLHNC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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Bvcy9waWNrdXAtb3JkZXJzL1tpZF0vY29sbGVjdC9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQXFEQSxvQkEwR0M7QUE5SkQscURBQXFFO0FBQ3JFLDZCQUF1QjtBQUN2QixtRUFBa0U7QUFDbEUsMkVBSStDO0FBQy9DLHlFQUkwQztBQUMxQyxxRUFLNEM7QUFFNUMsTUFBTSxVQUFVLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUMxQixlQUFlLEVBQUUsT0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDckQsT0FBTyxFQUFFLE9BQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO0lBQzdDLFdBQVcsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0NBQ25DLENBQUMsQ0FBQTtBQVVGLFNBQVMsUUFBUSxDQUFDLEtBQWM7SUFDOUIsT0FBTyxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFBO0FBQ3BELENBQUM7QUFFRCxTQUFTLGVBQWUsQ0FBQyxLQUFjO0lBQ3JDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksT0FBTyxLQUFLLENBQUMsRUFBRSxLQUFLLFFBQVE7UUFBRSxPQUFPLElBQUksQ0FBQTtJQUNqRSxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7SUFDM0QsT0FBTztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtRQUNaLFFBQVEsRUFBRSxJQUFBLHNCQUFRLEVBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLElBQUk7UUFDMUMsTUFBTTtLQUNQLENBQUE7QUFDSCxDQUFDO0FBRUQ7OztHQUdHO0FBQ0ksS0FBSyxVQUFVLElBQUksQ0FBQyxHQUFrQixFQUFFLEdBQW1CO0lBQ2hFLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFBO0lBQzdCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNiLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFBO1FBQy9FLE9BQU07SUFDUixDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBQ25ELElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDcEIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDbkIsT0FBTyxFQUFFLHNCQUFzQjtZQUMvQixNQUFNLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUU7WUFDOUIsSUFBSSxFQUFFLGNBQWM7U0FDckIsQ0FBQyxDQUFBO1FBQ0YsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDBCQUFhLEVBQUUsR0FBa0MsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUM5RSxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsSUFBSSxNQUFNLEVBQUUsaUJBQWlCLElBQUksSUFBSSxDQUFBO0lBQy9FLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoQixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNuQixPQUFPLEVBQUUseUJBQXlCO1lBQ2xDLElBQUksRUFBRSxjQUFjO1NBQ3JCLENBQUMsQ0FBQTtRQUNGLE9BQU07SUFDUixDQUFDO0lBRUQsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFlLENBQUE7SUFDOUUsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNqQyxNQUFNLEVBQUUsT0FBTztRQUNmLE1BQU0sRUFBRTtZQUNOLElBQUk7WUFDSixVQUFVO1lBQ1YsUUFBUTtZQUNSLHFCQUFxQjtZQUNyQiwyQkFBMkI7WUFDM0IsVUFBVTtZQUNWLGdCQUFnQjtZQUNoQix1QkFBdUI7WUFDdkIsaUNBQWlDO1NBQ2xDO1FBQ0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRTtLQUN6QixDQUFDLENBQUE7SUFDRixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDckIsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1gsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUE7UUFDdkUsT0FBTTtJQUNSLENBQUM7SUFFRCxJQUFJLENBQUMsSUFBQSxpQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUUsQ0FBQztRQUN6QyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNuQixPQUFPLEVBQUUsNENBQTRDO1lBQ3JELElBQUksRUFBRSxlQUFlO1NBQ3RCLENBQUMsQ0FBQTtRQUNGLE9BQU07SUFDUixDQUFDO0lBRUQsSUFBSSxPQUFPLEdBQTBFLElBQUksQ0FBQTtJQUN6RixJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7UUFDaEMsT0FBTyxHQUFHLE1BQU0sSUFBQSx5Q0FBd0IsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzlELENBQUM7SUFFRCxrREFBa0Q7SUFDbEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDekIsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEdBQUcsRUFBRSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1lBQ2pELE1BQU0sRUFBRSxPQUFPO1lBQ2YsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxnQkFBZ0IsRUFBRSxvQkFBb0IsRUFBRSxRQUFRLENBQUM7WUFDNUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRTtTQUN6QixDQUFDLENBQUE7UUFDRixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDL0QsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLFVBQVUsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDL0QsR0FBRyxDQUFDLGVBQWUsQ0FBQztTQUNwQixNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQTBCLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNwRCxNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzNDLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtRQUNYLFFBQVEsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUEsc0JBQVEsRUFBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztLQUMzRCxDQUFDLENBQUMsQ0FBQTtJQUNILE1BQU0sWUFBWSxHQUFHLElBQUEsK0JBQWlCLEVBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBQzlELElBQUksWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQztZQUNILE1BQU0sSUFBQSxrREFBOEIsRUFBQztnQkFDbkMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxLQUFLO2dCQUNwQixLQUFLO2dCQUNMLE9BQU87Z0JBQ1AsS0FBSyxFQUFFLFlBQVk7Z0JBQ25CLFVBQVU7Z0JBQ1YsT0FBTyxFQUFFLElBQUEsc0NBQWtCLEVBQUMsR0FBRyxDQUFDO2FBQ2pDLENBQUMsQ0FBQTtRQUNKLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsSUFBSSxHQUFHLFlBQVksb0RBQWdDLEVBQUUsQ0FBQztnQkFDcEQsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQyxDQUFBO2dCQUN6RSxPQUFNO1lBQ1IsQ0FBQztZQUNELEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNuQixPQUFPLEVBQUUsSUFBQSxtQ0FBcUIsRUFBQyxHQUFHLEVBQUUsZ0NBQWdDLENBQUM7Z0JBQ3JFLElBQUksRUFBRSxrQkFBa0I7YUFDekIsQ0FBQyxDQUFBO1lBQ0YsT0FBTTtRQUNSLENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFBLGdDQUFlLEVBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDdEUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDbkQsQ0FBQyJ9

package/.medusa/server/src/api/admin/pos/pickup-orders/[id]/ready/route.js

@@ -15,7 +15,7 @@ async function POST(req, res) {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
     const { data } = await query.graph({
         entity: "order",
-        fields: ["id", "metadata"],
+        fields: ["id", "metadata", "shipping_address.id", "shipping_address.metadata"],
         filters: { id: orderId },
     });
     const order = data[0];
@@ -34,4 +34,4 @@ async function POST(req, res) {
     const updated = await (0, pos_web_pickup_1.setPickupStatus)(req.scope, orderId, "ready");
     res.status(200).json({ order: updated });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Bvcy9waWNrdXAtb3JkZXJzL1tpZF0vcmVhZHkvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFrQkEsb0JBK0JDO0FBaERELHFEQUFxRTtBQUNyRSxtRUFBa0U7QUFDbEUsMkVBSStDO0FBVS9DLHFGQUFxRjtBQUM5RSxLQUFLLFVBQVUsSUFBSSxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDaEUsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUE7SUFDN0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUE7UUFDL0UsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDBCQUFhLEVBQUUsR0FBa0MsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUM5RSxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQWUsQ0FBQTtJQUM5RSxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxPQUFPO1FBQ2YsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQztRQUMxQixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNyQixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQTtRQUN2RSxPQUFNO0lBQ1IsQ0FBQztJQUVELE1BQU0sVUFBVSxHQUFHLE1BQU0sRUFBRSxpQkFBaUIsQ0FBQTtJQUM1QyxJQUFJLFVBQVUsSUFBSSxDQUFDLElBQUEsaUNBQWdCLEVBQUMsS0FBSyxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUM7UUFDdkQsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDbkIsT0FBTyxFQUFFLDRDQUE0QztZQUNyRCxJQUFJLEVBQUUsZUFBZTtTQUN0QixDQUFDLENBQUE7UUFDRixPQUFNO0lBQ1IsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBQSxnQ0FBZSxFQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQ2xFLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDMUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Bvcy9waWNrdXAtb3JkZXJzL1tpZF0vcmVhZHkvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFrQkEsb0JBK0JDO0FBaERELHFEQUFxRTtBQUNyRSxtRUFBa0U7QUFDbEUsMkVBSStDO0FBVS9DLHFGQUFxRjtBQUM5RSxLQUFLLFVBQVUsSUFBSSxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDaEUsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUE7SUFDN0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUE7UUFDL0UsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDBCQUFhLEVBQUUsR0FBa0MsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUM5RSxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQWUsQ0FBQTtJQUM5RSxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ2pDLE1BQU0sRUFBRSxPQUFPO1FBQ2YsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxxQkFBcUIsRUFBRSwyQkFBMkIsQ0FBQztRQUM5RSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNyQixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQTtRQUN2RSxPQUFNO0lBQ1IsQ0FBQztJQUVELE1BQU0sVUFBVSxHQUFHLE1BQU0sRUFBRSxpQkFBaUIsQ0FBQTtJQUM1QyxJQUFJLFVBQVUsSUFBSSxDQUFDLElBQUEsaUNBQWdCLEVBQUMsS0FBSyxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUM7UUFDdkQsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDbkIsT0FBTyxFQUFFLDRDQUE0QztZQUNyRCxJQUFJLEVBQUUsZUFBZTtTQUN0QixDQUFDLENBQUE7UUFDRixPQUFNO0lBQ1IsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBQSxnQ0FBZSxFQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQ2xFLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDMUMsQ0FBQyJ9

package/.medusa/server/src/utils/pos-web-pickup.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PICKUP_STATUS_KEY = exports.PAYMENT_MODE_KEY = exports.PICKUP_LOCATION_ID_KEY = exports.FULFILLMENT_METHOD_KEY = void 0;
+exports.isStorePickupOrder = isStorePickupOrder;
+exports.getPickupLocationId = getPickupLocationId;
 exports.isWebPickupOrder = isWebPickupOrder;
 exports.listWebPickupOrders = listWebPickupOrders;
 exports.setPickupStatus = setPickupStatus;
@@ -22,12 +24,39 @@ function meta(order) {
     const m = order.metadata;
     return m && typeof m === "object" && !Array.isArray(m) ? m : {};
 }
-function isWebPickupOrder(order, locationId) {
+function addressMeta(order) {
+    const addr = order.shipping_address;
+    if (!addr || typeof addr !== "object" || Array.isArray(addr))
+        return {};
+    const m = addr.metadata;
+    return m && typeof m === "object" && !Array.isArray(m) ? m : {};
+}
+/** True when order looks like store pickup (order or shipping-address metadata). */
+function isStorePickupOrder(order) {
     const m = meta(order);
-    if (m[exports.FULFILLMENT_METHOD_KEY] !== "pickup")
+    const method = str(m[exports.FULFILLMENT_METHOD_KEY]);
+    if (method === "pickup")
+        return true;
+    if (method === "delivery")
         return false;
-    const loc = str(m[exports.PICKUP_LOCATION_ID_KEY]);
-    return loc === locationId;
+    if (str(m[exports.PICKUP_LOCATION_ID_KEY]))
+        return true;
+    const am = addressMeta(order);
+    if (am.is_store_pickup === true)
+        return true;
+    if (str(am[exports.PICKUP_LOCATION_ID_KEY]))
+        return true;
+    return false;
+}
+function getPickupLocationId(order) {
+    return str(meta(order)[exports.PICKUP_LOCATION_ID_KEY]) || str(addressMeta(order)[exports.PICKUP_LOCATION_ID_KEY]);
+}
+/** Store-pickup order assigned to this stock location. */
+function isWebPickupOrder(order, locationId) {
+    if (!isStorePickupOrder(order))
+        return false;
+    const loc = getPickupLocationId(order);
+    return Boolean(loc) && loc === locationId;
 }
 async function listWebPickupOrders(container, locationId, opts) {
     const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
@@ -47,6 +76,8 @@ async function listWebPickupOrders(container, locationId, opts) {
             "currency_code",
             "total",
             "metadata",
+            "shipping_address.id",
+            "shipping_address.metadata",
             "customer.id",
             "customer.email",
             "customer.phone",
@@ -106,6 +137,8 @@ async function capturePayAtStorePayment(container, orderId) {
         fields: [
             "id",
             "metadata",
+            "shipping_address.id",
+            "shipping_address.metadata",
             "payment_collections.id",
             "payment_collections.payments.id",
             "payment_collections.payments.captured_amount",
@@ -117,7 +150,8 @@ async function capturePayAtStorePayment(container, orderId) {
     if (!order)
         return { captured: false, payment_ids: [], message: "Order not found" };
     const m = meta(order);
-    if (m[exports.PAYMENT_MODE_KEY] !== "pay_at_store" && m[exports.FULFILLMENT_METHOD_KEY] !== "pickup") {
+    const isPayAtStore = m[exports.PAYMENT_MODE_KEY] === "pay_at_store";
+    if (!isPayAtStore && !isStorePickupOrder(order)) {
         return { captured: false, payment_ids: [], message: "Order is not a pay-at-store pickup" };
     }
     const paymentIds = [];
@@ -140,8 +174,8 @@ async function capturePayAtStorePayment(container, orderId) {
             }
         }
     }
-    // Fallback: mark payment metadata if no payment sessions exist yet
-    if (!paymentIds.length) {
+    // Fallback: pay-at-store with no payment sessions yet — stamp capture metadata only.
+    if (!paymentIds.length && isPayAtStore) {
         const orderModule = container.resolve(utils_1.Modules.ORDER);
         await orderModule.updateOrders(orderId, {
             metadata: {
@@ -150,8 +184,13 @@ async function capturePayAtStorePayment(container, orderId) {
                 [exports.PAYMENT_MODE_KEY]: "pay_at_store",
             },
         });
+        return { captured: true, payment_ids: paymentIds };
     }
-    return { captured: true, payment_ids: paymentIds };
+    return {
+        captured: paymentIds.length > 0,
+        payment_ids: paymentIds,
+        message: paymentIds.length ? undefined : "Nothing to capture",
+    };
 }
 async function listWebReturnsForLocation(container, locationId, opts) {
     const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
@@ -191,4 +230,4 @@ async function listWebReturnsForLocation(container, locationId, opts) {
         count: filtered.length,
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pos-web-pickup.js","sourceRoot":"","sources":["../../../../src/utils/pos-web-pickup.ts"],"names":[],"mappings":";;;AAiCA,4CAKC;AAED,kDAuDC;AAED,0CA4BC;AAED,4DA0DC;AAED,8DA4CC;AAvOD;;GAEG;AACH,qDAA6D;AAE7D,qDAA8E;AAcjE,QAAA,sBAAsB,GAAG,oBAAoB,CAAA;AAC7C,QAAA,sBAAsB,GAAG,oBAAoB,CAAA;AAC7C,QAAA,gBAAgB,GAAG,cAAc,CAAA;AACjC,QAAA,iBAAiB,GAAG,eAAe,CAAA;AAEhD,SAAS,GAAG,CAAC,KAAc;IACzB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACxE,CAAC;AAED,SAAS,IAAI,CAAC,KAAU;IACtB,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAA;IACxB,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAA6B,CAAC,CAAC,CAAC,EAAE,CAAA;AAC9F,CAAC;AAED,SAAgB,gBAAgB,CAAC,KAAU,EAAE,UAAkB;IAC7D,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;IACrB,IAAI,CAAC,CAAC,8BAAsB,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IACxD,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,8BAAsB,CAAC,CAAC,CAAA;IAC1C,OAAO,GAAG,KAAK,UAAU,CAAA;AAC3B,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,SAA0B,EAC1B,UAAkB,EAClB,IAA2D;IAE3D,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAA0B,CAAA;IACzF,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAA;IAEhC,2FAA2F;IAC3F,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QAChD,MAAM,EAAE,OAAO;QACf,MAAM,EAAE;YACN,IAAI;YACJ,YAAY;YACZ,YAAY;YACZ,QAAQ;YACR,gBAAgB;YAChB,oBAAoB;YACpB,OAAO;YACP,eAAe;YACf,OAAO;YACP,UAAU;YACV,aAAa;YACb,gBAAgB;YAChB,gBAAgB;YAChB,qBAAqB;YACrB,oBAAoB;YACpB,UAAU;YACV,aAAa;YACb,gBAAgB;YAChB,wBAAwB;YACxB,4BAA4B;YAC5B,iCAAiC;YACjC,8CAA8C;YAC9C,qCAAqC;SACtC;QACD,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE;QACxC,UAAU,EAAE;YACV,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;SAC9B;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9D,gBAAgB,CAAC,CAAC,EAAE,UAAU,CAAC,CAChC,CAAA;IACD,MAAM,YAAY,GAAG,IAAI,EAAE,MAAM,CAAA;IACjC,MAAM,QAAQ,GAAG,YAAY;QAC3B,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,yBAAiB,CAAC,CAAC,KAAK,YAAY,CAAC;QAC1E,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;IACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,IAAI,QAAQ,EAAE,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAA;AACvF,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,SAA0B,EAC1B,OAAe,EACf,MAAyC;IAEzC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAA0B,CAAA;IACzF,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC;QAC1B,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE;KACzB,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAA;IAEvB,MAAM,QAAQ,GAAG;QACf,GAAG,IAAI,CAAC,KAAK,CAAC;QACd,CAAC,yBAAiB,CAAC,EAAE,MAAM;KAC5B,CAAA;IAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAsB,eAAO,CAAC,KAAK,CAAC,CAAA;IACzE,MAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAE/D,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QAC/C,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,QAAQ,CAAC;QAC5E,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE;KACzB,CAAC,CAAA;IACF,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;AAC3B,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,SAA0B,EAC1B,OAAe;IAEf,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAA0B,CAAA;IACzF,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,OAAO;QACf,MAAM,EAAE;YACN,IAAI;YACJ,UAAU;YACV,wBAAwB;YACxB,iCAAiC;YACjC,8CAA8C;YAC9C,qCAAqC;SACtC;QACD,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE;KACzB,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACrB,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAEnF,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;IACrB,IAAI,CAAC,CAAC,wBAAgB,CAAC,KAAK,cAAc,IAAI,CAAC,CAAC,8BAAsB,CAAC,KAAK,QAAQ,EAAE,CAAC;QACrF,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAA;IAC5F,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAC1D,CAAC,CAAE,KAAK,CAAC,mBAA6B;QACtC,CAAC,CAAC,EAAE,CAAA;IACN,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,QAAkB,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3E,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAC1B,IAAI,CAAC,EAAE;gBAAE,SAAQ;YACjB,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,IAAI,CAAC,CAAC,CAAA;YACrD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;YAC1C,IAAI,MAAM,GAAG,CAAC,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC;gBACpC,MAAM,IAAA,mCAAsB,EAAC,SAAS,CAAC,CAAC,GAAG,CAAC;oBAC1C,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;iBAC1B,CAAC,CAAA;gBACF,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAsB,eAAO,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE;YACtC,QAAQ,EAAE;gBACR,GAAG,CAAC;gBACJ,wBAAwB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBAClD,CAAC,wBAAgB,CAAC,EAAE,cAAc;aACnC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA;AACpD,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,SAA0B,EAC1B,UAAkB,EAClB,IAA0C;IAE1C,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAA0B,CAAA;IACzF,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAA;IAEhC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE;YACN,IAAI;YACJ,QAAQ;YACR,UAAU;YACV,aAAa;YACb,YAAY;YACZ,YAAY;YACZ,UAAU;YACV,UAAU;YACV,eAAe;YACf,gBAAgB;YAChB,yBAAyB;SAC1B;QACD,UAAU,EAAE;YACV,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;SAC9B;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAChE,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,UAAU;YAAE,OAAO,IAAI,CAAA;QACpD,MAAM,CAAC,GACL,GAAG,CAAC,QAAQ,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9E,CAAC,CAAE,GAAG,CAAC,QAAgB;YACvB,CAAC,CAAC,EAAE,CAAA;QACR,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,UAAU,CAAA;IACtF,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;QAC/C,KAAK,EAAE,QAAQ,CAAC,MAAM;KACvB,CAAA;AACH,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pos-web-pickup.js","sourceRoot":"","sources":["../../../../src/utils/pos-web-pickup.ts"],"names":[],"mappings":"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"}

package/README.md

@@ -119,6 +119,13 @@ POS staff access follows the existing guard: both paths are manager-write, so ca
 
 ## Known Issues & Fixes
 
+### 0.0.48 — store pickup collect + address-based detection
+
+- `POST /admin/pos/pickup-orders/:id/collect` with `{ capture_payment: true, fulfill: false }` captures only (does **not** set `pickup_status=collected`).
+- Full collect / mark picked up (`fulfill: true`) still captures if needed, fulfills + delivers, then sets `pickup_status=collected`.
+- Pickup detection also accepts shipping-address metadata (`is_store_pickup` / `pickup_location_id`), not only order `fulfillment_method=pickup`.
+- Capture no longer stamps `pay_at_store` on prepaid online pickups when there is nothing left to capture.
+
 ### 0.0.35 — barcode routes moved from the Chocomelon host
 
 `/admin/barcode-template` and `/admin/barcodes/bulk-generate` used to live in the Chocomelon store (`src/api/admin/...` plus `templates/barcode-template.html`). They now ship with this plugin with the same request/response shapes, so the `medusa-pos` client needs no change. **Delete the host copies after upgrading** — Medusa project routes override plugin routes, so stale host files would keep serving the old code. EAN-13 output is unchanged; existing printed labels still scan to the same variants.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-pos-plugin",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "Medusa v2 POS operations: draft carts, finalize, payments, returns, catalog, refunds.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",