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

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

@@ -1,24 +1,40 @@
 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 } from "../../composables/useDataLayer.js";
+import { META_begin_checkout, META_add_shipping_info } from "../../composables/useMetaLayer.js";
+import { TikTok_begin_checkout } 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";
+let checkoutEventsFired = false;
+let shippingInfoFired = false;
 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);
   const isCustomer = ref(false);
   const countries = useCountry().data;
   const ipLocation = ref();
+  const AllCheckoutErrors = ref({});
   const cartData = computed(() => {
     const cartItems = checkoutStore.config;
     return cartItems;
   });
+  const quote_number = computed(() => route.query?.quote_number || "");
+  const quote_expires = computed(() => route.query?.expires || "");
+  const quote_signature = computed(() => route.query?.signature || "");
   const abndToken = cartStore.cart.abndToken;
   const vouchercode = cartStore.cart.code;
   const sessiondata = computed(() => checkoutStore.checkoutSession);
@@ -26,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 : "",
@@ -74,15 +91,19 @@ export default function() {
     till_expiryyear: "",
     save_card_details: 0
   });
+  if (quote_number.value != "" && quote_expires.value != "" && quote_signature.value != "") {
+    inputData.value.quote_number = quote_number.value || "";
+    inputData.value.expires = quote_expires.value || "";
+    inputData.value.signature = quote_signature.value || "";
+  }
   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) {
@@ -96,15 +117,6 @@ export default function() {
           inputData.value.billing_mobile = inputData.value.billing_mobile ? inputData.value.billing_mobile : billingAddres.mobile;
         }
         if (shippingAddres != void 0) {
-          inputData.value.shipping_fullname = "";
-          inputData.value.shipping_firstname = "";
-          inputData.value.shipping_lastname = "";
-          inputData.value.shipping_address = "";
-          inputData.value.shipping_postcode = "";
-          inputData.value.shipping_state = "";
-          inputData.value.shipping_country = "";
-          inputData.value.shipping_suburb = "";
-          inputData.value.shipping_mobile = "";
           inputData.value.shipping_fullname = shippingAddres.fullname;
           inputData.value.shipping_firstname = shippingAddres.firstname;
           inputData.value.shipping_lastname = shippingAddres.lastname;
@@ -116,7 +128,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 : "";
@@ -126,25 +138,48 @@ export default function() {
       inputData.value.shipping_suburb = inputData.value.billing_suburb ? inputData.value.billing_suburb : "";
       inputData.value.shipping_mobile = inputData.value.billing_mobile ? inputData.value.billing_mobile : "";
     } else {
-      inputData.value.shipping_fullname = "";
-      inputData.value.shipping_firstname = "";
-      inputData.value.shipping_lastname = "";
-      inputData.value.shipping_address = "";
-      inputData.value.shipping_postcode = "";
-      inputData.value.shipping_state = "";
-      inputData.value.shipping_country = "";
-      inputData.value.shipping_suburb = "";
-      inputData.value.shipping_mobile = "";
     }
     checkoutStore.saveToCheckoutSession(inputData.value);
   });
   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 quotationData = checkoutStore.config?.quotation || {};
+    if (Object.keys(quotationData).length > 0) {
+      inputData.value.email = quotationData.email;
+    }
     let deliverymethods = checkoutStore.config.preferences;
     let deliverymethod = false;
+    let delivery_method = deliverymethods?.filter((method) => method.selected == true)[0];
+    if (delivery_method && !shippingInfoFired) {
+      shippingInfoFired = true;
+      if (delivery_method.id == 1) {
+        if (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 && !checkoutEventsFired) {
+      checkoutEventsFired = true;
+      GTM_begin_checkout(cartStore?.cart);
+      META_begin_checkout(cartStore?.cart);
+      TikTok_begin_checkout(cartStore?.cart);
+    }
   });
   const totalPrice = computed(() => {
     return checkoutStore.config ? checkoutStore.config?.calculations?.total : 0;
@@ -162,11 +197,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 +247,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 +284,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 +299,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,27 +310,34 @@ 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") {
+              AllCheckoutErrors.value = error2;
               showMessage(error2.message);
-            } else {
             }
           } else {
+            AllCheckoutErrors.value = error;
             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;
+          window.location.href = url;
         } else {
+          window.location.href = url_success;
         }
         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();
@@ -330,6 +370,27 @@ export default function() {
   const CreateAccount = defineAsyncComponent(
     () => import("@/components/Checkout/Template01/CreateAccount.vue")
   );
+  const fireShippingInfoEvent = () => {
+    const shippingmethods = checkoutStore.config?.shippingmethods;
+    const selectedShippingMethod = shippingmethods?.find((method) => method.selected == true);
+    let deliverymethods = checkoutStore.config?.preferences;
+    let delivery_method = deliverymethods?.find((method) => method.selected == true);
+    if (delivery_method?.id == 2) {
+      const clickCollectMethod = {
+        "id": 0,
+        "title": "Click and Collect",
+        "details": "",
+        "available": 1,
+        "price": 0,
+        "selected": true
+      };
+      GTM_add_shipping_info(cartStore?.cart, clickCollectMethod);
+      META_add_shipping_info(cartStore?.cart, clickCollectMethod);
+    } else if (selectedShippingMethod && cartStore?.cart) {
+      GTM_add_shipping_info(cartStore.cart, selectedShippingMethod);
+      META_add_shipping_info(cartStore.cart, selectedShippingMethod);
+    }
+  };
   return {
     router,
     route,
@@ -361,6 +422,9 @@ export default function() {
     step1Valid,
     step2Valid,
     PaymentMethods,
-    ipLocation
+    ipLocation,
+    isAuthenticated,
+    fireShippingInfoEvent,
+    AllCheckoutErrors
   };
 }

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">;
+};