You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/01/15 07:43:36 UTC
svn commit: r1851319 - in /ofbiz/ofbiz-framework/trunk/applications:
order/template/entry/CheckoutPayment.ftl
party/template/party/EditCreditCard.ftl
party/template/party/EditEftAccount.ftl
Author: jleroux
Date: Tue Jan 15 07:43:36 2019
New Revision: 1851319
URL: http://svn.apache.org/viewvc?rev=1851319&view=rev
Log:
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/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1851319&r1=1851318&r2=1851319&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl Tue Jan 15 07:43:36 2019
@@ -32,7 +32,7 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("NC" == mode) {
// new credit card
- form.action="<@o...@ofbizUrl>";
+ form.action="<@o...@ofbizUrl>";
form.submit();
} else if ("EC" == mode) {
// edit credit card
@@ -40,19 +40,19 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("GC" == mode) {
// edit gift card
- form.action="<@o...@ofbizUrl>";
+ form.action="<@o...@ofbizUrl>";
form.submit();
} else if ("NE" == mode) {
// new eft account
- form.action="<@o...@ofbizUrl>";
+ form.action="<@o...@ofbizUrl>";
form.submit();
} else if ("EE" == mode) {
// edit eft account
- form.action="<@o...@ofbizUrl>";
+ form.action="<@o...@ofbizUrl>";
form.submit();
}else if(mode = "EG")
//edit gift card
- form.action="<@o...@ofbizUrl>";
+ form.action="<@o...@ofbizUrl>";
form.submit();
}
//]]>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl?rev=1851319&r1=1851318&r2=1851319&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl Tue Jan 15 07:43:36 2019
@@ -28,7 +28,7 @@ under the License.
</div>
<div class="screenlet-body">
<div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+ <a href="<@o...@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="<@o...@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/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl?rev=1851319&r1=1851318&r2=1851319&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl Tue Jan 15 07:43:36 2019
@@ -28,7 +28,7 @@ under the License.
</div>
<div class="screenlet-body">
<div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+ <a href="<@o...@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='<@o...@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>