flowrix 1.0.1-beta.156 → 1.0.1-beta.158

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "flowrix",
   "configKey": "flowrix",
-  "version": "1.0.1-beta.156",
+  "version": "1.0.1-beta.158",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -9,19 +9,26 @@ const module$1 = defineNuxtModule({
   async setup(_options, nuxt) {
     const env = process.env;
     const runtimeConfig = nuxt.options.runtimeConfig;
+    nuxt.options.nitro = nuxt.options.nitro || {};
+    nuxt.options.nitro.externals = nuxt.options.nitro.externals || {};
+    nuxt.options.nitro.externals.inline = nuxt.options.nitro.externals.inline || [];
+    nuxt.options.nitro.externals.inline.push("@aws-sdk/client-s3", "tslib");
     runtimeConfig.FLOWRIX_API_KEY = env.KEY || "";
     runtimeConfig.FLOWRIX_API_SECRET = env.SECRET || "";
     runtimeConfig.FLOWRIX_API_ORIGIN = env.ORIGIN || "";
     runtimeConfig.FLOWRIX_API_BASE = env.BASE || "";
     runtimeConfig.FLOWRIX_CACHE = env.CACHE || "false";
     runtimeConfig.FLOWRIX_CDN = env.CDN || "";
+    runtimeConfig.S3_ACCESS_KEY_ID = env.S3_ACCESS_KEY_ID || "";
+    runtimeConfig.S3_SECRET_ACCESS_KEY = env.S3_SECRET_ACCESS_KEY || "";
+    runtimeConfig.S3_REGION = env.S3_REGION || "us-east-1";
+    runtimeConfig.S3_BUCKET = env.S3_BUCKET || "";
+    runtimeConfig.S3_TENANT = env.S3_TENANT || "";
+    runtimeConfig.WEBSITE_URL = env.WEBSITE_URL || "";
     Object.assign(runtimeConfig.public, {
       ...runtimeConfig.public,
       FLOWRIX_API_KEY: env.KEY || runtimeConfig.FLOWRIX_API_KEY || runtimeConfig.public.FLOWRIX_API_KEY || "",
-      FLOWRIX_API_ORIGIN: env.ORIGIN || runtimeConfig.FLOWRIX_API_ORIGIN || runtimeConfig.public.FLOWRIX_API_ORIGIN || "",
-      FLOWRIX_API_BASE: env.BASE || runtimeConfig.FLOWRIX_API_BASE || runtimeConfig.public.FLOWRIX_API_BASE || "",
-      FLOWRIX_CACHE: env.CACHE || runtimeConfig.FLOWRIX_CACHE || runtimeConfig.public.FLOWRIX_CACHE || "false",
-      FLOWRIX_CDN: env.FCDN || runtimeConfig.FLOWRIX_CDN || runtimeConfig.public.FLOWRIX_CDN || ""
+      FLOWRIX_API_BASE: runtimeConfig.public.FLOWRIX_API_BASE || ""
     });
     const resolver = createResolver(import.meta.url);
     await installModule("@pinia/nuxt");
@@ -35,6 +42,10 @@ const module$1 = defineNuxtModule({
     addPlugin({
       src: resolver.resolve("./runtime/plugins/router")
     });
+    addServerHandler({
+      middleware: true,
+      handler: resolver.resolve("./runtime/server/middleware/powertools")
+    });
     addServerHandler({
       middleware: true,
       handler: resolver.resolve("./runtime/utils/htmlCache")
@@ -49,6 +60,10 @@ const module$1 = defineNuxtModule({
       from: resolver.resolve("./runtime/middleware/flowrix"),
       name: "flowrixApi"
     });
+    addImports({
+      from: resolver.resolve("./runtime/middleware/s3api"),
+      name: "s3Api"
+    });
     addServerHandler({
       route: "/api/albums",
       handler: resolver.resolve("./runtime/server/api/albums")
@@ -61,46 +76,6 @@ const module$1 = defineNuxtModule({
       route: "/api/banners",
       handler: resolver.resolve("./runtime/server/api/banners")
     });
-    addServerHandler({
-      route: "/api/location",
-      handler: resolver.resolve("./runtime/server/api/location")
-    });
-    addServerHandler({
-      route: "/api/subscribe",
-      handler: resolver.resolve("./runtime/server/api/subscribe")
-    });
-    addServerHandler({
-      route: "/api/auth/forgot",
-      handler: resolver.resolve("./runtime/server/api/auth/forgot")
-    });
-    addServerHandler({
-      route: "/api/auth/login",
-      handler: resolver.resolve("./runtime/server/api/auth/login")
-    });
-    addServerHandler({
-      route: "/api/auth/logout",
-      handler: resolver.resolve("./runtime/server/api/auth/logout")
-    });
-    addServerHandler({
-      route: "/api/auth/register",
-      handler: resolver.resolve("./runtime/server/api/auth/register")
-    });
-    addServerHandler({
-      route: "/api/auth/session",
-      handler: resolver.resolve("./runtime/server/api/auth/session.get")
-    });
-    addServerHandler({
-      route: "/api/auth/user/reset-password",
-      handler: resolver.resolve("./runtime/server/api/auth/user/reset-password")
-    });
-    addServerHandler({
-      route: "/api/auth/user/session",
-      handler: resolver.resolve("./runtime/server/api/auth/user/session")
-    });
-    addServerHandler({
-      route: "/api/auth/user/verify-token",
-      handler: resolver.resolve("./runtime/server/api/auth/user/verify-token")
-    });
     addServerHandler({
       route: "/api/cmspost/**",
       handler: resolver.resolve("./runtime/server/api/cmspost/[...slug]")
@@ -117,26 +92,6 @@ const module$1 = defineNuxtModule({
       route: "/api/brand/**",
       handler: resolver.resolve("./runtime/server/api/brand/[...slug]")
     });
-    addServerHandler({
-      route: "/api/cart/remove",
-      handler: resolver.resolve("./runtime/server/api/cart/remove")
-    });
-    addServerHandler({
-      route: "/api/cart/:slug/add",
-      handler: resolver.resolve("./runtime/server/api/cart/[slug]/add")
-    });
-    addServerHandler({
-      route: "/api/cart/:slug/update",
-      handler: resolver.resolve("./runtime/server/api/cart/[slug]/update")
-    });
-    addServerHandler({
-      route: "/api/cart/service/:slug/add",
-      handler: resolver.resolve("./runtime/server/api/cart/service/[slug]/add")
-    });
-    addServerHandler({
-      route: "/api/cart/related",
-      handler: resolver.resolve("./runtime/server/api/cart/related")
-    });
     addServerHandler({
       route: "/api/catalog/categories",
       handler: resolver.resolve("./runtime/server/api/catalog/categories")
@@ -161,34 +116,6 @@ const module$1 = defineNuxtModule({
       route: "/api/category/**",
       handler: resolver.resolve("./runtime/server/api/category/[...slug]")
     });
-    addServerHandler({
-      route: "/api/checkout/applyCoupon",
-      handler: resolver.resolve("./runtime/server/api/checkout/applyCoupon")
-    });
-    addServerHandler({
-      route: "/api/checkout/configs",
-      handler: resolver.resolve("./runtime/server/api/checkout/configs")
-    });
-    addServerHandler({
-      route: "/api/checkout/countries",
-      handler: resolver.resolve("./runtime/server/api/checkout/countries")
-    });
-    addServerHandler({
-      route: "/api/checkout/paymentmethod",
-      handler: resolver.resolve("./runtime/server/api/checkout/paymentmethod")
-    });
-    addServerHandler({
-      route: "/api/checkout/quotation/guest/:slug",
-      handler: resolver.resolve("./runtime/server/api/checkout/quotation/guest/[slug]")
-    });
-    addServerHandler({
-      route: "/api/checkout/quotation/submit/:slug",
-      handler: resolver.resolve("./runtime/server/api/checkout/quotation/submit/[slug]")
-    });
-    addServerHandler({
-      route: "/api/checkout/quotation/:slug",
-      handler: resolver.resolve("./runtime/server/api/checkout/quotation/[slug]")
-    });
     addServerHandler({
       route: "/api/company/profile",
       handler: resolver.resolve("./runtime/server/api/company/profile")
@@ -197,94 +124,6 @@ const module$1 = defineNuxtModule({
       route: "/api/countries",
       handler: resolver.resolve("./runtime/server/api/countries")
     });
-    addServerHandler({
-      route: "/api/contact-center/webforms/create",
-      handler: resolver.resolve("./runtime/server/api/contact-center/webforms/create")
-    });
-    addServerHandler({
-      route: "/api/contact-center/webforms/:id/details",
-      handler: resolver.resolve("./runtime/server/api/contact-center/webforms/[id]/details")
-    });
-    addServerHandler({
-      route: "/api/customer/change-password",
-      handler: resolver.resolve("./runtime/server/api/customer/change-password")
-    });
-    addServerHandler({
-      route: "/api/customer/checkout",
-      handler: resolver.resolve("./runtime/server/api/customer/checkout")
-    });
-    addServerHandler({
-      route: "/api/customer/orders",
-      handler: resolver.resolve("./runtime/server/api/customer/orders")
-    });
-    addServerHandler({
-      route: "/api/customer/quotations",
-      handler: resolver.resolve("./runtime/server/api/customer/quotations")
-    });
-    addServerHandler({
-      route: "/api/customer/search",
-      handler: resolver.resolve("./runtime/server/api/customer/search")
-    });
-    addServerHandler({
-      route: "/api/customer/tax-invoice",
-      handler: resolver.resolve("./runtime/server/api/customer/tax-invoice")
-    });
-    addServerHandler({
-      route: "/api/customer/address/add",
-      handler: resolver.resolve("./runtime/server/api/customer/address/add")
-    });
-    addServerHandler({
-      route: "/api/customer/address/delete",
-      handler: resolver.resolve("./runtime/server/api/customer/address/delete")
-    });
-    addServerHandler({
-      route: "/api/customer/address/setshipping",
-      handler: resolver.resolve("./runtime/server/api/customer/address/setshipping")
-    });
-    addServerHandler({
-      route: "/api/customer/address/update",
-      handler: resolver.resolve("./runtime/server/api/customer/address/update")
-    });
-    addServerHandler({
-      route: "/api/customer/cards/delete",
-      handler: resolver.resolve("./runtime/server/api/customer/cards/delete")
-    });
-    addServerHandler({
-      route: "/api/customer/cards/get",
-      handler: resolver.resolve("./runtime/server/api/customer/cards/get")
-    });
-    addServerHandler({
-      route: "/api/customer/profile/update",
-      handler: resolver.resolve("./runtime/server/api/customer/profile/update")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/add",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/add")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/createWishList",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/createWishList")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/deleteFromWishList",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/deleteFromWishList")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/deleteWishList",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/deleteWishList")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/get",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/get")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/getWishListItems",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/getWishListItems")
-    });
-    addServerHandler({
-      route: "/api/customer/wishlist/updateWishList",
-      handler: resolver.resolve("./runtime/server/api/customer/wishlist/updateWishList")
-    });
     addServerHandler({
       route: "/api/nav/:id/links",
       handler: resolver.resolve("./runtime/server/api/nav/[id]/links")
@@ -314,24 +153,20 @@ const module$1 = defineNuxtModule({
       handler: resolver.resolve("./runtime/server/api/service/availability")
     });
     addServerHandler({
-      route: "/api/v2/**",
-      handler: resolver.resolve("./runtime/server/api/v2/[...slug].get")
+      route: "/api/permalink/**",
+      handler: resolver.resolve("./runtime/server/api/permalink/[...slug].get")
     });
     addServerHandler({
       route: "/api/shop",
       handler: resolver.resolve("./runtime/server/api/shop")
     });
-    addServerHandler({
-      route: "/api/featured",
-      handler: resolver.resolve("./runtime/server/api/featured")
-    });
     addServerHandler({
       route: "/api/samples",
       handler: resolver.resolve("./runtime/server/api/samples")
     });
     addServerHandler({
-      route: "/api/webform",
-      handler: resolver.resolve("./runtime/server/api/webform")
+      route: "/api/global/**",
+      handler: resolver.resolve("./runtime/server/api/global/[...slug]")
     });
     addServerHandler({
       route: "/api/cache/clean",
@@ -413,10 +248,6 @@ const module$1 = defineNuxtModule({
       route: "/api/faizancheck",
       handler: resolver.resolve("./runtime/server/api/checkvariables")
     });
-    addServerHandler({
-      route: "/api/check-404",
-      handler: resolver.resolve("./runtime/server/api/check-404")
-    });
   }
 });
 

package/dist/runtime/components/Types/page/index.d.vue.ts

@@ -1,6 +1,7 @@
-type __VLS_Props = {
-    data: any;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: import("vue").DefineComponent<{
+    data?: any;
+}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{
+    data?: any;
+}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/Types/page/index.vue

@@ -3,12 +3,8 @@ import { defineAsyncComponent } from "vue";
 import { useRoute } from "vue-router";
 import { useHead } from "#app";
 const route = useRoute();
-const slug = route.params.slug || "home";
 const DynamicComponent = defineAsyncComponent(() => import("../dynamic.vue"));
-const { data: fetchData, error } = await useFetch(`/api/page/${slug}`, {});
-defineProps({
-  data: { type: null, required: true }
-});
+const { data } = defineProps(["data"]);
 const fullPath = ((fullUrl = "") => {
   if (process.server) {
     const headers = useRequestHeaders();
@@ -21,19 +17,19 @@ const fullPath = ((fullUrl = "") => {
   return fullUrl;
 });
 useHead({
-  title: fetchData.value?.data?.meta_title || pageData?.data?.meta_title,
+  title: data?.meta_title,
   meta: [
     {
       name: "description",
-      content: fetchData.value?.data?.meta_description || pageData?.data?.meta_description
+      content: data?.meta_description
     },
     {
       name: "og:title",
-      content: fetchData.value?.data?.meta_title || pageData?.data?.meta_title
+      content: data?.meta_title
     },
     {
       name: "og:description",
-      content: fetchData.value?.data?.meta_description || pageData?.data?.meta_description
+      content: data?.meta_description
     },
     {
       name: "og:url",
@@ -44,8 +40,8 @@ useHead({
 </script>
 
 <template>
-  <!-- <pre>{{ fetchData.data.content }}</pre> -->
+  <!-- <pre>{{ fetchDatadata.content }}</pre> -->
   <div class="page-wraper">
-    <DynamicComponent :data="fetchData.data.content"/>
+    <DynamicComponent :data="data.content"/>
   </div>
 </template>

package/dist/runtime/components/Types/page/index.vue.d.ts

@@ -1,6 +1,7 @@
-type __VLS_Props = {
-    data: any;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: import("vue").DefineComponent<{
+    data?: any;
+}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{
+    data?: any;
+}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/composables/Blog/useBlogSingle.js

@@ -1,5 +1,5 @@
 import { ref, computed } from "vue";
-import { useRoute, useRequestHeaders, useHead } from "#imports";
+import { useRoute, useHead, useRuntimeConfig } from "#imports";
 export const useBlogSingle = (props) => {
   const route = useRoute();
   const magazineCards = ref([
@@ -27,10 +27,9 @@ export const useBlogSingle = (props) => {
   };
   const fullPath = computed(() => {
     if (process.server) {
-      const headers = useRequestHeaders();
-      const protocol = headers["x-forwarded-proto"] || "http";
-      const host = headers.host || "localhost";
-      return `${protocol}://${host}${route.fullPath}`;
+      const config = useRuntimeConfig();
+      const websiteurl = config.WEBSITE_URL || "";
+      return `${websiteurl}${route.fullPath}`;
     } else {
       return `${window.location.origin}${route.fullPath}`;
     }

package/dist/runtime/composables/Category/useCategoryIndex.js

@@ -1,4 +1,4 @@
-import { useHead, useRoute, useAsyncData } from "#imports";
+import { useHead, useRoute, useFetch } from "#imports";
 import { computed } from "vue";
 export const useCategoryIndex = (props, ProductTypesFilter = []) => {
   const route = useRoute();
@@ -25,10 +25,10 @@ export const useCategoryIndex = (props, ProductTypesFilter = []) => {
     query.sample = "true";
   }
   query.ProductTypesFilter = ["custom", "simple", "bundle", "sample"];
-  const { data: catData, pending, error, refresh } = useAsyncData(
-    `category-${slug}-${JSON.stringify(route.query)}`,
-    () => $fetch(`/api/category/${slug}`, { query })
-  );
+  const { data: catData, pending, error, refresh } = useFetch(`/api/category/${slug}`, {
+    key: `category-${slug}-${JSON.stringify(route.query)}`,
+    query
+  });
   const meta = computed(() => {
     const category = catData.value?.category || {};
     return {

package/dist/runtime/composables/Checkout/useCheckout.d.ts

@@ -5,6 +5,7 @@ export default function (): {
         deliverymethod: string | number | undefined;
         billing_address: string | number | undefined;
         billing_country: any;
+        mobile_country_id: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
         billing_state: string | number | undefined;
@@ -56,6 +57,7 @@ export default function (): {
         deliverymethod: string | number | undefined;
         billing_address: string | number | undefined;
         billing_country: any;
+        mobile_country_id: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
         billing_state: string | number | undefined;
@@ -107,6 +109,7 @@ export default function (): {
         deliverymethod: string | number | undefined;
         billing_address: string | number | undefined;
         billing_country: any;
+        mobile_country_id: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
         billing_state: string | number | undefined;
@@ -196,4 +199,5 @@ export default function (): {
     ipLocation: import("vue").Ref<any, any>;
     isAuthenticated: false;
     fireShippingInfoEvent: () => void;
+    AllCheckoutErrors: import("vue").Ref<{}, {}>;
 };

package/dist/runtime/composables/Checkout/useCheckout.js

@@ -27,6 +27,7 @@ export default function() {
   const isCustomer = ref(false);
   const countries = useCountry().data;
   const ipLocation = ref();
+  const AllCheckoutErrors = ref({});
   const cartData = computed(() => {
     const cartItems = checkoutStore.config;
     return cartItems;
@@ -41,6 +42,7 @@ export default function() {
     deliverymethod: sessiondata.value.fields ? sessiondata.value.fields.deliverymethod : "",
     billing_address: sessiondata.value.fields ? sessiondata.value.fields.billing_address : "",
     billing_country: sessiondata.value.fields ? sessiondata.value.fields.billing_country : companyCountryId.value,
+    mobile_country_id: sessiondata.value.fields ? sessiondata.value.fields.billing_country : companyCountryId.value,
     shippingasbilling: shippingFormEnabled.value,
     isCustomer: isCustomer.value,
     billing_state: sessiondata.value.fields ? sessiondata.value.fields.billing_state : "",
@@ -158,8 +160,6 @@ export default function() {
       shippingInfoFired = true;
       if (delivery_method.id == 1) {
         if (shipping_method) {
-          GTM_add_shipping_info(cartStore?.cart, shipping_method);
-          META_add_shipping_info(cartStore?.cart, shipping_method);
         }
       } else if (delivery_method.id == 2) {
         shipping_method = {
@@ -315,9 +315,11 @@ export default function() {
               }
             });
             if (error2.type === "card_error" || error2.type === "validation_error") {
+              AllCheckoutErrors.value = error2;
               showMessage(error2.message);
             }
           } else {
+            AllCheckoutErrors.value = error;
             showMessage(error.message);
           }
         } else if (chckoutResponse.data.url) {
@@ -328,9 +330,14 @@ export default function() {
         }
         removeLoading();
       } else if (checkoutStore.errorResponseData.status == "Error") {
+        console.log("dddd", checkoutStore.errorResponseData);
+        showMessage(checkoutStore.errorResponseData.message);
+        AllCheckoutErrors.value = checkoutStore.errorResponseData;
         removeLoading();
       }
     } catch (error2) {
+      console.log("dddd", error2);
+      showMessage(error2.message);
       removeLoading();
     } finally {
       removeLoading();
@@ -417,6 +424,7 @@ export default function() {
     PaymentMethods,
     ipLocation,
     isAuthenticated,
-    fireShippingInfoEvent
+    fireShippingInfoEvent,
+    AllCheckoutErrors
   };
 }

package/dist/runtime/composables/Customer/useBillingAddress.d.ts

@@ -3,6 +3,7 @@ export interface BillingForm {
     firstname: string;
     lastname: string;
     saddress: string;
+    saddress2: string;
     suburb: string;
     state: string;
     state_id: string | number;
@@ -19,6 +20,7 @@ export declare function useBillingAddress(): {
         firstname: string;
         lastname: string;
         saddress: string;
+        saddress2: string;
         suburb: string;
         state: string;
         state_id: string | number;
@@ -33,6 +35,7 @@ export declare function useBillingAddress(): {
         firstname: string;
         lastname: string;
         saddress: string;
+        saddress2: string;
         suburb: string;
         state: string;
         state_id: string | number;

package/dist/runtime/composables/Customer/useBillingAddress.js

@@ -11,6 +11,7 @@ export function useBillingAddress() {
     firstname: userBillingAddress.value?.firstname || "",
     lastname: userBillingAddress.value?.lastname || "",
     saddress: userBillingAddress.value?.address || "",
+    saddress2: userBillingAddress.value?.address || "",
     suburb: userBillingAddress.value?.suburb || "",
     state: userBillingAddress.value?.state || "",
     state_id: userBillingAddress.value?.state_id || "",
@@ -37,6 +38,7 @@ export function useBillingAddress() {
       firstname: userBillingAddress.value?.firstname || "",
       lastname: userBillingAddress.value?.lastname || "",
       saddress: userBillingAddress.value?.address || "",
+      saddress2: userBillingAddress.value?.address || "",
       suburb: userBillingAddress.value?.suburb || "",
       state: userBillingAddress.value?.state || "",
       state_id: userBillingAddress.value?.state_id || "",

package/dist/runtime/composables/Customer/useShippingAddress.d.ts

@@ -4,6 +4,7 @@ export interface ShippingAddress {
     lastname: string;
     address: string;
     saddress?: string;
+    saddress2?: string;
     suburb: string;
     state: string;
     state_id: string | number | null;
@@ -24,6 +25,7 @@ export declare function useShippingAddress(): {
         lastname: string;
         address: string;
         saddress?: string | undefined;
+        saddress2?: string | undefined;
         suburb: string;
         state: string;
         state_id: string | number | null;
@@ -39,6 +41,7 @@ export declare function useShippingAddress(): {
         lastname: string;
         address: string;
         saddress?: string | undefined;
+        saddress2?: string | undefined;
         suburb: string;
         state: string;
         state_id: string | number | null;

package/dist/runtime/composables/Customer/useShippingAddress.js

@@ -40,7 +40,8 @@ export function useShippingAddress() {
     isEditMode.value = true;
     currentAddress.value = {
       ...address,
-      saddress: address.address
+      saddress: address.address,
+      saddress2: address.address
     };
     showModal.value = true;
   };

package/dist/runtime/composables/Customer/useWishlists.d.ts

@@ -10,7 +10,7 @@ export declare function useWishlists(): {
     }>>;
     createWishlist: (data: CreateWishlistData) => Promise<ApiResponse<Wishlist>>;
     addToWishlist: (listId: number, productSlug: string, data?: AddToWishlistData) => Promise<ApiResponse<WishlistProduct>>;
-    removeFromWishlist: (listId: number, itemId: string) => Promise<ApiResponse<void>>;
+    removeFromWishlist: (listId: number, itemId: number) => Promise<ApiResponse<void>>;
     updateWishlist: (id: number, data: UpdateWishlistData) => Promise<ApiResponse<Wishlist>>;
     deleteWishlist: (id: number) => Promise<ApiResponse<void>>;
     wishlists: import("vue").ComputedRef<{

package/dist/runtime/composables/Product/CustomProduct/useCustomeScript.d.ts

@@ -4,6 +4,9 @@ export interface SelectedOptions {
 export interface attributeIdz {
     name: Object;
 }
+export interface productId {
+    name: String;
+}
 export interface lookupprices {
     name: Object;
 }
@@ -54,6 +57,7 @@ export interface With_this_selection_following_selections_will_be_changed {
 }
 export interface State {
     SelectedOptions: Record<string, string> | any;
+    productId: String | any;
     attributeIdz: object | any;
     lookupprices: lookupprices | null;
     servicePriceSetting: object | any;

package/dist/runtime/composables/Product/CustomProduct/useCustomeScript.js

@@ -2002,17 +2002,11 @@ export const useCustomScript = defineStore("CustomScript", {
         discount = parseFloat(total) * parseFloat(discount) / 100;
       }
       let promotionDiscount = discount + parseFloat(this.total_values_discount);
-      if (this.promotionSettings != void 0 && this.promotionSettings.promotion != void 0 && this.promotionSettings.promotion == true) {
-        if (this.promotionSettings.promotiontype == 3) {
-          for (var i = this.promotionSettings.rules.length - 1; i >= 0; i--) {
-            let rule = this.promotionSettings.rules[i];
-            if (rule.discounttype != void 0 || rule.discount != void 0) {
-              let new_total = parseFloat(total) - parseFloat(this.exclude_from_promo_total);
-              promotionDiscount += this.calculateDiscount(rule.discounttype, rule.discount, new_total);
-            }
-          }
-        }
-      }
+      let new_total = parseFloat(total) - parseFloat(this.exclude_from_promo_total);
+      const { calculatePrice } = usePriceCalculation();
+      const promotionsStore = usePromotions();
+      const priceResult = calculatePrice(this.product, new_total, promotionsStore.promotions || []);
+      promotionDiscount += priceResult.totalDiscount;
       if (parseFloat(total) - parseFloat(promotionDiscount) > 0 && promotionDiscount > 0) {
         promotionDiscount = this.customRoundUp(promotionDiscount);
         total = parseFloat(total) - parseFloat(promotionDiscount);