Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

snapshot 2.1 #35

Merged
merged 3 commits into from
Aug 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.adriens.cate.conso.plus.sdk</groupId>
<artifactId>carte-conso-plus-sdk</artifactId>
<version>2.0</version>
<version>2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ else if (flipsnackUrl.contains("https://www.flipsnack.com/KICOM/conso-n-")){
out = Integer.parseInt(tmp);
return out;
}
else if (flipsnackUrl.contains("https://www.flipsnack.com/KICOM/n-")){
// https://www.flipsnack.com/KICOM/n-191-ao-t-2020/full-view.html

String tmp = flipsnackUrl.replace("https://www.flipsnack.com/KICOM/n-", "");
tmp = tmp.replace("/full-view.html", "");

if(tmp.contains("-")) tmp = tmp.substring(0, tmp.indexOf("-"));

out = Integer.parseInt(tmp);
return out;
}
else{
throw new Exception("Unable to get magazine id from url: <" + flipsnackUrl + ">");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public class Partner {
private String name;
private String logoUrl;
private String wwwHomePage;

private String infos;

/**
* @return the name
*/
Expand Down Expand Up @@ -61,4 +62,18 @@ public void setWwwHomePage(String wwwHomePage) {
this.wwwHomePage = wwwHomePage;
}

/**
* @return the infos
*/
public String getInfos() {
return infos;
}

/**
* @param infos the infos to set
*/
public void setInfos(String infos) {
this.infos = infos;
}

}
10 changes: 10 additions & 0 deletions src/main/resources/partners.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,62 @@
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/crf_express.jpg</logoUrl>
<name>Carrefour Express</name>
<wwwHomePage>https://www.facebook.com/carrefour.express.nc/</wwwHomePage>
<infos>En obtenant 20 points par tranche de 2.000 F.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/crf_market.jpg</logoUrl>
<name>Carrefour Market</name>
<wwwHomePage>https://www.facebook.com/carrefour.market.nc/</wwwHomePage>
<infos>En obtenant 20 points par tranche de 2.000 F.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/champion.jpg</logoUrl>
<name>Champion</name>
<wwwHomePage>https://www.1012.nc/professionnels/details/6ab630c03b6698846c941900c86316a09acc3b84/champion_magenta</wwwHomePage>
<infos>En obtenant 20 points par tranche de 2.000 F.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/carf_kenuin.jpg</logoUrl>
<name>Carrefour</name>
<wwwHomePage>https://www.facebook.com/CarrefourKenuIn/</wwwHomePage>
<infos>En obtenant 20 points par tranche de 2.000 F.</infos>
</partner>
<!-- Devenu un carrefour express
<partner>
<logoUrl></logoUrl>
<name>Arizona</name>
<wwwHomePage></wwwHomePage>
<infos></infos>
</partner>
-->
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/conforama.jpg</logoUrl>
<name>Conforama</name>
<wwwHomePage>https://www.facebook.com/ConforamaNoumea/</wwwHomePage>
<infos>En obtenant 10 points tous les 2.000 F d’achat à partir de 2.000 F d’achat.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/lagoon.jpg</logoUrl>
<name>Lagoon</name>
<wwwHomePage>https://www.facebook.com/lagoonNC</wwwHomePage>
<infos>En obtenant 1 point tous les 100 F d’achat, après avoir effectué votre inscription dans leur rubrique « espace client » sur www.lagoon.nc</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/beauty_success.jpg</logoUrl>
<name>Beauty Success</name>
<wwwHomePage>https://www.facebook.com/beautysuccessnoumea/</wwwHomePage>
<infos>En obtenant 10 points tous les 2.000 F d’achat à partir de 2.000 F d’achat.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/mobil.jpg</logoUrl>
<name>Mobil</name>
<wwwHomePage>https://www.facebook.com/lesoffresmobil/</wwwHomePage>
<infos>En obtenant 10 points tous les 2.000 F d’achat à partir de 2.000 F d’achat.</infos>
</partner>
<partner>
<logoUrl>http://www.consoplus.nc/img/partenaires/logos/INGLOT.jpg</logoUrl>
<name>Inglot</name>
<wwwHomePage>https://www.facebook.com/inglotkenuin</wwwHomePage>
<infos>En obtenant 10 points tous les 2.000 F d’achat à partir de 2.000 F d’achat.</infos>
</partner>
</partners>