From 0dab223d410e1c6011bfb4e1e850dfe566c8d044 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 29 Aug 2023 14:11:23 +0700
Subject: add params etd di checkout

---
 public/images/BOX_DELIVERY_GREEN.svg      | 71 +++++++++++++++++++++++++++++++
 src/lib/checkout/components/Checkout.jsx  | 18 ++++++++
 src/lib/shipment/components/Shipments.jsx |  4 +-
 src/pages/my/menu.jsx                     | 53 ++++++++++++++++++++---
 4 files changed, 137 insertions(+), 9 deletions(-)
 create mode 100644 public/images/BOX_DELIVERY_GREEN.svg

diff --git a/public/images/BOX_DELIVERY_GREEN.svg b/public/images/BOX_DELIVERY_GREEN.svg
new file mode 100644
index 00000000..45ae81c4
--- /dev/null
+++ b/public/images/BOX_DELIVERY_GREEN.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#15803D;}
+</style>
+<g>
+	<path class="st0" d="M60.6,304.1c0.2,4.8-2.9,8.6-7.8,8.9c-4.5,0.3-9.1,0.2-13.6,0c-3.8-0.2-5.8-3-7.8-5.8c0.4-0.1,0.9-0.2,1.2,0.2
+		c5.5,6.9,13.2,4.7,20.2,4.3c4.4-0.2,6.6-3.5,6.4-7.6c-0.2-4-2.9-6.5-7.3-6.8c-3.5-0.2-7.1-0.1-10.7,0c-3,0-5.6,1-7.5,3.4
+		c-0.6,0.7-1.1,1.7-2.4,1.4c2.3-4.5,5.9-6.5,11.1-6.1c3.2,0.3,6.5,0,9.8,0.1C57.1,296.3,60.4,299.6,60.6,304.1z"/>
+	<path class="st0" d="M74.9,251.7c-4.7,0.1-8.6-3.7-8.6-8.5c0-4.7,3.6-8.4,8.2-8.5c4.7-0.1,8.8,3.8,8.8,8.5
+		C83.2,247.6,79.4,251.5,74.9,251.7z"/>
+	<path class="st0" d="M468.4,258.1c0.1,4.7-3.9,8.7-8.6,8.6c-4.8,0-8.6-4-8.4-8.8c0.1-4.6,3.9-8.2,8.6-8.1
+		C464.6,249.8,468.3,253.5,468.4,258.1z"/>
+	<path class="st0" d="M468.5,327.6c-0.3-11.4-0.1-22.8-0.1-34.1c0-5.9-3.4-9.6-8.5-9.5c-5.2,0-8.5,3.6-8.5,9.6
+		c-0.1,9.3-0.2,18.5,0.1,27.7c0.1,3.4-1.1,5-3.9,6.5c-28.8,15.7-57.5,31.5-86.2,47.2c-13,7.2-26.1,14.3-39.6,21.7
+		c-0.1-1.1-0.2-1.5-0.2-2c0-45.5,0-91-0.1-136.5c0-2.6,0.9-3.7,3.1-4.8c5.3-2.7,10.5-5.7,15.7-8.6c7.3-4,14.6-8,21.9-12
+		c1,1.7,0.6,3.1,0.6,4.5c0,9.8,0,19.6,0,29.4c0.1,8.8,6.4,12.5,14.1,8.3c9.5-5.2,18.9-10.5,28.4-15.5c4.2-2.3,6.2-5.3,6.1-10.2
+		c-0.2-12.8,0.1-25.6-0.2-38.4c-0.1-3.7,0.8-5.8,4.3-7.6c10.9-5.6,21.4-11.6,32.2-17.4c1.1-0.6,2-1.7,3.6-1.3v33.6
+		c0,1.6,0,3.1,0,4.7c0.1,5.9,3.4,9.7,8.5,9.7s8.6-3.8,8.6-9.6c0-17.1-0.1-34.1,0.1-51.2c0.1-5.4-2.1-8.7-6.7-11.2
+		c-47.5-26-95-52.1-142.5-78.2c-4.5-2.5-8.3-2.3-12.7,0.2c-20.3,11.3-40.8,22.4-61.1,33.6c-27.3,15-54.7,30.1-82,45
+		c-3.9,2.1-5.9,5.1-5.7,9.6c0.1,4-0.2,8,0.1,11.9c0.2,3.2-0.6,4.3-4.1,4.2c-30.2-0.1-60.3-0.1-90.5-0.1c-1.6,0-3.1-0.1-4.7,0.1
+		c-4.8,0.4-8,4.2-7.7,9c0.3,5,4,8,10.1,8c30.7,0,61.4,0.1,92.2-0.1c4.1,0,4.8,1.2,4.7,4.9c-0.3,7.1-0.3,14.2,0,21.3
+		c0.1,3.6-0.6,4.8-4.5,4.7c-14.5-0.3-29-0.2-43.5-0.1c-6.4,0-10.1,4.2-9.3,9.9c0.7,4.4,4.2,7.1,9.6,7.1c14.6,0,29.3,0.1,43.9-0.1
+		c2.9,0,3.8,0.6,3.8,3.7c-0.2,12.4-0.2,24.7,0,37.1c0,3-0.7,3.8-3.7,3.8C133.1,296,112.1,296,91,296c-2,0-4-0.1-6,0.1
+		c-3.8,0.4-6.9,3.4-7.4,7.2c-0.5,4,1.2,6.9,4.7,8.8c1.8,1,3.8,1,5.8,1c22.1,0,44.1,0,66.1-0.1c2.6,0,3.8,0.5,3.6,3.4
+		c-0.3,3.8,0.1,7.7-0.1,11.5c-0.3,5.3,1.8,8.7,6.6,11.2c47.7,26,95.3,52.2,142.8,78.4c4.2,2.3,7.8,2.4,12,0c9-5.1,18.1-10,27.2-15
+		c38.4-21.1,76.8-42.2,115.3-63.2C466.5,336.8,468.7,333.3,468.5,327.6z M392.5,247c-4,2.1-7.9,4.3-12.6,6.8c0-10.3,0-20,0-29.7
+		c0-1.1,0.7-1.5,1.4-1.9c4.1-2.3,8.2-4.5,13-7.1c0,10.1,0,19.5,0,28.9C394.3,245.5,393.8,246.4,392.5,247z M311.2,99.5
+		c1.4-0.8,2.5-0.8,3.9,0c42,23.1,84,46.2,125.9,69.3c0.2,0.1,0.4,0.4,0.8,0.7c-12.4,6.8-24.7,13.5-36.9,20.3c-2.2,1.2-3.5,0-5-0.8
+		c-28.5-15.6-56.9-31.3-85.4-46.9c-13.3-7.3-26.6-14.6-40.4-22.2C286.9,112.9,299,106.3,311.2,99.5z M254.8,130.5
+		c2-1.2,3.2,0.1,4.6,0.9c30.1,16.5,60.1,33,90.2,49.5c10.9,6,21.9,12,32.8,18c0.8,0.5,1.6,1,3,1.7c-4.6,2.5-8.7,4.7-12.7,7
+		c-2.1,1.2-3.2-0.5-4.6-1.3c-30.3-16.6-60.6-33.3-90.9-49.9c-10.2-5.6-20.4-11.2-30.6-16.8c-1.2-0.7-2.3-1.4-3.9-2.4
+		C247,134.8,251,132.8,254.8,130.5z M304.6,394.5c0,0.5-0.1,1.1-0.2,2.1c-5-2.7-9.7-5.2-14.4-7.8c-37.3-20.5-74.6-41-111.9-61.4
+		c-2.1-1.2-3.4-2.2-3.4-5c0.1-45.4,0.1-90.7,0.1-136.1c0-0.6,0.1-1.1,0.1-1.7c1.2-0.7,1.9,0.3,2.7,0.7c41.3,22.6,82.5,45.3,123.8,68
+		c2,1.1,3.3,2,3.2,4.7C304.5,303.5,304.6,349,304.6,394.5z M314.6,239.4c-1.4,0.7-2.4,0.3-3.6-0.4c-42-23.1-84-46.2-126-69.3
+		c-0.2-0.1-0.3-0.3-0.6-0.7c12.9-7.1,25.7-14,38.4-21.2c2.1-1.2,3.5,0,5,0.9c29.6,16.2,59.2,32.5,88.7,48.8
+		c12.2,6.7,24.3,13.4,37,20.3C340.3,225.3,327.5,232.3,314.6,239.4z"/>
+	<path class="st0" d="M52.9,313c-4.5,0.3-9.1,0.2-13.6,0c-3.8-0.2-5.8-3-7.8-5.8v-5.1c2.3-4.5,5.9-6.5,11.1-6.1
+		c3.2,0.3,6.5,0,9.8,0.1c4.8,0.2,8.1,3.5,8.3,8C60.8,308.9,57.7,312.7,52.9,313z"/>
+	<path class="st0" d="M468.5,327.6c-0.3-11.4-0.1-22.8-0.1-34.1c0-5.9-3.4-9.6-8.5-9.5c-5.2,0-8.5,3.6-8.5,9.6
+		c-0.1,9.3-0.2,18.5,0.1,27.7c0.1,3.4-1.1,5-3.9,6.5c-28.8,15.7-57.5,31.5-86.2,47.2c-13,7.2-26.1,14.3-39.6,21.7
+		c-0.1-1.1-0.2-1.5-0.2-2c0-45.5,0-91-0.1-136.5c0-2.6,0.9-3.7,3.1-4.8c5.3-2.7,10.5-5.7,15.7-8.6c7.3-4,14.6-8,21.9-12
+		c1,1.7,0.6,3.1,0.6,4.5c0,9.8,0,19.6,0,29.4c0.1,8.8,6.4,12.5,14.1,8.3c9.5-5.2,18.9-10.5,28.4-15.5c4.2-2.3,6.2-5.3,6.1-10.2
+		c-0.2-12.8,0.1-25.6-0.2-38.4c-0.1-3.7,0.8-5.8,4.3-7.6c10.9-5.6,21.4-11.6,32.2-17.4c1.1-0.6,2-1.7,3.6-1.3v33.6
+		c0,1.6,0,3.1,0,4.7c0.1,5.9,3.4,9.7,8.5,9.7s8.6-3.8,8.6-9.6c0-17.1-0.1-34.1,0.1-51.2c0.1-5.4-2.1-8.7-6.7-11.2
+		c-47.5-26-95-52.1-142.5-78.2c-4.5-2.5-8.3-2.3-12.7,0.2c-20.3,11.3-40.8,22.4-61.1,33.6c-27.3,15-54.7,30.1-82,45
+		c-3.9,2.1-5.9,5.1-5.7,9.6c0.1,4-0.2,8,0.1,11.9c0.2,3.2-0.6,4.3-4.1,4.2c-30.2-0.1-60.3-0.1-90.5-0.1c-1.6,0-3.1-0.1-4.7,0.1
+		c-4.8,0.4-8,4.2-7.7,9c0.3,5,4,8,10.1,8c30.7,0,61.4,0.1,92.2-0.1c4.1,0,4.8,1.2,4.7,4.9c-0.3,7.1-0.3,14.2,0,21.3
+		c0.1,3.6-0.6,4.8-4.5,4.7c-14.5-0.3-29-0.2-43.5-0.1c-6.4,0-10.1,4.2-9.3,9.9c0.7,4.4,4.2,7.1,9.6,7.1c14.6,0,29.3,0.1,43.9-0.1
+		c2.9,0,3.8,0.6,3.8,3.7c-0.2,12.4-0.2,24.7,0,37.1c0,3-0.7,3.8-3.7,3.8C133.1,296,112.1,296,91,296c-2,0-4-0.1-6,0.1
+		c-3.8,0.4-6.9,3.4-7.4,7.2c-0.5,4,1.2,6.9,4.7,8.8c1.8,1,3.8,1,5.8,1c22.1,0,44.1,0,66.1-0.1c2.6,0,3.8,0.5,3.6,3.4
+		c-0.3,3.8,0.1,7.7-0.1,11.5c-0.3,5.3,1.8,8.7,6.6,11.2c47.7,26,95.3,52.2,142.8,78.4c4.2,2.3,7.8,2.4,12,0c9-5.1,18.1-10,27.2-15
+		c38.4-21.1,76.8-42.2,115.3-63.2C466.5,336.8,468.7,333.3,468.5,327.6z M392.5,247c-4,2.1-7.9,4.3-12.6,6.8c0-10.3,0-20,0-29.7
+		c0-1.1,0.7-1.5,1.4-1.9c4.1-2.3,8.2-4.5,13-7.1c0,10.1,0,19.5,0,28.9C394.3,245.5,393.8,246.4,392.5,247z M311.2,99.5
+		c1.4-0.8,2.5-0.8,3.9,0c42,23.1,84,46.2,125.9,69.3c0.2,0.1,0.4,0.4,0.8,0.7c-12.4,6.8-24.7,13.5-36.9,20.3c-2.2,1.2-3.5,0-5-0.8
+		c-28.5-15.6-56.9-31.3-85.4-46.9c-13.3-7.3-26.6-14.6-40.4-22.2C286.9,112.9,299,106.3,311.2,99.5z M254.8,130.5
+		c2-1.2,3.2,0.1,4.6,0.9c30.1,16.5,60.1,33,90.2,49.5c10.9,6,21.9,12,32.8,18c0.8,0.5,1.6,1,3,1.7c-4.6,2.5-8.7,4.7-12.7,7
+		c-2.1,1.2-3.2-0.5-4.6-1.3c-30.3-16.6-60.6-33.3-90.9-49.9c-10.2-5.6-20.4-11.2-30.6-16.8c-1.2-0.7-2.3-1.4-3.9-2.4
+		C247,134.8,251,132.8,254.8,130.5z M304.6,394.5c0,0.5-0.1,1.1-0.2,2.1c-5-2.7-9.7-5.2-14.4-7.8c-37.3-20.5-74.6-41-111.9-61.4
+		c-2.1-1.2-3.4-2.2-3.4-5c0.1-45.4,0.1-90.7,0.1-136.1c0-0.6,0.1-1.1,0.1-1.7c1.2-0.7,1.9,0.3,2.7,0.7c41.3,22.6,82.5,45.3,123.8,68
+		c2,1.1,3.3,2,3.2,4.7C304.5,303.5,304.6,349,304.6,394.5z M314.6,239.4c-1.4,0.7-2.4,0.3-3.6-0.4c-42-23.1-84-46.2-126-69.3
+		c-0.2-0.1-0.3-0.3-0.6-0.7c12.9-7.1,25.7-14,38.4-21.2c2.1-1.2,3.5,0,5,0.9c29.6,16.2,59.2,32.5,88.7,48.8
+		c12.2,6.7,24.3,13.4,37,20.3C340.3,225.3,327.5,232.3,314.6,239.4z"/>
+	<path class="st0" d="M83.3,243.1c0,4.5-3.8,8.4-8.3,8.5c-4.7,0.1-8.6-3.7-8.6-8.5c0-4.7,3.6-8.4,8.2-8.5
+		C79.2,234.6,83.3,238.5,83.3,243.1z"/>
+	<path class="st0" d="M468.4,258.1c0.1,4.7-3.9,8.7-8.6,8.6c-4.8,0-8.6-4-8.4-8.8c0.1-4.6,3.9-8.2,8.6-8.1
+		C464.6,249.8,468.3,253.5,468.4,258.1z"/>
+</g>
+</svg>
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index afb94c10..0eb05345 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -297,10 +297,12 @@ const Checkout = () => {
       order_line: JSON.stringify(productOrder),
       delivery_amount: biayaKirim,
       carrier_id: selectedCarrierId,
+      estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
       voucher: activeVoucher,
       type: 'sale_order'
     }
