svn commit: r1806262 - in /ofbiz/branches/release16.11/applications/marketing/widget/sfa: CommonScreens.xml SfaMenus.xml forms/ContactForms.xml forms/LeadForms.xml forms/OpportunityForms.xml
Author: pranayp Date: Sat Aug 26 06:32:01 2017 New Revision: 1806262 URL: http://svn.apache.org/viewvc?rev=1806262&view=rev Log: Applied fix from trunk for revision: 1806261. === Fixed: Lead Profile URL not working properly in SFA. (OFBIZ-9512) Fixed it at all the places found in SFA where roleTypeId wasn't being passed and creating the issue. Thanks Jagpreet Kaur for reporting and verifying the issue, thanks Parakh Maheshwari and Devanshu Vyas for reviewing and providing details on their finding and thanks Aditya Sharma for providing the patch. === Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml?rev=1806262&r1=1806261&r2=1806262&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml Sat Aug 26 06:32:01 2017 @@ -222,6 +222,7 @@ under the License. + @@ -229,6 +230,7 @@ under the License. + Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml?rev=1806262&r1=1806261&r2=1806262&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml Sat Aug 26 06:32:01 2017 @@ -139,6 +139,7 @@ under the License. + Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1806262&r1=1806261&r2=1806262&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/ContactForms.xml Sat Aug 26 06:32:01 2017 @@ -101,6 +101,12 @@ under the License. + + + + + + Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1806262&r1=1806261&r2=1806262&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Aug 26 06:32:01 2017 @@ -232,6 +232,12 @@ under the License. + + + + + + Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1806262&r1=1806261&r2=1806262&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/OpportunityForms.xml (origina
svn commit: r1806261 - in /ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa: CommonScreens.xml SfaMenus.xml forms/ContactForms.xml forms/LeadForms.xml forms/OpportunityForms.xml
Author: pranayp Date: Sat Aug 26 06:23:57 2017 New Revision: 1806261 URL: http://svn.apache.org/viewvc?rev=1806261&view=rev Log: Fixed: Lead Profile URL not working properly in SFA. (OFBIZ-9512) Fixed it at all the places found in SFA where roleTypeId wasn't being passed and creating the issue. Thanks Jagpreet Kaur for reporting and verifying the issue, thanks Parakh Maheshwari and Devanshu Vyas for reviewing and providing details on their finding and thanks Aditya Sharma for providing the patch. Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=1806261&r1=1806260&r2=1806261&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sat Aug 26 06:23:57 2017 @@ -222,6 +222,7 @@ under the License. + @@ -229,6 +230,7 @@ under the License. + Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=1806261&r1=1806260&r2=1806261&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml Sat Aug 26 06:23:57 2017 @@ -139,6 +139,7 @@ under the License. + Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1806261&r1=1806260&r2=1806261&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sat Aug 26 06:23:57 2017 @@ -102,6 +102,12 @@ under the License. + + + + + + Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1806261&r1=1806260&r2=1806261&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Aug 26 06:23:57 2017 @@ -233,6 +233,12 @@ under the License. + + + + + + Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1806261&r1=1806260&r2=1806261&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sat Aug 26 06:23:57 2017 @@ -77,6 +77,7 @@ under the License. +
svn propchange: r1802972 - svn:log
Author: pranayp Revision: 1802972 Modified property: svn:log Modified: svn:log at Tue Jul 25 16:16:49 2017 -- --- svn:log (original) +++ svn:log Tue Jul 25 16:16:49 2017 @@ -3,4 +3,4 @@ Improved: User should be notified with s Created a new UiLabel for success message and returned it from 'updateQuote' service. -Thanks Sonal Patwari for reporting and providing the patch. +Thanks Aditya Sharma for reporting and thanks Sonal Patwari providing the patch.
svn commit: r1802972 - in /ofbiz/ofbiz-framework/trunk/applications/order: config/OrderUiLabels.xml minilang/quote/QuoteServices.xml
Author: pranayp Date: Tue Jul 25 16:12:15 2017 New Revision: 1802972 URL: http://svn.apache.org/viewvc?rev=1802972&view=rev Log: Improved: User should be notified with success message on Update Quote page. (OFBIZ-9519) Created a new UiLabel for success message and returned it from 'updateQuote' service. Thanks Sonal Patwari for reporting and providing the patch. Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1802972&r1=1802971&r2=1802972&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Tue Jul 25 16:12:15 2017 @@ -8929,6 +8929,9 @@ æ¥ä»·åä½æ è¯ å ±å¹åº¦éå®ä½èå¥ + +Quote updated successfully. + ٠شاÙدة ربØÙØ© عرض اÙسعر Angebotsgewinn anzeigen Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1802972&r1=1802971&r2=1802972&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml Tue Jul 25 16:12:15 2017 @@ -187,6 +187,7 @@ under the License. +
svn commit: r1802965 - /ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy
Author: pranayp
Date: Tue Jul 25 15:19:45 2017
New Revision: 1802965
URL: http://svn.apache.org/viewvc?rev=1802965&view=rev
Log:
Fixed: SCRUM - Error on 'Edit backlog' for a product.
(OFBIZ-9531)
Added missing import for GenericEntityException and defined customer and items
list at right place to make it available.
Thanks Pallavi Goyal for reporting and providing the patch.
Modified:
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy
Modified:
ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy?rev=1802965&r1=1802964&r2=1802965&view=diff
==
--- ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy
(original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/groovyScripts/AddProductBacklogItem.groovy
Tue Jul 25 15:19:45 2017
@@ -23,12 +23,14 @@ import java.util.Calendar
import net.fortuna.ical4j.model.DateTime
import org.apache.ofbiz.base.util.*
import org.apache.ofbiz.entity.condition.*
+import org.apache.ofbiz.entity.GenericEntityException
import sun.util.calendar.LocalGregorianCalendar.Date
def module = "AddProductBacklogItem.groovy"
// find cust request and items
def inputFields = [:]
+def custRequestAndItems = []
if(parameters.statusId == null){
parameters.statusId = ""
@@ -39,7 +41,7 @@ inputFields.putAll(parameters)
inputFields.custRequestTypeId = "RF_PROD_BACKLOG"
def performFindResults = runService('performFind', ["entityName":
"CustRequestAndCustRequestItem", "inputFields": inputFields, "orderBy":
"custSequenceNum"])
try {
-def custRequestAndItems = performFindResults.listIt.getCompleteList()
+custRequestAndItems = performFindResults.listIt.getCompleteList()
} catch (GenericEntityException e) {
Debug.logError(e, "Failure in " + module)
} finally {
svn commit: r1802893 - /ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml
Author: pranayp Date: Tue Jul 25 07:03:15 2017 New Revision: 1802893 URL: http://svn.apache.org/viewvc?rev=1802893&view=rev Log: Manually applied trunk for revision: 1802885. === Fixed: SCRUM - Upload content to a product email in SCRUM component is not working. (OFBIZ-9524) Fixed typo in form name in the javascript function on the button. Thanks Devanshu Vyas for reporting and providing the patch. === Modified: ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml Modified: ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml?rev=1802893&r1=1802892&r2=1802893&view=diff == --- ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml (original) +++ ofbiz/branches/release16.11/specialpurpose/scrum/widget/CommunicationEventForms.xml Tue Jul 25 07:03:15 2017 @@ -209,12 +209,12 @@ under the License. + (document.UploadContentForProduct.datetimeStarted.value=document.EditEmailForProduct.datetimeStarted.value), + (document.UploadContentForProduct.partyIdTo.value=document.EditEmailForProduct.partyIdTo.value), + (document.UploadContentForProduct.subject.value=document.EditEmailForProduct.subject.value), + (document.UploadContentForProduct.productId.value=document.EditEmailForProduct.productId.value), + (document.UploadContentForProduct.content.value=document.EditEmailForProduct.content.value), +(document.UploadContentForProduct.submit())"/>
svn commit: r1802885 - /ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml
Author: pranayp Date: Tue Jul 25 06:57:26 2017 New Revision: 1802885 URL: http://svn.apache.org/viewvc?rev=1802885&view=rev Log: Fixed: SCRUM - Upload content to a product email in SCRUM component is not working. (OFBIZ-9524) Fixed typo in form name in the javascript function on the button. Thanks Devanshu Vyas for reporting and providing the patch. Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml?rev=1802885&r1=1802884&r2=1802885&view=diff == --- ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/CommunicationEventForms.xml Tue Jul 25 06:57:26 2017 @@ -209,12 +209,12 @@ under the License. + (document.UploadContentForProduct.datetimeStarted.value=document.EditEmailForProduct.datetimeStarted.value), + (document.UploadContentForProduct.partyIdTo.value=document.EditEmailForProduct.partyIdTo.value), + (document.UploadContentForProduct.subject.value=document.EditEmailForProduct.subject.value), + (document.UploadContentForProduct.productId.value=document.EditEmailForProduct.productId.value), + (document.UploadContentForProduct.content.value=document.EditEmailForProduct.content.value), +(document.UploadContentForProduct.submit())"/>
svn commit: r1802692 - /ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js
Author: pranayp
Date: Sat Jul 22 13:12:19 2017
New Revision: 1802692
URL: http://svn.apache.org/viewvc?rev=1802692&view=rev
Log:
Manually applied fix from trunk for revision: 1802690
Fixed: Adding condition in price rule on 'Role Type' showing incorrect result.
(OFBIZ-7275)
The issue exists because in role type list there are multiple occurrences of
substring "CUSTOMER". The existing check was just checking the occurrence of a
substring in the string and found this value more than once in the list so the
last option gets selected. Applied equality check to find the exact match.
Thanks Aditi Patidar for reporting and providing the patch.
Modified:
ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js
Modified:
ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js?rev=1802692&r1=1802691&r2=1802692&view=diff
==
---
ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js
(original)
+++
ofbiz/branches/release16.11/framework/images/webapp/images/miscAjaxFunctions.js
Sat Jul 22 13:12:19 2017
@@ -62,7 +62,7 @@ function getDependentDropdownValues(requ
jQuery.each(list, function(key, value){
if (typeof value == 'string') {
values = value.split(': ');
-if (values[1].indexOf(selected) >= 0 &&
selected.length > 0) {
+if (values[1].indexOf(selected) >= 0 &&
selected.length > 0 && selected == values[1]) {
optionList += "" + values[0] + "";
} else {
optionList += "" + values[0] + "";
svn commit: r1802691 - /ofbiz/branches/release16.11/tools/
Author: pranayp Date: Sat Jul 22 13:10:36 2017 New Revision: 1802691 URL: http://svn.apache.org/viewvc?rev=1802691&view=rev Log: Applied fix from trunk for revision: 1802690 === Fixed: Adding condition in price rule on 'Role Type' showing incorrect result. (OFBIZ-7275) The issue exists because in role type list there are multiple occurrences of substring "CUSTOMER". The existing check was just checking the occurrence of a substring in the string and found this value more than once in the list so the last option gets selected. Applied equality check to find the exact match. Thanks Aditi Patidar for reporting and providing the patch. Modified: ofbiz/branches/release16.11/tools/ (props changed) Propchange: ofbiz/branches/release16.11/tools/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 22 13:10:36 2017 @@ -10,6 +10,6 @@ /ofbiz/branches/json-integration-refactoring/tools:1634077-1635900 /ofbiz/branches/multitenant20100310/tools:921280-927264 /ofbiz/branches/release13.07/tools:1547657 -/ofbiz/ofbiz-framework/trunk:1802459 +/ofbiz/ofbiz-framework/trunk:1802459,1802690 /ofbiz/ofbiz-framework/trunk/tools: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,1801336,1801340,1801359,1801742 /ofbiz/trunk/tools:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
svn commit: r1802690 - /ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js
Author: pranayp
Date: Sat Jul 22 13:06:12 2017
New Revision: 1802690
URL: http://svn.apache.org/viewvc?rev=1802690&view=rev
Log:
Fixed: Adding condition in price rule on 'Role Type' showing incorrect result.
(OFBIZ-7275)
The issue exists because in role type list there are multiple occurrences of
substring "CUSTOMER". The existing check was just checking the occurrence of a
substring in the string and found this value more than once in the list so the
last option gets selected. Applied equality check to find the exact match.
Thanks Aditi Patidar for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js
Modified:
ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js?rev=1802690&r1=1802689&r2=1802690&view=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/miscAjaxFunctions.js
Sat Jul 22 13:06:12 2017
@@ -62,7 +62,7 @@ function getDependentDropdownValues(requ
jQuery.each(list, function(key, value){
if (typeof value == 'string') {
values = value.split(': ');
-if (values[1].indexOf(selected) >= 0 &&
selected.length > 0) {
+if (values[1].indexOf(selected) >= 0 &&
selected.length > 0 && selected == values[1]) {
optionList += "" + values[0] + "";
} else {
optionList += "" + values[0] + "";
svn commit: r1802474 - /ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Author: pranayp
Date: Thu Jul 20 11:48:43 2017
New Revision: 1802474
URL: http://svn.apache.org/viewvc?rev=1802474&view=rev
Log:
Manually applied slightly updated fix for 16.11 from trunk for revision:
1802464.
===
Fixed: Wrong repository links on FormWidgetExamples page.
(OFBIZ-9494)
Updated the URL path and instead of changing it at all the places introduced a
variable. So in future same variable value can be changed instead of changing
its redundant occurrences.
Thanks Aditya Sharma for reporting and providing the patch.
===
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml?rev=1802474&r1=1802473&r2=1802474&view=diff
==
---
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Thu Jul 20 11:48:43 2017
@@ -26,6 +26,7 @@ under the License.
+http://svn.apache.org/repos/asf/ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleForms.xml"/>
@@ -41,7 +42,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DateTimeFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -50,7 +51,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DropDownFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -88,7 +89,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -97,7 +98,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -110,7 +111,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
&
svn commit: r1802468 - /ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Author: pranayp
Date: Thu Jul 20 10:10:52 2017
New Revision: 1802468
URL: http://svn.apache.org/viewvc?rev=1802468&view=rev
Log:
Reverted: Commit r1802467. Something went wrong again. I will need to double
check and correct, will be extra concious in future while using any automated
scripts for backporting.
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml?rev=1802468&r1=1802467&r2=1802468&view=diff
==
---
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Thu Jul 20 10:10:52 2017
@@ -26,7 +26,6 @@ under the License.
-http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml"/>
@@ -42,7 +41,6 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DateTimeFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -52,7 +50,6 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DropDownFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -91,7 +88,6 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields"
${uiLabelMap.ExampleDefinitionFile}
-
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -101,7 +97,6 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -115,7 +110,6 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"SelectionBoxesExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
svn commit: r1802467 - /ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Author: pranayp
Date: Thu Jul 20 10:01:36 2017
New Revision: 1802467
URL: http://svn.apache.org/viewvc?rev=1802467&view=rev
Log:
Manually applied fix from trunk for revision: 1802464.
===
Fixed: Wrong repository links on FormWidgetExamples page.
(OFBIZ-9494)
Updated the URL path and instead of changing it at all the places introduced a
variable. So in future same variable value can be changed instead of changing
its redundant occurrences.
Thanks Aditya Sharma for reporting and providing the patch.
===
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Modified:
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml?rev=1802467&r1=1802466&r2=1802467&view=diff
==
---
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++
ofbiz/branches/release16.11/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Thu Jul 20 10:01:36 2017
@@ -26,6 +26,7 @@ under the License.
+http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml"/>
@@ -41,6 +42,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DateTimeFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
+
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -50,6 +52,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DropDownFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
+
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -88,6 +91,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields"
${uiLabelMap.ExampleDefinitionFile}
+
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -97,6 +101,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm"
${uiLabelMap.ExampleDefinitionFile}
+
http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
@@ -110,6 +115,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"SelectionBoxesExampleForm"
${uiLabelMap.ExampleDefinitionFile}
+
http://svn.apache.org/repos/asf/ofbiz/trunk/spec
svn commit: r1802466 - in /ofbiz/branches/release16.11: applications/marketing/widget/sfa/SfaMenus.xml tools/
Author: pranayp Date: Thu Jul 20 09:57:46 2017 New Revision: 1802466 URL: http://svn.apache.org/viewvc?rev=1802466&view=rev Log: Manually applied fix from trunk for revision: 1802459 === Fixed: Profile link for Lead not working properly in sfa component. (OFBIZ-9497) Updated "Profile" link in LinkTabBar in SfaMenus for roleTypeId. Thanks Aditya Sharma for reporting an providing the patch. === Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/branches/release16.11/tools/ (props changed) Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml?rev=1802466&r1=1802465&r2=1802466&view=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/SfaMenus.xml Thu Jul 20 09:57:46 2017 @@ -188,6 +188,7 @@ under the License. + Propchange: ofbiz/branches/release16.11/tools/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 20 09:57:46 2017 @@ -0,0 +1,15 @@ +/ofbiz/branches/2013_RemoveJavolution/tools:1462755 +/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools:1535171-1654698 +/ofbiz/branches/OFBIZ-6275/tools:1675394-1675466 +/ofbiz/branches/addbirt/tools:831210-885099,885686-886087 +/ofbiz/branches/boostrap_theme/tools:1635411,1635439,1635465 +/ofbiz/branches/dojo1.4/tools:951708-952957 +/ofbiz/branches/framework-api-cleanup/tools:1619853-1620529 +/ofbiz/branches/jackrabbit20100709/tools:962442-1231517 +/ofbiz/branches/jquery/tools:952958-1044489 +/ofbiz/branches/json-integration-refactoring/tools:1634077-1635900 +/ofbiz/branches/multitenant20100310/tools:921280-927264 +/ofbiz/branches/release13.07/tools:1547657 +/ofbiz/ofbiz-framework/trunk:1802459 +/ofbiz/ofbiz-framework/trunk/tools: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,1801336,1801340,1801359,1801742 +/ofbiz/trunk/tools:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
svn commit: r1802465 - /ofbiz/branches/release16.11/tools/
Author: pranayp
Date: Thu Jul 20 09:55:23 2017
New Revision: 1802465
URL: http://svn.apache.org/viewvc?rev=1802465&view=rev
Log:
Reverted: Previous incomplete commit r1802460. Somehow I missed adding actual
code changes.
Modified:
ofbiz/branches/release16.11/tools/ (props changed)
Propchange: ofbiz/branches/release16.11/tools/
('svn:mergeinfo' removed)
svn commit: r1802464 - /ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
Author: pranayp
Date: Thu Jul 20 09:27:32 2017
New Revision: 1802464
URL: http://svn.apache.org/viewvc?rev=1802464&view=rev
Log:
Fixed: Wrong repository links on FormWidgetExamples page.
(OFBIZ-9494)
Updated the URL path and instead of changing it at all the places introduced a
variable. So in future same variable value can be changed instead of changing
its redundant occurrences.
Thanks Aditya Sharma for reporting and providing the patch.
Modified:
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
Modified:
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml?rev=1802464&r1=1802463&r2=1802464&view=diff
==
---
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml
Thu Jul 20 09:27:32 2017
@@ -26,6 +26,7 @@ under the License.
+http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml"/>
@@ -41,7 +42,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DateTimeFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -50,7 +51,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"DropDownFieldsExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -88,7 +89,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -97,7 +98,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-window="svnPage"
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+
@@ -110,7 +111,7 @@ under the License.
${uiLabelMap.ExampleSourceCode}
${uiLabelMap.ExampleDefinitionName}
"SelectionBoxesExampleForm"
${uiLabelMap.ExampleDefinitionFile}
-http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml";
url-mode="plain" target-w
svn commit: r1802460 - /ofbiz/branches/release16.11/tools/
Author: pranayp Date: Thu Jul 20 09:00:16 2017 New Revision: 1802460 URL: http://svn.apache.org/viewvc?rev=1802460&view=rev Log: Applied fix from trunk for revision: 1802459 === Fixed: Profile link for Lead not working properly in sfa component. (OFBIZ-9497) Updated "Profile" link in LinkTabBar in SfaMenus for roleTypeId. Thanks Aditya Sharma for reporting an providing the patch. Modified: ofbiz/branches/release16.11/tools/ (props changed) Propchange: ofbiz/branches/release16.11/tools/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 20 09:00:16 2017 @@ -0,0 +1,15 @@ +/ofbiz/branches/2013_RemoveJavolution/tools:1462755 +/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools:1535171-1654698 +/ofbiz/branches/OFBIZ-6275/tools:1675394-1675466 +/ofbiz/branches/addbirt/tools:831210-885099,885686-886087 +/ofbiz/branches/boostrap_theme/tools:1635411,1635439,1635465 +/ofbiz/branches/dojo1.4/tools:951708-952957 +/ofbiz/branches/framework-api-cleanup/tools:1619853-1620529 +/ofbiz/branches/jackrabbit20100709/tools:962442-1231517 +/ofbiz/branches/jquery/tools:952958-1044489 +/ofbiz/branches/json-integration-refactoring/tools:1634077-1635900 +/ofbiz/branches/multitenant20100310/tools:921280-927264 +/ofbiz/branches/release13.07/tools:1547657 +/ofbiz/ofbiz-framework/trunk:1802459 +/ofbiz/ofbiz-framework/trunk/tools: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,1801336,1801340,1801359,1801742 +/ofbiz/trunk/tools:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
svn commit: r1802459 - /ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml
Author: pranayp Date: Thu Jul 20 08:50:45 2017 New Revision: 1802459 URL: http://svn.apache.org/viewvc?rev=1802459&view=rev Log: Fixed: Profile link for Lead not working properly in sfa component. (OFBIZ-9497) Updated "Profile" link in LinkTabBar in SfaMenus for roleTypeId. Thanks Aditya Sharma for reporting an providing the patch. Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=1802459&r1=1802458&r2=1802459&view=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/SfaMenus.xml Thu Jul 20 08:50:45 2017 @@ -188,6 +188,7 @@ under the License. +
svn propchange: r1801270 - svn:log
Author: pranayp Revision: 1801270 Modified property: svn:log Modified: svn:log at Sat Jul 8 10:19:06 2017 -- --- svn:log (original) +++ svn:log Sat Jul 8 10:19:06 2017 @@ -1,9 +1,9 @@ -Merged from trunk r1801269. +Applied fix from trunk r1801269. == Fixed: Product specific quantity condition price rule application when quantity is changed in cart (OFBIZ-7263) -Changing item quantity in cart was setting the flag isModifiedPrice true which is conflicting with updatePrice condition and hence price recalculation was not being triggered. Thanks Aditi Patidar for reporting the issue and providing patch. +Changing item quantity in cart was setting the flag isModifiedPrice true which is conflicting with updatePrice condition and hence price recalculation was not being triggered. -Thanks Paul Foxworthy for reviewing the issue and providing the research details. +Thanks Aditi Patidar for reporting the issue and providing patch. Thanks Paul Foxworthy for reviewing the issue and providing the research details. ===
svn propchange: r1801269 - svn:log
Author: pranayp Revision: 1801269 Modified property: svn:log Modified: svn:log at Sat Jul 8 10:17:23 2017 -- --- svn:log (original) +++ svn:log Sat Jul 8 10:17:23 2017 @@ -1 +1,5 @@ -Fixed: Product specific quantity condition price rule application when quantity is changed in cart (OFBIZ-7263) Changing item quantity in cart was setting the flag isModifiedPrice true which is conflicting with updatePrice condition and hence price recalculation was not being triggered. Thanks Aditi Patidar for reporting the issue and providing patch. Thanks Paul Foxworthy for reviewing the issue and providing the research details. +Fixed: Product specific quantity condition price rule application when quantity is changed in cart (OFBIZ-7263) + +Changing item quantity in cart was setting the flag isModifiedPrice true which is conflicting with updatePrice condition and hence price recalculation was not being triggered. + +Thanks Aditi Patidar for reporting the issue and providing patch. Thanks Paul Foxworthy for reviewing the issue and providing the research details.
svn commit: r1801270 - /ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Author: pranayp
Date: Sat Jul 8 09:41:15 2017
New Revision: 1801270
URL: http://svn.apache.org/viewvc?rev=1801270&view=rev
Log:
Merged from trunk r1801269.
==
Fixed: Product specific quantity condition price rule application when quantity
is changed in cart (OFBIZ-7263)
Changing item quantity in cart was setting the flag isModifiedPrice true which
is conflicting with updatePrice condition and hence price recalculation was not
being triggered. Thanks Aditi Patidar for reporting the issue and providing
patch.
Thanks Paul Foxworthy for reviewing the issue and providing the research
details.
===
Modified:
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Modified:
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1801270&r1=1801269&r2=1801270&view=diff
==
---
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
(original)
+++
ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Sat Jul 8 09:41:15 2017
@@ -879,7 +879,6 @@ public class ShoppingCartHelper {
if (item != null) {
item.setBasePrice(quantity); // this is
quantity because the parsed number variable is the same as quantity
item.setDisplayPrice(quantity); // or the
amount shown the cart items page won't be right
-item.setIsModifiedPrice(true); // flag as
a modified price
}
}
}
svn commit: r1801269 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Author: pranayp
Date: Sat Jul 8 09:25:06 2017
New Revision: 1801269
URL: http://svn.apache.org/viewvc?rev=1801269&view=rev
Log:
Fixed: Product specific quantity condition price rule application when quantity
is changed in cart (OFBIZ-7263) Changing item quantity in cart was setting the
flag isModifiedPrice true which is conflicting with updatePrice condition and
hence price recalculation was not being triggered. Thanks Aditi Patidar for
reporting the issue and providing patch. Thanks Paul Foxworthy for reviewing
the issue and providing the research details.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1801269&r1=1801268&r2=1801269&view=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Sat Jul 8 09:25:06 2017
@@ -879,7 +879,6 @@ public class ShoppingCartHelper {
if (item != null) {
item.setBasePrice(quantity); // this is
quantity because the parsed number variable is the same as quantity
item.setDisplayPrice(quantity); // or the
amount shown the cart items page won't be right
-item.setIsModifiedPrice(true); // flag as
a modified price
}
}
}
svn commit: r1779311 - /ofbiz/trunk/README.md
Author: pranayp Date: Wed Jan 18 11:10:36 2017 New Revision: 1779311 URL: http://svn.apache.org/viewvc?rev=1779311&view=rev Log: Improved: Readability of README.md by adding some line breaks. There was a need of huge horizontal scroll in the Security block. Modified: ofbiz/trunk/README.md Modified: ofbiz/trunk/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/README.md?rev=1779311&r1=1779310&r2=1779311&view=diff == --- ofbiz/trunk/README.md (original) +++ ofbiz/trunk/README.md Wed Jan 18 11:10:36 2017 @@ -96,9 +96,12 @@ Apache Tomcat®, Apache Geronimo (tran Security --- -You can trust the OFBiz Project Management Committee members and committers do their best to keep OFBiz secure from external exploits, and fix vulnerabilities as soon as they are known. Despite these efforts, if ever you find and want to report a security issue, please report at: security @ ofbiz.apache.org, before disclosing them in a public forum. +You can trust the OFBiz Project Management Committee members and committers do their best to keep OFBiz secure from external exploits, +and fix vulnerabilities as soon as they are known. Despite these efforts, if ever you find and want to report a security issue, please report +at: security @ ofbiz.apache.org, before disclosing them in a public forum. ->_Note_: Be sure to read this Wiki page if ever you plan to use RMI, JNDI, JMX or Spring and maybe other Java classes OFBiz does not use Out Of The Box (OOTB): [The infamous Java serialization vulnerability](https://cwiki.apache.org/confluence/display/OFBIZ/The+infamous+Java+serialization+vulnerability) +>_Note_: Be sure to read this Wiki page if ever you plan to use RMI, JNDI, JMX or Spring and maybe other Java classes OFBiz does not use +Out Of The Box (OOTB): [The infamous Java serialization vulnerability](https://cwiki.apache.org/confluence/display/OFBIZ/The+infamous+Java+serialization+vulnerability) You can find more information about security in OFBiz at [Keeping OFBiz secure](https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure)
svn commit: r1765047 - in /ofbiz/trunk/applications/humanres/widget/forms: EmplPositionForms.xml GlobalHRSettingForms.xml PayGradeForms.xml
Author: pranayp Date: Sat Oct 15 12:35:27 2016 New Revision: 1765047 URL: http://svn.apache.org/viewvc?rev=1765047&view=rev Log: Improved: HR List forms column alignment. (OFBIZ-8456) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1765047&r1=1765046&r2=1765047&view=diff == --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Oct 15 12:35:27 2016 @@ -99,7 +99,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -135,7 +135,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -168,7 +168,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" list-name="emplPositionReportingStructList" separate-columns="true"> @@ -201,7 +201,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1765047&r1=1765046&r2=1765047&view=diff == --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sat Oct 15 12:35:27 2016 @@ -239,7 +239,7 @@ under the License. +default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=1765047&r1=1765046&r2=1765047&view=diff == --- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sat Oct 15 12:35:27 2016 @@ -60,7 +60,7 @@ +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
svn commit: r1765045 - /ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml
Author: pranayp Date: Sat Oct 15 12:31:48 2016 New Revision: 1765045 URL: http://svn.apache.org/viewvc?rev=1765045&view=rev Log: Reverted: Commit r1765030. Integration test failing, will look into it to correct it and checkin again. Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml?rev=1765045&r1=1765044&r2=1765045&view=diff == --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Sat Oct 15 12:31:48 2016 @@ -400,9 +400,8 @@ under the License. - - - + +
svn commit: r1765043 - in /ofbiz/trunk/applications/product/widget/facility: FacilityForms.xml FacilityGroupForms.xml InventoryItemLabelForms.xml
Author: pranayp Date: Sat Oct 15 12:14:15 2016 New Revision: 1765043 URL: http://svn.apache.org/viewvc?rev=1765043&view=rev Log: Improved: Facility List forms column alignment. (OFBIZ-8480) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1765043&r1=1765042&r2=1765043&view=diff == --- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Sat Oct 15 12:14:15 2016 @@ -601,7 +601,7 @@ under the License. +header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -636,7 +636,7 @@ under the License. +header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml?rev=1765043&r1=1765042&r2=1765043&view=diff == --- ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml Sat Oct 15 12:14:15 2016 @@ -53,7 +53,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -90,7 +90,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -128,7 +128,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml?rev=1765043&r1=1765042&r2=1765043&view=diff == --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml Sat Oct 15 12:14:15 2016 @@ -36,7 +36,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
svn commit: r1765041 - in /ofbiz/trunk/applications/manufacturing/widget/manufacturing: ProductionRunForms.xml RoutingTaskForms.xml
Author: pranayp Date: Sat Oct 15 12:10:22 2016 New Revision: 1765041 URL: http://svn.apache.org/viewvc?rev=1765041&view=rev Log: Improved: Manufacturing List form column alignment. (OFBIZ-8467) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1765041&r1=1765040&r2=1765041&view=diff == --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Sat Oct 15 12:10:22 2016 @@ -602,7 +602,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1765041&r1=1765040&r2=1765041&view=diff == --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Sat Oct 15 12:10:22 2016 @@ -375,7 +375,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
svn commit: r1765040 - in /ofbiz/branches/release14.12: ./ applications/accounting/widget/TaxAuthorityForms.xml
Author: pranayp Date: Sat Oct 15 12:05:41 2016 New Revision: 1765040 URL: http://svn.apache.org/viewvc?rev=1765040&view=rev Log: Applied fix from trunk for revision: 1765038 === Fixed: Pagination error in Accounting TaxAuthorityForms. (OFBIZ-8475) Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/accounting/widget/TaxAuthorityForms.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 15 12:05:41 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426,1757966,1758998,1759028 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,133,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-160,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569-1686570,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,17065 69,1706577,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,17 44396,1744662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,164
svn commit: r1765039 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/TaxAuthorityForms.xml
Author: pranayp Date: Sat Oct 15 12:04:49 2016 New Revision: 1765039 URL: http://svn.apache.org/viewvc?rev=1765039&view=rev Log: Applied fix from trunk for revision: 1765038 === Fixed: Pagination error in Accounting TaxAuthorityForms. (OFBIZ-8475) Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/widget/TaxAuthorityForms.xml Propchange: ofbiz/branches/release15.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 15 12:04:49 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017,1765038 Modified: ofbiz/branches/release15.12/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/TaxAuthorityForms.xml?rev=1765039&r1=1765038&r2=1765039&view=diff == --- ofbiz/branches/release15.12/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/branc
svn commit: r1765038 - /ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
Author: pranayp Date: Sat Oct 15 11:59:25 2016 New Revision: 1765038 URL: http://svn.apache.org/viewvc?rev=1765038&view=rev Log: Fixed: Pagination error in Accounting TaxAuthorityForms. (OFBIZ-8475) Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1765038&r1=1765037&r2=1765038&view=diff == --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Oct 15 11:59:25 2016 @@ -21,7 +21,7 @@ under the License. http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://ofbiz.apache.org/Widget-Form"; xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd";> +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindTaxAuthority"> @@ -72,7 +72,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditTaxAuthorityCategories"> @@ -111,7 +111,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditTaxAuthorityAssocs"> @@ -175,7 +175,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditTaxAuthorityGlAccounts"> @@ -223,7 +223,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditTaxAuthorityRateProducts"> @@ -333,7 +333,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListTaxAuthorityParties">
svn commit: r1765030 - /ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml
Author: pranayp Date: Sat Oct 15 09:50:06 2016 New Revision: 1765030 URL: http://svn.apache.org/viewvc?rev=1765030&view=rev Log: Fixed: InventoryItemStatus logging for reserved serialized inventory item. (OFBIZ-8459) InventoryItemStatus will now be logged as: INV_PROMISED when a serialized inventory item is reserved for an order. Thanks: Vaibhav Jain for the contribution. Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml?rev=1765030&r1=1765029&r2=1765030&view=diff == --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Sat Oct 15 09:50:06 2016 @@ -400,8 +400,9 @@ under the License. - - + + +
svn commit: r1765029 - /ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
Author: pranayp Date: Sat Oct 15 09:34:48 2016 New Revision: 1765029 URL: http://svn.apache.org/viewvc?rev=1765029&view=rev Log: Improved: Accounting-AR List form column alignment. (OFBIZ-8449) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1765029&r1=1765028&r2=1765029&view=diff == --- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Sat Oct 15 09:34:48 2016 @@ -357,7 +357,7 @@ under the License. + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -489,7 +489,7 @@ under the License. -
svn commit: r1765027 - in /ofbiz/branches/release14.12: ./ applications/accounting/widget/PaymentGroupForms.xml
Author: pranayp Date: Sat Oct 15 09:18:03 2016 New Revision: 1765027 URL: http://svn.apache.org/viewvc?rev=1765027&view=rev Log: Applied fix from trunk for revision: 1765017 === Fixed: Pagination error in Accounting PaymentGroupForms. (OFBIZ-8446) Thanks: Chandan Khandelwal for the contribution. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/accounting/widget/PaymentGroupForms.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 15 09:18:03 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426,1757966,1758998,1759028 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,133,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-160,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569-1686570,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,17065 69,1706577,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,17 44396,1744662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,164
svn commit: r1765026 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/PaymentGroupForms.xml
Author: pranayp Date: Sat Oct 15 09:15:41 2016 New Revision: 1765026 URL: http://svn.apache.org/viewvc?rev=1765026&view=rev Log: Applied fix from trunk for revision: 1765017 === Fixed: Pagination error in Accounting PaymentGroupForms. (OFBIZ-8446) Thanks: Chandan Khandelwal for the contribution. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/widget/PaymentGroupForms.xml Propchange: ofbiz/branches/release15.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 15 09:15:41 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017 Modified: ofbiz/branches/release15.12/applications/accounting/widget/PaymentGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/PaymentGroupForms.xml?rev=1765026&r1=1765025&r2=1765026&view=diff == --- ofbiz/branches/release15.12/applications/accounting/widget/PaymentGroupForms.xml (original) +++ ofbiz/branches/release15.12/applications/a
svn commit: r1765017 - /ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
Author: pranayp Date: Sat Oct 15 06:53:16 2016 New Revision: 1765017 URL: http://svn.apache.org/viewvc?rev=1765017&view=rev Log: Fixed: Pagination error in Accounting PaymentGroupForms. (OFBIZ-8446) Thanks: Chandan Khandelwal for the contribution. Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=1765017&r1=1765016&r2=1765017&view=diff == --- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Sat Oct 15 06:53:16 2016 @@ -103,7 +103,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row" separate-columns="true" paginate-target="EditPaymentGroupMember"> @@ -166,7 +166,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="PaymentGroupOverview">
svn commit: r1765012 - /ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
Author: pranayp Date: Sat Oct 15 05:56:30 2016 New Revision: 1765012 URL: http://svn.apache.org/viewvc?rev=1765012&view=rev Log: Improved: QuoteId field visibility in Create and Update Quote process. (OFBIZ-) When creating a new quote, the field quoteId is displayed even though its value is "null". Fixed the behavior adding a use-when condition to display the field when the quote already exists and to hide the field when the quote is being created. Thanks: Montalbano Florian for the contribution and Chandan Khandelwal for reviewing and providing the updated patch. Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1765012&r1=1765011&r2=1765012&view=diff == --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Sat Oct 15 05:56:30 2016 @@ -109,7 +109,8 @@ under the License. - + +
svn commit: r1765011 - in /ofbiz/trunk/applications/accounting/widget: BillingAccountForms.xml BudgetForms.xml FixedAssetForms.xml GlSetupForms.xml InvoiceItemTypeForms.xml PaymentGroupForms.xml Payme
Author: pranayp Date: Sat Oct 15 05:41:01 2016 New Revision: 1765011 URL: http://svn.apache.org/viewvc?rev=1765011&view=rev Log: Improved: Accounting list forms column title alignment. (OFBIZ-8278) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/BudgetForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeForms.xml Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=1765011&r1=1765010&r2=1765011&view=diff == --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sat Oct 15 05:41:01 2016 @@ -158,7 +158,8 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" +paginate-target="EditBillingAccountRoles" separate-columns="true"> Modified: ofbiz/trunk/applications/accounting/widget/BudgetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BudgetForms.xml?rev=1765011&r1=1765010&r2=1765011&view=diff == --- ofbiz/trunk/applications/accounting/widget/BudgetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BudgetForms.xml Sat Oct 15 05:41:01 2016 @@ -133,7 +133,7 @@ under the License. + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1765011&r1=1765010&r2=1765011&view=diff == --- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Sat Oct 15 05:41:01 2016 @@ -126,7 +126,8 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" +paginate-target="ListFixedAssetProducts" separate-columns="true"> @@ -189,7 +190,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -242,7 +243,8 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" +paginate-target="EditFixedAssetIdents" separate-columns="true"> @@ -281,7 +283,8 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" +paginate-target="EditFixedAssetRegistrations" separate-columns="true"> @@ -509,7 +512,8 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" +paginate-target="EditPartyFixedAssetAssignments" separate-columns="true"> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1765011&r1=1765010&r2=1765011&view=diff == --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sat Oct 15 05:41:01 2016 @@ -767,7 +767,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-tabl
svn commit: r1761542 - /ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
Author: pranayp Date: Tue Sep 20 09:34:52 2016 New Revision: 1761542 URL: http://svn.apache.org/viewvc?rev=1761542&view=rev Log: Fix for: Error on update of routing task deliverable product. (OFBIZ-8296) The reason of error was editable fromDate field, corrected the settings with routingProductLink null check to only display or show it editable. Thanks: Amardeep Singh Jhajj for the contribution. Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1761542&r1=1761541&r2=1761542&view=diff == --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Tue Sep 20 09:34:52 2016 @@ -365,7 +365,8 @@ under the License. - + +
svn commit: r1761204 - /ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
Author: pranayp Date: Sat Sep 17 12:20:38 2016 New Revision: 1761204 URL: http://svn.apache.org/viewvc?rev=1761204&view=rev Log: Fix for: Pagination error in Accounting PaymentGatewayConfigForms. (OFBIZ-8280) Added missing paginate-target for PaymentGatewayConfigForms - ListPaymentGatewayConfig and ListPaymentGatewayConfigTypes. Thanks: Chandan Khandelwal for the contribution. Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1761204&r1=1761203&r2=1761204&view=diff == --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Sat Sep 17 12:20:38 2016 @@ -37,7 +37,7 @@ under the License. - + @@ -417,7 +417,7 @@ under the License. - +
svn commit: r1761203 - /ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
Author: pranayp Date: Sat Sep 17 12:15:56 2016 New Revision: 1761203 URL: http://svn.apache.org/viewvc?rev=1761203&view=rev Log: Improved: Add default table style for Payments on ViewGatewayResponse screen. (OFBIZ-8276) Thanks:Mohammed Rehan Khan for the contribution. Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=1761203&r1=1761202&r2=1761203&view=diff == --- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Sat Sep 17 12:15:56 2016 @@ -103,7 +103,7 @@ under the License. - +
svn commit: r1761198 - /ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
Author: pranayp
Date: Sat Sep 17 11:17:47 2016
New Revision: 1761198
URL: http://svn.apache.org/viewvc?rev=1761198&view=rev
Log:
Improved: Removed obsolete popUpPrint functions from OfbizUtil.js.
(OFBIZ-8275)
Thanks: Amardeep Singh Jhajj for the contribution.
Modified:
ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
Modified: ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js?rev=1761198&r1=1761197&r2=1761198&view=diff
==
--- ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js Sat Sep 17 11:17:47
2016
@@ -212,50 +212,6 @@ function popUp(url, name, height, width)
function popUpSmall(url, name) {
popUp(url, name, '300', '450');
}
-function popUpPrint(printserver, screen1) {
-popUpPrint(printserver, screen1, null, null);
-}
-function popUpPrint(printserver, screen1, screen2) {
-popUpPrint(printserver, screen1, screen2, null);
-}
-function popUpPrint(printserver, screen1, screen2, screen3) {
-if (printserver == null) {
-printserver = "http://localhost:10080/";; // default print server port
-}
-
-if (screen1 != null) {
-screen1 = screen1.replace(/\:/g, "%3A");
-screen1 = screen1.replace(/\//g, "%2F");
-screen1 = screen1.replace(/\#/g, "%23");
-screen1 = screen1.replace(/\?/g, "%3F");
-screen1 = screen1.replace(/\=/g, "%3D");
-url = printserver + screen1;
-window.open(url, "screen1",
'location=no,statusbar=1,menubar=0,scrollbars,width=60,height=10,top=0,left=0');
-self.focus();
-
-if (screen2 != null) {
-screen2 = screen2.replace(/\:/g, "%3A");
-screen2 = screen2.replace(/\//g, "%2F");
-screen2 = screen2.replace(/\#/g, "%23");
-screen2 = screen2.replace(/\?/g, "%3F");
-screen2 = screen2.replace(/\=/g, "%3D");
-url = printserver + screen2;
-window.open(url, "screen2",
'location=no,statusbar=1,menubar=0,scrollbars,width=60,height=10,top=0,left=0');
-self.focus();
-
-if (screen3 != null) {
-screen3 = screen3.replace(/\:/g, "%3A");
-screen3 = screen3.replace(/\//g, "%2F");
-screen3 = screen3.replace(/\#/g, "%23");
-screen3 = screen3.replace(/\?/g, "%3F");
-screen3 = screen3.replace(/\=/g, "%3D");
-url = printserver + screen3;
-window.open(url, "screen13",
'location=no,statusbar=1,menubar=0,scrollbars,width=60,height=10,top=0,left=0');
-self.focus();
-}
-}
-}
-}
// Post a form from a pop up using the parent window
function doPostViaParent(formName) {
svn commit: r1761197 - in /ofbiz/trunk/applications/content/widget: compdoc/CompDocForms.xml content/ContentForms.xml contentsetup/ContentSetupForms.xml datasetup/DataSetupForms.xml survey/SurveyForms
Author: pranayp Date: Sat Sep 17 11:13:24 2016 New Revision: 1761197 URL: http://svn.apache.org/viewvc?rev=1761197&view=rev Log: Improved: Content: Aligned column titles in list forms. (OFBIZ-8272) Thanks: Aditi Patidar for reporting and providing the patch. Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1761197&r1=1761196&r2=1761197&view=diff == --- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Sep 17 11:13:24 2016 @@ -307,7 +307,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1761197&r1=1761196&r2=1761197&view=diff == --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Sep 17 11:13:24 2016 @@ -364,7 +364,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -401,7 +401,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -473,7 +473,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -528,7 +528,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml?rev=1761197&r1=1761196&r2=1761197&view=diff == --- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml (original) +++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml Sat Sep 17 11:13:24 2016 @@ -29,7 +29,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -143,7 +143,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> @@ -170,7 +170,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true"> Modified: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml?rev=1761197&r1=1761196&r2=1761197&view=diff == --- ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml (original) +++ ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml Sat Sep 17 11:13:24 2016 @@ -29,7 +29,7 @@ under the License.
svn commit: r1761195 - in /ofbiz/trunk/specialpurpose: ebay/template/find/EbayKeywordSearch.ftl ecommerce/template/cart/ShowCart.ftl ecommerce/template/order/RequestReturn.ftl
Author: pranayp
Date: Sat Sep 17 11:04:58 2016
New Revision: 1761195
URL: http://svn.apache.org/viewvc?rev=1761195&view=rev
Log:
Improved: Ecommerce, Ebay - inline js for toggleAll, checkToggle and selectAll
calling from ftls
(OFBIZ-7931)
Removed inline js for toggleAll, checkToggle and selectAll calling from ftls in
Ecommerce and Ebay component. Add class="selectAll" on parent checkbox element
for select all functionality.
Thanks: Amardeep Singh Jhajj for reporting and providing the patch.
Modified:
ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl
ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl
ofbiz/trunk/specialpurpose/ecommerce/template/order/RequestReturn.ftl
Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl?rev=1761195&r1=1761194&r2=1761195&view=diff
==
--- ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl Sat Sep
17 11:04:58 2016
@@ -39,28 +39,10 @@ under the License.
<#if productIds?has_content>
-
-//<![CDATA[
-function toggleAll(e) {
-var cform = document.products;
-var len = cform.elements.length;
-for (var i = 0; i < len; i++) {
-var element = cform.elements[i];
-if (element.name == "selectResult" && element.checked !=
e.checked) {
-toggle(element);
-}
-}
-}
-
-function toggle(e) {
-e.checked = !e.checked;
-}
-//]]>
-
<#macro paginationPanel>
-
+
${uiLabelMap.ProductProduct}
@@ -88,7 +70,7 @@ under the License.
<@paginationPanel />
-
+
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl?rev=1761195&r1=1761194&r2=1761195&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl Sat Sep 17
11:04:58 2016
@@ -18,35 +18,6 @@ under the License.
-->
svn commit: r1761185 [2/5] - in /ofbiz/trunk/specialpurpose/ebaystore/template: feedback/LeaveFeedback.ftl store/EbayApiKeywordSearch.ftl store/OrderImported.ftl store/ProductSearchExport.ftl store/St
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl?rev=1761185&r1=1761184&r2=1761185&view=diff
==
--- ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl
Sat Sep 17 10:44:25 2016
@@ -50,359 +50,583 @@ under the License.
}
-
-
+
+
-
-Item
-Rate this transaction
-Role
-
-<#assign row = "alternate-row">
-<#assign FeedbackSize = 0>
-<#assign feedbackCounter = 0>
-<#assign role = "">
-<#if parameters.role?has_content>
-<#assign role = parameters.role>
-
-<#list results.itemsAwaitingFeedback as leaveFeedback>
+
+ Item
+ Rate this transaction
+ Role
+
+ <#assign row = "alternate-row">
+ <#assign FeedbackSize = 0>
+ <#assign feedbackCounter = 0>
+ <#assign role = "">
+ <#if parameters.role?has_content>
+<#assign role = parameters.role>
+
+ <#list results.itemsAwaitingFeedback as leaveFeedback>
<#if !leaveFeedback.commentType?has_content>
-<#if parameters.role?has_content &&
parameters.transactionId?has_content && parameters.targetUser?has_content &&
parameters.commentingUser?has_content>
+ <#if parameters.role?has_content &&
parameters.transactionId?has_content
+ && parameters.targetUser?has_content &&
parameters.commentingUser?has_content>
<#if parameters.transactionId == leaveFeedback.transactionID &&
parameters.itemId == leaveFeedback.itemID>
-<#if role == "buyer">
-<#assign feedbackCounter = feedbackCounter + 1>
-<#if row == "">
-<#assign row = "alternate-row">
-<#else>
-<#assign row = "">
-
-
-
-
-
-
-
-
-${leaveFeedback.itemID} - ${leaveFeedback.title}
-http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>order
details
-
-
-
-Positive
-
-
-I'll
leave Feedback later
-
-
-
-80 characters left
-
+ <#if role == "buyer">
+<#assign feedbackCounter = feedbackCounter + 1>
+<#if row == "">
+ <#assign row = "alternate-row">
+<#else>
+ <#assign row = "">
+
+
+
+
+
+
+
+
+ ${leaveFeedback.itemID} - ${leaveFeedback.title}
+ http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>
+order details
+
+
+
+
+
+Positive
+
+
+
+I'll leave Feedback later
+
+
+
+80 characters left
+
+
+
+ Buyer:http://myworld.sandbox.ebay.com/${leaveFeedback.userID}";>${leaveFeedback.userID}
+
+
+ <#else>
+<#assign feedbackCounter = feedbackCounter + 1>
+<#if row == "">
+ <#assign row = "alternate-row">
+<#else>
+ <#assign row = "">
+
+
+
+
+
+
+
+
+ ${leaveFeedback.itemID} - ${leaveFeedback.title}
+ http://payments.sandbox.ebay.com/ws/eBayISAPI.dll?ViewPaymentStatus&transId=${leaveFeedback.transactionID}&ssPageName=STRK:MESOX:VPS&itemid=${leaveFeedback.itemID}";>
+order details
+
+
+
+
+
+Positive
+
svn commit: r1761185 [5/5] - in /ofbiz/trunk/specialpurpose/ebaystore/template: feedback/LeaveFeedback.ftl store/EbayApiKeywordSearch.ftl store/OrderImported.ftl store/ProductSearchExport.ftl store/St
Modified: ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl?rev=1761185&r1=1761184&r2=1761185&view=diff
==
--- ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl Sat
Sep 17 10:44:25 2016
@@ -19,51 +19,64 @@ under the License.
function countAreaChars(areaName, limit, charleft)
{
-if (areaName.value.length > limit){
- areaName.value=areaName.value.substring(0,limit);
-}else{
- charleft.innerHTML = (limit - areaName.value.length) + "
${uiLabelMap.CommonCharactorsLeft}";
+if (areaName.value.length > limit) {
+areaName.value=areaName.value.substring(0,limit);
+} else {
+charleft.innerHTML = (limit - areaName.value.length) + "
${uiLabelMap.CommonCharactorsLeft}";
}
}
-function retrieveThemeColorSchemeByThemeId(url, themeId, productStoreId){
+function retrieveThemeColorSchemeByThemeId(url, themeId, productStoreId) {
var pars = 'themeId='+themeId+'&productStoreId='+productStoreId;
jQuery.ajax({
- url: url,
- type: "GET",
- data: pars,
- beforeStart: function() {document.getElementById('loading').innerHTML
= ' ${uiLabelMap.CommonPleaseWait}';},
- success: function(data) {
+url: url,
+type: "GET",
+data: pars,
+beforeStart: function() {
+document.getElementById('loading').innerHTML = '
${uiLabelMap.CommonPleaseWait}';
+},
+success: function(data) {
if (data != null && data.storeColorSchemeMap){
var resp = eval("("+data.storeColorSchemeMap+")");
-if (resp.storeColorPrimary!=null)
document.getElementById('storePrimaryColor').value = resp.storeColorPrimary;
-if (resp.storeColorAccent!=null)
document.getElementById('storeSecondaryColor').value = resp.storeColorAccent;
-if (resp.storeColorSecondary!=null)
document.getElementById('storeAccentColor').value = resp.storeColorSecondary;
-
-if (resp.storeFontTypeFontFaceValue!=null) selectOption(
document.getElementById('storeNameFont'),resp.storeFontTypeFontFaceValue);
-if (resp.storeFontTypeNameFaceColor!=null)
document.getElementById('storeNameFontColor').value =
resp.storeFontTypeNameFaceColor;
-if (resp.storeFontTypeSizeFaceValue!=null) selectOption(
document.getElementById('storeNameFontSize'), resp.storeFontTypeSizeFaceValue);
-
-if (resp.storeFontTypeTitleColor!=null)
document.getElementById('storeTitleFontColor').value =
resp.storeFontTypeTitleColor;
-if (resp.storeFontTypeFontTitleValue!=null) selectOption(
document.getElementById('storeTitleFont'),resp.storeFontTypeFontTitleValue);
-if (resp.storeFontSizeTitleValue!=null) selectOption(
document.getElementById('storeTitleFontSize'),resp.storeFontSizeTitleValue);
-
-if (resp.storeFontTypeDescColor!=null)
document.getElementById('storeDescFontColor').value =
resp.storeFontTypeDescColor;
-if (resp.storeFontTypeFontDescValue!=null) selectOption(
document.getElementById('storeDescFont'),resp.storeFontTypeFontDescValue);
-if (resp.storeDescSizeValue!=null) selectOption(
document.getElementById('storeDescFontSize'),resp.storeDescSizeValue);
+if (resp.storeColorPrimary!=null)
+document.getElementById('storePrimaryColor').value =
resp.storeColorPrimary;
+if (resp.storeColorAccent!=null)
+ document.getElementById('storeSecondaryColor').value =
resp.storeColorAccent;
+if (resp.storeColorSecondary!=null)
+document.getElementById('storeAccentColor').value =
resp.storeColorSecondary;
+
+if (resp.storeFontTypeFontFaceValue!=null)
+selectOption(
document.getElementById('storeNameFont'),resp.storeFontTypeFontFaceValue);
+if (resp.storeFontTypeNameFaceColor!=null)
+document.getElementById('storeNameFontColor').value =
resp.storeFontTypeNameFaceColor;
+if (resp.storeFontTypeSizeFaceValue!=null)
+selectOption(
document.getElementById('storeNameFontSize'), resp.storeFontTypeSizeFaceValue);
+
+if (resp.storeFontTypeTitleColor!=null)
+document.getElementById('storeTitleFontColor').value =
resp.storeFontTypeTitleColor;
+if (resp.storeFontTypeFontTitleValue!=null)
+
svn commit: r1761185 [3/5] - in /ofbiz/trunk/specialpurpose/ebaystore/template: feedback/LeaveFeedback.ftl store/EbayApiKeywordSearch.ftl store/OrderImported.ftl store/ProductSearchExport.ftl store/St
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl?rev=1761185&r1=1761184&r2=1761185&view=diff
==
---
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl
Sat Sep 17 10:44:25 2016
@@ -22,23 +22,24 @@ under the License.
function selectChange(formId, elementId) {
if (elementId.id == 'searchCatalogId') {
if (document.getElementById('searchCategoryId').selectedIndex) {
-
document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value
= "";
- } else {
- document.getElementById('searchCategoryId').value = "";
- }
+document.getElementById('searchCategoryId')[document
+.getElementById('searchCategoryId').selectedIndex].value = "";
+} else {
+document.getElementById('searchCategoryId').value = "";
+}
}
formId.action="<@ofbizUrl>main";
formId.submit();
}
function submit (id) {
- var formId = id;
- if(!jQuery('#searchCatalogId').is(":empty")){
- document.getElementById(formId).submit();
- } else {
- if(jQuery('#searchCatalogId').is(":empty")) {
- jQuery('#catalogErrorMessage').fadeIn("fast");
- }
- }
+var formId = id;
+if(!jQuery('#searchCatalogId').is(":empty")){
+document.getElementById(formId).submit();
+} else {
+if(jQuery('#searchCatalogId').is(":empty")) {
+jQuery('#catalogErrorMessage').fadeIn("fast");
+}
+}
}
//]]>
@@ -47,55 +48,68 @@ under the License.
${uiLabelMap.ProductAdvancedSearchInCategory}
-
-
+
+
-
-${uiLabelMap.ProductCatalog}:
-
-
-
-
-<#list prodCatalogList as prodCatalog>
- <#assign displayDesc =
prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") />
+
+ ${uiLabelMap.ProductCatalog}:
+
+
+
+
+ <#list prodCatalogList as prodCatalog>
+<#assign displayDesc =
prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") />
+<#if (18 < displayDesc?length)>
+ <#assign displayDesc = displayDesc[0..15] + "...">
+
+
+selected="selected">${displayDesc}
[${prodCatalog.prodCatalogId}]
+
+
+
+
+ ${uiLabelMap.CommonRequired}
+
+
+
+
+
+
+ ${uiLabelMap.ProductCategory}:
+
+
+
+<#if categoryIds?has_content>
+
+- ${uiLabelMap.ProductAnyCategory}
-
+<#list categoryIds as categoryId>
+ <#assign productCategory =
+ delegator.findOne("ProductCategory",
{"productCategoryId" : categoryId}, true) />
+ <#assign displayDesc =
+
productCategory.categoryName?default("${uiLabelMap.ProductNoDescription}") />
<#if (18 < displayDesc?length)>
<#assign displayDesc = displayDesc[0..15] + "...">
-
selected="selected">${displayDesc} [${prodCatalog.prodCatalogId}]
+
+${displayDesc} [${productCategory.productCategoryId}]
+
- ${uiLabelMap.CommonRequired}
-
-
-
-
-
-${uiLabelMap.ProductCategory}:
-
-
-
- <#if categoryIds?has_content>
-
- - ${uiLabelMap.ProductAnyCategory}
-
- <#list categoryIds as categoryId>
-<#assign productCategory =
delegator.findOne("ProductCategory", {"productCategoryId" : categoryId}, true)
/>
-<#assign displayDesc =
productCategory.categoryName?default("${uiLabelMap.ProductNoDescription}") />
-<#if (18 < displayDesc?length)>
- <#assign disp
svn commit: r1761185 [4/5] - in /ofbiz/trunk/specialpurpose/ebaystore/template: feedback/LeaveFeedback.ftl store/EbayApiKeywordSearch.ftl store/OrderImported.ftl store/ProductSearchExport.ftl store/St
Modified:
ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl?rev=1761185&r1=1761184&r2=1761185&view=diff
==
--- ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl
Sat Sep 17 10:44:25 2016
@@ -64,7 +64,7 @@ under the License.
- function retrieveEbayCategoryByParent(url,cateId,productStoreId,id){
+function retrieveEbayCategoryByParent(url,cateId,productStoreId,id){
if (cateId.match('true')){
return true;
}
@@ -85,7 +85,7 @@ under the License.
removeOptions(id);
var resp = eval(data.categories);
var leng = resp.length;
- if (leng) {
+if (leng) {
for (i=0;iebayAdItemTemplate';
@@ -118,23 +118,25 @@ under the License.
var j = 0;
for (i=0;i
-Export
Products Listing
-
-
+
+ Items to export
+
+Clear
Listing
+
+ <#if isExportValid?? && isExportValid == "true">
+
+
+Export Products Listing
+
+
+
+
+
-
-
-
-
-<#if addItemObj?has_content>
-
-
-
- <#assign id = 1>
- <#if contentList?has_content>
- <#list contentList as content>
- <#if !isProductId?has_content>
-class="selected" <#assign
isProductId = content.product.productId!><#else>id="tabHeader${id}">${content.product.productName!}[${content.product.productId}]
- <#else>
-class="selected" <#assign isProductId =
content.product.productId!><#else>id="tabHeader${id}">${content.product.productName!}[${content.product.productId}]
-
- <#assign id = id+1>
-
-
svn commit: r1761185 [1/5] - in /ofbiz/trunk/specialpurpose/ebaystore/template: feedback/LeaveFeedback.ftl store/EbayApiKeywordSearch.ftl store/OrderImported.ftl store/ProductSearchExport.ftl store/St
Author: pranayp Date: Sat Sep 17 10:44:25 2016 New Revision: 1761185 URL: http://svn.apache.org/viewvc?rev=1761185&view=rev Log: Improved: Ebaystore FTL formatting. (OFBIZ-7864) No functional change, corrected FTL code formatting to improve readability. Thanks: Vaibhav Jain for reporting and providing the patch. Modified: ofbiz/trunk/specialpurpose/ebaystore/template/feedback/LeaveFeedback.ftl ofbiz/trunk/specialpurpose/ebaystore/template/store/EbayApiKeywordSearch.ftl ofbiz/trunk/specialpurpose/ebaystore/template/store/OrderImported.ftl ofbiz/trunk/specialpurpose/ebaystore/template/store/ProductSearchExport.ftl ofbiz/trunk/specialpurpose/ebaystore/template/store/StoreSetting.ftl
svn commit: r1761182 - in /ofbiz/trunk/applications/product/template: facility/ feature/ find/ inventory/ product/ returns/ shipment/
Author: pranayp
Date: Sat Sep 17 10:36:33 2016
New Revision: 1761182
URL: http://svn.apache.org/viewvc?rev=1761182&view=rev
Log:
Improved: Product: Remove inline js for toggleAll, checkToggle and selectAll
calling from ftls
(OFBIZ-7896)
Remove inline js for toggleAll, checkToggle and selectAll calling from ftls in
Product component, instead added class="selectAll" on parent checkbox element
for select all functionality.
Thanks: Amardeep Singh Jhajj for the contribution.
Modified:
ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl
ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Modified: ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==
--- ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
(original)
+++ ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl Sat
Sep 17 10:36:33 2016
@@ -59,7 +59,7 @@ under the License.
${uiLabelMap.CommonConfirm}
${uiLabelMap.ProductSelectAll}
-
+
<#if moveByOisgirInfoList?has_content ||
moveByPflInfoList?has_content>
@@ -91,7 +91,7 @@ under the License.
-
+
<#assign rowCount = rowCount + 1>
@@ -125,7 +125,7 @@ under the License.
-
+
<#assign rowCount = rowCount + 1>
@@ -184,4 +184,4 @@ under the License.
-
\ No newline at end of file
+
Modified: ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==
--- ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
(original)
+++ ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl Sat
Sep 17 10:36:33 2016
@@ -21,8 +21,8 @@ under the License.
${uiLabelMap.ProductAddProductFeatureInBulk}
${uiLabelMap.CommonFor} ${featureCategory.description}
+
-
@@ -31,7 +31,7 @@ under the License.
${uiLabelMap.ProductFeatureType}
${uiLabelMap.ProductIdSeqNum}
${uiLabelMap.ProductIdCode}
-${uiLabelMap.CommonAll}
+${uiLabelMap.CommonAll}
<#assign rowClass = "2">
<#list 0..featureNum-1 as feature>
@@ -46,7 +46,7 @@ under the License.
-
+
<#-- toggle the row color -->
<#if rowClass == "2">
@@ -57,8 +57,8 @@ under the License.
-
+
Modified:
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==
---
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
(original)
+++
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
Sat Sep 17 10:36:33 2016
@@ -81,7 +81,7 @@ under the License.
${uiLabelMap.ProductIdSeqNum}
svn commit: r1761180 - in /ofbiz/trunk/applications/order/template: entry/cart/Javascript.ftl entry/cart/ShowCartItems.ftl return/ReturnItemInc.ftl
Author: pranayp Date: Sat Sep 17 10:32:21 2016 New Revision: 1761180 URL: http://svn.apache.org/viewvc?rev=1761180&view=rev Log: Improved: Order: Remove inline js for toggleAll, checkToggle and selectAll calling from ftls. (OFBIZ-7896) Remove inline js for toggleAll, checkToggle and selectAll calling from ftls in Order component instead, added class="selectAll" on parent checkbox element for select all functionality. Thanks: Amardeep Singh Jhajj for the contribution. Modified: ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl Modified: ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl?rev=1761180&r1=1761179&r2=1761180&view=diff == --- ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl Sat Sep 17 10:32:21 2016 @@ -17,35 +17,6 @@ specific language governing permissions under the License. -->
svn commit: r1761177 - /ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
Author: pranayp
Date: Sat Sep 17 10:22:24 2016
New Revision: 1761177
URL: http://svn.apache.org/viewvc?rev=1761177&view=rev
Log:
Implemented: One generic functionality for select all checkbox by removing
currently written multiple functionality.
(OFBIZ-7720)
Did not remove usage of old functions as of now, these changes will come in
upcoming commits.
Thanks: Amardeep Singh Jhajj for the contribution.
Modified:
ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
Modified: ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js?rev=1761177&r1=1761176&r2=1761177&view=diff
==
--- ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/OfbizUtil.js Sat Sep 17 10:22:24
2016
@@ -23,6 +23,94 @@ var LAST_AUTOCOMP_REF = null;
//default ajax request timeout in milliseconds
var AJAX_REQUEST_TIMEOUT = 5000;
+// Add observers on DOM ready.
+$(document).ready(function() {
+// bindObservers will add observer on passed html section when DOM is
ready.
+bindObservers("body");
+});
+
+/* bindObservers function contains the code of adding observers and it can be
called for specific section as well
+ when we need to add observer on section which is updated by Ajax.
+ Example: bindObservers("sectionSelector");
+ sectionSelector can be Id, Class and Element name.
+*/
+function bindObservers(bind_element) {
+
+// Adding observer for checkboxes for select all action.
+jQuery(bind_element).on("click", "[type=checkbox]", function() {
+var action_checkbox = jQuery(this),
+parent_action = action_checkbox.is(".selectAll") ? action_checkbox
: action_checkbox.getForm().getFormFields().filter(".selectAll");
+if (parent_action.length !== 0) {
+addSelectAllObserver(action_checkbox);
+}
+});
+
+// If parent checkbox is already checked on DOM ready then check its child
checkboxes also.
+if (jQuery(".selectAll").is(":checked")) {
+jQuery(".selectAll").removeAttr("checked").trigger("click");
+}
+}
+
+/* SelectAll: This utility can be used when we need to use parent and child
box combination over any page. Here is the list of tasks it will do:
+ 1. Check/ Uncheck child checkboxes when parent checkbox checked.
+ 2. Check/ Uncheck parent checkbox when child checkboxes checked.
+*/
+
+// addSelectAllObserver: This function will add observers to checkboxes which
belongs to select all functionality.
+function addSelectAllObserver(action_checkbox) {
+var form_fields = jQuery(action_checkbox).getForm().getFormFields(),
+all_child =
form_fields.filter(":checkbox:not(:disabled):not(.selectAll)"),
+select_child = all_child.filter(".selectAllChild").size() > 0 ?
all_child.filter(".selectAllChild") : all_child,
+parent_checkbox = form_fields.filter(".selectAll"),
+is_parent = action_checkbox.is(".selectAll");
+
+if (is_parent) {
+// Check/ Uncheck child checkboxes when parent checked.
+jQuery(select_child).attr("checked", function() {
+return parent_checkbox.is(":checked");
+});
+} else {
+// Check/ Uncheck parent checkbox when child checkboxes checked.
+if (select_child.size() > 0) {
+var all_checked = true;
+
+select_child.each(function() {
+if (all_checked) {
+all_checked = all_checked && jQuery(this).is(":checked");
+}
+});
+
+// Below code is for checking or unchecking the parent checkbox if
all its dependent child checkbox is checked.
+if (all_checked) {
+parent_checkbox.attr("checked", "checked");
+} else {
+parent_checkbox.removeAttr("checked");
+}
+}
+}
+}
+
+// getFormFields: This utility function return all form fields (inside and
outside form)
+jQuery.fn.getFormFields = function() {
+var id = jQuery(this).attr("id");
+if (id === undefined) {
+return jQuery(this).find(":input");
+} else {
+return jQuery.merge(jQuery(this).find(":input"), jQuery(":input[form="
+ id + "]"));
+}
+}
+
+// getForm: This utility function return form of the field.
+jQuery.fn.getForm = function() {
+var form_id = jQuery(this).attr("form");
+// Get closest form if no form id specified else get the form using id.
+if (form_id === undefined) {
+return jQuery(this).closest("form");
+} else {
+return jQuery("#" + form_id);
+}
+}
+
// Check Box Select/Toggle Functions for Select/Toggle All
function toggle(e) {
svn commit: r1761174 - in /ofbiz/trunk/applications/product/widget/catalog: ProdCatalogForms.xml ProductForms.xml ReviewForms.xml StoreForms.xml SubscriptionForms.xml
Author: pranayp Date: Sat Sep 17 10:08:36 2016 New Revision: 1761174 URL: http://svn.apache.org/viewvc?rev=1761174&view=rev Log: Improved: Catalog: Align column titles in list forms. (OFBIZ-8260) Thanks: Aditi Patidar for the contribution. Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1761174&r1=1761173&r2=1761174&view=diff == --- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sat Sep 17 10:08:36 2016 @@ -102,7 +102,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -140,7 +140,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -162,7 +162,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProdCatalogCategories" separate-columns="true"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1761174&r1=1761173&r2=1761174&view=diff == --- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Sep 17 10:08:36 2016 @@ -476,7 +476,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductPrices" separate-columns="true"> @@ -549,7 +549,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -578,7 +578,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -1567,7 +1567,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -1619,7 +1619,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -1922,7 +1922,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -1956,7 +1956,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -2044,7 +2044,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -2125,7 +2125,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -2140,7 +2140,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> @@ -2242,7 +2242,7 @@ under the License. +odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true"> Modified: ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applica
svn commit: r1761173 - in /ofbiz/branches/release13.07: ./ applications/accounting/widget/FixedAssetForms.xml
Author: pranayp Date: Sat Sep 17 09:59:43 2016 New Revision: 1761173 URL: http://svn.apache.org/viewvc?rev=1761173&view=rev Log: Applied fix from trunk for revision: 1761170 === Fix for: Pagination error in Accounting FixedAssetForms. (OFBIZ-8263) Added paginate target to these forms for fixing the issue. Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/accounting/widget/FixedAssetForms.xml Propchange: ofbiz/branches/release13.07/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 17 09:59:43 2016 @@ -6,4 +6,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 /ofbiz/branches/release15.12:1745714 -/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,151,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1534062,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,154,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311, 1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,16121 90,1612202,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626425,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,16 63979,1664602,1664604,133,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-160,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998,1686566,1686569,1686574,1686583,1686635,1686651,1687427,1690086,1692458,1693579,1696018,1696234,1697993,1701164,1702704,1703121,1703586,1703965,1703977,1703981,1704000,1704018,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1706694,1707837,1708341,1708742,1710178,1710348,1711513,1714244,1714410,1714571,1714657,1715477,1715501,1717058,1717180,1717682,1717760,1718023,1718109,1719094,1720883,1721067,1721625,1722712,1724402,1724916,1724918,1724925,1724943,1724946,1724978,1726828,1729609,1729809,1730735,1730882,1731359,1732721,1733951,1733956,1734246,1734269,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735773,1736083,1736272 ,1736434,1736851,1736854,1738235,1738303,1740008,1740629,1741146,1741563,1741684,1742737,1742741,1743025,1743027,1743230,174
svn commit: r1761172 - in /ofbiz/branches/release14.12: ./ applications/accounting/widget/FixedAssetForms.xml
Author: pranayp Date: Sat Sep 17 09:58:42 2016 New Revision: 1761172 URL: http://svn.apache.org/viewvc?rev=1761172&view=rev Log: Applied fix from trunk for revision: 1761170 === Fix for: Pagination error in Accounting FixedAssetForms. (OFBIZ-8263) Added paginate target to these forms for fixing the issue. Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/accounting/widget/FixedAssetForms.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 17 09:58:42 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426,1757966,1758998,1759028 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,133,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-160,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1761127 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,164
svn commit: r1761171 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/FixedAssetForms.xml
Author: pranayp Date: Sat Sep 17 09:57:54 2016 New Revision: 1761171 URL: http://svn.apache.org/viewvc?rev=1761171&view=rev Log: Applied fix from trunk for revision: 1761170 === Fix for: Pagination error in Accounting FixedAssetForms. (OFBIZ-8263) Added paginate target to these forms for fixing the issue. Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml Propchange: ofbiz/branches/release15.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 17 09:57:54 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1761127 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1761127,1761170 Modified: ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml?rev=1761171&r1=1761170&r2=1761171&view=diff == --- ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml Sat Sep 17 09:57:54 2016 @@ -125,7 +12
svn commit: r1761170 - /ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
Author: pranayp Date: Sat Sep 17 09:54:33 2016 New Revision: 1761170 URL: http://svn.apache.org/viewvc?rev=1761170&view=rev Log: Fix for: Pagination error in Accounting FixedAssetForms. (OFBIZ-8263) Added paginate target to these forms for fixing the issue. Thanks: Chandan Khandelwal for reporting and providing the patch. Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1761170&r1=1761169&r2=1761170&view=diff == --- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Sat Sep 17 09:54:33 2016 @@ -126,7 +126,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="ListFixedAssetProducts"> @@ -242,7 +242,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditFixedAssetIdents"> @@ -281,7 +281,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditFixedAssetRegistrations"> @@ -470,7 +470,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditFixedAssetMaintOrders"> @@ -509,7 +509,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="EditPartyFixedAssetAssignments"> @@ -590,7 +590,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="showFixedAssetDepreciation"> @@ -610,7 +610,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="showFixedAssetDepreciation"> @@ -618,7 +618,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" list-name="fixedAssetTransactions" paginate-target="showFixedAssetDepreciation"> @@ -704,7 +704,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="showFixedAssetDepreciation"> @@ -724,7 +724,7 @@ under the License. +odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="showFixedAssetDepreciation">
svn commit: r1761156 - in /ofbiz/trunk: applications/content/data/ContentTypeData.xml specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml specialpurpose/cmssite/data/CmsSiteDemoData.xml
Author: pranayp Date: Sat Sep 17 08:15:20 2016 New Revision: 1761156 URL: http://svn.apache.org/viewvc?rev=1761156&view=rev Log: Implemented: Multisite support in specialpurpose/cmssite (OFBIZ-7120) Second patch for providing demo data for multisite feature. Thanks Mohammed Rehan Khan for the contribution. Added: ofbiz/trunk/specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1761156&r1=1761155&r2=1761156&view=diff == --- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Sat Sep 17 08:15:20 2016 @@ -187,6 +187,7 @@ under the License. + Added: ofbiz/trunk/specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml?rev=1761156&view=auto == --- ofbiz/trunk/specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml (added) +++ ofbiz/trunk/specialpurpose/cmssite/data/CmsMultiSiteDemoData.xml Sat Sep 17 08:15:20 2016 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=1761156&r1=1761155&r2=1761156&view=diff == --- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Sat Sep 17 08:15:20 2016 @@ -19,7 +19,8 @@ under the License. --> - + + @@ -94,6 +95,8 @@ under the License. Demo Page with blog using screen decorator Demo Page with an xml resource formatted with a template ftl resource The ofbiz public documents +WebSite 1 +WebSite 2 ]]> @@ -227,5 +230,5 @@ under the License. - +
svn commit: r1761155 - in /ofbiz/trunk/specialpurpose/cmssite/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/ofbiz/ main/java/org/apache/ofbiz/cmssite/ main/java/or
Author: pranayp
Date: Sat Sep 17 08:12:25 2016
New Revision: 1761155
URL: http://svn.apache.org/viewvc?rev=1761155&view=rev
Log:
Implemented: Multisite support in specialpurpose/cmssite
(OFBIZ-7120)
Adding missing files from last commit r1761150.
Thanks Mohammed Rehan Khan for the contribution.
Added:
ofbiz/trunk/specialpurpose/cmssite/src/
ofbiz/trunk/specialpurpose/cmssite/src/main/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java
Added:
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java?rev=1761155&view=auto
==
---
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java
(added)
+++
ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/MultiSiteRequestWrapper.java
Sat Sep 17 08:12:25 2016
@@ -0,0 +1,412 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
***/
+package org.apache.ofbiz.cmssite.multisite;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
+
+import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.UtilHttp;
+
+
+public class MultiSiteRequestWrapper implements HttpServletRequest {
+
+private final HttpServletRequest request;
+
+public MultiSiteRequestWrapper(HttpServletRequest request) {
+this.request = request;
+}
+
+@Override
+public String changeSessionId() { return request.changeSessionId(); }
+
+@Override
+public String getAuthType() {
+return request.getAuthType();
+}
+
+@Override
+public String getContextPath() {
+return request.getContextPath();
+}
+
+@Override
+public Cookie[] getCookies() {
+return request.getCookies();
+}
+
+@Override
+public long getDateHeader(String arg0) {
+return request.getDateHeader(arg0);
+}
+
+@Override
+public String getHeader(String arg0) {
+return request.getHeader(arg0);
+}
+
+@Override
+public Enumeration getHeaderNames() {
+return request.getHeaderNames();
+}
+
+@Override
+public Enumeration getHeaders(String arg0) {
+return request.getHeaders(arg0);
+}
+
+@Override
+public int getIntHeader(String arg0) {
+return request.getIntHeader(arg0);
+}
+
+@Override
+public String getMethod() {
+return request.getMethod();
+}
+
+@Override
+public String getPathInfo() {
+
svn commit: r1761150 - in /ofbiz/trunk: applications/content/src/main/java/org/apache/ofbiz/content/cms/ applications/datamodel/entitydef/ framework/webapp/src/main/java/org/apache/ofbiz/webapp/contro
Author: pranayp
Date: Sat Sep 17 08:03:19 2016
New Revision: 1761150
URL: http://svn.apache.org/viewvc?rev=1761150&view=rev
Log:
Implemented: Multisite support in specialpurpose/cmssite
(OFBIZ-7120)
This is the first patch from the ticket and is for the implementation done to
support the multisite feature in specialpurpose/cmssite component.
Thanks Mohammed Rehan Khan for the contribution.
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
ofbiz/trunk/applications/datamodel/entitydef/product-entitymodel.xml
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
ofbiz/trunk/specialpurpose/cmssite/ofbiz-component.xml
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
Modified:
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java?rev=1761150&r1=1761149&r2=1761150&view=diff
==
---
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
(original)
+++
ofbiz/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
Sat Sep 17 08:03:19 2016
@@ -66,6 +66,8 @@ public class CmsEvents {
LocalDispatcher dispatcher = (LocalDispatcher)
request.getAttribute("dispatcher");
ServletContext servletContext =
request.getSession().getServletContext();
HttpSession session = request.getSession();
+Writer writer = null;
+Locale locale = UtilHttp.getLocale(request);
String webSiteId = (String) session.getAttribute("webSiteId");
if (webSiteId == null) {
@@ -97,6 +99,26 @@ public class CmsEvents {
String pathInfo = null;
+String displayMaintenancePage = (String)
session.getAttribute("displayMaintenancePage");
+if (UtilValidate.isNotEmpty(displayMaintenancePage) &&
"Y".equalsIgnoreCase(displayMaintenancePage)) {
+try {
+writer = response.getWriter();
+GenericValue webSiteContent =
EntityQuery.use(delegator).from("WebSiteContent").where("webSiteId", webSiteId,
"webSiteContentTypeId", "MAINTENANCE_PAGE").filterByDate().queryFirst();
+if (webSiteContent != null) {
+ContentWorker.renderContentAsText(dispatcher, delegator,
webSiteContent.getString("contentId"), writer, null, locale, "text/html", null,
null, true);
+return "success";
+} else {
+request.setAttribute("_ERROR_MESSAGE_", "Not able to
display maintenance page for [" + webSiteId + "]");
+return "error";
+}
+} catch (GenericEntityException e) {
+Debug.logError(e, module);
+} catch (IOException e) {
+throw new GeneralRuntimeException(String.format("Error in the
response writer/output stream while rendering content [%s]", contentId), e);
+} catch (GeneralException e) {
+throw new GeneralRuntimeException(String.format("Error
rendering content [%s]", contentId), e);
+}
+} else {
// If an override view is present then use that in place of
request.getPathInfo()
String overrideViewUri = (String)
request.getAttribute("_CURRENT_CHAIN_VIEW_");
if (UtilValidate.isNotEmpty(overrideViewUri)) {
@@ -114,8 +136,8 @@ public class CmsEvents {
} // if called through the default request, there is no request in
pathinfo
}
-// if path info is null; check for a default content
-if (pathInfo == null) {
+// if path info is null or path info is / (i.e application mounted on
root); check for a default content
+if (pathInfo == null || "/".equals(pathInfo)) {
GenericValue defaultContent = null;
try {
defaultContent =
EntityQuery.use(delegator).from("WebSiteContent")
@@ -169,9 +191,6 @@ public class CmsEvents {
}
}
-// process through CMS -- using the mapKey (for now)
-Locale locale = UtilHttp.getLocale(request);
-
// get the contentId/mapKey from URL
if (contentId == null) {
if (Debug.verboseOn()) Debug.logVerbose("Current PathInfo: " +
pathInfo, module);
@@ -267,7 +286,7 @@ public class CmsEvents {
response.setStatus(statusCode);
try {
-Writer writer = response.getWriter()
svn commit: r1761135 [6/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl
Sat Sep 17 07:17:15 2016
@@ -22,12 +22,14 @@ under the License.
<#-- looping macro -->
<#macro categoryList parentCategory category wrapInBox>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
+ catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")??>
<#assign categoryName =
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")>
<#else>
<#assign categoryName = category.categoryName!>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
+ catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")??>
<#assign categoryDescription =
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")>
<#else>
<#assign categoryDescription = category.description!>
@@ -41,53 +43,69 @@ under the License.
- <#if
categoryDescription?has_content>${categoryDescription}<#else>${categoryName?default("")}
+
+<#if categoryDescription?has_content>
+ ${categoryDescription}
+<#else>
+ ${categoryName?default("")}
+
+
-
- <#if parentCategory?has_content>
-<#assign parentCategoryId = parentCategory.productCategoryId/>
- <#else>
-<#assign parentCategoryId = ""/>
-
- <#if
categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}
+
+<#if parentCategory?has_content>
+ <#assign parentCategoryId = parentCategory.productCategoryId/>
+<#else>
+ <#assign parentCategoryId = ""/>
+
+
+ <#if categoryName?has_content>
+${categoryName}
+ <#else>
+${categoryDescription?default("")}
+
+
- <#if
(Static["org.apache.ofbiz.product.category.CategoryWorker"].checkTrailItem(request,
category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId
== category.productCategoryId)>
-<#local subCatList =
Static["org.apache.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request,
"subCatList", category.getString("productCategoryId"), true)>
-<#if subCatList??>
- <#list subCatList as subCat>
-
- <@categoryList parentCategory=category category=subCat
wrapInBox="N"/>
-
-
+<#if (Static["org.apache.ofbiz.product.category.CategoryWorker"]
+.checkTrailItem(request, category.getString("productCategoryId"))) ||
+(curCategoryId?? && curCategoryId == category.productCategoryId)>
+ <#local subCatList =
Static["org.apache.ofbiz.product.category.CategoryWorker"]
+ .getRelatedCategoriesRet(request, "subCatList",
category.getString("productCategoryId"), true)>
+ <#if subCatList??>
+<#list subCatList as subCat>
+
+<@categoryList parentCategory=category category=subCat
wrapInBox="N"/>
+
+
+
-
<#if wrapInBox == "Y">
+
-
<#if topLevelList?has_content>
-
-
-
- ${uiLabelMap.ProductBrowseCategories}
-
-
-
-
-
- <#list topLevelList as category>
-<@categoryList parentCategory="" category=category wrapInBox="N"/>
-
-
+
+
+
+${uiLabelMap.ProductBrowseCategories}
+
+
+
+
+
+<#list topLevelList as category>
+ <@categoryList parentCategory="" category=category wrapInBox="N"/>
+
+
+
-
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl Sat
Sep 17 07:17:15 2016
@@ -18,49 +18,51 @@ under the License.
-->
-
- ${uiLabelMap
svn commit: r1761135 [10/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/t
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl
Sat Sep 17 07:17:15 2016
@@ -23,16 +23,17 @@ under the License.
-->
<#if recipientName??>${recipientName},
-
+
<#-- MyCompany.com (not a variable why?) must be adapted - JLR 1/6/5 -->
-${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com <#if senderName??>
${uiLabelMap.EcommerceGiftCardFrom} ${senderName}!
-
+${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com
+<#if senderName??> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}!
+
<#if giftMessage?has_content>
${uiLabelMap.OrderGiftMessage}
-
+
${giftMessage}
-
+
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl Sat
Sep 17 07:17:15 2016
@@ -37,16 +37,16 @@ under the License.
<#if processResult>
<#-- success -->
-
+
${uiLabelMap.EcommerceYourGiftCard} ${displayNumber}
${uiLabelMap.EcommerceYourGiftCardReloaded}
-
+
${uiLabelMap.EcommerceGiftCardNewBalance} ${amount} ${uiLabelMap.CommonFrom}
${previousAmount}
-
+
<#else>
<#-- fail -->
-
+
${uiLabelMap.EcommerceGiftCardReloadFailed} ${responseCode}
-
+
${uiLabelMap.EcommerceGiftCardRefunded}
-
+
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl
Sat Sep 17 07:17:15 2016
@@ -17,129 +17,127 @@ specific language governing permissions
under the License.
-->
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml";>
-
-${title!}
-<#-- this needs to be fully qualified to appear in email; the server must
also be available -->
-
-html, body, div, h1, h3, a, ul,
-li, table, tbody, tfoot, thead,
-tr, th, td {
-border:0;
-margin:0;
-outline:0;
-padding:0;
-font-size: 100%;
-background:transparent;
-vertical-align: baseline;
-}
-
-a, body, th {
-font-style: normal;
-font-weight: normal;
-text-decoration: none;
-}
-
-body, th {
-text-align: left;
-}
-
-ul {
-list-style: none;
-}
-
-div.screenlet {
-background-color: #FF;
-border: 0.1em solid #99;
-height: auto !important;
-height: 1%;
-margin-bottom: 1em;
-}
-
-body {
-background: #D4D0C8;
-font-size: 62.5%;
-position: relative;
-line-height: 1;
-color: black;
-font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-h1 {
-font-size: 1.6em;
-font-weight: bold;
-}
-
-h3 {
-font-size: 1.1em;
-font-weight: bold;
-}
-
-/* IE7 fix */
-table {
-font-size: 1em;
-}
-
-div.screenlet ul {
-margin: 10px;
-}
-
-div.screenlet li {
-line-height: 15px;
-}
-
-div.screenlet h3 {
-background:#1C334D none repeat scroll 0 0;
-color:#FF;
-height:auto !important;
-padding:3px 4px 4px;
-}
-
-.columnLeft {
-width: 45%;
-float: left;
-margin-right: 10px;
-}
-
-.columnRight {
-width: 45%;
-float: left;
-margin-left: 10px;
-clear: none;
-}
-
-div.screenlet table {
-width: 100%;
-margin: 10px;
-}
-
-div.screenlet table tfoot th {
-text-align: right;
-font-weight: bold;
-}
-
svn commit: r1761135 [12/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/t
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/order/OnePageCheckoutProcess.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OnePageCheckoutProcess.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
---
ofbiz/trunk/specialpurpose/ecommerce/template/order/OnePageCheckoutProcess.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/template/order/OnePageCheckoutProcess.ftl
Sat Sep 17 07:17:15 2016
@@ -19,482 +19,606 @@ under the License.
<#assign shoppingCart = sessionAttributes.shoppingCart! />
- ${uiLabelMap.OrderCheckout}
-<#if shoppingCart?has_content && shoppingCart.size() > 0>
-
-
-<#--
==
-->
-
-
${screens.render("component://ecommerce/widget/CartScreens.xml#UpdateCart")}
-
+${uiLabelMap.OrderCheckout}
+ <#if shoppingCart?has_content && shoppingCart.size() > 0>
+
+
+<#--
==
-->
+
+
${screens.render("component://ecommerce/widget/CartScreens.xml#UpdateCart")}
+
-<#--
==
-->
-
- ${uiLabelMap.EcommerceStep} 2:
${uiLabelMap.FacilityShipping}
-
-${uiLabelMap.EcommerceClickHereToEdit}
-
-
-
- ${uiLabelMap.OrderShipTo}
-
-
-
-
-
-
-
- ${uiLabelMap.EcommerceLocation}
-
-
-
-
-
-
-
-
+<#--
==
-->
+
+${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}
+
+
+${uiLabelMap.EcommerceClickHereToEdit}
+
+
+
+
+${uiLabelMap.OrderShipTo}
+
+
+
+
+
+
+
+${uiLabelMap.EcommerceLocation}
+
+
+
+
+
+
+
+
-<#-- = -->
-
-
-
-
-
-
-
-
-
-
- <#if userLogin??>
-
-
-
-<#assign productStoreId =
Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)
/>
-
- <#else>
-
-
-
-
-
-${uiLabelMap.PartyFirstName}*
- (${uiLabelMap.CommonRequired})
-
-
-
-
-${uiLabelMap.PartyLastName}*
- (${uiLabelMap.CommonRequired})
-
-
-
-
-
- <#if shipToTelecomNumber?has_content>
-
- ${uiLabelMap.CommonCountry}*
- (${uiLabelMap.CommonRequired})
-
- -
-
-
- ${uiLabelMap.PartyAreaCode}*
- (${uiLabelMap.CommonRequired})
-
- -
-
-
- ${uiLabelMap.PartyContactNumber}*
- (${uiLabelMap.CommonRequired})
-
- -
-
-
- ${uiLabelMap.PartyExtension}
-
-
- <#else>
-
- ${uiLabelMap.CommonCountry}*
- (${uiLabelMap.CommonRequired})
-
- -
-
-
svn commit: r1761135 [2/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl Sat Sep 17
07:17:15 2016
@@ -17,514 +17,662 @@ specific language governing permissions
under the License.
-->
-//addBulkToShoppingList";
+cform.submit();
}
-}
-}
-function removeSelected() {
-var cform = document.cartform;
-cform.removeSelected.value = true;
-cform.submit();
-}
-function addToList() {
-var cform = document.cartform;
-cform.action = "<@ofbizUrl>addBulkToShoppingList";
-cform.submit();
-}
-function gwAll(e) {
-var cform = document.cartform;
-var len = cform.elements.length;
-var selectedValue = e.value;
-if (selectedValue == "") {
-return;
-}
-
-var cartSize = ${shoppingCartSize};
-var passed = 0;
-for (var i = 0; i < len; i++) {
-var element = cform.elements[i];
-var ename = element.name;
-var sname = ename.substring(0,16);
-if (sname == "option^GIFT_WRAP") {
-var options = element.options;
-var olen = options.length;
-var matching = -1;
-for (var x = 0; x < olen; x++) {
-var thisValue = element.options[x].value;
-if (thisValue == selectedValue) {
-element.selectedIndex = x;
-passed++;
+function gwAll(e) {
+var cform = document.cartform;
+var len = cform.elements.length;
+var selectedValue = e.value;
+if (selectedValue == "") {
+return;
+}
+
+var cartSize = ${shoppingCartSize};
+var passed = 0;
+for (var i = 0; i < len; i++) {
+var element = cform.elements[i];
+var ename = element.name;
+var sname = ename.substring(0,16);
+if (sname == "option^GIFT_WRAP") {
+var options = element.options;
+var olen = options.length;
+var matching = -1;
+for (var x = 0; x < olen; x++) {
+var thisValue = element.options[x].value;
+if (thisValue == selectedValue) {
+element.selectedIndex = x;
+passed++;
+}
+}
}
svn commit: r1761135 [9/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
---
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl
Sat Sep 17 07:17:15 2016
@@ -23,46 +23,64 @@ under the License.
-${uiLabelMap.PartyContactInformation}
-
- ${uiLabelMap.PartyFirstName}*(${uiLabelMap.CommonRequired})
-
-
-
- ${uiLabelMap.PartyLastName}*(${uiLabelMap.CommonRequired})
-
-
-
- ${uiLabelMap.CommonEmail}*
-(${uiLabelMap.CommonRequired})
-${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}
-
-
-
+ ${uiLabelMap.PartyContactInformation}
+
+
+ ${uiLabelMap.PartyFirstName}*
+
+(${uiLabelMap.CommonRequired})
+
+
+
+
+
+
+ ${uiLabelMap.PartyLastName}*
+
+(${uiLabelMap.CommonRequired})
+
+
+
+
+
+${uiLabelMap.CommonEmail}*
+
+(${uiLabelMap.CommonRequired})
+
+
+${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}
+
+
+
+
-${uiLabelMap.EcommerceAccountInformation}
-
- ${uiLabelMap.CommonUsername}*
- disabled="disabled" />
-
-
- ${uiLabelMap.CommonCurrentPassword}*
-
-
-
- ${uiLabelMap.CommonNewPassword}*
-
-
-
- ${uiLabelMap.CommonNewPasswordVerify}*
-
-
+ ${uiLabelMap.EcommerceAccountInformation}
+
+${uiLabelMap.CommonUsername}*
+disabled="disabled" />
+
+
+${uiLabelMap.CommonCurrentPassword}*
+
+
+
+${uiLabelMap.CommonNewPassword}*
+
+
+
+${uiLabelMap.CommonNewPasswordVerify}*
+
+
- ${uiLabelMap.CommonCancel}
+
+${uiLabelMap.CommonCancel}
+
\ No newline at end of file
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
---
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl
Sat Sep 17 07:17:15 2016
@@ -20,28 +20,36 @@ under the License.
-
-
-<#assign productStoreId =
Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)
/>
-
+
+
+<#assign productStoreId =
Static["org.apache.ofbiz.product.store.ProductStoreWorker"]
+.getProductStoreId(request) />
+
${uiLabelMap.PartyAddressLine1}*
-
- (${uiLabelMap.CommonRequired})
+
+
+(${uiLabelMap.CommonRequired})
+
${uiLabelMap.PartyAddressLine2}
-
+
${uiLabelMap.PartyCity}*
-
- (${uiLabelMap.CommonRequired})
+
+
+(${uiLabelMap.CommonRequired})
+
${uiLabelMap.PartyZipCode}*
-
- (${uiLabelMap.CommonRequired})
+
+ (${uiLabelMap.CommonRequired})
${uiLabelMap.CommonCountry}*
@@ -51,13 +59,22 @@ under the License.
${screens.render("component://common/widget/CommonScreens.xml#countries")}
- (${uiLabelMap.CommonRequired})
+ (${uiLabelMap.CommonRequired})
+
- ${uiLabelMap.PartyState}*(${uiLabelMap.CommonRequired})
+
+${uiLabelMap.PartyState}*
+
+ (${uiLabelMap.CommonRequired})
+
+
<#if shipToStateProvinceGeoId?has_content>
- ${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}
+
+${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}
+
<#else>
${uiLabelMap.PartyNoState}
@@ -70,22 +87,29 @@ under the License.
(${uiLabelMap.CommonRequired})
-
-
--
--
--
+
+
+-
+-
+-
${uiLabelMap.EcommerceMyDefaultBillingAddress}
- checked="checked" />
+ checked=
svn commit: r1761135 [5/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl Sat
Sep 17 07:17:15 2016
@@ -335,584 +335,766 @@ $(function(){
-<#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
-<#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
-<#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
-<#assign productAdditionalImage4 =
productContentWrapper.get("ADDITIONAL_IMAGE_4", "url")! />
-
- <#-- Category next/previous -->
- <#if category??>
-
-<#if previousProductId??>
- ${uiLabelMap.CommonPrevious} |
-
-${(category.categoryName)?default(category.description)!}
-<#if nextProductId??>
- | ${uiLabelMap.CommonNext}
-
-
+ <#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
+ <#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
+ <#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
+ <#assign productAdditionalImage4 =
productContentWrapper.get("ADDITIONAL_IMAGE_4", "url")! />
+
+ <#-- Category next/previous -->
+ <#if category??>
+
+ <#if previousProductId??>
+${uiLabelMap.CommonPrevious} |
+
+ ${(category.categoryName)?default(category.description)!}
+ <#if nextProductId??> |
+${uiLabelMap.CommonNext}
-
-
-
+
+
+
+
+
+<#if productImageList?has_content>
+ <#-- Product image/name/price -->
+
+<#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL", "url")! />
+<#-- remove the next two lines to always display the virtual image
first (virtual images must exist) -->
+<#if firstLargeImage?has_content>
+ <#assign productLargeImageUrl = firstLargeImage />
+
+<#if productLargeImageUrl?string?has_content>
+
+
+
+
+
+<#if !productLargeImageUrl?string?has_content>
+
+
+
+ <#-- Show Image Approved -->
+
<#if productImageList?has_content>
-<#-- Product image/name/price -->
-
-<#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL", "url")! />
-<#-- remove the next two lines to always display the virtual
image first (virtual images must exist) -->
-<#if firstLargeImage?has_content>
-<#assign productLargeImageUrl = firstLargeImage />
-
-<#if productLargeImageUrl?string?has_content>
-
-
-
-<#if !productLargeImageUrl?string?has_content>
-
-
-
-<#-- Show Image Approved -->
-
-<#if productImageList?has_content>
-<#list productImageList as productImage>
-
-
-
-
-
-
-<#else>
-<#-- Product image/name/price -->
-
-<#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL", "url")! />
-<#-- remove the next two lines to always display the virtual
image first (virtual images must exist) -->
-<#if firstLargeImage?has_content>
-<#assign productLargeImageUrl = firstLargeImage />
-
-<#if productLargeImageUrl?string?has_content>
-
-
-
-<#if !productLargeImageUrl?string?has_content>
-
-
-
-
-<#if productAdditionalImage1?string?has_content>
-
-
-
-
-<#if productAdditionalImage2?string?has_content>
-
-
-
-
-<#if productAdditionalImage3?string?has_content>
-
-
-
-
-<#if productAdditionalImage4?string?has_content>
-
-
-
svn commit: r1761135 [13/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/t
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl Sat Sep
17 07:17:15 2016
@@ -26,288 +26,304 @@ under the License.
<#-- left side -->
-
-
-
-<#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y"
&& (orderHeader.statusId)! == "ORDER_COMPLETED" && roleTypeId! ==
"PLACING_CUSTOMER">
- makeReturn?orderId=${orderHeader.orderId}"
class="submenutextright">${uiLabelMap.OrderRequestReturn}
-
-${uiLabelMap.OrderOrder}
-<#if orderHeader?has_content>
- ${uiLabelMap.CommonNbr}orderstatus?orderId=${orderHeader.orderId}"
class="lightbuttontext">${orderHeader.orderId}
-
-${uiLabelMap.CommonInformation}
-<#if (orderHeader.orderId)??>
- ${externalOrder!} [ order.pdf?orderId=${(orderHeader.orderId)!}"
target="_BLANK" class="lightbuttontext">PDF ]
-
-
- <#-- placing customer information -->
-
-<#if localOrderReadHelper?? && orderHeader?has_content>
- <#assign displayParty = localOrderReadHelper.getPlacingParty()!/>
- <#if displayParty?has_content>
-<#assign displayPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId",
displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin",
userLogin))/>
+
+
+
+ <#if maySelectItems?default("N") == "Y" && returnLink?default("N") ==
"Y" && (orderHeader.statusId)! == "ORDER_COMPLETED" && roleTypeId! ==
"PLACING_CUSTOMER">
+makeReturn?orderId=${orderHeader.orderId}"
+class="submenutextright">${uiLabelMap.OrderRequestReturn}
-
-${uiLabelMap.PartyName}
-${(displayPartyNameResult.fullName)?default("[Name Not Found]")}
-
-
-<#-- order status information -->
-
- ${uiLabelMap.CommonStatus}
+ ${uiLabelMap.OrderOrder}
<#if orderHeader?has_content>
-${localOrderReadHelper.getStatusString(locale)}
- <#else>
-${uiLabelMap.OrderNotYetOrdered}
+${uiLabelMap.CommonNbr}
+orderstatus?orderId=${orderHeader.orderId}"
+class="lightbuttontext">${orderHeader.orderId}
-
-<#-- ordered date -->
-<#if orderHeader?has_content>
-
-${uiLabelMap.CommonDate}
-${orderHeader.orderDate.toString()}
-
-
-<#if distributorId??>
-
-${uiLabelMap.OrderDistributor}
-${distributorId}
-
-
-
-
-
-
- <#if paymentMethods?has_content || paymentMethodType?has_content ||
billingAccount?has_content>
-<#-- order payment info -->
-${uiLabelMap.AccountingPaymentInformation}
-<#-- offline payment address infomation :: change this to use Company's
address -->
-
- <#if !paymentMethod?has_content && paymentMethodType?has_content>
+ ${uiLabelMap.CommonInformation}
+ <#if (orderHeader.orderId)??>
+${externalOrder!} [ order.pdf?orderId=${(orderHeader.orderId)!}"
+target="_BLANK" class="lightbuttontext">PDF ]
+
+
+ <#-- placing customer information -->
+
+<#if localOrderReadHelper?? && orderHeader?has_content>
+ <#assign displayParty = localOrderReadHelper.getPlacingParty()!/>
+ <#if displayParty?has_content>
+<#assign displayPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId",
displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin",
userLogin))/>
+
+
+${uiLabelMap.PartyName}
+${(displayPartyNameResult.fullName)?default("[Name Not Found]")}
+
+
+<#-- order status information -->
- <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE">
-${uiLabelMap.AccountingOfflinePayment}
-<#if orderHeader?has_content && paymentAddress?has_content>
- ${uiLabelMap.OrderSendPaymentTo}:
- <#if
paymentAddress.toName?has_content>${paymentAddress.toName}
- <#if
paymentAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}:
${paymentAddress.attnName}
- ${paymentAddress.address1}
- <#if
paymentAddress.address2?has_content>${paymentAddress.address2}
- <#assign paymentStateGeo = (delegator.findOne("Geo", {"geoId",
paymentAddress.stateProvinceGeoId!}, false))! />
- ${paymentAddress.city}<#if paymentStateGeo?has_content>,
${paymentStateGeo.geoName!} ${paymentAddress.postalCode!}
- <#assign paymentCountryGeo = (delegato
svn commit: r1761135 [11/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/t
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl Sat
Sep 17 07:17:15 2016
@@ -18,276 +18,357 @@ under the License.
-->
-function shipBillAddr() {
+ function shipBillAddr() {
<#if requestParameters.singleUsePayment?default("N") == "Y">
<#assign singleUse = "&singleUsePayment=Y">
<#else>
<#assign singleUse = "">
if (document.billsetupform.useShipAddr.checked) {
-
window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}&useShipAddr=Y${singleUse}");
+
window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}&useShipAddr=Y${singleUse}");
} else {
-
window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}${singleUse}");
+
window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}${singleUse}");
}
-}
+ }
-
-
-<#if requestParameters.singleUsePayment?default("N") != "Y">
-
-${screens.render(anonymoustrailScreen)}
-
-
+
+
+ <#if requestParameters.singleUsePayment?default("N") != "Y">
+
+ ${screens.render(anonymoustrailScreen)}
-${uiLabelMap.AccountingPaymentInformation}
+
-
-<#if (paymentMethodType?? && !requestParameters.resetType?has_content)
|| finalizeMode?default("") == "payment">
- <#-- after initial screen; show detailed screens for selected type
-->
- <#if paymentMethodType == "CC">
-<#if creditCard?has_content && postalAddress?has_content>
-
-
-
-<#elseif requestParameters.useShipAddr??>
-
-<#else>
-
-
-
- <#if paymentMethodType == "EFT">
-<#if eftAccount?has_content && postalAddress?has_content>
-
-
-
-<#elseif requestParameters.useShipAddr??>
-
-<#else>
-
-
-
- <#if paymentMethodType == "GC">
-
-
+${uiLabelMap.AccountingPaymentInformation}
+
+
+<#if (paymentMethodType?? && !requestParameters.resetType?has_content) ||
finalizeMode?default("") == "payment">
+ <#-- after initial screen; show detailed screens for selected type -->
+ <#if paymentMethodType == "CC">
+<#if creditCard?has_content && postalAddress?has_content>
+
+
+
+<#elseif requestParameters.useShipAddr??>
+
+<#else>
+
+
+
+ <#if paymentMethodType == "EFT">
+<#if eftAccount?has_content && postalAddress?has_content>
+
+
+
+<#elseif requestParameters.useShipAddr??>
+
+<#else>
+
+
+
+ <#if paymentMethodType == "GC">
+
+
+
+ <#if requestParameters.singleUsePayment?default("N") == "Y">
+
+
+
+
+
+
+
+
+
+ <#if requestParameters.useShipAddr??>
+
+
+
+
+<#if cart.getShippingContactMechId()?? && paymentMethodType != "GC">
+
+
+ checked="checked"/>
+
+
+ ${uiLabelMap.FacilityBillingAddressSameShipping}
+
+
+
+
+
+
+
+
- <#if requestParameters.singleUsePayment?default("N") == "Y">
-
-
-
+<#if (paymentMethodType == "CC" || paymentMethodType == "EFT")>
+
+
+ ${uiLabelMap.PartyBillingAddress}
+
+
+
+
+
${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")}
+
-
-
-
-
-
- <#if requestParameters.useShipAddr??>
-
+<#-- credit card fields -->
+<#if paymentMethodType == "CC">
+ <#if !creditCard?has_content>
+<#assign creditCard = requestParameters>
svn commit: r1761135 [7/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl
Sat Sep 17 07:17:15 2016
@@ -17,27 +17,30 @@ specific language governing permissions
under the License.
-->
<#if canNotView>
- ${uiLabelMap.PartyContactInfoNotBelongToYou}.
- ${uiLabelMap.CommonBack}
+${uiLabelMap.PartyContactInfoNotBelongToYou}.
+${uiLabelMap.CommonBack}
<#else>
<#if !contactMech??>
-<#-- When creating a new contact mech, first select the type, then
actually create -->
+ <#-- When creating a new contact mech, first select the type, then actually
create -->
<#if !requestParameters.preContactMechTypeId?? && !preContactMechTypeId??>
${uiLabelMap.PartyCreateNewContactInfo}
-
-
- ${uiLabelMap.PartySelectContactType}:
-
-
- <#list contactMechTypes as contactMechType>
-${contactMechType.get("description",locale)}
-
- ${uiLabelMap.CommonCreate}
-
-
-
+
+
+${uiLabelMap.PartySelectContactType}:
+
+
+<#list contactMechTypes as contactMechType>
+
+${contactMechType.get("description",locale)}
+
+
+
+ ${uiLabelMap.CommonCreate}
+
+
+
<#-- ERROR: Contact information with ID "${contactMechId}" not
found! -->
@@ -46,80 +49,95 @@ under the License.
<#if contactMechTypeId??>
<#if !contactMech??>
- ${uiLabelMap.PartyCreateNewContactInfo}
- ${uiLabelMap.CommonGoBack}
- ${uiLabelMap.CommonSave}
-
-
-
-
- <#if contactMechPurposeType??>
-(${uiLabelMap.PartyNewContactHavePurpose}
"${contactMechPurposeType.get("description",locale)!}")
-
- <#if cmNewPurposeTypeId?has_content>
- <#if preContactMechTypeId?has_content>
- <#if paymentMethodId?has_content>
+${uiLabelMap.PartyCreateNewContactInfo}
+${uiLabelMap.CommonGoBack}
+${uiLabelMap.CommonSave}
+
+
+
+
+ <#if contactMechPurposeType??>
+(${uiLabelMap.PartyNewContactHavePurpose}
"${contactMechPurposeType.get("description",locale)!}")
+
+ <#if cmNewPurposeTypeId?has_content>
+
+
+ <#if preContactMechTypeId?has_content>
+
+
+ <#if paymentMethodId?has_content>
+
+
<#else>
- ${uiLabelMap.PartyEditContactInfo}
+ ${uiLabelMap.PartyEditContactInfo}
${uiLabelMap.CommonGoBack}
${uiLabelMap.CommonSave}
-
-
- ${uiLabelMap.PartyContactPurposes}
-
-
-
- <#list partyContactMechPurposes! as partyContactMechPurpose>
-<#assign contactMechPurposeType =
partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
-
-
-<#if contactMechPurposeType??>
- ${contactMechPurposeType.get("description",locale)}
-<#else>
- ${uiLabelMap.PartyPurposeTypeNotFound}:
"${partyContactMechPurpose.contactMechPurposeTypeId}"
-
-
(${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
-<#if
partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})
-
-
-
-
-
-
-
-
- ${uiLabelMap.CommonDelete}
-
-
-
-
-
- <#if purposeTypes?has_content>
+
+
+${uiLabelMap.PartyContactPurposes}
+
+
+
+<#list partyContactMechPurposes! as partyContactMechPurpose>
+ <#assign contactMechPurposeType =
partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
+
+
+ <#if contactMechPurposeType??>
+ ${contactMechPurposeType.get("description",locale)}
+ <#else>
+ ${uiLabelMap.PartyPurposeTypeNotFound}:
"${partyContactMechPurpose.contactMechPurposeTypeId}"
+
+
svn commit: r1761135 [8/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl
Sat Sep 17 07:17:15 2016
@@ -19,48 +19,72 @@ under the License.
<#assign delegator = requestAttributes.delegator>
<#if communicationEvent.partyIdFrom??>
-<#assign fromName =
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdFrom, true)>
+ <#assign fromName =
+
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdFrom, true)>
<#if communicationEvent.partyIdTo??>
-<#assign toName =
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdTo, true)>
+ <#assign toName =
+
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdTo, true)>
-
-
-<#if (communicationEvent.partyIdFrom! != (userLogin.partyId)!)>
- ${uiLabelMap.PartyReply}
-
-${uiLabelMap.EcommerceViewList}
-
-${uiLabelMap.EcommerceReadMessage}
-
-
-
-
-
- ${uiLabelMap.CommonFrom}:
- ${fromName!}
-
-
- ${uiLabelMap.CommonTo}:
- ${toName!}
-
-
- ${uiLabelMap.CommonDate}:
- ${communicationEvent.entryDate}
-
-
- ${uiLabelMap.EcommerceSubject}:
-
${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}
-
-
-
-
-
-
${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}
-
-
-
+
+
+<#if (communicationEvent.partyIdFrom! != (userLogin.partyId)!)>
+ ${uiLabelMap.PartyReply}
+
+
+ ${uiLabelMap.EcommerceViewList}
+${uiLabelMap.EcommerceReadMessage}
+
+
+
+
+
+
+
+
+ ${uiLabelMap.CommonFrom}:
+
+
+ ${fromName!}
+
+
+
+
+ ${uiLabelMap.CommonTo}:
+
+
+ ${toName!}
+
+
+
+
+ ${uiLabelMap.CommonDate}:
+
+
+ ${communicationEvent.entryDate}
+
+
+
+
+ ${uiLabelMap.EcommerceSubject}:
+
+
+
${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}
+
+
+
+
+
+
+
+
+
${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}
+
+
+
+
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl Sat
Sep 17 07:17:15 2016
@@ -19,67 +19,97 @@ under the License.
<#macro showMessage communicationEvent isSentMessage index>
<#if communicationEvent.partyIdFrom?has_content>
-<#assign partyNameFrom =
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdFrom, true)>
+<#assign partyNameFrom =
+
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdFrom, true)>
<#else>
<#assign partyNameFrom = "${uiLabelMap.CommonNA}">
<#if communicationEvent.partyIdTo?has_content>
-<#assign partyNameTo =
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdTo, true)>
+<#assign partyNameTo =
+
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
communicationEvent.partyIdTo, true)>
<#else>
<#assign partyNameTo = "${uiLabelMap.CommonNA}">
-
-${partyNameFrom}
-${partyNameTo}
-${communicationEvent.subject?default("")}
-${communicationEvent.entryDate}
-
-
-
-
- ${uiLabelMap.EcommerceRead}
-
- <#if
svn commit: r1761135 [1/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Author: pranayp Date: Sat Sep 17 07:17:15 2016 New Revision: 1761135 URL: http://svn.apache.org/viewvc?rev=1761135&view=rev Log: Improved: E-commerce : FTL formatting. (OFBIZ-7949) For improved FTL code readability. Here is the first patch for the effort. There are still files which are required to be formatted. Thanks: Vaibhav Jain for the contribution. Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/DetailImage.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LastViewedProducts.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LayeredCategoryDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LayeredNavBar.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniAssocProds.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastProductSearches.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastViewedCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastViewedProducts.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniProductSummary.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniReOrderProds.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/PopularTags.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductCategoryLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductReview.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ShowBestSellingCategory.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cust
svn commit: r1761135 [3/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/te
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
--- ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl Sat
Sep 17 07:17:15 2016
@@ -18,28 +18,30 @@ under the License.
-->
<#assign catalogCol =
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogIdsAvailable(request)!>
<#assign currentCatalogId =
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)!>
-<#assign currentCatalogName =
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
currentCatalogId)!>
+<#assign currentCatalogName =
+
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
currentCatalogId)!>
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when
there is only one option... -->
<#if (catalogCol?size > 1)>
-
-
-
- ${uiLabelMap.ProductChooseCatalog}
-
-
+
+
+
+${uiLabelMap.ProductChooseCatalog}
+
+
+
+
+
+
+ ${currentCatalogName}
+
+ <#list catalogCol as catalogId>
+<#assign thisCatalogName =
+
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
catalogId)>
+${thisCatalogName}
+
+
+
+
-
-
-
-${currentCatalogName}
-
-<#list catalogCol as catalogId>
- <#assign thisCatalogName =
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
catalogId)>
- ${thisCatalogName}
-
-
-
-
-
Modified:
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==
---
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl
Sat Sep 17 07:17:15 2016
@@ -24,341 +24,380 @@ under the License.
<#-- virtual product javascript -->
${virtualJavaScript!}
-