volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shipping method added to checkDeliveryTime

Browse Source
This commit is contained in:
mustafa içmen
2019-12-25 22:58:40 +03:00
parent d6584b58ec
commit 6708060b5f
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

9
app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
View File

@@ -203,12 +203,14 @@ public interface ApiInterface {
@Query("token") String token); @Query("token") String token);
@GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) @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 @FormUrlEncoded
@POST("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) @POST("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
Call<ResponseObject<Boolean>> checkDeliveryTimeWithDateAndTime(@Path("storeName") String storeName, 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 @FormUrlEncoded
@POST @POST
@@ -223,7 +225,8 @@ public interface ApiInterface {
Call<ResponseArray<StoreModel>> getStoreList(); Call<ResponseArray<StoreModel>> getStoreList();
@GET("{storeName}" + ApiEndPoints.API_GET_DELIVERY_TIME_OF_STORE) @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 @FormUrlEncoded
@POST @POST

11
app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -251,7 +251,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
private void checkDeliveryTime(){ private void checkDeliveryTime(){
ApiService ApiService
.apiInterface .apiInterface
.checkDeliveryTime(SessionHelper.getSelectedStore().getStoreName()) .checkDeliveryTime(
SessionHelper.getSelectedStore().getStoreName(),
createOrderActivity.getSelectedShippingMethod().getCode())
.enqueue(new Callback<ResponseObject<Boolean>>() { .enqueue(new Callback<ResponseObject<Boolean>>() {
@Override @Override
public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) { 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){ private void getDeliveryTimeOfStore(final String dialogMessage){
ApiService ApiService
.apiInterface .apiInterface
.getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName()) .getDeliveryTimeOfStore(
SessionHelper.getSelectedStore().getStoreName(),
createOrderActivity.getSelectedShippingMethod().getCode())
.enqueue(new Callback<ResponseObject<StoreShiftModel>>() { .enqueue(new Callback<ResponseObject<StoreShiftModel>>() {
@Override @Override
public void onResponse(Call<ResponseObject<StoreShiftModel>> call, Response<ResponseObject<StoreShiftModel>> response) { public void onResponse(Call<ResponseObject<StoreShiftModel>> call, Response<ResponseObject<StoreShiftModel>> response) {
@@ -325,7 +329,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
.apiInterface .apiInterface
.checkDeliveryTimeWithDateAndTime( .checkDeliveryTimeWithDateAndTime(
SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getSelectedStore().getStoreName(),
deliveryDateAndTime) deliveryDateAndTime,
createOrderActivity.getSelectedShippingMethod().getCode())
.enqueue(new Callback<ResponseObject<Boolean>>() { .enqueue(new Callback<ResponseObject<Boolean>>() {
@Override @Override
public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) { public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {