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

void by invoice

Browse Source
This commit is contained in:
moon 2026-06-21 21:20:00 +06:30
parent 1e29fd9fab
commit afd3d925e1
5 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.idea/deploymentTargetSelector.xml
View File

@ -13,6 +13,39 @@
</DropdownSelection> </DropdownSelection>
<DialogSelection /> <DialogSelection />
</SelectionState> </SelectionState>
<SelectionState runConfigName="unitTest">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-01-20T10:19:44.274945Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="androidTest">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-01-20T10:19:44.274945Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="main">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-01-20T10:19:44.274945Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
</selectionStates> </selectionStates>
</component> </component>
</project> </project>

14
app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
View File

@ -116,7 +116,14 @@ public class InputTraceNoFragment extends DataBindingFragment {
clearInputView(); clearInputView();
setToolBarTitleWithBackIcon(getResourceString(R.string.title_trace_number)); TransactionsType currentTransType = sharedViewModel.transactionsType.getValue();
if (currentTransType == TransactionsType.VOID
|| currentTransType == TransactionsType.TIP_ADJUSTMENT
|| currentTransType == TransactionsType.PRE_AUTH_COMPLETE_VOID) {
setToolBarTitleWithBackIcon(getResourceString(R.string.title_invoice_number));
} else {
setToolBarTitleWithBackIcon(getResourceString(R.string.title_trace_number));
}
if (sharedViewModel.isEcr.getValue() != null) { if (sharedViewModel.isEcr.getValue() != null) {
if (sharedViewModel.isEcr.getValue()) { if (sharedViewModel.isEcr.getValue()) {
@ -151,10 +158,9 @@ public class InputTraceNoFragment extends DataBindingFragment {
configTime = "23:00"; configTime = "23:00";
} }
LogUtil.d(TAG,"Input trace :"+traceNo); LogUtil.d(TAG,"Input invoice :"+traceNo);
// voidViewModel.getGenericVoidTransactions(transType,POSUtil.getInstance().formatTrace(traceNo),isEmv).observe(getViewLifecycleOwner(), new Observer<PayDetail>() { voidViewModel.getVoidTransByInvoice(transType, POSUtil.getInstance().formatTrace(traceNo)).observe(getViewLifecycleOwner(), new Observer<PayDetail>() {
voidViewModel.getVoidTrans(transType,POSUtil.getInstance().formatTrace(traceNo)).observe(getViewLifecycleOwner(), new Observer<PayDetail>() {
@Override @Override
public void onChanged(PayDetail payDetail) { public void onChanged(PayDetail payDetail) {

4
app/src/main/java/com/utsmm/kbz/ui/sale_void/VoidViewModel.java
View File

@ -39,6 +39,10 @@ public class VoidViewModel extends ViewModel {
return repository.getVoidTransaction(transType,voucherNo); return repository.getVoidTransaction(transType,voucherNo);
} }
public LiveData<PayDetail> getVoidTransByInvoice(int transType, String invoiceNo) {
return repository.getVoidTransactionByInvoice(transType, invoiceNo);
}
public void observeVoidTrans(int transType) { public void observeVoidTrans(int transType) {
getVoidTransactions(transType).observeForever(new Observer<List<PayDetail>>() { getVoidTransactions(transType).observeForever(new Observer<List<PayDetail>>() {

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

@ -120,6 +120,9 @@ public interface PayDetailDao {
@Query("SELECT * FROM paydetail WHERE isSettle = 0 AND transactionType IN(:transType) AND voucherNo IN(:voucherNo)") @Query("SELECT * FROM paydetail WHERE isSettle = 0 AND transactionType IN(:transType) AND voucherNo IN(:voucherNo)")
LiveData<PayDetail> getVoidTrans(int transType,String voucherNo); LiveData<PayDetail> getVoidTrans(int transType,String voucherNo);
@Query("SELECT * FROM paydetail WHERE isSettle = 0 AND transactionType IN(:transType) AND invoiceNo IN(:invoiceNo)")
LiveData<PayDetail> getVoidTransByInvoice(int transType, String invoiceNo);
// 5 = PRE_SALE // 5 = PRE_SALE
@Query("SELECT * FROM paydetail WHERE isCanceled = 0 AND transactionType = 5 AND voucherNo IN(:voucherNo) AND accountType != 'MPU'") @Query("SELECT * FROM paydetail WHERE isCanceled = 0 AND transactionType = 5 AND voucherNo IN(:voucherNo) AND accountType != 'MPU'")

3
baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
View File

@ -185,7 +185,10 @@ public class Repository {
public LiveData<PayDetail> getVoidTransaction(int transType,String voucherNo) { public LiveData<PayDetail> getVoidTransaction(int transType,String voucherNo) {
return payDetailDao.getVoidTrans(transType,voucherNo); return payDetailDao.getVoidTrans(transType,voucherNo);
}
public LiveData<PayDetail> getVoidTransactionByInvoice(int transType, String invoiceNo) {
return payDetailDao.getVoidTransByInvoice(transType, invoiceNo);
} }