diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 34e0041..854f78d 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -220,8 +220,6 @@ export const ProductComponent = observer((props) => { const handleCancelFilter = async () => { store.product.filterSubCategory = null; store.product.filterSupplier = null; - // setFilterSubCategories([]); - // setFilterSupplier([]); store.product.visibleModalFilterProduct = false; await store.product.getData(); }; @@ -232,21 +230,9 @@ export const ProductComponent = observer((props) => { modalLoader.setLoading(true); await store.product.getData(); modalLoader.setLoading(false); - // setFilterSupplier([]); - // setFilterSubCategories([]); store.product.visibleModalFilterProduct = false; }; - // const handleFilterCategory = async (value) => { - // if (value) { - // store.product.filterCategory = value; - // await store.product.getDataSubCategories(); - // } else { - // store.product.filterCategory = null; - // await store.product.getDataSubCategories(); - // } - // }; - const footerLayoutFilter = [ , + , + , + ]; return (
{ {store.authentication.dataProfit.is_active === true - ? "Aktif" - : "Inaktif"} + ? "Active" + : "Inactive"} - {/* {store.authentication.userData.role === "Sales" && ( - - - Foto Identitas - - - - - - - - - Foto Toko - - - {store.authentication.listImage.map((item) => ( - - ))} - - - - - )} */} {store.authentication.userData.role === "Admin" && store.authentication.dataProfit.roles?.name !== "Admin Partner" && ( @@ -587,7 +633,6 @@ export const DetailUser = observer(() => { )} - {store.authentication.userData.role === "Supervisor" && ( @@ -664,7 +709,6 @@ export const DetailUser = observer(() => { - {/* {store.ui.mediaQuery.isDesktop && ( */} { modalLoader.setLoading(false); }} /> - {/* )} */} - {/*
*/} {store.ui.mediaQuery.isDesktop && ( - //
{ - // let pageNumber = page.current; - // store.transaction.pageSizeHistoryTransaction = - // page.pageSize; - // store.transaction.pageHistoryTransaction = pageNumber - 1; - // modalLoader.setLoading(true); - // await store.transaction.getDataHistoryTransaction(); - // modalLoader.setLoading(false); - // }} - // /> -
{ - let pageNumber = page.current; - store.transaction.pageSize = page.pageSize; - store.transaction.page = pageNumber - 1; - modalLoader.setLoading(true); - await getData(); - modalLoader.setLoading(false); - }} - /> +
+ +
{ + let pageNumber = page.current; + store.transaction.pageSize = page.pageSize; + store.transaction.page = pageNumber - 1; + modalLoader.setLoading(true); + await getData(); + modalLoader.setLoading(false); + }} + /> + )} {store.ui.mediaQuery.isMobile && ( @@ -843,11 +872,6 @@ export const DetailUser = observer(() => { }} /> )} - {/*
*/} @@ -866,6 +890,39 @@ export const DetailUser = observer(() => { setVisibleModal(false); }} /> + { + //form.resetFields(); + store.transaction.filterStart = null; + store.transaction.filterEnd = null; + store.transaction.visibleModalFilterTransaction = false; + await store.transaction.getDetailHistoryTransaction(); + }} + > + + + + + + + + + + + + + ); }); diff --git a/src/pages/Membership/FilterUser.js b/src/pages/Membership/FilterUser.js index 814d3c6..5328009 100644 --- a/src/pages/Membership/FilterUser.js +++ b/src/pages/Membership/FilterUser.js @@ -1,82 +1,77 @@ import React, { useState } from "react"; -import { Form, Input, Modal, Select, InputNumber,Row,Title,Col,Option } from "antd"; +import { + Form, + Input, + Modal, + Select, + InputNumber, + Row, + Title, + Col, + Option, +} from "antd"; import { useStore } from "../../utils/useStore"; import { observer } from "mobx-react-lite"; - export const FilterUser = observer(() => { - const store = useStore(); -// const [form] = Form.useForm(); -// const { Option } = Select; -// const store = useStore(); -// const [value, setValue] = useState(); - + const store = useStore(); return ( - - - - Filter Supplier - - - - - - Filter Categories - - - - - - Filter Sub-Categories - - - - - + visible={store.membership.visibleModalFilterMembership} + title={"Filter"} + //footer={footerLayoutFilter} + > + + + + Filter Supplier + + + + + + Filter Categories + + + + + + Filter Sub-Categories + + + + + ); }); diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js index d55bbab..d6c4f3f 100644 --- a/src/pages/Membership/Konfirmasi.js +++ b/src/pages/Membership/Konfirmasi.js @@ -93,24 +93,11 @@ export const Konfirmasi = observer(() => { dataIndex: "image_prove", key: "image_prove", render: (text, record) => ( - // @@ -272,42 +259,6 @@ export const Konfirmasi = observer(() => { store.payback.visibleModalFilterPayback = false; }; - const handleFilterCategory = async (value) => { - if (value) { - store.product.filterCategory = value; - await store.product.getDataSubCategories(); - } else { - store.product.filterCategory = null; - await store.product.getDataSubCategories(); - } - }; - - const footerLayoutFilter = [ - , - , - , - ]; - return (
{ />
- {/* */} - {/*
- - */} - {/* */} - {/* */} - {/* */} - {/* */} {store.ui.mediaQuery.isDesktop && (
{ >

@@ -418,7 +346,6 @@ export const Konfirmasi = observer(() => { okType: "primary", onOk() { handleApprove(item.id); - //console.log(record.id); }, onCancel() { console.log("Cancel"); @@ -473,20 +400,14 @@ export const Konfirmasi = observer(() => { )}

*/}
{ const { Option } = Select; const { Title } = Typography; @@ -245,17 +244,7 @@ export const Payback = observer(() => { modalLoader.setLoading(false); store.payback.visibleModalFilterPayback = false; }; - - const handleFilterCategory = async (value) => { - if (value) { - store.product.filterCategory = value; - await store.product.getDataSubCategories(); - } else { - store.product.filterCategory = null; - await store.product.getDataSubCategories(); - } - }; - + const footerLayoutFilter = [
- - */} - {/* */} - - */} - - {/* */} + + - + ); diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 846f497..0eb67f6 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -128,6 +128,11 @@ export const Profile = observer(() => { , ]; const columns = [ + { + title: "Name Produk", + dataIndex: "name", + key: "name", + }, { title: "Price", dataIndex: "price", @@ -142,6 +147,7 @@ export const Profile = observer(() => { title: "Pembeli", dataIndex: "buyer", key: "buyer", + width: "10%", }, { title: "Tujuan", @@ -196,9 +202,13 @@ export const Profile = observer(() => { title: "Tanggal Transaksi", dataIndex: "created_at", key: "created_at", - + width: "15%", render: (text, record) => { - return {format(parseISO(record.created_at), "dd-MM-yyyy")}; + return ( + + {format(parseISO(record.created_at), "dd-MM-yyyy HH:mm:ss")} + + ); }, }, ]; @@ -306,27 +316,6 @@ export const Profile = observer(() => { )} - {/* {store.authentication.userData.role === "Supervisor" && ( - - - Foto Identitas - - - - - - - - - )} */} diff --git a/src/store/supplier.js b/src/store/supplier.js index ecc81e1..c3e0f74 100644 --- a/src/store/supplier.js +++ b/src/store/supplier.js @@ -1,90 +1,87 @@ -import {makeAutoObservable} from "mobx"; -import {http} from "../utils/http"; +import { makeAutoObservable } from "mobx"; +import { http } from "../utils/http"; export class Supplier { - page = 0; - pageSize = 10 - data = []; - total_data = 0; - filterCategory = null; - visibleModalSupplier = false; - visibleModalTransaction = false; - code = ""; + page = 0; + pageSize = 10; + data = []; + total_data = 0; + filterCategory = null; + visibleModalSupplier = false; + visibleModalTransaction = false; + code = ""; - pageCategories = 0; - pageSizeCategories = 10 - dataCategories = []; - total_dataCategories = 0; + pageCategories = 0; + pageSizeCategories = 10; + dataCategories = []; + total_dataCategories = 0; - pageSubCategories = 0; - pageSizeSubCategories = 10 - dataSubCategories = []; - total_dataSubCategories = 0; + pageSubCategories = 0; + pageSizeSubCategories = 10; + dataSubCategories = []; + total_dataSubCategories = 0; - constructor(ctx) { - this.ctx = ctx; - makeAutoObservable(this); - } + constructor(ctx) { + this.ctx = ctx; + makeAutoObservable(this); + } - async getData() { - try { - const response = await http.get(`/users/supplier?page=${this.page}&pageSize=${this.pageSize}`); - //console.log(response) - this.data = response.body.data ?? [] - this.total_data = response.body.count ?? 0 - } catch (e) { - console.error(e); - } - } - - async create(data) { - // try { - const response = await http.post('/users/supplier').send(data); - //await this.getData(); - return response; - // } catch (e) { - // console.error(e); - // } - } - async createTransaction(data) { - try { - const response = await http.post('/transaction/add-saldo-supplier').send(data); - await this.getData(); - return response; - } catch (e) { - console.error(e); - } + async getData() { + try { + const response = await http.get( + `/users/supplier?page=${this.page}&pageSize=${this.pageSize}` + ); + //console.log(response) + this.data = response.body.data ?? []; + this.total_data = response.body.count ?? 0; + } catch (e) { + console.error(e); } + } - async update(id, data) { - try { - const response = await http.put(`/users/supplier/${id}`).send(data); - await this.getData(); - return response; - } catch (e) { - console.error(e); - } + async create(data) { + const response = await http.post("/users/supplier").send(data); + return response; + } + async createTransaction(data) { + try { + const response = await http + .post("/transaction/add-saldo-supplier") + .send(data); + await this.getData(); + return response; + } catch (e) { + console.error(e); } + } - async delete(id) { - try { - const response = await http.del(`/product/${id}`); - await this.getData(); - return response; - } catch (e) { - console.error(e) - } + async update(id, data) { + try { + const response = await http.put(`/users/supplier/${id}`).send(data); + await this.getData(); + return response; + } catch (e) { + console.error(e); } + } - async changeStatus(id, status) { - try { - const response = await http.get(`/users/supplier/${id}/${status}`); - await this.getData(); - return response; - } catch (e) { - console.error(e); - } + async delete(id) { + try { + const response = await http.del(`/product/${id}`); + await this.getData(); + return response; + } catch (e) { + console.error(e); } + } + + async changeStatus(id, status) { + try { + const response = await http.get(`/users/supplier/${id}/${status}`); + await this.getData(); + return response; + } catch (e) { + console.error(e); + } + } } - - diff --git a/src/store/transaction.js b/src/store/transaction.js index f10cb9e..d212316 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -143,7 +143,7 @@ export class Transaction { async getDetailHistoryTransaction(id) { try { - const response = await http.get(`/transaction/history-user/${id}?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStartDetailUser}&end=${this.filterEndDetailUser}`); + const response = await http.get(`/transaction/history-user/${id}?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}`); console.log(response,'Data Trans'); this.dataDetailHistoryTransactionDetailUser = response.body.data ?? []; this.total_data = response?.body?.count ?? 0;