svn commit: r1822145 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/catalog/AdvancedSearch.ftl template/order/QuickAdd.ftl template/order/QuickAddSummary.ftl widget/CatalogScreens.xml

[Deepak Dixit-5]

Author: deepak
Date: Wed Jan 24 18:06:18 2018
New Revision: 1822145

URL: http://svn.apache.org/viewvc?rev=1822145&view=rev
Log:
Improved: Update markup of qucik add page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10161)
Thanks Nitish Mishra for your contribution

Added:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl   (with props)
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl   (with props)
Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl?rev=1822145&r1=1822144&r2=1822145&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl Wed Jan 24 18:06:18 2018
@@ -156,7 +156,7 @@ under the License.
             <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="button">
               ${uiLabelMap.OrderClearSearchHistory}
             </a>
-            <h4>${uiLabelMap.OrderClearSearchHistoryNote}</h5>
+            <h4>${uiLabelMap.OrderClearSearchHistoryNote}</h4>
           </div>
           <#list searchOptionsHistoryList as searchOptions>
           <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->

Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl?rev=1822145&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl Wed Jan 24 18:06:18 2018
@@ -0,0 +1,66 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="card m-3">
+<#if product??>
+  <div class="card-header">
+    <strong>
+      ${product.productId}
+    </strong>
+  </div>
+  <div class="card-body">
+  <div class="row">
+  <div class="col-sm-10">
+      <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
+  </div>
+  <div class="col-sm-10">
+      <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
+        ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+      <#else>
+        &nbsp;
+      </#if>
+  </div>
+  <div class="col-sm-10">
+    <#if totalPrice??>
+        <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+    <#else>
+      <div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>">
+        <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
+      </div>
+    </#if>
+  </div>
+  <div class="col-sm-10">
+    <#-- check to see if introductionDate hasn't passed yet -->
+    <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
+      ${uiLabelMap.ProductNotYetAvailable}
+    <#-- check to see if salesDiscontinuationDate has passed -->
+    <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
+      ${uiLabelMap.ProductNoLongerAvailable}
+    <#-- check to see if the product is a virtual product -->
+    <#elseif "Y" == product.isVirtual?default("N")>
+        <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>">${uiLabelMap.OrderChooseVariations}...</a>
+    <#else>
+        <input type="text" size="5" class="form-control form-control-sm" name="quantity_${product.productId}" value=""/>
+    </#if>
+  </div>
+  </div>
+<#else>
+  <div class="alert alert-light" role="alert">${uiLabelMap.ProductErrorProductNotFound}.</div>
+</#if>
+</div>
+</div>
\ No newline at end of file

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl?rev=1822145&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl Wed Jan 24 18:06:18 2018
@@ -0,0 +1,66 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="card m-3">
+<#if product??>
+  <div class="card-header">
+    <strong>
+      ${product.productId}
+    </strong>
+  </div>
+  <div class="card-body">
+  <div class="row">
+  <div class="col-sm-10">
+      <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
+  </div>
+  <div class="col-sm-10">
+      <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
+        ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+      <#else>
+        &nbsp;
+      </#if>
+  </div>
+  <div class="col-sm-10">
+    <#if totalPrice??>
+        <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+    <#else>
+      <div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>">
+        <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
+      </div>
+    </#if>
+  </div>
+  <div class="col-sm-10">
+    <#-- check to see if introductionDate hasn't passed yet -->
+    <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
+      ${uiLabelMap.ProductNotYetAvailable}
+    <#-- check to see if salesDiscontinuationDate has passed -->
+    <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
+      ${uiLabelMap.ProductNoLongerAvailable}
+    <#-- check to see if the product is a virtual product -->
+    <#elseif "Y" == product.isVirtual?default("N")>
+        <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>">${uiLabelMap.OrderChooseVariations}...</a>
+    <#else>
+        <input type="text" size="5" class="form-control form-control-sm" name="quantity_${product.productId}" value=""/>
+    </#if>
+  </div>
+  </div>
+<#else>
+  <div class="alert alert-light" role="alert">${uiLabelMap.ProductErrorProductNotFound}.</div>
+</#if>
+</div>
+</div>
\ No newline at end of file

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml?rev=1822145&r1=1822144&r2=1822145&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml Wed Jan 24 18:06:18 2018
@@ -397,7 +397,7 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAdd.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/QuickAdd.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -410,7 +410,7 @@ under the License.
                 <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAddSummary.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/QuickAddSummary.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>