gel-al minimum price and coupon problem fixed
This commit is contained in:
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@@ -23,8 +23,8 @@ android {
|
|||||||
applicationId "ch.pizzapp.capri"
|
applicationId "ch.pizzapp.capri"
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 21 // play store'daki version --> canlı: 20 - dahili test: 15
|
versionCode 22 // play store'daki version --> canlı: 21 - dahili test: 15
|
||||||
versionName "2.23" // play store'daki version --> canlı: 2.22 - dahili test: 2.17
|
versionName "2.24" // play store'daki version --> canlı: 2.23 - dahili test: 2.17
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
|
|||||||
@@ -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":{}}]
|
||||||
@@ -149,6 +149,20 @@ public class CartFragment extends BaseFragment {
|
|||||||
break;
|
break;
|
||||||
case R.id.continueCartButton:
|
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 storeMinimumPrice = PriceHelper.stringToDouble(SessionHelper.getSelectedStore().getMinimumPrice());
|
||||||
Double cartCurrentPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
|
Double cartCurrentPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
|
||||||
|
|
||||||
@@ -179,8 +193,8 @@ public class CartFragment extends BaseFragment {
|
|||||||
BaseActivity.currentActivity,
|
BaseActivity.currentActivity,
|
||||||
dialogText);
|
dialogText);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user