Fakultas Ilmu Komputer UI

Commit ddb6033e authored by Shella Gabriella's avatar Shella Gabriella
Browse files

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

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

Closes #43

See merge request !37
parents c2f449dd e3f5d00b
Pipeline #82033 passed with stages
in 2 minutes and 53 seconds
...@@ -39,4 +39,8 @@ test("Test detail loaded donasi", async () => { ...@@ -39,4 +39,8 @@ test("Test detail loaded donasi", async () => {
await waitFor(() => getByTestId("page-detail-donasi")); await waitFor(() => getByTestId("page-detail-donasi"));
const data = getByTestId("page-detail-donasi"); const data = getByTestId("page-detail-donasi");
expect(data.textContent).toContain("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");
}); });
...@@ -53,7 +53,6 @@ const DetailDonasiUang = ({ idDonasi }) => { ...@@ -53,7 +53,6 @@ const DetailDonasiUang = ({ idDonasi }) => {
display: flex; display: flex;
margin: 2rem 3rem 3rem 3rem; margin: 2rem 3rem 3rem 3rem;
flex-direction: column; flex-direction: column;
justify-content: space-around;
height: 75vh; height: 75vh;
padding-top: 100px; padding-top: 100px;
`} `}
......
...@@ -320,7 +320,9 @@ const DetailTransaksi = ({ idTransaksi }) => { ...@@ -320,7 +320,9 @@ const DetailTransaksi = ({ idTransaksi }) => {
<TableRow> <TableRow>
<TableCell>Kode Produk</TableCell> <TableCell>Kode Produk</TableCell>
<TableCell>Nama Produk</TableCell> <TableCell>Nama Produk</TableCell>
<TableCell>Pesan (Hampers)</TableCell>
<TableCell>Kuantitas</TableCell> <TableCell>Kuantitas</TableCell>
<TableCell>Biaya Hampers</TableCell>
<TableCell>Harga Produk</TableCell> <TableCell>Harga Produk</TableCell>
<TableCell>Subtotal</TableCell> <TableCell>Subtotal</TableCell>
</TableRow> </TableRow>
...@@ -332,7 +334,9 @@ const DetailTransaksi = ({ idTransaksi }) => { ...@@ -332,7 +334,9 @@ const DetailTransaksi = ({ idTransaksi }) => {
<Link to={`/produk/${row.product}`}>{row.product_code}</Link> <Link to={`/produk/${row.product}`}>{row.product_code}</Link>
</TableCell> </TableCell>
<TableCell>{row.product_name}</TableCell> <TableCell>{row.product_name}</TableCell>
<TableCell>{row.hampers_messages}</TableCell>
<TableCell>{row.quantity}</TableCell> <TableCell>{row.quantity}</TableCell>
<TableCell>{stringToCurrency(row.hampers_price)}</TableCell>
<TableCell>{stringToCurrency(row.product_price)}</TableCell> <TableCell>{stringToCurrency(row.product_price)}</TableCell>
<TableCell> <TableCell>
{stringToCurrency( {stringToCurrency(
...@@ -342,7 +346,7 @@ const DetailTransaksi = ({ idTransaksi }) => { ...@@ -342,7 +346,7 @@ const DetailTransaksi = ({ idTransaksi }) => {
</TableRow> </TableRow>
))} ))}
<TableRow> <TableRow>
<TableCell rowSpan={3} colSpan={3} /> <TableCell rowSpan={3} colSpan={5} />
<TableCell align="left" colSpan={1}> <TableCell align="left" colSpan={1}>
Donasi Donasi
</TableCell> </TableCell>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment