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

url changed

Browse Source
This commit is contained in:
mustafa içmen
2020-04-19 13:42:04 +03:00
parent 713651b0e4
commit fa9b5ef2fe
5 changed files with 7 additions and 8 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.

1
app/src/main/java/ch/pizzacucina/android/activity/MainActivity.java
View File

@@ -547,7 +547,6 @@ public class MainActivity extends BaseActivity {
private CategoryModel getDefaultCategory(){ private CategoryModel getDefaultCategory(){
CategoryModel defaultCategory = null; CategoryModel defaultCategory = null;
for(CategoryModel categoryModel: categoryList){ for(CategoryModel categoryModel: categoryList){
// || categoryModel.getId() == 20 for test
if(categoryModel.isDefault()){ if(categoryModel.isDefault()){
defaultCategory = categoryModel; defaultCategory = categoryModel;
break; break;

9
app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java
View File

@@ -3,8 +3,7 @@ package ch.pizzacucina.android.api;
public class ApiConstants { public class ApiConstants {
public static final int API_READ_TIMEOUT = 30; public static final int API_READ_TIMEOUT = 30;
public static final int API_CONNECT_TIMEOUT = 10; public static final int API_CONNECT_TIMEOUT = 10;
public static final String API_PATH = "http://pizzamaxx.ch/"; public static final String API_PATH = "http://cucinaexpress.ch/";
//public static final String API_PATH = "http://pizzaleu.ddns.net/";
public static final String APP_TYPE_ID_ANDROID = "2"; public static final String APP_TYPE_ID_ANDROID = "2";
public static final int APP_ERROR_CODE_AUTHORIZATION = 1; public static final int APP_ERROR_CODE_AUTHORIZATION = 1;
@@ -44,10 +43,10 @@ public class ApiConstants {
public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed";
public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true";
public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://pizza-cucina.ch/pizzacucina/index.php?route=mobile/service/postFinancePayment&order_id="; public static final String PAYMENT_WEBVIEW_URL_POSTFINANCE_TWINT = "https://cucinaexpress.ch/pizzacucina/index.php?route=mobile/service/postFinancePayment&order_id=";
public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_SUCCESS = "postFinancePaymentIsSuccess"; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_SUCCESS = "postFinancePaymentIsSuccess";
public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_FAIL = "postFinancePaymentIsFailed"; public static final String PAYMENT_WEBVIEW_REDIRECT_URL_POSTFINANCE_TWINT_FAIL = "postFinancePaymentIsFailed";
public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.pizza-cucina.ch/"; public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.cucinaexpress.ch/";
public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.pizza-cucina.ch/"; public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.cucinaexpress.ch/";
} }

2
app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java
View File

@@ -6,7 +6,7 @@ public class ApiEndPoints {
private static final String SUFFIX = "&is_mobile=1"; private static final String SUFFIX = "&is_mobile=1";
public static final String API_GET_STORE_LIST = "pizza/servicemagazabelirle.php"; public static final String API_GET_STORE_LIST = "pizza/servicemagazabelirle.php";
public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucina/" + PREFIX + "getCampaignBanners" + SUFFIX; public static final String API_GET_CAMPAIGN_BANNERS = "pizzacucina" + PREFIX + "getCampaignBanners" + SUFFIX;
public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX; public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX;
public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX; public static final String API_GET_IGNORED_CATEGORY_IDS= PREFIX + "getIgnoredCategory" + SUFFIX;

3
app/src/main/res/layout/activity_register.xml
View File

@@ -41,7 +41,8 @@
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp"/> android:paddingEnd="24dp"
android:visibility="gone"/>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"