You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2012/05/28 09:36:41 UTC
svn commit: r1343156 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Author: jacopoc
Date: Mon May 28 07:36:41 2012
New Revision: 1343156
URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
Log:
Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343156&r1=1343155&r2=1343156&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
@@ -81,7 +81,7 @@ under the License.
<#list orderPaymentPreferences as orderPaymentPreference>
<fo:block text-indent="0.2in">
<#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
- <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
+ <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
<#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
<#else>
Re: svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Posted by Ankit Jain <an...@gmail.com>.
Jacopo,
I have created the issue and attached the patch for other ftls.
https://issues.apache.org/jira/browse/OFBIZ-4916
Regards,
Ankit Jain
On Fri, Jun 1, 2012 at 1:02 PM, Ankit Jain <an...@gmail.com> wrote:
> Sure Jacopo, I'll do that.
>
> Regards,
> Ankit Jain
>
>
>
> On Fri, Jun 1, 2012 at 12:59 PM, Jacopo Cappellato
> <ja...@hotwaxmedia.com> wrote:
>> Hi Ankit,
>>
>> yeah, this should be fixed everywhere... if you have a patch for other screens and you are willing to contribute please add the patch file to a new Jira ticket.
>>
>> Thanks,
>>
>> Jacopo
>>
>> On Jun 1, 2012, at 9:07 AM, Ankit Jain wrote:
>>
>>> Hi Jacopo,
>>>
>>> Do we need to apply this change to other ftls ??
>>>
>>> There is an error on demo trunk ecommerce product detail page after
>>> applying this change will fix the error, I tested on my local machine
>>> and its working fine after applying this fix please have a look.
>>>
>>> http://demo-trunk.ofbiz.apache.org/ecommerce/tiny-chrome-widget-WG-5569-p
>>>
>>>
>>> Regards,
>>> Ankit Jain
>>>
>>>
>>>
>>> On Mon, May 28, 2012 at 1:06 PM, <ja...@apache.org> wrote:
>>>> Author: jacopoc
>>>> Date: Mon May 28 07:36:41 2012
>>>> New Revision: 1343156
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
>>>> Log:
>>>> Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).
>>>>
>>>> Modified:
>>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>>>>
>>>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343156&r1=1343155&r2=1343156&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
>>>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
>>>> @@ -81,7 +81,7 @@ under the License.
>>>> <#list orderPaymentPreferences as orderPaymentPreference>
>>>> <fo:block text-indent="0.2in">
>>>> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
>>>> - <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>>>> + <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>>>> <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
>>>> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>>>> <#else>
>>>>
>>>>
>>
Re: svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Posted by Ankit Jain <an...@gmail.com>.
Sure Jacopo, I'll do that.
Regards,
Ankit Jain
On Fri, Jun 1, 2012 at 12:59 PM, Jacopo Cappellato
<ja...@hotwaxmedia.com> wrote:
> Hi Ankit,
>
> yeah, this should be fixed everywhere... if you have a patch for other screens and you are willing to contribute please add the patch file to a new Jira ticket.
>
> Thanks,
>
> Jacopo
>
> On Jun 1, 2012, at 9:07 AM, Ankit Jain wrote:
>
>> Hi Jacopo,
>>
>> Do we need to apply this change to other ftls ??
>>
>> There is an error on demo trunk ecommerce product detail page after
>> applying this change will fix the error, I tested on my local machine
>> and its working fine after applying this fix please have a look.
>>
>> http://demo-trunk.ofbiz.apache.org/ecommerce/tiny-chrome-widget-WG-5569-p
>>
>>
>> Regards,
>> Ankit Jain
>>
>>
>>
>> On Mon, May 28, 2012 at 1:06 PM, <ja...@apache.org> wrote:
>>> Author: jacopoc
>>> Date: Mon May 28 07:36:41 2012
>>> New Revision: 1343156
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
>>> Log:
>>> Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).
>>>
>>> Modified:
>>> ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>>>
>>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343156&r1=1343155&r2=1343156&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
>>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
>>> @@ -81,7 +81,7 @@ under the License.
>>> <#list orderPaymentPreferences as orderPaymentPreference>
>>> <fo:block text-indent="0.2in">
>>> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
>>> - <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>>> + <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>>> <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
>>> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>>> <#else>
>>>
>>>
>
Re: svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
Hi Ankit,
yeah, this should be fixed everywhere... if you have a patch for other screens and you are willing to contribute please add the patch file to a new Jira ticket.
Thanks,
Jacopo
On Jun 1, 2012, at 9:07 AM, Ankit Jain wrote:
> Hi Jacopo,
>
> Do we need to apply this change to other ftls ??
>
> There is an error on demo trunk ecommerce product detail page after
> applying this change will fix the error, I tested on my local machine
> and its working fine after applying this fix please have a look.
>
> http://demo-trunk.ofbiz.apache.org/ecommerce/tiny-chrome-widget-WG-5569-p
>
>
> Regards,
> Ankit Jain
>
>
>
> On Mon, May 28, 2012 at 1:06 PM, <ja...@apache.org> wrote:
>> Author: jacopoc
>> Date: Mon May 28 07:36:41 2012
>> New Revision: 1343156
>>
>> URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
>> Log:
>> Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).
>>
>> Modified:
>> ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>>
>> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343156&r1=1343155&r2=1343156&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
>> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
>> @@ -81,7 +81,7 @@ under the License.
>> <#list orderPaymentPreferences as orderPaymentPreference>
>> <fo:block text-indent="0.2in">
>> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
>> - <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>> + <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
>> <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
>> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
>> <#else>
>>
>>
Re: svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Posted by Ankit Jain <an...@gmail.com>.
Hi Jacopo,
Do we need to apply this change to other ftls ??
There is an error on demo trunk ecommerce product detail page after
applying this change will fix the error, I tested on my local machine
and its working fine after applying this fix please have a look.
http://demo-trunk.ofbiz.apache.org/ecommerce/tiny-chrome-widget-WG-5569-p
Regards,
Ankit Jain
On Mon, May 28, 2012 at 1:06 PM, <ja...@apache.org> wrote:
> Author: jacopoc
> Date: Mon May 28 07:36:41 2012
> New Revision: 1343156
>
> URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
> Log:
> Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).
>
> Modified:
> ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
>
> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=1343156&r1=1343155&r2=1343156&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
> @@ -81,7 +81,7 @@ under the License.
> <#list orderPaymentPreferences as orderPaymentPreference>
> <fo:block text-indent="0.2in">
> <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
> - <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
> + <#if (orderPaymentPreference?? && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
> <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
> <#else>
>
>