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

show delivery time preference dialog on self pick up orders too

Browse Source
This commit is contained in:
mustafa içmen
2020-01-18 15:47:00 +03:00
parent 1edd02709c
commit 018d02e507
3 changed files with 2 additions and 12 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.

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

@@ -227,16 +227,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@Override @Override
public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) { public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) {
if(response.isSuccessful() && response.body().isSuccess()){ if(response.isSuccessful() && response.body().isSuccess()){
checkDeliveryTimeForPreferenceDialog();
if(createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_FREE_SHIPPING)){
checkDeliveryTimeForPreferenceDialog();
}
else if(createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
getDeliveryTimeOfStore(choosePickUpDateTimeText);
}
else {
checkDeliveryTime();
}
} }
else{ else{
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
@@ -301,8 +292,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@Override @Override
public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) { public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && if(response.isSuccessful() && response.body() != null){
response.body() != null){
if(response.body().isSuccess()){ if(response.body().isSuccess()){
showDeliveryTimePreferenceDialogWithTwoButtons(); showDeliveryTimePreferenceDialogWithTwoButtons();