{filter.map((field) => {
if (Array.isArray(field)) {
- return (
-
- {field[1]}
-
-
- );
+
+ return (
+
+ {field[1]}
+
+
+ );
} else if (typeof field === "object") {
const k = Object.keys(field);
return (
diff --git a/src/component/TableUtils.jsx b/src/component/TableUtils.jsx
index 3d095a09e1a9004a2fd4b2708254b4807d18f8e2..81f10791e1dfed8d178b4c176c55b9ae069e2714 100644
--- a/src/component/TableUtils.jsx
+++ b/src/component/TableUtils.jsx
@@ -4,6 +4,7 @@ import NumberFormat from "react-number-format";
import "moment-timezone";
import Status from "./Status";
import StatusDonasi from "./StatusDonasi";
+import StatusDonasiBarang from "./StatusDonasiBarang";
export const stringToDate = (date) => {
const dateFormat = new Date(date);
return (
@@ -11,6 +12,13 @@ export const stringToDate = (date) => {
);
};
+export const stringToDateNoTime = (date) => {
+ const dateFormat = new Date(date);
+ return (
+
+ );
+};
+
export const stringToCurrency = (currency) => (
(
/>
);
+export const itemDonationStatus = (donation) => {
+ let statusLabel;
+ const status = donation.donation_status
+ switch(status){
+ case "001":
+ statusLabel = "Dalam Proses";
+ break;
+
+ case "002":
+ statusLabel = "Donasi Diterima";
+ break;
+
+ default:
+ statusLabel = "Dalam Proses";
+ break;
+ }
+ return
+}
+
export const preorderStock = (product) => (
{product.pre_order ? "preorder" : product.stock}
);
diff --git a/src/page/bank/TambahBank.jsx b/src/page/bank/TambahBank.jsx
index 36d8af4e613386c3aaee0a97e86b47fe64f05865..6e6619bfdefb243f152ca7b987e87d4a1e9a485e 100644
--- a/src/page/bank/TambahBank.jsx
+++ b/src/page/bank/TambahBank.jsx
@@ -17,6 +17,10 @@ const TambahBank = () => {
formData.append("bank_name", data["bank_name"]);
formData.append("bank_account_number", data["bank_account_number"]);
formData.append("bank_account_name", data["bank_account_name"]);
+ console.log(data);
+ for (let pair in formData.entries()){
+ console.log(pair[0] + ' ' + pair[1]);
+ }
send(formData);
};
return (
diff --git a/src/page/batch/DetailBatch.jsx b/src/page/batch/DetailBatch.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..8a5cb5e35e79ef6b93cedbbd52e780c6d8f54cb9
--- /dev/null
+++ b/src/page/batch/DetailBatch.jsx
@@ -0,0 +1,144 @@
+import React from "react";
+import useFetchSingleData from "../../utils/useFetchSingleData";
+import { css } from "@emotion/core";
+import ArrowBackIcon from "@material-ui/icons/ArrowBack";
+import { navigate } from "@reach/router";
+import { stringToCurrency, stringToDateNoTime } from "../../component/TableUtils";
+import { ErrorDiv, ButtonDeleteStyled } from "../../component/html/html";
+import LinkYellow from "../../component/LinkYellow";
+import useDelete from "../../utils/useDelete";
+
+const DetailBatch = ({ batchId }) => {
+ const url = `${process.env.REACT_APP_BASE_URL}/batch/${batchId}/`;
+ // const url = `http://localhost:8000/batch/${batchId}/`; // for local testing purposes
+ const [batch, error] = useFetchSingleData(url);
+ const [deleteBatch, errorDelete] = useDelete(url);
+
+
+ if (Object.keys(batch).length === 0)
+ return (
+
+ {error && Something error}
+ Fetching data..
+
+ );
+ return (
+
+ {error &&
Something error}
+ {errorDelete && (
+
+ Tidak dapat menghapus batch, mohon periksa apakah ada transaksi
+ didalam batch ini.
+
+ )}
+
+
+
+ DETAIL BATCH
+
+
+
+
+
+ Nama Batch:
+
+
{batch.batch_name}
+
+
+
+
+ Tanggal Mulai:{" "}
+
+
{stringToDateNoTime(batch.start_date)}
+
+
+
+ Tanggal Berakhir:{" "}
+
+
{stringToDateNoTime(batch.end_date)}
+
+
+
+ Ongkos Kirim:{" "}
+
+
{stringToCurrency(batch.shipping_cost)}
+
+
+
+
+
+ deleteBatch()}
+ >
+ HAPUS
+
+
+
+
+
+ Fetching data..
+
+ );
+ return (
+
+ {error &&
Error !, Data tidak dapat disimpan}
+
+
+
+ Edit {initialData.batch_name}
+
+
+
+
+
+ Informasi Batch
+
+
+
+
+
+ ADMIN - KELOLA BATCH
+
+
+ TAMBAH
+ LIHAT
+
+
+
+
+ Total Ongkos Kirim: {totalCost}
+
+
+
+
+
+
+ {error && Error !, Data tidak dapat disimpan}
+
+
+
+ ADMIN - KELOLA BATCH
+
+
+ TAMBAH
+ LIHAT
+
+
Informasi Batch
+
+
+ {error && Something error}
+ Fetching data..
+
+ );
+ return (
+
+ {error &&
Something error}
+
+
+
+ DETAIL DONASI
+
+
+
+
+
+ {donation.user_full_name} / {donation.user_username}
+
+
+
+
+
{donation.user_phone_number}
+
+
+
Program:
+
+ {donation.program_name}
+
+
+
+
Jenis Barang:
+
+ {donation.goods_description}
+
+
+
+
Jumlah Barang:
+
+ {donation.goods_quantity}
+
+
+
+ {" "}
+
+
+ {donation.delivery_address === null ? (
+
Diantar ke Masjid Al-Jabar
+ ) : (
+
Dijemput di {donation.delivery_address}
+ )}
+
+
+
+ {donation.donation_status !== "002" ? (
+
+ ) :
+ Donasi sudah diterima
+
}
+
+ {errorSend && Status donasi tidak dapat disimpan}
+
+
+ );
+};
+
+export default FormDonasi;
diff --git a/src/page/donasi-barang/ListDonasiBarang.jsx b/src/page/donasi-barang/ListDonasiBarang.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..b195566be4cdf37468f7be58e876f7945cff614d
--- /dev/null
+++ b/src/page/donasi-barang/ListDonasiBarang.jsx
@@ -0,0 +1,67 @@
+import React from "react";
+import TableComponent from "../../component/TableComponent";
+import { css } from "@emotion/core";
+import {
+ itemDonationStatus
+} from "../../component/TableUtils";
+import FormDownload from "../../component/FormDownload";
+
+const ListDonasiBarang = () => {
+ const data = {
+ url: `${process.env.REACT_APP_BASE_URL}/program-donations/gds`,
+ pageDefault: 1,
+ title: "",
+ keyValuePairs: [
+ ["id", "id"],
+ ["donation_number", "ID Donasi"],
+ ["user_username", "Username"],
+ ["program_name", "Nama Program"],
+ ["", "Status", itemDonationStatus],
+ ],
+ link: "/donasi-barang/",
+ filter: [
+ ["updated_at_date_range_after", "Updated from", "date"],
+ ["updated_at_date_range_before", "Updated before", "date"],
+ {
+ donation_status: {
+ label: "Status Donasi",
+ choices: [
+ { "001": "Dalam Proses" },
+ { "002": "Donasi Diterima" },
+ ],
+ },
+ },
+ ],
+ };
+ console.log(data);
+ return (
+
+
+ KELOLA DONASI BARANG
+
+
+
+
+
+
{
font-weight: bold;
`}
>
- Riwayat Donasi
+ Riwayat Donasi Uang
+
+
+ {
category: initialData["category"],
subcategory: initialData["subcategory"],
description: initialData["description"],
- price: initialData["price"],
+ price: initialData["price"].split(".")[0],
stock: initialData["stock"],
- pre_order: initialData["pre_order"].toString(),
+ modal: initialData["modal"].split(".")[0],
}
: {},
});
@@ -37,7 +37,6 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
null,
]);
const watchCategory = watch("category", "");
- const watchPreorder = watch("pre_order");
const [resultsSubcategory, errorStateSubcategory, , , , , ,] = useFetchList([
urlSubcategory,
null,
@@ -47,18 +46,14 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
null,
]);
const filterSubmit = (data) => {
+ console.log(data);
const formData = new FormData();
- if (watchPreorder === "false") {
- data.pre_order = false;
- formData.append("stock", data["stock"]);
- } else {
- data.pre_order = true;
- }
+ formData.append("stock", data["stock"]);
formData.append("name", data["name"]);
formData.append("subcategory", data["subcategory"]);
formData.append("description", data["description"]);
formData.append("price", data["price"]);
- formData.append("pre_order", data["pre_order"]);
+ formData.append("modal", data["modal"]);
if (data["image"].length !== 0) formData.append("image", data["image"][0]);
onSubmit(formData);
};
@@ -139,46 +134,14 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
)}
- Tipe Barang
-
-
-
-
-
-
-
-
- {errors.pre_order && (
- Tipe Produk tidak boleh kosong
- )}
+ Modal/kuantitas
+
+ {errors.modal && Modal tidak boleh kosong}
Harga/kuantitas
@@ -196,8 +159,7 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
data-testid="stock-produk-input"
type="number"
name="stock"
- disabled={watchPreorder === "true"}
- ref={register({ required: watchPreorder === "false" })}
+ ref={register({ required: true })}
/>
{errors.stock && Stok Produk tidak boleh kosong}
diff --git a/src/page/produk/ListProduk.jsx b/src/page/produk/ListProduk.jsx
index 1cdd2f01d78a949a2d5b5e0c8802d2c3fdfcdb05..e31d7051eb93a6e1330d38c760628d9513d4db40 100644
--- a/src/page/produk/ListProduk.jsx
+++ b/src/page/produk/ListProduk.jsx
@@ -13,8 +13,10 @@ const ListProduk = () => {
keyValuePairs: [
["id", "id"],
["name", "Nama Produk"],
- ["price", "Harga", stringToCurrency],
["", "Stok", preorderStock],
+ ["price", "Harga", stringToCurrency],
+ ["profit", "Keuntungan/Produk", stringToCurrency],
+ ["total_profit", "Keuntungan Penjualan", stringToCurrency],
],
link: "",
};
diff --git a/src/page/program/DetailProgram.jsx b/src/page/program/DetailProgram.jsx
index 890d0c899f6134beded0b61b73c29e75ec1536a7..45108290cd76e6b900d5ad4b7de748fdf6934e05 100644
--- a/src/page/program/DetailProgram.jsx
+++ b/src/page/program/DetailProgram.jsx
@@ -23,12 +23,27 @@ import {
const DetailProgram = ({ idProgram }) => {
const url = `${process.env.REACT_APP_BASE_URL}/programs/${idProgram}/`;
+ const progressUrl = url+"progress";
const [program, error] = useFetchSingleData(url);
+ const [progress, progressError] = useFetchSingleData(progressUrl);
const [deleteProgram, errorDelete] = useDelete(url);
const [openModal, setOpenModal] = useState(false);
const handleClose = () => setOpenModal(false);
+ const [dialogOpen, setDialogOpen] = useState(false);
+ const [image, setImage] = useState("");
+
+ const handleClickOpen = (img) => {
+ setImage(img);
+ setDialogOpen(true);
+ };
+
+ const handleClickClose = () => {
+ setDialogOpen(false);
+ };
const start_date_time = new Date(program.start_date_time).toLocaleString();
const end_date_time = new Date(program.end_date_time).toLocaleString();
+
+
return (
{