Merge branch 'shella/43/tambah-fitur-hampers' into 'dev'

PBI-15: Menambahkan kolom pesan & harga hampers di transaksi

Closes #43

See merge request !37

src/__test__/donasi-barang/DetailDonasiBarang.test.js

@@ -39,4 +39,8 @@ test("Test detail loaded donasi", async () => {
   await waitFor(() => getByTestId("page-detail-donasi"));
   const data = getByTestId("page-detail-donasi");
   expect(data.textContent).toContain("DETAIL DONASI");
+  expect(data.textContent).toContain("DONASI BARANG");
+  expect(data.textContent).toContain("7NGVBN");
+  expect(data.textContent).toContain("dummy 2");
+  expect(data.textContent).toContain("Donasi Diterima");
 });

src/page/donasi/DetailDonasiUang.jsx

@@ -53,7 +53,6 @@ const DetailDonasiUang = ({ idDonasi }) => {
         display: flex;
         margin: 2rem 3rem 3rem 3rem;
         flex-direction: column;
-        justify-content: space-around;
         height: 75vh;
         padding-top: 100px;
       `}

src/page/transaksi/DetailTransaksi.jsx

@@ -320,7 +320,9 @@ const DetailTransaksi = ({ idTransaksi }) => {
             <TableRow>
               <TableCell>Kode Produk</TableCell>
               <TableCell>Nama Produk</TableCell>
+              <TableCell>Pesan (Hampers)</TableCell>
               <TableCell>Kuantitas</TableCell>
+              <TableCell>Biaya Hampers</TableCell>
               <TableCell>Harga Produk</TableCell>
               <TableCell>Subtotal</TableCell>
             </TableRow>
@@ -332,7 +334,9 @@ const DetailTransaksi = ({ idTransaksi }) => {
                   <Link to={`/produk/${row.product}`}>{row.product_code}</Link>
                 </TableCell>
                 <TableCell>{row.product_name}</TableCell>
+                <TableCell>{row.hampers_messages}</TableCell>
                 <TableCell>{row.quantity}</TableCell>
+                <TableCell>{stringToCurrency(row.hampers_price)}</TableCell>
                 <TableCell>{stringToCurrency(row.product_price)}</TableCell>
                 <TableCell>
                   {stringToCurrency(
@@ -342,7 +346,7 @@ const DetailTransaksi = ({ idTransaksi }) => {
               </TableRow>
             ))}
             <TableRow>
-              <TableCell rowSpan={3} colSpan={3} />
+              <TableCell rowSpan={3} colSpan={5} />
               <TableCell align="left" colSpan={1}>
                 Donasi
               </TableCell>