svn commit: r1849570 - in /ofbiz/branches/release16.11: ./ 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:55 2018
New Revision: 1849570

URL: http://svn.apache.org/viewvc?rev=1849570&view=rev
Log:
"Applied fix from trunk framework 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/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/template/entry/BillSettings.ftl
    ofbiz/branches/release16.11/applications/order/template/entry/EditShipAddress.ftl
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 22 19:23:55 2018
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/order/template/entry/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/entry/BillSettings.ftl?rev=1849570&r1=1849569&r2=1849570&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/entry/BillSettings.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/entry/BillSettings.ftl Sat Dec 22 19:23:55 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/branches/release16.11/applications/order/template/entry/EditShipAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/entry/EditShipAddress.ftl?rev=1849570&r1=1849569&r2=1849570&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/entry/EditShipAddress.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/entry/EditShipAddress.ftl Sat Dec 22 19:23:55 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/branches/release16.11/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1849570&r1=1849569&r2=1849570&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat Dec 22 19:23:55 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"/>
@@ -168,6 +187,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>