From 6708060b5f41a84a7d377b95719d40c9430e98a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Wed, 25 Dec 2019 22:58:40 +0300
Subject: [PATCH] shipping method added to checkDeliveryTime

---
 .idea/caches/build_file_checksums.ser         | Bin 542 -> 542 bytes
 .idea/caches/gradle_models.ser                | Bin 315113 -> 315113 bytes
 .../ch/pizzaleu/android/api/ApiInterface.java |   9 ++++++---
 .../CreateOrderSummaryFragment.java           |  11 ++++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 26847de8835d09f08e9d25c8bf56bc77b64473f5..04dc050ba6dc57d53e3dd94ec702fa0a9da1dac7 100644
GIT binary patch
delta 15
WcmbQoGLL1#3>G`T0@samniv5qs|A7p

delta 15
XcmbQoGLL1#3>KX`O)?wjG%*4IE}RAD

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 53c4fee8f51c211470fa21bc0847ca24c952b317..76b03944b2588b01b457ee8af05685fae06a4848 100644
GIT binary patch
delta 188
zcmaDkSNP>z;SKxM`79(hzGDCZ#^NFdqsb4$G&X-#kGA34wUFT%Lm@*QqfrS1YszGM
zW6|c~l=k8jMj&R|UYx?reVt7_ckv6xg6V~=Ov2lzTeECpV~O41=Dgk4iN&dzt(mt<
z9VWTrD2pzW%-P?zAAuHegG|){5==LXfu!K&0*ynW(?1?(St1XT61)x)We_U`k&+;X
T0U4s-8=Q_T+`i=mizyob3w=Nv

delta 188
zcmaDkSNP>z;SKxM`NY=Uxy1kijKxI^Mw1_gX>9(g9&N+tY|^I1P{>fnXjH<$nljnm
zShTq~rM)<X5r~<#7pE|DUuP@T`NqpwFukyqNqGBoYnDxHES93{?6&(lu{brey*=Wh
z0h3&Dltq_G#?bhZ0MH^Xkf}OAg6U>4kQBUJpm9iK`p4reOXNXPg4aQ!3}U4qQWE4a
TAVc)~<LZb5+qaxxF=Yb)PY*s#

diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
index 9541518..5f75cf2 100644
--- a/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
+++ b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
@@ -203,12 +203,14 @@ public interface ApiInterface {
                                                                @Query("token") String token);
 
     @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
-    Call<ResponseObject<Boolean>> checkDeliveryTime(@Path("storeName") String storeName);
+    Call<ResponseObject<Boolean>> checkDeliveryTime(@Path("storeName") String storeName,
+                                                    @Query("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
     Call<ResponseObject<Boolean>> checkDeliveryTimeWithDateAndTime(@Path("storeName") String storeName,
-                                                                   @Field("delivery_date") String deliveryDateAndTime);
+                                                                   @Field("delivery_date") String deliveryDateAndTime,
+                                                                   @Field("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST
@@ -223,7 +225,8 @@ public interface ApiInterface {
     Call<ResponseArray<StoreModel>> getStoreList();
 
     @GET("{storeName}" + ApiEndPoints.API_GET_DELIVERY_TIME_OF_STORE)
-    Call<ResponseObject<StoreShiftModel>> getDeliveryTimeOfStore(@Path("storeName") String storeName);
+    Call<ResponseObject<StoreShiftModel>> getDeliveryTimeOfStore(@Path("storeName") String storeName,
+                                                                 @Query("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 878a4e6..ee95912 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -251,7 +251,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void checkDeliveryTime(){
         ApiService
                 .apiInterface
-                .checkDeliveryTime(SessionHelper.getSelectedStore().getStoreName())
+                .checkDeliveryTime(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<Boolean>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {
@@ -287,7 +289,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void getDeliveryTimeOfStore(final String dialogMessage){
         ApiService
                 .apiInterface
-                .getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName())
+                .getDeliveryTimeOfStore(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<StoreShiftModel>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<StoreShiftModel>> call, Response<ResponseObject<StoreShiftModel>> response) {
@@ -325,7 +329,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 .apiInterface
                 .checkDeliveryTimeWithDateAndTime(
                         SessionHelper.getSelectedStore().getStoreName(),
-                        deliveryDateAndTime)
+                        deliveryDateAndTime,
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<Boolean>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {