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

fixed password for refund

Browse Source
This commit is contained in:
kizzy 2025-11-13 01:01:01 +07:00
parent 644df8211d
commit 28d4672878
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/utsmm/kbz/ui/core_ui/InputPasswordFragment.java
View File

@ -144,6 +144,7 @@ public class InputPasswordFragment extends DataBindingFragment implements DataBi
switch (Objects.requireNonNull(sharedViewModel.transactionsType.getValue())) {
case MMQR_REFUND:
inputPasswordViewModel.passwordType.setValue(InputPasswordType.SYSTEM);
routeId = R.id.action_inputPasswordFragment_to_qrRefundList;
break;
case PRE_AUTH_COMPLETE_VOID:
inputPasswordViewModel.passwordType.setValue(InputPasswordType.SYSTEM);
@ -245,10 +246,6 @@ public class InputPasswordFragment extends DataBindingFragment implements DataBi
if(inputPasswordViewModel.onClickEnter()) {
clearLiveData();
if(sharedViewModel.transactionsType.getValue() == TransactionsType.MMQR_REFUND){
safePopBackStack();
return;
}
if(sharedViewModel.transactionsType.getValue() == TransactionsType.SETTING) {
mListener.onSuccess();

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

@ -18,6 +18,7 @@ import com.utsmyanmar.paylibs.print.printx.PrintXStatus;
import com.utsmyanmar.paylibs.system.SingleLiveEvent;
import com.utsmyanmar.paylibs.utils.PrintStatus;
import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionType;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
import com.utsmm.kbz.util.enums.AccountType;
import com.utsmm.kbz.util.enums.SettlementType;
@ -167,6 +168,9 @@ public class SharedViewModel extends ViewModel {
}
public void setTransactionsType(TransactionsType transactionType) {
this.transactionsType.postValue(transactionType);
}
public void setEmvTrans(boolean status) {
isEmv.setValue(status);
}

8
app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
View File

@ -48,7 +48,8 @@ public class QRPayFragment extends DataBindingFragment {
@Override
protected void initViewModel() {
mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
// sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
}
@Override
@ -76,6 +77,7 @@ public class QRPayFragment extends DataBindingFragment {
});
DataBindingConfig config = new DataBindingConfig(R.layout.fragment_qr_pay, BR.mainViewModel, mainViewModel);
config.addBindingParam(BR.sharedViewModel,sharedViewModel);
config.addBindingParam(BR.adapter, adapter);
return config;
}
@ -133,7 +135,9 @@ public class QRPayFragment extends DataBindingFragment {
}
private void onClickRefund(){
routeId = R.id.action_qrFragment_to_qr_refund_list;
sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND);
// routeId = R.id.action_qrFragment_to_qr_refund_list;
routeId = R.id.action_qrFragment_to_inputPasswordFragment;
safeNavigateToRouteId();
}

3
app/src/main/res/layout/fragment_qr_pay.xml
View File

@ -9,6 +9,9 @@
<variable
name="adapter"
type="androidx.recyclerview.widget.RecyclerView.Adapter" />
<variable
name="sharedViewModel"
type="com.utsmm.kbz.ui.core_viewmodel.SharedViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

12
app/src/main/res/navigation/mobile_navigation.xml
View File

@ -335,6 +335,12 @@
app:popUpToInclusive="true"
android:id="@+id/action_inputPasswordFragment_to_inputTraceFragment"
app:destination="@id/inputTraceFragment" />
<action
app:launchSingleTop="true"
app:popUpTo="@+id/inputPasswordFragment"
app:popUpToInclusive="true"
android:id="@+id/action_inputPasswordFragment_to_qrRefundList"
app:destination="@id/qrRefundList" />
</fragment>
@ -1090,6 +1096,12 @@
android:id="@+id/action_qrFragment_to_qr_refund_list"
app:destination="@id/qrRefundList"
/>
<action
app:launchSingleTop="true"
app:popUpTo="@+id/fragment_qr_pay"
app:popUpToInclusive="true"
android:id="@+id/action_qrFragment_to_inputPasswordFragment"
app:destination="@id/inputPasswordFragment" />
</fragment>
<!-- <fragment-->

4
gradle.properties
View File

@ -8,8 +8,8 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
# Force Gradle to use system Java instead of Android Studio's JBR
#org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.16.8-hotspot
org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
#org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.16.8-hotspot
# Enable parallel builds and configure cache
org.gradle.parallel=true