Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qr "cancel" history removed

Browse Source
This commit is contained in:
moon 2026-06-03 14:47:48 +06:30
parent 7145000175
commit 7a317dede7
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
View File

@ -2,6 +2,7 @@ package com.utsmm.kbz.ui.core_viewmodel;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.widget.ListView; import android.widget.ListView;
@ -231,7 +232,15 @@ public class SharedViewModel extends ViewModel {
public void setPrintReceiptMsg(String msg) { this.printReceiptMsg.setValue(msg);} public void setPrintReceiptMsg(String msg) { this.printReceiptMsg.setValue(msg);}
public void postPrintReceiptMsg(String msg) { this.printReceiptMsg.postValue(msg);} public void postPrintReceiptMsg(String msg) { this.printReceiptMsg.postValue(msg);}
public void setPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); } public void setPrintStatus(PrintStatus printStatus) {
// this.printStatus.postValue(printStatus);
if (Looper.myLooper() == Looper.getMainLooper()) {
this.printStatus.setValue(printStatus);
} else {
this.printStatus.postValue(printStatus);
}
}
public void postPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); } public void postPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
public SingleLiveEvent<PrintStatus> getPrintStatus() { return this.printStatus; } public SingleLiveEvent<PrintStatus> getPrintStatus() { return this.printStatus; }

2
baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
View File

@ -186,7 +186,7 @@ public interface PayDetailDao {
@Query("SELECT * FROM paydetail ORDER BY PID DESC") @Query("SELECT * FROM paydetail ORDER BY PID DESC")
LiveData<List<PayDetail>> getAllTrans(); LiveData<List<PayDetail>> getAllTrans();
@Query("SELECT * FROM paydetail WHERE transactionType = 20 ORDER BY PID DESC") @Query("SELECT * FROM paydetail WHERE transactionType = 20 AND qrTransStatus = 1 ORDER BY PID DESC")
LiveData<List<PayDetail>> getAllQRHistory(); LiveData<List<PayDetail>> getAllQRHistory();
@Query("SELECT * FROM paydetail WHERE transactionType = 20 AND qrTransStatus = 1 AND isCanceled = 0 ORDER BY PID DESC") @Query("SELECT * FROM paydetail WHERE transactionType = 20 AND qrTransStatus = 1 AND isCanceled = 0 ORDER BY PID DESC")

8
baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
View File

@ -254,8 +254,8 @@ public class NetworkModule {
} }
if (baseUrl.isEmpty()) { if (baseUrl.isEmpty()) {
// baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; //UAT baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; //UAT
baseUrl = "https://api.kbzpay.com/payment/gateway/"; //Prod // baseUrl = "https://api.kbzpay.com/payment/gateway/"; //Prod
} }
return new Retrofit.Builder() return new Retrofit.Builder()
.baseUrl(baseUrl) .baseUrl(baseUrl)
@ -311,8 +311,8 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) {
// char[] password = "test123".toCharArray(); // char[] password = "test123".toCharArray();
String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/"; // String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/";
// String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/"; String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/";
// String IpAddress = SystemParamsOperation.getInstance().getSecHostIpAddress(); // String IpAddress = SystemParamsOperation.getInstance().getSecHostIpAddress();