svn commit: r1851322 - in /ofbiz/branches/release16.11: ./ applications/order/template/en
Locked
svn commit: r1851322 - in /ofbiz/branches/release16.11: ./ applications/order/template/en
 
|
Author: jleroux
Date: Tue Jan 15 07:44:35 2019 New Revision: 1851322 URL: http://svn.apache.org/viewvc?rev=1851322&view=rev Log: "Applied fix from trunk framework for revision: 1851319" ------------------------------------------------------------------------ r1851319 | jleroux | 2019-01-15 08:43:36 +0100 (mar. 15 janv. 2019) | 12 lignes Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT account from the quick finalize page (OFBIZ-10680) If you split the payment and want to create an EFT account you get an error in EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing. Adds the patch to add the partyId field that was missing while creating an EFT account or credit card in split payment mode. Added proper checks to avoid the broken screen in case the parameter is missing. Thanks: Ankit Joshi for the fix ------------------------------------------------------------------------ Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl Propchange: ofbiz/branches/release16.11/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 15 07:44:35 2019 @@ -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,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247 +/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,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319 /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/CheckoutPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl?rev=1851322&r1=1851321&r2=1851322&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl (original) +++ ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl Tue Jan 15 07:44:35 2019 @@ -32,7 +32,7 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "NC") { // new credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; form.submit(); } else if (mode == "EC") { // edit credit card @@ -40,19 +40,19 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "GC") { // edit gift card - form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "NE") { // new eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>"; form.submit(); } else if (mode == "EE") { // edit eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); }else if(mode = "EG") //edit gift card - form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } //]]> Modified: ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl?rev=1851322&r1=1851321&r2=1851322&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl (original) +++ ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl Tue Jan 15 07:44:35 2019 @@ -28,7 +28,7 @@ under the License. </div> <div class="screenlet-body"> <div class="button-bar"> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> + <a href="<@ofbizUrl>${donePage}?partyId=${partyId!}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> </div> <#if !creditCard??> @@ -37,7 +37,7 @@ under the License. <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> - <input type="hidden" name="partyId" value="${partyId}"/> + <input type="hidden" name="partyId" value="${partyId!}"/> <table class="basic-table" cellspacing="0"> ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} Modified: ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl?rev=1851322&r1=1851321&r2=1851322&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl (original) +++ ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl Tue Jan 15 07:44:35 2019 @@ -28,7 +28,7 @@ under the License. </div> <div class="screenlet-body"> <div class="button-bar"> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> + <a href="<@ofbizUrl>${donePage}?partyId=${partyId!}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> </div> <#if !eftAccount??> @@ -37,7 +37,7 @@ under the License. <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' /> </#if> - <input type="hidden" name="partyId" value="${partyId}"/> + <input type="hidden" name="partyId" value="${partyId!}"/> <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.AccountingNameAccount}</td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |