Skip to content

Removed redundant code #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danieltaylor-nz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed redundant code #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cffd24a
Removed redundant calls to get CartInfo
danieltaylor-nz May 25, 2020
9e75911
Removed redundant service calls
danieltaylor-nz May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions screen/store.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,10 @@ var storeInfo = ${storeInfoJson};
<service-call name="popstore.ProductServices.get#CategoryInfo" out-map="browseRootCategoryInfo"
in-map="[productCategoryId:browseRootCategoryId]"/>
</if>
<!-- get allProductsInfo for subCategoryList used in header, etc -->
<set field="allProducts" from="storeInfo.categoryByType.PsctSearch"/>
<set field="allProductsId" from="storeInfo.categoryByType.PsctSearch?.productCategoryId"/>
<if condition="allProductsId">
<service-call name="popstore.ProductServices.get#CategoryInfo" out-map="allProductsInfo"
in-map="[productCategoryId:allProductsId]"/>
</if>
<!-- cartInfo for cart count in header/navbar -->
<service-call name="popstore.CartServices.get#CartInfo" out-map="cartInfo" in-map="context"/>

<set field="productsInCart" from="cartInfo" /><!-- for legacy reasons -->

<!-- get settings used in subscreens -->
<set field="template_server_root" from="storeInfo.settings.template_server_root" default-value="component://PopRestStore/template/store/root.html.ftl"/>
<set field="template_server_header" from="storeInfo.settings.template_server_header" default-value="component://PopRestStore/template/store/navbar.html.ftl"/>
Expand Down
1 change: 0 additions & 1 deletion screen/store/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ along with this software (see the LICENSE.md file). If not, see
<service-call name="popstore.ProductServices.find#ProductAvailability" in-map="context" out-map="context" />
<set field="inStock" from="false"/>

<service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />
<service-call name="popstore.ProductServices.get#SortedProductList" in-map="context + [productCategoryId:categoryId]" out-map="context"/>

<set field="pageSize" from="pageSize ?: 100"/>
Expand Down
2 changes: 0 additions & 2 deletions screen/store/product.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ along with this software (see the LICENSE.md file). If not, see
<service-call name="popstore.ProductServices.get#ProductReviews" out-map="reviewsList" in-map="[productId:productId]"/>
<service-call name="popstore.ProductServices.find#ProductAvailability" in-map="context" out-map="context" />

<service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />

<set field="inStock" from="false"/>
<if condition="product.productTypeEnumId == 'PtVirtual'">
<service-call name="popstore.ProductServices.get#ProductVariantsDisplayInfo"
Expand Down
2 changes: 0 additions & 2 deletions screen/store/search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ along with this software (see the LICENSE.md file). If not, see
<service-call name="popstore.SearchServices.search#All" out-map="context"
in-map="[searchParameter:searchParameter, productStoreId:productStoreId, pageIndex:pageIndex ? pageIndex : '0', pageSize:'12']"/>

<service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />

<set field="productListCount" from="productListCount ?: 0"/>
<set field="productListPageSize" from="productListPageSize ?: 0"/>
<set field="productListPageRangeHigh" from="productListPageRangeHigh ?: 0"/>
Expand Down