PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging

Browse Source
This commit is contained in:
Muhammad Fadli 2023-05-10 15:08:35 +07:00
commit 63bb902eea
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/Membership/DetailUser.js
View File

@ -45,6 +45,7 @@ export const DetailUser = observer(() => {
const [filterStart, setFilterStart] = useState([]); const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]); const [filterEnd, setFilterEnd] = useState([]);
const [filterTrxId, setFilterTrxId] = useState([]); const [filterTrxId, setFilterTrxId] = useState([]);
const [filterPartnerTrxId, setFilterPartnerTrxId] = useState([]);
const [visibleHis, setVisibleHis] = useState(true); const [visibleHis, setVisibleHis] = useState(true);
const [actionFilter, setAction] = useState(false); const [actionFilter, setAction] = useState(false);
const [actionFilterByCode, setActionFilterByCode] = useState(false); const [actionFilterByCode, setActionFilterByCode] = useState(false);
@ -396,10 +397,12 @@ export const DetailUser = observer(() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
formFilterByTrxCode.resetFields(); formFilterByTrxCode.resetFields();
setFilterStart([]); setFilterStart([]);
setFilterEnd([]); setFilterEnd([]);
setFilterTrxId([]); setFilterTrxId([]);
setFilterPartnerTrxId([]);
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false); setActionFilterByCode(false);
await store.transaction.getDetailHistoryTransaction( await store.transaction.getDetailHistoryTransaction(
@ -426,6 +429,7 @@ export const DetailUser = observer(() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false); setActionFilterByCode(false);
@ -455,7 +459,8 @@ export const DetailUser = observer(() => {
const handleSubmitFilterByTrxId = async (data) => { const handleSubmitFilterByTrxId = async (data) => {
store.transaction.filterStart = null store.transaction.filterStart = null
store.transaction.filterEnd = null store.transaction.filterEnd = null
store.transaction.filterTrxId = data.trx_id store.transaction.filterTrxId = data.trx_id == undefined || data.trx_id == '' ? null : data.trx_id
store.transaction.filterPartnerTrxId = data.partner_trx_id == undefined || data.partner_trx_id == '' ? null : data.partner_trx_id
modalLoader.setLoading(true); modalLoader.setLoading(true);
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -1012,7 +1017,7 @@ export const DetailUser = observer(() => {
}} }}
> >
<FilterOutlined /> <FilterOutlined />
Filter By Transaction Code Filter : kode transaksi/ IDTrx Mitra
</Button> </Button>
<Table <Table
key="1" key="1"
@ -1223,12 +1228,13 @@ export const DetailUser = observer(() => {
<Modal <Modal
visible={store.transaction.visibleModalFilterTransactionByCode} visible={store.transaction.visibleModalFilterTransactionByCode}
title={"Filter by transaction code"} title={"Filter : kode transaksi/ IDTrx Mitra"}
footer={footerLayoutFilterByTrxId} footer={footerLayoutFilterByTrxId}
onCancel={async () => { onCancel={async () => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)
@ -1244,7 +1250,13 @@ export const DetailUser = observer(() => {
<Form.Item <Form.Item
name="trx_id" name="trx_id"
label="Kode Transaksi" label="Kode Transaksi"
rules={[{ required: true, message: "Please input transaction code!" }]} >
<Input />
</Form.Item>
<Form.Item
name="partner_trx_id"
label="IDTrx Mitra"
> >
<Input /> <Input />
</Form.Item> </Form.Item>

19
src/pages/Profile/Profile.js
View File

@ -41,6 +41,7 @@ export const Profile = observer(() => {
const [filterStart, setFilterStart] = useState([]); const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]); const [filterEnd, setFilterEnd] = useState([]);
const [filterTrxId, setFilterTrxId] = useState([]); const [filterTrxId, setFilterTrxId] = useState([]);
const [filterPartnerTrxId, setFilterPartnerTrxId] = useState([]);
const [actionFilter, setAction] = useState(false); const [actionFilter, setAction] = useState(false);
const [actionFilterByCode, setActionFilterByCode] = useState(false); const [actionFilterByCode, setActionFilterByCode] = useState(false);
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
@ -100,10 +101,12 @@ export const Profile = observer(() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
formFilterByTrxCode.resetFields(); formFilterByTrxCode.resetFields();
setFilterStart([]); setFilterStart([]);
setFilterEnd([]); setFilterEnd([]);
setFilterTrxId([]); setFilterTrxId([]);
setFilterPartnerTrxId([]);
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false); setActionFilterByCode(false);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
@ -127,6 +130,7 @@ export const Profile = observer(() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false); setActionFilterByCode(false);
@ -157,7 +161,8 @@ export const Profile = observer(() => {
const handleSubmitFilterByTrxId = async (data) => { const handleSubmitFilterByTrxId = async (data) => {
store.transaction.filterStart = null store.transaction.filterStart = null
store.transaction.filterEnd = null store.transaction.filterEnd = null
store.transaction.filterTrxId = data.trx_id store.transaction.filterTrxId = data.trx_id == undefined || data.trx_id == '' ? null : data.trx_id
store.transaction.filterPartnerTrxId = data.partner_trx_id == undefined || data.partner_trx_id == '' ? null : data.partner_trx_id
modalLoader.setLoading(true); modalLoader.setLoading(true);
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -785,7 +790,7 @@ export const Profile = observer(() => {
}} }}
> >
<FilterOutlined /> <FilterOutlined />
Filter By Transaction Code Filter : kode transaksi/ IDTrx Mitra
</Button> </Button>
{store.ui.mediaQuery.isDesktop && ( {store.ui.mediaQuery.isDesktop && (
<Table <Table
@ -1066,13 +1071,14 @@ export const Profile = observer(() => {
<Modal <Modal
visible={store.transaction.visibleModalFilterTransactionByCode} visible={store.transaction.visibleModalFilterTransactionByCode}
title={"Filter by transaction code"} title={"Filter : kode transaksi/ IDTrx Mitra"}
footer={footerLayoutFilterByTrxId} footer={footerLayoutFilterByTrxId}
onCancel={async () => { onCancel={async () => {
//form.resetFields(); //form.resetFields();
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.filterTrxId = null; store.transaction.filterTrxId = null;
store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false; store.transaction.visibleModalFilterTransactionByCode = false;
actionFilterByCode === true actionFilterByCode === true
? await store.transaction.getDataHistoryTopUpProfile( ? await store.transaction.getDataHistoryTopUpProfile(
@ -1087,10 +1093,15 @@ export const Profile = observer(() => {
<Form.Item <Form.Item
name="trx_id" name="trx_id"
label="Kode Transaksi" label="Kode Transaksi"
rules={[{ required: true, message: "Please input transaction code!" }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item
name="partner_trx_id"
label="IDTrx Mitra"
>
<Input />
</Form.Item>
</Form> </Form>
</Col> </Col>
</Row> </Row>

5
src/store/transaction.js
View File

@ -68,6 +68,7 @@ export class Transaction {
filterStart = null; filterStart = null;
filterEnd = null; filterEnd = null;
filterTrxId = null; filterTrxId = null;
filterPartnerTrxId = null;
filterStartDetailUser = null; filterStartDetailUser = null;
filterEndDetailUser = null; filterEndDetailUser = null;
constructor(ctx) { constructor(ctx) {
@ -165,7 +166,7 @@ export class Transaction {
async getDataHistoryTransaction() { async getDataHistoryTransaction() {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}&trxId=${this.filterTrxId}` `/transaction/history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}&trxId=${this.filterTrxId}&partnerTrxId=${this.filterPartnerTrxId}`
); );
console.log(response); console.log(response);
this.dataHistoryTransaction = response.body.data ?? []; this.dataHistoryTransaction = response.body.data ?? [];
@ -177,7 +178,7 @@ export class Transaction {
async getDetailHistoryTransaction(id) { async getDetailHistoryTransaction(id) {
try { try {
const response = await http.get(`/transaction/history-user/${id}?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}&trxId=${this.filterTrxId}`); const response = await http.get(`/transaction/history-user/${id}?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}&trxId=${this.filterTrxId}&partnerTrxId=${this.filterPartnerTrxId}`);
console.log(response, 'Data Trans'); console.log(response, 'Data Trans');
this.dataDetailHistoryTransactionDetailUser = response.body.data ?? []; this.dataDetailHistoryTransactionDetailUser = response.body.data ?? [];
this.total_data = response?.body?.count ?? 0; this.total_data = response?.body?.count ?? 0;