flowrix 1.0.1-beta.16 → 1.0.1-beta.160

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

@@ -1,50 +1,325 @@
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useRouter, useRoute } from "#vue-router";
-import { useAuth } from "../useAuth.js";
-export default function() {
+import { useAuthStore } from "../../stores/auth.js";
+export default function(countries) {
   const router = useRouter();
   const route = useRoute();
-  const { signUp } = useAuth();
-  const form_error = ref("");
-  const inputData = ref({ passwordStrengthValue: 0 });
-  const { showPassword, togglePassword } = useTogglePassword();
-  const {
-    passwordStrength,
-    passwordStrengthClass,
-    passwordStrengthTextColor,
-    passwordStrengthWidth
-  } = usePasswordFormatter(inputData.value.password, inputData.value);
-  const { inputValue: mobile, errorMessage, handleInput } = useNumberOnly();
-  const signupFunction = async () => {
-    if (!inputData.value.firstname || !inputData.value.lastname || !inputData.value.email || !inputData.value.password || !inputData.value.password_confirmation) {
-      console.error("All fields are required");
-      form_error.value = "All fields are required";
+  const authStore = useAuthStore();
+  const inputData = ref({
+    abn: "",
+    addresses: [],
+    address: "",
+    postCode: "",
+    suburb: "",
+    billing_address: "",
+    businessAddress: "",
+    billing_country: "",
+    billing_firstname: "",
+    billing_lastname: "",
+    billing_mobile: "",
+    billing_postcode: "",
+    billing_state: "",
+    billing_suburb: "",
+    company_name: "",
+    email: "",
+    email_confirmation: "",
+    firstname: "",
+    lastname: "",
+    mobile: "",
+    newsletterSignup: false,
+    password: "",
+    password_confirmation: "",
+    recaptcha: "",
+    shipping_address: "",
+    shipping_country: "",
+    shipping_postcode: "",
+    shipping_state: "",
+    shipping_suburb: "",
+    shipping_town: "",
+    shipping_mobile: "",
+    subscribe: false
+  });
+  const regResponse = ref(null);
+  const isBusinessAccount = ref(false);
+  const companyName = ref("");
+  const abn = ref("");
+  const address = ref("");
+  const sameAsCustomerDetails = ref(true);
+  const showPassword = ref(false);
+  const showConfirmPassword = ref(false);
+  const isLoading = ref(false);
+  const alertMessage = ref("");
+  const alertType = ref("danger");
+  const showAlert = ref(false);
+  const getStates = (countryId) => {
+    const activeCountry = countries.data.find((country) => country.id == countryId);
+    return activeCountry ? activeCountry.states : [];
+  };
+  const validateEmail = (email) => {
+    return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
+  };
+  const validateForm = () => {
+    if (!inputData.value.firstname.trim()) return "First Name is required";
+    if (!inputData.value.lastname.trim()) return "Last Name is required";
+    if (!inputData.value.address.trim()) return "Address is required";
+    if (!String(inputData.value.billing_country).trim()) return "Country is required";
+    if (!String(inputData.value.billing_state).trim()) return "State is required";
+    if (!inputData.value.billing_postcode.trim()) return "Post Code is required";
+    if (!inputData.value.billing_suburb.trim()) return "Suburb is required";
+    if (!validateEmail(inputData.value.email)) return "Please enter a valid email address";
+    if (inputData.value.email !== inputData.value.email_confirmation) return "Email addresses do not match";
+    if (inputData.value.password.length < 6) return "Password must be at least 6 characters";
+    if (inputData.value.password !== inputData.value.password_confirmation) return "Passwords do not match";
+    if (!inputData.value.mobile.trim()) return "Mobile Number is required";
+    if (isBusinessAccount.value) {
+      if (!companyName.value.trim()) return "Company Name is required";
+      if (!abn.value.trim()) return "ABN is required";
+      if (!address.value.trim()) return "Business Address is required";
+    }
+    if (!sameAsCustomerDetails.value) {
+      if (!inputData.value.shipping_address.trim()) return "Shipping Address is required";
+      if (!String(inputData.value.shipping_country).trim()) return "Shipping country is required.";
+      if (!inputData.value.shipping_town.trim()) return "Shipping Town is required";
+      if (!String(inputData.value.shipping_state).trim()) return "Shipping State is required";
+      if (!inputData.value.shipping_postcode.trim()) return "Shipping Post Code is required";
+      if (!inputData.value.shipping_mobile.trim()) return "Shipping Mobile is required";
+    }
+    return true;
+  };
+  const togglePassword = () => {
+    showPassword.value = !showPassword.value;
+  };
+  const toggleConfirmPassword = () => {
+    showConfirmPassword.value = !showConfirmPassword.value;
+  };
+  const handleSameAsCustomerDetails = () => {
+    if (sameAsCustomerDetails.value) {
+      const billingAddr = isBusinessAccount.value ? address.value : inputData.value.address;
+      const billingSuburb = inputData.value.billing_suburb;
+      const billingPostcode = inputData.value.billing_postcode;
+      const billingMobile = inputData.value.mobile;
+      inputData.value.shipping_address = billingAddr;
+      inputData.value.shipping_country = inputData.value.billing_country;
+      inputData.value.shipping_state = inputData.value.billing_state;
+      inputData.value.shipping_town = billingSuburb;
+      inputData.value.shipping_suburb = billingSuburb;
+      inputData.value.shipping_postcode = billingPostcode;
+      inputData.value.shipping_mobile = billingMobile;
+    } else {
+      inputData.value.shipping_address = "";
+      inputData.value.shipping_town = "";
+      inputData.value.shipping_suburb = "";
+      inputData.value.shipping_postcode = "";
+      inputData.value.shipping_mobile = "";
+    }
+  };
+  const initializeShippingData = () => {
+    if (sameAsCustomerDetails.value) {
+      handleSameAsCustomerDetails();
+    }
+  };
+  const dismissAlert = () => {
+    showAlert.value = false;
+    alertMessage.value = "";
+  };
+  const displayAlert = (message, type) => {
+    alertMessage.value = message;
+    alertType.value = type;
+    showAlert.value = true;
+    if (type === "success") {
+      setTimeout(() => {
+        dismissAlert();
+      }, 5e3);
+    }
+  };
+  watch(() => inputData.value.billing_postcode, (newPostcode) => {
+    if (sameAsCustomerDetails.value && newPostcode) {
+      inputData.value.shipping_postcode = newPostcode;
+    }
+  });
+  watch(() => inputData.value.billing_suburb, (newSuburb) => {
+    if (sameAsCustomerDetails.value && newSuburb) {
+      inputData.value.shipping_suburb = newSuburb;
+      inputData.value.shipping_town = newSuburb;
+    }
+  });
+  watch(() => inputData.value.address, (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;
+    }
+  });
+  watch(() => inputData.value.billing_country, (newCountry) => {
+    if (sameAsCustomerDetails.value && newCountry) {
+      inputData.value.shipping_country = newCountry;
+    }
+  });
+  watch(() => inputData.value.billing_state, (newState) => {
+    if (sameAsCustomerDetails.value && newState) {
+      inputData.value.shipping_state = newState;
+    }
+  });
+  watch(isBusinessAccount, () => {
+    if (sameAsCustomerDetails.value) {
+      handleSameAsCustomerDetails();
+    }
+  });
+  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;
+    inputData.value.billing_lastname = inputData.value.lastname;
+    inputData.value.suburb = inputData.value.billing_suburb;
+    inputData.value.postCode = inputData.value.billing_postcode;
+    const validationError = validateForm();
+    if (validationError !== true) {
+      displayAlert(validationError, "danger");
+      isLoading.value = false;
       return;
     }
     try {
-      inputData.value.email_confirmation = inputData.value.email;
-      await signUp(inputData.value, { callbackUrl: "/customer/account", redirect: true });
-    } catch (error) {
-      console.error("Signup Error:", error);
-      let errorMessage2 = "An unexpected error occurred.";
-      if (error.data?.message) {
-        errorMessage2 = error.data.message;
-      } else if (error.message) {
-        errorMessage2 = error.message;
+      if (isBusinessAccount.value) {
+        inputData.value.company_name = companyName.value;
+        inputData.value.abn = abn.value;
+        inputData.value.businessAddress = address.value;
+        if (address.value) {
+          inputData.value.billing_address = address.value;
+        }
+      }
+      if (sameAsCustomerDetails.value) {
+        handleSameAsCustomerDetails();
+      } else {
+        if (inputData.value.shipping_town && !inputData.value.shipping_suburb) {
+          inputData.value.shipping_suburb = inputData.value.shipping_town;
+        }
+        if (inputData.value.shipping_suburb && !inputData.value.shipping_town) {
+          inputData.value.shipping_town = inputData.value.shipping_suburb;
+        }
+      }
+      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}`)
+            );
+            errorMsg = fieldErrors.length > 0 ? fieldErrors.join("\n") : errorMsg;
+          }
+        } else if (!regResponse.value) {
+          errorMsg = "No response received from server. Please try again.";
+        }
+        displayAlert(errorMsg, "danger");
+        isLoading.value = false;
+        return;
       }
-      form_error.value = errorMessage2;
+      const loginCredentials = {
+        email: inputData.value.email,
+        password: inputData.value.password
+      };
+      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;
+      }
+      const successMsg = typeof regResponse.value.message === "string" ? regResponse.value.message : "Registration successful! Welcome aboard.";
+      displayAlert(successMsg, "success");
+      resetForm();
+      setTimeout(() => {
+        router.push({ name: "dashboard-profile" });
+      }, 1500);
+    } catch (error) {
+      console.error("Registration Error:", error);
+      const errorMsg = error?.message || error?.data?.message || "An unexpected error occurred. Please try again.";
+      displayAlert(errorMsg, "danger");
+    } finally {
+      isLoading.value = false;
     }
   };
+  const resetForm = () => {
+    inputData.value = {
+      abn: "",
+      addresses: [],
+      address: "",
+      postCode: "",
+      suburb: "",
+      billing_address: "",
+      businessAddress: "",
+      billing_country: "",
+      billing_firstname: "",
+      billing_lastname: "",
+      billing_mobile: "",
+      billing_postcode: "",
+      billing_state: "",
+      billing_suburb: "",
+      company_name: "",
+      email: "",
+      email_confirmation: "",
+      firstname: "",
+      lastname: "",
+      mobile: "",
+      newsletterSignup: false,
+      password: "",
+      password_confirmation: "",
+      recaptcha: "",
+      shipping_address: "",
+      shipping_country: "",
+      shipping_postcode: "",
+      shipping_state: "",
+      shipping_suburb: "",
+      shipping_town: "",
+      shipping_mobile: "",
+      subscribe: false
+    };
+    isBusinessAccount.value = false;
+    companyName.value = "";
+    abn.value = "";
+    address.value = "";
+    sameAsCustomerDetails.value = true;
+  };
   return {
     router,
     route,
-    form_error,
     inputData,
-    passwordStrength,
-    passwordStrengthClass,
-    passwordStrengthTextColor,
-    passwordStrengthWidth,
-    errorMessage,
-    signupFunction
+    regResponse,
+    isBusinessAccount,
+    companyName,
+    abn,
+    address,
+    sameAsCustomerDetails,
+    showPassword,
+    showConfirmPassword,
+    isLoading,
+    getStates,
+    validateForm,
+    togglePassword,
+    toggleConfirmPassword,
+    handleSameAsCustomerDetails,
+    alertMessage,
+    alertType,
+    showAlert,
+    displayAlert,
+    dismissAlert,
+    handleSignup,
+    initializeShippingData,
+    resetForm
   };
 }

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

@@ -0,0 +1,124 @@
+export interface ShippingAddress {
+    id: string | number | null;
+    firstname: string;
+    lastname: string;
+    address: string;
+    saddress?: string;
+    saddress2?: string;
+    suburb: string;
+    state: string;
+    state_id: string | number | null;
+    country: string;
+    country_id: string | number;
+    postcode: string;
+    mobile: string;
+    shipping: number;
+    billing: number;
+}
+export declare function useShippingAddress(): {
+    showModal: import("vue").Ref<boolean, boolean>;
+    isEditMode: import("vue").Ref<boolean, boolean>;
+    showDeleteModal: import("vue").Ref<boolean, boolean>;
+    currentAddress: import("vue").Ref<{
+        id: string | number | null;
+        firstname: string;
+        lastname: string;
+        address: string;
+        saddress?: string | undefined;
+        saddress2?: string | undefined;
+        suburb: string;
+        state: string;
+        state_id: string | number | null;
+        country: string;
+        country_id: string | number;
+        postcode: string;
+        mobile: string;
+        shipping: number;
+        billing: number;
+    } | null, ShippingAddress | {
+        id: string | number | null;
+        firstname: string;
+        lastname: string;
+        address: string;
+        saddress?: string | undefined;
+        saddress2?: string | undefined;
+        suburb: string;
+        state: string;
+        state_id: string | number | null;
+        country: string;
+        country_id: string | number;
+        postcode: string;
+        mobile: string;
+        shipping: number;
+        billing: number;
+    } | null>;
+    submitAddressReturn: import("vue").Ref<any, any>;
+    loading: import("vue").Ref<boolean, boolean>;
+    user: import("vue").ComputedRef<{
+        id: number;
+        fullname: string;
+        firstname: string;
+        lastname: string;
+        email: string;
+        avatar: string;
+        country_id: number | null;
+        country: {
+            id: number;
+            name: string;
+            emoji: string;
+        } | null;
+        state_id: number | null;
+        state: string | null;
+        suburb: string | null;
+        dob: string | null;
+        phone: string | null;
+        address: string | null;
+        mobile: string | null;
+        company: string | null;
+        addresses: {
+            id: number;
+            fullname: string | null;
+            firstname: string;
+            middlename: string | null;
+            lastname: string;
+            address: string;
+            suburb: string;
+            state: string | null;
+            state_id: number | null;
+            country: string;
+            country_id: number;
+            postcode: string;
+            mobile: string;
+            shipping: number;
+            billing: number;
+        }[];
+        created_at: string;
+    } | null>;
+    shippingAddresses: import("vue").ComputedRef<{
+        id: number;
+        fullname: string | null;
+        firstname: string;
+        middlename: string | null;
+        lastname: string;
+        address: string;
+        suburb: string;
+        state: string | null;
+        state_id: number | null;
+        country: string;
+        country_id: number;
+        postcode: string;
+        mobile: string;
+        shipping: number;
+        billing: number;
+    }[]>;
+    clearMessages: () => void;
+    openAddModal: () => void;
+    openEditModal: (address: any) => void;
+    closeModal: () => void;
+    openDeleteModal: (address: any) => void;
+    closeDeleteModal: () => void;
+    submitAddress: () => Promise<void>;
+    setShipping: (address: any) => Promise<void>;
+    deleteAddress: () => Promise<void>;
+    autoClearMessages: () => void;
+};

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

@@ -0,0 +1,146 @@
+import { ref, computed } from "vue";
+import { useAuthStore } from "../../stores/auth.js";
+export function useShippingAddress() {
+  const authStore = useAuthStore();
+  const user = computed(() => authStore.user);
+  const shippingAddresses = computed(() => {
+    return user.value?.addresses?.filter((a) => a.billing == 0) ?? [];
+  });
+  const showModal = ref(false);
+  const isEditMode = ref(false);
+  const showDeleteModal = ref(false);
+  const currentAddress = ref(null);
+  const submitAddressReturn = ref(null);
+  const loading = ref(false);
+  const clearMessages = () => {
+    submitAddressReturn.value = null;
+  };
+  const openAddModal = () => {
+    clearMessages();
+    isEditMode.value = false;
+    currentAddress.value = {
+      id: null,
+      firstname: "",
+      lastname: "",
+      address: "",
+      suburb: "",
+      state: "",
+      state_id: null,
+      country: "Australia",
+      country_id: "",
+      postcode: "",
+      mobile: "",
+      shipping: 1,
+      billing: 0
+    };
+    showModal.value = true;
+  };
+  const openEditModal = (address) => {
+    clearMessages();
+    isEditMode.value = true;
+    currentAddress.value = {
+      ...address,
+      saddress: address.address,
+      saddress2: address.address
+    };
+    showModal.value = true;
+  };
+  const closeModal = () => {
+    clearMessages();
+    showModal.value = false;
+    currentAddress.value = null;
+  };
+  const openDeleteModal = (address) => {
+    clearMessages();
+    currentAddress.value = address;
+    showDeleteModal.value = true;
+  };
+  const closeDeleteModal = () => {
+    clearMessages();
+    showDeleteModal.value = false;
+    currentAddress.value = null;
+  };
+  const submitAddress = async () => {
+    if (!currentAddress.value) return;
+    loading.value = true;
+    clearMessages();
+    try {
+      const method = currentAddress.value.id ? "update" : "add";
+      submitAddressReturn.value = await authStore.setAddress(currentAddress.value, method);
+      if (submitAddressReturn.value.status === "Success") {
+        await authStore.fetchProfile();
+        if (method === "update") {
+          submitAddressReturn.value.message = "Address Updated Successfully";
+        } else {
+          submitAddressReturn.value.message = "Address Created Successfully";
+        }
+        showModal.value = false;
+      }
+    } catch (error) {
+      console.error("Address submission error:", error);
+    } finally {
+      loading.value = false;
+    }
+  };
+  const setShipping = async (address) => {
+    loading.value = true;
+    clearMessages();
+    try {
+      submitAddressReturn.value = await authStore.setAddress(address, "setshipping");
+      if (submitAddressReturn.value.status === "Success") {
+        await authStore.fetchProfile();
+        submitAddressReturn.value.message = "Shipping Address Updated Successfully";
+      }
+    } catch (error) {
+      console.error("Set shipping error:", error);
+    } finally {
+      loading.value = false;
+    }
+  };
+  const deleteAddress = async () => {
+    if (!currentAddress.value) return;
+    loading.value = true;
+    clearMessages();
+    try {
+      submitAddressReturn.value = await authStore.setAddress(currentAddress.value, "delete");
+      if (submitAddressReturn.value.status === "Success") {
+        await authStore.fetchProfile();
+        showDeleteModal.value = false;
+      }
+    } catch (error) {
+      console.error("Delete address error:", error);
+    } finally {
+      loading.value = false;
+    }
+  };
+  const autoClearMessages = () => {
+    if (submitAddressReturn.value?.status !== void 0) {
+      setTimeout(() => {
+        submitAddressReturn.value = null;
+      }, 5e3);
+    }
+  };
+  return {
+    // State
+    showModal,
+    isEditMode,
+    showDeleteModal,
+    currentAddress,
+    submitAddressReturn,
+    loading,
+    // Computed
+    user,
+    shippingAddresses,
+    // Methods
+    clearMessages,
+    openAddModal,
+    openEditModal,
+    closeModal,
+    openDeleteModal,
+    closeDeleteModal,
+    submitAddress,
+    setShipping,
+    deleteAddress,
+    autoClearMessages
+  };
+}

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

@@ -0,0 +1,21 @@
+export declare function useUpdatePassword(): {
+    form: import("vue").Ref<{
+        currentPassword: string;
+        newPassword: string;
+        confirmPassword: string;
+    }, {
+        currentPassword: string;
+        newPassword: string;
+        confirmPassword: string;
+    } | {
+        currentPassword: string;
+        newPassword: string;
+        confirmPassword: string;
+    }>;
+    loading: import("vue").Ref<boolean, boolean>;
+    errorMessage: import("vue").Ref<string, string>;
+    successMessage: import("vue").Ref<string, string>;
+    updatePassword: () => Promise<boolean>;
+    clearMessages: () => void;
+    resetForm: () => void;
+};