flowrix 1.0.1-beta.80 → 1.0.1-beta.81

package/dist/module.json

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

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

@@ -122,4 +122,6 @@ export default function (countries: any): {
     displayAlert: (message: string, type: "success" | "danger") => void;
     dismissAlert: () => void;
     handleSignup: () => Promise<void>;
+    initializeShippingData: () => void;
+    resetForm: () => void;
 };

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

@@ -48,10 +48,13 @@ export default function(countries) {
   const companyName = ref("");
   const abn = ref("");
   const address = ref("");
-  const sameAsCustomerDetails = ref(false);
+  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 : [];
@@ -65,8 +68,8 @@ export default function(countries) {
     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.postCode.trim()) return "Post Code is required";
-    if (!inputData.value.suburb.trim()) return "Suburb 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";
@@ -96,8 +99,8 @@ export default function(countries) {
   const handleSameAsCustomerDetails = () => {
     if (sameAsCustomerDetails.value) {
       const billingAddr = isBusinessAccount.value ? address.value : inputData.value.address;
-      const billingSuburb = inputData.value.suburb;
-      const billingPostcode = inputData.value.postCode;
+      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;
@@ -106,15 +109,23 @@ export default function(countries) {
       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 alertMessage = ref("");
-  const alertType = ref("danger");
-  const showAlert = ref(false);
   const displayAlert = (message, type) => {
     alertMessage.value = message;
     alertType.value = type;
@@ -125,6 +136,42 @@ export default function(countries) {
       }, 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) {
+      inputData.value.shipping_address = newAddress;
+    }
+  });
+  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, (newValue) => {
+    if (sameAsCustomerDetails.value) {
+      handleSameAsCustomerDetails();
+    }
+  });
   watch(logResponse, (newres) => {
     if (newres?.status == "Success") {
       router.push({ name: "dashboard-profile" });
@@ -132,6 +179,12 @@ export default function(countries) {
   });
   const handleSignup = async () => {
     isLoading.value = true;
+    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");
@@ -139,28 +192,23 @@ export default function(countries) {
       return;
     }
     try {
-      if (inputData.value.mobile) {
-        inputData.value.billing_mobile = inputData.value.mobile;
-      }
-      inputData.value.billing_suburb = inputData.value.suburb;
-      inputData.value.billing_address = inputData.value.address;
-      inputData.value.billing_firstname = inputData.value.firstname;
-      inputData.value.billing_lastname = inputData.value.lastname;
-      inputData.value.billing_postcode = inputData.value.postCode;
-      inputData.value.shipping_suburb = inputData.value.shipping_town;
       if (isBusinessAccount.value) {
         inputData.value.company_name = companyName.value;
         inputData.value.abn = abn.value;
-        inputData.value.billing_address = address.value;
+        inputData.value.businessAddress = address.value;
+        if (address.value) {
+          inputData.value.billing_address = address.value;
+        }
       }
       if (sameAsCustomerDetails.value) {
-        inputData.value.shipping_address = inputData.value.billing_address;
-        inputData.value.shipping_country = inputData.value.billing_country;
-        inputData.value.shipping_state = inputData.value.billing_state;
-        inputData.value.shipping_town = inputData.value.billing_suburb;
-        inputData.value.shipping_suburb = inputData.value.billing_suburb;
-        inputData.value.shipping_postcode = inputData.value.billing_postcode;
-        inputData.value.shipping_mobile = inputData.value.billing_mobile;
+        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;
+        }
       }
       await CustomerRegister(inputData.value);
       if (!regResponse.value || regResponse.value.status !== "Success") {
@@ -192,24 +240,7 @@ export default function(countries) {
       }
       const successMsg = typeof regResponse.value.message === "string" ? regResponse.value.message : "Registration successful! Welcome aboard.";
       displayAlert(successMsg, "success");
-      inputData.value.firstname = "";
-      inputData.value.lastname = "";
-      inputData.value.address = "";
-      inputData.value.billing_country = "";
-      inputData.value.billing_state = "";
-      inputData.value.suburb = "";
-      inputData.value.postCode = "";
-      inputData.value.email = "";
-      inputData.value.email_confirmation = "";
-      inputData.value.password = "";
-      inputData.value.password_confirmation = "";
-      inputData.value.mobile = "";
-      isBusinessAccount.value = false;
-      companyName.value = "";
-      abn.value = "";
-      address.value = "";
-      sameAsCustomerDetails.value = false;
-      inputData.value.newsletterSignup = false;
+      resetForm();
       setTimeout(() => {
         router.push("/dashboard/profile");
       }, 1e3);
@@ -221,6 +252,47 @@ export default function(countries) {
       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,
@@ -245,6 +317,9 @@ export default function(countries) {
     showAlert,
     displayAlert,
     dismissAlert,
-    handleSignup
+    handleSignup,
+    initializeShippingData,
+    // Make sure this is returned
+    resetForm
   };
 }

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

@@ -1,6 +1,6 @@
 import { type Wishlist, type WishlistProduct, type CreateWishlistData, type UpdateWishlistData, type AddToWishlistData, type ApiResponse } from '../../stores/wishlists.js';
 export declare function useWishlists(): {
-    fetchWishlists: () => Promise<ApiResponse<Wishlist[]>>;
+    fetchWishlists: (force?: boolean) => Promise<ApiResponse<Wishlist[]>>;
     fetchWishlistProducts: (listId: number) => Promise<ApiResponse<{
         id: number;
         title: string;
@@ -19,7 +19,7 @@ export declare function useWishlists(): {
         default: boolean;
         created_at: string;
     }[]>;
-    wishlistProducts: (listId: number) => import("vue").ComputedRef<WishlistProduct[]>;
+    wishlistProducts: (listId: number) => WishlistProduct[];
     loading: import("vue").ComputedRef<boolean>;
     error: import("vue").ComputedRef<string | null>;
 };

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

@@ -19,11 +19,11 @@ function formatErrorMessage(message) {
 }
 export function useWishlists() {
   const store = useWishlistsStore();
-  async function fetchWishlists() {
+  async function fetchWishlists(force) {
     store.setLoading(true);
     store.setError(null);
     try {
-      const response = await store.fetchWishlists();
+      const response = await store.fetchWishlists(force || false);
       if (response.status === "Success") {
         return response;
       } else {
@@ -175,7 +175,8 @@ export function useWishlists() {
     updateWishlist,
     deleteWishlist,
     wishlists: computed(() => store.getWishlists),
-    wishlistProducts: (listId) => computed(() => store.getWishlistProducts(listId)),
+    // Fixed: Remove extra computed wrapper - direct getter for reactivity
+    wishlistProducts: (listId) => store.getWishlistProducts(listId),
     loading: computed(() => store.isLoading),
     error: computed(() => store.getError)
   };

package/dist/runtime/stores/wishlists.d.ts

@@ -6,7 +6,15 @@ export interface Wishlist {
 }
 export interface WishlistProduct {
     id: number;
-    productSlug: string;
+    slug: string;
+    name: string;
+    image: string;
+    price: string;
+    pricefloat: number;
+    rp: string;
+    rpfloat: number;
+    type: string;
+    brandimage: string;
 }
 export interface WishlistProducts {
     [listId: number]: WishlistProduct[];
@@ -113,7 +121,7 @@ export declare const useWishlistsStore: import("pinia").StoreDefinition<"wishlis
     addWishlistProduct(listId: number, product: WishlistProduct): void;
     removeWishlistProduct(listId: number, productSlug: string): void;
     clearWishlistProducts(listId: number): void;
-    fetchWishlists(): Promise<ApiResponse<Wishlist[]>>;
+    fetchWishlists(force?: boolean): Promise<ApiResponse<Wishlist[]>>;
     fetchWishlistProducts(listId: number): Promise<ApiResponse<{
         id: number;
         title: string;

package/dist/runtime/stores/wishlists.js

@@ -42,15 +42,23 @@ export const useWishlistsStore = defineStore("wishlists", {
     removeWishlistProduct(listId, productSlug) {
       if (this.wishlistProducts[listId]) {
         this.wishlistProducts[listId] = this.wishlistProducts[listId].filter(
-          (product) => product.productSlug !== productSlug
+          (product) => product.slug !== productSlug
+          // Changed from productSlug to slug
         );
       }
     },
     clearWishlistProducts(listId) {
       delete this.wishlistProducts[listId];
     },
-    // Fetch all wishlists
-    async fetchWishlists() {
+    // Fetch all wishlists - Added force param for cache bypass
+    async fetchWishlists(force = false) {
+      if (!force && this.wishlists.length > 0) {
+        return {
+          status: "Success",
+          data: this.wishlists,
+          message: null
+        };
+      }
       try {
         const config = useRuntimeConfig();
         let rawCookies = "";
@@ -115,7 +123,7 @@ export const useWishlistsStore = defineStore("wishlists", {
           body: data
         });
         if (response.status === "Success") {
-          await this.fetchWishlists();
+          await this.fetchWishlists(true);
           return response;
         } else {
           return response;
@@ -165,6 +173,7 @@ export const useWishlistsStore = defineStore("wishlists", {
         const apiUrl = `mystore/customer/wishlist/${listId}/item/delete`;
         const response = await flowrixApi.post(apiUrl, apiConfig, {
           body: { ids: { productSlug } }
+          // Assuming API expects this format
         });
         if (response.status === "Success") {
           this.removeWishlistProduct(listId, productSlug);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowrix",
-  "version": "1.0.1-beta.80",
+  "version": "1.0.1-beta.81",
   "description": "Plug-and-play Nuxt eCommerce cart powered by FLOWRiX. Subscription required.",
   "license": "MIT",
   "type": "module",