test

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

@@ -47,7 +47,11 @@ public class BottomSheets extends BottomSheetDialogFragment {
     Utils utils;
     String defaultText = "0";
     Client client = new Client();
+<<<<<<< HEAD
+    public static long grossAmount,result, input;
+=======
     public static long grossAmount, input, result;
+>>>>>>> 11ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
     SharedPreferences sharedPreferences;
     public static BottomSheetBehavior bottomSheetBehavior;
     RelativeLayout layoutFormCash;

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

@@ -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{

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

@@ -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

@@ -121,7 +121,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/api/service/PaymentService.java

@@ -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<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

@@ -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);