diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d0f2a2b..b39357c 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 8eb59b9..5706885 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "ch.pizzapp.capri" minSdkVersion 16 targetSdkVersion 27 - versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 15 - versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.17 + versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 22 + versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.24 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index a0a5c39..fde16b6 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"2.23","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":22,"versionName":"2.24","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java index 78dc811..48118d4 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -48,6 +48,6 @@ public class ApiEndPoints { public static final String API_CHECK_COUPON = PREFIX + "checkCoupon" + SUFFIX + "&token="; public static final String API_CREATE_PAYMENT = PREFIX + "checkBrainTreePayment" + SUFFIX + "&token="; public static final String API_REPEAT_ORDER = PREFIX + "reOrder" + SUFFIX + "&token="; - public static final String API_CHECK_BASKET_BY_MINIMUM_PRICE = PREFIX + "checkBasketByMinimumPrice" + SUFFIX + "&token="; + public static final String API_CHECK_ORDER_PRICE = PREFIX + "checkOrderPrice" + SUFFIX + "&token="; } diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java index a40ce4f..eb43ed3 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java @@ -226,8 +226,8 @@ public interface ApiInterface { @FormUrlEncoded @POST - Call> checkBasketByMinimumPriceOfStore(@Url String url, - @FieldMap HashMap body); + Call checkOrderPrice(@Url String url, + @FieldMap HashMap body); diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index 18139cc..a2fd818 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -143,7 +143,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { createOrderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: - checkBasketByMinimumPriceOfStore(); + checkOrderPrice(); break; } } @@ -186,7 +186,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { orderProductsRecyclerView.setAdapter(productOnOrderSummaryRecyclerAdapter); } - private void checkBasketByMinimumPriceOfStore(){ + private void checkOrderPrice(){ DialogHelper.showLoadingDialog(); @@ -204,11 +204,11 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("coupon", SessionHelper.getSelectedCoupon().getCode()); } - Call> call = ApiService.apiInterface.checkBasketByMinimumPriceOfStore( - "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CHECK_BASKET_BY_MINIMUM_PRICE + SessionHelper.getCustomerToken().getToken(), params); - call.enqueue(new Callback>() { + Call call = ApiService.apiInterface.checkOrderPrice( + "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CHECK_ORDER_PRICE + SessionHelper.getCustomerToken().getToken(), params); + call.enqueue(new Callback() { @Override - public void onResponse(Call> call, Response> response) { + public void onResponse(Call call, Response response) { if(response.isSuccessful() && response.body().isSuccess()){ checkDeliveryTime(); } @@ -219,7 +219,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); }