diff --git a/data/PopRestStoreProductData.xml b/data/PopRestStoreProductData.xml index 06c76389..7780ca6b 100644 --- a/data/PopRestStoreProductData.xml +++ b/data/PopRestStoreProductData.xml @@ -26,9 +26,9 @@ along with this software (see the LICENSE.md file). If not, see - + - + @@ -71,7 +71,7 @@ along with this software (see the LICENSE.md file). If not, see assetTypeEnumId="AstTpInventory" assetClassEnumId="AsClsInventoryFin" copyCategoryMembers="false"/> - diff --git a/screen/store.xml b/screen/store.xml index 64fb908b..665fae84 100644 --- a/screen/store.xml +++ b/screen/store.xml @@ -28,6 +28,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -71,14 +73,14 @@ var storeInfo = ${storeInfoJson}; + in-map="[categoryId:browseRootCategoryId]"/> + in-map="[categoryId:allProductsId]"/> diff --git a/screen/store/assets/bolster/landing/banner1.jpg b/screen/store/assets/bolster/landing/banner1.jpg new file mode 100644 index 00000000..39fc065d Binary files /dev/null and b/screen/store/assets/bolster/landing/banner1.jpg differ diff --git a/screen/store/assets/bolster/landing/banner2.jpg b/screen/store/assets/bolster/landing/banner2.jpg new file mode 100644 index 00000000..738abc80 Binary files /dev/null and b/screen/store/assets/bolster/landing/banner2.jpg differ diff --git a/screen/store/assets/bolster/landing/banner3.jpg b/screen/store/assets/bolster/landing/banner3.jpg new file mode 100644 index 00000000..37ce22b2 Binary files /dev/null and b/screen/store/assets/bolster/landing/banner3.jpg differ diff --git a/screen/store/assets/bolster/landing/banner4.jpg b/screen/store/assets/bolster/landing/banner4.jpg new file mode 100644 index 00000000..80479984 Binary files /dev/null and b/screen/store/assets/bolster/landing/banner4.jpg differ diff --git a/screen/store/assets/bolster/landing/banner5.jpg b/screen/store/assets/bolster/landing/banner5.jpg new file mode 100644 index 00000000..fc181f08 Binary files /dev/null and b/screen/store/assets/bolster/landing/banner5.jpg differ diff --git a/screen/store/category.xml b/screen/store/category.xml index 1916476b..0383bae3 100755 --- a/screen/store/category.xml +++ b/screen/store/category.xml @@ -41,32 +41,27 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - - - + + + + - - + + + + + + + + - - - + + diff --git a/screen/store/product.xml b/screen/store/product.xml index b1d34d57..577ff5bc 100755 --- a/screen/store/product.xml +++ b/screen/store/product.xml @@ -81,6 +81,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -99,7 +101,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/service/popstore/ProductServices.xml b/service/popstore/ProductServices.xml index 5bc36606..69ba2ded 100755 --- a/service/popstore/ProductServices.xml +++ b/service/popstore/ProductServices.xml @@ -41,6 +41,11 @@ along with this software (see the LICENSE.md file). If not, see + + + + + @@ -498,18 +503,34 @@ along with this software (see the LICENSE.md file). If not, see - + + + - + + + + + + + + + + + + + + + + + - - diff --git a/template/store/category.html.ftl b/template/store/category.html.ftl index de71aa12..c2def87a 100644 --- a/template/store/category.html.ftl +++ b/template/store/category.html.ftl @@ -9,27 +9,27 @@ @@ -45,7 +45,7 @@ <#if products??> <#list products.productList as localProd>