ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r1822390 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/order/ ecommerce/webapp/ecommerce/WEB-INF/ ecommerce/widget/
Date Sat, 27 Jan 2018 11:18:04 GMT
Author: deepak
Date: Sat Jan 27 11:18:04 2018
New Revision: 1822390

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

Improved: Update markup of Checkout page according to standard markup given by Bootstrap v4.0.s
(OFBIZ-10105)
Thanks Mayank for your contribution

Added:
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutPayment.ftl
      - copied unchanged from r1822389, ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutPayment.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingAddress.ftl
      - copied unchanged from r1822389, ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingAddress.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CustomerTaxInfo.ftl
      - copied unchanged from r1822389, ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustomerTaxInfo.ftl
Modified:
    ofbiz/ofbiz-plugins/branches/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingOptions.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/OrderScreens.xml

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 27 11:18:04 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,1821051,1822129,1822133,1822139,1822143,1822145
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingOptions.ftl?rev=1822390&r1=1822389&r2=1822390&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingOptions.ftl
(original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/CheckoutShippingOptions.ftl
Sat Jan 27 11:18:04 2018
@@ -61,189 +61,100 @@ under the License.
 <form method="post" name="checkoutInfoForm" style="margin:0;">
   <fieldset>
     <input type="hidden" name="checkoutpage" value="shippingoptions"/>
-
-    <div class="screenlet" style="height: 100%;">
-      <div class="screenlet-title-bar">
-        <div class="h3">2)&nbsp;${uiLabelMap.OrderHowShallWeShipIt}?</div>
-      </div>
-      <div class="screenlet-body" style="height: 100%;">
-        <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
+    <div class="card">
+      <h4 class="card-header">
+        2)&nbsp;${uiLabelMap.OrderHowShallWeShipIt}?
+      </h4>
+      <div class="card-body">
         <#list carrierShipmentMethodList as carrierShipmentMethod>
           <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" +
carrierShipmentMethod.partyId>
-          <tr>
-            <td width="1%" valign="top">
-              <input type="radio" name="shipping_method" value="${shippingMethod}"
-                     <#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if>/>
-            </td>
-            <td valign="top">
-              <div>
-                <#if shoppingCart.getShippingContactMechId()??>
-                  <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
-                </#if>
-                <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!}
-                  &nbsp;</#if>${carrierShipmentMethod.description!}
-                <#if shippingEst?has_content> -
-                  <#if (shippingEst > -1)>
-                    <@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/>
-                  <#else>
-                    ${uiLabelMap.OrderCalculatedOffline}
-                  </#if>
-                </#if>
-              </div>
-            </td>
-          </tr>
+          <div class="form-check">
+            <input class="form-check-input" type="radio" id="shipping_method_${carrierShipmentMethod?index}"
name="shipping_method" value="${shippingMethod}"
+            <#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if>/>
+            <#if shoppingCart.getShippingContactMechId()??>
+              <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+            </#if>
+            <label class="form-check-label" for="shipping_method_${carrierShipmentMethod?index}">
+            <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!}
+              &nbsp;</#if>${carrierShipmentMethod.description!}
+            <#if shippingEst?has_content> -
+              <#if (shippingEst > -1)>
+                <@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/>
+              <#else>
+                ${uiLabelMap.OrderCalculatedOffline}
+              </#if>
+            </#if>
+            </label>
+          </div>
         </#list>
         <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
-          <tr>
-            <td width="1%" valign="top">
-              <input type="radio" name="shipping_method" value="Default" checked="checked"/>
-            </td>
-            <td valign="top">
-              <div>${uiLabelMap.OrderUseDefault}.</div>
-            </td>
-          </tr>
+          <div class="form-check">
+          <input type="radio" name="shipping_method" class="form-check-input" value="Default"
checked="checked"/>
+          <label class="form-check-label" for="shipping_method">${uiLabelMap.OrderUseDefault}.</label>
+          </div>
         </#if>
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
-            </td>
-          </tr>
-          <tr>
-            <td valign="top">
-              <input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
-                  name="may_split" value="false"/>
-            </td>
-            <td valign="top">
-              <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
-            </td>
-          </tr>
-          <tr>
-            <td valign="top">
-              <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
type="radio"
-                  name="may_split" value="true"/>
-            </td>
-            <td valign="top">
-              <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <h2>${uiLabelMap.OrderSpecialInstructions}</h2>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <textarea class="textAreaBox" cols="30" rows="3" wrap="hard"
-                  name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <h2>${uiLabelMap.OrderPoNumber}</h2>&nbsp;
-              <#if shoppingCart.getPoNumber()?? && shoppingCart.getPoNumber()
!= "(none)">
-                <#assign currentPoNumber = shoppingCart.getPoNumber()>
-              </#if>
-              <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber!}"/>
-            </td>
-          </tr>
+        <hr>
+        <h4>${uiLabelMap.OrderShipAllAtOnce}?</h4>
+        <div class="form-check">
+          <input type="radio" class="form-check-input" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
id="may_split_no" name="may_split" value="false"/>
+          <label class="form-check-label" for="may_split_no">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
+        </div>
+        <div class="form-check">
+        <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
type="radio" class="form-check-input" id="may_split_yes" name="may_split" value="true"/>
+        <label for="may_split_yes" class="form-check-label">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
+        </div>
+        <hr>
+        <h4>${uiLabelMap.OrderSpecialInstructions}</h4>
+        <textarea class="form-control" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
+        <hr>
+        <h4>${uiLabelMap.OrderPoNumber}</h4>
+          <#if shoppingCart.getPoNumber()?? && shoppingCart.getPoNumber() != "(none)">
+            <#assign currentPoNumber = shoppingCart.getPoNumber()>
+          </#if>
+        <input type="text" class="form-control" name="correspondingPoId" value="${currentPoNumber!}"/>
         <#if productStore.showCheckoutGiftOptions! != "N">
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <div>
-                <h2>${uiLabelMap.OrderIsThisGift}</h2>
-                <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
-                    name="is_gift" value="true"/><span>${uiLabelMap.CommonYes}</span>
-                <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
-                    name="is_gift" value="false"/><span>${uiLabelMap.CommonNo}</span>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <h2>${uiLabelMap.OrderGiftMessage}</h2>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <textarea class="textAreaBox" cols="30" rows="3" wrap="hard"
-                  name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
-            </td>
-          </tr>
+        <hr>
+        <h4>${uiLabelMap.OrderIsThisGift}</h4>
+        <div class="form-check">
+          <input type="radio" class="form-check-input" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
name="is_gift" id="is_gift_true" value="true"/><label class="form-check-label" for="is_gift_true">${uiLabelMap.CommonYes}</label>
+        </div>
+        <div class="form-check">
+          <input type="radio" class="form-check-input"<#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
name="is_gift" id="is_gift_false" value="false"/><label class="form-check-label" for="is_gift_false">${uiLabelMap.CommonNo}</label>
+        </div>
+        <hr>
+        <h4>${uiLabelMap.OrderGiftMessage}</h4>
+        <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
         <#else>
