Merge branch 'dev' into cart

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

@@ -167,8 +167,17 @@ public class CartActivity extends AppCompatActivity {
 
             @Override
             public void onUpdateQuantityPlus(ProductCartModels productCartModels) {
+                if (!((productCartModels.getQuantity_orders() + 1) > productCartModels.getQuantity_stock() - 1)){
                     productCartModels.setQuantity_orders(productCartModels.getQuantity_orders() + 1);
                     modelsCart.updateCart(productCartModels);
+                }else{
+                    utils.dialog(CartActivity.this,
+                            true,
+                            getLayoutInflater().inflate(R.layout.alert_dialog, null),
+                            "Warning",
+                            "Item stock does not meet").show();
+                }
+
             }
 
             @Override
@@ -239,34 +248,7 @@ public class CartActivity extends AppCompatActivity {
                 paymentsModels.setOrderId(sharedPreferences.getString(ORDER_ID, ""));
                 paymentsModels.setTransactionStatus("pending");
                 Log.i("Convert Input", "onChanged: "+utils.convertGson(paymentsModels));
-                PaymentService paymentService = client.Client(PaymentService.class);
-                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) {
-                        Log.i("Response simpan_cart", "onResponse: "+utils.convertGson(response.body()));
-                        if (response.body() != null){
-                            SharedPreferences.Editor editor = sharedPreferences.edit();
-                            editor.putString(ORDER_ID, "");
-                            if (editor.commit()){
-                                startActivity(new Intent(CartActivity.this, MainActivity.class));
-                                finish();
-                            }
-                        }else{
-                            new AlertDialog.Builder(CartActivity.this)
-                                    .setCancelable(false)
-                                    .setTitle("Save new Order")
-                                    .setMessage("Erorr save!").show();
-                        }
-                    }
 
-                    @Override
-                    public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
-                        new AlertDialog.Builder(CartActivity.this)
-                                .setCancelable(false)
-                                .setTitle("Save new Order")
-                                .setMessage("Add new order failed, try again!").show();
-                    }
-                });
 
             }
         });

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