+
     if (query) {
       data.source = 'buy'
     }
@@ -1444,6 +1446,22 @@ function calculateEstimatedArrival(duration) {
   return ''
 }
 
+function splitDuration(duration){
+  if (duration) {
+    let estimationDate = null
+    if (duration.includes('-')){
+      estimationDate = duration.split('-')
+      estimationDate = parseInt(estimationDate[1])
+    }else{
+      estimationDate = parseInt(duration)
+    }
+
+    return estimationDate
+  }
+
+  return ''
+}
+
 const extractDuration = (text) => {
   const matches = text.match(/\d+(?:-\d+)?/g)
 
diff --git a/src/lib/shipment/components/Shipments.jsx b/src/lib/shipment/components/Shipments.jsx
index d62afcb7..c9d3e627 100644
--- a/src/lib/shipment/components/Shipments.jsx
+++ b/src/lib/shipment/components/Shipments.jsx
@@ -144,8 +144,8 @@ const Shipments = () => {
                 onClick={() => setIdAWB(shipment.id)}
                 className='flex items-center mt-1 gap-x-1 min-w-full'
               >
-                <ImageNext src={`/images/BOX_DELIVER_(1).svg`} width={20} height={20} />
-                <p className='text-sm text-green-600 truncate'>
+                <ImageNext src={`/images/BOX_DELIVERY_GREEN.svg`} width={20} height={20} />
+                <p className='text-sm text-green-700 truncate'>
                   {shipment.lastManifest.description}
                 </p>
                 <p className='ml-auto'>{'>'}</p>
diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx
index 8d209fba..124c87c9 100644
--- a/src/pages/my/menu.jsx
+++ b/src/pages/my/menu.jsx
@@ -6,6 +6,7 @@ import { deleteAuth } from '@/core/utils/auth'
 import IsAuth from '@/lib/auth/components/IsAuth'
 import { ChevronRightIcon, UserIcon } from '@heroicons/react/24/solid'
 import { useRouter } from 'next/router'
+import ImageNext from 'next/image'
 
 export default function Menu() {
   const auth = useAuth()
@@ -40,11 +41,38 @@ export default function Menu() {
             <MenuHeader>Aktivitas Pembelian</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/my/quotations'>Daftar Quotation</LinkItem>
-              <LinkItem href='/my/transactions'>Daftar Transaksi</LinkItem>
-              <LinkItem href='/my/shipments'>Daftar Pengiriman</LinkItem>
-              <LinkItem href='/my/invoices'>Invoice & Faktur Pajak</LinkItem>
-              <LinkItem href='/my/wishlist'>Wishlist</LinkItem>
+              <LinkItem href='/my/quotations'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_quotation.svg' width={18} height={20} />
+                  <p>Daftar Quotation</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/transactions'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_transaksi.svg' width={18} height={20} />
+                  <p>Daftar Transaksi</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/shipments'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_pengiriman.svg' width={18} height={20} />
+                  <p>Daftar Pengiriman</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/invoices'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_invoice.svg' width={18} height={20} />
+                  <p>Invoice & Faktur Pajak</p>
+                </div>
+              </LinkItem>
+              <LinkItem href='/my/wishlist'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_wishlist.svg' width={18} height={20} />
+                  <p>Wishlist</p>
+                </div>
+              </LinkItem>
             </div>
           </div>
 
@@ -52,7 +80,13 @@ export default function Menu() {
             <MenuHeader>Pusat Bantuan</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/'>Layanan Pelanggan</LinkItem>
+              <LinkItem href='/'>
+                {' '}
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_layanan_pelanggan.svg' width={18} height={20} />
+                  <p>Layanan Pelanggan</p>
+                </div>
+              </LinkItem>
             </div>
           </div>
 
@@ -60,7 +94,12 @@ export default function Menu() {
             <MenuHeader>Pengaturan Akun</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/my/address'>Daftar Alamat</LinkItem>
+              <LinkItem href='/my/address'>
+                <div className='flex gap-x-3 items-center'>
+                  <ImageNext src='/images/icon/icon_daftar_alamat.svg' width={18} height={20} />
+                  <p>Daftar Alamat</p>
+                </div>
+              </LinkItem>
             </div>
 
             <div onClick={logout} className='p-4 mt-2'>
-- 
cgit v1.2.3