diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index d8013ed..f4e2dd3 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -45,6 +45,7 @@ export const DetailUser = observer(() => {
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
const [filterTrxId, setFilterTrxId] = useState([]);
+ const [filterPartnerTrxId, setFilterPartnerTrxId] = useState([]);
const [visibleHis, setVisibleHis] = useState(true);
const [actionFilter, setAction] = useState(false);
const [actionFilterByCode, setActionFilterByCode] = useState(false);
@@ -396,10 +397,12 @@ export const DetailUser = observer(() => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.filterTrxId = null;
+ store.transaction.filterPartnerTrxId = null;
formFilterByTrxCode.resetFields();
setFilterStart([]);
setFilterEnd([]);
setFilterTrxId([]);
+ setFilterPartnerTrxId([]);
store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false);
await store.transaction.getDetailHistoryTransaction(
@@ -426,6 +429,7 @@ export const DetailUser = observer(() => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.filterTrxId = null;
+ store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false);
@@ -455,7 +459,8 @@ export const DetailUser = observer(() => {
const handleSubmitFilterByTrxId = async (data) => {
store.transaction.filterStart = 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(false);
@@ -1012,7 +1017,7 @@ export const DetailUser = observer(() => {
}}
>
- Filter By Transaction Code
+ Filter : kode transaksi/ IDTrx Mitra
{
{
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.filterTrxId = null;
+ store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false;
actionFilter === true
? await store.transaction.getDataHistoryTopUp(id)
@@ -1244,7 +1250,13 @@ export const DetailUser = observer(() => {
+
+
+
+
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 9d711d5..916877a 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -41,6 +41,7 @@ export const Profile = observer(() => {
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
const [filterTrxId, setFilterTrxId] = useState([]);
+ const [filterPartnerTrxId, setFilterPartnerTrxId] = useState([]);
const [actionFilter, setAction] = useState(false);
const [actionFilterByCode, setActionFilterByCode] = useState(false);
const [visible, setVisible] = useState(false);
@@ -100,10 +101,12 @@ export const Profile = observer(() => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.filterTrxId = null;
+ store.transaction.filterPartnerTrxId = null;
formFilterByTrxCode.resetFields();
setFilterStart([]);
setFilterEnd([]);
setFilterTrxId([]);
+ setFilterPartnerTrxId([]);
store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false);
await store.transaction.getDataHistoryTransaction();
@@ -127,6 +130,7 @@ export const Profile = observer(() => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.filterTrxId = null;
+ store.transaction.filterPartnerTrxId = null;
store.transaction.visibleModalFilterTransactionByCode = false;
setActionFilterByCode(false);
@@ -157,7 +161,8 @@ export const Profile = observer(() => {
const handleSubmitFilterByTrxId = async (data) => {
store.transaction.filterStart = 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(false);
@@ -785,7 +790,7 @@ export const Profile = observer(() => {
}}
>
- Filter By Transaction Code
+ Filter : kode transaksi/ IDTrx Mitra
{store.ui.mediaQuery.isDesktop && (