shopizer-developers

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 81eec8b..1c6f08a 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Jan 13 16:58:26 EST 2017
+#Mon Jan 16 09:00:50 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 016204a..8ecd5c9 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Jan 13 16:58:32 EST 2017
+#Mon Jan 16 09:00:51 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 90d0a23..7258342 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index b1ac53a..a34b579 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Fri Jan 13 17:00:19 EST 2017
-id=15999d878b2f874d838fded54e89fad6433e03d7352
+#Fri Jan 13 17:09:10 EST 2017
+id=15999e09070cb9cf1432fc03f8d915fc14a2254a3aa
 method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
index 86a0fe8..7b195b8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
@@ -13,11 +13,13 @@ public class OrderTotal extends Entity implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 	private String title;
-        private String text;
+    private String text;
 	private String code;
 	private int order;
 	private String module;
 	private BigDecimal value;
+	
+	
 	public String getTitle() {
 		return title;
 	}
@@ -48,6 +50,12 @@ public class OrderTotal extends Entity implements Serializable {
 	public void setValue(BigDecimal value) {
 		this.value = value;
 	}
+	public String getText() {
+		return text;
+	}
+	public void setText(String text) {
+		this.text = text;
+	}
 
 
 }

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
index b3edd7e..70b8002 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java
@@ -1,5 +1,6 @@
 package com.salesmanager.shop.populator.order;
 
+import com.salesmanager.core.business.constants.Constants;
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.services.catalog.product.PricingService;
 import com.salesmanager.core.business.utils.AbstractDataPopulator;
@@ -10,6 +11,7 @@ import com.salesmanager.shop.model.order.ReadableOrderTotal;
 import com.salesmanager.shop.utils.LabelUtils;
 import com.salesmanager.shop.utils.LocaleUtils;
 import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Locale;
 
@@ -41,10 +43,20 @@ public class ReadableOrderTotalPopulator extends
 				target.setId(source.getId());
 				target.setModule(source.getModule());
 				target.setOrder(source.getSortOrder());
+				
+
 				target.setTitle(messages.getMessage(source.getOrderTotalCode(), locale, source.getOrderTotalCode()));
+				target.setText(source.getText());
+				
 				target.setValue(source.getValue());
 				target.setTotal(pricingService.getDisplayAmount(source.getValue(), store));
 				
+				if(!StringUtils.isBlank(source.getOrderTotalCode())) {
+					if(Constants.OT_DISCOUNT_TITLE.equals(source.getOrderTotalCode())) {
+						target.setDiscounted(true);
+					}
+				}
+				
 			} catch(Exception e) {
 				throw new ConversionException(e);
 			}
@@ -74,4 +86,4 @@ public class ReadableOrderTotalPopulator extends
 		this.messages = messages;
 	}
 
-}
+}
\ No newline at end of file

diff --git a/sm-shop/src/main/resources/bundles/shopizer.properties b/sm-shop/src/main/resources/bundles/shopizer.properties
index e7344cb..a03d0ae 100644
--- a/sm-shop/src/main/resources/bundles/shopizer.properties
+++ b/sm-shop/src/main/resources/bundles/shopizer.properties
@@ -1,6 +1,7 @@
 label.quantity=Quantity
 
 label.defaultlanguage=Default language
+label.defaultSelection=Default selection
 lang.en=English
 lang.fr=French
 
@@ -87,6 +88,7 @@ label.generic.city=City
 label.generic.country=Country
 label.generic.hi=Hi
 label.generic.send=Send
+label.generic.rebate=Rebate
 
 label.soldout=Sold out
 
@@ -507,6 +509,7 @@ order.total.subtotal=Sub-total
 order.total.total=Total
 order.total.shipping=Shipping
 order.total.handling=Handling
+order.total.discount=Rebate
 
 label.order.recalculate=Recalculate
 
@@ -665,7 +668,6 @@ button.label.printreport=Print report
 button.label.upload.images=Upload Images
 button.label.upload.files=Upload Files
 button.label.resetpassword=Reset Password
-button.label.setcredentials=Set credentials
 button.label.view=Details
 button.label.addToCart=Add to cart
 button.label.continue=Continue shopping

diff --git a/sm-shop/src/main/resources/bundles/shopizer_fr.properties b/sm-shop/src/main/resources/bundles/shopizer_fr.properties
index d412f81..d854830 100644
--- a/sm-shop/src/main/resources/bundles/shopizer_fr.properties
+++ b/sm-shop/src/main/resources/bundles/shopizer_fr.properties
@@ -1,6 +1,7 @@
 label.quantity=Quantité
 
 label.defaultlanguage=Langue par défaut
+label.defaultSelection=Sélection par défaut
 lang.en=Anglais
 lang.fr=Français
 
@@ -87,6 +88,7 @@ label.generic.city=Ville
 label.generic.country=Pays
 label.generic.hi=Bonjour
 label.generic.send=Envoyer
+label.generic.rebate=Rabais
 
 label.soldout=Non disponible
 
@@ -505,6 +507,7 @@ order.total.subtotal=Sous-total
 order.total.total=Total
 order.total.shipping=Livraison
 order.total.handling=Manutention
+order.total.discount=Rabais
 
 label.order.recalculate=Recalculer
 label.order.transactions=Liste des transactions
@@ -661,7 +664,6 @@ button.label.subscribe = S'abonner
 button.label.printreport=Imprimer un rapport
 button.label.upload.images=Ajouter des fichiers
 button.label.resetpassword=Ré-initialiser le mot de passe
-button.label.setcredentials=Nom d'usager et mot de passe
 button.label.view=Détails
 button.label.addToCart=Ajouter au panier
 button.label.continue=Continuez votre magasinage