flowrix 1.0.1-beta.9 → 1.0.1-beta.91

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

@@ -1,39 +1,39 @@
 export default function (): {
-    router: any;
-    route: any;
+    router: import("vue-router").Router;
+    route: import("vue-router").RouteLocationNormalizedLoadedGeneric;
     inputData: import("vue").Ref<{
-        deliverymethod: any;
-        billing_address: any;
+        deliverymethod: string | number | undefined;
+        billing_address: string | number | undefined;
         billing_country: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
-        billing_state: any;
-        billing_suburb: any;
+        billing_state: string | number | undefined;
+        billing_suburb: string | undefined;
         clientsceret: any;
-        billing_postcode: any;
-        billing_mobile: any;
-        billing_firstname: any;
-        firstname: any;
-        billing_middlename: any;
-        billing_lastname: any;
-        lastname: any;
-        shipping_address: any;
-        shippingmethod: any;
+        billing_postcode: number | undefined;
+        billing_mobile: string | number | undefined;
+        billing_firstname: string | number | undefined;
+        firstname: string | number | undefined;
+        billing_middlename: string | undefined;
+        billing_lastname: string | number | undefined;
+        lastname: string | number | undefined;
+        shipping_address: string | undefined;
+        shippingmethod: string | number | undefined;
         shipping_country: any;
-        shipping_state: any;
-        shipping_suburb: any;
-        shipping_postcode: any;
-        shipping_mobile: any;
-        shipping_firstname: any;
-        shipping_middlename: any;
-        shipping_lastname: any;
+        shipping_state: string | number | undefined;
+        shipping_suburb: string | undefined;
+        shipping_postcode: number | undefined;
+        shipping_mobile: string | undefined;
+        shipping_firstname: string | undefined;
+        shipping_middlename: string | undefined;
+        shipping_lastname: string | undefined;
         vouchercode: any;
         paymentmethod: string;
         cart: any;
-        abndToken: any;
+        abndToken: string | undefined;
         customertoken: string;
-        email: any;
-        mobile: any;
+        email: string | number | undefined;
+        mobile: string | number | undefined;
         authoritytoleave: undefined;
         register: string;
         password: string;
@@ -53,38 +53,38 @@ export default function (): {
         till_expiryyear: string;
         save_card_details: number;
     }, {
-        deliverymethod: any;
-        billing_address: any;
+        deliverymethod: string | number | undefined;
+        billing_address: string | number | undefined;
         billing_country: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
-        billing_state: any;
-        billing_suburb: any;
+        billing_state: string | number | undefined;
+        billing_suburb: string | undefined;
         clientsceret: any;
-        billing_postcode: any;
-        billing_mobile: any;
-        billing_firstname: any;
-        firstname: any;
-        billing_middlename: any;
-        billing_lastname: any;
-        lastname: any;
-        shipping_address: any;
-        shippingmethod: any;
+        billing_postcode: number | undefined;
+        billing_mobile: string | number | undefined;
+        billing_firstname: string | number | undefined;
+        firstname: string | number | undefined;
+        billing_middlename: string | undefined;
+        billing_lastname: string | number | undefined;
+        lastname: string | number | undefined;
+        shipping_address: string | undefined;
+        shippingmethod: string | number | undefined;
         shipping_country: any;
-        shipping_state: any;
-        shipping_suburb: any;
-        shipping_postcode: any;
-        shipping_mobile: any;
-        shipping_firstname: any;
-        shipping_middlename: any;
-        shipping_lastname: any;
+        shipping_state: string | number | undefined;
+        shipping_suburb: string | undefined;
+        shipping_postcode: number | undefined;
+        shipping_mobile: string | undefined;
+        shipping_firstname: string | undefined;
+        shipping_middlename: string | undefined;
+        shipping_lastname: string | undefined;
         vouchercode: any;
         paymentmethod: string;
         cart: any;
-        abndToken: any;
+        abndToken: string | undefined;
         customertoken: string;
-        email: any;
-        mobile: any;
+        email: string | number | undefined;
+        mobile: string | number | undefined;
         authoritytoleave: undefined;
         register: string;
         password: string;
@@ -104,38 +104,38 @@ export default function (): {
         till_expiryyear: string;
         save_card_details: number;
     } | {
-        deliverymethod: any;
-        billing_address: any;
+        deliverymethod: string | number | undefined;
+        billing_address: string | number | undefined;
         billing_country: any;
         shippingasbilling: boolean;
         isCustomer: boolean;
-        billing_state: any;
-        billing_suburb: any;
+        billing_state: string | number | undefined;
+        billing_suburb: string | undefined;
         clientsceret: any;
-        billing_postcode: any;
-        billing_mobile: any;
-        billing_firstname: any;
-        firstname: any;
-        billing_middlename: any;
-        billing_lastname: any;
-        lastname: any;
-        shipping_address: any;
-        shippingmethod: any;
+        billing_postcode: number | undefined;
+        billing_mobile: string | number | undefined;
+        billing_firstname: string | number | undefined;
+        firstname: string | number | undefined;
+        billing_middlename: string | undefined;
+        billing_lastname: string | number | undefined;
+        lastname: string | number | undefined;
+        shipping_address: string | undefined;
+        shippingmethod: string | number | undefined;
         shipping_country: any;
-        shipping_state: any;
-        shipping_suburb: any;
-        shipping_postcode: any;
-        shipping_mobile: any;
-        shipping_firstname: any;
-        shipping_middlename: any;
-        shipping_lastname: any;
+        shipping_state: string | number | undefined;
+        shipping_suburb: string | undefined;
+        shipping_postcode: number | undefined;
+        shipping_mobile: string | undefined;
+        shipping_firstname: string | undefined;
+        shipping_middlename: string | undefined;
+        shipping_lastname: string | undefined;
         vouchercode: any;
         paymentmethod: string;
         cart: any;
-        abndToken: any;
+        abndToken: string | undefined;
         customertoken: string;
-        email: any;
-        mobile: any;
+        email: string | number | undefined;
+        mobile: string | number | undefined;
         authoritytoleave: undefined;
         register: string;
         password: string;
@@ -155,9 +155,20 @@ export default function (): {
         till_expiryyear: string;
         save_card_details: number;
     }>;
-    cartData: import("vue").ComputedRef<any>;
+    cartData: import("vue").ComputedRef<{
+        [x: string]: any;
+        preferences?: Record<string, any>[] | undefined;
+        outlets?: Record<string, any>[] | undefined;
+        deliverytype?: string | undefined;
+        order_no?: string | undefined;
+        publishableKey?: any;
+        calculations?: any;
+        shippingmethods?: any;
+        cart?: Record<string, import("../../stores/Checkout.js").CartItem> | undefined;
+        totals?: Record<string, any> | undefined;
+    }>;
     AuthStore: import("vue").Ref<any, any>;
-    checkoutStore: any;
+    checkoutStore: import("pinia").Store<"checkout", import("../../stores/Checkout.js").CheckoutState, {}, {}>;
     countries: any;
     BillingDetailsForm: any;
     DeliveryMethodForm: any;

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

@@ -1,14 +1,24 @@
 import { ref, computed, watch, onMounted, defineAsyncComponent } from "vue";
+import { useCompanyProfile } from "../../stores/useCompanyProfile.js";
+import { useCartStore } from "../../stores/Cart.js";
+import { GTM_begin_checkout, GTM_add_shipping_info, GTM_add_payment_info } from "../../composables/useDataLayer.js";
+import { META_begin_checkout, META_add_shipping_info, META_add_payment_info } from "../../composables/useMetaLayer.js";
+import { TikTok_begin_checkout, TikTok_add_payment_info } from "../../composables/useTikTokDatalayer.js";
+import { useCheckoutStore } from "../../stores/Checkout.js";
+import { useCountry } from "../Extras/useCountry.js";
+import { useRouter, useRoute } from "vue-router";
+import { useAuthStore } from "../../stores/auth.js";
 export default function() {
   const router = useRouter();
   const route = useRoute();
   const {
-    status,
-    data
-  } = useAuth();
+    user,
+    token,
+    isAuthenticated
+  } = useAuthStore();
   const { profile } = useCompanyProfile();
   const cartStore = useCartStore();
-  const companyCountryId = computed(() => profile?.value?.country_id || 235);
+  const companyCountryId = computed(() => profile?.data.country_id || "");
   const checkoutStore = useCheckoutStore();
   const AuthStore = ref();
   const shippingFormEnabled = ref(true);
@@ -75,14 +85,13 @@ export default function() {
     save_card_details: 0
   });
   const updateUserFieldsIfuserLogin = (async (sameasbilling = false) => {
-    const LoggedInUser = data;
-    if (Object.keys(LoggedInUser).length > 0 && LoggedInUser.value !== void 0) {
-      const billingAddres = LoggedInUser.value.addresses?.filter((address) => address.billing == 1)[0];
-      const shippingAddres = LoggedInUser.value.addresses?.filter((address) => address.shipping == 1)[0];
+    if (isAuthenticated) {
+      const billingAddres = user.addresses?.filter((address) => address.billing == 1)[0];
+      const shippingAddres = user.addresses?.filter((address) => address.shipping == 1)[0];
       inputData.value.billing_firstname = billingAddres.firstname;
       inputData.value.billing_lastname = billingAddres.lastname;
-      inputData.value.email = LoggedInUser.value.email;
-      inputData.value.billing_mobile = LoggedInUser.value.mobile;
+      inputData.value.email = user.email;
+      inputData.value.billing_mobile = user.mobile;
       if (sameasbilling == true) {
       } else {
         if (billingAddres != void 0) {
@@ -116,7 +125,7 @@ export default function() {
           inputData.value.shipping_mobile = shippingAddres.mobile;
         }
       }
-    } else if (Object.keys(LoggedInUser).length == 0 && sameasbilling == true) {
+    } else if (isAuthenticated && sameasbilling == true) {
       inputData.value.shipping_firstname = inputData.value.billing_firstname ? inputData.value.billing_firstname : "";
       inputData.value.shipping_lastname = inputData.value.billing_lastname ? inputData.value.billing_lastname : "";
       inputData.value.shipping_address = inputData.value.billing_address ? inputData.value.billing_address : "";
@@ -141,10 +150,51 @@ export default function() {
   onMounted(() => {
     checkoutStore.getConfig();
     updateUserFieldsIfuserLogin(inputData.value.shippingasbilling);
-    const cart = [];
-    cart.items = checkoutStore.config.cart;
+    const cartInfo = [];
+    cartInfo.items = checkoutStore.config.cartInfo;
+    cartInfo.totals = checkoutStore?.config?.calculations ? checkoutStore?.config?.calculations : "";
+    let shippingmethods = checkoutStore.config.shippingmethods;
+    let shipping_method = shippingmethods.filter((method) => method.selected == true)[0];
     let deliverymethods = checkoutStore.config.preferences;
     let deliverymethod = false;
+    let delivery_method = deliverymethods.filter((method) => method.selected == true)[0];
+    if (delivery_method) {
+      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 = {
+          "id": 0,
+          "title": "Click and Collect",
+          "details": "",
+          "available": 1,
+          "price": 0,
+          "selected": true
+        };
+        GTM_add_shipping_info(cartStore?.cart, shipping_method);
+        META_add_shipping_info(cartStore?.cart, shipping_method);
+      }
+    }
+    if (cartStore?.cart) {
+      GTM_begin_checkout(cartStore?.cart);
+      META_begin_checkout(cartStore?.cart);
+      TikTok_begin_checkout(cartStore?.cart);
+      GTM_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+      META_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+      TikTok_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+    }
+  });
+  watch(() => cartStore?.cart, (newCartData) => {
+    if (newCartData) {
+      GTM_begin_checkout(newCartData);
+      META_begin_checkout(newCartData);
+      TikTok_begin_checkout(newCartData);
+      GTM_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+      META_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+      TikTok_add_payment_info(cartStore?.cart, inputData.value.paymentmethod);
+    }
   });
   const totalPrice = computed(() => {
     return checkoutStore.config ? checkoutStore.config?.calculations?.total : 0;
@@ -162,11 +212,11 @@ export default function() {
     }
     return states.value;
   });
-  watch(inputData.value, async (newData, oldValue) => {
+  watch(() => inputData.value, async (newData, oldValue) => {
   });
   const shippingMethods = computed(() => {
     if (checkoutStore.config) {
-      return checkoutStore.config.shippingmethods.filter((method) => method.available == 1);
+      return checkoutStore.config?.shippingmethods?.filter((method) => method.available == 1);
     }
   });
   watch(() => checkoutStore.config.shippingmethods, (newValue, oldValue) => {
@@ -212,28 +262,27 @@ export default function() {
     }
   };
   const CheckFlowrixPayment = ((inputData2, payment) => {
-    let status2 = {};
-    var data2 = {
+    let status = {};
+    var data = {
       card_holder: inputData2.till_cardname,
       month: inputData2.till_expirymonth,
       year: inputData2.till_expiryyear
     };
     payment.tokenize(
-      data2,
-      //additional data, MUST include card_holder (or first_name & last_name), month and year
-      function(token, cardData) {
-        inputData2.clientsceret = token;
-        checkoutStore.publishableKey.clientsceret = token;
+      data,
+      function(token2, cardData) {
+        inputData2.clientsceret = token2;
+        checkoutStore.publishableKey.clientsceret = token2;
         checkoutStore.saveToCheckoutSession(inputData2);
-        if (token != "") {
-          status2 = {};
+        if (token2 != "") {
+          status = {};
         }
       },
       function(errors) {
-        status2 = errors;
+        status = errors;
       }
     );
-    return status2;
+    return status;
   });
   const handleSubmit = async (url_cancel, url_success, url_booking) => {
     try {
@@ -250,8 +299,7 @@ export default function() {
           return false;
         }
       }
-      const LoggedInUser = "";
-      if (Object.keys(LoggedInUser).length == 0) {
+      if (isAuthenticated) {
         sessiondata.value.fields.firstname = inputData.value.billing_firstname;
         sessiondata.value.fields.lastname = inputData.value.billing_lastname;
       }
@@ -266,8 +314,8 @@ export default function() {
         sessiondata.value.fields.eway_cardnumber = cardnumber;
         sessiondata.value.fields.eway_cvn = eway_cvn;
       }
-      await checkoutStore.submitCheckout();
-      if (checkoutStore.errorResponseData.status != "Error") {
+      const chckoutResponse = await checkoutStore.submitCheckout();
+      if (chckoutResponse.status == "Success") {
         if (inputData.value.paymentmethod == "web-stripe") {
           const { stripe, elements } = await getStripeElements(
             checkoutStore.publishableKey.key,
@@ -277,21 +325,20 @@ export default function() {
             const { error: error2 } = await stripe.confirmPayment({
               elements,
               confirmParams: {
-                // Make sure to change this to your payment completion page
                 return_url: checkoutStore.responseData.booking ? `${window.location.origin}${url_booking}?calendar=${checkoutStore.responseData.calendar}&order_no=${checkoutStore.responseData.order_no}` : `${window.location.origin}${url_success}`,
                 receipt_email: inputData.value.email
               }
             });
             if (error2.type === "card_error" || error2.type === "validation_error") {
               showMessage(error2.message);
-            } else {
             }
           } else {
             showMessage(error.message);
           }
-        } else if (checkoutStore.response.data.url) {
-          var url = checkoutStore.response.data.url;
+        } else if (chckoutResponse.data.url) {
+          var url = chckoutResponse.data.url;
         } else {
+          window.location.href = url_success;
         }
         removeLoading();
       } else if (checkoutStore.errorResponseData.status == "Error") {

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

@@ -0,0 +1,43 @@
+export default function (inputData: any): {
+    checkoutStore: import("pinia").Store<"checkout", import("../../stores/Checkout.js").CheckoutState, {}, {}>;
+    Countries: import("vue").Ref<never[], never[]>;
+    ChangeCountry: (billingfield: any) => Promise<void>;
+    States: import("vue").Ref<never[], never[]>;
+    getUserBillingAddresses: 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;
+    }[]>;
+    getPrimaryBillingAddress: 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;
+    } | null>;
+    fillBillingAddressFields: (billingAddress: any) => void;
+    handleBillingAddressSelect: (event: Event) => void;
+    updateBillingAddress: (billingfield: any) => void;
+};

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

@@ -0,0 +1,84 @@
+import { ref, computed, onMounted } from "vue";
+import { useCheckoutStore } from "../../stores/Checkout.js";
+import { useCountry } from "../Extras/useCountry.js";
+import { useCompanyProfile } from "../../stores/useCompanyProfile.js";
+import { useAuthStore } from "../../stores/auth.js";
+export default function(inputData) {
+  const checkoutStore = useCheckoutStore();
+  const authStore = useAuthStore();
+  const CountryData = useCountry().data;
+  const States = ref([]);
+  const Countries = ref([]);
+  const getUserBillingAddresses = computed(() => {
+    if (!authStore.user || !authStore.user.addresses) return [];
+    return authStore.user.addresses.filter((address) => address.billing === 1);
+  });
+  const getPrimaryBillingAddress = computed(() => {
+    const billingAddresses = getUserBillingAddresses.value;
+    return billingAddresses.length > 0 ? billingAddresses[0] : null;
+  });
+  const GetStates = async (countryID) => {
+    return States.value;
+  };
+  onMounted(() => {
+    GetStates(inputData.billing_country);
+    if (authStore.isAuthenticated && getPrimaryBillingAddress.value) {
+      const billingAddr = getPrimaryBillingAddress.value;
+      inputData.billing_firstname = billingAddr.firstname || "";
+      inputData.billing_lastname = billingAddr.lastname || "";
+      inputData.billing_fullname = billingAddr.fullname || "";
+      inputData.billing_address = billingAddr.address || "";
+      inputData.billing_suburb = billingAddr.suburb || "";
+      inputData.billing_state = billingAddr.state_id || "";
+      inputData.billing_country = billingAddr.country_id || "";
+      inputData.billing_postcode = billingAddr.postcode || "";
+      inputData.billing_mobile = billingAddr.mobile || "";
+      inputData.billing_address_id = billingAddr.id || "";
+      updateBillingAddress(inputData);
+    }
+  });
+  const ChangeCountry = async (billingfield) => {
+    if (billingfield.billing_country == void 0) {
+      billingfield.billing_country = useCompanyProfile().profile.country_id;
+    }
+    let newstates = await GetStates(billingfield.billing_country);
+    checkoutStore.saveToCheckoutSession(billingfield);
+  };
+  const fillBillingAddressFields = (billingAddress) => {
+    if (!billingAddress) return;
+    inputData.billing_firstname = billingAddress.firstname || "";
+    inputData.billing_lastname = billingAddress.lastname || "";
+    inputData.billing_fullname = billingAddress.fullname || "";
+    inputData.billing_address = billingAddress.address || "";
+    inputData.billing_suburb = billingAddress.suburb || "";
+    inputData.billing_state = billingAddress.state_id || "";
+    inputData.billing_country = billingAddress.country_id || "";
+    inputData.billing_postcode = billingAddress.postcode || "";
+    inputData.billing_mobile = billingAddress.mobile || "";
+    inputData.billing_address_id = billingAddress.id || "";
+    updateBillingAddress(inputData);
+  };
+  const updateBillingAddress = ((billingfield) => {
+    checkoutStore.saveToCheckoutSession(billingfield);
+  });
+  const handleBillingAddressSelect = (event) => {
+    const selectedAddressId = event.target.value;
+    if (selectedAddressId) {
+      const selectedAddress = getUserBillingAddresses.value.find((addr) => addr.id == parseInt(selectedAddressId));
+      if (selectedAddress) {
+        fillBillingAddressFields(selectedAddress);
+      }
+    }
+  };
+  return {
+    checkoutStore,
+    Countries,
+    ChangeCountry,
+    States,
+    getUserBillingAddresses,
+    getPrimaryBillingAddress,
+    fillBillingAddressFields,
+    handleBillingAddressSelect,
+    updateBillingAddress
+  };
+}

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

@@ -0,0 +1,55 @@
+export default function (inputData: any): {
+    checkoutStore: import("pinia").Store<"checkout", import("../../stores/Checkout.js").CheckoutState, {}, {}>;
+    updateShippingAddress: (shippingfield: any) => void;
+    sameAsBilling: (sameasbilling: boolean | undefined, inputData: any) => Promise<void>;
+    UpdateStripe: (inputData: any) => Promise<void>;
+    Countries: import("vue").ComputedRef<any>;
+    ChangeCountry: (shippingfield: any) => Promise<void>;
+    States: import("vue").Ref<never[], never[]>;
+    getUserShippingAddresses: 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;
+    }[]>;
+    getPrimaryShippingAddress: 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;
+    } | null>;
+    passwordShow: import("vue").Ref<string, string>;
+    password: import("vue").Ref<string, string>;
+    password_confirmationShow: import("vue").Ref<string, string>;
+    updateBillingAddress: (billingfield: any) => void;
+    UserAccount: import("vue").Ref<boolean, boolean>;
+    CheckUserAccount: (billingDetails: any, userEmail: string) => Promise<void>;
+    CheckingUserAccount: import("vue").Ref<boolean, boolean>;
+    passwordStrength: import("vue").ComputedRef<"Password must be 8 characters" | "Strong" | "Medium" | "Weak">;
+    passwordStrengthClass: import("vue").ComputedRef<"bg-danger" | "bg-success" | "bg-warning">;
+    passwordStrengthValue: import("vue").ComputedRef<number>;
+    passwordStrengthWidth: import("vue").ComputedRef<string>;
+    passwordStrengthTextColor: import("vue").ComputedRef<"text-danger" | "text-success" | "text-black">;
+};