check from dev

app/src/main/java/com/yono/messeripos/BottomSheets.java

@@ -47,7 +47,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
     Utils utils;
     String defaultText = "0";
     Client client = new Client();
-    public static long grossAmount,result, input;
+    public static long grossAmount, input, result;
     SharedPreferences sharedPreferences;
     public static BottomSheetBehavior bottomSheetBehavior;
     RelativeLayout layoutFormCash;
@@ -82,6 +82,12 @@ public class BottomSheets extends BottomSheetDialogFragment {
         btnCash = v.findViewById(R.id.btnCash);
         totalHarga = v.findViewById(R.id.totalHarga);
         utils = new Utils();
+<<<<<<< HEAD
+=======
+
+        btnCash.setEnabled(false);
+
+>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
 //        bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
         sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
 //        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
@@ -127,14 +133,19 @@ public class BottomSheets extends BottomSheetDialogFragment {
 
             @Override
             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();
                 input = Long.parseLong(inputAmount.getText().toString());
                 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
@@ -149,16 +160,17 @@ public class BottomSheets extends BottomSheetDialogFragment {
     }
 
     private void bayar(View view) {
-        
+
 //        String orderId, String paymentType, String bank, long grossAmount
         PaymentsModels paymentsModels = new PaymentsModels(
                 sharedPreferences.getString(ORDER_ID, ""),
                 "cash",
                 "none",
                 grossAmount
-                );
+        );
 
         PaymentService paymentService = client.Client(PaymentService.class);
+<<<<<<< HEAD
         paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
             @Override
             public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
@@ -176,9 +188,28 @@ public class BottomSheets extends BottomSheetDialogFragment {
 
             @Override
             public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
+=======
+
+            paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() {
+                @Override
+                public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) {
+                    Log.i("CASH", "onResponse: " + utils.convertGson(response.body()));
+                    if (response.body() != null) {
+                        SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit();
+                        editor.putBoolean(CHECKOUT, false);
+                        editor.putString(ORDER_ID, "");
+                        if (editor.commit()) {
+                            Intent i = new Intent(getActivity(), MainActivity.class);
+                            view.getContext().startActivity(i);
+                        }
+                    }
+                }
+                @Override
+                public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
+>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
 
-            }
-        });
+                }
+            });
 
-    }
+        }
 }

app/src/main/res/layout/activity_q_r_code.xml

 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/bot_sheet"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.Rounded.BottomSheet"
+    app:behavior_hideable="false"
+    app:behavior_peekHeight="500dp"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     xmlns:android="http://schemas.android.com/apk/res/android">
 

app/src/main/res/layout/item_category.xml

@@ -58,7 +58,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/categoryDelete"
-            android:layout_width="70dp"
+            android:layout_width="0dp"
             android:layout_height="40dp"
             android:backgroundTint="@android:color/holo_red_dark"
             android:text="DELETE"
@@ -71,7 +71,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/categoryUpdate"
-            android:layout_width="70dp"
+            android:layout_width="0dp"
             android:layout_height="40dp"
             android:backgroundTint="@color/colorGreen"
             android:text="UPDATE"