shopizer-developers
Changes
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java 14(+7 -7)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java 41(+20 -21)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderTotalPopulator.java 23(+11 -12)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java 18(+9 -9)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java 20(+10 -10)
sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java 28(+14 -14)
Details
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
index 83b4d1d..b1b71be 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderPopulator.java
@@ -1,20 +1,20 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.Order;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.order.OrderTotalType;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+import com.salesmanager.shop.model.order.ReadableOrder;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.Order;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.order.model.OrderTotalType;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
-import com.salesmanager.web.entity.order.ReadableOrder;
-
public class ReadableOrderPopulator extends
AbstractDataPopulator<Order, ReadableOrder> {
@@ -36,8 +36,8 @@ public class ReadableOrderPopulator extends
target.setConfirmedAddress(source.getConfirmedAddress());
}
- com.salesmanager.web.entity.order.OrderTotal taxTotal = null;
- com.salesmanager.web.entity.order.OrderTotal shippingTotal = null;
+ com.salesmanager.shop.model.order.OrderTotal taxTotal = null;
+ com.salesmanager.shop.model.order.OrderTotal shippingTotal = null;
if(source.getBilling()!=null) {
@@ -78,18 +78,18 @@ public class ReadableOrderPopulator extends
target.setDelivery(address);
}
- List<com.salesmanager.web.entity.order.OrderTotal> totals = new ArrayList<com.salesmanager.web.entity.order.OrderTotal>();
+ List<com.salesmanager.shop.model.order.OrderTotal> totals = new ArrayList<com.salesmanager.shop.model.order.OrderTotal>();
for(OrderTotal t : source.getOrderTotal()) {
if(t.getOrderTotalType()==null) {
continue;
}
if(t.getOrderTotalType().name().equals(OrderTotalType.TOTAL.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
target.setTotal(totalTotal);
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.TAX.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(taxTotal==null) {
taxTotal = totalTotal;
} else {
@@ -101,7 +101,7 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.SHIPPING.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(shippingTotal==null) {
shippingTotal = totalTotal;
} else {
@@ -113,7 +113,7 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.HANDLING.name())) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = createTotal(t);
if(shippingTotal==null) {
shippingTotal = totalTotal;
} else {
@@ -125,12 +125,12 @@ public class ReadableOrderPopulator extends
totals.add(totalTotal);
}
else if(t.getOrderTotalType().name().equals(OrderTotalType.SUBTOTAL.name())) {
- com.salesmanager.web.entity.order.OrderTotal subTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal subTotal = createTotal(t);
totals.add(subTotal);
}
else {
- com.salesmanager.web.entity.order.OrderTotal otherTotal = createTotal(t);
+ com.salesmanager.shop.model.order.OrderTotal otherTotal = createTotal(t);
totals.add(otherTotal);
}
}
@@ -140,8 +140,8 @@ public class ReadableOrderPopulator extends
return target;
}
- private com.salesmanager.web.entity.order.OrderTotal createTotal(OrderTotal t) {
- com.salesmanager.web.entity.order.OrderTotal totalTotal = new com.salesmanager.web.entity.order.OrderTotal();
+ private com.salesmanager.shop.model.order.OrderTotal createTotal(OrderTotal t) {
+ com.salesmanager.shop.model.order.OrderTotal totalTotal = new com.salesmanager.shop.model.order.OrderTotal();
totalTotal.setCode(t.getOrderTotalCode());
totalTotal.setId(t.getId());
totalTotal.setModule(t.getModule());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
index 8a8d0e2..978ca50 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductDownloadPopulator.java
@@ -1,11 +1,11 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.ReadableOrderProductDownload;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.order.ReadableOrderProductDownload;
public class ReadableOrderProductDownloadPopulator extends
AbstractDataPopulator<OrderProductDownload, ReadableOrderProductDownload> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
index c0d353c..895ca69 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableOrderProductPopulator.java
@@ -1,30 +1,29 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.orderproduct.OrderProduct;
+import com.salesmanager.core.model.order.orderproduct.OrderProductAttribute;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.order.ReadableOrderProduct;
+import com.salesmanager.shop.model.order.ReadableOrderProductAttribute;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.utils.ImageFilePath;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
-import com.salesmanager.core.business.order.model.orderproduct.OrderProductAttribute;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.order.ReadableOrderProduct;
-import com.salesmanager.web.entity.order.ReadableOrderProductAttribute;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.utils.ImageFilePath;
-
public class ReadableOrderProductPopulator extends
AbstractDataPopulator<OrderProduct, ReadableOrderProduct> {
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 eabf946..b3edd7e 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,18 +1,17 @@
-package com.salesmanager.web.populator.order;
-
-import java.util.Locale;
+package com.salesmanager.shop.populator.order;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.OrderTotal;
+import com.salesmanager.core.model.reference.language.Language;
+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 com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.OrderTotal;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.ReadableOrderTotal;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import java.util.Locale;
public class ReadableOrderTotalPopulator extends
AbstractDataPopulator<OrderTotal, ReadableOrderTotal> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
index 9d61443..c730851 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShippingSummaryPopulator.java
@@ -1,15 +1,15 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
import org.apache.commons.lang.Validate;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shipping.model.ShippingSummary;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
-import com.salesmanager.web.entity.order.ReadableShippingSummary;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shipping.ShippingSummary;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+import com.salesmanager.shop.model.order.ReadableShippingSummary;
public class ReadableShippingSummaryPopulator extends
AbstractDataPopulator<ShippingSummary, ReadableShippingSummary> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
index b499c77..5051a75 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ReadableShopOrderPopulator.java
@@ -1,14 +1,14 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.entity.order.ReadableShopOrder;
-import com.salesmanager.web.entity.order.ShopOrder;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.model.order.ReadableShopOrder;
+import com.salesmanager.shop.model.order.ShopOrder;
public class ReadableShopOrderPopulator extends
AbstractDataPopulator<ShopOrder, ReadableShopOrder> {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
index 578bb85..fda655c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/order/ShoppingCartItemPopulator.java
@@ -1,19 +1,19 @@
-package com.salesmanager.web.populator.order;
+package com.salesmanager.shop.populator.order;
import org.apache.commons.lang3.Validate;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.PersistableOrderProduct;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCartItem;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.shop.model.order.PersistableOrderProduct;
public class ShoppingCartItemPopulator extends
AbstractDataPopulator<PersistableOrderProduct, ShoppingCartItem> {
@@ -34,7 +34,7 @@ public class ShoppingCartItemPopulator extends
Product product = productService.getById(source.getProduct().getId());
if(source.getAttributes()!=null) {
- for(com.salesmanager.web.entity.catalog.product.attribute.ProductAttribute attr : source.getAttributes()) {
+ for(com.salesmanager.shop.model.catalog.product.attribute.ProductAttribute attr : source.getAttributes()) {
ProductAttribute attribute = productAttributeService.getById(attr.getId());
if(attribute==null) {
throw new ConversionException("ProductAttribute with id " + attr.getId() + " is null");
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
index 148841c..b2f76f4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartDataPopulator.java
@@ -1,36 +1,34 @@
/**
*
*/
-package com.salesmanager.web.populator.shoppingCart;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
+package com.salesmanager.shop.populator.shoppingCart;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartCalculationService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.order.OrderSummary;
+import com.salesmanager.core.model.order.OrderTotalSummary;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.order.OrderTotal;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartAttribute;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartItem;
+import com.salesmanager.shop.utils.ImageFilePath;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration.ConversionException;
-import org.apache.commons.lang.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.order.model.OrderSummary;
-import com.salesmanager.core.business.order.model.OrderTotalSummary;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartCalculationService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.order.OrderTotal;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartAttribute;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartItem;
-import com.salesmanager.web.utils.ImageFilePath;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
/**
@@ -90,12 +88,12 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
//Validate.notNull(imageUtils, "Requires to set imageUtils");
int cartQuantity = 0;
cart.setCode(shoppingCart.getShoppingCartCode());
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> items = shoppingCart.getLineItems();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> items = shoppingCart.getLineItems();
List<ShoppingCartItem> shoppingCartItemsList=Collections.emptyList();
try{
if(items!=null) {
shoppingCartItemsList=new ArrayList<ShoppingCartItem>();
- for(com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem item : items) {
+ for(com.salesmanager.core.model.shoppingcart.ShoppingCartItem item : items) {
ShoppingCartItem shoppingCartItem = new ShoppingCartItem();
shoppingCartItem.setCode(cart.getCode());
@@ -119,10 +117,10 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
String imagePath = imageUtils.buildProductimageUtils(store, item.getProduct().getSku(), image.getProductImage());
shoppingCartItem.setImage(imagePath);
}
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> attributes = item.getAttributes();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> attributes = item.getAttributes();
if(attributes!=null) {
List<ShoppingCartAttribute> cartAttributes = new ArrayList<ShoppingCartAttribute>();
- for(com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem attribute : attributes) {
+ for(com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem attribute : attributes) {
ShoppingCartAttribute cartAttribute = new ShoppingCartAttribute();
cartAttribute.setId(attribute.getId());
cartAttribute.setAttributeId(attribute.getProductAttributeId());
@@ -146,14 +144,14 @@ public class ShoppingCartDataPopulator extends AbstractDataPopulator<ShoppingCar
}
OrderSummary summary = new OrderSummary();
- List<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> productsList = new ArrayList<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ List<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> productsList = new ArrayList<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
productsList.addAll(shoppingCart.getLineItems());
summary.setProducts(productsList);
OrderTotalSummary orderSummary = shoppingCartCalculationService.calculate(shoppingCart,store, language );
if(CollectionUtils.isNotEmpty(orderSummary.getTotals())) {
List<OrderTotal> totals = new ArrayList<OrderTotal>();
- for(com.salesmanager.core.business.order.model.OrderTotal t : orderSummary.getTotals()) {
+ for(com.salesmanager.core.model.order.OrderTotal t : orderSummary.getTotals()) {
OrderTotal total = new OrderTotal();
total.setCode(t.getOrderTotalCode());
total.setValue(t.getValue());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
index b77ce03..4d13464 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/shoppingCart/ShoppingCartModelPopulator.java
@@ -1,12 +1,22 @@
/**
*
*/
-package com.salesmanager.web.populator.shoppingCart;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+package com.salesmanager.shop.populator.shoppingCart;
+
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
+import com.salesmanager.core.business.services.shoppingcart.ShoppingCartService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.shoppingcart.ShoppingCart;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartAttribute;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartData;
+import com.salesmanager.shop.model.shoppingcart.ShoppingCartItem;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration.ConversionException;
import org.apache.commons.lang3.StringUtils;
@@ -14,20 +24,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
-import com.salesmanager.core.business.shoppingcart.service.ShoppingCartService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartAttribute;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartData;
-import com.salesmanager.web.entity.shoppingcart.ShoppingCartItem;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* @author Umesh A
@@ -114,33 +113,33 @@ public class ShoppingCartModelPopulator
}
List<ShoppingCartItem> items = shoppingCart.getShoppingCartItems();
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> newItems =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> newItems =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
if ( items != null && items.size() > 0 )
{
for ( ShoppingCartItem item : items )
{
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> cartItems = cartMdel.getLineItems();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> cartItems = cartMdel.getLineItems();
if ( cartItems != null && cartItems.size() > 0 )
{
- for ( com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem dbItem : cartItems )
+ for ( com.salesmanager.core.model.shoppingcart.ShoppingCartItem dbItem : cartItems )
{
if ( dbItem.getId().longValue() == item.getId() )
{
dbItem.setQuantity( item.getQuantity() );
// compare attributes
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> attributes =
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> attributes =
dbItem.getAttributes();
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> newAttributes =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> newAttributes =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem>();
List<ShoppingCartAttribute> cartAttributes = item.getShoppingCartAttributes();
if ( !CollectionUtils.isEmpty( cartAttributes ) )
{
for ( ShoppingCartAttribute attribute : cartAttributes )
{
- for ( com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem dbAttribute : attributes )
+ for ( com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem dbAttribute : attributes )
{
if ( dbAttribute.getId().longValue() == attribute.getId() )
{
@@ -161,13 +160,13 @@ public class ShoppingCartModelPopulator
}
else
{// create new item
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem cartItem =
+ com.salesmanager.core.model.shoppingcart.ShoppingCartItem cartItem =
createCartItem( cartMdel, item, store );
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem> lineItems =
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartItem> lineItems =
cartMdel.getLineItems();
if ( lineItems == null )
{
- lineItems = new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem>();
+ lineItems = new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
cartMdel.setLineItems( lineItems );
}
lineItems.add( cartItem );
@@ -188,7 +187,7 @@ public class ShoppingCartModelPopulator
}
- private com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem createCartItem( com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart,
+ private com.salesmanager.core.model.shoppingcart.ShoppingCartItem createCartItem( com.salesmanager.core.model.shoppingcart.ShoppingCart cart,
ShoppingCartItem shoppingCartItem,
MerchantStore store )
throws Exception
@@ -207,8 +206,8 @@ public class ShoppingCartModelPopulator
+ store.getId() );
}
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem item =
- new com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem( cart, product );
+ com.salesmanager.core.model.shoppingcart.ShoppingCartItem item =
+ new com.salesmanager.core.model.shoppingcart.ShoppingCartItem( cart, product );
item.setQuantity( shoppingCartItem.getQuantity() );
item.setItemPrice( shoppingCartItem.getProductPrice() );
item.setShoppingCart( cart );
@@ -217,16 +216,16 @@ public class ShoppingCartModelPopulator
List<ShoppingCartAttribute> cartAttributes = shoppingCartItem.getShoppingCartAttributes();
if ( !CollectionUtils.isEmpty( cartAttributes ) )
{
- Set<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem> newAttributes =
- new HashSet<com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem>();
+ Set<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem> newAttributes =
+ new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem>();
for ( ShoppingCartAttribute attribute : cartAttributes )
{
ProductAttribute productAttribute = productAttributeService.getById( attribute.getAttributeId() );
if ( productAttribute != null
&& productAttribute.getProduct().getId().longValue() == product.getId().longValue() )
{
- com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem attributeItem =
- new com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem( item,
+ com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem attributeItem =
+ new com.salesmanager.core.model.shoppingcart.ShoppingCartAttributeItem( item,
productAttribute );
if ( attribute.getAttributeId() > 0 )
{