diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/checkout/components/SectionExpedition.jsx | 2 | ||||
| -rw-r--r-- | src/lib/checkout/components/SectionQuotationExpedition.jsx | 369 | ||||
| -rw-r--r-- | src/lib/checkout/stores/stateQuotation.js | 30 | ||||
| -rw-r--r-- | src/lib/pengajuan-tempo/component/PengajuanTempo.jsx | 250 | ||||
| -rw-r--r-- | src/lib/quotation/components/Quotation.jsx | 390 | ||||
| -rw-r--r-- | src/lib/transaction/components/Transactions.jsx | 17 |
6 files changed, 729 insertions, 329 deletions
diff --git a/src/lib/checkout/components/SectionExpedition.jsx b/src/lib/checkout/components/SectionExpedition.jsx index 3cb321c7..2e92ffbc 100644 --- a/src/lib/checkout/components/SectionExpedition.jsx +++ b/src/lib/checkout/components/SectionExpedition.jsx @@ -407,7 +407,7 @@ export default function SectionExpedition({ products }) { </div> {checkoutValidation && ( <span className='text-sm text-red-500'> - *silahkan pilih expedisi + *Silahkan pilih expedisi </span> )} </div> diff --git a/src/lib/checkout/components/SectionQuotationExpedition.jsx b/src/lib/checkout/components/SectionQuotationExpedition.jsx new file mode 100644 index 00000000..b8ea04ef --- /dev/null +++ b/src/lib/checkout/components/SectionQuotationExpedition.jsx @@ -0,0 +1,369 @@ +'use client'; + +import { Skeleton } from '@chakra-ui/react'; +import axios from 'axios'; +import Image from 'next/image'; +import React, { useEffect, useState } from 'react'; +import { useQuery } from 'react-query'; +import toast from 'react-hot-toast'; +import { useAddress } from '../stores/useAdress'; +import { useQuotation } from '../stores/stateQuotation'; + +import currencyFormat from '@/core/utils/currencyFormat'; +import { formatShipmentRange } from '../utils/functionCheckouit'; +import odooApi from '@/core/api/odooApi'; + +function mappingItems(products) { + return products?.map((item) => ({ + name: item?.name, + description: `${item.code} - ${item.name}`, + value: item.price.priceDiscount, + weight: item.weight * 1000, + quantity: item.quantity, + })); +} + +function reverseMappingCourier(couriersOdoo, couriers, includeInstant = false) { + const courierMap = couriers.reduce((acc, item) => { + const { courier_name, courier_code, courier_service_code } = item; + const key = courier_code.toLowerCase(); + + if ( + !includeInstant && + (['hours'].includes(item.shipment_duration_unit.toLowerCase()) || + item.service_type === 'same_day') + ) { + return acc; + } + + if (!acc[key]) { + acc[key] = { + courier_name: item.courier_name, + courier_code: courier_code, + service_type: {}, + }; + } + + acc[key].service_type[courier_service_code] = { + service_name: item.courier_service_name, + duration: item.duration, + shipment_range: item.shipment_duration_range, + shipment_unit: item.shipment_duration_unit, + price: item.price, + service_type: courier_service_code, + description: item.description, + }; + + return acc; + }, {}); + + return couriersOdoo.map((courierOdoo) => { + const courierNameKey = courierOdoo.label.toLowerCase(); + const carrierId = courierOdoo.carrierId; + + const mappedCourier = courierMap[courierNameKey] || false; + + if (!mappedCourier) { + return { + ...courierOdoo, + courier: false, + }; + } + + return { + ...courierOdoo, + courier: { + ...mappedCourier, + courier_id_odoo: carrierId, + }, + }; + }); +} + +export default function SectionExpeditionQuotation({ products }) { + const { addressMaps, coordinate, postalCode } = useAddress(); + const [serviceOptions, setServiceOptions] = useState([]); + const [isOpen, setIsOpen] = useState(false); + const [onFocusSelectedCourier, setOnFocuseSelectedCourier] = useState(false); + const [couriers, setCouriers] = useState(null); + const [slaProducts, setSlaProducts] = useState(null); + const [savedServiceOptions, setSavedServiceOptions] = useState([]); + + const { + checkWeigth, + checkoutValidation, + setBiayaKirim, + setUnit, + setEtd, + selectedCourier, + setSelectedCourier, + selectedService, + setSelectedService, + listExpedisi, + productSla, + setProductSla, + setSelectedCourierId, + } = useQuotation(); + + let destination = {}; + let items = mappingItems(products); + + if (addressMaps) { + destination = { + origin_latitude: -6.3031123, + origin_longitude: 106.7794934999, + ...coordinate, + }; + } else if (postalCode) { + destination = { + origin_postal_code: 14440, + destination_postal_code: postalCode, + }; + } + + const fetchSlaProducts = async () => { + try { + let productsMapped = products.map((item) => ({ + id: item.id, + quantity: item.quantity, + })); + + let data = { + products: JSON.stringify(productsMapped), + }; + const res = await odooApi('POST', `/api/v1/product/variants/sla`, data); + setSlaProducts(res); + } catch (error) { + console.error('Failed to fetch SLA:', error); + } + }; + + useEffect(() => { + fetchSlaProducts(); + }, []); + + useEffect(() => { + if (slaProducts) { + let productSla = slaProducts?.slaTotal; + if (slaProducts.slaUnit === 'jam') { + productSla = 1; + } + setProductSla(productSla); + } + }, [slaProducts]); + + const fetchExpedition = async () => { + const body = { + ...destination, + couriers: + 'gojek,grab,deliveree,lalamove,jne,tiki,ninja,lion,rara,sicepat,jnt,pos,idexpress,rpx,wahana,jdl,pos,anteraja,sap,paxel,borzo', + items, + }; + const response = await axios.get(`/api/biteship-service`, { + params: { body: JSON.stringify(body) }, + }); + return response; + }; + + const { data, isLoading } = useQuery( + ['expedition', JSON.stringify(destination), JSON.stringify(items)], + fetchExpedition, + { + enabled: + Boolean(Object.keys(destination).length) && + items?.length > 0 && + !checkWeigth && + onFocusSelectedCourier, + staleTime: Infinity, + cacheTime: Infinity, + } + ); + + useEffect(() => { + const instant = slaProducts?.includeInstant || false; + if (data) { + const couriers = reverseMappingCourier( + listExpedisi, + data?.data?.pricing, + instant + ); + setCouriers(couriers); + } + }, [data, slaProducts]); + + const onCourierChange = (courier) => { + setIsOpen(false); + setOnFocuseSelectedCourier(false); + setSelectedService(null); + setBiayaKirim(0); + if (courier !== 0 && courier !== 32) { + if (courier.courier) { + setSelectedCourier(courier.courier.courier_code); + setSelectedCourierId(courier.carrierId); + setServiceOptions(Object.values(courier.courier.service_type)); + } else { + if ( + (courier.label === 'GRAB' || courier.label === 'GOJEK') && + !addressMaps + ) { + toast.error( + `Maaf, layanan kurir ${courier.label} tidak tersedia karena belum mengatur PinPoint.` + ); + } else { + toast.error('Maaf, layanan tidak tersedia. Mohon pilih ekspedisi lain.'); + } + setServiceOptions([]); + } + } else { + setSelectedCourier(courier === 32 ? 'SELF PICKUP' : null); + setSelectedCourierId(courier); + setServiceOptions([]); + } + }; + + const handleSelect = (service) => { + setSelectedService(service); + setBiayaKirim(service?.price); + setEtd(service?.shipment_range); + setUnit(service?.shipment_unit); + setIsOpen(false); + }; + + useEffect(() => { + if (serviceOptions.length > 0) { + setSavedServiceOptions(serviceOptions); + } + }, [serviceOptions]); + + return ( + <div className='px-4 py-2'> + <div className='flex justify-between items-center'> + <div className='font-medium'>Pilih Ekspedisi: </div> + <div className='w-[350px]'> + <div + className='w-full p-2 border rounded-lg bg-white cursor-pointer' + onClick={() => setOnFocuseSelectedCourier(!onFocusSelectedCourier)} + > + {selectedCourier ? ( + <div className='flex justify-between'> + <span>{selectedCourier}</span> + </div> + ) : ( + <span className='text-gray-500'>Pilih Expedisi</span> + )} + </div> + {onFocusSelectedCourier && ( + <div className='absolute bg-white border rounded-lg mt-1 shadow-lg z-10 max-h-[200px] overflow-y-auto w-[350px]'> + {!isLoading ? ( + <> + <div + key={32} + onClick={() => onCourierChange(32)} + className='p-2 hover:bg-gray-100 cursor-pointer' + > + <p className='font-semibold'>SELF PICKUP</p> + </div> + {couriers?.map((courier) => ( + <div + key={courier?.courier?.courier_code} + onClick={() => onCourierChange(courier)} + className='flex justify-between p-2 items-center hover:bg-gray-100 cursor-pointer' + > + <p className='font-semibold'>{courier?.label}</p> + <Image + src={courier?.logo} + alt={courier?.courier?.courier_name} + width={50} + height={50} + /> + </div> + ))} + </> + ) : ( + <> + <Skeleton height={40} /> + <Skeleton height={40} /> + </> + )} + </div> + )} + {checkoutValidation && ( + <span className='text-sm text-red-500'> + *Silahkan pilih ekspedisi + </span> + )} + </div> + </div> + + {checkWeigth && ( + <p className='mt-4 text-gray-600'> + Mohon maaf, pengiriman hanya tersedia untuk self pickup karena ada barang + yang belum memiliki berat. Silakan hubungi admin via{' '} + <a + className='text-blue-600 underline' + href='https://api.whatsapp.com/send?phone=6281717181922' + target='_blank' + rel='noopener noreferrer' + > + tautan ini + </a> + </p> + )} + + {(serviceOptions.length > 0 || selectedService) && + selectedCourier && + selectedCourier !== 32 && + selectedCourier !== 0 && ( + <div className='mt-4 flex justify-between'> + <div className='font-medium mb-2'>Tipe Layanan Ekspedisi:</div> + <div className='relative w-[350px]'> + <div + className='p-2 border rounded-lg bg-white cursor-pointer' + onClick={() => setIsOpen(!isOpen)} + > + {selectedService ? ( + <div className='flex justify-between'> + <span>{selectedService.service_name}</span> + <span> + {currencyFormat( + Math.round((selectedService?.price * 1.1) / 1000) * 1000 + )} + </span> + </div> + ) : ( + <span className='text-gray-500'>Pilih layanan pengiriman</span> + )} + </div> + {isOpen && ( + <div className='absolute bg-white border rounded-lg mt-1 shadow-lg z-10 w-full'> + {serviceOptions.map((service) => ( + <div + key={service.service_type} + onClick={() => handleSelect(service)} + className='flex justify-between p-2 items-center hover:bg-gray-100 cursor-pointer' + > + <div> + <p className='font-semibold'>{service.service_name}</p> + <p className='text-sm text-gray-600'> + {formatShipmentRange( + service.shipment_range, + service.shipment_unit, + productSla + )} + </p> + </div> + <span> + {currencyFormat( + Math.round((service?.price * 1.1) / 1000) * 1000 + )} + </span> + </div> + ))} + </div> + )} + </div> + </div> + )} + </div> + ); +} diff --git a/src/lib/checkout/stores/stateQuotation.js b/src/lib/checkout/stores/stateQuotation.js new file mode 100644 index 00000000..da84997a --- /dev/null +++ b/src/lib/checkout/stores/stateQuotation.js @@ -0,0 +1,30 @@ +import { create } from "zustand"; + +export const useQuotation = create((set) => ({ + products : null, + checkWeigth : false, + hasFlashSale : false, + checkoutValidation : false, + biayaKirim : 0, + etd : null, + unit : null, + selectedCourier : null, + selectedCourierId : null, + selectedService : null, + listExpedisi : [], + productSla : null, + setCheckWeight : (checkWeigth) => set({ checkWeigth }), + setHasFlashSale : (hasFlashSale) => set({ hasFlashSale }), + setCheckoutValidation : (checkoutValidation) => set({ checkoutValidation }), + setBiayaKirim : (biayaKirim) => set({ biayaKirim }), + setProducts : (products) => set({ products }), + setEtd : (etd) => set({ etd }), + setUnit : (unit) => set({ unit }), + setSelectedCourier : (selectedCourier) => set({ selectedCourier }), + setSelectedService : (selectedService) => set({ selectedService }), + setSelectedCourierId : (selectedCourierId) => set({ selectedCourierId }), + setExpedisi : (listExpedisi) => set({ listExpedisi }), + setProductSla : (productSla) => set({ productSla }) + + +}))
\ No newline at end of file diff --git a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx index d59bfd75..ae3d97fd 100644 --- a/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx +++ b/src/lib/pengajuan-tempo/component/PengajuanTempo.jsx @@ -38,7 +38,7 @@ const PengajuanTempo = () => { const [bigData, setBigData] = useState(); const [idTempo, setIdTempo] = useState(0); const { form, errors, validate, updateForm } = usePengajuanTempoStore(); - const { control, watch, setValue } = useForm(); + const { control, watch, setValue, setError } = useForm(); const auth = useAuth(); const router = useRouter(); const [BannerTempo, setBannerTempo] = useState(); @@ -426,111 +426,185 @@ const PengajuanTempo = () => { } }; - const handleDaftarTempo = async () => { - for (const error of stepDivsError) { - if (error.length > 0) { - return; +const handleDaftarTempo = async () => { +const phones = [ + { key: 'mobile', label: 'No. HP Perusahaan', value: form.mobile?.trim() }, + { + key: 'direkturMobile', + label: 'No. HP Direktur', + value: formKontakPerson.direkturMobile?.trim(), + }, + { + key: 'purchasingMobile', + label: 'No. HP Purchasing', + value: formKontakPerson.purchasingMobile?.trim(), + }, + { + key: 'financeMobile', + label: 'No. HP Finance', + value: formKontakPerson.financeMobile?.trim(), + }, + { + key: 'PICBarangMobile', + label: 'No. HP PIC Barang', + value: formPengiriman.PICBarangMobile?.trim(), + }, + { + key: 'invoicePicMobile', + label: 'No. HP PIC Invoice', + value: formPengiriman.invoicePicMobile?.trim(), + }, +].filter((p) => p.value); + + + const seen = new Map(); + let firstErrorField = null; + + // Reset error manual + phones.forEach((p) => setError(p.key, { type: 'manual', message: '' })); + + for (const phone of phones) { + if (!seen.has(phone.value)) { + seen.set(phone.value, phone); + } else { + const first = seen.get(phone.value); + + // Tampilkan toast + toast.error(`${phone.label} tidak boleh sama dengan ${first.label}`); + + // Error merah di bawah input + setError(phone.key, { + type: 'manual', + message: `${phone.label} tidak boleh sama dengan ${first.label}`, + }); + + // Pasangan pertama yang duplikat + setError(first.key, { + type: 'manual', + message: `${first.label} tidak boleh sama dengan ${phone.label}`, + }); + + if (!firstErrorField) { + firstErrorField = phone.key; } } + } + + if (firstErrorField) { + setTimeout(() => { + const el = document.querySelector(`[name="${firstErrorField}"]`); + if (el) { + el.scrollIntoView({ behavior: 'smooth', block: 'center' }); + el.focus(); + } + }, 100); + return; + } - // Filter hanya dokumen dengan `format` yang tidak undefined - const formattedDokumen = Object.entries(formDokumen) - .filter(([_, doc]) => doc.format !== undefined) // Hanya dokumen dengan `format` tidak undefined - .map(([key, doc]) => ({ - documentName: key, - details: { - name: doc.name, - format: doc.format, - base64: doc.base64, - }, - })); + for (const error of stepDivsError) { + if (error.length > 0) { + return; + } + } + + const formattedDokumen = Object.entries(formDokumen) + .filter(([_, doc]) => doc.format !== undefined) + .map(([key, doc]) => ({ + documentName: key, + details: { + name: doc.name, + format: doc.format, + base64: doc.base64, + }, + })); - const toastId = toast.loading('Mengirimkan formulir pengajuan tempo...'); - setIsLoading(true); - try { - let address4; - let address3; - const address = await createPengajuanTempoApi({ - id: 0, + const toastId = toast.loading('Mengirimkan formulir pengajuan tempo...'); + setIsLoading(true); + + try { + let address4; + let address3; + const address = await createPengajuanTempoApi({ + id: 0, + partner_id: auth.partnerId, + user_id: auth.parentId ? auth.parentId : auth.partnerId, + tempo_request: false, + ...form, + }); + + if (address.id) { + const address2 = await createPengajuanTempoApi({ + id: address.id, partner_id: auth.partnerId, - user_id: auth.parentId ? auth.parentId : auth.partnerId, + user_id: address.userId, tempo_request: false, - ...form, + ...formKontakPerson, }); - if (address.id) { - const address2 = await createPengajuanTempoApi({ - id: address.id, + + if (address2.id) { + address3 = await createPengajuanTempoApi({ + id: address2.id, partner_id: auth.partnerId, - user_id: address.userId, + user_id: address2.userId, tempo_request: false, - ...formKontakPerson, - }); - if (address2.id) { - address3 = await createPengajuanTempoApi({ - id: address2.id, - partner_id: auth.partnerId, - user_id: address2.userId, - tempo_request: false, - ...formPengiriman, - formDokumenProsedur: formPengiriman.dokumenProsedur + ...formPengiriman, + formDokumenProsedur: formPengiriman.dokumenProsedur ? JSON.stringify(formPengiriman.dokumenProsedur) : false, + }); + + if (address3.id && formattedDokumen.length > 0) { + address4 = await createPengajuanTempoApi({ + id: address3.id, + partner_id: auth.partnerId, + user_id: address3.userId, + tempo_request: true, + formDocs: JSON.stringify(formattedDokumen), + }); + } else { + address4 = await createPengajuanTempoApi({ + id: address3.id, + partner_id: auth.partnerId, + user_id: address3.userId, + tempo_request: true, }); - if (address3.id && formattedDokumen.length > 0) { - // Kirim dokumen yang sudah difilter - address4 = await createPengajuanTempoApi({ - id: address3.id, - partner_id: auth.partnerId, - user_id: address3.userId, - tempo_request: true, - formDocs: JSON.stringify(formattedDokumen), - }); - } else { - address4 = await createPengajuanTempoApi({ - id: address3.id, - partner_id: auth.partnerId, - user_id: address3.userId, - tempo_request: true, - }); - } } } + } - if (address4?.id) { - toast.success('Pengajuan tempo berhasil dilakukan'); - const toastId = toast.loading('Mengubah status akun...'); - const isUpdated = await editAuthTempo(); - if (isUpdated?.user) { - const update = await setAuth(isUpdated.user); - if (update) { - toast.dismiss(toastId); - setIsLoading(false); - toast.success('Berhasil mengubah status akun', { duration: 1000 }); - router.push('/pengajuan-tempo/finish'); - } else { - toast.dismiss(toastId); - setIsLoading(false); - toast.success('Pengajuan tempo berhasil dilakukan'); - toast.error('Gagal mengubah status akun', { duration: 1000 }); - router.push('/pengajuan-tempo'); - } - removeFromLocalStorage(); - return; + if (address4?.id) { + toast.success('Pengajuan tempo berhasil dilakukan'); + const toastId2 = toast.loading('Mengubah status akun...'); + const isUpdated = await editAuthTempo(); + if (isUpdated?.user) { + const update = await setAuth(isUpdated.user); + if (update) { + toast.dismiss(toastId2); + setIsLoading(false); + toast.success('Berhasil mengubah status akun', { duration: 1000 }); + router.push('/pengajuan-tempo/finish'); + } else { + toast.dismiss(toastId2); + setIsLoading(false); + toast.success('Pengajuan tempo berhasil dilakukan'); + toast.error('Gagal mengubah status akun', { duration: 1000 }); + router.push('/pengajuan-tempo'); } - } else { - toast.dismiss(toastId); - setIsLoading(false); - - toast.error('Terjadi kesalahan dalam pengiriman formulir'); + removeFromLocalStorage(); + return; } - } catch (error) { + } else { toast.dismiss(toastId); setIsLoading(false); - toast.error('Terjadi kesalahan dalam pengiriman formulir'); - console.error(error); } - }; + } catch (error) { + toast.dismiss(toastId); + setIsLoading(false); + toast.error('Terjadi kesalahan dalam pengiriman formulir'); + console.error(error); + } +}; const removeFromLocalStorage = () => { for (const key of stepLabels) { @@ -660,10 +734,8 @@ const PengajuanTempo = () => { isDisabled={!isCheckedTNC || isLoading} onClick={handleDaftarTempo} > - {isLoading - ? 'Loading...' - : 'Daftar Tempo'} - {!isLoading && <ChevronRightIcon className='w-5' />} + {isLoading ? 'Loading...' : 'Daftar Tempo'} + {!isLoading && <ChevronRightIcon className='w-5' />} </Button> </div> )} diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx index 2f4d6c46..f0791512 100644 --- a/src/lib/quotation/components/Quotation.jsx +++ b/src/lib/quotation/components/Quotation.jsx @@ -10,7 +10,6 @@ import { deleteItemCart, getCart, getItemCart } from '@/core/utils/cart'; import currencyFormat from '@/core/utils/currencyFormat'; import { toast } from 'react-hot-toast'; import { useProductCartContext } from '@/contexts/ProductCartContext'; -// import checkoutApi from '@/lib/checkout/api/checkoutApi' import { useRouter } from 'next/router'; import VariantGroupCard from '@/lib/variant/components/VariantGroupCard'; import MobileView from '@/core/components/views/MobileView'; @@ -19,11 +18,11 @@ import Image from '@/core/components/elements/Image/Image'; import { useQuery } from 'react-query'; import CardProdcuctsList from '@/core/components/elements/Product/cartProductsList'; import { Skeleton } from '@chakra-ui/react'; +import { useAddress } from '@/lib/checkout/stores/useAdress'; +import { useCheckout } from '@/lib/checkout/stores/stateCheckout'; import { PickupAddress, SectionAddress, - SectionExpedisi, - SectionListService, SectionValidation, calculateEstimatedArrival, splitDuration, @@ -31,7 +30,8 @@ import { import addressesApi from '@/lib/address/api/addressesApi'; import { getItemAddress } from '@/core/utils/address'; import ExpedisiList from '../../checkout/api/ExpedisiList'; -import axios from 'axios'; +import SectionQuotationExpedition from '@/lib/checkout/components/SectionQuotationExpedition'; +import { useQuotation } from '@/lib/checkout/stores/stateQuotation'; const { checkoutApi } = require('@/lib/checkout/api/checkoutApi'); const { getProductsCheckout } = require('@/lib/checkout/api/checkoutApi'); @@ -51,41 +51,48 @@ const Quotation = () => { const { setRefreshCart } = useProductCartContext(); const SELF_PICKUP_ID = 32; - const [products, setProducts] = useState(null); - const [totalAmount, setTotalAmount] = useState(0); + const [totalAmount, setTotalAmount] = useState(0); const [totalDiscountAmount, setTotalDiscountAmount] = useState(0); - - //start set up address and carrier - const [selectedCarrierId, setselectedCarrierId] = useState(0); - const [listExpedisi, setExpedisi] = useState([]); - const [selectedExpedisi, setSelectedExpedisi] = useState(0); - const [checkWeigth, setCheckWeight] = useState(false); - const [checkoutValidation, setCheckoutValidation] = useState(false); - const [loadingRajaOngkir, setLoadingRajaOngkir] = useState(false); - - const [listserviceExpedisi, setListServiceExpedisi] = useState([]); - const [selectedServiceType, setSelectedServiceType] = useState(null); - - const [selectedCarrier, setselectedCarrier] = useState(0); - const [totalWeight, setTotalWeight] = useState(0); - - const [biayaKirim, setBiayaKirim] = useState(0); - const [selectedExpedisiService, setselectedExpedisiService] = useState(null); - const [etd, setEtd] = useState(null); - const [etdFix, setEtdFix] = useState(null); - const [isApproval, setIsApproval] = useState(false); - - const expedisiValidation = useRef(null); - - const [selectedAddress, setSelectedAddress] = useState({ - shipping: null, - invoicing: null, - }); - - const [addresses, setAddresses] = useState(null); - const [note_websiteText, setselectedNote_websiteText] = useState(''); + const [isLoading, setIsLoading] = useState(false); + const [etdFix, setEtdFix] = useState(null); + + const { + selectedAddress, + setSelectedAddress, + addresses, + setAddresses, + setAddressMaps, + setCoordinate, + setPostalCode, + } = useAddress(); + + const { + products, + setProducts, + checkWeigth, + setCheckWeight, + checkoutValidation, + setCheckoutValidation, + biayaKirim, + etd, + unit, + selectedCourier, + selectedCourierId, + selectedService, + listExpedisi, + setExpedisi, + productSla, + setProductSla, + setBiayaKirim, + setUnit, + setEtd, + setSelectedCourier, + setSelectedService, + setSelectedCourierId + } = useQuotation(); + useEffect(() => { if (!auth) return; @@ -116,198 +123,145 @@ const Quotation = () => { return addresses[0]; }; + let ship = matchAddress('shipping'); + setSelectedAddress({ shipping: matchAddress('shipping'), invoicing: matchAddress('invoicing'), }); - }, [addresses]); - - const loadExpedisi = async () => { - let dataExpedisi = await ExpedisiList(); - dataExpedisi = dataExpedisi.map((expedisi) => ({ - value: expedisi.id, - label: expedisi.name, - carrierId: expedisi.deliveryCarrierId, - })); - setExpedisi(dataExpedisi); - }; - - const loadServiceRajaOngkir = async () => { - setLoadingRajaOngkir(true); - const body = { - origin: 2127, - destination: selectedAddress.shipping.rajaongkirCityId, - weight: totalWeight, - courier: selectedCarrier, - originType: 'subdistrict', - destinationType: 'subdistrict', - }; - setBiayaKirim(0); - const dataService = await axios( - '/api/rajaongkir-service?body=' + JSON.stringify(body) - ); - setLoadingRajaOngkir(false); - setListServiceExpedisi(dataService.data[0].costs); - if (dataService.data[0].costs[0]) { - setBiayaKirim(dataService.data[0].costs[0]?.cost[0].value); - setselectedExpedisiService( - dataService.data[0].costs[0]?.description + - '-' + - dataService.data[0].costs[0]?.service - ); - setEtd(dataService.data[0].costs[0]?.cost[0].etd); - toast.success('Harap pilih tipe layanan pengiriman'); - } else { - toast.error('Maaf, layanan tidak tersedia. Mohon pilih expedisi lain.'); - } - }; - - useEffect(() => { - setCheckoutValidation(false); - - if (selectedCarrier != 0 && selectedCarrier != 1 && totalWeight > 0) { - loadServiceRajaOngkir(); - } else { - setListServiceExpedisi(); - setBiayaKirim(0); - setselectedExpedisiService(); - setEtd(); + setPostalCode(ship?.zip); + if (ship?.addressMap) { + setAddressMaps(ship?.addressMap); + setCoordinate({ + destination_latitude: ship?.latitude, + destination_longitude: ship?.longtitude, + }); } - }, [selectedCarrier, selectedAddress, totalWeight]); + }, [addresses]); useEffect(() => { - if (selectedExpedisi) { - let serviceType = selectedExpedisi.split(','); - if (serviceType[0] === 0) return; + const loadExpedisi = async () => { + let dataExpedisi = await ExpedisiList(); + dataExpedisi = dataExpedisi.map((expedisi) => ({ + value: expedisi.id, + label: expedisi.name, + carrierId: expedisi.deliveryCarrierId, + logo: expedisi.image, + })); + setExpedisi(dataExpedisi); + }; + + loadExpedisi(); - setselectedCarrier(serviceType[0]); - setselectedCarrierId(serviceType[1]); - setListServiceExpedisi([]); - } - }, [selectedExpedisi]); + const handlePopState = () => { + router.push('/shop/cart'); + }; - useEffect(() => { - if (selectedServiceType) { - let serviceType = selectedServiceType.split(','); - setBiayaKirim(serviceType[0]); - setselectedExpedisiService(serviceType[1]); - setEtd(serviceType[2]); - } - }, [selectedServiceType]); + window.onpopstate = handlePopState; - useEffect(() => { - if (etd) setEtdFix(calculateEstimatedArrival(etd)); - }, [etd]); + return () => { + window.onpopstate = null; + }; + }, []); useEffect(() => { if (isApproval) { - setselectedCarrierId(1); - setselectedExpedisiService('indoteknik'); + setSelectedCourierId(1); + setSelectedCourier('indoteknik'); } }, [isApproval]); - // end set up address and carrier - - useEffect(() => { - const loadProducts = async () => { - const cart = getCart(); - const variantIds = _.filter(cart, (o) => o.selected == true) - .map((o) => o.productId) - .join(','); - const dataProducts = await CartApi({ variantIds }); - const productsWithQuantity = dataProducts?.map((product) => { - return { - ...product, - quantity: getItemCart({ productId: product.id }).quantity, - }; - }); - if (productsWithQuantity) { - Promise.all(productsWithQuantity).then((resolvedProducts) => { - setProducts(resolvedProducts); - }); - } - }; - loadExpedisi(); - // loadProducts() - }, []); - useEffect(() => { - setProducts(cartCheckout?.products); - setCheckWeight(cartCheckout?.hasProductWithoutWeight); - setTotalWeight(cartCheckout?.totalWeight.g); + if (cartCheckout) { + setProducts(cartCheckout?.products); + setCheckWeight(cartCheckout?.hasProductWithoutWeight); + } }, [cartCheckout]); useEffect(() => { if (products) { - let calculateTotalAmount = 0; - let calculateTotalDiscountAmount = 0; - products.forEach((product) => { - calculateTotalAmount += product.price.price * product.quantity; - calculateTotalDiscountAmount += - (product.price.price - product.price.priceDiscount) * - product.quantity; - }); - setTotalAmount(calculateTotalAmount); - setTotalDiscountAmount(calculateTotalDiscountAmount); + const calculateTotals = () => { + let calculateTotalAmount = 0; + let calculateTotalDiscountAmount = 0; + + products.forEach((product) => { + calculateTotalAmount += product.price.price * product.quantity; + calculateTotalDiscountAmount += + (product.price.price - product.price.priceDiscount) * product.quantity; + }); + + setTotalAmount(calculateTotalAmount); + setTotalDiscountAmount(calculateTotalDiscountAmount); + }; + + calculateTotals(); } }, [products]); - const [isLoading, setIsLoading] = useState(false); + useEffect(() => { + if (etd) { + setEtdFix(calculateEstimatedArrival(etd)); + } + }, [etd]); const checkout = async () => { - // validation checkout - if (selectedExpedisi === 0 && !isApproval) { + // Validation + if (!selectedCourierId && !isApproval) { setCheckoutValidation(true); - if (expedisiValidation.current) { - const position = expedisiValidation.current.getBoundingClientRect(); - window.scrollTo({ - top: position.top - 300 + window.pageYOffset, - behavior: 'smooth', - }); - } + toast.error('Silahkan pilih ekspedisi'); return; } - if (selectedCarrier != 1 && biayaKirim == 0 && !isApproval) { + + if (selectedCourierId !== SELF_PICKUP_ID && biayaKirim === 0 && !isApproval) { toast.error('Maaf, layanan tidak tersedia. Mohon pilih expedisi lain.'); return; } - if (!products || products.length == 0) return; + if (!products || products.length === 0) return; - if (isApproval && note_websiteText == '') { + if (isApproval && note_websiteText === '') { toast.error('Maaf, Note wajib dimasukkan.'); return; } setIsLoading(true); - const productOrder = products.map((product) => ({ - product_id: product.id, - quantity: product.quantity, - })); - let data = { - partner_shipping_id: selectedAddress.shipping.id, - partner_invoice_id: selectedAddress.invoicing.id, - user_id: auth.id, - order_line: JSON.stringify(productOrder), - delivery_amount: biayaKirim, - carrier_id: selectedCarrierId, - estimated_arrival_days: splitDuration(etd), - delivery_service_type: selectedExpedisiService, - note_website: note_websiteText, - }; - - const isSuccess = await checkoutApi({ data }); - setIsLoading(false); - if (isSuccess?.id) { - for (const product of products) deleteItemCart({ productId: product.id }); - router.push(`/shop/quotation/finish?id=${isSuccess.id}`); - setRefreshCart(true); - return; + try { + const productOrder = products.map((product) => ({ + product_id: product.id, + quantity: product.quantity, + })); + + const data = { + partner_shipping_id: selectedAddress.shipping.id, + partner_invoice_id: selectedAddress.invoicing.id, + user_id: auth.id, + order_line: JSON.stringify(productOrder), + delivery_amount: biayaKirim, + carrier_id: selectedCourierId, + estimated_arrival_days: splitDuration(etd), + delivery_service_type: selectedService?.service_type || selectedCourier, + note_website: note_websiteText, + }; + + const isSuccess = await checkoutApi({ data }); + + if (isSuccess?.id) { + for (const product of products) { + deleteItemCart({ productId: product.id }); + } + router.push(`/shop/quotation/finish?id=${isSuccess.id}`); + setRefreshCart(true); + } else { + toast.error('Gagal melakukan transaksi, terjadi kesalahan internal'); + } + } catch (error) { + toast.error('Terjadi kesalahan saat memproses quotation'); + } finally { + setIsLoading(false); } - - toast.error('Gagal melakukan transaksi, terjadi kesalahan internal'); }; + const taxTotal = (totalAmount - totalDiscountAmount) * (PPN - 1); return ( @@ -327,21 +281,21 @@ const Quotation = () => { <Divider /> - {selectedCarrierId == SELF_PICKUP_ID && ( + {selectedCourierId == SELF_PICKUP_ID && ( <div className='p-4'> <div - class='flex items-center p-4 mb-4 text-sm border border-yellow-500 text-yellow-800 rounded-lg bg-yellow-50' + className='flex items-center p-4 mb-4 text-sm border border-yellow-500 text-yellow-800 rounded-lg bg-yellow-50' role='alert' > <svg - class='flex-shrink-0 inline w-4 h-4 mr-3' + className='flex-shrink-0 inline w-4 h-4 mr-3' aria-hidden='true' fill='currentColor' viewBox='0 0 20 20' > <path d='M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z' /> </svg> - <span class='sr-only'>Info</span> + <span className='sr-only'>Info</span> <div className='text-justify'> Fitur Self Pickup, hanya berlaku untuk customer di area jakarta. Apa bila memilih fitur ini, anda akan dihubungi setelah barang @@ -351,10 +305,10 @@ const Quotation = () => { </div> )} - {selectedCarrierId == SELF_PICKUP_ID && ( + {selectedCourierId == SELF_PICKUP_ID && ( <PickupAddress label='Alamat Pickup' /> )} - {selectedCarrierId != SELF_PICKUP_ID && ( + {selectedCourierId != SELF_PICKUP_ID && ( <Skeleton isLoaded={!!selectedAddress.invoicing && !!selectedAddress.shipping} minHeight={320} @@ -374,32 +328,14 @@ const Quotation = () => { )} <Divider /> <SectionValidation address={selectedAddress.invoicing} /> - {!isApproval && ( - <> - <SectionExpedisi - address={selectedAddress.shipping} - listExpedisi={listExpedisi} - setSelectedExpedisi={setSelectedExpedisi} - checkWeigth={checkWeigth} - checkoutValidation={checkoutValidation} - expedisiValidation={expedisiValidation} - loadingRajaOngkir={loadingRajaOngkir} - /> - <Divider /> - </> - )} - - <SectionListService - listserviceExpedisi={listserviceExpedisi} - setSelectedServiceType={setSelectedServiceType} - /> - + <div className='p-4 flex flex-col gap-y-4'> {products && ( <VariantGroupCard openOnClick={false} variants={products} /> )} </div> + <SectionQuotationExpedition products={products} /> <Divider /> <div className='p-4'> @@ -497,10 +433,10 @@ const Quotation = () => { <DesktopView> <div className='container mx-auto py-10 flex'> <div className='w-3/4 border border-gray_r-6 rounded bg-white p-4'> - {selectedCarrierId == SELF_PICKUP_ID && ( + {selectedCourierId == SELF_PICKUP_ID && ( <PickupAddress label='Alamat Pickup' /> )} - {selectedCarrierId != SELF_PICKUP_ID && ( + {selectedCourierId != SELF_PICKUP_ID && ( <Skeleton isLoaded={ !!selectedAddress.invoicing && !!selectedAddress.shipping @@ -522,31 +458,16 @@ const Quotation = () => { )} <Divider /> <SectionValidation address={selectedAddress.invoicing} /> - {!isApproval && ( - <SectionExpedisi - address={selectedAddress.shipping} - listExpedisi={listExpedisi} - setSelectedExpedisi={setSelectedExpedisi} - checkWeigth={checkWeigth} - checkoutValidation={checkoutValidation} - expedisiValidation={expedisiValidation} - loadingRajaOngkir={loadingRajaOngkir} - /> - )} - + + <SectionQuotationExpedition products={products} /> <Divider /> - <SectionListService - listserviceExpedisi={listserviceExpedisi} - setSelectedServiceType={setSelectedServiceType} - /> - {/* <div className='p-4'> */} + <div className='font-medium mb-6'>Detail Barang</div> <CardProdcuctsList isLoading={isLoading} products={products} source='checkout' /> - {/* </div> */} </div> <div className='w-1/4 pl-4'> @@ -601,9 +522,6 @@ const Quotation = () => { )} </div> </div> - {/* <p className='text-caption-2 text-gray_r-11 mb-2'> - *) Belum termasuk biaya pengiriman - </p> */} <p className='text-caption-2 text-gray_r-11 leading-5'> Dengan melakukan pembelian melalui website Indoteknik, saya menyetujui{' '} @@ -655,4 +573,4 @@ const Quotation = () => { ); }; -export default Quotation; +export default Quotation;
\ No newline at end of file diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx index acb925da..de93d742 100644 --- a/src/lib/transaction/components/Transactions.jsx +++ b/src/lib/transaction/components/Transactions.jsx @@ -127,6 +127,16 @@ const Transactions = ({ context = '' }) => { { id: 'cancel', label: 'Pesanan Dibatalkan' }, ]; + const contextLabelMap = { + draft: 'Pending Quotation', + waiting: 'Pesanan Diproses', + sale: 'Pesanan Dikemas', + partial_shipping: 'Dikirim Sebagian', + shipping: 'Pesanan Dikirim', + done: 'Pesanan Selesai', + cancel: 'Pesanan Dibatalkan', + }; + const sortes = [ { id: 'none', label: 'Urutkan' }, { id: 'asc', label: 'dari yang terkecil' }, @@ -199,7 +209,7 @@ const Transactions = ({ context = '' }) => { 'Created By': saleOrder.address.customer?.name || '-', Salesperson: saleOrder.sales, Total: currencyFormat(saleOrder.amountTotal), - Status: saleOrder.status, + Status: contextLabelMap[saleOrder.status] || saleOrder.status, }; if (siteFilter) { row['Site'] = siteFilter; @@ -245,7 +255,7 @@ const Transactions = ({ context = '' }) => { saleOrder.address.customer?.name || '-', saleOrder.sales, currencyFormat(saleOrder.amountTotal), - saleOrder.status, + contextLabelMap[saleOrder.status] || saleOrder.status, ]; if (siteFilter) { @@ -273,7 +283,7 @@ const Transactions = ({ context = '' }) => { name: q, offset: (pageNew - 1) * limitNew, limit: limitNew, - context: contextMap[statusNew], // gunakan contextMap + context: contextNew[statusNew] || 'all', sort: sortNew, startDate: state[0]?.startDate ? state[0].startDate.toLocaleDateString('id-ID') @@ -1023,6 +1033,7 @@ const Transactions = ({ context = '' }) => { <option value={10}>10</option> <option value={15}>15</option> <option value={20}>20</option> + <option value={transactions?.data?.saleOrderTotal}>Semua</option> </select> <div ref={calendarRef} className="relative inline-block"> <button |
