You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/07/08 11:01:04 UTC
svn commit: r1801275 - in /ofbiz/branches/release16.11: ./
applications/order/groovyScripts/entry/AddGiftCertificates.groovy
applications/order/template/entry/cart/ShowCart.ftl
Author: deepak
Date: Sat Jul 8 11:01:03 2017
New Revision: 1801275
URL: http://svn.apache.org/viewvc?rev=1801275&view=rev
Log:
Applied fix from trunk for revision: 1801274
===
Fixed: add gift certificate in purchase order cause exception (OFBIZ-9438)
Apply slightly modified patch from jira issue.
Thanks Wai and Pallavi for your contribution.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/order/groovyScripts/entry/AddGiftCertificates.groovy
ofbiz/branches/release16.11/applications/order/template/entry/cart/ShowCart.ftl
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 8 11:01:03 2017
@@ -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,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094
+/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,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801274
/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/groovyScripts/entry/AddGiftCertificates.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/groovyScripts/entry/AddGiftCertificates.groovy?rev=1801275&r1=1801274&r2=1801275&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/groovyScripts/entry/AddGiftCertificates.groovy (original)
+++ ofbiz/branches/release16.11/applications/order/groovyScripts/entry/AddGiftCertificates.groovy Sat Jul 8 11:01:03 2017
@@ -51,5 +51,5 @@ context.giftCardProductList = giftCardPr
// Get Survey Id for Gift Certificates
productStoreFinActSetting = from("ProductStoreFinActSetting").where("productStoreId", productStoreId, "finAccountTypeId", "GIFTCERT_ACCOUNT").queryOne()
-context.surveyId = productStoreFinActSetting.purchaseSurveyId
+context.surveyId = productStoreFinActSetting?.purchaseSurveyId
Modified: ofbiz/branches/release16.11/applications/order/template/entry/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/entry/cart/ShowCart.ftl?rev=1801275&r1=1801274&r2=1801275&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/entry/cart/ShowCart.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/entry/cart/ShowCart.ftl Sat Jul 8 11:01:03 2017
@@ -91,7 +91,9 @@ under the License.
</#if>
<@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/>
<a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
+ <#if "SALES_ORDER" == shoppingCart.getOrderType()>
<a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a>
+ </#if>
<#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
<a href="javascript:showQohAtp()" class="buttontext">${uiLabelMap.ProductAtpQoh}</a>
</#if>