Merge branch 'develop' into 'main'

Develop

See merge request empatnusabangsa/ppob/ppob-frontend!132

src/store/transaction.js

@@ -23,7 +23,7 @@ export class Transaction {
   pageSizeSubCategories = 10;
   dataSubCategories = [];
   total_dataSubCategories = 0;
-  filterSubCategory = null;
+  //filterSubCategory = null;
 
   pageHistoryTransaction = 0;
   pageSizeHistoryTransaction = 10;
@@ -40,6 +40,9 @@ export class Transaction {
   dataHistoryTopUp = [];
   total_dataHistoryTopUp = 0;
 
+  dataHistoryTopUpProfile = [];
+  total_dataHistoryTopUpProfile = 0;
+
   dataTransaction = [];
   dataTransactionB2B = [];
   dataTransactionPartner = [];
@@ -155,7 +158,7 @@ export class Transaction {
   async getDataHistoryTopUp(id) {
     try {
       const response = await http.get(
-        `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}`
+        `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
       );
       console.log(response,'get data history')
       this.dataHistoryTopUp = response.body.data ?? [];
@@ -165,6 +168,19 @@ export class Transaction {
     }
   }
 
+  async getDataHistoryTopUpProfile(id) {
+    try {
+      const response = await http.get(
+        `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
+      );
+      console.log(response,'get data history Profile')
+      this.dataHistoryTopUpProfile = response.body.data ?? [];
+      this.total_dataHistoryTopUpProfile = response?.body?.count ?? 0;
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
   async create(data) {
     try {
       const response = await http.post("/product").send(data);