flowrix 1.0.1-beta.103 → 1.0.1-beta.106

package/dist/module.json

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

package/dist/module.mjs

@@ -8,15 +8,16 @@ const module$1 = defineNuxtModule({
   defaults: {},
   async setup(_options, nuxt) {
     const env = process.env;
+    console.log("envenvenvenvenvenvenv", env);
     const runtimeConfig = nuxt.options.runtimeConfig;
     runtimeConfig.FLOWRIX_API_KEY = env.KEY || runtimeConfig.FLOWRIX_API_KEY || "";
+    runtimeConfig.FLOWRIX_API_SECRET = env.SECRET || runtimeConfig.FLOWRIX_API_SECRET || "";
     runtimeConfig.FLOWRIX_API_ORIGIN = env.ORIGIN || runtimeConfig.FLOWRIX_API_ORIGIN || "";
     runtimeConfig.FLOWRIX_API_BASE = env.BASE || runtimeConfig.FLOWRIX_API_BASE || "";
     runtimeConfig.FLOWRIX_CACHE = env.CACHE || runtimeConfig.FLOWRIX_CACHE || "false";
     runtimeConfig.FLOWRIX_CDN = env.CDN || runtimeConfig.FLOWRIX_CDN || "";
     Object.assign(runtimeConfig.public, {
       ...runtimeConfig.public,
-      ...process.env,
       FLOWRIX_API_KEY: runtimeConfig.public.FLOWRIX_API_KEY || env.KEY || runtimeConfig.FLOWRIX_API_KEY || "",
       FLOWRIX_API_ORIGIN: runtimeConfig.public.FLOWRIX_API_ORIGIN || env.ORIGIN || runtimeConfig.FLOWRIX_API_ORIGIN || "",
       FLOWRIX_API_BASE: runtimeConfig.public.FLOWRIX_API_BASE || env.BASE || runtimeConfig.FLOWRIX_API_BASE || "",

package/dist/runtime/composables/Cart/useCartComponent.js

@@ -1,10 +1,11 @@
+import { useCartStore } from "../../stores/Cart.js";
 import { GTM_view_cart } from "../useDataLayer.js";
 import { META_view_cart } from "../useMetaLayer.js";
 import { TikTok_view_cart } from "../useTikTokDatalayer.js";
 export const useCartComponent = async () => {
   const cartStore = useCartStore();
-  const cartItems = cartStore.cart.items;
-  GTM_view_cart(cartItems);
-  META_view_cart(cartItems);
-  TikTok_view_cart(cartItems);
+  const cart = cartStore.cart;
+  GTM_view_cart(cart);
+  META_view_cart(cart);
+  TikTok_view_cart(cart);
 };

package/dist/runtime/composables/Checkout/PaymentMethods/useDirectDeposit.js

@@ -1,4 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
@@ -12,6 +16,10 @@ export default function() {
         });
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Direct Deposit");
+      META_add_payment_info(cartData, "Direct Deposit");
+      TikTok_add_payment_info(cartData, "Direct Deposit");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/useEway.js

@@ -1,4 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
@@ -13,6 +17,10 @@ export default function() {
         inputData.ewayKey = checkoutStore.publishableKey.key;
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Eway");
+      META_add_payment_info(cartData, "Eway");
+      TikTok_add_payment_info(cartData, "Eway");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/useFlowrixpay.js

@@ -1,5 +1,9 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
 import { useAuthStore } from "../../../stores/auth.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const { user } = useAuthStore();
@@ -113,6 +117,10 @@ export default function() {
         });
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Flowrix Pay");
+      META_add_payment_info(cartData, "Flowrix Pay");
+      TikTok_add_payment_info(cartData, "Flowrix Pay");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/useOpayo.js

@@ -1,5 +1,9 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
 import { useAuthStore } from "../../../stores/auth.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const { user } = useAuthStore();
@@ -15,6 +19,10 @@ export default function() {
         inputData.opayoKey = checkoutStore.publishableKey.key;
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Opayo");
+      META_add_payment_info(cartData, "Opayo");
+      TikTok_add_payment_info(cartData, "Opayo");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/usePaypal.js

@@ -1,4 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
@@ -12,6 +16,10 @@ export default function() {
         });
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Paypal");
+      META_add_payment_info(cartData, "Paypal");
+      TikTok_add_payment_info(cartData, "Paypal");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/useStripe.js

@@ -1,5 +1,9 @@
 import { loadStripe } from "@stripe/stripe-js";
 import { useCheckoutStore } from "../../../stores/Checkout.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 let stripe = null;
 let elements = null;
 export default function() {
@@ -26,6 +30,10 @@ export default function() {
         cardElement.mount("#card-element");
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Stripe");
+      META_add_payment_info(cartData, "Stripe");
+      TikTok_add_payment_info(cartData, "Stripe");
     } catch (error) {
       console.log("Error", error);
     }

package/dist/runtime/composables/Checkout/PaymentMethods/useZippay.js

@@ -1,4 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
+import { useCartStore } from "../../../stores/Cart.js";
+import { GTM_add_payment_info } from "../../useDataLayer.js";
+import { META_add_payment_info } from "../../useMetaLayer.js";
+import { TikTok_add_payment_info } from "../../useTikTokDatalayer.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
@@ -12,6 +16,10 @@ export default function() {
         });
       }
       checkoutStore.saveToCheckoutSession(inputData);
+      const cartData = useCartStore().cart;
+      GTM_add_payment_info(cartData, "Zippay");
+      META_add_payment_info(cartData, "Zippay");
+      TikTok_add_payment_info(cartData, "Zippay");
     } catch (error) {
       console.log("Error", error);
     }

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

@@ -101,7 +101,6 @@ export default function (countries: any): {
         shipping_mobile: string;
         subscribe: boolean;
     }>;
-    CustomerRegister: (registerFields: any) => Promise<void>;
     regResponse: import("vue").Ref<null, null>;
     isBusinessAccount: import("vue").Ref<boolean, boolean>;
     companyName: import("vue").Ref<string, string>;
@@ -117,9 +116,9 @@ export default function (countries: any): {
     toggleConfirmPassword: () => void;
     handleSameAsCustomerDetails: () => void;
     alertMessage: import("vue").Ref<string, string>;
-    alertType: import("vue").Ref<"success" | "danger", "success" | "danger">;
+    alertType: import("vue").Ref<string, string>;
     showAlert: import("vue").Ref<boolean, boolean>;
-    displayAlert: (message: string, type: "success" | "danger") => void;
+    displayAlert: (message: any, type: any) => void;
     dismissAlert: () => void;
     handleSignup: () => Promise<void>;
     initializeShippingData: () => void;

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

@@ -1,11 +1,10 @@
 import { ref, watch } from "vue";
 import { useRouter, useRoute } from "#vue-router";
 import { useAuthStore } from "../../stores/auth.js";
-import useLogin from "./useLogin.js";
 export default function(countries) {
   const router = useRouter();
   const route = useRoute();
-  const { CustomerLogin, logResponse } = useLogin();
+  const authStore = useAuthStore();
   const inputData = ref({
     abn: "",
     addresses: [],
@@ -41,9 +40,6 @@ export default function(countries) {
     subscribe: false
   });
   const regResponse = ref(null);
-  const CustomerRegister = (async (registerFields) => {
-    regResponse.value = await useAuthStore().signUp(registerFields);
-  });
   const isBusinessAccount = ref(false);
   const companyName = ref("");
   const abn = ref("");
@@ -148,10 +144,15 @@ export default function(countries) {
     }
   });
   watch(() => inputData.value.address, (newAddress) => {
-    if (sameAsCustomerDetails.value && newAddress) {
+    if (sameAsCustomerDetails.value && newAddress && !isBusinessAccount.value) {
       inputData.value.shipping_address = newAddress;
     }
   });
+  watch(() => address.value, (newBusinessAddress) => {
+    if (sameAsCustomerDetails.value && newBusinessAddress && isBusinessAccount.value) {
+      inputData.value.shipping_address = newBusinessAddress;
+    }
+  });
   watch(() => inputData.value.mobile, (newMobile) => {
     if (sameAsCustomerDetails.value && newMobile) {
       inputData.value.shipping_mobile = newMobile;
@@ -167,18 +168,14 @@ export default function(countries) {
       inputData.value.shipping_state = newState;
     }
   });
-  watch(isBusinessAccount, (newValue) => {
+  watch(isBusinessAccount, () => {
     if (sameAsCustomerDetails.value) {
       handleSameAsCustomerDetails();
     }
   });
-  watch(logResponse, (newres) => {
-    if (newres?.status == "Success") {
-      router.push({ name: "dashboard-profile" });
-    }
-  });
   const handleSignup = async () => {
     isLoading.value = true;
+    dismissAlert();
     inputData.value.billing_mobile = inputData.value.mobile;
     inputData.value.billing_address = inputData.value.address;
     inputData.value.billing_firstname = inputData.value.firstname;
@@ -210,14 +207,16 @@ export default function(countries) {
           inputData.value.shipping_town = inputData.value.shipping_suburb;
         }
       }
-      await CustomerRegister(inputData.value);
+      regResponse.value = await authStore.signUp(inputData.value);
       if (!regResponse.value || regResponse.value.status !== "Success") {
         let errorMsg = "Registration failed. Please try again.";
         if (regResponse.value?.message) {
           if (typeof regResponse.value.message === "string") {
             errorMsg = regResponse.value.message;
           } else if (typeof regResponse.value.message === "object") {
-            const fieldErrors = Object.entries(regResponse.value.message).flatMap(([field, errors]) => (errors || []).map((err) => `${field.charAt(0).toUpperCase() + field.slice(1)}: ${err}`));
+            const fieldErrors = Object.entries(regResponse.value.message).flatMap(
+              ([field, errors]) => (errors || []).map((err) => `${field.charAt(0).toUpperCase() + field.slice(1)}: ${err}`)
+            );
             errorMsg = fieldErrors.length > 0 ? fieldErrors.join("\n") : errorMsg;
           }
         } else if (!regResponse.value) {
@@ -231,10 +230,13 @@ export default function(countries) {
         email: inputData.value.email,
         password: inputData.value.password
       };
-      logResponse.value = await useAuthStore().userLogin(loginCredentials);
-      if (!logResponse.value || logResponse.value.status !== "Success") {
-        const errorMsg = !logResponse.value ? "No login response received." : typeof logResponse.value.message === "string" ? logResponse.value.message : "Login failed after registration. Please try logging in manually.";
-        displayAlert(errorMsg, "danger");
+      const loginResult = await authStore.userLogin(loginCredentials);
+      if (!loginResult || loginResult.status !== "Success") {
+        const errorMsg = loginResult?.message ? typeof loginResult.message === "string" ? loginResult.message : "Auto-login failed." : "Auto-login failed. Please login manually.";
+        displayAlert(`Registration successful! However, ${errorMsg} Redirecting to login page...`, "danger");
+        setTimeout(() => {
+          router.push({ name: "customer-account-login" });
+        }, 3e3);
         isLoading.value = false;
         return;
       }
@@ -242,11 +244,11 @@ export default function(countries) {
       displayAlert(successMsg, "success");
       resetForm();
       setTimeout(() => {
-        router.push("/dashboard/profile");
-      }, 1e3);
+        router.push({ name: "dashboard-profile" });
+      }, 1500);
     } catch (error) {
       console.error("Registration Error:", error);
-      const errorMsg = error.message || "An unexpected error occurred. Please try again.";
+      const errorMsg = error?.message || error?.data?.message || "An unexpected error occurred. Please try again.";
       displayAlert(errorMsg, "danger");
     } finally {
       isLoading.value = false;
@@ -297,7 +299,6 @@ export default function(countries) {
     router,
     route,
     inputData,
-    CustomerRegister,
     regResponse,
     isBusinessAccount,
     companyName,
@@ -319,7 +320,6 @@ export default function(countries) {
     dismissAlert,
     handleSignup,
     initializeShippingData,
-    // Make sure this is returned
     resetForm
   };
 }

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

@@ -22,23 +22,57 @@ export function useUpdatePassword() {
     };
     clearMessages();
   };
+  const formatApiError = (message) => {
+    if (typeof message === "string") {
+      return message;
+    }
+    if (typeof message === "object" && message !== null) {
+      const errors = [];
+      Object.entries(message).forEach(([field, fieldErrors]) => {
+        const fieldName = field.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+        if (Array.isArray(fieldErrors)) {
+          fieldErrors.forEach((error) => {
+            errors.push(`${fieldName}: ${error}`);
+          });
+        } else {
+          errors.push(`${fieldName}: ${fieldErrors}`);
+        }
+      });
+      return errors.join("\n");
+    }
+    return "An error occurred";
+  };
   const validateForm = () => {
-    if (!form.value.currentPassword?.trim() || !form.value.newPassword?.trim() || !form.value.confirmPassword?.trim()) {
-      errorMessage.value = "All password fields are required!";
+    clearMessages();
+    if (!form.value.currentPassword?.trim()) {
+      errorMessage.value = "Current password is required!";
+      return false;
+    }
+    if (!form.value.newPassword?.trim()) {
+      errorMessage.value = "New password is required!";
+      return false;
+    }
+    if (!form.value.confirmPassword?.trim()) {
+      errorMessage.value = "Please confirm your new password!";
       return false;
     }
     if (form.value.newPassword !== form.value.confirmPassword) {
       errorMessage.value = "New password and confirm password do not match!";
       return false;
     }
-    if (form.value.newPassword.length < 8) {
-      errorMessage.value = "New password must be at least 8 characters long!";
+    if (form.value.newPassword.length < 6) {
+      errorMessage.value = "New password must be at least 6 characters long!";
+      return false;
+    }
+    if (form.value.currentPassword === form.value.newPassword) {
+      errorMessage.value = "New password must be different from current password!";
       return false;
     }
     return true;
   };
   const updatePassword = async () => {
     if (!validateForm()) {
+      console.log("Validation failed:", errorMessage.value);
       return false;
     }
     loading.value = true;
@@ -50,34 +84,36 @@ export function useUpdatePassword() {
         password_confirmation: form.value.confirmPassword.trim()
       };
       const response = await authStore.changePassword(requestBody);
-      if (response && response?.status === "Success") {
-        successMessage.value = response.message || "Password updated successfully!";
-        resetForm();
-        return true;
+      if (!response) {
+        console.log("No response received");
+        errorMessage.value = "No response received from server. Please try again.";
+        return false;
       }
-      if (response) {
+      if (response.status === "Success") {
         successMessage.value = response.message || "Password updated successfully!";
-        resetForm();
+        setTimeout(() => {
+          resetForm();
+        }, 7e3);
+        setTimeout(() => {
+          successMessage.value = "";
+        }, 2e3);
         return true;
-      } else if (response && response.status === "Error") {
-        errorMessage.value = response.message || "Failed to update password. Please try again.";
+      } else if (response.status === "Error") {
+        console.log("Error response:", response.message);
+        errorMessage.value = formatApiError(response.message);
         return false;
       } else {
+        console.log("Unexpected response format:", response);
         errorMessage.value = "Unexpected response from server. Please try again.";
         return false;
       }
     } catch (err) {
-      console.error("Unexpected error:", err);
-      if (err.data && err.data.status === "Error") {
-        errorMessage.value = err.data.message || "Failed to update password. Please try again.";
-      } else if (err.message) {
-        errorMessage.value = err.message;
-      } else {
-        errorMessage.value = "An unexpected error occurred while updating your password.";
-      }
+      console.error("Caught error:", err);
+      errorMessage.value = "An unexpected error occurred. Please try again.";
       return false;
     } finally {
       loading.value = false;
+      console.log("Final state - Error:", errorMessage.value, "Success:", successMessage.value);
     }
   };
   return {

package/dist/runtime/composables/useWebforms.d.ts

@@ -1,16 +1,45 @@
-import { type WebForm, type WebFormData } from '../stores/webforms.js';
-export interface ApiResponse<T> {
-    status: string;
-    message: string | Record<string, string[]> | null;
-    data: T | null;
-}
+import type { WebForm, WebFormSubmission, WebFormResponse } from '../stores/webforms.js';
 export declare function useWebforms(): {
-    fetchWebform: (id: number) => Promise<ApiResponse<WebForm>>;
-    submitInquiry: (formData: WebFormData, recaptchaToken?: string) => Promise<ApiResponse<any>>;
+    showSuccessModal: import("vue").Ref<boolean, boolean>;
+    currentFormData: import("vue").Ref<{
+        [x: string]: any;
+        recaptcha: string;
+    } | null, WebFormSubmission | {
+        [x: string]: any;
+        recaptcha: string;
+    } | null>;
+    recaptchaToken: import("vue").Ref<string, string>;
+    formLoading: import("vue").Ref<boolean, boolean>;
     webform: import("vue").ComputedRef<{
         id: number;
+        title: string;
+        description?: string | undefined;
+        fields: {
+            id: number;
+            name: string;
+            label: string;
+            type: string;
+            required: boolean;
+            options?: string[] | undefined;
+            validation?: string | undefined;
+            placeholder?: string | undefined;
+        }[];
+        success_message?: string | undefined;
+    } | null>;
+    webFormReturn: import("vue").ComputedRef<{
+        status: string;
+        message: string;
+        data: any | null;
     } | null>;
-    webFormReturn: import("vue").ComputedRef<any>;
     loading: import("vue").ComputedRef<boolean>;
     error: import("vue").ComputedRef<string | null>;
+    clearMessages: () => void;
+    fetchWebform: (id: number) => Promise<WebForm | null>;
+    initFormSubmission: (formData: WebFormSubmission) => void;
+    submitInquiry: (formData: WebFormSubmission) => Promise<WebFormResponse>;
+    setRecaptchaToken: (token: string) => void;
+    closeSuccessModal: () => void;
+    resetForm: () => void;
+    autoClearMessages: () => void;
+    isFormValid: (formData: WebFormSubmission) => boolean;
 };