diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a4216db..3475856 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index c5c6b62..50a5950 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/release/output.json b/app/release/output.json index 42afb3e..99125f0 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.12","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":7,"versionName":"1.13","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/pizzamaxx/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java index 3711a57..a8a6c2a 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java @@ -138,11 +138,13 @@ public class CampaignProductDetailsActivity extends BaseActivity { } */ + /* if((menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select") && !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){ menuProductOptionValueModel.setSelected(true); } + */ } } @@ -266,11 +268,13 @@ public class CampaignProductDetailsActivity extends BaseActivity { } */ + /* if((menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select") && !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){ menuProductOptionValueModel.setSelected(true); } + */ } } } diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CreateOrderActivity.java index 1e56921..295a99b 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/CreateOrderActivity.java @@ -160,9 +160,29 @@ public class CreateOrderActivity extends BaseActivity { return cartInfoModel; } + /** + * Kampanya urunu detay sayfasında urunun fiyatı 0 olan tum optionlarını seçiyor, + * bunun da düzeltilmesi gerekiyor!! + */ + + /** + * eğer kampanya kullanıldıysa cartInfoModel de isPizzapassCampaignUsed ve isKebappassCampaignUsed + * alanalrını true olarak set ediyoruz. create order ekranlarında herhangi bir yerde sepet sorgusu yapınca + * buradaki cartInfoModel i de güncelliyoruz. fakat isPizzapassCampaignUsed ve isKebappassCampaignUsed alanları + * servisten gelmeyen değerler, bizim loaklde tuttuğumuz değişkenler. bu sebeple bu alanlar servisten hep false geliyor, + * buradakinde true olsa bile değişkeni guncellediğimiz için bu alanlar kayboluyor. bunu engellemek için bu metodu yazdım. + */ + public void setCartInfoSafeForCampaigns(CartInfoModel cartInfoModel) { + cartInfoModel.setPizzapassCampaignUsed(this.cartInfoModel.isPizzapassCampaignUsed()); + cartInfoModel.setKebappassCampaignUsed(this.cartInfoModel.isKebappassCampaignUsed()); + this.cartInfoModel = cartInfoModel; + } + + /* public void setCartInfo(CartInfoModel cartInfoModel) { this.cartInfoModel = cartInfoModel; } + */ public ShippingMethodModel getSelectedShippingMethod(){ return selectedShippingMethod; diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java index 420eac4..276dd7c 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -656,7 +656,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { response.body().getData() != null && response.body().isSuccess()){ response.body().getData().checkNull(); - createOrderActivity.setCartInfo(response.body().getData()); + createOrderActivity.setCartInfoSafeForCampaigns(response.body().getData()); } else ApiErrorUtils.parseError(response); @@ -698,7 +698,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { response.body().isSuccess()){ CartInfoModel cartInfoModel = response.body().getData(); cartInfoModel.checkNull(); - createOrderActivity.setCartInfo(cartInfoModel); + createOrderActivity.setCartInfoSafeForCampaigns(cartInfoModel); //setOrderTotalText(response.body().getData()); cartTotalList.clear(); cartTotalList.addAll(cartInfoModel.getTotalsList()); diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java index d848363..4b4b759 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java @@ -293,7 +293,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; CartInfoModel cartInfoModel = response.body().getData(); cartInfoModel.checkNull(); - createOrderActivity.setCartInfo(cartInfoModel); + createOrderActivity.setCartInfoSafeForCampaigns(cartInfoModel); createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod); createOrderActivity.onNextClicked(FRAGMENT_NAME); } diff --git a/app/src/main/res/layout/row_option_checkbox.xml b/app/src/main/res/layout/row_option_checkbox.xml index 78c4f57..ffb8249 100644 --- a/app/src/main/res/layout/row_option_checkbox.xml +++ b/app/src/main/res/layout/row_option_checkbox.xml @@ -15,9 +15,16 @@ android:layout_height="wrap_content" android:clickable="false" android:textColor="@color/black" - fontPath="fonts/Quicksand-Bold.ttf"/> + fontPath="fonts/Quicksand-Bold.ttf" + android:layout_marginRight="16dp" + android:layout_marginEnd="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_toLeftOf="@+id/optionPriceDescriptionLayout" + android:layout_toStartOf="@+id/optionPriceDescriptionLayout"/> + fontPath="fonts/Quicksand-Bold.ttf" + android:layout_marginRight="16dp" + android:layout_marginEnd="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_toLeftOf="@+id/optionPriceDescriptionLayout" + android:layout_toStartOf="@+id/optionPriceDescriptionLayout"/>