-          <input type="hidden" name="is_gift" value="false"/>
+          <input type="hidden" name="is_gift" value="fcheckpoutalse"/>
         </#if>
-          <tr>
-            <td colspan="2">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <h2>${uiLabelMap.PartyEmailAddresses}</h2>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
-              <div>
-                <b>
-                  <#list emailList as email>
-                    ${email.infoString!}<#if email_has_next>,</#if>
-                  </#list>
-                </b>
-              </div>
-              <div>
-                ${uiLabelMap.OrderUpdateEmailAddress}
-                <a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>"
class="buttontext">
-                  ${uiLabelMap.PartyProfile}
-                </a>.
-              </div>
-              <br/>
-              <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
-              <input type="text" class="inputBox" size="30" name="order_additional_emails"
-                  value="${shoppingCart.getOrderAdditionalEmails()!}"/>
-            </td>
-          </tr>
-        </table>
-      </div>
+        <hr>
+        <h4>${uiLabelMap.PartyEmailAddresses}</h4>
+        <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
+          <strong>
+            <#list emailList as email>
+              ${email.infoString!}<#if email_has_next>,</#if>
+            </#list>
+          </strong>
+          <div>
+            ${uiLabelMap.OrderUpdateEmailAddress}
+            <a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>"
class="buttontext">
+             ${uiLabelMap.PartyProfile}
+            </a>.
+          </div>
+          <hr>
+          <label for="order_additional_emails">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</label>
+          <input type="text" class="form-control" name="order_additional_emails" id="order_additional_emails"
value="${shoppingCart.getOrderAdditionalEmails()!}"/>
+     </div>
     </div>
   </fieldset>
 </form>
-
-<table width="100%">
-  <tr valign="top">
-    <td>&nbsp;
+<div class="row">
+  <div class="col-auto mr-auto">
       <a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');"
-          class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
-    </td>
-    <td align="right">
+          class="btn btn-secondary">${uiLabelMap.OrderBacktoShoppingCart}</a>
+  </div>
+  <div class="col-auto">
       <a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');"
-          class="buttontextbig">${uiLabelMap.CommonNext}</a>
-    </td>
-  </tr>
-</table>
+          class="btn btn-primary">${uiLabelMap.CommonNext}</a>
+  </div>
+</div>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1822390&r1=1822389&r2=1822390&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
(original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Sat Jan 27 11:18:04 2018
@@ -1915,7 +1915,7 @@ under the License.
     <view-map name="quickcheckout" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutoptions"/>
     <view-map name="checkoutshippingaddress" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingaddress"/>
     <view-map name="checkoutshippingoptions" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingoptions"/>
-    <view-map name="checkoutpayment" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#checkoutpayment"/>
+    <view-map name="checkoutpayment" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutpayment"/>
     <view-map name="splitship" type="screen" page="component://ecommerce/widget/OrderScreens.xml#splitship"/>
 
     <view-map name="checkoutreview" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutreview"/>

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=1822390&r1=1822389&r2=1822390&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 27
11:18:04 2018
@@ -261,7 +261,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/CheckoutShippingAddress.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutShippingAddress.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -605,6 +605,45 @@ under the License.
                     </decorator-section>
                 </decorator-screen>
             </widgets>
+        </section>
+    </screen>
+    <screen name="customertaxinfo">
+        <!-- meant to be included, generally through a screens.render type of thing -->
+        <section>
+            <actions>
+                <set field="partyId" from-field="userLogin.partyId"/>
+                <entity-condition entity-name="PartyTaxAuthInfoAndDetail" list="partyTaxAuthInfoAndDetailList">
+                    <condition-expr field-name="partyId" from-field="partyId"/>
+                    <order-by field-name="geoCode"/>
+                    <order-by field-name="groupName"/>
+                </entity-condition>
+                <entity-condition entity-name="TaxAuthorityAndDetail" list="taxAuthorityAndDetailList">
+                    <order-by field-name="geoCode"/>
+                    <order-by field-name="groupName"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/order/CustomerTaxInfo.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="checkoutpayment">
+        <section>
+            <actions>
+                <set field="rightbarScreenName" value="rightbar"/>
+                <set field="MainColumnStyle" value="rightonly"/>
+
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
+                <script location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/>
+                <script location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/template/order/CheckoutPayment.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
         </section>
     </screen>
 </screens>



Mime
View raw message