Commit 399d9729 authored by iman Fauzi's avatar iman Fauzi

🐛 fix payment button, ketika onchange kurang dari harga, maka button tidak aktif

parent 41dab5ea
...@@ -44,7 +44,7 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -44,7 +44,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
Utils utils; Utils utils;
String defaultText = "0"; String defaultText = "0";
Client client = new Client(); Client client = new Client();
public static long grossAmount; public static long grossAmount, input, result;
SharedPreferences sharedPreferences; SharedPreferences sharedPreferences;
public static BottomSheetBehavior bottomSheetBehavior; public static BottomSheetBehavior bottomSheetBehavior;
RelativeLayout layoutFormCash; RelativeLayout layoutFormCash;
...@@ -80,6 +80,8 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -80,6 +80,8 @@ public class BottomSheets extends BottomSheetDialogFragment {
totalHarga = v.findViewById(R.id.totalHarga); totalHarga = v.findViewById(R.id.totalHarga);
utils = new Utils(); utils = new Utils();
btnCash.setEnabled(false);
// bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash); // bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE); sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); // bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
...@@ -124,14 +126,19 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -124,14 +126,19 @@ public class BottomSheets extends BottomSheetDialogFragment {
@Override @Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
if (TextUtils.isEmpty(charSequence)) inputAmount.setText(""); if (TextUtils.isEmpty(charSequence)) inputAmount.setText("0");
grossAmount = paymentsModels.getGrossAmount(); grossAmount = paymentsModels.getGrossAmount();
long input = Long.parseLong(inputAmount.getText().toString()); input = Long.parseLong(inputAmount.getText().toString());
long result = input-grossAmount; result = input-grossAmount;
hargaChange.setText(utils.convertPrice("Rp.", result)); if (result > 0) {
btnCash.setEnabled(true);
}else {
btnCash.setEnabled(false);
}
hargaChange.setText(utils.convertPrice("Rp.", result));
} }
@Override @Override
...@@ -156,21 +163,21 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -156,21 +163,21 @@ public class BottomSheets extends BottomSheetDialogFragment {
); );
PaymentService paymentService = client.Client(PaymentService.class); PaymentService paymentService = client.Client(PaymentService.class);
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() { paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() {
@Override @Override
public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) { public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) {
Log.i("CASH", "onResponse: "+utils.convertGson(response.body())); Log.i("CASH", "onResponse: " + utils.convertGson(response.body()));
if (response.body() != null){ if (response.body() != null) {
SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit(); SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit();
editor.putBoolean(CHECKOUT, false); editor.putBoolean(CHECKOUT, false);
editor.putString(ORDER_ID, ""); editor.putString(ORDER_ID, "");
if (editor.commit()){ if (editor.commit()) {
Intent i = new Intent(getActivity(), MainActivity.class); Intent i = new Intent(getActivity(), MainActivity.class);
view.getContext().startActivity(i); view.getContext().startActivity(i);
} }
} }
} }
@Override @Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) { public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
......
...@@ -45,6 +45,7 @@ import retrofit2.Call; ...@@ -45,6 +45,7 @@ import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import static com.yono.messeripos.BottomSheets.bottomSheetBehavior;
import static com.yono.messeripos.BottomSheets.grossAmount; import static com.yono.messeripos.BottomSheets.grossAmount;
import static com.yono.messeripos.MainActivity.CHECKOUT; import static com.yono.messeripos.MainActivity.CHECKOUT;
import static com.yono.messeripos.MainActivity.ORDER_ID; import static com.yono.messeripos.MainActivity.ORDER_ID;
...@@ -66,13 +67,13 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -66,13 +67,13 @@ public class PaymentActivity extends AppCompatActivity {
public static BottomSheets bottomSheet; public static BottomSheets bottomSheet;
public static QRCode qrCode; public static QRCode qrCode;
public static SharedPreferences sharedPreferences; public static SharedPreferences sharedPreferences;
Button cashBtn;
ProgressDialog progressDialog; ProgressDialog progressDialog;
BottomSheetBehavior bottomSheetBank; BottomSheetBehavior bottomSheetBank;
RelativeLayout qrcodeLayoutBank; RelativeLayout qrcodeLayoutBank;
PaymentsModels paymentsModelsIntent; PaymentsModels paymentsModelsIntent;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -210,7 +211,7 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -210,7 +211,7 @@ public class PaymentActivity extends AppCompatActivity {
qrCode = new QRCode(response.body()); qrCode = new QRCode(response.body());
qrCode.show( qrCode.show(
getSupportFragmentManager(), getSupportFragmentManager(),
"QRCode" qrCode.getTag()
); );
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bot_sheet"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Rounded.BottomSheet" style="@style/Widget.Rounded.BottomSheet"
app:behavior_hideable="false"
app:behavior_peekHeight="500dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment