diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d9c79ee..d0f2a2b 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 b0ec376..8eb59b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "ch.pizzapp.capri" minSdkVersion 16 targetSdkVersion 27 - versionCode 21 // play store'daki version --> canlı: 20 - dahili test: 15 - versionName "2.23" // play store'daki version --> canlı: 2.22 - dahili test: 2.17 + versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 15 + versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.17 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index f3261f2..a0a5c39 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"2.22","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":21,"versionName":"2.23","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 b2b4cea..f0922c5 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java @@ -149,6 +149,20 @@ public class CartFragment extends BaseFragment { break; case R.id.continueCartButton: + // without minimum price control for store. minimum price is contorlled by addOrder2() service. + if(!pizzapassCampaignCategoryId.isEmpty()){ + getCampaignProductsForPizzapassOnContinueButtonClicked(); + } + else if(!champagneCampaignCategoryId.isEmpty()){ + getCampaignProductsForChampagneOnContinueButtonClicked(); + } + else { + openCreateOrderActivity(); + } + break; + + // with minimum price control for store + /* Double storeMinimumPrice = PriceHelper.stringToDouble(SessionHelper.getSelectedStore().getMinimumPrice()); Double cartCurrentPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText())); @@ -179,8 +193,8 @@ public class CartFragment extends BaseFragment { BaseActivity.currentActivity, dialogText); } - break; + */ } }