diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java index b703891..c7c9373 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiService.java @@ -50,7 +50,7 @@ public class ApiService { HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level logging.setLevel(HttpLoggingInterceptor.Level.BODY); - //builder.addInterceptor(logging); + builder.addInterceptor(logging); OkHttpClient client = builder.build(); diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java index ff2e1e1..438394d 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java @@ -49,6 +49,7 @@ import static android.app.Activity.RESULT_OK; public class ProfileFragment extends BaseFragment { @BindView(R.id.pizzapassCountPizzalinkInfoLayout) AppInfoView pizzapassCountPizzalinkInfoLayout; + @BindView(R.id.kebappassCountPizzalinkInfoLayout) AppInfoView kebappassCountPizzalinkInfoLayout; @BindView(R.id.firstnamePizzalinkInfoLayout) AppInfoView firstnamePizzalinkInfoLayout; @BindView(R.id.lastnamePizzalinkInfoLayout) AppInfoView lastnamePizzalinkInfoLayout; @BindView(R.id.emailPizzalinkInfoLayout) AppInfoView emailPizzalinkInfoLayout; @@ -129,6 +130,7 @@ public class ProfileFragment extends BaseFragment { resultCode == RESULT_OK){ userModel = SessionHelper.getUser(); pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount()); + kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount()); firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); emailPizzalinkInfoLayout.setText(userModel.getEmail()); @@ -252,6 +254,7 @@ public class ProfileFragment extends BaseFragment { SessionHelper.saveCustomer(userModel); pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount()); + kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount()); firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); emailPizzalinkInfoLayout.setText(userModel.getEmail()); 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 aea56c5..749b8aa 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/UserModel.java @@ -14,6 +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; private String firstname; private String lastname; private String email; @@ -41,7 +42,10 @@ public class UserModel implements Serializable{ telephone = ""; if(pizzapassCount == null) - pizzapassCount = ""; + pizzapassCount = "0"; + + if(kebappassCount == null) + kebappassCount = "0"; if(token != null) token.checkNull(); @@ -114,4 +118,12 @@ public class UserModel implements Serializable{ public void setPizzapassCount(String pizzapassCount) { this.pizzapassCount = pizzapassCount; } + + public String getKebappassCount() { + return kebappassCount; + } + + public void setKebappassCount(String kebappassCount) { + this.kebappassCount = kebappassCount; + } } diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index fe2bd85..3b338c2 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -40,6 +40,12 @@ android:layout_height="wrap_content" app:description="@string/pizza_pass" /> + +      - PIZZA PASS     + PIZZA PASS  + KEBAP PASS       PRÉNOM     NOM DE FAMILLE     NATEL     diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b674bd..525f93a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -199,6 +199,7 @@      PIZZA PASS     + KEBAP PASS     VORNAME     NACHNAME     NATEL