volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gel-al minimum price and coupon problem fixed

Browse Source
This commit is contained in:
cimenmus
2018-10-01 23:57:41 +03:00
parent b67ca26981
commit 035f39f50a
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@@ -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 = [

2
app/release/output.json
View File

@@ -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":{}}]
[{"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":{}}]

16
app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
View File

@@ -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;
*/
}
}