From a24fabc06fbfa13073ebf5a019966f87cd8e67fd Mon Sep 17 00:00:00 2001 From: cimenmus Date: Tue, 21 Aug 2018 00:09:43 +0300 Subject: [PATCH] =?UTF-8?q?servis=20ay=C4=B1rma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 538 -> 538 bytes .idea/misc.xml | 2 +- app/build.gradle | 2 +- .../android/activity/AddAddressActivity.java | 8 +- .../activity/CampaignProductListActivity.java | 5 +- .../activity/ForgotPasswordActivity.java | 2 + .../android/activity/LoginActivity.java | 6 +- .../android/activity/MyAddressesActivity.java | 1 + .../activity/OrderHistoryDetailsActivity.java | 1 + .../android/activity/RegisterActivity.java | 18 +- .../android/activity/SplashActivity.java | 71 +++++- .../ch/pizzapp/android/api/ApiEndPoints.java | 48 ++-- .../ch/pizzapp/android/api/ApiInterface.java | 204 ++++++++++++++++- .../android/fragment/CartFragment.java | 29 ++- .../android/fragment/MenuFragment.java | 5 +- .../fragment/OrderHistoryFragment.java | 5 +- .../android/fragment/ProductFragment.java | 5 +- .../android/fragment/ProfileFragment.java | 5 +- .../android/fragment/StoreInfoFragment.java | 3 +- .../CreateOrderSummaryFragment.java | 212 +++++++++++++++--- .../createOrder/PaymentMethodFragment.java | 1 + .../createOrder/ShippingAddressFragment.java | 1 + .../createOrder/ShippingMethodFragment.java | 1 + .../pizzapp/android/helper/DialogHelper.java | 14 ++ .../pizzapp/android/helper/PriceHelper.java | 2 +- .../pizzapp/android/helper/SessionHelper.java | 13 +- .../android/helper/SharedPrefsHelper.java | 17 ++ .../android/model/CustomerTokenModel.java | 13 ++ .../ch/pizzapp/android/model/StoreModel.java | 111 +++++++++ .../android/model/StoreShiftModel.java | 84 +++++++ .../android/model/StoreWorkDayModel.java | 65 ++++++ app/src/main/res/values/strings.xml | 5 +- 32 files changed, 878 insertions(+), 81 deletions(-) create mode 100644 app/src/main/java/ch/pizzapp/android/model/StoreModel.java create mode 100644 app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java create mode 100644 app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 053ac8dda321d716d5f169ad37d427bd236b53f3..4afa8bd58728602a464de1cd7480dbfbf669580d 100644 GIT binary patch delta 34 scmV+-0NwwZ1eyepmjz{5;2K=9oNWOSxBxb5==kI$gF5=Ru!6VRc=&%1G5`Po delta 34 scmV+-0NwwZ1eyepmjz^tFqj^(oNWOS;Lpx6szp2DLf=5Me$Hbec=!YlAOHXW diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 1f91ecd..8e71f4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'uk.co.chrisjenx:calligraphy:2.3.0' - implementation 'com.wdullaer:materialdatetimepicker:3.1.1' + implementation 'com.wdullaer:materialdatetimepicker:3.6.3' implementation 'io.nlopez.smartlocation:library:3.3.3' implementation 'q.rorbin:badgeview:1.1.0' implementation 'com.braintreepayments.api:braintree:2.13.1' diff --git a/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java b/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java index ae01df9..dcb5021 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java @@ -124,7 +124,7 @@ public class AddAddressActivity extends BaseActivity { if(activeRequestCount == 0) DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getCityList(); + Call> call = ApiService.apiInterface.getCityList(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -165,7 +165,7 @@ public class AddAddressActivity extends BaseActivity { increaseActiveRequestCount(); - Call> call = ApiService.apiInterface.getCountryList(); + Call> call = ApiService.apiInterface.getCountryList(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -198,7 +198,9 @@ public class AddAddressActivity extends BaseActivity { private void getZoneList(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getZoneList(selectedCountryModel.getId()); + Call> call = ApiService.apiInterface.getZoneList( + SessionHelper.getSelectedStore().getStoreName(), + selectedCountryModel.getId()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzapp/android/activity/CampaignProductListActivity.java b/app/src/main/java/ch/pizzapp/android/activity/CampaignProductListActivity.java index d6b85ca..01f0531 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/CampaignProductListActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/CampaignProductListActivity.java @@ -19,6 +19,7 @@ import ch.pizzapp.android.api.ApiService; import ch.pizzapp.android.api.ResponseArray; import ch.pizzapp.android.helper.DialogHelper; import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.model.CampaignModel; import ch.pizzapp.android.model.menu.MenuProductModel; @@ -90,7 +91,9 @@ public class CampaignProductListActivity extends BaseActivity { private void getCampaignProducts(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getProductsByCategory(campaignModel.getCategoryId()); + Call> call = ApiService.apiInterface.getProductsByCategory( + SessionHelper.getSelectedStore().getStoreName(), + campaignModel.getCategoryId()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java b/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java index 11c0102..8e424d2 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java @@ -17,6 +17,7 @@ import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiService; import ch.pizzapp.android.api.ResponseObject; import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.helper.ViewHelper; import ch.pizzapp.android.view.AppEditText; import retrofit2.Call; @@ -66,6 +67,7 @@ public class ForgotPasswordActivity extends BaseActivity { private void resetPassword(){ DialogHelper.showLoadingDialog(); Call call = ApiService.apiInterface.forgotPassword( + SessionHelper.getSelectedStore().getStoreName(), forgotPasswordEmailAppEditText.getText()); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java index edd787f..23e999a 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java @@ -20,6 +20,7 @@ import ch.pizzapp.android.helper.PriceHelper; import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.ViewHelper; +import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzapp.android.model.UserModel; import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzapp.android.view.AppEditText; @@ -91,6 +92,7 @@ public class LoginActivity extends BaseActivity { private void login(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.login( + SessionHelper.getSelectedStore().getStoreName(), emailAppEditText.getText(), passwordAppEditText.getText()); call.enqueue(new Callback>() { @Override @@ -99,7 +101,9 @@ public class LoginActivity extends BaseActivity { response.body().getData() != null && response.body().isSuccess()){ SharedPrefsHelper.saveUser(response.body().getData()); - SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken()); + CustomerTokenModel customerTokenModel = response.body().getData().getToken(); + customerTokenModel.setStoreOfToken(SessionHelper.getSelectedStore()); + SharedPrefsHelper.saveCustomerToken(customerTokenModel); SharedPrefsHelper.setCustomerLoggedIn(true); getCartItemCount(); } diff --git a/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java index 579d403..c18e4ad 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java @@ -76,6 +76,7 @@ public class MyAddressesActivity extends BaseActivity { private void getCustomerAddresses(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getCustomerAddresses( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java index 136ba34..e8cd2af 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java @@ -196,6 +196,7 @@ public class OrderHistoryDetailsActivity extends BaseActivity { private void clearCart(){ DialogHelper.showLoadingDialog(); Call call = ApiService.apiInterface.clearCart( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java index 9610458..7bcc7a1 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java @@ -23,10 +23,12 @@ import ch.pizzapp.android.api.ApiService; import ch.pizzapp.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseObject; import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.ViewHelper; import ch.pizzapp.android.model.CityModel; import ch.pizzapp.android.model.CountryModel; +import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzapp.android.model.UserModel; import ch.pizzapp.android.model.ZoneModel; import ch.pizzapp.android.view.AppDropdownView; @@ -155,7 +157,7 @@ public class RegisterActivity extends BaseActivity { if(activeRequestCount == 0) DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getCityList(); + Call> call = ApiService.apiInterface.getCityList(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -196,7 +198,7 @@ public class RegisterActivity extends BaseActivity { increaseActiveRequestCount(); - Call> call = ApiService.apiInterface.getCountryList(); + Call> call = ApiService.apiInterface.getCountryList(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -229,7 +231,9 @@ public class RegisterActivity extends BaseActivity { private void getZoneList(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getZoneList(selectedCountryModel.getId()); + Call> call = ApiService.apiInterface.getZoneList( + SessionHelper.getSelectedStore().getStoreName(), + selectedCountryModel.getId()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -273,7 +277,9 @@ public class RegisterActivity extends BaseActivity { private void registerUser(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.register(getRegisterParams()); + Call> call = ApiService.apiInterface.register( + SessionHelper.getSelectedStore().getStoreName(), + getRegisterParams()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -283,7 +289,9 @@ public class RegisterActivity extends BaseActivity { response.body().isSuccess()){ response.body().getData().checkNull(); SharedPrefsHelper.saveUser(response.body().getData()); - SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken()); + CustomerTokenModel customerTokenModel = response.body().getData().getToken(); + customerTokenModel.setStoreOfToken(SessionHelper.getSelectedStore()); + SharedPrefsHelper.saveCustomerToken(customerTokenModel); SharedPrefsHelper.setCustomerLoggedIn(true); startActivity(new Intent(RegisterActivity.this, MainActivity.class)); finishAffinity(); diff --git a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java index f674e93..7f91766 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java @@ -9,10 +9,15 @@ import android.os.Bundle; import android.os.Handler; import android.support.v4.content.ContextCompat; import android.util.Log; +import android.view.View; import android.view.Window; import android.view.WindowManager; +import com.afollestad.materialdialogs.MaterialDialog; + import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import butterknife.ButterKnife; @@ -31,6 +36,7 @@ import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzapp.android.model.AppVersionModel; import ch.pizzapp.android.model.CategoryModel; +import ch.pizzapp.android.model.StoreModel; import ch.pizzapp.android.model.cart.CartInfoModel; import retrofit2.Call; import retrofit2.Callback; @@ -44,14 +50,65 @@ public class SplashActivity extends BaseActivity { setContentView(R.layout.activity_splash); ButterKnife.bind(this); //DisplayHelper.changeStatusColor(); - if(NetworkHelper.isNetworkAvailable()) - checkVersion(); - else + if(NetworkHelper.isNetworkAvailable()){ + getStoreList(); + } + else{ DialogHelper.showNoNetworkDialog(); + } + } + + private void getStoreList(){ + Call> call = ApiService.apiInterface.getStoreList(); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if(response.isSuccessful() && + response.body().getData() != null && + response.body().isSuccess() && !response.body().getData().isEmpty()){ + showStoreListDialog(response.body().getData()); + } + else { + ApiErrorUtils.parseError(response); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.showFailedDialog(); + } + }); + } + + private void showStoreListDialog(final ArrayList storeList){ + + Collections.sort(storeList, new Comparator() { + @Override + public int compare(StoreModel s1, StoreModel s2) { + return s1.getPostCode().compareTo(s2.getPostCode()); + } + }); + + final ArrayList postCodeList = new ArrayList<>(); + for(StoreModel storeModel : storeList){ + storeModel.checkNull(); + postCodeList.add(storeModel.getPostCode()); + } + + DialogHelper.showStoreListDialog(postCodeList, new MaterialDialog.ListCallback() { + @Override + public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { + StoreModel selectedStoreModel = storeList.get(position); + SharedPrefsHelper.saveSelectedStore(selectedStoreModel); + checkVersion(); + } + }); } private void checkVersion(){ - Call> call = ApiService.apiInterface.checkUpdate(getCheckUpdateParams()); + Call> call = ApiService.apiInterface.checkUpdate( + SessionHelper.getSelectedStore().getStoreName(), + getCheckUpdateParams()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -94,7 +151,7 @@ public class SplashActivity extends BaseActivity { } private void getCategoryList(){ - Call> call = ApiService.apiInterface.getAllCategories(); + Call> call = ApiService.apiInterface.getAllCategories(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -117,7 +174,7 @@ public class SplashActivity extends BaseActivity { } private void getPizzaCategoryIds(){ - Call> call = ApiService.apiInterface.getPizzaCategoryIds(); + Call> call = ApiService.apiInterface.getPizzaCategoryIds(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -140,7 +197,7 @@ public class SplashActivity extends BaseActivity { } private void getIgnoredCategoryIds(){ - Call> call = ApiService.apiInterface.getIgnoredCategoryIds(); + Call> call = ApiService.apiInterface.getIgnoredCategoryIds(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { 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 4bd39f2..95e936b 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -1,10 +1,14 @@ package ch.pizzapp.android.api; +import ch.pizzapp.android.helper.SessionHelper; + public class ApiEndPoints { - private static final String PREFIX = "pizza/index.php?route=mobile/service/"; + private static final String PREFIX = "/index.php?route=mobile/service/"; private static final String SUFFIX = "&is_mobile=1"; + public static final String API_GET_STORE_LIST = "pizzacommon/servicemagazabelirle.php"; + public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX; public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX; public static final String API_GET_PIZZA_CATEGORY_IDS= PREFIX + "getPizzaCategories" + SUFFIX; @@ -12,33 +16,49 @@ public class ApiEndPoints { public static final String API_LOGIN = PREFIX + "login" + SUFFIX; public static final String API_LOGOUT = PREFIX + "logout" + SUFFIX; public static final String API_GET_ORDER_HISTORY = PREFIX + "getOrders" + SUFFIX; - public static final String API_GET_CART_PRODUCTS = PREFIX + "getBasketProducts" + SUFFIX + "&token="; public static final String API_GET_CLEAR_CART = PREFIX + "clearBasket" + SUFFIX; public static final String API_GET_PRODUCTS_BY_CATEGORY = PREFIX + "getProductsByCategory" + SUFFIX; public static final String API_GET_PRODUCT = PREFIX + "getProduct" + SUFFIX; - public static final String API_ADD_PRODUCTS_TO_BASKET = PREFIX + "addProductsToBasket" + SUFFIX + "&token="; - //public static final String API_ADD_PRODUCTS_TO_BASKET = PREFIX + "addProductsToBasketYeni" + SUFFIX + "&token="; public static final String API_GET_SHIPPING_METHODS = PREFIX + "getShippingMethodsArray" + SUFFIX; public static final String API_GET_CUSTOMER_ADDRESSES = PREFIX + "getAddresses" + SUFFIX; - public static final String API_ADD_NEW_ADDRESS = PREFIX + "addAddress" + SUFFIX + "&token="; - public static final String API_DELETE_ADDRESS = PREFIX + "deleteAddress" + SUFFIX + "&token="; public static final String API_GET_PAYMENT_METHODS = PREFIX + "getPaymentMethodsArray" + SUFFIX; - public static final String API_CREATE_ORDER = PREFIX + "addOrder2" + SUFFIX + "&token="; public static final String API_CHECK_UPDATE = PREFIX + "checkUpdate" + SUFFIX; public static final String API_FORGOT_PASSWORD = PREFIX + "forgotPassword" + SUFFIX; public static final String API_GET_CITY_LIST = PREFIX + "getCities" + SUFFIX; public static final String API_GET_COUNTRY_LIST = PREFIX + "getCountries" + SUFFIX; public static final String API_GET_ZONE_LIST = PREFIX + "getZones" + SUFFIX; public static final String API_GET_CUSTOMER_PROFILE = PREFIX + "getCustomerInfo" + SUFFIX; - public static final String API_UPDATE_PASSWORD = PREFIX + "passwordUpdate" + SUFFIX + "&token="; - public static final String API_UPDATE_PROFILE = PREFIX + "updateCustomerInfo" + SUFFIX + "&token="; - public static final String API_REMOVE_RPODUCT_FORM_CART = PREFIX + "removeProductFromBasket" + SUFFIX + "&token="; public static final String API_GET_STORE_INFO = PREFIX + "getStoreInfo" + SUFFIX; - public static final String API_GET_ORDER_PRODUCT_LIST = PREFIX + "getOrderProducts" + SUFFIX; - public static final String API_CHECK_COUPON = PREFIX + "checkCoupon" + SUFFIX + "&token="; public static final String API_CHECK_CAMPAIGN_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token="; public static final String API_CHECK_CAMPAIGN_CHAMPAGNE = PREFIX + "detectChampagneCampaign" + SUFFIX + "&token="; public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX; - 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_GET_DELIVERY_TIME_OF_STORE = PREFIX + "getDeliveryTimeForStore" + SUFFIX; + + + public static final String API_GET_CART_PRODUCTS = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "getBasketProducts" + SUFFIX + "&token="; + //addProductsToBasketYeni + public static final String API_ADD_PRODUCTS_TO_BASKET = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addProductsToBasket" + SUFFIX + "&token="; + public static final String API_ADD_NEW_ADDRESS = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addAddress" + SUFFIX + "&token="; + public static final String API_DELETE_ADDRESS = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "deleteAddress" + SUFFIX + "&token="; + public static final String API_CREATE_ORDER = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addOrder2" + SUFFIX + "&token="; + public static final String API_UPDATE_PASSWORD = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "passwordUpdate" + SUFFIX + "&token="; + public static final String API_UPDATE_PROFILE = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "updateCustomerInfo" + SUFFIX + "&token="; + public static final String API_REMOVE_RPODUCT_FORM_CART = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "removeProductFromBasket" + SUFFIX + "&token="; + public static final String API_GET_ORDER_PRODUCT_LIST = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "getOrderProducts" + SUFFIX + "&token="; + public static final String API_CHECK_COUPON = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "checkCoupon" + SUFFIX + "&token="; + public static final String API_CREATE_PAYMENT = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "checkBrainTreePayment" + SUFFIX + "&token="; + public static final String API_REPEAT_ORDER = + SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "reOrder" + 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 8bd28ef..37010b2 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java @@ -15,6 +15,8 @@ import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; import ch.pizzapp.android.model.ShippingMethodModel; import ch.pizzapp.android.model.StoreInfoModel; import ch.pizzapp.android.model.CityModel; +import ch.pizzapp.android.model.StoreModel; +import ch.pizzapp.android.model.StoreShiftModel; import ch.pizzapp.android.model.ZoneModel; import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.CategoryModel; @@ -30,6 +32,7 @@ import retrofit2.http.FieldMap; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; import retrofit2.http.POST; +import retrofit2.http.Path; import retrofit2.http.Query; import retrofit2.http.Url; @@ -39,8 +42,191 @@ import retrofit2.http.Url; public interface ApiInterface { + + @GET("{storeName}" + ApiEndPoints.API_GET_ALL_CATEGORIES) + Call> getAllCategories(@Path("storeName") String storeName); + + @GET("{storeName}" + ApiEndPoints.API_GET_IGNORED_CATEGORY_IDS) + Call> getIgnoredCategoryIds(@Path("storeName") String storeName); + + @GET("{storeName}" + ApiEndPoints.API_GET_PIZZA_CATEGORY_IDS) + Call> getPizzaCategoryIds(@Path("storeName") String storeName); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_REGISTER) + Call> register(@Path("storeName") String storeName, + @FieldMap HashMap body); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_LOGIN) + Call> login(@Path("storeName") String storeName, + @Field("email") String email, + @Field("password") String password); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_LOGOUT) + Call logout(@Path("storeName") String storeName, + @Field("token") String customerToken); + + @GET("{storeName}" + ApiEndPoints.API_GET_ORDER_HISTORY) + Call> getOrderHistory(@Path("storeName") String storeName, + @Query("token") String token); + + // OK + @POST + Call> getCartProducts(@Url String url); + + // OK + @FormUrlEncoded + @POST + Call> getCartProductsForCommission(@Url String url, + @Field("payment_method") String paymentMethodCode, + @Field("shipping_method") String shippingMethodCode); + + @GET("{storeName}" + ApiEndPoints.API_GET_CLEAR_CART) + Call clearCart(@Path("storeName") String storeName, + @Query("token") String token); + + @GET("{storeName}" + ApiEndPoints.API_GET_PRODUCTS_BY_CATEGORY) + Call> getProductsByCategory(@Path("storeName") String storeName, + @Query("category_id") String categoryId); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_GET_PRODUCT) + Call> getProductById(@Path("storeName") String storeName, + @Field("product_id") int productId); + + + // * Bu projedeki post servisler bizden form-data bekliyor. Bu serviste @FormUrlEncoded yapınca ve + // * body'i @FieldMap HashMap body olarak verince, body içindeki alanlar + // * encode ediliyor, mesela body içindeki "[" karakteri "%5D" ye falan dönüşüyor, dolayısı ile servis bunları okuyamıyor. + // * Bu sebeple body olarak RequestBody verdim ve servisi çağırırken bod içindeki alanları FormBody olarak ekledim. + // OK + @POST + Call> addProductsToBasket(@Url String url, + @Body RequestBody body); + @GET("{storeName}" + ApiEndPoints.API_GET_SHIPPING_METHODS) + Call> getShippingMethods(@Path("storeName") String storeName, + @Query("token") String token); + + @GET("{storeName}" + ApiEndPoints.API_GET_CUSTOMER_ADDRESSES) + Call> getCustomerAddresses(@Path("storeName") String storeName, + @Query("token") String token); + + @FormUrlEncoded + @POST + Call> addNewAddress(@Url String url, + @FieldMap HashMap body); + @FormUrlEncoded + @POST + Call> deleteAddress(@Url String url, + @Field("address_id") String addressId); + @GET("{storeName}" + ApiEndPoints.API_GET_PAYMENT_METHODS) + Call> getPaymentMethods(@Path("storeName") String storeName, + @Query("token") String token); + + @FormUrlEncoded + @POST + Call> createOrder(@Url String url, @FieldMap HashMap body); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_CHECK_UPDATE) + Call> checkUpdate(@Path("storeName") String storeName, + @FieldMap HashMap body); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_FORGOT_PASSWORD) + Call forgotPassword(@Path("storeName") String storeName, + @Field("email") String emailAddress); + + @GET("{storeName}" + ApiEndPoints.API_GET_CITY_LIST) + Call> getCityList(@Path("storeName") String storeName); + + @GET("{storeName}" + ApiEndPoints.API_GET_COUNTRY_LIST) + Call> getCountryList(@Path("storeName") String storeName); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_GET_ZONE_LIST) + Call> getZoneList(@Path("storeName") String storeName, + @Field("country_id") String countryId); + + @GET("{storeName}" + ApiEndPoints.API_GET_CUSTOMER_PROFILE) + Call> getCustomerProfile(@Path("storeName") String storeName, + @Query("token") String token); + + @FormUrlEncoded + @POST + Call updatePassword(@Url String url, + @FieldMap HashMap body); + + @FormUrlEncoded + @POST + Call> updateProfile(@Url String url, + @FieldMap HashMap body); + + @FormUrlEncoded + @POST + Call> removeProductFromCart(@Url String url, + @FieldMap HashMap body); + @GET("{storeName}" + ApiEndPoints.API_GET_STORE_INFO) + Call> getStoreInfo(@Path("storeName") String storeName); + + @FormUrlEncoded + @POST + Call> getOrderProductList(@Url String url, + @Field("order_id") String orderId); + @FormUrlEncoded + @POST + Call> checkCoupon(@Url String url, + @Field("coupon") String couponCode); + + @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_PIZZAPASS) + Call> checkPizzapassCampaign(@Path("storeName") String storeName, + @Query("token") String token); + + @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_CHAMPAGNE) + Call> checkChampagneCampaign(@Path("storeName") String storeName, + @Query("token") String token); + + @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) + Call> checkDeliveryTime(@Path("storeName") String storeName); + + @FormUrlEncoded + @POST("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) + Call> checkDeliveryTimeWithDateAndTime(@Path("storeName") String storeName, + @Field("delivery_date") String deliveryDateAndTime); + + @FormUrlEncoded + @POST + Call createPayment(@Url String url, + @FieldMap HashMap body); + + @FormUrlEncoded + @POST + Call repeatOrder(@Url String url, + @FieldMap HashMap body); + + @GET(ApiEndPoints.API_GET_STORE_LIST) + Call> getStoreList(); + + @GET("{storeName}" + ApiEndPoints.API_GET_DELIVERY_TIME_OF_STORE) + Call> getDeliveryTimeOfStore(@Path("storeName") String storeName); + + + + + + + + + + + + + + /* @GET(ApiEndPoints.API_GET_ALL_CATEGORIES) - Call> getAllCategories(); + Call> getAllCategories(@Path("id") int id); @GET(ApiEndPoints.API_GET_IGNORED_CATEGORY_IDS) Call> getIgnoredCategoryIds(); @@ -82,12 +268,11 @@ public interface ApiInterface { @POST(ApiEndPoints.API_GET_PRODUCT) Call> getProductById(@Field("product_id") int productId); - /* - * Bu projedeki post servisler bizden form-data bekliyor. Bu serviste @FormUrlEncoded yapınca ve - * body'i @FieldMap HashMap body olarak verince, body içindeki alanlar - * encode ediliyor, mesela body içindeki "[" karakteri "%5D" ye falan dönüşüyor, dolayısı ile servis bunları okuyamıyor. - * Bu sebeple body olarak RequestBody verdim ve servisi çağırırken bod içindeki alanları FormBody olarak ekledim. - */ + + // * Bu projedeki post servisler bizden form-data bekliyor. Bu serviste @FormUrlEncoded yapınca ve + // * body'i @FieldMap HashMap body olarak verince, body içindeki alanlar + // * encode ediliyor, mesela body içindeki "[" karakteri "%5D" ye falan dönüşüyor, dolayısı ile servis bunları okuyamıyor. + // * Bu sebeple body olarak RequestBody verdim ve servisi çağırırken bod içindeki alanları FormBody olarak ekledim. @POST Call> addProductsToBasket(@Url String url, @Body RequestBody body); @@ -177,4 +362,9 @@ public interface ApiInterface { @POST Call repeatOrder(@Url String url, @FieldMap HashMap body); + @GET(ApiEndPoints.API_GET_STORE_LIST) + Call> getStoreList(); + */ + + } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java index 1d96458..ec16d42 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java @@ -65,6 +65,8 @@ public class CartFragment extends BaseFragment { @BindString(R.string.alert_remove_prdocut_from_cart) String removeProdcutFromCartAlert; @BindString(R.string.product_removed_from_cart) String productRemovedFromCartText; @BindString(R.string.alert_clear_cart) String clearCartAlertText; + @BindString(R.string.minimum_order_price_alert) String minimumOrderPriceAlertText; + @BindString(R.string.minimum_order_price) String minimumOrderPriceText; @BindColor(R.color.actvity_default_background_color_1) int grayColor; @@ -119,10 +121,30 @@ public class CartFragment extends BaseFragment { }); break; case R.id.continueCartButton: - Intent continueCartIntent = new Intent(BaseActivity.currentActivity, CreateOrderActivity.class); - continueCartIntent.putExtra("cartInfoModel", cartInfoModel); - startActivity(continueCartIntent); + + Double storeMinimumPrice = PriceHelper.stringToDouble(SessionHelper.getSelectedStore().getMinimumPrice()); + Double currentBasketPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText())); + + if(currentBasketPrice >= storeMinimumPrice){ + Intent continueCartIntent = new Intent(BaseActivity.currentActivity, CreateOrderActivity.class); + continueCartIntent.putExtra("cartInfoModel", cartInfoModel); + startActivity(continueCartIntent); + } + else { + String dialogText = + new StringBuilder().append(minimumOrderPriceAlertText) + .append("\n") + .append(minimumOrderPriceText).append(" ") + .append(PriceHelper.getPriceWithCurreny(storeMinimumPrice)) + .toString(); + + DialogHelper.showAlertDialog( + BaseActivity.currentActivity, + dialogText); + } + break; + } } @@ -166,6 +188,7 @@ public class CartFragment extends BaseFragment { private void clearCart(){ DialogHelper.showLoadingDialog(); Call call = ApiService.apiInterface.clearCart( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java index b06d4e7..9292584 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java @@ -25,6 +25,7 @@ import ch.pizzapp.android.api.ResponseArray; import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; import ch.pizzapp.android.helper.DialogHelper; import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.model.CategoryModel; import ch.pizzapp.android.model.menu.MenuProductModel; @@ -114,7 +115,9 @@ public class MenuFragment extends BaseFragment { private void getProductsByCategory(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getProductsByCategory(categoryModel.getCategoryIdString()); + Call> call = ApiService.apiInterface.getProductsByCategory( + SessionHelper.getSelectedStore().getStoreName(), + categoryModel.getCategoryIdString()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java index a8f55d6..baede26 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java @@ -125,7 +125,9 @@ public class OrderHistoryFragment extends BaseFragment { private void getOrderHistory(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface. - getOrderHistory(SessionHelper.getCustomerToken().getToken()); + getOrderHistory( + SessionHelper.getSelectedStore().getStoreName(), + SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -156,6 +158,7 @@ public class OrderHistoryFragment extends BaseFragment { private void clearCart(final String orderId){ DialogHelper.showLoadingDialog(); Call call = ApiService.apiInterface.clearCart( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java index 6f75a3d..92df8b8 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java @@ -24,6 +24,7 @@ import ch.pizzapp.android.api.ResponseArray; import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; import ch.pizzapp.android.helper.DialogHelper; import ch.pizzapp.android.helper.DisplayHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.model.CategoryModel; import ch.pizzapp.android.model.menu.MenuProductModel; @@ -112,7 +113,9 @@ public class ProductFragment extends BaseFragment { private void getProductById(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getProductById(getProductIdByCategory()); + Call> call = ApiService.apiInterface.getProductById( + SessionHelper.getSelectedStore().getStoreName(), + getProductIdByCategory()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java index eff358f..cbce7a3 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java @@ -132,6 +132,7 @@ public class ProfileFragment extends BaseFragment { private void getCustomerProfile(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getCustomerProfile( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override @@ -170,7 +171,9 @@ public class ProfileFragment extends BaseFragment { private void logOutOnWeb(){ DialogHelper.showLoadingDialog(); - Call call = ApiService.apiInterface.logout(SessionHelper.getCustomerToken().getToken()); + Call call = ApiService.apiInterface.logout( + SessionHelper.getSelectedStore().getStoreName(), + SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java index 203b0bf..ec0a0b8 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java @@ -16,6 +16,7 @@ import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiService; import ch.pizzapp.android.api.ResponseObject; import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.model.StoreInfoModel; import retrofit2.Call; import retrofit2.Callback; @@ -59,7 +60,7 @@ public class StoreInfoFragment extends BaseFragment { private void getStoreInfo(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getStoreInfo(); + Call> call = ApiService.apiInterface.getStoreInfo(SessionHelper.getSelectedStore().getStoreName()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { 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 0c88352..56382a0 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 @@ -20,6 +20,7 @@ import com.google.android.gms.wallet.Cart; import com.google.android.gms.wallet.LineItem; import com.wdullaer.materialdatetimepicker.date.DatePickerDialog; import com.wdullaer.materialdatetimepicker.time.TimePickerDialog; +import com.wdullaer.materialdatetimepicker.time.Timepoint; import java.util.ArrayList; import java.util.Calendar; @@ -46,6 +47,8 @@ import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzapp.android.model.CampaignModel; import ch.pizzapp.android.model.PaymentMethodModel; +import ch.pizzapp.android.model.StoreShiftModel; +import ch.pizzapp.android.model.StoreWorkDayModel; import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzapp.android.model.cart.CartTotalModel; @@ -89,9 +92,11 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847; private final int REQUEST_CODE_BRAINTREE_PAYMENT = 3784; private CreateOrderActivity createOrderActivity; - private String dateOfOrder, timeOfOrder; + private String dateOfOrderString, timeOfOrder; + private Calendar dateOfOrder; private ArrayList cartTotalList = new ArrayList<>(); private OrderPriceRecyclerAdapter orderPriceRecyclerAdapter; + private StoreShiftModel storeShiftModel; public CreateOrderSummaryFragment() {} @@ -182,7 +187,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { DialogHelper.showLoadingDialog(); ApiService .apiInterface - .checkPizzapassCampaign(SessionHelper.getCustomerToken().getToken()) + .checkPizzapassCampaign( + SessionHelper.getSelectedStore().getStoreName(), + SessionHelper.getCustomerToken().getToken()) .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -276,7 +283,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private void checkChampagneCampaign(){ ApiService .apiInterface - .checkChampagneCampaign(SessionHelper.getCustomerToken().getToken()) + .checkChampagneCampaign( + SessionHelper.getSelectedStore().getStoreName(), + SessionHelper.getCustomerToken().getToken()) .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -356,19 +365,22 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private void checkDeliveryTime(){ ApiService .apiInterface - .checkDeliveryTime() + .checkDeliveryTime(SessionHelper.getSelectedStore().getStoreName()) .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if(response.isSuccessful() && response.body() != null){ - if(response.body().isSuccess()){ + if(!response.body().isSuccess()){ redirectToPayment(); } else { + getDeliveryTimeOfStore(); + /* DialogHelper.hideLoadingDialog(); showRestaurantOutOfOrderDialog(restaurantOutOfOrderText); + */ } } @@ -382,40 +394,52 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { public void onFailure(Call> call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); + } + }); + } + private void getDeliveryTimeOfStore(){ + ApiService + .apiInterface + .getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName()) + .enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + DialogHelper.hideLoadingDialog(); + if(response.isSuccessful() && + response.body() != null){ - /* - // dummy // + if(response.body().isSuccess()){ + storeShiftModel = response.body().getData(); + showRestaurantOutOfOrderDialog(restaurantOutOfOrderText); + } + else { + DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); + } - if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.UNKNOWN){ + } + else{ DialogHelper.hideLoadingDialog(); - DialogHelper.showAlertDialog(BaseActivity.currentActivity, unknownPaymentMethodText); + ApiErrorUtils.parseError(response); } - else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH || - createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){ - createOrder(null); - } - else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT) { - DialogHelper.hideLoadingDialog(); - startTwintPayment(); - } - else { - DialogHelper.hideLoadingDialog(); - startBraintreePayment(); - } - */ - + } + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.hideLoadingDialog(); + DialogHelper.showFailedDialog(); } }); } private void checkDeliveryTimeWithDateAndTime(){ DialogHelper.showLoadingDialog(); - String deliveryDateAndTime = dateOfOrder + " " + timeOfOrder; + String deliveryDateAndTime = dateOfOrderString + " " + timeOfOrder; ApiService .apiInterface - .checkDeliveryTimeWithDateAndTime(deliveryDateAndTime) + .checkDeliveryTimeWithDateAndTime( + SessionHelper.getSelectedStore().getStoreName(), + deliveryDateAndTime) .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -518,7 +542,10 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { dayOfOrder = "0" + dayOfOrder; } - dateOfOrder = dayOfOrder + "-" + monthOfOrder + "-" + yearOfOrder; + dateOfOrder = Calendar.getInstance(); + dateOfOrder.set(year, monthOfYear, dayOfMonth); + + dateOfOrderString = dayOfOrder + "-" + monthOfOrder + "-" + yearOfOrder; showTimePickerDialog(); } }, @@ -541,6 +568,33 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { int nowMinute = nowDate.get(Calendar.MINUTE); int nowSecond = nowDate.get(Calendar.SECOND); + int selectedDayIndex = dateOfOrder.get(Calendar.DAY_OF_WEEK); + StoreWorkDayModel storeWorkDayModelOfSelectedDay = new StoreWorkDayModel(); + switch (selectedDayIndex){ + case 0: + storeWorkDayModelOfSelectedDay = storeShiftModel.getMondayShift(); + break; + case 1: + storeWorkDayModelOfSelectedDay = storeShiftModel.getTuesdayShift(); + break; + case 2: + storeWorkDayModelOfSelectedDay = storeShiftModel.getWednesdayShift(); + break; + case 3: + storeWorkDayModelOfSelectedDay = storeShiftModel.getThursdayShift(); + break; + case 4: + storeWorkDayModelOfSelectedDay = storeShiftModel.getFridayShift(); + break; + case 5: + storeWorkDayModelOfSelectedDay = storeShiftModel.getSaturdayShift(); + break; + case 6: + storeWorkDayModelOfSelectedDay = storeShiftModel.getSundayShift(); + break; + } + + TimePickerDialog timePickerDialog = TimePickerDialog.newInstance( new TimePickerDialog.OnTimeSetListener() { @@ -568,6 +622,17 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { true ); + + + int shiftStartHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftStartTime().substring(0,2)); + int shiftStartMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftStartTime().substring(3, 5)); + int shiftEndHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftEndTime().substring(0,2)); + int shiftEndMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftEndTime().substring(3, 5)); + + //timePickerDialog.setMinTime(new Timepoint(shiftStartHour, shiftStartMinute)); + //timePickerDialog.setMaxTime(new Timepoint(shiftEndHour, shiftEndMinute)); + timePickerDialog.setSelectableTimes(generateEnabledTimePoints(storeWorkDayModelOfSelectedDay)); + timePickerDialog.vibrate(false); //timePickerDialog.setMinTime(nowHour, nowMinute, nowSecond); timePickerDialog.show(BaseActivity.currentActivity.getFragmentManager(), choosetext); @@ -658,13 +723,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { .append(createOrderActivity.getOrderNote()) .append("
"); - if(dateOfOrder != null && !dateOfOrder.isEmpty() && + if(dateOfOrderString != null && !dateOfOrderString.isEmpty() && timeOfOrder != null && !timeOfOrder.isEmpty()){ stringBuilder .append(deliveryDateText) .append(" ") - .append(dateOfOrder) + .append(dateOfOrderString) .append("\n") .append(deliveryTimeText) .append(" ") @@ -672,7 +737,12 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } - return stringBuilder.toString(); + if(stringBuilder.toString().equals("\n
") || stringBuilder.toString().equals("
")){ + return ""; + } + else { + return stringBuilder.toString(); + } } private boolean isCartContainsAnyPizza(){ @@ -898,4 +968,88 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } */ + /* + private Timepoint[] generateDisabledTimePoints(StoreWorkDayModel storeWorkDayModelOfSelectedDay){ + + int breakStartHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakStartTime().substring(0,2)); + int breakStartMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakStartTime().substring(3, 5)); + int breakEndHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakEndTime().substring(0,2)); + int breakEndMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakEndTime().substring(3, 5)); + + int hour = breakStartHour; + int minute = breakStartMinute; + + ArrayList disabledTimePointList = new ArrayList<>(); + + while (hour <= breakEndHour && minute <= breakEndMinute){ + disabledTimePointList.add(new Timepoint(hour, minute)); + Log.i("vrjgerureg", "" + hour + ":" + minute); + minute++; + if(minute == 60){ + minute = 0; + hour += 1; + } + } + + return disabledTimePointList.toArray(new Timepoint[disabledTimePointList.size()]); + } + */ + + private Timepoint[] generateEnabledTimePoints(StoreWorkDayModel storeWorkDayModelOfSelectedDay){ + + int shiftStartHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftStartTime().substring(0,2)); + int shiftStartMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftStartTime().substring(3, 5)); + int shiftEndHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftEndTime().substring(0,2)); + int shiftEndMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getShiftEndTime().substring(3, 5)); + + int breakStartHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakStartTime().substring(0,2)); + int breakStartMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakStartTime().substring(3, 5)); + int breakEndHour = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakEndTime().substring(0,2)); + int breakEndMinute = Integer.valueOf(storeWorkDayModelOfSelectedDay.getBreakEndTime().substring(3, 5)); + + int hour = shiftStartHour; + int minute = shiftStartMinute; + + ArrayList enabledTimePointList = new ArrayList<>(); + + // öğleden tatilinden önceki kısım + while (hour <= breakStartHour){ + enabledTimePointList.add(new Timepoint(hour, minute)); + minute++; + if(minute == 60){ + minute = 0; + hour += 1; + } + + if(hour == breakStartHour && minute == breakStartMinute){ + break; + } + } + + // öğle tatilinden sonraki kısım + if(breakEndMinute == 59){ + breakEndMinute = 0; + breakEndHour += 1; + } + + hour = breakEndHour; + minute = breakEndMinute; + + + while (hour <= shiftEndHour){ + enabledTimePointList.add(new Timepoint(hour, minute)); + minute++; + if(minute == 60){ + minute = 0; + hour += 1; + } + + if(hour == shiftEndHour && minute == shiftEndMinute){ + break; + } + } + + return enabledTimePointList.toArray(new Timepoint[enabledTimePointList.size()]); + } + } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java index 285f358..1753f02 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java @@ -120,6 +120,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { private void getPaymentMethods(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getPaymentMethods( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java index 633191f..75e43f5 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java @@ -115,6 +115,7 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment { private void getCustomerShippingAddresses(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getCustomerAddresses( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java index 0eeed0b..258acf1 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java @@ -86,6 +86,7 @@ public class ShippingMethodFragment extends CreateOrderBaseFragment { private void getShippingMethods(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getShippingMethods( + SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback>() { @Override diff --git a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java index 70c42eb..5e259e6 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java @@ -290,4 +290,18 @@ public class DialogHelper { .show(); } + public static void showStoreListDialog(ArrayList itemList, + MaterialDialog.ListCallback listCallback){ + new MaterialDialog.Builder(BaseActivity.currentActivity) + .title(R.string.choose_store) + .titleColorRes(R.color.red) + .contentColorRes(R.color.black) + .items(itemList) + .cancelable(false) + .itemsCallback(listCallback) + .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") + .show(); + } + + } diff --git a/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java b/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java index ad4a444..e3532b1 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java @@ -100,7 +100,7 @@ public class PriceHelper { .toString(); } - private static Double stringToDouble(String string){ + public static Double stringToDouble(String string){ string = addFractions(string); Double dbl = Double.valueOf(string); return Math.floor(dbl * 100) / 100; diff --git a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java index fcf9c52..bc1e1b2 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java @@ -6,6 +6,7 @@ import java.util.Calendar; import java.util.Date; import ch.pizzapp.android.model.CustomerTokenModel; +import ch.pizzapp.android.model.StoreModel; import ch.pizzapp.android.model.UserModel; /** @@ -43,7 +44,9 @@ public class SessionHelper { } public static boolean isCustomerLoggedIn(){ - return SharedPrefsHelper.isCustomerLoggedIn(); + return SharedPrefsHelper.isCustomerLoggedIn() && + SharedPrefsHelper.getCustomerToken().getStoreOfToken().getStoreName().toLowerCase().equals( + SharedPrefsHelper.getSelectedStore().getStoreName().toLowerCase()); } public static void setUserSeenPizzapassCampaign(boolean isSeen){ @@ -78,6 +81,14 @@ public class SessionHelper { return SharedPrefsHelper.isUserUsedChampagneCampaign(); } + public static void setSelectedStore(StoreModel storeModel){ + SharedPrefsHelper.saveSelectedStore(storeModel); + } + + public static StoreModel getSelectedStore(){ + return SharedPrefsHelper.getSelectedStore(); + } + public static void logOut(){ setCustomerLoggedIn(false); diff --git a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java index 66dfe44..dd9e25e 100644 --- a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java +++ b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java @@ -14,6 +14,7 @@ import java.util.Locale; import ch.pizzapp.android.activity.BaseActivity; import ch.pizzapp.android.model.CategoryModel; import ch.pizzapp.android.model.CustomerTokenModel; +import ch.pizzapp.android.model.StoreModel; import ch.pizzapp.android.model.UserModel; import static android.content.Context.MODE_PRIVATE; @@ -38,6 +39,7 @@ public class SharedPrefsHelper { private static final String PREF_KEY_USER_USED_PIZZAPASS_CAMPAIGN = SHARED_PREFS_NAME + "userUsedPizzapassCampaign"; private static final String PREF_KEY_USER_SEEN_CHAMPAGNE_CAMPAIGN = SHARED_PREFS_NAME + "userSeenChampagneCampaign"; private static final String PREF_KEY_USER_USED_CHAMPAGNE_CAMPAIGN = SHARED_PREFS_NAME + "userUsedChampagneCampaign"; + private static final String PREF_KEY_USER_SELECTED_STORE = SHARED_PREFS_NAME + "selectedStore"; private static SharedPreferences sharedPreferences = BaseActivity.currentActivity @@ -177,6 +179,21 @@ public class SharedPrefsHelper { editor.apply(); } + public static void saveSelectedStore(StoreModel storeModel){ + editor.putString(PREF_KEY_USER_SELECTED_STORE, gson.toJson(storeModel)); + editor.apply(); + } + + public static StoreModel getSelectedStore(){ + StoreModel selectedStoreModel = gson.fromJson(sharedPreferences.getString(PREF_KEY_USER_SELECTED_STORE, ""), StoreModel.class); + if(selectedStoreModel == null){ + selectedStoreModel = new StoreModel(); + } + return selectedStoreModel; + } + + + /* public static void saveCategoryList(ArrayList cats){ diff --git a/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java index 0c8eb0b..a86ec5f 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java @@ -21,6 +21,8 @@ public class CustomerTokenModel implements Serializable { @Expose @SerializedName("token_death_time") private String expiresIn; @Expose @SerializedName("refresh_token") private String refreshToken; + private StoreModel storeOfToken; + public boolean isCustomerTokenAlive(){ long millis7days = 86400000 * 7; return DateTimeHelper.getMillisFromDateString(expiresIn) - System.currentTimeMillis() >= millis7days; @@ -61,4 +63,15 @@ public class CustomerTokenModel implements Serializable { public void setRefreshToken(String refreshToken) { this.refreshToken = refreshToken; } + + public StoreModel getStoreOfToken() { + if(storeOfToken == null){ + storeOfToken = new StoreModel(); + } + return storeOfToken; + } + + public void setStoreOfToken(StoreModel storeOfToken) { + this.storeOfToken = storeOfToken; + } } diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreModel.java b/app/src/main/java/ch/pizzapp/android/model/StoreModel.java new file mode 100644 index 0000000..5b35790 --- /dev/null +++ b/app/src/main/java/ch/pizzapp/android/model/StoreModel.java @@ -0,0 +1,111 @@ +package ch.pizzapp.android.model; + +import com.google.gson.annotations.SerializedName; + +public class StoreModel { + + @SerializedName("shipping_point_id") + private String shippingPointId; + + @SerializedName("store_id") + private String storeId; + + @SerializedName("postcode") + private String postCode; + + @SerializedName("city") + private String city; + + @SerializedName("minimum_price") + private String minimumPrice; + + @SerializedName("canton") + private String canton; + + @SerializedName("store_name") + private String storeName; + + public StoreModel(){ + checkNull(); + } + + public void checkNull(){ + if(shippingPointId == null){ + shippingPointId = ""; + } + if(storeId == null){ + storeId = ""; + } + if(postCode == null){ + postCode = ""; + } + if(city == null){ + city = ""; + } + if(minimumPrice == null){ + minimumPrice = ""; + } + if(canton == null){ + canton = ""; + } + if(storeName == null){ + storeName = ""; + } + } + + public String getShippingPointId() { + return shippingPointId; + } + + public void setShippingPointId(String shippingPointId) { + this.shippingPointId = shippingPointId; + } + + public String getStoreId() { + return storeId; + } + + public void setStoreId(String storeId) { + this.storeId = storeId; + } + + public String getPostCode() { + return postCode; + } + + public void setPostCode(String postCode) { + this.postCode = postCode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getMinimumPrice() { + return minimumPrice; + } + + public void setMinimumPrice(String minimumPrice) { + this.minimumPrice = minimumPrice; + } + + public String getCanton() { + return canton; + } + + public void setCanton(String canton) { + this.canton = canton; + } + + public String getStoreName() { + return storeName; + } + + public void setStoreName(String storeName) { + this.storeName = storeName; + } +} diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java b/app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java new file mode 100644 index 0000000..b8ea97f --- /dev/null +++ b/app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java @@ -0,0 +1,84 @@ +package ch.pizzapp.android.model; + +import com.google.gson.annotations.SerializedName; + +public class StoreShiftModel { + + @SerializedName("1") + private StoreWorkDayModel mondayShift; + + @SerializedName("2") + private StoreWorkDayModel tuesdayShift; + + @SerializedName("3") + private StoreWorkDayModel wednesdayShift; + + @SerializedName("4") + private StoreWorkDayModel thursdayShift; + + @SerializedName("5") + private StoreWorkDayModel fridayShift; + + @SerializedName("6") + private StoreWorkDayModel saturdayShift; + + @SerializedName("7") + private StoreWorkDayModel sundayShift; + + public StoreWorkDayModel getMondayShift() { + return mondayShift; + } + + public void setMondayShift(StoreWorkDayModel mondayShift) { + this.mondayShift = mondayShift; + } + + public StoreWorkDayModel getTuesdayShift() { + return tuesdayShift; + } + + public void setTuesdayShift(StoreWorkDayModel tuesdayShift) { + this.tuesdayShift = tuesdayShift; + } + + public StoreWorkDayModel getWednesdayShift() { + return wednesdayShift; + } + + public void setWednesdayShift(StoreWorkDayModel wednesdayShift) { + this.wednesdayShift = wednesdayShift; + } + + public StoreWorkDayModel getThursdayShift() { + return thursdayShift; + } + + public void setThursdayShift(StoreWorkDayModel thursdayShift) { + this.thursdayShift = thursdayShift; + } + + public StoreWorkDayModel getFridayShift() { + return fridayShift; + } + + public void setFridayShift(StoreWorkDayModel fridayShift) { + this.fridayShift = fridayShift; + } + + public StoreWorkDayModel getSaturdayShift() { + return saturdayShift; + } + + public void setSaturdayShift(StoreWorkDayModel saturdayShift) { + this.saturdayShift = saturdayShift; + } + + public StoreWorkDayModel getSundayShift() { + return sundayShift; + } + + public void setSundayShift(StoreWorkDayModel sundayShift) { + this.sundayShift = sundayShift; + } + +} diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java b/app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java new file mode 100644 index 0000000..e2172b1 --- /dev/null +++ b/app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java @@ -0,0 +1,65 @@ +package ch.pizzapp.android.model; + +import com.google.gson.annotations.SerializedName; + +public class StoreWorkDayModel { + + @SerializedName("begin") + private String shiftStartTime; + + @SerializedName("paydos_baslangic") + private String breakStartTime; + + @SerializedName("paydos_bitis") + private String breakEndTime; + + @SerializedName("end") + private String shiftEndTime; + + public void checkNull(){ + if(shiftStartTime == null){ + shiftStartTime = "00:00"; + } + if(breakStartTime == null){ + breakStartTime = "00:00"; + } + if(breakEndTime == null){ + breakEndTime = "00:00"; + } + if(shiftEndTime == null){ + shiftEndTime = "00:00"; + } + } + + public String getShiftStartTime() { + return shiftStartTime; + } + + public void setShiftStartTime(String shiftStartTime) { + this.shiftStartTime = shiftStartTime; + } + + public String getBreakStartTime() { + return breakStartTime; + } + + public void setBreakStartTime(String breakStartTime) { + this.breakStartTime = breakStartTime; + } + + public String getBreakEndTime() { + return breakEndTime; + } + + public void setBreakEndTime(String breakEndTime) { + this.breakEndTime = breakEndTime; + } + + public String getShiftEndTime() { + return shiftEndTime; + } + + public void setShiftEndTime(String shiftEndTime) { + this.shiftEndTime = shiftEndTime; + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 367fdc4..7c5b35d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,10 +32,9 @@    Keine Internetverbindung. Bitte versuchen Sie es später noch einmal. -    Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden. -      AKTUALISIEREN + Posta Kodu Seçin @@ -105,6 +104,8 @@      Produkt wurde aus dem Warenkorb entfernt.     Möchten Sie alle Produkte aus dem Warenkorb entfernen? + Minimum tutarın altında sipariş veremezsiniz. + Minimum Sipariş Tutarı: