Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

3 files changed, 16 insertions, 7 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 111117c9..f777a3a8 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -20,6 +20,8 @@ import Image from '@/core/components/elements/Image/Image'
 import MobileView from '@/core/components/views/MobileView'
 import DesktopView from '@/core/components/views/DesktopView'
 import ExpedisiList from '../api/ExpedisiList'
+import whatsappUrl from '@/core/utils/whatsappUrl'
+import { createSlug } from '@/core/utils/slug'
 
 const Checkout = () => {
   const router = useRouter()
@@ -166,8 +168,8 @@ const Checkout = () => {
       quantity: product.quantity
     }))
     let data = {
-      partner_shipping_id: selectedAddress.shipping.id,
-      partner_invoice_id: selectedAddress.invoicing.id,
+      partner_shipping_id: auth.partnerId,
+      partner_invoice_id: auth.partnerId,
       order_line: JSON.stringify(productOrder),
       delivery_amount : biayaKirim,
       type: 'sale_order'
@@ -342,7 +344,7 @@ const Checkout = () => {
           <div className='px-4 mb-4'>
             <span className='text-danger-500'>
               *) Terdapat produk yang belum memiliki harga,{' '}
-              <a href='https://wa.me/628128080622' className='underline'>
+              <a href={whatsappUrl()} className='underline'>
                 Hubungi Kami untuk meminta harga.
               </a>
             </span>
@@ -465,7 +467,13 @@ const Checkout = () => {
                           {product.price.priceDiscount > 0 ? (
                             currencyFormat(product?.price?.priceDiscount * product?.quantity)
                           ) : (
-                            <a href='https://wa.me/628128080622' className='underline'>
+                            <a
+                              href={whatsappUrl('product', {
+                                name: product.name,
+                                url: createSlug('/shop/product/', product.name, product.id, true)
+                              })}
+                              className='underline'
+                            >
                               Call For Price{' '}
                             </a>
                           )}
@@ -562,7 +570,7 @@ const Checkout = () => {
                 <div className='mt-4'>
                   <span className='text-danger-500'>
                     *) Terdapat produk yang belum memiliki harga,{' '}
-                    <a href='https://wa.me/628128080622' className='underline'>
+                    <a href={whatsappUrl()} className='underline'>
                       Hubungi Kami untuk meminta harga.
                     </a>
                   </span>
diff --git a/src/lib/checkout/components/FinishCheckout.jsx b/src/lib/checkout/components/FinishCheckout.jsx
index cd93e3a4..92245e31 100644
--- a/src/lib/checkout/components/FinishCheckout.jsx
+++ b/src/lib/checkout/components/FinishCheckout.jsx
@@ -14,7 +14,7 @@ const FinishCheckout = ({ query }) => {
           <p className='text-caption-2 text-warning-800'>No. Transaksi</p>
         </div>
         <Link
-          href='/my/transactions'
+          href='/my/quotations'
           className='bg-warning-400 text-warning-900 rounded-b-xl py-4 block'
         >
           Lihat detail pembelian Anda disini
diff --git a/src/lib/checkout/email/FinishCheckoutEmail.jsx b/src/lib/checkout/email/FinishCheckoutEmail.jsx
index e8f63afa..d40ce7d4 100644
--- a/src/lib/checkout/email/FinishCheckoutEmail.jsx
+++ b/src/lib/checkout/email/FinishCheckoutEmail.jsx
@@ -1,5 +1,6 @@
 import currencyFormat from '@/core/utils/currencyFormat'
 import toTitleCase from '@/core/utils/toTitleCase'
+import whatsappUrl from '@/core/utils/whatsappUrl'
 import {
   Body,
   Column,
@@ -255,7 +256,7 @@ const FinishCheckoutEmail = ({ transaction, payment, statusPayment }) => {
                 Jika ada pertanyaan seputar teknis pembayaran {transaction.address.customer.name}{' '}
                 dapat hubungi kami melalui Email{' '}
                 <a href='mailto:sales@indoteknik.com'>(sales@indoteknik.com)</a> atau Whatsapp{' '}
-                <a href='https://wa.me/628128080622' target='_blank' rel='noreferrer'>
+                <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
                   (+62 812-8080-622)
                 </a>
                 .