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

.idea/dictionaries/ABI.xml

+<component name="ProjectDictionaryState">
+  <dictionary name="ABI">
+    <words>
+      <w>transaksi</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file

.idea/dictionaries/ASUS.xml

+<component name="ProjectDictionaryState">
+  <dictionary name="ASUS">
+    <words>
+      <w>transaksi</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file

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

@@ -15,8 +15,10 @@ import com.example.yourcashiertest.adapters.CartAdapter;
 import com.example.yourcashiertest.databinding.ActivityCartBinding;
 import com.example.yourcashiertest.entities.Cart;
 import com.example.yourcashiertest.entities.Product;
+import com.example.yourcashiertest.entities.Transaksi;
 import com.example.yourcashiertest.utils.Convert;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
+import com.example.yourcashiertest.viewmodels.TransaksiViewModel;
 
 
 public class CartActivity extends AppCompatActivity {
@@ -25,6 +27,7 @@ public class CartActivity extends AppCompatActivity {
     private static int SUM = 0;
     public static String PRICE = "price";
     Product product;
+    TransaksiViewModel transaksiViewModel;
 
     @SuppressLint("SetTextI18n")
     @Override
@@ -38,6 +41,8 @@ public class CartActivity extends AppCompatActivity {
 
         product = new Product();
 
+        transaksiViewModel = new ViewModelProvider(this).get(TransaksiViewModel.class);
+
         CartViewModel cartViewModel = new ViewModelProvider(this).get(CartViewModel.class);
         cartViewModel.getCarts().observe(this, carts -> adapter.setCartList(carts));
 
@@ -79,6 +84,19 @@ public class CartActivity extends AppCompatActivity {
             startActivity(new Intent(CartActivity.this, PaymentActivity.class).putExtra(PRICE, SUM));
             finish();
         });
+        binding.saveOrder.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                saveTransaction(SUM);
+            }
+        });
+    }
+
+    private void saveTransaction(int amount) {
+        Transaksi transaksi = new Transaksi(0, "");
+        transaksi.setAmount(amount);
+        transaksi.setStatus("Pending");
+        transaksiViewModel.insertTransaksi(transaksi);
     }
 
     @Override

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

