svn commit: r1849569 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/order/template/entry/BillSettings.ftl applications/order/template/entry/EditShipAddress.ftl applications/order/widget/ordermgr/OrderEntryOrderScreens.xml

Author: jleroux
Date: Sat Dec 22 19:23:43 2018
New Revision: 1849569

URL: http://svn.apache.org/viewvc?rev=1849569&view=rev
Log:
"Applied fix from trunk for revision: 1849567"
------------------------------------------------------------------------
r1849567 | jleroux | 2018-12-22 20:18:49 +0100 (sam. 22 déc. 2018) | 10 lignes

Fixed: Dependent dropdowns should be used in createPostalAddress and
Set Billing screens of ordermgr.
(OFBIZ-10681)

If you create an EFT account from the quick finalyse page, at
ordermgr/control/createPostalAddress the US states which are proposed by default
are not the US states but all states.
You still can pick one US state, but it's counter intuitive.

Thanks: Aman Mishra for the fix and finding of Set Billing screen
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/BillSettings.ftl
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/EditShipAddress.ftl
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 22 19:23:43 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/BillSettings.ftl?rev=1849569&r1=1849568&r2=1849569&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/BillSettings.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/BillSettings.ftl Sat Dec 22 19:23:43 2018
@@ -228,7 +228,7 @@ function makeExpDate() {
               <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
               <td width="5">&nbsp;</td>
               <td width="74%">
-                <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+                <select id="checkoutsetupform_stateProvinceGeoId" name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
                   <#if postalFields.stateProvinceGeoId??>
                   <option>${postalFields.stateProvinceGeoId}</option>
                   <option value="${postalFields.stateProvinceGeoId}">---</option>
@@ -249,7 +249,7 @@ function makeExpDate() {
               <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
               <td width="5">&nbsp;</td>
               <td width="74%">
-                <select name="countryGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+                <select id="checkoutsetupform_countryGeoId" name="countryGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
                   <#if postalFields.countryGeoId??>
                   <option>${postalFields.countryGeoId}</option>
                   <option value="${postalFields.countryGeoId}">---</option>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/EditShipAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/EditShipAddress.ftl?rev=1849569&r1=1849568&r2=1849569&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/EditShipAddress.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/EditShipAddress.ftl Sat Dec 22 19:23:43 2018
@@ -24,10 +24,10 @@ under the License.
         <tr>
           <td>
               <#if postalAddress?has_content>
-              <form method="post" action="<@ofbizUrl>updatePostalAddressOrderEntry</@ofbizUrl>" name="checkoutsetupform">
+              <form method="post" action="<@ofbizUrl>updatePostalAddressOrderEntry</@ofbizUrl>" id="checkoutsetupform" name="checkoutsetupform">
                 <input type="hidden" name="contactMechId" value="${shipContactMechId!}"/>
               <#else>
-              <form method="post" action="<@ofbizUrl>createPostalAddress</@ofbizUrl>" name="checkoutsetupform">
+              <form method="post" action="<@ofbizUrl>createPostalAddress</@ofbizUrl>" id="checkoutsetupform" name="checkoutsetupform">
                 <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
                 <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
               </#if>
@@ -85,7 +85,7 @@ under the License.
                     <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <select name="stateProvinceGeoId">
+                      <select id="checkoutsetupform_stateProvinceGeoId" name="stateProvinceGeoId">
                         <option value=""></option>
                         ${screens.render("component://common/widget/CommonScreens.xml#states")}
                       </select>
@@ -102,7 +102,7 @@ under the License.
                     <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <select name="countryGeoId">
+                      <select id="checkoutsetupform_countryGeoId" name="countryGeoId">
                         ${screens.render("component://common/widget/CommonScreens.xml#countries")}
                       </select>
                     *</td>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1849569&r1=1849568&r2=1849569&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat Dec 22 19:23:43 2018
@@ -106,6 +106,15 @@ under the License.
     <screen name="EditShipAddress">
         <section>
             <actions>
+                <set field="dependentForm" value="checkoutsetupform"/>
+                <set field="mainId" value="countryGeoId"/>
+                <set field="paramKey" value="countryGeoId"/>
+                <set field="dependentId" value="stateProvinceGeoId"/>
+                <set field="requestName" value="getAssociatedStateList"/>
+                <set field="responseName" value="stateList"/>
+                <set field="dependentKeyName" value="geoId"/>
+                <set field="descName" value="geoName"/>
+                <set field="selectedDependentOption" default-value="_none_"/>
                 <set field="stepTitleId" value="OrderOrderEntryShipToSettings"/>
                 <set field="stepLabelId" value="FacilityShipping"/>
                 <script location="component://order/groovyScripts/entry/ShipSettings.groovy"/>
@@ -113,6 +122,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonOrderCheckoutDecorator">
                     <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific>
                         <platform-specific>
                             <html><html-template location="component://order/template/entry/EditShipAddress.ftl"/></html>
                         </platform-specific>
@@ -161,6 +171,15 @@ under the License.
     <screen name="BillSettings">
         <section>
             <actions>
+                <set field="dependentForm" value="checkoutsetupform"/>
+                <set field="mainId" value="countryGeoId"/>
+                <set field="paramKey" value="countryGeoId"/>
+                <set field="dependentId" value="stateProvinceGeoId"/>
+                <set field="requestName" value="getAssociatedStateList"/>
+                <set field="responseName" value="stateList"/>
+                <set field="dependentKeyName" value="geoId"/>
+                <set field="descName" value="geoName"/>
+                <set field="selectedDependentOption" default-value="_none_"/>
                 <set field="stepTitleId" value="OrderOrderEntryPaymentSettings"/>
                 <set field="stepLabelId" value="AccountingPayment"/>
                 <script location="component://order/groovyScripts/entry/BillSettings.groovy"/>
@@ -169,6 +188,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonOrderCheckoutDecorator">
                     <decorator-section name="body">
+                      <platform-specific><html><html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific>
                       <platform-specific>
                             <html><html-template location="component://order/template/entry/BillSettings.ftl"/></html>
                         </platform-specific>