diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 4afa8bd..99fd413 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 8e71f4e..6d4674b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
applicationId "ch.pizzapp.capri"
minSdkVersion 16
targetSdkVersion 27
- versionCode 10 // play store'daki version --> canlı: 8 - dahili test: 6
- versionName "2.12" // play store'daki version --> canlı: 2.1 - dahili test: 2.11
+ versionCode 11 // play store'daki version --> canlı: 8 - dahili test: 10
+ versionName "2.13" // play store'daki version --> canlı: 2.1 - dahili test: 2.12
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/release/output.json b/app/release/output.json
index 682ceae..b53cdf2 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"2.11","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":10,"versionName":"2.12","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/pizzapp/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
index 958ab02..72cd4b7 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
@@ -65,9 +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;
-
+ @BindString(R.string.minimum_order_price_alert_part_1) String minimumOrderPriceAlertPart1Text;
+ @BindString(R.string.minimum_order_price_alert_part_2) String minimumOrderPriceAlertPart2Text;
@BindColor(R.color.actvity_default_background_color_1) int grayColor;
@BindColor(R.color.white) int whiteColor;
@@ -133,11 +132,11 @@ public class CartFragment extends BaseFragment {
else {
String dialogText =
new StringBuilder()
- .append(minimumOrderPriceAlertText)
- .append("\n")
- .append(minimumOrderPriceText)
+ .append(minimumOrderPriceAlertPart1Text)
.append(" ")
- .append(PriceHelper.getPriceWithCurreny(storeMinimumPrice))
+ .append(SessionHelper.getSelectedStore().getMinimumPrice())
+ .append(" ")
+ .append(minimumOrderPriceAlertPart2Text)
.toString();
DialogHelper.showAlertDialog(
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 e3532b1..cc8053d 100644
--- a/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java
+++ b/app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java
@@ -23,6 +23,10 @@ public class PriceHelper {
return BaseActivity.currentActivity.getString(R.string.chf) + " " + priceString;
}
+ public static String getPriceWithCurrenyAndFractions(Double price){
+ return BaseActivity.currentActivity.getString(R.string.chf) + " " + price;
+ }
+
public static String removeCurrencyFromPrice(String priceWithCurreny){
/*
try {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c5b35d..47c1c51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
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
+ Wählen Sie Postleitzahl
@@ -104,8 +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ı:
+ Die Summe Ihres Warenkorbes muss mindestens
+ betragen, um die Bestellung auszuführen.