@@ -25,7 +25,6 @@ import retrofit2.Response;
 public class LoginActivity extends AppCompatActivity {
     ActivityLoginBinding binding;
     private PrefManager prefManager;
-
     UserViewModel viewModel;
 
     @Override
@@ -43,10 +42,6 @@ public class LoginActivity extends AppCompatActivity {
         binding.btnLogin.setOnClickListener(view -> {
             if(binding.etUsername.getText().toString().length() == 0 || binding.etPassword.getText().toString().length() == 0){
                 Toast.makeText(getApplicationContext(), "Please input Username and Password", Toast.LENGTH_SHORT).show();
-            }else if(!binding.etPassword.getText().toString().matches("[A-Za-z0-9]+")){
-                binding.etPassword.setError("Passwords can only contain Alphanumeric");
-            }else if(binding.etPassword.getText().toString().length() < 8) {
-                binding.etPassword.setError("Password length cannot be less than 8 characters");
             }else{
                 binding.setLoading(true);
                 viewModel.setListUser();
@@ -72,10 +67,11 @@ public class LoginActivity extends AppCompatActivity {
             ApiClient.client(UserService.class, UserViewModel.BASE_URL).loginUser(login).enqueue(new Callback<ResponseLogin>() {
                 @Override
                 public void onResponse(Call<ResponseLogin> call, Response<ResponseLogin> response) {
-                    if (response.code() >= 200 & response.code() <= 299){
+                    if (response.body()!= null){
                         Log.d("body", String.valueOf(response.body().getData().getFullName()));
                         prefManager.setFirstLogin(false);
                         binding.setLoading(false);
+                        Toast.makeText(getApplicationContext(), response.body().getMessages(), Toast.LENGTH_LONG).show();
                         startActivity(new Intent(LoginActivity.this, MainActivity.class)
                                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
                         prefManager.setDataUser(response.body().getData().getFullName());
@@ -84,7 +80,7 @@ public class LoginActivity extends AppCompatActivity {
                         Toast.makeText(getApplicationContext(), "Please verify your account!", Toast.LENGTH_LONG).show();
                         binding.setLoading(false);
                     }else{
-                        Toast.makeText(getApplicationContext(), "Email or password wrong", Toast.LENGTH_LONG).show();
+                        Toast.makeText(getApplicationContext(), response.body().getMessages(), Toast.LENGTH_LONG).show();
                         binding.setLoading(false);
                     }
                 }

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

 package com.example.yourcashiertest.activities;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import android.os.Bundle;
 
 import com.example.yourcashiertest.R;
+import com.example.yourcashiertest.adapters.OrderAdapter;
+import com.example.yourcashiertest.databinding.ActivityOrderBinding;
+import com.example.yourcashiertest.entities.Transaksi;
+import com.example.yourcashiertest.viewmodels.TransaksiViewModel;
+
+import java.util.List;
 
 public class OrderActivity extends AppCompatActivity {
 
+    ActivityOrderBinding binding;
+    OrderAdapter adapter;
+    TransaksiViewModel viewModel;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_order);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_order);
+
+        viewModel = new ViewModelProvider(this).get(TransaksiViewModel.class);
+        binding.rvListOrder.setLayoutManager(new LinearLayoutManager(this));
+        binding.rvListOrder.setAdapter(adapter);
+        viewModel.getList().observe(this, transaksi -> adapter.setTransaksiList(transaksi));
+//        adapter.setListener(new OrderAdapter.TransaksiListener() {
+//            @Override
+//            public void onCancel(Transaksi transaksi) {
+//
+//            }
+//
+//            @Override
+//            public void onContinue(Transaksi transaksi) {
+//
+//            }
+//        });
+
     }
 }
\ No newline at end of file

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

@@ -19,11 +19,13 @@ import com.example.yourcashiertest.databases.DBHelper;
 import com.example.yourcashiertest.databinding.ActivityPaymentBinding;
 import com.example.yourcashiertest.entities.Cart;
 import com.example.yourcashiertest.entities.Product;
+import com.example.yourcashiertest.entities.Transaksi;
 import com.example.yourcashiertest.models.ResponsePayment;
 import com.example.yourcashiertest.utils.Convert;
 import com.example.yourcashiertest.utils.ViewUtil;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
 import com.example.yourcashiertest.viewmodels.ProductViewModel;
+import com.example.yourcashiertest.viewmodels.TransaksiViewModel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,6 +39,7 @@ public class  PaymentActivity extends AppCompatActivity {
     public int amount;
     CartViewModel cartViewModel;
     ProductViewModel viewModel;
+    TransaksiViewModel payViewModel;
     public static final String PAY_WITH = "pay_with";
     private ArrayList<ResponsePayment> responsePayments = new ArrayList<>();
 
@@ -47,6 +50,7 @@ public class  PaymentActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_payment);
 
+        payViewModel = new ViewModelProvider(this).get(TransaksiViewModel.class);
         cartViewModel = new ViewModelProvider(this).get(CartViewModel.class);
         viewModel = new ViewModelProvider(this).get(ProductViewModel.class);
         amount = getIntent().getIntExtra(CartActivity.PRICE, 0);
@@ -86,6 +90,14 @@ public class  PaymentActivity extends AppCompatActivity {
         List<Product> products = DBHelper.getAllProduct(getApplicationContext());
         List<Cart> carts = DBHelper.getAllCart(getApplicationContext());
 
+        // just checking data
+        List<Transaksi> list = DBHelper.getAllTransaksi(getApplicationContext());
+        for (int i = 0; i < list.size(); i++){
+            Log.d("transaction", String.valueOf(list.get(i).getOrderId()));
+        }
+
+        createTransaksi(amount);
+
         for (int c = 0; c < carts.size(); c++){
             for (int p = 0; p < products.size(); p++){
                 if (carts.get(c).getIdProduct() == products.get(p).getId()){
@@ -99,6 +111,13 @@ public class  PaymentActivity extends AppCompatActivity {
         }
     }
 
+    private void createTransaksi(int amount) {
+        Transaksi transaksi = new Transaksi(0, "");
+        transaksi.setAmount(amount);
+        transaksi.setStatus("Success");
+        payViewModel.insertTransaksi(transaksi);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -40,7 +40,7 @@ public class RegisterActivity extends AppCompatActivity {
                 binding.etPassword.setError("Passwords can only contain Alphanumeric");
             }else if(binding.etPassword.getText().toString().length() < 8) {
                 binding.etPassword.setError("Password length cannot be less than 8 characters");
-            }else if(binding.etPassword.getText().toString() != binding.etConfirmPassword.getText().toString()){
+            }else if(!binding.etPassword.getText().toString().equals(binding.etConfirmPassword.getText().toString())){
                 binding.etConfirmPassword.setError("Password doesn't match!");
             }else {
                 user.setEmail(binding.etEmail.getText().toString());
@@ -51,6 +51,7 @@ public class RegisterActivity extends AppCompatActivity {
 
                 Toast.makeText(getApplicationContext(), viewModel.getMessages(), Toast.LENGTH_LONG).show();
                 startActivity(new Intent(getApplicationContext(), LoginActivity.class));
+                finish();
             }
         });
     }

app/src/main/java/com/example/yourcashiertest/adapters/OrderAdapter.java

+package com.example.yourcashiertest.adapters;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.yourcashiertest.R;
+import com.example.yourcashiertest.databinding.ItemOrderBinding;
+import com.example.yourcashiertest.entities.Transaksi;
+import com.example.yourcashiertest.utils.Convert;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OrderAdapter extends RecyclerView.Adapter<OrderAdapter.ViewHolder> {
+
+    private List<Transaksi> transaksiList = new ArrayList<>();
+
+    public interface TransaksiListener{
+        void onCancel(Transaksi transaksi);
+        void onContinue(Transaksi transaksi);
+    }
+
+    private TransaksiListener listener;
+    public void setListener(TransaksiListener listener) {
+        this.listener = listener;
+    }
+
+    public void setTransaksiList(List<Transaksi> transaksiList) {
+        this.transaksiList = transaksiList;
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new OrderAdapter.ViewHolder(
+                DataBindingUtil.inflate(
+                        LayoutInflater.from(parent.getContext()),
+                        R.layout.item_order,
+                        parent,
+                        false
+                )
+        );
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.bindData(transaksiList.get(position), listener);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (transaksiList.size() != 0){
+            return transaksiList.size();
+        }else return 0;
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+
+        private ItemOrderBinding binding;
+
+        public ViewHolder(@NonNull ItemOrderBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void bindData(Transaksi transaksi, TransaksiListener listener){
+            binding.setTransaction(transaksi);
+            binding.setAmount(Convert.changeToCurrency(transaksi.getAmount()));
+            binding.btnCancel.setOnClickListener(view -> listener.onCancel(transaksi));
+            binding.btnContinue.setOnClickListener(view -> listener.onContinue(transaksi));
+        }
+    }
+}

app/src/main/java/com/example/yourcashiertest/daos/TransaksiDao.java

 package com.example.yourcashiertest.daos;
 
+import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
@@ -13,15 +14,19 @@ import java.util.List;
 
 @Dao
 public interface TransaksiDao {
+
     @Query("SELECT * FROM Transaksi")
-    public List<Transaksi> getAll();
+    List<Transaksi> getTransaksi();
+
+    @Query("SELECT * FROM Transaksi ORDER BY orderId DESC")
+    LiveData<List<Transaksi>> getAll();
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    public void insertTransaksi(Transaksi transaksi);
+    void insertTransaksi(Transaksi transaksi);
 
     @Update
-    public void updateTransaksi(Transaksi transaksi);
+    void updateTransaksi(Transaksi transaksi);
 
     @Delete
-    public void deleteTransaksi(Transaksi transaksi);
+    void deleteTransaksi(Transaksi transaksi);
 }

app/src/main/java/com/example/yourcashiertest/databases/DBHelper.java

@@ -2,8 +2,12 @@ package com.example.yourcashiertest.databases;
 
 import android.content.Context;
 
+import androidx.lifecycle.LiveData;
+
 import com.example.yourcashiertest.entities.Cart;
 import com.example.yourcashiertest.entities.Product;
+import com.example.yourcashiertest.entities.Transaksi;
+import com.example.yourcashiertest.utils.Convert;
 
 import java.util.List;
 
@@ -21,4 +25,11 @@ public class DBHelper {
         list = db.cartDao().getAllCarts();
         return list;
     }
+
+    public static List<Transaksi> getAllTransaksi(Context context){
+        List<Transaksi> list;
+        LocalDatabase db = LocalDatabase.getDatabase(context);
+        list = db.transaksiDao().getTransaksi();
+        return list;
+    }
 }

app/src/main/java/com/example/yourcashiertest/databases/LocalDatabase.java

@@ -17,11 +17,12 @@ import com.example.yourcashiertest.daos.ProductDao;
 import com.example.yourcashiertest.daos.TransaksiDao;
 import com.example.yourcashiertest.entities.Cart;
 import com.example.yourcashiertest.entities.Product;
+import com.example.yourcashiertest.entities.Transaksi;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Database(entities = {Product.class, Cart.class}, version = 4, exportSchema = false)
+@Database(entities = {Product.class, Cart.class, Transaksi.class}, version = 5, exportSchema = false)
 public abstract class LocalDatabase extends RoomDatabase {
 
     public abstract ProductDao productDao();
@@ -42,13 +43,6 @@ public abstract class LocalDatabase extends RoomDatabase {
         }
     };
 
-    public static final Migration MIGRATION_4_5 = new Migration(4, 5) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE IF NOT EXISTS Transaksi (orderId INTEGER NOT NULL, " +
-                    "amount INTEGER NOT NULL, status TEXT NOT NULL, PRIMARY KEY(orderId))");
-        }
-    };
 
     public static final Migration MIGRATION_2_3 = new Migration(2,3) {
         @Override
@@ -64,6 +58,13 @@ public abstract class LocalDatabase extends RoomDatabase {
         }
     };
 
+    public static final Migration MIGRATION_4_5 = new Migration(4, 5) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS Transaksi (orderId INTEGER NOT NULL, " +
+                    "amount INTEGER NOT NULL, status TEXT NOT NULL, PRIMARY KEY(orderId))");
+        }
+    };
     public static LocalDatabase getDatabase(Context context) {
         if (INSTANCE == null) {
             synchronized (LocalDatabase.class) {

app/src/main/java/com/example/yourcashiertest/entities/Product.java

@@ -5,9 +5,8 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
-import androidx.annotation.NonNull;
+
 import androidx.databinding.BindingAdapter;
-import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 

app/src/main/java/com/example/yourcashiertest/entities/Transaksi.java

@@ -29,6 +29,11 @@ public class Transaksi implements Parcelable {
         status = in.readString();
     }
 
+    public Transaksi(long amount, String status){
+        this.amount = amount;
+        this.status = status;
+    }
+
     public static final Creator<Transaksi> CREATOR = new Creator<Transaksi>() {
         @Override
         public Transaksi createFromParcel(Parcel in) {

app/src/main/java/com/example/yourcashiertest/repositories/TransaksiRepository.java

@@ -3,6 +3,8 @@ package com.example.yourcashiertest.repositories;
 import android.app.Application;
 
 
+import androidx.lifecycle.LiveData;
+
 import com.example.yourcashiertest.daos.TransaksiDao;
 import com.example.yourcashiertest.databases.LocalDatabase;
 import com.example.yourcashiertest.entities.Transaksi;
@@ -11,7 +13,7 @@ import java.util.List;
 
 public class TransaksiRepository {
     private TransaksiDao dao;
-    private List<Transaksi> allTransaksi;
+    private LiveData<List<Transaksi>> allTransaksi;
 
     public TransaksiRepository(Application application){
         LocalDatabase db = LocalDatabase.getDatabase(application);
@@ -19,7 +21,19 @@ public class TransaksiRepository {
         allTransaksi = dao.getAll();
     }
 
-    public List<Transaksi> getAllTransaksi(){
+    public LiveData<List<Transaksi>> getAllTransaksi(){
         return this.allTransaksi;
     }
+
+    public void insert(Transaksi transaksi){
+        LocalDatabase.databaseWriteExecutor.execute(() -> dao.insertTransaksi(transaksi));
+    }
+
+    public void update(Transaksi transaksi){
+        LocalDatabase.databaseWriteExecutor.execute(() -> dao.updateTransaksi(transaksi));
+    }
+
+    public void delete(Transaksi transaksi){
+        LocalDatabase.databaseWriteExecutor.execute(() -> dao.deleteTransaksi(transaksi));
+    }
 }

app/src/main/java/com/example/yourcashiertest/viewmodels/TransaksiViewModel.java

@@ -19,5 +19,22 @@ public class TransaksiViewModel extends AndroidViewModel {
     public TransaksiViewModel(@NonNull Application application) {
         super(application);
         repository = new TransaksiRepository(application);
+        list = repository.getAllTransaksi();
+    }
+
+    public LiveData<List<Transaksi>> getList() {
+        return list;
+    }
+
+    public void insertTransaksi(Transaksi transaksi){
+        repository.insert(transaksi);
+    }
+
+    public void updateTransaksi(Transaksi transaksi){
+        repository.update(transaksi);
+    }
+
+    public void deleteTransaksi(Transaksi transaksi){
+        repository.delete(transaksi);
     }
 }

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

 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="8dp"
         tools:context=".activities.OrderActivity">
+
         <TextView
             android:id="@+id/tvListOrder"
             android:layout_width="wrap_content"
@@ -19,6 +26,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.105" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnPending"
             android:layout_width="160dp"
@@ -55,4 +63,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnPending"
             tools:listitem="@layout/item_order" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</layout>
\ No newline at end of file

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

@@ -5,15 +5,11 @@
     xmlns:tools="http://schemas.android.com/tools">
     <data>
         <variable
-            name="cartProduct"
-            type="com.example.yourcashiertest.entities.Cart" />
+            name="transaction"
+            type="com.example.yourcashiertest.entities.Transaksi" />
 
         <variable
-            name="qty"
-            type="String" />
-
-        <variable
-            name="price"
+            name="amount"
             type="String" />
 
     </data>
@@ -47,6 +43,7 @@
                 android:id="@+id/tvOrderId"
                 android:layout_width="250dp"
                 android:layout_height="41dp"
+                android:text="@{transaction.orderId + ``}"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
@@ -54,8 +51,7 @@
                 android:textAppearance="@style/some_id"
                 app:layout_constraintStart_toEndOf="@id/tvOrderNumber"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:layout_editor_absoluteX="169dp"
-                tools:text="@{price}" />
+                tools:layout_editor_absoluteX="169dp" />
 
             <TextView
                 android:id="@+id/tvTotal"
@@ -74,6 +70,7 @@
                 android:id="@+id/tvAmount"
                 android:layout_width="250dp"
                 android:layout_height="41dp"
+                android:text="@{amount}"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:layout_marginStart="4dp"
@@ -81,8 +78,7 @@
                 android:textAppearance="@style/some_id"
                 app:layout_constraintStart_toEndOf="@id/tvTotal"
                 app:layout_constraintTop_toBottomOf="@id/tvOrderId"
-                tools:layout_editor_absoluteX="169dp"
-                tools:text="@{price}"/>
+                tools:layout_editor_absoluteX="169dp"/>
 
             <TextView
                 android:id="@+id/tvStatus"
@@ -91,11 +87,10 @@
                 android:layout_marginStart="4dp"
                 android:layout_marginTop="4dp"
                 android:gravity="center"
-                android:text="@{}"
+                android:text="@{transaction.status}"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTotal"
-                tools:text="Success" />
+                app:layout_constraintTop_toBottomOf="@+id/tvTotal" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnContinue"