diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/reference/country/CountryRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/reference/country/CountryRepository.java index 635c100f25..96fcb9df3f 100755 --- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/reference/country/CountryRepository.java +++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/reference/country/CountryRepository.java @@ -14,7 +14,10 @@ public interface CountryRepository extends JpaRepository { Country findByIsoCode(String code); - @Query("select c from Country c left join fetch c.descriptions cd where cd.language.id=?1") + @Query("select c from Country c " + + "left join fetch c.descriptions cd " + + "left join fetch c.zones cz left join fetch cz.descriptions " + + "where cd.language.id=?1") List listByLanguage(Integer id); /** get country including zones by language **/ diff --git a/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java b/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java index 9b8f6d184e..71a15112f5 100755 --- a/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java +++ b/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java @@ -15,6 +15,7 @@ public class Product extends Entity implements Serializable { private boolean productShipeable = false; private boolean available; + private boolean visible = true; private int sortOrder; private String dateAvailable; @@ -49,6 +50,12 @@ public String getCreationDate() { public void setCreationDate(String creationDate) { this.creationDate = creationDate; } + public boolean isVisible() { + return visible; + } + public void setVisible(boolean visible) { + this.visible = visible; + } diff --git a/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java b/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java index d3773fa729..f2bb6c1c5d 100644 --- a/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java +++ b/sm-shop-model/src/main/java/com/salesmanager/shop/model/catalog/product/product/definition/ProductDefinition.java @@ -16,7 +16,7 @@ public class ProductDefinition extends Entity { private static final long serialVersionUID = 1L; private boolean visible = true; private boolean shipeable = true; - private boolean virtual = true; + private boolean virtual = false; private boolean canBePurchased = true; private String dateAvailable; private String identifier;