Merge branch 'master' of https://git.mdd.co.id:44195/abimulya/your-cashier

app/src/main/java/com/example/yourcashiertest/activities/MainActivity.java

@@ -3,6 +3,7 @@ package com.example.yourcashiertest.activities;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 import android.Manifest;
@@ -12,6 +13,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.widget.PopupMenu;
 import android.widget.Toast;
 
@@ -23,6 +25,8 @@ import com.example.yourcashiertest.entities.Product;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
 import com.example.yourcashiertest.viewmodels.ProductViewModel;
 
+import java.util.List;
+
 
 public class MainActivity extends AppCompatActivity {
 
@@ -39,6 +43,7 @@ public class MainActivity extends AppCompatActivity {
     public static boolean visibility = false;
     ProductViewModel viewModel;
     CartViewModel cartViewModel;
+    boolean added = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -137,6 +142,9 @@ public class MainActivity extends AppCompatActivity {
 
 
     public void addToCart(Product product){
+        // cek apakah sudah ditambahkan
+//        checkProduct(product);
+
         product.setQuantity(product.getQuantity() - 1);
         viewModel.updateProduct(product);
         Cart cart = new Cart(0,"", "", 0, 0, 0);
@@ -147,9 +155,24 @@ public class MainActivity extends AppCompatActivity {
         cart.setQty(1);
         cart.setRealPrice(product.getPrice());
         cartViewModel.insertCart(cart);
+
         Toast.makeText(MainActivity.this, "Produk berhasil ditambahkan ke keranjang", Toast.LENGTH_LONG).show();
     }
 
+//    public void checkProduct(Product product){
+//        cartViewModel.getCarts().observe(this, new Observer<List<Cart>>() {
+//            @Override
+//            public void onChanged(List<Cart> carts) {
+//                for(int i = 0; i < carts.size(); i++){
+//                    if (carts.get(i).getNameProduct().equals(product.getName())){
+//                        carts.get(i).setQty(carts.get(i).getQty() + 1);
+//                        cartViewModel.updateCart(carts.get(i));
+//                        break;
+//                    }
+//                }
+//            }
+//        });
+//    }
 
     @Override
     public void onBackPressed() {

app/src/main/java/com/example/yourcashiertest/activities/PaymentActivity.java

@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 
+import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RadioButton;
@@ -19,6 +20,7 @@ import android.widget.Toast;
 import com.example.yourcashiertest.R;
 import com.example.yourcashiertest.databinding.ActivityPaymentBinding;
 import com.example.yourcashiertest.utils.Convert;
+import com.example.yourcashiertest.utils.ViewUtil;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
 
 public class PaymentActivity extends AppCompatActivity {
@@ -52,14 +54,20 @@ public class PaymentActivity extends AppCompatActivity {
 //        });
 
 
+
+
     }
 
     public void btnPay(View view) {
-        int amountPaid = Integer.parseInt(binding.etAmountPaid.getText().toString());
-        refund = amountPaid - amount;
-        startActivity(new Intent(PaymentActivity.this, StatusPayment.class).putExtra(REFUND, refund));
-        cartViewModel.clear();
-        finish();
+        if (TextUtils.isEmpty(binding.etAmountPaid.getText().toString())){
+            ViewUtil.showMessage(view, "Amount paid not empty");
+        }else {
+            int amountPaid = Integer.parseInt(binding.etAmountPaid.getText().toString());
+            refund = amountPaid - amount;
+            startActivity(new Intent(PaymentActivity.this, StatusPayment.class).putExtra(REFUND, refund));
+            cartViewModel.clear();
+            finish();
+        }
     }