svn commit: r1821052 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/order/CheckoutOptions.ftl ecommerce/template/order/CheckoutReview.ftl ecommerce/template/order/OrderItems.ftl ecommerce/widget/OrderScreens.xml

[Deepak Dixit-5]

Author: deepak
Date: Sat Jan 13 08:50:39 2018
New Revision: 1821052

URL: http://svn.apache.org/viewvc?rev=1821052&view=rev
Log:
Applied fix from trunk for revision: 1821051
===

Improved: Update markup of Quick Checkout Page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10136)
Thanks Mayank Lambhate for your contribution

Added:
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutOptions.ftl
      - copied unchanged from r1821051, ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutOptions.ftl
Modified:
    ofbiz/ofbiz-plugins/branches/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutReview.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/OrderItems.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 13 08:50:39 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutReview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutReview.ftl?rev=1821052&r1=1821051&r2=1821052&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutReview.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutReview.ftl Sat Jan 13 08:50:39 2018
@@ -34,7 +34,7 @@ under the License.
   // -->
 </script>
 
-<h1>${uiLabelMap.OrderFinalCheckoutReview}</h1>
+<h2>${uiLabelMap.OrderFinalCheckoutReview}</h2>
 <#if !isDemoStore?? && isDemoStore>
   <p>${uiLabelMap.OrderDemoFrontNote}.</p>
 </#if>
@@ -43,27 +43,23 @@ under the License.
   ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
   <br/>
   ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
-  <table border="0" cellpadding="1" width="100%">
-    <tr>
-      <td colspan="4">
-        &nbsp;
-      </td>
-      <td align="right">
-        <form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
-          <#if (requestParameters.checkoutpage)?has_content>
-            <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/>
-          </#if>
-          <#if (requestAttributes.issuerId)?has_content>
-            <input type="hidden" name="issuerId" value="${requestAttributes.issuerId}"/>
-          </#if>
-          <input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
-                 class="mediumSubmit"/>
-        </form>
+  <div class="row">
+    <div class="col-auto ml-auto">
+      <form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
+        <#if (requestParameters.checkoutpage)?has_content>
+          <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/>
+        </#if>
+        <#if (requestAttributes.issuerId)?has_content>
+          <input type="hidden" name="issuerId" value="${requestAttributes.issuerId}"/>
+        </#if>
+        <input type="button" name="processButton" class="btn btn-primary" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
+               class="mediumSubmit"/>
+      </form>
       <#-- doesn't work with Safari, seems to work with IE, Mozilla
-           <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}]&nbsp;</a> -->
-      </td>
-    </tr>
-  </table>
+      <a href="#" onclick="processOrder();" >[${uiLabelMap.OrderSubmitOrder}]&nbsp;</a> -->
+    </div>
+  </div>
+
 <#else>
   <h3>${uiLabelMap.OrderErrorShoppingCartEmpty}.</h3>
 </#if>

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/OrderItems.ftl?rev=1821052&r1=1821051&r2=1821052&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/OrderItems.ftl Sat Jan 13 08:50:39 2018
@@ -57,9 +57,9 @@ under the License.
           <th></th>
           <th>${uiLabelMap.OrderQtyOrdered}</th>
         </#if>
-          <th>${uiLabelMap.EcommerceUnitPrice}</th>
-          <th>${uiLabelMap.OrderAdjustments}</th>
-          <th>${uiLabelMap.CommonSubtotal}</th>
+          <th class="amount">${uiLabelMap.EcommerceUnitPrice}</th>
+          <th class="amount">${uiLabelMap.OrderAdjustments}</th>
+          <th class="amount">${uiLabelMap.CommonSubtotal}</th>
         <#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
           <th colspan="3"></th>
         </#if>
@@ -68,7 +68,7 @@ under the License.
     <tfoot>
       <tr>
         <th colspan="7">${uiLabelMap.CommonSubtotal}</th>
-        <td><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td>
+        <td class="amount"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td>
         <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
@@ -76,7 +76,7 @@ under the License.
       <#list headerAdjustmentsToShow as orderHeaderAdjustment>
         <tr>
           <th colspan="7">${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</th>
-          <td><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></td>
+          <td class="amount"><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></td>
           <#if "Y" == maySelectItems?default("N")>
             <td colspan="3"></td>
           </#if>
@@ -84,14 +84,14 @@ under the License.
       </#list>
       <tr>
         <th colspan="7">${uiLabelMap.OrderShippingAndHandling}</th>
-        <td><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></td>
+        <td class="amount"><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></td>
         <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
       </tr>
       <tr>
         <th colspan="7">${uiLabelMap.OrderSalesTax}</th>
-        <td><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></td>
+        <td class="amount"><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></td>
         <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
@@ -107,7 +107,7 @@ under the License.
       </tr>
       <tr>
         <th colspan="7">${uiLabelMap.OrderGrandTotal}</th>
-        <td>
+        <td class="amount">
           <@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/>
         </td>
         <#if "Y" == maySelectItems?default("N")>
@@ -224,13 +224,13 @@ under the License.
                 ${canceledQty?default(0)?string.number}
               </td>
             </#if>
-            <td>
+            <td class="amount">
               <@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/>
             </td>
-            <td>
+            <td class="amount">
               <@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/>
             </td>
-            <td>
+            <td class="amount">
               <#if workEfforts??>
                   <@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem)*rentalQuantity isoCode=currencyUomId/>
                 <#else>
@@ -308,7 +308,7 @@ under the License.
               </#if>
             </td>
             <td colspan="5"></td>
-            <td>
+            <td class="amount">
               <@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/>
             </td>
             <td></td>

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml?rev=1821052&r1=1821051&r2=1821052&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml Sat Jan 13 08:50:39 2018
@@ -242,7 +242,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/CheckoutOptions.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutOptions.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>