Merge branch 'release' into feature/step_approval

# Conflicts:
#	src-migrate/modules/product-detail/components/PriceAction.tsx
#	src/lib/transaction/components/Transaction.jsx
#	src/pages/index.jsx

7 files changed, 35 insertions, 6 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 314d70ea..6129143d 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -271,7 +271,7 @@ const InformationCenter = () => (
       <li className='text-gray_r-12/80 flex items-center'>
         <DevicePhoneMobileIcon className='w-[18px] mr-2' />
         <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
-          0812-8080-622
+          0817-1718-1922
         </a>
       </li>
     </ul>
@@ -386,7 +386,7 @@ const Payments = () => (
   <div>
     <div className={headerClassName}>Metode Pembayaran</div>
     <NextImage
-      src='/images/footer/payment-method.png'
+      src='/images/footer/payment-method-new.png'
       alt='Metode Pembayaran - Indoteknik'
       width={512}
       height={512}
diff --git a/src/core/components/elements/Footer/SimpleFooter.jsx b/src/core/components/elements/Footer/SimpleFooter.jsx
index 26f7f786..371b1652 100644
--- a/src/core/components/elements/Footer/SimpleFooter.jsx
+++ b/src/core/components/elements/Footer/SimpleFooter.jsx
@@ -22,7 +22,7 @@ const SimpleFooter = () => (
         <li className='text-gray_r-12/80 flex items-center'>
           <DevicePhoneMobileIcon className='w-[18px] mr-2' />
           <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
-            0812-8080-622
+            081717181922
           </a>
         </li>
       </ul>
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index d2f73d2d..308f2623 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -142,7 +142,7 @@ const NavbarDesktop = () => {
               />
               <div>
                 <div className='font-semibold'>Whatsapp</div>
-                0812 8080 622 (Chat)
+                0817 1718 1922 (Chat)
               </div>
             </a>
           </div>
diff --git a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
index 1851ce84..42bdc12a 100644
--- a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
+++ b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
@@ -2,9 +2,11 @@ import { deleteAuth } from '@/core/utils/auth'
 import Link from '../Link/Link'
 import { useRouter } from 'next/router'
 import { signOut, useSession } from 'next-auth/react'
+import useAuth from '@/core/hooks/useAuth'
 
 const NavbarUserDropdown = () => {
   const router = useRouter()
+  const atuh = useAuth()
 
   const logout = async () => {
     deleteAuth().then(() => {
@@ -21,6 +23,9 @@ const NavbarUserDropdown = () => {
         <Link href='/my/invoices'>Invoice & Faktur Pajak</Link>
         <Link href='/my/wishlist'>Wishlist</Link>
         <Link href='/my/address'>Daftar Alamat</Link>
+        {!atuh?.external &&
+          <Link href='/my/recomendation'>Dashboard Recomendation</Link>
+        }
         <button type='button' onClick={logout}>
           Keluar Akun
         </button>
diff --git a/src/core/utils/auth.js b/src/core/utils/auth.js
index a7244747..03b20ae2 100644
--- a/src/core/utils/auth.js
+++ b/src/core/utils/auth.js
@@ -29,7 +29,7 @@ const setAuth = (user) => {
  * @returns {boolean} - Returns `true`.
  */
 const deleteAuth = async() => {
-  // await signOut()
+  await signOut()
   deleteCookie('auth')
   return true
 }
diff --git a/src/core/utils/googleTag.js b/src/core/utils/googleTag.js
index cc6d1283..96a6bd2e 100644
--- a/src/core/utils/googleTag.js
+++ b/src/core/utils/googleTag.js
@@ -33,6 +33,20 @@ const sumTotal = (variants) => {
   }
 }
 
+const mapProducts = (product) => {
+  const res = {
+    item_id: product.id,
+    item_name: product.name,
+    discount: product.lowest_price.price_discount || 0,
+    // index: 0,
+    item_brand: product.manufacture.name,
+    item_category: product.categories,
+    item_variant: product.variants,
+    price: product.lowest_price.price,
+    quantity: product.stock_total
+  }
+  return res
+}
 export const gtagAddToCart = (variant, quantity) => {
   const param = {
     currency: 'IDR',
@@ -77,3 +91,13 @@ export const gtagPurchase = (variants, shipping, transactionId) => {
   }
   gtag('event', 'purchase', param)
 }
+
+export const gtagProductDetail = (product) => {
+  const items = mapProducts(product)
+  const param = {
+    currency: 'IDR',
+    value: product.id,
+    items
+  }
+  gtag('event', 'view_item', param)
+}
\ No newline at end of file
diff --git a/src/core/utils/whatsappUrl.js b/src/core/utils/whatsappUrl.js
index 9a92f424..7a129aa6 100644
--- a/src/core/utils/whatsappUrl.js
+++ b/src/core/utils/whatsappUrl.js
@@ -7,7 +7,7 @@ const whatsappUrl = (template = 'default', payload, urlPath = null) => {
     if(!urlPath) return '/login'
   }
   let parentName = user.parentName ||  '-'
-  let url = 'https://wa.me/628128080622'
+  let url = 'https://wa.me/6281717181922'
   let text = 'Hallo Indoteknik.com,'
   switch (template) {
     case 'product':