@@ -61,6 +61,7 @@ public class FormProductActivity extends AppCompatActivity {
     MainViewModels mainViewModels;
     MaterialSpinner spinner;
     List<String> categoryModels;
+    List<String> str = new ArrayList<>();
     private static final int REQUEST_IMAGE_CAPTURE = 1;
     private static final int REQUEST_PERMISSIONS = 448;
     private boolean isUpdate = false;
@@ -75,7 +76,7 @@ public class FormProductActivity extends AppCompatActivity {
     ProgressDialog progressDialog;
     Client client = new Client();
     ProductModels productModelsIntent;
-    List<String> categorySelect = new ArrayList<>();
+    List<Integer> categorySelect = new ArrayList<>();
     FormCategory formCategory;
 
     @RequiresApi(api = Build.VERSION_CODES.N)
@@ -180,7 +181,8 @@ public class FormProductActivity extends AppCompatActivity {
         binding.listCategory.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() {
             @Override
             public void onItemSelected(MaterialSpinner view, int position, long id, Object item) {
-                categorySelect.add(item.toString());
+                progressDialog.show();
+                getCategory(item.toString());
             }
         });
     }
@@ -189,17 +191,15 @@ public class FormProductActivity extends AppCompatActivity {
     private void setSpinner(String s) {
         progressDialog.show();
         HashSet<String> set = new HashSet<>();
-        List<String> str = new ArrayList<>();
         categoryModels = new ArrayList<>();
         Log.i("GET_CATEGORY", "setSpinner: "+utils.convertGson(productModelsIntent));
-//        if (productModelsIntent == null){
-//            str.add("SELECT CATEGORY");
-//        }else{
-//            getCategoryById(productModelsIntent.getIdProduct());
-//            categoryName = ""
-//            str.add(categoryName);
-//        }
+        if (productModelsIntent == null){
             str.add("SELECT CATEGORY");
+        }else{
+            getCategoryById(productModelsIntent.getIdProduct());
+            categorySelect.add(0, productModelsIntent.getCategoryProduct());
+        }
+//        str.add("SELECT CATEGORY");
         mainViewModels.getCategory().observe(this, listDataResponse -> {
             progressDialog.dismiss();
             for (CategoryModels cd: listDataResponse.getData()){
@@ -228,7 +228,7 @@ public class FormProductActivity extends AppCompatActivity {
         productModelsSave.setProductName(binding.etName.getText().toString());
         productModelsSave.setPriceProduct(Integer.parseInt(binding.etPrice.getText().toString()));
         productModelsSave.setStockProduct(Integer.parseInt(binding.etStock.getText().toString()));
-        productModelsSave.setCategoryProduct(getCategory(categorySelect.get(0)));
+        productModelsSave.setCategoryProduct(categorySelect.get(0));
         if (productModelsIntent == null){
             productModelsSave.setImageProduct(productModels.getImageProduct());
         }else{
@@ -346,6 +346,8 @@ public class FormProductActivity extends AppCompatActivity {
                 Log.i("CHDJHD", "getCategory: "+utils.convertGson(response.body()));
                 id = response.body().getData().get(0).getIdCategory();
                 productModels.setCategoryProduct(id);
+                categorySelect.add(0, id);
+                progressDialog.dismiss();
             }
 
             @Override
@@ -362,9 +364,7 @@ public class FormProductActivity extends AppCompatActivity {
             @Override
             public void onResponse(Call<DataResponse<CategoryModels>> call, Response<DataResponse<CategoryModels>> response) {
                 Log.i("ER", "onResponse: "+utils.convertGson(response.body()));
-                if (categoryName.isEmpty()){
-                    categoryName = response.body().getData().getNameCategory();
-                }
+                str.add(response.body().getData().getNameCategory());
             }
 
             @Override

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

@@ -201,7 +201,6 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
-
     private void mainViewModelsGettCategory() {
         mainViewModels.getCategory().observe(this, new Observer<DataResponse<List<CategoryModels>>>() {
             @Override
@@ -339,7 +338,7 @@ public class MainActivity extends AppCompatActivity {
                                     product.getIdProduct(),
                                     product.getProductName(),
                                     product.getPriceProduct(),
-                                    0
+                                    product.getStockProduct()
                             ));
 
 //                            Log.d("order_id_create", "onChanged: "+orderId);

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

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -89,7 +91,9 @@ public class RegisterState extends BottomSheetDialogFragment {
         registerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mainViewModels.postRegis(new UsersModels(username.getText().toString(),email.getText().toString(),password.getText().toString(),repassword.getText().toString()));
+                mainViewModels.postRegis(new UsersModels(username.getText().toString(),
+                        email.getText().toString(),password.getText().toString(),
+                        repassword.getText().toString()));
             }
         });
 

app/src/main/java/com/yono/messeripos/adapter/ProductAdapter.java

@@ -138,7 +138,7 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.MyViewHo
                 binding.materialBtnAddCart.setVisibility(View.GONE);
             }
 
-            if (products.getStockProduct() == 0) {
+            if (products.getStockProduct() <= 1) {
                 statusProduct = "Not Available";
                 binding.status.setBackgroundColor(0x55FF0000);
                 binding.setStatus(statusProduct);

app/src/main/java/com/yono/messeripos/models/MainViewModels.java

@@ -187,7 +187,8 @@ public class MainViewModels extends ViewModel {
         usersService.postRegister(usersModels).enqueue(new Callback<DataResponse<UsersModels>>() {
             @Override
             public void onResponse(Call<DataResponse<UsersModels>> call, Response<DataResponse<UsersModels>> response) {
-
+                Log.i("REGISTER", "onResponse: "+utils.convertGson(response.body()));
+                usersRegister.setValue(response.body());
             }
 
             @Override

app/src/main/java/com/yono/messeripos/models/MainViewModelsCart.java

@@ -19,6 +19,7 @@ import com.yono.messeripos.api.client.Client;
 import com.yono.messeripos.api.service.OrdersService;
 import com.yono.messeripos.api.service.PaymentService;
 import com.yono.messeripos.repositories.CartRepositories;
+import com.yono.messeripos.repositories.PaymentPendingRepositories;
 import com.yono.messeripos.response.DataResponse;
 import com.yono.messeripos.response.OrdersResponse;
 
@@ -36,6 +37,7 @@ public class MainViewModelsCart extends AndroidViewModel {
     private Client client;
 
     private CartRepositories cartRepositories;
+    private PaymentPendingRepositories paymentPendingRepositories;
 
     public void setCart(ProductCartModels product){this.cart.setValue(product);}
 
@@ -47,6 +49,7 @@ public class MainViewModelsCart extends AndroidViewModel {
         super(application);
 
         cartRepositories = new CartRepositories(application);
+        paymentPendingRepositories = new PaymentPendingRepositories(application);
 
         productsLive = cartRepositories.getDataCart();
         client = new Client();

app/src/main/java/com/yono/messeripos/models/ProductCartModels.java

@@ -20,6 +20,9 @@ public class ProductCartModels implements Parcelable {
     @SerializedName("quantity")
     private long quantity_orders;
 
+    @SerializedName("quantity_stock")
+    private long quantity_stock;
+
     @SerializedName("product_id")
     private int id_product_orders;
 
@@ -41,13 +44,13 @@ public class ProductCartModels implements Parcelable {
                              int id_product_orders,
                              String product_name_orders,
                              long price_orders,
-                             int grand_total_orders) {
+                             int quantity_stock) {
         this.id_orders = id_orders;
         this.quantity_orders = quantity_orders;
         this.id_product_orders = id_product_orders;
         this.product_name_orders = product_name_orders;
         this.price_orders = price_orders;
-        this.grand_total_orders = grand_total_orders;
+        this.quantity_stock = quantity_stock;
     }
 
     protected ProductCartModels(Parcel in) {
@@ -143,4 +146,11 @@ public class ProductCartModels implements Parcelable {
         this.grand_total_orders = grand_total_orders;
     }
 
+    public long getQuantity_stock() {
+        return quantity_stock;
+    }
+
+    public void setQuantity_stock(long quantity_stock) {
+        this.quantity_stock = quantity_stock;
+    }
 }

app/src/main/java/com/yono/messeripos/utils/Utils.java

@@ -271,7 +271,7 @@ public class Utils {
 
         AlertDialog dialog = builder.create();
         dialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
-        btnCard.setOnClickListener(view1 -> listener.onClickDisimiss(dialog));
+        btCard.setOnClickListener(view1 -> listener.onClickDisimiss(dialog));
         return dialog;
     }