Skip to content

M
meser
Commit 50d2ec50 authored by iman Fauzi's avatar iman Fauzi
Browse files
Options

fix conflict

parents 02c82d78 1247a99e
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 51 deletions
app/src/main/java/com/yono/messeripos/BottomSheets.java
View file @ 50d2ec50
......@@ -51,11 +51,13 @@ public class BottomSheets extends BottomSheetDialogFragment {
SharedPreferences sharedPreferences;
public static BottomSheetBehavior bottomSheetBehavior;
RelativeLayout layoutFormCash;
int statusUpdatePayment = 0;
PaymentsModels paymentsModels;
public static PaymentsModels paymentsModels;
public BottomSheets(PaymentsModels paymentsModels) {
public BottomSheets(PaymentsModels paymentsModels, int statusUpdatePayment) {
this.paymentsModels = paymentsModels;
this.statusUpdatePayment = statusUpdatePayment;
}
public interface CashListener {
......@@ -82,11 +84,12 @@ public class BottomSheets extends BottomSheetDialogFragment {
totalHarga = v.findViewById(R.id.totalHarga);
utils = new Utils();
btnCash.setEnabled(false);
// bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
Log.i("BITTOM", "BottomSheets: "+utils.convertGson(paymentsModels)+"ID "+statusUpdatePayment);
long ga = paymentsModels.getGrossAmount();
String setCurrency = utils.convertPrice("Rp.", ga);
......@@ -106,7 +109,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
// case BottomSheetBehavior.STATE_DRAGGING:
// break;
// case BottomSheetBehavior.STATE_SETTLING:
// break;
// break;int
// }
// }
......@@ -128,7 +131,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
if (TextUtils.isEmpty(charSequence)) inputAmount.setText("0");
if (TextUtils.isEmpty(charSequence)) inputAmount.setText("");
grossAmount = paymentsModels.getGrossAmount();
input = Long.parseLong(inputAmount.getText().toString());
......@@ -141,6 +144,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
}
hargaChange.setText(utils.convertPrice("Rp.", result));
}
@Override
......@@ -157,23 +161,25 @@ 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
);
PaymentsModels paymentsModels1 = new PaymentsModels();
paymentsModels1.setTransactionStatus("success");
paymentsModels1.setPaymentType("cash");
paymentsModels1.setGrossAmount(grossAmount);
paymentsModels1.setBank("");
PaymentService paymentService = client.Client(PaymentService.class);
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() {
if (statusUpdatePayment == 0){
paymentsModels1.setOrderId(sharedPreferences.getString(ORDER_ID, ""));
paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override
public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) {
Log.i("CASH", "onResponse: " + utils.convertGson(response.body()));
if (response.body() != null) {
public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
Log.i("CASH_0", "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()) {
if (editor.commit()){
Intent i = new Intent(getActivity(), MainActivity.class);
view.getContext().startActivity(i);
}
......@@ -181,9 +187,36 @@ public class BottomSheets extends BottomSheetDialogFragment {
}
@Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
}
});
}else{
paymentsModels.setTransactionStatus("success");
paymentsModels.setPaymentType("cash");
paymentService.postFromCartPending(paymentsModels.getOrderId(), paymentsModels).enqueue(new Callback<DataResponse>() {
@Override
public void onResponse(Call<DataResponse> call, Response<DataResponse> response) {
Log.i("CASH_1", "onResponse: "+utils.convertGson(paymentsModels));
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> call, Throwable t) {
}
});
}
}
}
app/src/main/java/com/yono/messeripos/CartActivity.java
View file @ 50d2ec50
......@@ -115,7 +115,7 @@ public class CartActivity extends AppCompatActivity {
modelsCart = new ViewModelProvider(this).get(MainViewModelsCart.class);
// show to cart
Log.i("GET CART", "onCreate: "+paymentsModelsIntent);
Log.i("GET CART", "onCreate: "+utils.convertGson(paymentsModelsIntent));
if (paymentsModelsIntent == null){
modelsCart = new ViewModelProvider(this).get(MainViewModelsCart.class);
modelsCart.getCartById(sharedPreferences.getString(ORDER_ID,"")).observe(this, new Observer<List<ProductCartModels>>() {
......@@ -207,6 +207,7 @@ public class CartActivity extends AppCompatActivity {
if(editor.commit()){
Log.i("FROM_CHECKOUT_INTENT", "onClick: "+utils.convertGson(paymentsModelsIntent));
if (paymentsModelsIntent != null){
Log.i("TAGAAAAA", "onClick: "+utils.convertGson(paymentsModelsIntent));
startActivity(new Intent(CartActivity.this, PaymentActivity.class)
.putExtra(CODE_SEND_CHECKOUT_HISTORY, paymentsModelsIntent));
}else{
......@@ -239,9 +240,9 @@ public class CartActivity extends AppCompatActivity {
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>>() {
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override
public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) {
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();
......@@ -259,7 +260,7 @@ public class CartActivity extends AppCompatActivity {
}
@Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
new AlertDialog.Builder(CartActivity.this)
.setCancelable(false)
.setTitle("Save new Order")
......
app/src/main/java/com/yono/messeripos/HistoryActivity.java
View file @ 50d2ec50
......@@ -100,6 +100,7 @@ public class HistoryActivity extends AppCompatActivity {
.setTitle("Transaction")
.setMessage("Transaction success!").show();
}else if (paymentsModels.getPaymentType().equals("pending")){
Log.i("JAJSKASA", "onShowDetail: "+utils.convertGson(paymentsModels));
startActivity(new Intent(HistoryActivity.this,
CartActivity.class).putExtra(DATA_TRANSACTION_PENDING, paymentsModels));
}
......
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @ 50d2ec50
......@@ -122,7 +122,7 @@ public class MainActivity extends AppCompatActivity {
editor.putString(ORDER_ID,"MES-ORDER"+utils.timeStamp());
if (editor.commit()){
Log.i("ORDER ID", "onCreate: "+sharedPreferences.getString(ORDER_ID,"").toString());
Toast.makeText(MainActivity.this, sharedPreferences.getString(ORDER_ID,"").toString(), Toast.LENGTH_LONG).show();
// Toast.makeText(MainActivity.this, sharedPreferences.getString(ORDER_ID,"").toString(), Toast.LENGTH_LONG).show();
}
}
......
app/src/main/java/com/yono/messeripos/PaymentActivity.java
View file @ 50d2ec50
......@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
......@@ -32,6 +33,7 @@ import com.yono.messeripos.api.service.PaymentService;
import com.yono.messeripos.models.MainViewModelsCart;
import com.yono.messeripos.models.PaymentsModels;
import com.yono.messeripos.models.ProductCartModels;
import com.yono.messeripos.models.VaNumberModels;
import com.yono.messeripos.response.DataResponse;
import com.yono.messeripos.response.PaymentResponse;
import com.yono.messeripos.utils.Utils;
......@@ -64,13 +66,13 @@ public class PaymentActivity extends AppCompatActivity {
public static BottomSheets bottomSheet;
public static PaymentCreated paymentCreated;
public static SharedPreferences sharedPreferences;
Button cashBtn;
ProgressDialog progressDialog;
BottomSheetBehavior bottomSheetBank;
RelativeLayout qrcodeLayoutBank;
PaymentsModels paymentsModelsIntent;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -85,6 +87,7 @@ public class PaymentActivity extends AppCompatActivity {
sharedPreferences = getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
paymentsModelsIntent = getIntent().getParcelableExtra(CartActivity.CODE_SEND_CHECKOUT_HISTORY);
paymentsModels = new PaymentsModels();
checkoutAdapter = new CheckoutAdapter();
recyclerView = findViewById(R.id.rvItem);
......@@ -128,7 +131,7 @@ public class PaymentActivity extends AppCompatActivity {
@Override
public void onChanged(List<ProductCartModels> productCartModels) {
String js = new Gson().toJson(productCartModels);
Log.i("On Intent_CHANGE", "onChanged: "+paymentsModels.getOrderId());
Log.i("On Intent_CHANGE", "onChanged: "+paymentsModelsIntent.getOrderId());
for (ProductCartModels pd : productCartModels){
total = total + pd.getPrice_orders()*pd.getQuantity_orders();
......@@ -136,8 +139,8 @@ public class PaymentActivity extends AppCompatActivity {
if (productCartModels.size() != 0){
getSupportActionBar().setTitle(productCartModels.get(0).getId_orders());
paymentsModels.setOrderId(productCartModels.get(0).getId_orders());
paymentsModels.setGrossAmount(total);
paymentsModelsIntent.setOrderId(productCartModels.get(0).getId_orders());
paymentsModelsIntent.setGrossAmount(total);
checkoutAdapter.setCheckoutAdapter(PaymentActivity.this, productCartModels);
recyclerView.setLayoutManager(new LinearLayoutManager(PaymentActivity.this, RecyclerView.VERTICAL, false));
recyclerView.setAdapter(checkoutAdapter);
......@@ -149,7 +152,7 @@ public class PaymentActivity extends AppCompatActivity {
});
}
bottomSheet = new BottomSheets(paymentsModels);
bottomSheet = new BottomSheets(paymentsModels,0);
RecyclerView rvPayment = findViewById(R.id.rvPayment);
......@@ -157,7 +160,7 @@ public class PaymentActivity extends AppCompatActivity {
rvPayment.setLayoutManager(llm);
paymentResponses.add(new PaymentResponse("https://i.ibb.co/5c40mWX/cash-logo.png", "cash"));
paymentResponses.add(new PaymentResponse("https://i.ibb.co/bNDJqyj/BANK-BRI-logo.png", "bri"));
paymentResponses.add(new PaymentResponse("https://i.ibb.co/XCsdmmT/Bank-Mandiri-logo.png", "mandiri"));
paymentResponses.add(new PaymentResponse("https://i.ibb.co/2n65nCT/bca-bank-central-asia.png", "bca"));
paymentResponses.add(new PaymentResponse("https://i.ibb.co/RjJQT9K/BNI-logo.png", "bni"));
......@@ -176,16 +179,27 @@ public class PaymentActivity extends AppCompatActivity {
public void onClick(View view) {
if (methodPay.equals("cash")){
paymentsModels.setPaymentType("cash");
paymentsModels.setTransactionStatus("success");
paymentsModels.setTransaction_id(utils.timeStamp()+"-MES");
paymentsModels.setTransaction_time(utils.timeStamp());
Log.i("CASH", "onClick: "+utils.convertGson(paymentsModels));
bottomSheet = new BottomSheets(paymentsModels);
bottomSheet.setCancelable(false);
if (paymentsModelsIntent == null){
bottomSheet = new BottomSheets(paymentsModels,0);
bottomSheet.setCancelable(true);
bottomSheet.show(getSupportFragmentManager(),
"ModalBottomSheet");
}else{
bottomSheet = new BottomSheets(paymentsModelsIntent,1);
bottomSheet.setCancelable(true);
bottomSheet.show(getSupportFragmentManager(),
"ModalBottomSheet");
}
}else{
progressDialog.show();
progressDialog.setCancelable(false);
// bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED);
// progressDialog.show();
Client client = new Client();
......@@ -200,9 +214,9 @@ public class PaymentActivity extends AppCompatActivity {
PaymentService paymentService = client.Client(PaymentService.class);
if (paymentsModelsIntent == null){
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() {
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override
public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) {
public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
Log.i("Paymen_bank", "onResponse: "+utils.convertGson(response.body()));
if (response.body() != null){
......@@ -225,8 +239,9 @@ public class PaymentActivity extends AppCompatActivity {
.setMessage("Erorr save!").show();
}
}
@Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setCancelable(false)
......@@ -235,7 +250,7 @@ public class PaymentActivity extends AppCompatActivity {
}
});
}else{
paymentService.postFromCartPending(paymentsModels).enqueue(new Callback<DataResponse>() {
paymentService.postFromCartPending(paymentsModelsIntent.getOrderId(), paymentsModelsIntent).enqueue(new Callback<DataResponse>() {
@Override
public void onResponse(Call<DataResponse> call,
Response<DataResponse> response) {
......@@ -290,10 +305,10 @@ public class PaymentActivity extends AppCompatActivity {
);
PaymentService paymentService = client.Client(PaymentService.class);
paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels>>() {
paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override
public void onResponse(Call<DataResponse<PaymentsModels>> call,
Response<DataResponse<PaymentsModels>> response) {
public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call,
Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
if (response.body() != null){
progressDialog.dismiss();
SharedPreferences.Editor editor = sharedPreferences.edit();
......@@ -306,7 +321,7 @@ public class PaymentActivity extends AppCompatActivity {
}
@Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) {
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
}
});
......
app/src/main/java/com/yono/messeripos/api/service/PaymentService.java
View file @ 50d2ec50
......@@ -11,14 +11,16 @@ import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path;
public interface PaymentService {
@POST(ApiHelper.VERSI_API_1+"payment")
Call<DataResponse<PaymentsModels>> postFromCart(@Body PaymentsModels paymentsModels);
Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> postFromCart(@Body PaymentsModels paymentsModels);
@POST(ApiHelper.VERSI_API_1+"payment/midtrans/push")
Call<DataResponse> postFromCartPending(@Body PaymentsModels paymentsModels);
@PUT(ApiHelper.VERSI_API_1+"payment/{id}")
Call<DataResponse> postFromCartPending(@Path("id")String id,
@Body PaymentsModels paymentsModels);
@GET(ApiHelper.VERSI_API_1+"payment/{id}")
Call<DataResponse<PaymentsModels>> getTransactionById(@Body PaymentsModels paymentsModels, @Path("id") int id);
......
app/src/main/java/com/yono/messeripos/models/PaymentsModels.java
View file @ 50d2ec50
......@@ -11,6 +11,9 @@ import com.google.gson.annotations.SerializedName;
import com.yono.messeripos.R;
public class PaymentsModels<T> implements Parcelable {
@SerializedName("id")
private int id;
@SerializedName("order_code")
private String orderId;
......@@ -181,6 +184,14 @@ public class PaymentsModels<T> implements Parcelable {
return 0;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
@Override
public void writeToParcel(Parcel parcel, int i) {
parcel.writeString(orderId);
......
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