@moonbase.sh/vue 0.4.57 → 0.4.58

package/dist/index.cjs

@@ -1088,16 +1088,22 @@ function useEligibleOffers(context) {
     throw new Error("No storefront configured");
   return (0, import_vue10.computed)(() => {
     var _a;
-    return ((_a = storefront.storefront.value.offers) != null ? _a : []).filter((o) => import_storefront_api6.OfferUtils.eligible(o, storefront.currentOrder.value) && !offerTargetIsInCart(o, storefront.currentOrder.value));
+    return ((_a = storefront.storefront.value.offers) != null ? _a : []).filter((o) => import_storefront_api6.OfferUtils.eligible(o, storefront.currentOrder.value) && !offerIsInCart(o, storefront.currentOrder.value) && !offerTargetIsInCart(o, storefront.currentOrder.value));
   });
 }
+function offerIsInCart(offer, order) {
+  return order.items.some(
+    (i) => i.offerId === offer.id
+  );
+}
 function offerTargetIsInCart(offer, order) {
-  if (order.items.some(
-    (i) => i.type === "Product" && offer.target.type === "Product" && i.productId === offer.target.id || i.type === "Bundle" && offer.target.type === "Bundle" && i.bundleId === offer.target.id
-  )) {
-    return true;
+  const target = offer.target;
+  if (Array.isArray(target)) {
+    return target.every((target2) => order.items.some((i) => i.type === "Product" && target2.type === "Product" && i.productId === target2.id || i.type === "Bundle" && target2.type === "Bundle" && i.bundleId === target2.id));
   }
-  return false;
+  return order.items.some(
+    (i) => i.type === "Product" && target.type === "Product" && i.productId === target.id || i.type === "Bundle" && target.type === "Bundle" && i.bundleId === target.id
+  );
 }
 
 // src/composables/useProduct.ts

package/dist/index.js

@@ -1056,16 +1056,22 @@ function useEligibleOffers(context) {
     throw new Error("No storefront configured");
   return computed6(() => {
     var _a;
-    return ((_a = storefront.storefront.value.offers) != null ? _a : []).filter((o) => OfferUtils3.eligible(o, storefront.currentOrder.value) && !offerTargetIsInCart(o, storefront.currentOrder.value));
+    return ((_a = storefront.storefront.value.offers) != null ? _a : []).filter((o) => OfferUtils3.eligible(o, storefront.currentOrder.value) && !offerIsInCart(o, storefront.currentOrder.value) && !offerTargetIsInCart(o, storefront.currentOrder.value));
   });
 }
+function offerIsInCart(offer, order) {
+  return order.items.some(
+    (i) => i.offerId === offer.id
+  );
+}
 function offerTargetIsInCart(offer, order) {
-  if (order.items.some(
-    (i) => i.type === "Product" && offer.target.type === "Product" && i.productId === offer.target.id || i.type === "Bundle" && offer.target.type === "Bundle" && i.bundleId === offer.target.id
-  )) {
-    return true;
+  const target = offer.target;
+  if (Array.isArray(target)) {
+    return target.every((target2) => order.items.some((i) => i.type === "Product" && target2.type === "Product" && i.productId === target2.id || i.type === "Bundle" && target2.type === "Bundle" && i.bundleId === target2.id));
   }
-  return false;
+  return order.items.some(
+    (i) => i.type === "Product" && target.type === "Product" && i.productId === target.id || i.type === "Bundle" && target.type === "Bundle" && i.bundleId === target.id
+  );
 }
 
 // src/composables/useProduct.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.4.57",
+  "version": "0.4.58",
   "description": "Package to let you build vue.js storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@vue/devtools-api": "^6.6.3",
     "uuid": "^9.0.1",
     "zod": "^3.23.8",
-    "@moonbase.sh/storefront-api": "0.4.57"
+    "@moonbase.sh/storefront-api": "0.4.58"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.8",