Merge branch 'new-release' into feature/integrasi_biteship

# Conflicts:
#	src/lib/address/components/EditAddress.jsx

2 files changed, 15 insertions, 2 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index fa8d8aea..637706a2 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -184,6 +184,7 @@ const Checkout = () => {
         let dataVoucher = await getVoucher(auth?.id, {
           source: query,
           type: 'all,brand',
+          partner_id : auth?.partnerId,
         });
         SetListVoucher(dataVoucher);
 
@@ -411,13 +412,25 @@ const Checkout = () => {
     if (query) {
       data.source = 'buy';
     }
-    if (poNumber.current.value) data.po_number = poNumber.current.value;
+    if (poNumber.current.value) {
+      if (typeof file == 'undefined') {
+        toast.error(
+          'Nomor PO ' +
+            poNumber.current.value +
+            ' telah dimasukkan, Harap upload file PO yang dimaksud'
+        );
+        setIsLoading(false);
+        return;
+      }
+      data.po_number = poNumber.current.value;
+    }
     if (typeof file !== 'undefined') data.po_file = await getFileBase64(file);
 
     const isCheckouted = await checkoutApi({ data });
 
     if (!isCheckouted?.id) {
       toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
+      setIsLoading(false);
       return;
     } else {
       gtagPurchase(products, biayaKirim, isCheckouted.name);
diff --git a/src/lib/checkout/components/CheckoutSection.jsx b/src/lib/checkout/components/CheckoutSection.jsx
index 623152c6..c82e15c7 100644
--- a/src/lib/checkout/components/CheckoutSection.jsx
+++ b/src/lib/checkout/components/CheckoutSection.jsx
@@ -33,7 +33,7 @@ export const SectionAddress = ({ address, label, url }) => {
 };
 
 export const SectionValidation = ({ address }) =>
-  address?.rajaongkirCityId == 0 && (
+  address?.stateId == 0 && (
     <BottomPopup active={true} title='Update Alamat'>
       <div className='leading-7 text-gray_r-12/80'>
         Mohon untuk memperbarui alamat Anda dengan mengklik tombol di bawah ini.{' '}