Merge branch 'release/v0.11.5' into develop

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.utc.simde.jessy"
-    android:versionCode="37"
-    android:versionName="0.11.4">
+    android:versionCode="38"
+    android:versionName="0.11.5">
 
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/fr/utc/simde/jessy/responses/APIResponse.java

 package fr.utc.simde.jessy.responses;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Created by Samy on 10/11/2017.
  */
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class APIResponse {
     protected String id;
     protected String username;
     protected String type;
-    protected Integer fun_id;
-    protected long expires_at;
     protected long creation_date;
-    protected boolean paid;
-    protected boolean validated;
+    protected long expires_at;
 
     public String getId() { return this.id; }
     public String getUsername() { return this.username; }
     public String getType() { return this.type; }
-    public Integer getFoundationId() { return this.fun_id; }
-    public long getExpiresAt() { return this.expires_at; }
-    public long getCreatedAt() { return this.creation_date; }
-    public boolean isPaid() { return this.paid; }
-    public boolean isValidated() { return this.validated; }
+    public long getCreation_date() { return this.creation_date; }
+    public long getExpires_at() { return this.expires_at; }
 }

app/src/main/java/fr/utc/simde/jessy/responses/BottomatikResponse.java

 package fr.utc.simde.jessy.responses;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,10 +10,19 @@ import java.util.List;
  * Created by Samy on 10/11/2017.
  */
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class BottomatikResponse extends APIResponse {
+    protected String _id;
+    protected Integer fun_id;
+    protected boolean paid;
+    protected boolean validated;
     protected List<List<String>> articles;
 
+    public String get_id() { return this._id; }
+    public Integer getFun_id() { return this.fun_id; }
+    public boolean isPaid() { return this.paid; }
+    public boolean isValidated() { return this.validated; }
+    public List<List<String>> getArticles() { return this.articles; }
+
     public List<List<Integer>> getArticleList() {
         List<List<Integer>> articleList = new ArrayList<List<Integer>>();
 

app/src/main/java/fr/utc/simde/jessy/responses/GingerResponse.java

@@ -17,12 +17,12 @@ public class GingerResponse {
     protected boolean is_cotisant;
     protected String badge_uid;
 
-    public String getUsername() { return login; }
-    public String getLastname() { return nom; }
-    public String getFirstname() { return prenom; }
-    public String getEmail() { return mail; }
+    public String getLogin() { return login; }
+    public String getNom() { return nom; }
+    public String getPrenom() { return prenom; }
+    public String getMail() { return mail; }
     public String getType() { return type; }
-    public boolean getIsAdult() { return is_adulte; }
-    public boolean getIsContributer() { return is_cotisant; }
-    public String getBadgeId() { return badge_uid; }
+    public boolean getIs_adulte() { return is_adulte; }
+    public boolean getIs_cotisant() { return is_cotisant; }
+    public String getBadge_uid() { return badge_uid; }
 }

app/src/main/java/fr/utc/simde/jessy/responses/QRCodeResponse.java

@@ -12,6 +12,10 @@ public class QRCodeResponse {
     protected String id;
     protected String system;
 
+    public void setUsername(String username) { this.username = username; }
+    public void setId(String id) { this.id = id; }
+    public void setSystem(String system) { this.system = system; }
+
     public String getUsername() { return this.username; }
     public String getId() { return this.id; }
     public String getSystem() { return this.system; }

app/src/main/java/fr/utc/simde/jessy/responses/ComedmusResponse.java → app/src/main/java/fr/utc/simde/jessy/responses/ReservationResponse.java

 package fr.utc.simde.jessy.responses;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Created by Samy on 10/11/2017.
  */
 
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ComedmusResponse extends APIResponse {
+public class ReservationResponse extends APIResponse {
     protected Integer reservation_id;
     protected String seance;
 
-    public Integer getReservationId() { return this.reservation_id; }
+    public Integer getReservation_id() { return this.reservation_id; }
     public String getSeance() { return this.seance; }
 }

app/src/main/res/layout/dialog_reservation_info.xml

@@ -55,7 +55,7 @@
             android:layout_width="100dp"
             android:textColor="#000000"
             android:layout_height="wrap_content"
-            android:text="@string/price" />
+            android:text="@string/type" />
 
         <TextView
             android:id="@+id/text_price"