Prepare 3.2.1 release

shopizer-ecommerce · Sep 5, 2022 · 0bdf8ab · 0bdf8ab
1 parent 48f4e5a
commit 0bdf8ab
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 1,096 deletions.
diff --git a/sm-core/pom.xml b/sm-core/pom.xml
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>shopizer-commons</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.0.5</version>
 		</dependency>
 
 		<!-- open search client -->

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/mapper/catalog/ReadableProductMapper.java b/sm-shop/src/main/java/com/salesmanager/shop/mapper/catalog/ReadableProductMapper.java
@@ -96,6 +96,7 @@ public ReadableProduct merge(Product source, ReadableProduct destination, Mercha
 		Validate.notNull(source, "Product cannot be null");
 		Validate.notNull(destination, "Product destination cannot be null");
 
+
 		// read only product values
 		// will contain options
 		TreeMap<Long, ReadableProductOption> selectableOptions = new TreeMap<Long, ReadableProductOption>();
@@ -371,7 +372,7 @@ public ReadableProduct merge(Product source, ReadableProduct destination, Mercha
 
 						destination.setProductPrice(readableProductPrice);
 
-						if (pr.isPresent()) {
+						if (pr.isPresent() && language !=null) {
 							readableProductPrice.setId(pr.get().getId());
 							Optional<ProductPriceDescription> d = pr.get().getDescriptions().stream()
 									.filter(desc -> desc.getLanguage().getCode().equals(language.getCode()))

diff --git a/.../src/main/java/com/salesmanager/shop/store/api/v0/product/ProductItemsRESTController.java b/.../src/main/java/com/salesmanager/shop/store/api/v0/product/ProductItemsRESTController.java