Skip to content

M
meser
Commit b1efe15a authored by Alfansyah Fadlian's avatar Alfansyah Fadlian
Browse files
Options

tes

parents 005a5c7f aee372a2
Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 219 deletions
app/src/main/AndroidManifest.xml
View file @ b1efe15a
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<activity <activity
android:name=".BottomSheets" android:name=".BottomSheets"
tools:ignore="Instantiatable" /> tools:ignore="Instantiatable" />
<activity android:name=".QRCode" /> <activity android:name=".PaymentCreated" />
<activity <activity
android:name=".HistoryActivity" android:name=".HistoryActivity"
android:theme="@style/AppTheme.appbar" /> android:theme="@style/AppTheme.appbar" />
......
app/src/main/java/com/yono/messeripos/BottomSheets.java
View file @ b1efe15a
...@@ -47,19 +47,17 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -47,19 +47,17 @@ public class BottomSheets extends BottomSheetDialogFragment {
Utils utils; Utils utils;
String defaultText = "0"; String defaultText = "0";
Client client = new Client(); Client client = new Client();
<<<<<<< HEAD
public static long grossAmount,result, input;
=======
public static long grossAmount, input, result; public static long grossAmount, input, result;
>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
SharedPreferences sharedPreferences; SharedPreferences sharedPreferences;
public static BottomSheetBehavior bottomSheetBehavior; public static BottomSheetBehavior bottomSheetBehavior;
RelativeLayout layoutFormCash; 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.paymentsModels = paymentsModels;
this.statusUpdatePayment = statusUpdatePayment;
} }
public interface CashListener { public interface CashListener {
...@@ -74,8 +72,7 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -74,8 +72,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable public View onCreateView(LayoutInflater inflater, @Nullable
ViewGroup container, @Nullable Bundle savedInstanceState) ViewGroup container, @Nullable Bundle savedInstanceState) {
{
View v = inflater.inflate(R.layout.activity_bottom_sheets, View v = inflater.inflate(R.layout.activity_bottom_sheets,
container, false); container, false);
...@@ -86,16 +83,13 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -86,16 +83,13 @@ public class BottomSheets extends BottomSheetDialogFragment {
btnCash = v.findViewById(R.id.btnCash); btnCash = v.findViewById(R.id.btnCash);
totalHarga = v.findViewById(R.id.totalHarga); totalHarga = v.findViewById(R.id.totalHarga);
utils = new Utils(); utils = new Utils();
<<<<<<< HEAD
=======
btnCash.setEnabled(false); btnCash.setEnabled(false);
>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
// bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash); // bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE); sharedPreferences = getActivity().getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); // bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
Log.i("BITTOM", "BottomSheets: "+utils.convertGson(paymentsModels)+"ID "+statusUpdatePayment);
long ga = paymentsModels.getGrossAmount(); long ga = paymentsModels.getGrossAmount();
String setCurrency = utils.convertPrice("Rp.", ga); String setCurrency = utils.convertPrice("Rp.", ga);
...@@ -115,7 +109,7 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -115,7 +109,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
// case BottomSheetBehavior.STATE_DRAGGING: // case BottomSheetBehavior.STATE_DRAGGING:
// break; // break;
// case BottomSheetBehavior.STATE_SETTLING: // case BottomSheetBehavior.STATE_SETTLING:
// break; // break;int
// } // }
// } // }
...@@ -141,15 +135,16 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -141,15 +135,16 @@ public class BottomSheets extends BottomSheetDialogFragment {
grossAmount = paymentsModels.getGrossAmount(); grossAmount = paymentsModels.getGrossAmount();
input = Long.parseLong(inputAmount.getText().toString()); input = Long.parseLong(inputAmount.getText().toString());
result = input-grossAmount; result = input - grossAmount;
if (result > 0) { if (result >= 0) {
btnCash.setEnabled(true); btnCash.setEnabled(true);
}else { } else {
btnCash.setEnabled(false); btnCash.setEnabled(false);
} }
hargaChange.setText(utils.convertPrice("Rp.", result)); hargaChange.setText(utils.convertPrice("Rp.", result));
} }
@Override @Override
...@@ -166,54 +161,62 @@ public class BottomSheets extends BottomSheetDialogFragment { ...@@ -166,54 +161,62 @@ public class BottomSheets extends BottomSheetDialogFragment {
private void bayar(View view) { private void bayar(View view) {
// String orderId, String paymentType, String bank, long grossAmount // String orderId, String paymentType, String bank, long grossAmount
PaymentsModels paymentsModels = new PaymentsModels( PaymentsModels paymentsModels1 = new PaymentsModels();
sharedPreferences.getString(ORDER_ID, ""), paymentsModels1.setTransactionStatus("success");
"cash", paymentsModels1.setPaymentType("cash");
"none", paymentsModels1.setGrossAmount(grossAmount);
grossAmount paymentsModels1.setBank("");
);
PaymentService paymentService = client.Client(PaymentService.class); PaymentService paymentService = client.Client(PaymentService.class);
<<<<<<< HEAD
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() { if (statusUpdatePayment == 0){
@Override paymentsModels1.setOrderId(sharedPreferences.getString(ORDER_ID, ""));
public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) { paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
Log.i("CASH", "onResponse: "+utils.convertGson(response.body())); @Override
if (response.body() != null){ public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit(); Log.i("CASH_0", "onResponse: "+utils.convertGson(response.body()));
editor.putBoolean(CHECKOUT, false); if (response.body() != null){
editor.putString(ORDER_ID, ""); SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit();
if (editor.commit()){ editor.putBoolean(CHECKOUT, false);
Intent i = new Intent(getActivity(), MainActivity.class); editor.putString(ORDER_ID, "");
view.getContext().startActivity(i); if (editor.commit()){
Intent i = new Intent(getActivity(), MainActivity.class);
view.getContext().startActivity(i);
}
} }
} }
}
@Override @Override
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) { public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
=======
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels>>() { }
});
}else{
paymentsModels.setTransactionStatus("success");
paymentsModels.setPaymentType("cash");
paymentService.postFromCartPending(paymentsModels.getOrderId(), paymentsModels).enqueue(new Callback<DataResponse>() {
@Override @Override
public void onResponse(Call<DataResponse<PaymentsModels>> call, Response<DataResponse<PaymentsModels>> response) { public void onResponse(Call<DataResponse> call, Response<DataResponse> response) {
Log.i("CASH", "onResponse: " + utils.convertGson(response.body())); Log.i("CASH_1", "onResponse: "+utils.convertGson(paymentsModels));
if (response.body() != null) { if (response.body() != null){
SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit(); SharedPreferences.Editor editor = PaymentActivity.sharedPreferences.edit();
editor.putBoolean(CHECKOUT, false); editor.putBoolean(CHECKOUT, false);
editor.putString(ORDER_ID, ""); editor.putString(ORDER_ID, "");
if (editor.commit()) { if (editor.commit()){
Intent i = new Intent(getActivity(), MainActivity.class); Intent i = new Intent(getActivity(), MainActivity.class);
view.getContext().startActivity(i); view.getContext().startActivity(i);
} }
} }
} }
@Override @Override
public void onFailure(Call<DataResponse<PaymentsModels>> call, Throwable t) { public void onFailure(Call<DataResponse> call, Throwable t) {
>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
} }
}); });
} }
}
} }
app/src/main/java/com/yono/messeripos/PaymentActivity.java
View file @ b1efe15a
package com.yono.messeripos; package com.yono.messeripos;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
...@@ -11,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -11,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
...@@ -22,7 +22,6 @@ import android.view.WindowManager; ...@@ -22,7 +22,6 @@ import android.view.WindowManager;
import android.widget.Button; import android.widget.Button;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.appbar.MaterialToolbar;
import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetBehavior;
...@@ -46,7 +45,6 @@ import retrofit2.Call; ...@@ -46,7 +45,6 @@ import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import static com.yono.messeripos.BottomSheets.bottomSheetBehavior;
import static com.yono.messeripos.BottomSheets.grossAmount; import static com.yono.messeripos.BottomSheets.grossAmount;
import static com.yono.messeripos.MainActivity.CHECKOUT; import static com.yono.messeripos.MainActivity.CHECKOUT;
import static com.yono.messeripos.MainActivity.ORDER_ID; import static com.yono.messeripos.MainActivity.ORDER_ID;
...@@ -56,7 +54,7 @@ import static com.yono.messeripos.MainActivity.orderId; ...@@ -56,7 +54,7 @@ import static com.yono.messeripos.MainActivity.orderId;
public class PaymentActivity extends AppCompatActivity { public class PaymentActivity extends AppCompatActivity {
private ArrayList<PaymentResponse> paymentResponses = new ArrayList<>(); private ArrayList<PaymentResponse> paymentResponses = new ArrayList<>();
public static String methodPay = ""; public static String methodPay="";
private Button btnPay; private Button btnPay;
private MainViewModelsCart mainViewModels; private MainViewModelsCart mainViewModels;
private PaymentsModels paymentsModels; private PaymentsModels paymentsModels;
...@@ -66,8 +64,9 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -66,8 +64,9 @@ public class PaymentActivity extends AppCompatActivity {
private CheckoutAdapter checkoutAdapter; private CheckoutAdapter checkoutAdapter;
private TextView grandTotal; private TextView grandTotal;
public static BottomSheets bottomSheet; public static BottomSheets bottomSheet;
public static QRCode qrCode; public static PaymentCreated paymentCreated;
public static SharedPreferences sharedPreferences; public static SharedPreferences sharedPreferences;
Button cashBtn;
ProgressDialog progressDialog; ProgressDialog progressDialog;
BottomSheetBehavior bottomSheetBank; BottomSheetBehavior bottomSheetBank;
RelativeLayout qrcodeLayoutBank; RelativeLayout qrcodeLayoutBank;
...@@ -79,7 +78,7 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -79,7 +78,7 @@ public class PaymentActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_payment); setContentView(R.layout.activity_payment);
Log.i("Status Checkout payment", "onCreate: " + checkout); Log.i("Status Checkout payment", "onCreate: "+checkout);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Window w = getWindow(); Window w = getWindow();
w.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS); w.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
...@@ -88,6 +87,7 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -88,6 +87,7 @@ public class PaymentActivity extends AppCompatActivity {
sharedPreferences = getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE); sharedPreferences = getSharedPreferences(MainActivity.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
paymentsModelsIntent = getIntent().getParcelableExtra(CartActivity.CODE_SEND_CHECKOUT_HISTORY); paymentsModelsIntent = getIntent().getParcelableExtra(CartActivity.CODE_SEND_CHECKOUT_HISTORY);
paymentsModels = new PaymentsModels(); paymentsModels = new PaymentsModels();
checkoutAdapter = new CheckoutAdapter(); checkoutAdapter = new CheckoutAdapter();
recyclerView = findViewById(R.id.rvItem); recyclerView = findViewById(R.id.rvItem);
...@@ -101,20 +101,20 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -101,20 +101,20 @@ public class PaymentActivity extends AppCompatActivity {
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
mainViewModels = new ViewModelProvider(PaymentActivity.this).get(MainViewModelsCart.class); mainViewModels = new ViewModelProvider(PaymentActivity.this).get(MainViewModelsCart.class);
Log.i("IN_HISTORY", "onCreate: " + utils.convertGson(paymentsModelsIntent)); Log.i("IN_HISTORY", "onCreate: "+utils.convertGson(paymentsModelsIntent));
if (paymentsModelsIntent == null) { if (paymentsModelsIntent == null){
mainViewModels.getCartById(sharedPreferences.getString(ORDER_ID, "")).observe(this, new Observer<List<ProductCartModels>>() { mainViewModels.getCartById(sharedPreferences.getString(ORDER_ID, "")).observe(this, new Observer<List<ProductCartModels>>() {
@Override @Override
public void onChanged(List<ProductCartModels> productCartModels) { public void onChanged(List<ProductCartModels> productCartModels) {
String js = new Gson().toJson(productCartModels); String js = new Gson().toJson(productCartModels);
Log.i("On payment", "onChanged: " + js); Log.i("On payment", "onChanged: "+js);
for (ProductCartModels pd : productCartModels) { for (ProductCartModels pd : productCartModels){
total = total + pd.getPrice_orders() * pd.getQuantity_orders(); total = total + pd.getPrice_orders()*pd.getQuantity_orders();
} }
if (productCartModels.size() != 0) { if (productCartModels.size() !=0){
getSupportActionBar().setTitle(productCartModels.get(0).getId_orders()); getSupportActionBar().setTitle(productCartModels.get(0).getId_orders());
paymentsModels.setOrderId(productCartModels.get(0).getId_orders()); paymentsModels.setOrderId(productCartModels.get(0).getId_orders());
paymentsModels.setGrossAmount(total); paymentsModels.setGrossAmount(total);
...@@ -126,21 +126,21 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -126,21 +126,21 @@ public class PaymentActivity extends AppCompatActivity {
} }
} }
}); });
} else { }else{
mainViewModels.getCartById(paymentsModelsIntent.getOrderId()).observe(this, new Observer<List<ProductCartModels>>() { mainViewModels.getCartById(paymentsModelsIntent.getOrderId()).observe(this, new Observer<List<ProductCartModels>>() {
@Override @Override
public void onChanged(List<ProductCartModels> productCartModels) { public void onChanged(List<ProductCartModels> productCartModels) {
String js = new Gson().toJson(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) { for (ProductCartModels pd : productCartModels){
total = total + pd.getPrice_orders() * pd.getQuantity_orders(); total = total + pd.getPrice_orders()*pd.getQuantity_orders();
} }
if (productCartModels.size() != 0) { if (productCartModels.size() != 0){
getSupportActionBar().setTitle(productCartModels.get(0).getId_orders()); getSupportActionBar().setTitle(productCartModels.get(0).getId_orders());
paymentsModels.setOrderId(productCartModels.get(0).getId_orders()); paymentsModelsIntent.setOrderId(productCartModels.get(0).getId_orders());
paymentsModels.setGrossAmount(total); paymentsModelsIntent.setGrossAmount(total);
checkoutAdapter.setCheckoutAdapter(PaymentActivity.this, productCartModels); checkoutAdapter.setCheckoutAdapter(PaymentActivity.this, productCartModels);
recyclerView.setLayoutManager(new LinearLayoutManager(PaymentActivity.this, RecyclerView.VERTICAL, false)); recyclerView.setLayoutManager(new LinearLayoutManager(PaymentActivity.this, RecyclerView.VERTICAL, false));
recyclerView.setAdapter(checkoutAdapter); recyclerView.setAdapter(checkoutAdapter);
...@@ -152,7 +152,7 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -152,7 +152,7 @@ public class PaymentActivity extends AppCompatActivity {
}); });
} }
bottomSheet = new BottomSheets(paymentsModels); bottomSheet = new BottomSheets(paymentsModels,0);
RecyclerView rvPayment = findViewById(R.id.rvPayment); RecyclerView rvPayment = findViewById(R.id.rvPayment);
...@@ -160,7 +160,7 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -160,7 +160,7 @@ public class PaymentActivity extends AppCompatActivity {
rvPayment.setLayoutManager(llm); rvPayment.setLayoutManager(llm);
paymentResponses.add(new PaymentResponse("https://i.ibb.co/5c40mWX/cash-logo.png", "cash")); 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/2n65nCT/bca-bank-central-asia.png", "bca"));
paymentResponses.add(new PaymentResponse("https://i.ibb.co/RjJQT9K/BNI-logo.png", "bni")); paymentResponses.add(new PaymentResponse("https://i.ibb.co/RjJQT9K/BNI-logo.png", "bni"));
...@@ -177,185 +177,173 @@ public class PaymentActivity extends AppCompatActivity { ...@@ -177,185 +177,173 @@ public class PaymentActivity extends AppCompatActivity {
btnPay.setOnClickListener(new View.OnClickListener() { btnPay.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (methodPay.equals("cash")) { if (methodPay.equals("cash")){
paymentsModels.setPaymentType("cash"); paymentsModels.setPaymentType("cash");
Log.i("CASH", "onClick: " + utils.convertGson(paymentsModels)); paymentsModels.setTransactionStatus("success");
paymentsModels.setTransaction_id(utils.timeStamp()+"-MES");
bottomSheet = new BottomSheets(paymentsModels); paymentsModels.setTransaction_time(utils.timeStamp());
bottomSheet.setCancelable(true); Log.i("CASH", "onClick: "+utils.convertGson(paymentsModels));
bottomSheet.show(getSupportFragmentManager(),
"ModalBottomSheet"); 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 { }else{
progressDialog.show(); progressDialog.show();
progressDialog.setCancelable(false);
// bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED); // bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED);
// progressDialog.show(); // progressDialog.show();
Client client = new Client(); Client client = new Client();
paymentsModels.setPaymentType("bank_transfer"); paymentsModels.setPaymentType("bank_transfer");
paymentsModels.setBank(methodPay); paymentsModels.setBank(methodPay);
paymentsModels.setOrderIdUpdate(sharedPreferences.getString(ORDER_ID, "")); paymentsModels.setOrderIdUpdate(sharedPreferences.getString(ORDER_ID,""));
paymentsModels.setOrderId(sharedPreferences.getString(ORDER_ID, "")); paymentsModels.setOrderId(sharedPreferences.getString(ORDER_ID, ""));
paymentsModels.setTransactionStatus("success"); paymentsModels.setTransactionStatus("success");
paymentsModels.setTransaction_id(utils.timeStamp() + "-MES"); paymentsModels.setTransaction_id(utils.timeStamp()+"-MES");
paymentsModels.setTransaction_time(utils.timeStamp()); paymentsModels.setTransaction_time(utils.timeStamp());
Log.i("BANK", "onClick: " + utils.convertGson(paymentsModels)); Log.i("BANK", "onClick: "+utils.convertGson(paymentsModels));
PaymentService paymentService = client.Client(PaymentService.class); PaymentService paymentService = client.Client(PaymentService.class);
<<<<<<<HEAD
if (paymentsModelsIntent == null) { if (paymentsModelsIntent == null){
paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() { paymentService.postFromCart(paymentsModels).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override @Override
public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> 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())); Log.i("Paymen_bank", "onResponse: "+utils.convertGson(response.body()));
if (response.body() != null) { if (response.body() != null){
SharedPreferences.Editor editor = sharedPreferences.edit(); SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString(ORDER_ID, ""); editor.putString(ORDER_ID, "");
editor.putBoolean(CHECKOUT, false); editor.putBoolean(CHECKOUT, false);
progressDialog.dismiss(); progressDialog.dismiss();
if (editor.commit()) { if (editor.commit()){
qrCode = new QRCode(response.body()); paymentCreated = new PaymentCreated();
qrCode.show( paymentCreated.setCancelable(false);
paymentCreated.show(
getSupportFragmentManager(), getSupportFragmentManager(),
"QRCode" "paymentCreated"
); );
} }
} else { }else{
progressDialog.dismiss(); progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this) new AlertDialog.Builder(PaymentActivity.this)
.setTitle("Payment Order") .setTitle("Payment Order")
.setMessage("Erorr save!").show(); .setMessage("Erorr save!").show();
} }
} }
=======
paymentService.postFromCart(paymentsModels).
enqueue(new Callback<DataResponse<PaymentsModels>>() {
@Override
public void onResponse
(Call < DataResponse < PaymentsModels >> call, Response < DataResponse < PaymentsModels >> response)
{
Log.i("Paymen_bank", "onResponse: " + utils.convertGson(response.body()));
if (response.body() != null) {
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString(ORDER_ID, "");
editor.putBoolean(CHECKOUT, false);
progressDialog.dismiss();
if (editor.commit()) {
qrCode = new QRCode(response.body());
qrCode.show(
getSupportFragmentManager(),
qrCode.getTag()
);
>>>>>>>11 ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
@Override
public void onFailure
(Call < DataResponse < PaymentsModels < List < VaNumberModels >>> > call, Throwable
t){
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setCancelable(false)
.setTitle("Payment Order")
.setMessage("Add new payment failed, try again!").show();
}
});
} else {
paymentService.postFromCartPending(paymentsModels).enqueue(new Callback<DataResponse>() {
@Override
public void onResponse(Call<DataResponse> call,
Response<DataResponse> response) {
Log.i("Paymen_bank_sa", "onResponse: " + utils.convertGson(response.body()));
if (response.body() != null) {
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString(ORDER_ID, "");
editor.putBoolean(CHECKOUT, false);
progressDialog.dismiss();
if (editor.commit()) {
qrCode = new QRCode(response.body());
qrCode.show(
getSupportFragmentManager(),
"QRCode"
);
}
} else {
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setTitle("Payment Order")
.setMessage("Erorr save!").show();
}
}
@Override
public void onFailure(Call<DataResponse> call, Throwable t) {
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setCancelable(false)
.setTitle("Payment Order")
.setMessage("Add new payment failed, try again!").show();
}
});
}
} @Override
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setCancelable(false)
.setTitle("Payment Order")
.setMessage("Add new payment failed, try again!").show();
} }
}); });
}else{
bottomSheet.setListener(new BottomSheets.CashListener() { paymentService.postFromCartPending(paymentsModelsIntent.getOrderId(), paymentsModelsIntent).enqueue(new Callback<DataResponse>() {
@Override @Override
public void onCash(PaymentsModels paymentsModels) { public void onResponse(Call<DataResponse> call,
progressDialog.show(); Response<DataResponse> response) {
Client client = new Client(); Log.i("Paymen_bank_sa", "onResponse: "+utils.convertGson(response.body()));
PaymentsModels paymentsModels1 = new PaymentsModels(
MainActivity.orderId,
"cash",
"none",
grossAmount
);
PaymentService paymentService = client.Client(PaymentService.class);
paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override
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();
editor.putBoolean(CHECKOUT, false);
editor.putString(orderId, "");
if (editor.commit()) {
startActivity(new Intent(PaymentActivity.this, MainActivity.class));
}
}
}
@Override
public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
if (response.body() != null){
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString(ORDER_ID, "");
editor.putBoolean(CHECKOUT, false);
progressDialog.dismiss();
if (editor.commit()){
paymentCreated = new PaymentCreated();
paymentCreated.setCancelable(false);
paymentCreated.show(
getSupportFragmentManager(),
"QRCode"
);
} }
}); }else{
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setTitle("Payment Order")
.setMessage("Erorr save!").show();
}
} }
});
@Override
public void onFailure(Call<DataResponse> call, Throwable t) {
progressDialog.dismiss();
new AlertDialog.Builder(PaymentActivity.this)
.setCancelable(false)
.setTitle("Payment Order")
.setMessage("Add new payment failed, try again!").show();
}
});
} }
}
}
});
bottomSheet.setListener(new BottomSheets.CashListener() {
@Override
public void onCash(PaymentsModels paymentsModels) {
progressDialog.show();
Client client = new Client();
PaymentsModels paymentsModels1 = new PaymentsModels(
MainActivity.orderId,
"cash",
"none",
grossAmount
);
PaymentService paymentService = client.Client(PaymentService.class);
paymentService.postFromCart(paymentsModels1).enqueue(new Callback<DataResponse<PaymentsModels<List<VaNumberModels>>>>() {
@Override @Override
public void onBackPressed () { public void onResponse(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call,
super.onBackPressed(); Response<DataResponse<PaymentsModels<List<VaNumberModels>>>> response) {
startActivity(new Intent(PaymentActivity.this, MainActivity.class)); if (response.body() != null){
finish(); progressDialog.dismiss();
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putBoolean(CHECKOUT, false);
editor.putString(orderId, "");
if (editor.commit()){
startActivity(new Intent(PaymentActivity.this, MainActivity.class));
}
}
} }
public void savePaymentSuccess () { @Override
SharedPreferences.Editor editor = sharedPreferences.edit(); public void onFailure(Call<DataResponse<PaymentsModels<List<VaNumberModels>>>> call, Throwable t) {
editor.putString(ORDER_ID, "");
if (editor.commit()) {
startActivity(new Intent(PaymentActivity.this, MainActivity.class));
finish();
}
} }
} });
} }
{} });
\ No newline at end of file
}
@Override
public void onBackPressed() {
super.onBackPressed();
startActivity(new Intent(PaymentActivity.this, MainActivity.class));
finish();
}
public void savePaymentSuccess(){
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString(ORDER_ID, "");
if (editor.commit()){
startActivity(new Intent(PaymentActivity.this, MainActivity.class));
finish();
}
}
}
app/src/main/java/com/yono/messeripos/QRCode.java → app/src/main/java/com/yono/messeripos/PaymentCreated.java
View file @ b1efe15a
...@@ -2,9 +2,9 @@ package com.yono.messeripos; ...@@ -2,9 +2,9 @@ package com.yono.messeripos;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Point; import android.graphics.Point;
import android.os.Bundle; import android.os.Bundle;
...@@ -14,12 +14,12 @@ import android.view.LayoutInflater; ...@@ -14,12 +14,12 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.EditText; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView; import com.google.android.material.textview.MaterialTextView;
import com.google.zxing.WriterException;
import com.yono.messeripos.models.PaymentsModels; import com.yono.messeripos.models.PaymentsModels;
import com.yono.messeripos.models.VaNumberModels; import com.yono.messeripos.models.VaNumberModels;
import com.yono.messeripos.response.DataResponse; import com.yono.messeripos.response.DataResponse;
...@@ -29,20 +29,9 @@ import java.util.List; ...@@ -29,20 +29,9 @@ import java.util.List;
import androidmads.library.qrgenearator.QRGContents; import androidmads.library.qrgenearator.QRGContents;
import androidmads.library.qrgenearator.QRGEncoder; import androidmads.library.qrgenearator.QRGEncoder;
public class QRCode extends BottomSheetDialogFragment { public class PaymentCreated extends BottomSheetDialogFragment {
ImageView qrCode; Button btnHome;
MaterialTextView vaText;
QRGEncoder qrgEncoder;
String inputValue;
Bitmap bitmap;
DataResponse<PaymentsModels<List<VaNumberModels>>> paymentsModels;
public QRCode(DataResponse<PaymentsModels<List<VaNumberModels>>> paymentsModels) {
this.paymentsModels = paymentsModels;
Log.d("TAG", "QRCode: "+paymentsModels);
}
@Nullable @Nullable
@Override @Override
...@@ -53,33 +42,44 @@ public class QRCode extends BottomSheetDialogFragment { ...@@ -53,33 +42,44 @@ public class QRCode extends BottomSheetDialogFragment {
false false
); );
qrCode = v.findViewById(R.id.qr_image); btnHome = v.findViewById(R.id.btnBackHome);
vaText = v.findViewById(R.id.etVA);
WindowManager manager = (WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE);
Display display = manager.getDefaultDisplay(); btnHome.setOnClickListener(new View.OnClickListener() {
Point point = new Point(); @Override
display.getSize(point); public void onClick(View view) {
int width = point.x; startActivity(new Intent(v.getContext(), MainActivity.class));
int height = point.y; getActivity().finish();
int smallDimens = Math.min(width, height); }
smallDimens = smallDimens * 3 / 4; });
qrgEncoder = new QRGEncoder(
"inputValue", null,
QRGContents.Type.TEXT,
smallDimens
);
try {
bitmap = qrgEncoder.getBitmap();
qrCode.setImageBitmap(bitmap);
}catch (Exception e) {
Log.d("onCreate: ", e.toString());
}
return v; return v;
} }
}
} // qrCode = v.findViewById(R.id.qr_image);
\ No newline at end of file // vaText = v.findViewById(R.id.etVA);
//
// WindowManager manager = (WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE);
//
// Display display = manager.getDefaultDisplay();
// Point point = new Point();
// display.getSize(point);
// int width = point.x;
// int height = point.y;
// int smallDimens = Math.min(width, height);
// smallDimens = smallDimens * 3 / 4;
// qrgEncoder = new QRGEncoder(
// "inputValue", null,
// QRGContents.Type.TEXT,
// smallDimens
// );
//
// try {
// bitmap = qrgEncoder.getBitmap();
// qrCode.setImageBitmap(bitmap);
// }catch (Exception e) {
// Log.d("onCreate: ", e.toString());
// }
//
// return v;
// }
app/src/main/res/drawable/ic_payment_success.xml 0 → 100644
View file @ b1efe15a
<vector android:height="128dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>
app/src/main/res/layout/activity_q_r_code.xml
View file @ b1efe15a
...@@ -13,27 +13,48 @@ ...@@ -13,27 +13,48 @@
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView <ImageView
android:id="@+id/qr_image" android:id="@+id/successIcon"
android:layout_width="300dp" android:layout_width="351dp"
android:layout_height="300dp" android:layout_height="181dp"
android:backgroundTint="#333" android:layout_marginTop="64dp"
android:src="@mipmap/ic_launcher" android:src="@drawable/payment_created"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/paymentCreated"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:text="Payment Success Created"
android:textFontWeight="600"
android:textSize="25sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/successIcon" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/etVA" android:id="@+id/textDetail"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Va_Text" android:text="Please make a payment"
android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent"
android:textStyle="bold" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/qr_image" app:layout_constraintTop_toBottomOf="@id/paymentCreated" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnBackHome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30dp"
android:layout_marginVertical="20dp"
android:text="back to home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textDetail"
app:layout_constraintVertical_bias="0.997" />
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/layout_login.xml 0 → 100644
View file @ b1efe15a
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/layout_register.xml 0 → 100644
View file @ b1efe15a
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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