diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0f7aba2..a4216db 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 9968337..c5c6b62 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 6a16053..4075241 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { applicationId "ch.pizzamaxx.android" minSdkVersion 16 targetSdkVersion 28 - versionCode 5 // play store'daki version --> canlı: - dahili test: 4 - versionName "1.11" // play store'daki version --> canlı: - dahili test: 1.10 + versionCode 7 // play store'daki version --> canlı: 6 - dahili test: 6 + versionName "1.13" // play store'daki version --> canlı: 1.12 - dahili test: 1.12 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..6003331 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index c1dc3e5..42afb3e 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.10","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":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 diff --git a/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java b/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java index 749b8aa..30e6f74 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java @@ -14,7 +14,7 @@ public class UserModel implements Serializable{ @Expose @SerializedName("customer_id") private String id; @Expose @SerializedName("address_id") private String addressId; @Expose @SerializedName("pizza_pass_count") private String pizzapassCount; - @Expose @SerializedName("kebap_pass_count") private String kebappassCount; + @Expose @SerializedName("kebab_pass_count") private String kebappassCount; private String firstname; private String lastname; private String email;