Ivan test

components-atomic/MetaHead.js

@@ -1,8 +1,8 @@
-import useWebInstance from "grandus-lib/hooks/useWebInstance";
-import { getDevMeta, getDocumentInitialProps } from "grandus-lib/utils";
-import TagManager from "grandus-lib/utils/gtag";
-import FBPixel from "grandus-lib/utils/fbpixel";
-import Analytics from "grandus-lib/utils/analytics";
+import useWebInstance from 'grandus-lib/hooks/useWebInstance';
+import { getDevMeta, getDocumentInitialProps } from 'grandus-lib/utils';
+import TagManager from 'grandus-lib/utils/gtag';
+import FBPixel from 'grandus-lib/utils/fbpixel';
+import Analytics from 'grandus-lib/utils/analytics';
 
 const MetaHead = ({ children }) => {
   const { webInstance } = useWebInstance();
@@ -21,7 +21,7 @@ const MetaHead = ({ children }) => {
     <>
       <meta
         name="viewport"
-        content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+        content="width=device-width, initial-scale=1, maximum-scale=5"
       />
       {getDevMeta()}
       {process.env.NEXT_PUBLIC_IMAGE_HOST ? (
@@ -30,9 +30,9 @@ const MetaHead = ({ children }) => {
           <link rel="preconnect" href={process.env.NEXT_PUBLIC_IMAGE_HOST} />
         </>
       ) : (
-        ""
+        ''
       )}
-      <link rel="icon" href={favicon || "/favicon.ico"} />
+      <link rel="icon" href={favicon || '/favicon.ico'} />
       {Analytics.init(googleAnalyticsCode)}
       {TagManager.init(googleTagManagerCode)}
       {FBPixel.init(fbPixelCode)}
@@ -46,7 +46,7 @@ const MetaHead = ({ children }) => {
           }}
         />
       ) : (
-        ""
+        ''
       )}
     </>
   );

components/v2/delivery/provider/providers/packetery.js

@@ -48,6 +48,17 @@ const Packetery = ({ errors, delivery, onSelect }) => {
     return null;
   }
 
+  let packetaOptions = {
+    language: "sk",
+    country: "sk",
+  };
+
+  try {
+    packetaOptions = JSON.parse(get(settings, "packetery_widget_settings"));
+  } catch (e) {
+    // do nothing
+  }
+
   const handlePickupPointSelection = async (selected) => {
     let pickupPointId = get(selected, "id") || null;
     if (get(selected, 'pickupPointId') === PICKUP_POINT_TYPE_EXTERNAL) {
@@ -93,8 +104,7 @@ const Packetery = ({ errors, delivery, onSelect }) => {
   const showModal = () => {
     Packeta.Widget.pick(apiKey, handlePickupPointSelection, {
       apiKey,
-      language: "sk",
-      country: "sk",
+      ...packetaOptions
     });
   };
 

hooks/useUser.js

@@ -80,16 +80,23 @@ export default function useUser({
   const createUser = async (values, callback) => {
     setIsLoading(true);
     try {
+      const userData = {
+        name: get(values, "user.firstname"),
+        surname: get(values, "user.surname"),
+        email: get(values, "user.email"),
+        phone: get(values, "user.phone", ""),
+        password: get(values, "user.password"),
+        passwordRepeat: get(values, "user.passwordRepeat"),
+      }
+
+      if (get(values, "user.params")) {
+        userData.params = get(values, "user.params");
+      }
+
       const reqBody = {
-        user: {
-          name: get(values, "user.firstname"),
-          surname: get(values, "user.surname"),
-          email: get(values, "user.email"),
-          phone: get(values, "user.phone", ""),
-          password: get(values, "user.password"),
-          passwordRepeat: get(values, "user.passwordRepeat"),
-        },
+        user: userData,
       };
+
       if (get(values, "cart.accessToken")) {
         reqBody.cart = { accessToken: get(values, "cart.accessToken") };
       }

pages/cart/step1.default.js

@@ -7,7 +7,7 @@ import {
 } from "@ant-design/icons";
 import useCart from "grandus-lib/hooks/useCart";
 import useWebInstance from "grandus-lib/hooks/useWebInstance";
-import { get, find, toNumber, isEmpty } from "lodash";
+import { get, find, toNumber, isEmpty, first } from "lodash";
 import EnhancedEcommerce from "grandus-lib/utils/ecommerce";
 import TagManager from "grandus-lib/utils/gtag";
 
@@ -19,6 +19,7 @@ import Isic from "components/cart/Isic";
 import Steps from "components/cart/steps/CartSteps";
 import Link from "next/link";
 import CartSummary from "components/cart/summary/CartSummary";
+import {formatCart, formatedVariant, formatItem, formatProduct} from "grandus-lib/utils/helperFunctions";
 
 import { Table, InputNumber, Button, Row, Col, Result, Typography } from "antd";
 
@@ -54,10 +55,17 @@ export const ItemCountInput = ({
               Math.abs(itemsDifference)
             )
           );
+          TagManager.push(
+            EnhancedEcommerce.remove_from_cart(formatItem(item)),
+            Math.abs(itemsDifference)
+          );
         } else if (itemsDifference > 0) {
           TagManager.push(
             EnhancedEcommerce.cartAdd(item?.product, Math.abs(itemsDifference))
           );
+          TagManager.push(
+            EnhancedEcommerce.add_to_cart(formatProduct(item?.product),
+            formatedVariant(first(item?.product.store)?.name), Math.abs(itemsDifference)));
         }
       }
       setInternalLoading(false);
@@ -130,6 +138,9 @@ const ItemRemove = ({ item, itemRemove, setLoading, style = {} }) => {
           TagManager.push(
             EnhancedEcommerce.cartRemove(item?.product, get(item, "count", 1))
           );
+          TagManager.push(
+            EnhancedEcommerce.remove_from_cart(formatItem(item)), item?.count
+          );
           setLoading(false);
         });
       }}
@@ -147,8 +158,11 @@ const Cart = ({ inputCountRender, allowCoupons = true }) => {
   const isProcessing = isLoading || loading;
 
   useEffect(() => {
-    TagManager.push(EnhancedEcommerce.checkout(get(cart, "items", []), 1));
-  }, []);
+    if(cart){
+      TagManager.push(EnhancedEcommerce.checkout(get(cart, "items", []), 1));
+      TagManager.push(EnhancedEcommerce.view_cart(formatCart(cart)));
+    }
+  }, [cart]);
 
   if (isEmpty(get(cart, "items", [])) && isProcessing) {
     return (

pages/cart/step2.default.js

@@ -45,6 +45,7 @@ import {
   STREET_REGEX,
 } from "grandus-lib/constants/ValidatorConstants";
 import { useState, useRef, useEffect } from "react";
+import {formatCart} from "grandus-lib/utils/helperFunctions";
 const { Option } = Select;
 
 const authSectionContentList = {
@@ -372,6 +373,7 @@ const CartContact = (props) => {
   };
   useEffect(() => {
     TagManager.push(EnhancedEcommerce.checkout(cart, 2));
+    TagManager.push(EnhancedEcommerce.begin_checkout(formatCart(cart)));
   }, []);
 
   if (isEmpty(get(cart, "items", [])) && isLoading) {