fix merge

2 files changed, 29 insertions, 0 deletions

diff --git a/src/lib/treckingAwb/component/InformationSection.jsx b/src/lib/treckingAwb/component/InformationSection.jsx
index a2297af3..4b3bd5fb 100644
--- a/src/lib/treckingAwb/component/InformationSection.jsx
+++ b/src/lib/treckingAwb/component/InformationSection.jsx
@@ -69,6 +69,10 @@ const InformationSection = ({ manifests }) => {
             <span className='text-red-600 font-semibold'>{manifests?.eta}</span>
           </span>
         </div>
+        <div className='grid grid-cols-[150px_auto]'>
+          <span>Total Product</span>
+          <span className='font-semibold'> : {Array.isArray(manifests?.products) ? manifests.products.length : 0} Product</span>
+        </div>
       </div>
     </div>
   );
diff --git a/src/lib/treckingAwb/component/Manifest.jsx b/src/lib/treckingAwb/component/Manifest.jsx
index acb86f57..6eb0b0ac 100644
--- a/src/lib/treckingAwb/component/Manifest.jsx
+++ b/src/lib/treckingAwb/component/Manifest.jsx
@@ -223,6 +223,31 @@ const Manifest = ({ idAWB, closePopup }) => {
                 )
             }
           </div>
+          
+        {/* Barang */}
+        <div className='mt-1'>
+          {Array.isArray(manifests?.products) && manifests.products.length > 0 ? (
+            <div className='flex flex-col gap-4'>
+              {manifests.products.map((product, idx) => (
+                <div key={idx} className='flex gap-4 border-b pb-4'>
+                  {/* Gambar Produk */}
+                  <img
+                    src={product.image}
+                    alt={product.name}
+                    className='w-16 h-16 object-contain border'
+                  />
+                  {/* Info Produk */}
+                  <div className='flex flex-col flex-1'>
+                    <span className='font-semibold'>{product.name}</span>
+                    <span className='text-sm text-gray-500'>{product.code}</span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          ) : (
+            <span></span>
+          )}
+        </div>
         </BottomPopup>
       )}
     </>