144 Commits
Author SHA1 Message Date
Deepak Dixit 4bef6dd715 Updated code as per lucene dependency update (OFBIZ-12100) 2021-01-04 14:43:07 +05:30
Deepak Dixit 1c355bb6d8 Updated lucene and solr dependecy to fix the test case failure related to tika-parser dependency update(OFBIZ-12100) (#48) 2021-01-04 12:45:22 +05:30
Jacques Le Roux 581c68f3c6 Fixed: Issue: Displaying company and product information at product backlog, subcomponent of Scrum Application
(OFBIZ-)

Steps to regenerate:
    Navigate to Applications
    Scrum
    Click on '+ Add product'
    Enter: Company and Product Owner
    Product Name
    Description

Issue: the information given in 4, 5, 6 steps are not displayed at the
Product backlog (view product) screen.

Thanks: Dikpal Kanungo for report and Anushi Gupta for the fix
2020-12-28 11:55:31 +01:00
Jacques Le Roux 96e2deea3b Fixed: Lucene TopScoreDocCollector::create wrong call the 2 in Search.groovy scripts (OFBIZ-12087)
I guess it's due to an update of Lucene, easy fix

# Conflicts:
#	ecommerce/groovyScripts/content/Search.groovy
2020-12-07 13:22:12 +01:00
Jacques Le Roux aff4aa19ff * Fixed: Secure the uploads (OFBIZ-12080)
2020/08/10 the OFBiz security team received a security report by Harshit Shukla
<harshit.shukz@gmail.com>, roughly it was (quoting part of it to simplify):

<<I have identified a Remote Code Execution (RCE) Vulnerability. The reason
behind this RCE is lack of file extension check at
catalog/control/UploadCategoryImage?productCategoryId=CATALOG1_BEST_SELL&pload_file_type=category>>

Using this post-auth RCE in OFBiz demos, Harshit was able to get some AWS
credentials by uploading a webshell (based on [0]).
By security, it was then decided by the Infra and OFBiz security teams to shut
down the demos.

After discussing the elements reported with Mark J Cox (VP of ASF security team)
we in common decided that no CVE was necessary.

# Conflicts handled by hand:
#	birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
2020-12-01 09:55:46 +01:00
Saurabh Dixit 819be88570 Fixed: Product summary cards don't have uniform height. (OFBIZ-11910) (#46)
Done following:
1. Used bootstrap card-deck to equalize the height/width of all the product summary cards.

Reference:
https://v4-alpha.getbootstrap.com/components/card/#card-decks

Thanks Guys: Alex Bodnaru for report and suggestion, Saurabh Dixit for the patch, and Daniel Watford for the test
# Conflicts:
#	ecommerce/template/catalog/ProductSummary.ftl
2020-11-30 11:39:18 +01:00
Jacques Le Roux feef385e7e Fixed: Wrong quote marks (OFBIZ-11972)
Thanks: Alex Bodnaru
2020-10-06 16:03:44 +02:00
Jacques Le Roux 128c252942 Fixed: Flexible reports use an old noNamespaceSchemaLocation (OFBIZ-12039)
While working on using flexible reports during this discussion
(https://markmail.org/message/qgebmemkqb6ddgzw)
I found this kind of errors in log:

XmlFileLoader: File Internal Content process error. Line: 20. Error message:
TargetNamespace.2: Expecting no namespace, but the schema document has a target
 namespace of 'http://ofbiz.apache.org/Widget-Form'.

Turned out that it was due to an old use of noNamespaceSchemaLocation when
dynamically creating forms.

The fix is to use the same definition than in current forms.

Thanks: Georg Potthast for starting the discussion

# Conflicts handled by hand
#	birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
#	birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
2020-10-04 12:04:07 +02:00
holivier eadffa215b Improved: Error messages when generating HTML and PDF file from AsciiDoc files (OFBIZ-11893)
re-encode birt image Report-Master.png to be supported by asciidoctor
2020-10-02 18:34:40 +02:00
Akash Jain 39494e6a57 Fixed: Error on removing scrum members (OFBIZ-7249)
Thanks, Anurag Chandak for report.
2020-09-01 15:21:14 +05:30
Suraj Khurana b52a5e85e2 Fixed: Typo in class name.
(OFBIZ-11978)
Thanks Alex Bodnaru for reporting and providing the patch.
2020-09-01 15:12:55 +05:30
Jacques Le Roux 1ada36d74d Fixed: display/selection of unit of measure is broken/plugins (OFBIZ-11993)
Allows selection of uom for multiple products on the same web page

Thanks: Alex
2020-08-31 10:08:15 +02:00
Jacques Le Roux c903c71aa8 Fixed: multiflex css is linking to wrong location (OFBIZ-11977)
Thanks: Alex
2020-08-30 11:19:34 +02:00
Akash Jain e6e7351309 Fixed: Distorted Final Checkout Review page when Credit card is selected as Payment option (OFBIZ-11920)
Thanks, Rashi Dhagat for reporting.
2020-08-25 21:24:49 +05:30
Akash Jain 2386d02960 Fixed: Product link on Order confirmation page is not responding (OFBIZ-11735)
Thanks, Rashi Dhagat for reporting.
2020-08-03 18:36:58 +05:30
Aditya Sharma 486f1d8a59 Fixed: ui for the product summary in promotion product list (OFBIZ-11906)
The product summary in the row is too slim, leaving 75% of the place unused.
Added CSS that forces to take 100% width
Thanks Alex Bodnaru for reporting and providing the patch
2020-07-24 16:08:46 +05:30
Jacques Le Roux d335f7890f Improved: Rename a few map files (OFBIZ-11882)
Renames a few files to suppress warnings in the browser console.

Thanks: Alex Bodnaru
2020-07-23 09:12:13 +02:00
Pawan Verma 1a8410f98b Fixed: Send me this every month link is not working in order items section(OFBIZ-10891)
Thanks, Ashish for the report, Vivek for lookup and Amit for the patch.
2020-07-11 10:32:51 +05:30
Jacques Le Roux 6d87d52388 Fixed: Error while uploading file in Ecommerce Profile's File Manager (OFBIZ-10746)
This is only fixing the UI where you did not see the file to upload you selected

There is still an issue to upload the file

Changes done by hand, impossible to cherry-pick

Thanks: Priya Sharma for testing
2020-06-23 14:56:32 +02:00
Jacques Le Roux 76775e4a7c Improved: adds pull_request_template.md (OFBIZ-11722) 2020-05-31 09:48:15 +02:00
Pawan Verma 369088d732 Fixed: Improve the buttons on edit credit card page
(OFBIZ-10975)

Thanks: Sourabh and Suraj for your contribution.
2020-05-10 14:14:04 +05:30
Pawan Verma 3e312acc68 Fixed: Product Images not rendering on One Page Checkout
(OFBIZ-11400)

Thanks: Archana Asthana for the report and Devanshu Vyas for the patch.
2020-03-28 12:43:20 +01:00
Jacques Le Roux 62f9b45dcf Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

As reported by OWASP ZAP:
A cookie has been set without the SameSite attribute, which means that the
cookie can be sent as a result of a 'cross-site' request. The SameSite attribute
is an effective counter measure to cross-site request forgery, cross-site script
inclusion, and timing attacks.

The solution was not obvious in OFBiz for 2 reasons:

1. There is no HttpServletResponse::setHeader. So we need to use a filter
  (SameSiteFilter) and even that is not enough because of 2:
2. To prevent session fixation we force Tomcat to generates a new jsessionId,
ultimately put in cookie, in LoginWorker::login. So we need to add a call to
SameSiteFilter::addSameSiteCookieAttribute in
UtilHttp::setResponseBrowserDefaultSecurityHeaders.
2020-03-20 17:54:26 +01:00
Jacques Le Roux c8ed017afe Improved: no functional change
Follows the "How to apply the Apache License to your work" section at
https://www.apache.org/licenses/LICENSE-2.0
2020-03-14 12:38:53 +01:00
Jacques Le Roux 88ca87d106 Implemented: have a license
(OFBIZ-11451)

Fixes missing sections in LICENCE and adds NOTICE

I have also removed the plugins prefix in "URIs" because we are under plugins

Thanks: Jacopo for spotting missing sections
2020-03-14 08:28:00 +01:00
Pierre Smits 1ad6d34683 Implemented: have a license
(OFBIZ-11451)
2020-03-13 16:07:12 +01:00
Suraj Khurana 0d05685ad4 Fixed: Unable to remove items from onePageCheckout screen of e-commerce.
(OFBIZ-10800)

Thanks Arpit Mor for reporting and Dhaval Wagela for the patch.
2020-03-02 12:21:34 +05:30
Deepak Dixit 227ecf8023 Upgrade Tomcat from 9.0.29 to 9.0.31 (CVE-2020-1938)
(OFBIZ-11407)

tomcat-embed-websocket dependencies not updated
2020-02-27 19:57:54 +05:30
Jacques Le Roux 3d37294014 Fixed: replaceFirst sensible to variable pattern
(OFBIZ-11396)

When using variable pattern with replaceFirst you may cross issues if the
pattern contains specific tokens. For instance on Windows with the path
"C:\projectsASF\Git\ofbiz-framework/" you have inside the token "\p" which has
a special meaning.
2020-02-22 07:42:32 +01:00
Jacques Le Roux 6f944d762e Improved: no functional change
This file inadvertently slipped in with a previous commit, it's not needed.
2020-02-19 14:10:13 +01:00
Jacques Le Roux a4d6d422e2 Improved: no functional change
This was added for OFBIZ-9198 but was superfluous since the same is already in
the included ecommerce controller
2020-02-19 14:04:00 +01:00
Jacques Le Roux 17d5c1a1e7 Fixed: The "stream" request-map in ecommerce and commonext controllers
requires authentication
(OFBIZ-11349)

Thanks: Michael for reporting a possible issue when only commenting the "stream"
request-map in commonext controller. And Jacopo to suggest to require
authentication (after suggesting to comment out)

It should be also noted that when the CSRF defense implementation will be in
place, all XSS vulnerabilities w/o authentication will not longer be possible.
Because then all requests shall contains a CSRF token.
2020-02-19 14:01:35 +01:00
Jacques Le Roux 6e7f6a4495 Improved: Temporarily comment out the "stream" request-map in ecommerce
controller for security reason
(OFBIZ-11348)

No functional change, simply amend the comment
2020-02-14 10:25:53 +01:00
Jacques Le Roux 483dba49a0 Fixed: Temporarily comment out the "stream" request-map in ecommerce controller
for security reason
(OFBIZ-11348)

A vulnerability has been reported to the OFBiz security team. We were able to
quickly and quietly fix it in supported versions, but in the ecommerce component.
To be able to release the 17.12.01 version with this vulnerability fixed we need
to temporarily comment out the "stream" request-map in ecommerce controller.
We will later fix the specific issue in ecommerce to put back the functionnalities
allowed by the "stream" request-map in ecommerce controller.
2020-02-13 06:55:04 +01:00
Aditya Sharma 0cd36fe73d Implemented: Cookie Consent In E-Commerce
(OFBIZ-11333)
Implemented internationalisation by initialising the plugin in header.ftl and using uiLabels for title, message and labels.
Thanks Michael Brohl for your inputs
2020-02-11 14:31:08 +05:30
Aditya Sharma cea914ad86 Implemented: Cookie Consent In E-Commerce
(OFBIZ-11333)
The Cookie Law is a piece of privacy legislation that requires websites to get consent from visitors to store or retrieve any information on their computer, smartphone or tablet. It was designed to protect online privacy, by making consumers aware of how information about them is collected and used online, and give them a choice to allow it or not.

The EU Cookie Legislation began as a directive from the European Union. Some variation on the policy has since been adopted by all countries within the EU.

The EU Cookie Legislation requires 4 actions from website owners who use cookies:
1. When someone visits your website, you need to let them know that your site uses cookies.
2. You need to provide detailed information regarding how that cookie data will be utilized.
3. You need to provide visitors with some means of accepting or refusing the use of cookies in your site.
4. If they refuse, you need to ensure that cookies will not be placed on their machine.

Used bsgdprcookies plugin to implement the feature. Thanks Deepak Nigam for initiating and providing initial patch. Thanks Deepak Nigam, Pierre Smits, Michael Brohl, Jacques Le Roux and Swapnil M Mane for inputs.
2020-02-11 14:31:00 +05:30
Aditya Sharma 416b6a1cdb Improved: no functional change
Added .gitignore file
2020-02-10 10:49:49 +05:30
Nicolas Malin 571fb3ae72 Fixed: Error when initialize billFromParty from groovy context in loadSalesOrderItemFact service
After the conversion from bsh to groovy, the script that resolve
billFromParty need to propage the value on context Map to be available
on minilang context
2020-02-06 13:04:00 +01:00
Pawan Verma 7996d142b5 Fixed: service 'loadSalesOrderItemFact' has hard coded currencyUomId
(OFBIZ-11033)

Used PartyAccountingPreference.baseCurrencyUomId instead of hard coded USD.

Thanks: Pierre Smits for your contribution.
2020-01-30 18:57:27 +05:30
Jacques Le Roux 3470703447 Fixed: User should not be directed to main page after adding product to cart
from showcart page
(OFBIZ-11223)

    Navigate to URL: https://demo-trunk.ofbiz.apache.org/ecomseo/
    Click on View Cart at top-right of the page (User will be directed to showcart page)
    Enter product number (Eg: GZ-2644)
    Enter quantity
    Click on add to cart

Product is added to the cart but user is directed to main page of ecommerce. 


Thanks: Arpit Mor for report, Sourabh Punyani for the fix
2020-01-26 10:52:48 +01:00
akash 224d2f67b8 Fixed: User is unable to create return.
(OFBIZ-10850)
Thanks, Ashish and Ankush Upadhyay for your contribution.
2020-01-25 18:36:02 +05:30
Pawan Verma dc7304a5f6 Fixed: Corrected file path for ProcessPaymentSettings.groovy
(OFBIZ-11324)
2020-01-25 11:43:32 +05:30
James Yong a183733775 Fixed: processorder is submitted as GET instead of POST
(OFBIZ-11319)

During checkout of shopping cart, it is observed that the processorder of the form action is submitted as GET which is incorrect.

Thanks: Jacques for the review
2020-01-19 00:47:18 +08:00
Mathieu Lirzin 0a7770087d Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)
These declarations avoid SAXParseException traceback when parsing web.xml
the first time in WebappUtil.parseWebXmlFile

A schema conformance issue has been fixed in ecommerce “web.xml”.

# Conflicts handled by hand
#	msggateway/webapp/msggateway/WEB-INF/web.xml
2019-12-19 06:51:42 +01:00
Jacopo Cappellato 0276303d95 Fixed: Add missing view permissions checks to various screens. 2019-11-16 08:19:40 +01:00
Jacques Le Roux 34e6581c5e Fixed: Link in verification email for Newsletter gives security error
(OFBIZ-9804)

Changes ContactListEmailTemplate.ftl to also use GET. 
Because we dont' want a form to ask, but only to hide parameters.
See details in Jira.

Handles the emails also in ecomseo after OFBIZ-11278

I have still to see why I get this message at the end of the process:
"Invalid verify code for the New Product Announcements"
ie when using the link in the last (3rd) email:
"Subscribe Contact List New Product Announcements"
This will be another Jira..!
2019-11-10 11:06:07 +01:00
Jacques Le Roux ff75d41c9c Fixed: double forward slashes in ecommerce emails
(OFBIZ-2618)

I reopened this issue because while working on OFBIZ-9804 I found that
since maybe r1052457 some baseEcommerceSecureUrl in screens like 
ContactListSubscribeEmail are not working anymore.
While at it I remove the commented out lines
2019-11-10 04:42:03 +01:00
Jacques Le Roux 6254c0ce6e "Applied fix from plugins for revision: 1868545"
------------------------------------------------------------------------
r1868545 | jleroux | 2019-10-17 14:19:33 +0200 (jeu. 17 oct. 2019) | 16 lignes

Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status 
only. So current status is not in the list and the status print in the drop-down 
is the next authorized. I want to modify exampleName or exampleType, I go to 
editExample and change what I want and validate. The problem is status is also 
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount) 
there is the same bug: when I change FinAccount Name, status change too. If I 
add current="first-in-list" in the tag drop-down it works 

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1868549 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:20:29 +00:00
Jacques Le Roux feb6039c65 "Applied fix from plugins for revision: 1867849"
------------------------------------------------------------------------
r1867849 | jleroux | 2019-10-01 19:32:02 +0200 (mar. 01 oct. 2019) | 18 lignes

Fixed: Issue with "User name filed" while creating the new user
(OFBIZ-11226)

Steps to regenerate:

    Open URL https://demo-trunk.ofbiz.apache.org
    2. Click on the "Register" button for creating a new customer
    3. Enter all the mandatory details for the registring a new customer
    4. Enter the user name with a dot (.), for example: "demo.user"
    5. Click on the "Save" button

Actual: Error message "Username can only have letters, digits and the _- 
        characters" is displaying on the screen.

Expected: Dot (.) should be also allowed in validation rules when we enter user 
name manually with a dot (.)

Thanks: Vedansh Tiwari for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1867851 13f79535-47bb-0310-9956-ffa450edef68
2019-10-01 17:32:54 +00:00
Jacques Le Roux f1e5dd85fd "Applied fix from plugins for revision: 1867717"
------------------------------------------------------------------------
r1867717 | jleroux | 2019-09-29 11:43:42 +0200 (dim. 29 sept. 2019) | 11 lignes

Fixed: Freemarker error on reviewProduct page on storefront
(OFBIZ-11108)

Steps to regenerate:
1)Navigate to https://demo-trunk.ofbiz.apache.org/ecommerce/control/main
2) User should not be logged in
3) Click on any product
4) Click on Be The First To Review This Product! link
5) FTL error for the null check is occurring

Thanks: Minal Phalak for the patch and Suraj for review
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1867721 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 11:00:38 +00:00
Jacques Le Roux 873057025a "Applied fix from plugins for revision: 1867712"
------------------------------------------------------------------------
r1867712 | jleroux | 2019-09-29 11:31:59 +0200 (dim. 29 sept. 2019) | 9 lignes

Improved: UI issue on ecommerce Product page
(OFBIZ-10884)

Navigate to demo-trunk ecom
Click on Product titled as Enchiladas, It redirects to the product page
On the Product page, Multiple horizontal lines are displayed 

Thanks: Garima jain for report, Sourabh Punyani for initial patch and Jayesh 
Agrawal for updated patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1867714 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 09:34:27 +00:00
Pawan Verma a062af9c05 Applied fix from trunk for revision: 1865828
===

Fixed: Scrum parties don't have partyTypeId set
(OFBIZ-11013)
Added missing partyTypeId data for the Scrum Parties.

Thanks: Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1865834 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 09:48:22 +00:00
Jacques Le Roux 9ef625b894 "Applied fix from plugins for revision: 1865398"
------------------------------------------------------------------------
r1865398 | jleroux | 2019-08-18 17:16:12 +0200 (dim. 18 août 2019) | 5 lignes

Fixed: <description> of <visual-theme> in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label
Missed theses files in previous commit (damn plugins)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1865400 13f79535-47bb-0310-9956-ffa450edef68
2019-08-18 15:17:33 +00:00
Jacques Le Roux 72448ecebf "Applied fix from plugins for revision: 1865347"
------------------------------------------------------------------------
r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1865351 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:39:37 +00:00
Aditya Sharma 5723446547 Applied fix from trunk for revision: 1838797
===

Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Updated the icon for the ecommerce.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1865035 13f79535-47bb-0310-9956-ffa450edef68
2019-08-13 12:27:53 +00:00
Aditya Sharma b58aa998f8 Applied fix from trunk for revision: 1863839
===

Fixed: Check embedded Javascript libs vulnerabilities using retire.js
(OFBIZ-10678)
For solving CVE-2018-14041, Bootstrap upgraded to latest 4.3.1
Thanks Jacques Le Roux for the reviews


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1863854 13f79535-47bb-0310-9956-ffa450edef68
2019-07-27 12:31:10 +00:00
Jacques Le Roux 9fa8357112 "Applied fix from plugins for revision: 1862466 "
------------------------------------------------------------------------
r1862466 | jleroux | 2019-07-03 15:30:28 +0200 (mer. 03 juil. 2019) | 20 lignes

Fixed: Error message is displayed when user having space in username logs 
in at ecommerce
(OFBIZ-10671)

Steps to regenerate:
 # Open URL: [https://demo-trunk.ofbiz.apache.org/ecommerce/control/main]
 # Click on register in header section
 # Provide all the mandatory information but provide a user name such that is 
    contains a space (like: Walter White or Jesse Pinkman)
 # Click on save button

Actual: When user clicks on save button then he is redirected to main page of 
ecommerce and an error message is displayed. 
Similarly when user with space in username tries to login, error message is 
displayed. 

Praven: Added standard regex for username allowed alphabets, numbers, and _-
jleroux: actually "-" was  missing in the regepx definition.

Thanks: Arpit Mor for report and Praveen Sharma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1862473 13f79535-47bb-0310-9956-ffa450edef68
2019-07-03 13:33:19 +00:00
Jacques Le Roux 77c20ee229 "Applied fix from plugins for revision: 1861986"
------------------------------------------------------------------------
r1861986 | jleroux | 2019-06-24 12:31:11 +0200 (lun. 24 juin 2019) | 6 lignes

Fixed: Last Categories section is blank 
(OFBIZ-10858)

Fixes typos in descriptions

Thanks: Priya Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1861988 13f79535-47bb-0310-9956-ffa450edef68
2019-06-24 10:32:07 +00:00
Jacques Le Roux e53f7244b9 "Applied fix from plugins for revision: 1861904"
------------------------------------------------------------------------
r1861904 | jleroux | 2019-06-23 11:09:00 +0200 (dim. 23 juin 2019) | 26 lignes

Fixed: Last Categories section is blank 
(OFBIZ-10858)

Issue 1:
1. Open https://demo-trunk.ofbiz.apache.org/ecomseo
2. Click on a category from the Categories section
3. Refresh the page
Actual:
1. Last Categories is blank
2. If we refresh the page then only the search category visible with the last 
row blank with a bullet.

Issue 2:
1. Open https://demo-trunk.ofbiz.apache.org/ecomseo
2. Click on a category from the Categories section
3. Again, open the https://demo-trunk.ofbiz.apache.org/ecomseo in the new tab
Actual: 1st row is blank with searched categories

As per the initial observation, the issue persists for some specific categories 
like Dropship Products, Account Activation and Services.
For all other categories, the last categories section is populated correctly. 
So there could be some issue with the data.

jleroux: on Priya warning I modified the descriptions

Thanks: Rashi Dhagat for reporting, Priya Sharma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1861907 13f79535-47bb-0310-9956-ffa450edef68
2019-06-23 09:11:53 +00:00
Swapnil Mane c8f8ba8f2f Applied fix from trunk for revision: 1861824
===

Fixed: UI issue on the Contact Us page of ecommerce application
(OFBIZ-11061)

Steps to regenerate:

1. Navigate to https://demo-trunk.ofbiz.apache.org/ecomseo/
2. Click on Login
3. Enter valid username and password
4. Click on login button
5. Click on Contact Us

Actual: From, subject and message label are not displayed properly on some resolution.

Note: This issue is resolution specific if you are unable to generate the issue then increase the resolution of your screen or zoom in the page on browser

Thanks:  Arpit Mor for reporting and Sasikant Biswal for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1861827 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 09:17:10 +00:00
Suraj Khurana d3e892318f Applied fix from trunk for revision: 1860801
===

Fixed: Blank page appears after using Tell-A-Friend functionality while adding item to cart.
(OFBIZ-10885)
Thanks Ravi Lodhi for reporting and Nitish Mishra for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1860804 13f79535-47bb-0310-9956-ffa450edef68
2019-06-08 06:52:26 +00:00
Deepak Dixit 634e928124 Applied fix from trunk for revision: 1860648
===

Fixed: Wrong page title displayed on contact us page of ecommerce
(OFBIZ-11062)
Thanks Arpit Mor and Ayushi Rathod for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1860650 13f79535-47bb-0310-9956-ffa450edef68
2019-06-05 09:46:11 +00:00
Suraj Khurana b818e3a07c Applied fix from trunk for revision: 1859906
===

Fixed: Unable to find any product in Quick Add functionality.
(OFBIZ-10978)
Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1859908 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 05:08:07 +00:00
Jacques Le Roux e187d9307f "Applied fix from plugins for revision: 1859893"
------------------------------------------------------------------------
r1859893 | jleroux | 2019-05-24 19:15:04 +0200 (ven. 24 mai 2019) | 4 lignes

Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe"
(OFBIZ-5254)

Once again forgot to commit this changes in plugins :/
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1859895 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 17:17:12 +00:00
Jacques Le Roux 40514d73e0 "Applied fix from plugins for revision: 1859735 "
------------------------------------------------------------------------
r1859735 | jleroux | 2019-05-22 18:41:04 +0200 (mer. 22 mai 2019) | 12 lignes

Fixed: massPrintOrders service does not work
(OFBIZ-11049)

This problem was similar to what was resolved by r1806237 for OFBIZ-9138.

This fixes it by using the same solution than in r1806237. If the visual theme 
is unknown in the the service  context  get the default theme from 
general.properties using ThemeFactory::resolveTheme.

sendPrintFromScreen, createFileFromScreen, sendBirtMail, getXslFo and 
printReportPdf (in example) were concerned

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1859739 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 16:42:53 +00:00
Jacques Le Roux 11d158ad7f "Applied fix from plugins for revision: 1859012"
------------------------------------------------------------------------
r1859012 | jleroux | 2019-05-09 16:32:35 +0200 (jeu. 09 mai 2019) | 6 lignes

Fixed: Touch F8 in webpos does not work and generate an error
(OFBIZ-11010)

Adds missing data for POS_SALES_CHANNEL fix this issue, was removed in r1754402.

Thanks: Pawan Verma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1859014 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 14:33:39 +00:00
Jacopo Cappellato 2e3e34d50c Applied fix from trunk for revision: 1858435
===

Fixed: improved the configuration for the "add forum message" form (the source 
tab is not needed in the ecommerce application).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1858440 13f79535-47bb-0310-9956-ffa450edef68
2019-04-30 14:59:07 +00:00
Jacques Le Roux 5c2bf2f9b7 "Applied fix from plugins for revision: 1858312"
------------------------------------------------------------------------
r1858312 | jleroux | 2019-04-28 12:51:46 +0200 (dim. 28 avr. 2019) | 17 lignes

Fixed: Remove link is not working in shopping list
(OFBIZ-10967)

Steps to reproduce
1. Login with valid username and password.
2. Navigate to ecommerce.
2.1 Adds product/s to the cart
2.2 Add it/them in a shopping list.
4. Navigate to shopping list section.
5. Click on link “Remove"
Expected Result: Product should be removed from shopping list.
Actual Result: Remove link is not working.

jleroux: OFBIZ-7291 broke it. That can be tested on old demo (R13)
Fixed by using a simple submit field

Thanks: Ashish Sharma for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1858314 13f79535-47bb-0310-9956-ffa450edef68
2019-04-28 10:52:36 +00:00
Suraj Khurana f840c99e6e Applied fix from trunk for revision: 1858285
===

Fixed: FindTask does not allow for all statuses possible to be selected.
(OFBIZ-10913)
Thanks Pierre Smits for repoting, Deepak Dixit for comments/findings and Pawan Verma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1858287 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 16:16:30 +00:00
Suraj Khurana bb5f21f4f6 Applied fix from trunk for revision: 1858244
===

Fixed: Can't set (expected) start and end date of project when creating a project. 
(OFBIZ-10927)
Thanks Pierre Smits for reporting, Pawan Verma for the patch and Jacques for review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1858247 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 06:55:36 +00:00
Jacques Le Roux b2a23af862 "Applied fix from plugins for revision: 1858141 "
------------------------------------------------------------------------
r1858141 | jleroux | 2019-04-25 16:27:36 +0200 (jeu. 25 avr. 2019) | 11 lignes

Fixed: Ensure html verbosity is following general setup
(OFBIZ-10940)

Currently the configuration of the Birt and Scrum component does not follow the 
- de facto - standard of having the html code reference the OFBiz widget and 
templates. 
See [1] vs [2]
[1] view-source:https://demo-trunk.ofbiz.apache.org/birt/control/main
[2] view-source:https://demo-trunk.ofbiz.apache.org/accounting/control/main

Thanks: Pierre Smits
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1858143 13f79535-47bb-0310-9956-ffa450edef68
2019-04-25 14:28:30 +00:00
Jacques Le Roux 51ea2deb68 Fixed: Update Tomcat to 9.0.18 due to CVE-2019-0232
(OFBIZ-10920)

CVE-2019-0232 Apache Tomcat Remote Code Execution on Windows

Severity: Important

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 9.0.0.M1 to 9.0.17
Apache Tomcat 8.5.0 to 8.5.39
Apache Tomcat 7.0.0 to 7.0.93

Description:
When running on Windows with enableCmdLineArguments enabled, the CGI
Servlet is vulnerable to Remote Code Execution due to a bug in the way
the JRE passes command line arguments to Windows. The CGI Servlet is
disabled by default. The CGI option enableCmdLineArguments is disabled
by default in Tomcat 9.0.x (and will be disabled by default in all
versions in response to this vulnerability). For a detailed explanation
of the JRE behaviour, see Markus Wulftange's blog [1] and this archived
MSDN blog [2].

Mitigation:
Users of affected versions should apply one of the following mitigations:
- Ensure the CGI Servlet initialisation parameter enableCmdLineArguments
    is set to false
- Upgrade to Apache Tomcat 9.0.18 or later when released
- Upgrade to Apache Tomcat 8.5.40 or later when released
- Upgrade to Apache Tomcat 7.0.93 or later when released
This announcement is being made before the releases are available as the
change to fix this issue is obviously security related.

Credit:
This issue was identified by an external security researcher and
reported to the Apache Tomcat security team via the bug bounty program
sponsored by the EU FOSSA-2 project.


jleroux: actually Tomcat 9.0.19 was released, here it is

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1857588 13f79535-47bb-0310-9956-ffa450edef68
2019-04-15 14:42:44 +00:00
Jacques Le Roux 3205479542 "Applied fix from plugins for revision: 1857173 "
------------------------------------------------------------------------
r1857173 | jleroux | 2019-04-09 13:49:10 +0200 (mar. 09 avr. 2019) | 8 lignes

Fixed: Error message is displayed while click on create new quotes.
(OFBIZ-10882)

This feature has been removed with OFBIZ-10882, 

This removes the "Create New Quote" link, the redundant "Save" link (there is a 
Save button) and the OrderCreateQuoteFromShoppingList label which was only used 
there
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1857177 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 11:51:44 +00:00
Deepak Dixit 6078d8ae6e Applied fix from trunk for revision: 1857120
===

Improved: Amount field is editable at Product Detail Page 
(OFBIZ-10663)
Added mising css and js code to show/hide the amount field based on Product.requireAmount field.
Thanks  Dikpal Kanungo for reporting the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1857122 13f79535-47bb-0310-9956-ffa450edef68
2019-04-08 16:56:39 +00:00
Jacques Le Roux 3bb9ee24c1 "Applied fix from plugins for revision: 1856917 "
------------------------------------------------------------------------
r1856917 | jleroux | 2019-04-04 14:17:35 +0200 (jeu. 04 avr. 2019) | 12 lignes

Fixed: Unable to create new quote from cart at eCommerce store
(OFBIZ-10886)

Actually we decided that an external user should not be able to create quotes
but only requests for quote.

This disables creating quotes from the ecommerce. An authorised user can still
do the same from the backedn (order manager)

Thanks: Sanjay Yadav for initial report, Sasikant Biswal for trying, Pierre for
mentioning that this should not be open to external users and Pawan Verma for 
the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1856919 13f79535-47bb-0310-9956-ffa450edef68
2019-04-04 12:19:21 +00:00
Jacques Le Roux ac4cb72de9 "Applied fix from plugins for revision: 1856802"
------------------------------------------------------------------------
r1856802 | jleroux | 2019-04-02 09:52:53 +0200 (mar. 02 avr. 2019) | 17 lignes

Fixed: Error message is displayed in shopping cart when click on recalculate 
cart link
(OFBIZ-10852)

Login with valid username and password.
Navigate to ecommerce.
Add multiple product in shopping cart.
Select one product and click on remove selected.
Product should be removed.
Select another product and click on recalculate cart.

Expected result: Product should be recalculate.
Actual result: Error message is displayed as 404. Screen print attached

jleroux: I did not see the error message but the fix makes sense anyway

Thanks: Ashish Sharma for report Sasikant Biswal for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1856804 13f79535-47bb-0310-9956-ffa450edef68
2019-04-02 07:57:26 +00:00
Jacques Le Roux 785757e657 Fixed: Update Tomcat to 9.0.16 due to CVE-2019-0199
(OFBIZ-10873)

The HTTP/2 implementation accepted streams with excessive numbers of
SETTINGS frames and also permitted clients to keep streams open without
reading/writing request/response data. By keeping streams open for
requests that utilised the Servlet API's blocking I/O, clients were able
to cause server-side threads to block eventually leading to thread
exhaustion and a DoS.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1856215 13f79535-47bb-0310-9956-ffa450edef68
2019-03-25 17:51:52 +00:00
Suraj Khurana 77a889ec97 Applied fix from trunk for revision: 1855082
===

Fixed: Product image is not displayed on showcart page of ecommerce.
(OFBIZ-10738)
Thanks Arpit Mor for reporting the issue and Praveen Sharma for providing the patch.
It was occuring due to incorrect encoder type used and so URL was not creating properly to render the image.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1855085 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 06:33:00 +00:00
Jacques Le Roux 88d76df718 Improved: no functional change
Copies Solr doc from trunk

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1854517 13f79535-47bb-0310-9956-ffa450edef68
2019-02-28 10:30:30 +00:00
Swapnil Mane 1d6d1206d0 Applied fix from trunk for revision: 1852988
===

Fixed: 404 error while creating/updating contact information from the checkout page
(OFBIZ-10827)

Thanks: Ravi Lodhi for reporting the issue and Pawan Verma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1852999 13f79535-47bb-0310-9956-ffa450edef68
2019-02-05 12:10:19 +00:00
Deepak Dixit b629615b3c Applied fix from trunk for revision: 1851185
===

Improved: Convert Promotion Screen of e-commerce as per Bootstrap Styling
(OFBIZ-10793)
Thanks  Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851187 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 19:18:11 +00:00
Deepak Dixit 56a228c9a1 Improved: Backporting the all the changes of ecommerce multiflex theme to OFBiz17.12, after the ecommerce markup update work it was broken.
(OFBIZ-9760)
Thanks Parakh Maheshwari for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851184 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 18:55:51 +00:00
Deepak Dixit b14305ae57 Applied fix from trunk for revision: 1851140
===

Fixed:List Request page seems distorted of ecommerce component
(OFBIZ-10621)
Thanks  Garima jain for reporting the issue.
Set the col class based on right/left screen inclusion



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851144 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:53:35 +00:00
Deepak Dixit a5773f6be4 Applied fix from trunk for revision: 1851135
===

Improved: Improve ecommerce main-decorator 
(OFBIZ-10790)
Added two new section in ecommerce main-decorator, now we don't need to pass right/left bar screen name, instead we can include it directly in decoratot-section.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851138 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:35:19 +00:00
Jacques Le Roux 2fa1cc428d "Applied fix from plugins for revision: 1851068 "
------------------------------------------------------------------------
r1851068 | jleroux | 2019-01-11 17:12:01 +0100 (ven. 11 janv. 2019) | 12 lignes

Fixed: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Following "Session timeout for webapps" discussion on dev ML 
https://markmail.org/message/p6fbiojjrwb2ybxd

We decided to put back the session-timeout value in web.xml files and to remove
the line
    session.setMaxInactiveInterval(60*60); //in seconds
from ControlEventListener.java

Thanks: Deepak Nigam for report and Girish Vasmatkar for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851072 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:14:05 +00:00
Deepak Dixit c75da28008 Applied fix from trunk for revision: 1851002
===

Fixed: Page dropdown list on categorydetail page broken
(OFBIZ-10787)
Thanks Sebastian Wachinger for reporting the issue.
Corrected the condition to display pagination options


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1851003 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:02:28 +00:00
Suraj Khurana bfee22492d Fixed: Quantity of the product added in the cart should not be negative.
(OFBIZ-10668)
Thanks Dikpal Kanungo for reporting and Prakhar Kumar for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1849533 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 10:15:31 +00:00
Jacques Le Roux 0cb5d81015 "Applied fix from plugins for revision: 1849119"
------------------------------------------------------------------------
r1849119 | jleroux | 2018-12-17 18:42:20 +0100 (lun. 17 déc. 2018) | 5 lignes

Improved: Plugins Asciidoc documentation must be standalone
(OFBIZ-10658)

Removes toc information after ":toclevels:" 3 is used in build.gradle

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1849162 13f79535-47bb-0310-9956-ffa450edef68
2018-12-18 11:04:28 +00:00
Deepak Dixit 39ea9aadc4 Applied fix from trunk for revision: 1848921
===

Fixed: visual-editor not working on ecommerce (OFBIZ-10708)
The main issue was in js file loading, jQuery is being initialised twice thus eltre might not be available in the prototype of reinitialised jQuery object.
Thanks Aditya Sharama for the discussion


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1848922 13f79535-47bb-0310-9956-ffa450edef68
2018-12-14 10:34:53 +00:00
Michael Brohl 10e4c785e5 Fixed: Update and fix openstreetmap.org integration.
(OFBIZ-10553)

Manual backport because of the renamed paths.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1848437 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 08:06:32 +00:00
Jacques Le Roux 79df69b93c "Applied fix from plugins for revision: 1848398 "
------------------------------------------------------------------------
r1848398 | jleroux | 2018-12-07 14:14:48 +0100 (ven. 07 déc. 2018) | 17 lignes

Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)

Steps to regenerate:
Open URL: https://demo-trunk.ofbiz.apache.org/ecommerce/control/main. 
  Welcome is displayed and user's name is not displayed when URL is opened.
Login at ecommerce, username will be displayed after user logs in.
Logout of ecommerce by clicking on logout. User will be logged out and login 
  link will be displayed in place of logout link, but the name of user is still 
  displayed.

Actual: Username is still displayed after user logs out
Expected: Username should not be displayed after the user logs out

Note: Similar issue also exists when the user clicks on (Not You?) link.

Thanks: Arpit Mor for detailled report, Deepak Dixit for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1848400 13f79535-47bb-0310-9956-ffa450edef68
2018-12-07 13:16:58 +00:00
Jacques Le Roux a925850041 "Applied fix from plugins for revision: 1848009"
------------------------------------------------------------------------
r1848009 | shijh | 2018-12-02 19:51:51 +0100 (dim. 02 déc. 2018) | 16 lignes

Improved: OFBizPricatUtil class don't use a org.apache.ofbiz.pricat package
(OFBIZ-10655)

I didn't realized OFBizPricatUtil under org.apache.poi package is a bug 
for OFBiz project at the first sight of this issue. When I tried to think from 
Jacques view as our project SQA, I understood this OFBizPricatUtil may be missed 
during code style check, and this is a major problem :).

Now I moved the OFBizPricatUtil under org.apache.ofbiz.pricat.util package and 
changed two other files accordingly.

I upgraded the implement to match the POI 3.7 used in the OFBiz plugins 
trunk, and I also tested it with POI 4.0.0 and it worked fine.

Thanks: Jacques for pointing out this issue

------------------------------------------------------------------------

jleroux: I fixed 2 small conflicts by hand in AbstractPricatParser and 
SamplePricatParser.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1848026 13f79535-47bb-0310-9956-ffa450edef68
2018-12-03 08:17:47 +00:00
Jacques Le Roux 9ceb7d3ded "Applied fix from plugins for revision: 1847530 "
------------------------------------------------------------------------
r1847530 | jleroux | 2018-11-27 12:27:39 +0100 (mar. 27 nov. 2018) | 12 lignes

Reverted: User should be redirected to view cart page after adding the product 
from compare product screen
(OFBIZ-10667)

Revert r1847478

There was a problem with this fix. It changes the behaviour of additem when you 
add an item from the main or another page.

The behaviour is defined by the "Always View Cart After Adding An Item." 
checkbox in the cart view.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847531 13f79535-47bb-0310-9956-ffa450edef68
2018-11-27 11:28:13 +00:00
Jacques Le Roux 334a0136ff "Applied fix from plugins for revision: 1847528"
------------------------------------------------------------------------
r1847528 | jleroux | 2018-11-27 12:18:07 +0100 (mar. 27 nov. 2018) | 19 lignes

Fixed: User should be redirected to view cart page after adding the product 
from compare product screen
(OFBIZ-10667)

Currently user is navigating add item page instead of view cart page while 
adding product to cart from compare product screen. User gets stuck after 
navigating over add item page.

Steps to replicate the issue: 
 1. Go to eCommerce application.
 2. Click on add to compare button for the products - 
    Round Gizmo and Tiny Chrome Widget.
 3. Click on 'Compare Products' from right bar.
 4. Click on 'Add to cart' over compare product screen.

Expected behaviour : User should be redirected to view cart page instead 
of add item page.

Thanks: Ratnesh Upadhyay for report and Ritesh Kumar for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847529 13f79535-47bb-0310-9956-ffa450edef68
2018-11-27 11:18:44 +00:00
Jacques Le Roux c841e9afc5 "Applied fix from plugins for revision: 1847398 "
------------------------------------------------------------------------
r1847398 | jleroux | 2018-11-25 09:40:23 +0100 (dim. 25 nov. 2018) | 15 lignes

Fixed: Instructions for Configurable PC don't work
(OFBIZ-10542)

This concerns only R16, R17 and the trunk. The "Instructions" button was not 
present in R13.

This kind of message shows:
Trunk:
<a href="javascript:showErrorAlert('The following errors occurred','');"
R16:
<a href="javascript:showErrorAlert(" the="" following="" errors="" occurred","")

The same exists for all configurable products, notably Gold Pizza

Thanks: Priya Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847400 13f79535-47bb-0310-9956-ffa450edef68
2018-11-25 08:41:49 +00:00
Suraj Khurana 183be07009 Fixed: Error message is displayed on ecommerce when user tries to use Split shipment functionality.
> (OFBIZ-10623)
> Thanks Arpit Mor for reporting and Praveen Sharma for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847349 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 09:13:01 +00:00
Deepak Dixit 8baa4f35e0 Applied fix from trunk for revision: 1847346
===

Fixed: Quote list is not showing on ecommerce
(OFBIZ-10628)
Thanks  Mohammed Rehan Khan for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847347 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 08:51:49 +00:00
Jacques Le Roux ea125e1397 "Applied fix from plugins for revision: 1847272 "
------------------------------------------------------------------------
r1847272 | jleroux | 2018-11-23 15:27:05 +0100 (ven. 23 nov. 2018) | 10 lignes

Fixed: Plugins Asciidoc documentation must be standalone
(OFBIZ-10658)

Completes the standalone document part as required by guidelines.

Note that using ":toclevels: 3" does not work when generating with Gradle 
because of the OOTB definition "'toclevels': '5'" in build.gradle

It does when used apart in Asciidoc editors. I believe OOTB a 3 levels is enough
 and the numbers are superfluous if not unpleasant.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847274 13f79535-47bb-0310-9956-ffa450edef68
2018-11-23 14:33:48 +00:00
Jacques Le Roux d22074ab14 Documented: Backport the Asciidoc documentation and means to generate it to
R17 branch
(OFBIZ-10657)
Convert Birt component doc from Markdown to AsciiDoc 
(OFBIZ-10647)

As discussed in https://markmail.org/message/x7sv2mpvtytr4vl4 we decided to 
backport the Asciidoc documentation, and means to generate it, to R17 branch

This is related with OFBIZ-10651 and OFBIZ-10652 tasks. 
So 2 parts are impacted: code in framework and plugins and Buildbot script. 
It's only a copy from the trunk to the R17 branch, including *.adoc files, 
related images and the build.gradle script.

I previous commit I missed to remove security-impersonation.adoc now replaced 
by sy-impersonation.adoc
Forgot to commit the plugins part. Including replacing Birt Markdown 
documentation by Asciidoc  (OFBIZ-10647)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1847253 13f79535-47bb-0310-9956-ffa450edef68
2018-11-23 12:16:52 +00:00
Jacques Le Roux 2bddf1baf9 "Applied fix from plugins for revision: 1845558 "
------------------------------------------------------------------------
r1845558 | jleroux | 2018-11-02 10:46:42 +0100 (ven. 02 nov. 2018) | 15 lignes

Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

Renames "keep-autologin-cookie" to "use-autologin-cookie", and only create 
Autologin cookies when needed. No need to create Autologin cookies in 
applications that don't need it.

Don't pass webAppName to LoginWorker::getSecuredUserLoginId, that can be handled
with improved LoginWorker::getSecuredLoginIdCookieName

Removes LoginWorker::autoLogoutCleanCookies, no longer needed since only those
needed are created and kept (1 year at least after creation).

For both autoLogin and securedLoginId cookies sets the path to the application.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1845569 13f79535-47bb-0310-9956-ffa450edef68
2018-11-02 10:38:35 +00:00
Suraj Khurana ba76128822 Fixed: Added missing import.
(OFBIZ-10314)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1844967 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 13:28:29 +00:00
Suraj Khurana 0f2a9187be Fixed: Multiple records are shown in search modal in webpos.
(OFBIZ-10314)
Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1844959 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 12:51:03 +00:00
Ashish Vijaywargiya ffac3cc539 Applied fix from trunk for revision: 1844946
=======================================================
Fixed: ECommerce landing page breaks if popular category does not exists.
(OFBIZ-10617)
Thanks Rehan for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1844947 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 08:27:27 +00:00
Aditya Sharma 23c29f7a0e Applied fix from trunk for revision: 1841650
===

Fixed: Webpos Keyboard Shortcut keys does not work correctly
(OFBIZ-7945)
Updated wrong function calls in switch case of activateHotKeys(). As support for Pin Payment transactions is still to be added under OFBIZ-5241. Commented code for Pin payment transaction and updated other shortcuts accordingly.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1841651 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 05:58:58 +00:00
Suraj Khurana 831e9cf6c5 Applied fix from trunk for revision: 1838816
===

Fixed: Java object rendering on billing section of one page anonymous checkout process.
(OFBIZ-10425)
Thanks Jason Hao for reporting and Priya Sharma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1838818 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 11:01:39 +00:00
Jacques Le Roux 66c27fdc57 "Applied fix from plugins for revision: 1838381 "
------------------------------------------------------------------------
r1838381 | jleroux | 2018-08-19 17:30:42 +0200 (dim. 19 août 2018) | 8 lignes

Fixed: Search in Ecommerce no longer works
(OFBIZ-10531)

I guess that when I worked on OFBIZ-9164 I broke that.

I found 3 occurences where the dispatcher was not in the session because the 
session comes from the request and the request has not it in.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1838383 13f79535-47bb-0310-9956-ffa450edef68
2018-08-19 15:31:41 +00:00
Suraj Khurana 029ee2810b Applied fix from trunk for revision: 1838249
===

Fixed: Could not find simple-method createWorkEffortSkillStandard as it was called as simple method and it is converted to entity-auto service.
(OFBIZ-10524)
Thanks Fernando Ortega for reporting the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1838250 13f79535-47bb-0310-9956-ffa450edef68
2018-08-17 11:18:43 +00:00
Jacques Le Roux 5f954c4b6e "Applied fix from plugins for revision: 1837857"
------------------------------------------------------------------------
r1837857 | jleroux | 2018-08-11 12:37:40 +0200 (sam. 11 août 2018) | 10 lignes

Fixed: Update Apache Tomcat to 9.0.10 because of CVE-2018-8037
(OFBIZ-10517)

If an async request was completed by the application at the same time as the 
container triggered the async timeout, a race condition existed that could 
result in a user seeing a response intended for a different user. 
An additional issue was present in the NIO and NIO2 connectors that did not 
correctly track the closure of the connection when an async request was 
completed by the application and timed out by the container at the same time.
This could also result in a user seeing a response intended for another user. 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1837862 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 10:40:20 +00:00
Suraj Khurana eeb88a9da9 Applied fix from trunk for revision: 1837845
===

Fixed: Party Search doesn't consider Billing Address and Shipping Address checkbox in WebPos.
(OFBIZ-7709)
Thanks Vishal for your patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1837846 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 06:24:31 +00:00
Suraj Khurana c0ed79e0bf Applied fix from trunk for revision: 1837796
===

Fixed: Not able to select Virtual Product in WebPos.
(OFBIZ-7719)
Thanks Vishal for your patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1837799 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 12:57:11 +00:00
Suraj Khurana aa729cad31 Reverted: Applied fix from trunk for revision: 1837796
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1837798 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 12:46:48 +00:00
Suraj Khurana 2470947ae5 Applied fix from trunk for revision: 1837796
===



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1837797 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 12:41:37 +00:00
Aditya Sharma f428a5b7ca Applied fix from trunk for revision: 1836107
===
Fixed: UI issue on blog screens on storefront
(OFBIZ-10466)
Thanks: Pritam Kute for reporting the issue and providing the patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1836108 13f79535-47bb-0310-9956-ffa450edef68
2018-07-17 12:10:43 +00:00
Jacques Le Roux 445cf20bc9 "Applied fix from plugins for revision: 1832800 "
------------------------------------------------------------------------
r1832800 | jleroux | 2018-06-04 10:34:35 +0200 (lun. 04 juin 2018) | 11 lignes

Fixed: Click on category the filter function doesn't work
(OFBIZ-10423)

Click on the left category, the page doesn't refresh, there are two issues.

productCategoryId not set in 
   ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
updated data will fill in #div3, but the div id is missing in 
   ecommerce/widget/CommonScreens.xml
 
Thanks: Jason Hao
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1832802 13f79535-47bb-0310-9956-ffa450edef68
2018-06-04 08:57:48 +00:00
Jacques Le Roux d7b9688e50 "Applied fix from plugins for revision: 1832727"
------------------------------------------------------------------------
r1832727 | jleroux | 2018-06-02 11:11:22 +0200 (sam. 02 juin 2018) | 6 lignes

Fixed: jquery.jgrowl.min.css url out of date
(OFBIZ-10421)

jleroux: this is only in ecommerce and R16 is not concerned

Thanks: Jason Hao
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1832728 13f79535-47bb-0310-9956-ffa450edef68
2018-06-02 09:14:19 +00:00
Deepak Dixit 823cb88e86 Applied fix from trunk for revision: 1831084
===

Implemented: Upgraded to latest Tomcat (9.0.7), Updated tomcat embed websocket jar to 9.0.7
(OFBIZ-10036)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1831085 13f79535-47bb-0310-9956-ffa450edef68
2018-05-07 09:00:44 +00:00
Deepak Dixit 30ac2dcc8f Applied fix from trunk for revision: 1830856
===

Fixed: The viewSize should be converted Integer for multiplication
Found one occurence in plugins component


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1830858 13f79535-47bb-0310-9956-ffa450edef68
2018-05-03 18:36:13 +00:00
Jacques Le Roux ccf1bd2e33 "Applied fix from plugins for revision: 1828569 "
------------------------------------------------------------------------
r1828569 | jleroux | 2018-04-06 23:06:48 +0200 (ven., 06 avr. 2018) | 12 lines

Fixed: One Page Checkout page cannot move to Step 5 due to javascript errors
(OFBIZ-10329)

When you click on continue to step 5 you encounter some javascript exception
which makes the checkout process hit the wall.

additional-methods.min.js was missing in ecommerce
 
Thanks: Sameer Gajanan Apte
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1828570 13f79535-47bb-0310-9956-ffa450edef68
2018-04-06 21:07:54 +00:00
Arun Patidar 617cfd4495 Fixed: Changed org.ofbiz package to org.apache.ofbiz in missing files. (OFBIZ-10235)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1825200 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 08:51:58 +00:00
Deepak Dixit 80ed21a8df Applied fix from trunk for revision: 1824654
===

Improved: Done some markup cleanup, Removed some unusd html tag. Added css rule to set padding=0 for  ul (OFBIZ-9760)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1824657 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 10:06:29 +00:00
Deepak Dixit ab60dc5991 Applied fix from trunk for revision: 1824650
===

Improved: UI improvement on various pages
1) Improvement of various button UI.

2) Improvement in layout at some screens.

3) Alignment issues of some card-header.

Thanks Nitish for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1824651 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:18:06 +00:00
Deepak Dixit d61f5740db Applied fix from trunk for revision: 1824648
===

Improved: Update markup of various product page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10160)
Thanks Mayank for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1824649 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:10:39 +00:00
Deepak Dixit 4978683fec Applied fix from trunk for revision: 1824646
===

Improved: Fix UI issue for error messages.(OFBIZ-10185)
Thanks  Mayank Lambhate for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1824647 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:03:37 +00:00
Arun Patidar 012accb56f Applied fix from trunk for revision: 1822377
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822925 13f79535-47bb-0310-9956-ffa450edef68
2018-02-02 06:46:28 +00:00
Rishi Solanki c8b62b8aa4 Fixed: Error on My Portal Request Overview Page. Issue was due to an incorrect path of OverViewRequestItems.ftl in ViewRequest screen. Applied fix from trunk revision 1822512.
(OFBIZ-10183)
Thanks Ratnesh Upadhyay for reporting the issue and Yogesh Naroliya for providing patch to fix the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822513 13f79535-47bb-0310-9956-ffa450edef68
2018-01-29 15:12:22 +00:00
Deepak Dixit 75f24795e4 Applied fix from trunk for revision: 1822395
===

Improved: Update markup of Shopping Lists page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10119)
Thanks Parakh Maheshwari for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822396 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:48:17 +00:00
Deepak Dixit 0434173e04 Applied fix from trunk for revision: 1822391
===

Improved: Improvement in UI of various pages of ecommerce(OFBIZ-10182)
Thanks  Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822392 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:42:10 +00:00
Deepak Dixit 25e8736a86 Applied fix from trunk for revision: 1822389
===

Improved: Update markup of Checkout page according to standard markup given by Bootstrap v4.0.s (OFBIZ-10105)
Thanks Mayank for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822390 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:18:04 +00:00
Deepak Dixit 2c2c60acef Applied fix from trunk for revision: 1822145
===

Improved: Update markup of qucik add page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10161)
Thanks Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822146 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 18:07:23 +00:00
Deepak Dixit cc2f85960a Applied fix from trunk for revision: 1822143
===

Improved: Update markup of advanced seach page page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10162)
Thanks Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822144 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:58:00 +00:00
Deepak Dixit 7c90e33250 Applied fix from trunk for revision: 1822139
===

Improved: Update markup of quick reorder section according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10163)
Thanks Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822140 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:52:13 +00:00
Deepak Dixit 3d621e5800 Applied fix from trunk for revision: 1822133
===

Improved: Update markup of Last Products section according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10169)
Thanks  Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822135 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:47:07 +00:00
Deepak Dixit 190fb25511 Applied fix from trunk for revision: 1822129
===

Improved: Update Bootstrap 4.0 library to stable version from bootstrap 4.0 beta-2 (OFBIZ-10179)
Thanks  Parakh Maheshwari for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1822130 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:41:19 +00:00
Deepak Dixit f6bc18fe84 Applied fix from trunk for revision: 1821051
===

Improved: Update markup of Quick Checkout Page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10136)
Thanks Mayank Lambhate for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1821052 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:50:39 +00:00
Deepak Dixit fcce738985 Applied fix from trunk for revision: 1821049
===

Improved: Update markup of OrderHistory page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10135)
Thanks Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1821050 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:43:19 +00:00
Deepak Dixit 5f8cbc75eb Applied fix from trunk for revision:1821045
==
Fixed: Recent markup changed breaks Product view page,  https://demo-trunk.ofbiz.apache.org/ecommerce/round-gizmo-GZ-2644-p (OFBIZ-10117)
Thanks Parakh and Mayank for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1821046 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 06:50:45 +00:00
Jacques Le Roux 54d832ac74 "Applied fix from plugins for revision: 1820962"
------------------------------------------------------------------------
r1820962 | taher | 2018-01-12 11:45:06 +0100 (ven., 12 janv. 2018) | 8 lines

Reverted: faulty code that caused a regression in installing birt plugin
(OFBIZ-9383)

The code removed used to draw a fixed hard dependency between the BIRT and
example components thus causing the build system to crash when issuing the
command ./gradlew pullPlugin -PpluginId=birt. To be replaced later with a
proper dependency declaration using the plugin manager dependency definitions.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1820976 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 12:36:19 +00:00
Jacques Le Roux 7bae82c85f "Applied fix from plugins for revision: 1820973 "
------------------------------------------------------------------------
r1820973 | jleroux | 2018-01-12 13:22:29 +0100 (ven., 12 janv. 2018) | 16 lines

Fixed: Birt plugin depends on example plugin 
(OFBIZ-9383)

The BIRT demo data for flexible reports depends on the Example entity from the 
Example plugin.

We should either provide BIRT's own example data with example reports 
OR 
setup a gradle dependency on the example plugin so that everything is in place.

jleroux: this simply duplicates example data in birt component. There are
cases where duplication is the simplest solution even at the cost of possible
divergence in the future (not a problem for the birt component, so it's OK)


Thanks: Michael Brohl for report and Taher for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1820975 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 12:24:01 +00:00
Jacques Le Roux 7729116d4a "Applied fix from trunk plugins for revision: 1819589"
------------------------------------------------------------------------
r1819589 | jleroux | 2017-12-30 11:36:47 +0100 (sam., 30 déc. 2017) | 1 line

Fixes a wrong path to jgrowl
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819593 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 12:13:51 +00:00
Jacques Le Roux 7c3176cb3a "Applied fix from trunk plugins for revision: 1819589 "
------------------------------------------------------------------------
Fixed: Exception Error rendering on all View Category pages
(OFBIZ-10006)

Steps to regenerate:
1. Open https://demo-trunk.ofbiz.apache.org/ecommerce/control/main
2. Go to Category section
3. Click any category
Exception Error renders

jleroux: the patch fixes the issue in log but the feature still does not work. 
I mean when you click on a category in the tree nothing happens. 
I see no related js error in browser console.

Thanks: Archana Asthana for report and Aman Agrawal for patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819591 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 11:23:40 +00:00
Deepak Dixit 54cb008374 Merge from trunk revision:1819582
Improvement in UI of register page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10127)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819583 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 09:51:57 +00:00
Deepak Dixit 75c2b12376 Merge from trunk revision:1819580
Improved: Update markup of Configure product page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10110)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819581 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 09:47:02 +00:00
Deepak Dixit c7f641c225 Applied fix from trunk for revision:1819576
Improved: Added responsive and thead-light class on quote list ecommerce page (OFBIZ-10095)
Thanks Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819577 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 09:35:25 +00:00
Jacopo Cappellato a965a2d40c Created feature branch 17.12 for the ofbiz-plugins.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12@1819408 13f79535-47bb-0310-9956-ffa450edef68
2017-12-28 09:03:30 +00:00
213 changed files with 30902 additions and 4347 deletions
+11
View File
@@ -0,0 +1,11 @@
Improved:
Implemented:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:
+1
View File
@@ -0,0 +1 @@
.DS_Store
+232
View File
@@ -0,0 +1,232 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed 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.
=========================================================================
This product bundles "jQuery" and "jQuery" plugins and extensions, which are available
under the "MIT" license. For details, see:
webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
webpos/webapp/webpos/images/js/WebPosHotkeys.js
=========================================================================
This product bundles files from the "Birt" technology platform (www.eclipse.org/birt/)
which are available under the "Eclipse Public License - v 1.0".
For details, see birt/webapp/birt/webcontent/birt/
=========================================================================
This product bundles "Webhelp for DocBook", which is available
under the "MIT" License. For details, see cmssite/template/docbook/webhelp/
=========================================================================
This product bundles "DocBook XSL Stylesheets 1.77.1", which is available
under the "MIT" license.
For details, see cmssite/template/docbook/
=========================================================================
This product bundles "Bootstrap", which is available
under the "MIT" license.
For details, see:
ecommerce/webapp/ecommerce/js
ecommerce/webapp/ecommerce/css
+5
View File
@@ -0,0 +1,5 @@
Apache OFBiz
Copyright 2001-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Asset Maintenance</display-name>
<description>Asset Management component of the Apache OFBiz Project</description>
@@ -77,6 +77,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -85,6 +90,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -103,6 +112,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Information Systems</display-name>
<description>Information Systems Management application of the Apache OFBiz Project</description>
@@ -72,6 +72,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -80,6 +85,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -98,6 +107,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+14 -4
View File
@@ -354,6 +354,16 @@ under the License.
<!-- =============== -->
<!-- facts handling -->
<!-- =============== -->
<script>groovy:
import org.apache.ofbiz.order.order.OrderReadHelper
orderReadHelper = new OrderReadHelper(orderHeader)
context.billFromParty = orderReadHelper.getBillFromParty()
</script>
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="billFromParty.partyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
<result-to-field result-name="partyAccountingPreference" field="accPref"/>
</call-service>
<set field="fact.quantity" from-field="orderItem.quantity" type="BigDecimal"/>
<set field="fact.extGrossAmount" value="0" type="BigDecimal"/>
<set field="fact.extGrossCost" value="0" type="BigDecimal"/>
@@ -374,7 +384,7 @@ under the License.
<!-- extGrossAmount -->
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -406,7 +416,7 @@ under the License.
<first-from-list list="costs" entry="cost"/>
<set field="convertUomCurrencyMap.uomId" from-field="cost.currencyUomId"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -492,7 +502,7 @@ under the License.
</iterate>
<if-compare field="countGS" operator="equals" value="0">
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -555,7 +565,7 @@ under the License.
</calculate>
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Business Intelligence</display-name>
<description>Business Intelligence component of the Apache OFBiz Project</description>
@@ -57,6 +57,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -83,6 +92,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+3
View File
@@ -99,6 +99,9 @@ under the License.
<screen name="main">
<section>
<condition>
<if-has-permission permission="BI" action="_VIEW"/>
</condition>
<actions>
<set field="titleProperty" value="BusinessIntelligenceMainPage"/>
<set field="headerItem" value="main"/>
-7
View File
@@ -23,10 +23,3 @@ dependencies {
exclude group: 'org.eclipse.birt.runtime.3_7_1', module: 'org.apache.batik.pdf'
}
}
// If the example plugin misses the birt component can't build.
// If you want to use the birt component independently of the example plugin
// simply comment out or remove the line below.
apply from: '../example/build.gradle'
// Then the flexible report example will not work
// It's not an issue out of demonstration
// If needed simply remove the birt data related to the example component
+93
View File
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<ExampleType exampleTypeId="REAL_WORLD" description="Real World" parentTypeId=""/>
<ExampleType exampleTypeId="MADE_UP" description="Made Up" parentTypeId=""/>
<ExampleType exampleTypeId="CONTRIVED" description="Contrived" parentTypeId="MADE_UP"/>
<ExampleType exampleTypeId="INSPIRED" description="Inspired" parentTypeId="MADE_UP"/>
<ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" description="Required" parentTypeId=""/>
<ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" description="Desired" parentTypeId=""/>
<ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" description="Not Allowed" parentTypeId=""/>
<StatusType description="Example" statusTypeId="EXAMPLE_STATUS" hasTable="N" parentTypeId=""/>
<StatusItem description="In Design" sequenceId="01" statusCode="IN_DESIGN" statusId="EXST_IN_DESIGN" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Defined" sequenceId="02" statusCode="DEFINED" statusId="EXST_DEFINED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" statusId="EXST_APPROVED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Implemented" sequenceId="04" statusCode="IMPLEMENTED" statusId="EXST_IMPLEMENTED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Tested" sequenceId="05" statusCode="TESTED" statusId="EXST_TESTED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Complete" sequenceId="06" statusCode="COMPLETE" statusId="EXST_COMPLETE" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="EXST_CANCELLED" statusTypeId="EXAMPLE_STATUS"/>
<StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_DEFINED" transitionName="Definition Complete"/>
<StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_APPROVED" transitionName="Approve"/>
<StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_IMPLEMENTED" transitionName="Implementation Complete"/>
<StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_TESTED" transitionName="Testing Complete"/>
<StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_COMPLETE" transitionName="Example Completed"/>
<StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<EnumerationType description="Example Feature Source" enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N" parentTypeId=""/>
<Enumeration description="Customer" enumCode="CUSTOMER" enumId="EXFTSRC_CUSTOMER" sequenceId="01" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Enumeration description="Partner" enumCode="PARTNER" enumId="EXFTSRC_PARTNER" sequenceId="02" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Enumeration description="Employee" enumCode="EMPLOYEE" enumId="EXFTSRC_EMPLOYEE" sequenceId="03" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Example exampleId="EX01" exampleName="Example 1" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX02" exampleName="Example 2" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX03" exampleName="Example 3" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX04" exampleName="Example 4" exampleTypeId="REAL_WORLD" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX05" exampleName="Example 5" exampleTypeId="REAL_WORLD" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX06" exampleName="Example 6" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX07" exampleName="Example 7" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX08" exampleName="Example 8" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX09" exampleName="Example 9" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX10" exampleName="Example 10" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX11" exampleName="Example 11" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 11 description"/>
<Example exampleId="EX12" exampleName="Example 12" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 12 description"/>
<create>
<Example exampleId="EX13" exampleName="Example 13" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX14" exampleName="Example 14" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create>
<create-replace>
<Example exampleId="EX12" exampleName="Example 12 after replace" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create-replace>
<create-update>
<Example exampleId="EX12" exampleName="Example 11 after update" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create-update>
<delete>
<Example exampleId="EX09"/>
</delete>
<Example exampleId="EX10" exampleName="Example 10 after update"/>
<ExampleItem exampleId="EX01" exampleItemSeqId="00001" description="EX1-001" amount="10"/>
<ExampleItem exampleId="EX01" exampleItemSeqId="00002" description="EX1-002" amount="20"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00001" description="EX2-001" amount="10"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00002" description="EX2-002" amount="20"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00003" description="EX2-003" amount="30"/>
<ExampleStatus exampleId="EX01" statusDate="2010-01-02 00:00:00" statusEndDate="2011-01-02 00:00:00" statusId="EXST_IN_DESIGN"/>
<ExampleStatus exampleId="EX01" statusDate="2011-01-02 00:00:01" statusEndDate="2012-01-02 00:00:00" statusId="EXST_DEFINED"/>
<ExampleStatus exampleId="EX01" statusDate="2012-01-02 00:00:00" statusEndDate="2013-01-02 00:00:00" statusId="EXST_APPROVED"/>
<ExampleStatus exampleId="EX02" statusDate="2010-01-02 00:00:00" statusEndDate="2011-01-02 00:00:00" statusId="EXST_IN_DESIGN"/>
<ExampleStatus exampleId="EX02" statusDate="2011-01-02 00:00:01" statusEndDate="2012-01-02 00:00:00" statusId="EXST_DEFINED"/>
<ExampleStatus exampleId="EX02" statusDate="2012-01-02 00:00:00" statusEndDate="2013-01-02 00:00:00" statusId="EXST_APPROVED"/>
</entity-engine-xml>
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<DataResource dataResourceId="HELP_EXAMPLE" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Framework Example" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_EXAMPLE" contentTypeId="DOCUMENT" contentName="Framework Example" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_EXAMPLE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EXAMPLE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Exemple pour le développement" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_EXAMPLE_FR" contentTypeId="DOCUMENT" contentName="Exemple pour le développement" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_EXAMPLE_FR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html" localeString="fr" />
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="HELP_EXAMPLE_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
<DataResource dataResourceId="EXAMPLE_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EXAMPLE_main" contentTypeId="DOCUMENT" contentName="Example main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_main" fromDate="2006-01-12 01:01:01" contentAssocTypeId="TREE_CHILD" sequenceNum="000"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_FindExample" fromDate="2006-01-12 01:01:02" sequenceNum="000" contentAssocTypeId="INSTANCE"/>
<DataResource dataResourceId="EXAMPLE_docbook" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EXAMPLE_docbook" contentTypeId="DOCUMENT" contentName="Example Docbook usage" templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_docbook" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_docbook" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EXAMPLE_docbook"/>
</entity-engine-xml>
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<!-- PortalPortlet Seed Data: system pages -->
<PortalPage portalPageId="EXAMPLE" sequenceNum="0" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00001" columnWidthPixels="400"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
<PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_3" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
<PortalPage portalPageId="EXAMPLE1" sequenceNum="100" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 1" description="Portal page 1" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE1" columnSeqId="00001"/>
<PortalPagePortlet portalPageId="EXAMPLE1" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
<PortalPage portalPageId="EXAMPLE2" sequenceNum="200" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 2" description="Portal page 2" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE2" columnSeqId="00001"/>
<PortalPagePortlet portalPageId="EXAMPLE2" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
</entity-engine-xml>
+39
View File
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<PortalPortlet portalPortletId="EXAMPLE_1" portletName="Example 1" description="Example portlet n. 1"
screenName="ExamplePortlet1" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet1Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
screenshot="/themes/common/webapp/images/ofbiz_logo.png"/>
<PortalPortlet portalPortletId="EXAMPLE_2" portletName="Example 2" description="Example portlet n. 2"
screenName="ExamplePortlet2" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet2Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
screenshot="/images/opentravelsystem_logo.jpg"/>
<PortalPortlet portalPortletId="EXAMPLE_3" portletName="Example 3" description="Example portlet n. 3"
screenName="ExamplePortlet3" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet3Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"/>
<PortletCategory portletCategoryId="EXAMPLE" description="Example Portlet(s)"/>
<PortletPortletCategory portalPortletId="EXAMPLE_1" portletCategoryId="EXAMPLE"/>
<PortletPortletCategory portalPortletId="EXAMPLE_2" portletCategoryId="EXAMPLE"/>
<PortletPortletCategory portalPortletId="EXAMPLE_3" portletCategoryId="EXAMPLE"/>
</entity-engine-xml>
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<!-- Example security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="EXAMPLE_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="EXAMPLE_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="EXAMPLE_ADMIN"/>
</entity-engine-xml>
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
<!-- Example security -->
<SecurityPermission description="View operations in the Example Management Screens." permissionId="EXAMPLE_VIEW"/>
<SecurityPermission description="Create operations in the Example Management Screens." permissionId="EXAMPLE_CREATE"/>
<SecurityPermission description="Update operations in the Example Management Screens." permissionId="EXAMPLE_UPDATE"/>
<SecurityPermission description="Delete operations in the Example Management Screens." permissionId="EXAMPLE_DELETE"/>
<SecurityPermission description="ALL operations in the Example Management Screens." permissionId="EXAMPLE_ADMIN"/>
<!-- super user -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="EXAMPLE_ADMIN"/>
</entity-engine-xml>
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entity-engine-xml>
</entity-engine-xml>
-48
View File
@@ -1,48 +0,0 @@
# Report creation - Admin/Super-User #
## Introduction ##
A flexible report is an OFBiz content of FLEXIBLE\_REPORT type that allows a final user to make use of the reporting module to obtain flexible reports, ie reports which are created from an entity or view definition and even from a service. A flexible report is created from a Report Master (content REPORT_MASTER), and an optional XML override of the parent form.
## Pre-requisite ##
- OFBiz framework
- The Birt plugin
- The BIRT Report Designer
## Report creation ##
1. Get to Birt component in OFBiz ![Birt menus](https://cwiki.apache.org/confluence/download/attachments/68720496/Birt%20Menus.png?api=v2)
2. Click on the "Flexible Report" menu (varies depending on themes)
3. Click on the "Generate report" button, you get to this screen:
4. Fill the form:
![Example Report](https://cwiki.apache.org/confluence/download/attachments/68720496/Example%20Report.png?api=v2)
* The list "Choose report topic" will let you choose among predefined report masters your topic of interest.
* The report name is a simple short name from which the file name will be generated.
* The description is a short description which will allow you to recognise the report and its topic.
* The box "Generate filters in design" will add in the design the visualisation of the filters filled in the filtering form.
Finally, if you don't find what you want, you will need to create a new Report Master...
Once the form is validated, OFBiz will show you the "Edit Report" screen. ![Edit Report screen](https://cwiki.apache.org/confluence/download/attachments/68720496/Edit%20Report%20screen.png?api=v2)
## Report information ##
This first panel allows you to change the report description and status. Actually it does not make sense changing the status to published before having downloaded the .rptdesign file (Birt Report Designer file) from the server (in database), edited and uploaded it back to the server. This is explained in the section below. Changing the status allows users to use your reports. But if you publish without any change the report will render as empty.
## The .rptdesign report file: donwload, edit, upload and publish it ##
To really use the report you need to download the .rptdesign file from the server in a location from where you can edit it with the BIRT Report Designer. So you need to install first the BIRT Report Designer. Then you can edit the .rptdesign file in the BIRT Report Designer. For that refer to the ["Using the Birt Report Designer.md.html" file](https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/birt/documents/Using%20the%20Birt%20Report%20Designer.md.html). You can also find the Markdonw version in the same directory: ofbiz-framework/plugins/birt/documents
### Editing the downloaded file ###
Once you installed the BIRT Report Designer and have downloaded the .rptdesign file, you can edit it with the Birt Report Designer. When you have edited it suiting your needs you must upload it to the server for your changes to be taken into account by OFBiz.
<span style="color:red">**This is when things begin to be really interesting**.</span> You can then test your report using the "Preview" panel. There you can temporarily filter the result, and use the export format you prefer, once done click "Send". You can then decide to change the report content in the Birt Report Designer again or keep your changes. Once done in the Birt Report Designer, simply select the changed file to upload, and upload it again. You can re-test your changes and continue until you really get what you want! You can then publish the report to allow users to select and use it. There are 2 ways to publish a report from the "Manage reports" screen or directly in the "Report information" panel. We will see the "Manage reports" screen below.
## Filters Overriding ##
You may want to overide the default filters. You can then use the Xml "Override filters" panel to override and personnalize the form, once done click "Save". If you ignore that step, it will **NOT** prevent the report creation, **it is already done**, it will just be with the generic filtering form inherited from the master from.
>_Note_: if no preview is available, it is usually due to a mistake in the master form code. You can edit it in the database.
## Manage reports ##
The "Manage reports" button get you to a screen which allows to edit (get back to current page), publish or delete a report.
## Use a report ##
Users can select and use any published report from that screen. When they select a report they then get the same "Preview" Panel and can do the same things than in the "Edit Report" screen. Refer users to
@@ -1,18 +0,0 @@
# Using a flexible report - User #
## Introduction ##
A flexible report is an OFBiz content of FLEXIBLE_REPORT type which allows the final user to obtain reports using the Birt reporting module. It will be produced at a specific time of your choosing, with your chosen output format, filtering the data with a few parameters defined during report design creation.
## Pre-requisite ##
- OFBiz
- The Birt plugin
- Pre-published reports created from report masters
## Using the report ##
1. go to the Birt component or to another page harboring reports.
2. In the Birt component, click "Use a report".
3. Select your report and hit "Send".
4. The next screen will allow you to filter your data through a set of pre-defined criteria. Should you leave it empty, you will retrieve unfiltered data.
5. Select the desired export format
6. Upon validation, your report is now loaded and can be saved.
>_Note_: Report loading can be a bit long depending on the data treatment
@@ -1,72 +0,0 @@
# Using the Birt Report Designer - Admin/Super-User #
## Introduction ##
The creation of a flexible report goes through a design step of the initial flexible report output under the Birt Report Designer.
This document describes the simplest designs to connect to the data. It is not exhaustive, and simply attempts to cover basic needs. You will find much more documentation online. In our approach, the connection to the data is generated automatically by OFBiz, only the design part of the report will be discussed.
## Installing the BIRT Report Designer ##
Installing the BIRT Report Designer is easy. If you use Eclipse, you can include it as a plugin. You can also install the whole BIRT Report Designer. I use Eclipse but I prefer the second way, to not mix things. So simply download and install the whole all-in-one thing. Or install the plugin if you prefer and use its "Report Design" view which allows to edit .rptdesign files.
>_Note_: if you installed the BIRT Report Designer under say, a Birt directory, then by default the reports will be accessed from the Birt\workspace\Report Builder directly and this is where you should put the .rptdesign files when downloading them. Your mileage may wary...
## Different areas of the screen and their role ##
### Navigator - Report Builder ###
This is where you should find the .rptdesign files you downloaded.
![Report Builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Report%20Builder.png?api=v2)
### Data Explorer ###
The Data Explorer defaults to the right of your screen. It gives you access to two things. The data fields available for the report, and the filter fields that can be used for this report.
![Data Explorer](https://cwiki.apache.org/confluence/download/attachments/68720496/Data%20Explorer.png?api=v2)
### Palette ###
The palette provides the various tools you can insert in the report. Simple text, image, table of data, layout table, graph, aggregation, etc. All objects are added to the report by drag & drop.
![Palette](https://cwiki.apache.org/confluence/download/attachments/68720496/Palette.png?api=v2)
### Tabs ###
At the right bottom of the window is a series of five tabs.
We will use two:
- Layout, which will allow most of the design.
- Master Page, which will give access by its owners to standard parameters such as the orientation or size of the report.
The preview is not accessible because it can not be executed outside of OFBiz. Any changes to the scripts will be erased during the upload in OFBiz.
### Simple design without break ###
The simplest possible design is to insert in a table (table in the palette), a part or all of the data set data fields. To do this, right-click on Data Set in the Data Explorer -> Insert in Layout, and then select the fields you want to see appear.
### Simple design with break ###
A break is a collection of data made by Birt from the data. It permits to classify according to a field, and to give details for each category, then to aggregate certain fields, etc.
1. Insert a table (Table) in the report -> OK
2. Right-click on the table -> Edit Data Binding, select all fields
3. In the data set field, change "None" in "Data Set", validate
4. Right-click the table -> Insert Group. Configure your group, eg: ![group](https://cwiki.apache.org/confluence/download/attachments/68720496/Group.png?api=v2)
5. Your table then has five lines:
* A global title line
* A title line of the group
* A group detail line
* A footer of the group
* A global footer line
6. Then insert some elements in the design: in the global header, everything that does not depend on the group, for example the title of the report. In the header of the group, everything that is common to the whole group and that you want to see in its title. In the details, the fields that may appear for each group line. As in the image below, the fields might be inserted by Copy/Paste from the Data Set, and titles via a text element of the palette. You can add lines and columns by right clicking on the end of the line (gray rectangle when the table is selected), etc. ![Design with break](https://cwiki.apache.org/confluence/download/attachments/68720496/Design%20with%20break.png?api=v2)
#### Construction of aggregation ####
The aggregations may be on the whole table, or only on a group. They are characterized by an expression to aggregate (made up of different data fields), a possible filter on the data lines, and an aggregation function, eg:
![Aggregation builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Aggregation%20builder.png?api=v2)
#### Expression builder ####
The *fx* (for expression and filter) buttons are used to open a complex expression construction window. It is possible to use predefined functions, Javascript, data fields, already built aggregations, and so on. This window can also be used by including a data element, which allows to construct non-aggregated data expressions.
![Expression builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Expression%20builder.png?api=v2)
Footer lines often allow you to place aggregations, such as sums on the group or table rows, eg
![Design with break complete](https://cwiki.apache.org/confluence/download/attachments/68720496/Design%20with%20break%20complete.png?api=v2)
> Warning: any unused line must be deleted, otherwise it generates white spaces on the report.
## Layout Management ##
### General settings ###
Right button leads to Properties Editor tab at bottom. Then click on the Master Page tab, just above. In the Property Editor you will see a series of general properties that will allow you to modify the general form of the report.
### Styles ###
By right-clicking on any item in the table, you have access to the menu of styles. From there they can be edited, applied, created. A style can be applied to the whole picture, to a row or column, to a cell, or to an element in that cell (text, data, ...).
+2 -2
View File
@@ -24,7 +24,7 @@ under the License.
<description>None</description>
<version>1.0</version>
<view-entity entity-name="OrderAndProductStore" package-name="org.ofbiz.birt">
<view-entity entity-name="OrderAndProductStore" package-name="org.apache.ofbiz.birt">
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="PS" entity-name="ProductStore"/>
<alias-all entity-alias="PS"/>
@@ -34,7 +34,7 @@ under the License.
</view-link>
</view-entity>
<view-entity entity-name="InvoiceItemProductAndParty" package-name="org.ofbiz.birt">
<view-entity entity-name="InvoiceItemProductAndParty" package-name="org.apache.ofbiz.birt">
<member-entity entity-alias="INV" entity-name="Invoice"/>
<member-entity entity-alias="INITM" entity-name="InvoiceItem"/>
<member-entity entity-alias="PA" entity-name="Party"/>
+8
View File
@@ -31,6 +31,14 @@ under the License.
<entity-resource type="data" reader-name="demo" loader="main" location="data/BirtSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/BirtMasterData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleSecurityPermissionSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortalSeedData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleDemoData.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/ServiceReportsView.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
@@ -0,0 +1,79 @@
=== Report creation
==== Introduction
NOTE: This feature will begin to be officially available with the R17.12 branch first release
A flexible report is an OFBiz content of FLEXIBLE_REPORT type that allows a final user to make use of the reporting
module to obtain flexible reports, ie reports which are created from an entity or view definition and even from a
service. A flexible report is created from a Report Master (content REPORT_MASTER), and an optional XML override of the
parent form.
==== Pre-requisite
* OFBiz framework
* The Birt plugin
* The BIRT Report Designer: <<#_using_the_birt_report_designer,Using the Birt Report Designer>>
'''
. Get to Birt component in OFBiz image:Birt-Menus.png[Birt menus]
. Click on the "Flexible Report" menu (varies depending on themes)
. Click on the "Generate report" button, you get to this screen:
. Fill the form: image:Example-Report.png[Example Report]
** The list "Choose report topic" will let you choose among predefined report masters your topic of interest.
** The report name is a simple short name from which the file name will be generated.
** The description is a short description which will allow you to recognise the report and its topic.
** The box "Generate filters in design" will add in the design the visualisation of the filters filled in the filtering form.
Once the form is validated, OFBiz will show you the "Edit Report" screen.
image::Edit-Report-screen.png[Edit Report screen]
==== Report information
This first panel allows you to change the report description and status. Actually it does not make sense changing the
status to published before having downloaded the .rptdesign file (Birt Report Designer file) from the server (in
database), edited and uploaded it back to the server. This is explained in the section below. Changing the status allows
users to use your reports. But if you publish without any change the report will render as empty.
==== The .rptdesign report file: download, edit, upload and publish it
To really use the report you need to download the .rptdesign file from the server in a location from where you can edit
it with the BIRT Report Designer. So you need to install first the BIRT Report Designer. Then you can edit the
.rptdesign file in the BIRT Report Designer. For that refer to <<#_using_the_birt_report_designer,Using the Birt Report
Designer>>.
===== Editing the downloaded file
Once you installed the BIRT Report Designer and have downloaded the .rptdesign file, you can edit it with the Birt
Report Designer. When you have edited it suiting your needs you must upload it to the server for your changes to be
taken into account by OFBiz.
*This is when things begin to be really interesting*. You can then test your report using the "Preview" panel. There you
can temporarily filter the result, and use the export format you prefer, once done click "Send". You can then decide to
change the report content in the Birt Report Designer again or keep your changes. Once done in the Birt Report Designer,
simply select the changed file to upload, and upload it again. You can re-test your changes and continue until you
really get what you want! You can then publish the report to allow users to select and use it. There are 2 ways to
publish a report from the "Manage reports" screen or directly in the "Report information" panel. We will see the "Manage
reports" screen below.
==== Filters Overriding
You may want to overide the default filters. You can then use the Xml "Override filters" panel to override and
personnalize the form, once done click "Save". If you ignore that step, it will *NOT* prevent the report creation, *it
is already done*, it will just be with the generic filtering form inherited from the master from.
NOTE: if no preview is available, it is usually due to a mistake in the master form code. You can edit it in the
database.
==== Manage reports
The "Manage reports" button get you to a screen which allows to edit (get back to current page), publish or delete a
report.
==== Use a report
Users can select and use any published report from that screen. When they select a report they then get the same
"Preview" Panel and can do the same things than in the "Edit Report" screen. Refer users to
@@ -0,0 +1,25 @@
=== Using a flexible report
==== Introduction
NOTE: this feature will be officially available with the R17.12 branch first release
A flexible report is an OFBiz content of FLEXIBLE_REPORT type which allows the final user to obtain reports using the
Birt reporting module. It will be produced at a specific time of your choosing, with your chosen output format,
filtering the data with a few parameters defined during report design creation.
==== Pre-requisite
* OFBiz
* The Birt plugin
* Pre-published reports created from report masters
==== Using the report
. go to the Birt component or to another page harboring reports.
. In the Birt component, click "Use a report".
. Select your report and hit "Send".
. The next screen will allow you to filter your data through a set of pre-defined criteria. Should you leave it empty, you will retrieve unfiltered data.
. Select the desired export format
. Upon validation, your report is now loaded and can be saved.
@@ -1,27 +1,35 @@
# Report master creation #
=== Report master creation
## Introduction ##
A report master is an OFBiz content which allows a user to generate data reports. It defines data connexion, and a general filtering form for data. It can be based on an entity, a dedicated service, or in a wider sense on any shape a data connexion can take and return back a map.
==== Introduction
## Pre-requisite ##
- OFBiz
- Birt plugin
NOTE: this feature will be officially available with the R17.12 branch first release
## Report Master based on an entity/view ##
A report master is an OFBiz content which allows a user to generate data reports.
It defines data connexion, and a general filtering form for data.
It can be based on an entity, a dedicated service, or in a wider sense on any shape
a data connexion can take and return back a map.
==== Pre-requisite
1. Create or choice a database entity or view
2. Create the general filtering form within the file plugins/birt/widget/birt/BirtMasterForms.xml. The only informations to be changed are entity-name and form name.
* OFBiz
* Birt plugin
```xml
<form name="CTNT_MASTER_EXAMPLE" type="single" extends="AbstractFlexibleReportSearchForm">
==== Report Master based on an entity/view
. Create or choice a database entity or view
. Create the general filtering form within the file plugins/birt/widget/birt/BirtMasterForms.xml. The only informations to be changed are entity-name and form name.
[source,xml]
----
<form name="CTNT_MASTER_EXAMPLE" type="single" extends="AbstractFlexibleReportSearchForm">
<auto-fields-entity entity-name="Example" default-field-type="find"/>
</form>
```
----
[start=3]
. Add the informations about this Master in the database using the file
plugins/birt/data/BirtMasterData.xml
3. Add the informations about this Master in the database using the file plugins/birt/data/BirtMasterData.xml
```xml
[source,xml]
----
<DataResource dataResourceId="DR_MASTER_EXAMPLE" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" />
<ElectronicText dataResourceId="DR_MASTER_EXAMPLE">
<textData><![CDATA[<!--default domain form-->
@@ -32,53 +40,75 @@ A report master is an OFBiz content which allows a user to generate data reports
<Content contentId="CTNT_MASTER_EXAMPLE" contentTypeId="REPORT_MASTER" dataResourceId="DR_MASTER_EXAMPLE" statusId="CTNT_PUBLISHED" contentName="Example" description="Master Content for Example" />
<!-- Data retrieval will be done using perform find on entity Example-->
<ContentAttribute contentId="CTNT_MASTER_EXAMPLE" attrName="Entity" attrValue="Example"/>
```
----
The form in the database is the form that will allow users to change form parameters. You can add any field you desire. Some field names are though reserved: reportContentId, overrideFilters, entityViewName, birtContentType.
The form in the database is the form that will allow users to change form parameters.
You can add any field you desire. Some field names are though reserved: reportContentId, overrideFilters,
entityViewName, birtContentType.
[start=4]
. Add in the file content/config/contentEntityLabels.xml the Property that will allow translation
for your report master description.
4. Add in the file content/config/contentEntityLabels.xml the Property that will allow translation for your report master description.
```xml
[source,xml]
----
<property key="Content.description.CTNT_MASTER_EXAMPLE">
<value xml:lang="en">Example</value>
<value xml:lang="fr">Exemple</value>
</property>
```
----
Your Report Master is created ! You can now create reports using it.
Your Report Master is created ! You can now create reports using it.
## Report Master based on a service ##
Create in plugins/birt/src/org/ofbiz/birt/birt/BirtMasterReportServices.java 2 dedicated services (see examples there)
==== Report Master based on a service
1. The first one, which name will return 4 items:
* an object of type Map<String, String> called dataMap. **Keys**: data field names. **Values**: data types (OFBiz types).
* an object of type Map<String, String> called fieldDisplayLabels. **Keys**: data field names. **Values**: the names displayed to the user. This output is optional, should it be missing, the keys will be displayed.
* an object of type Map<String, String> called filterMap. **Keys**: data filtering field names (exact names used for the form fields). **Values**: data type (OFBiz type). This output is optional, if missing, filters can not be displayed on the report.
* an object of type Map<String, String> called filterDisplayLabels. **Keys**: data filtering field names (exact names used for the form fields). **Values**: names to be displayed to the user. This output is optional, should it be missing, the keys will be displayed.
2. The second service will actually get the data. It receives an object (Object type) called reportContext. From this object, you can obtain the map parameters using the following code:
In plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java there is 2 sets of dedicated services (see examples there)
```java
Map<String, Object> parameters = (Map<String, Object>) reportContext.getParameterValue("parameters");
```
. In each set the first service, will return 4 items:
** an object of type Map<String, String> called dataMap.
*Keys*: data field names. *Values*: data types (OFBiz types).
** an object of type Map<String, String> called fieldDisplayLabels.
*Keys*: data field names. *Values*: the names displayed to the user.
This output is optional, should it be missing, the keys will be displayed.
** an object of type Map<String, String> called filterMap.
*Keys*: data filtering field names (exact names used for the form fields).
*Values*: data type (OFBiz type).
This output is optional, if missing, filters can not be displayed on the report.
** an object of type Map<String, String> called filterDisplayLabels.
*Keys*: data filtering field names (exact names used for the form fields).
*Values*: names to be displayed to the user.
This output is optional, should it be missing, the keys will be displayed.
. The second service will actually get the data. It receives an object (Object type) called reportContext.
From this object, you can obtain the map parameters using the following code:
[source,java]
----
Map<String, Object> parameters = UtilGenerics.checkMap(reportContext.getParameterValue("parameters"));
----
This Map will give access fields of the filtering form.
This service will return a list called list of type List<GenericValue>, containing the data. A Map<String, Object> would also do.
This service will return a list of type List<GenericValue>, containing the data.
A Map<String, Object> would also do.
3. create the parent form in the file plugins/birt/widget/birt/BirtMasterForms.xml.
Field names created here must be then names used on the Map parameters of the previous service, and also corresponding to the map filterMap.
Then,
```xml
. create the parent form in the file plugins/birt/widget/birt/BirtMasterForms.xml.
Field names created here must be the names used on the Map parameters of the previous service,
and also corresponding to the map filterMap.
[source,xml]
----
<form name="CTNT_MASTER_TURNOVER" type="single" extends="AbstractFlexibleReportSearchForm">
<field name="fromDate"><date-time type="date"/></field>
<field name="thruDate"><date-time type="date"/></field>
<field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field>
<field name="productStoreId"><lookup target-form-name="LookupProductStore"/></field>
</form>
```
----
[start=2]
. Create the master in database following.
4. Create the master in database following.
```xml
[source,xml]
----
<CustomMethod customMethodId="CM_FB_TURNOVER" customMethodTypeId="FLEXIBLE_BIRT" customMethodName="flexibleReportTurnOver" description="service to resolve invoice for turnover report domain"/>
<DataResource dataResourceId="DR_MASTER_TURNOVER" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" />
<ElectronicText dataResourceId="DR_MASTER_TURNOVER">
@@ -93,21 +123,28 @@ Field names created here must be then names used on the Map parameters of the pr
Second, the custom method gives the service to retrieve all data in the report design.
Here : flexibleReportTurnOverPrepareFields (customMethodName + "prepareFields") then flexibleReportTurnOver-->
<ContentAttribute contentId="CTNT_MASTER_TURNOVER" attrName="Service" attrValue="default"/>
```
----
The form in the database is the form that will allow users to change form parameters. You can add any field you desire. Some field names are reserved: reportContentId, overrideFilters, entityViewName, birtContentType.
The form in the database is the form that will allow users to change form parameters.
You can add any field you desire. Some field names are reserved: reportContentId, overrideFilters,
entityViewName, birtContentType.
[start=3]
. Import these data in the base using Webtools XML import (or the longer "gradlew 'ofbiz -l readers=seed,ext' command).
. Add in the file content/config/contentEntityLabels.xml the Property which will translate your report Master description.
5. Import these data in the base using Webtools XML import (or the longer "gradlew 'ofbiz -l readers=seed,ext' command).
6. Add in the file content/config/contentEntityLabels.xml the Property which will translate your report Master description.
```xml
[source,xml]
----
<property key="Content.description.CTNT_MASTER_TURNOVER">
<value xml:lang="en">Turnover (product)</value>
<value xml:lang="fr">Rotation (des stocks)</value>
</property>
```
----
==== Entities diagram
Entities diagram
-----------------
The following diagram shows the Entities linked with Content to store report_master/report.
![Report_Master](https://cwiki.apache.org/confluence/download/attachments/68720496/Report_Master.png?api=v2)
image::Report-Master.png[Report Master]
@@ -0,0 +1,116 @@
=== Using the Birt Report Designer
==== Introduction
NOTE: this feature will be officially available with the R17.12 branch first release
The creation of a flexible report goes through a design step of the initial flexible report output under the Birt Report
Designer.
This document describes the simplest designs to connect to the data. It is not exhaustive, and simply attempts to cover
basic needs. You will find much more documentation online. In our approach, the connection to the data is generated
automatically by OFBiz, only the design part of the report will be discussed.
==== Installing the BIRT Report Designer
Installing the BIRT Report Designer is easy. If you use Eclipse, you can include it as a plugin. You can also install
the whole BIRT Report Designer. I use Eclipse but I prefer the second way, to not mix things. So simply download and
install the whole all-in-one thing. Or install the plugin if you prefer and use its "Report Design" view which allows to
edit .rptdesign files.
NOTE: if you installed the BIRT Report Designer under say, a Birt directory, then by default the reports will be
accessed from the Birt\workspace\Report Builder directly and this is where you should put the .rptdesign files when
downloading them. Your mileage may wary...
==== Different areas of the screen and their role
===== Navigator - Report Builder
This is where you should find the .rptdesign files you downloaded.
image::Report-Builder.png[Report Builder]
===== Data Explorer
The Data Explorer defaults to the right of your screen. It gives you access to two things. The data fields available for
the report, and the filter fields that can be used for this report.
image::Data-Explorer.png[Data Explorer]
===== Palette
The palette provides the various tools you can insert in the report. Simple text, image, table of data, layout table,
graph, aggregation, etc. All objects are added to the report by drag & drop.
image::Palette.png[Palette]
===== Tabs
At the right bottom of the window is a series of five tabs.
We will use two:
* Layout, which will allow most of the design.
* Master Page, which will give access by its owners to standard parameters such as the orientation or size of the report.
The preview is not accessible because it can not be executed outside of OFBiz. Any changes to the scripts will be erased
during the upload in OFBiz.
===== Simple design without break
The simplest possible design is to insert in a table (table in the palette), a part or all of the data set data fields.
To do this, right-click on Data Set in the Data Explorer \-> Insert in Layout, and then select the fields you want to
see appear.
===== Simple design with break
A break is a collection of data made by Birt from the data. It permits to classify according to a field, and to give
details for each category, then to aggregate certain fields, etc.
. Insert a table (Table) in the report \-> OK
. Right-click on the table \-> Edit Data Binding, select all fields
. In the data set field, change "None" in "Data Set", validate
. Right-click the table \-> Insert Group. Configure your group, eg: image:Group.png[group]
. Your table then has five lines:
** A global title line
** A title line of the group
** A group detail line
** A footer of the group
** A global footer line
. Then insert some elements in the design: in the global header, everything that does not depend on the group, for example the title of the report. In the header of the group, everything that is common to the whole group and that you want to see in its title. In the details, the fields that may appear for each group line. As in the image below, the fields might be inserted by Copy/Paste from the Data Set, and titles via a text element of the palette. You can add lines and columns by right clicking on the end of the line (gray rectangle when the table is selected), etc.
image::Design-with-break.png[Design with break]
====== Construction of aggregation
The aggregations may be on the whole table, or only on a group. They are characterized by an expression to aggregate
(made up of different data fields), a possible filter on the data lines, and an aggregation function, eg:
image::Aggregation-builder.png[Aggregation builder]
====== Expression builder
The _fx_ (for expression and filter) buttons are used to open a complex expression construction window. It is possible
to use predefined functions, Javascript, data fields, already built aggregations, and so on. This window can also be
used by including a data element, which allows to construct non-aggregated data expressions.
image::Expression-builder.png[Expression builder]
Footer lines often allow you to place aggregations, such as sums on the group or table rows, eg
image::Design-with-break-complete.png[Design with break complete]
WARNING: any unused line must be deleted, otherwise it generates white spaces on the report.
==== Layout Management
===== General settings
Right button leads to Properties Editor tab at bottom. Then click on the Master Page tab, just above. In the Property
Editor you will see a series of general properties that will allow you to modify the general form of the report.
===== Styles
By right-clicking on any item in the table, you have access to the menu of styles. From there they can be edited,
applied, created. A style can be applied to the whole picture, to a row or column, to a cell, or to an element in that
cell (text, data, ...).
+44
View File
@@ -0,0 +1,44 @@
////
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.
////
= Birt Apache OFBiz® plugin
The Apache OFBiz Project
Release 17.12
:imagesdir: ./images
ifdef::backend-pdf[]
:title-logo-image: image::OFBiz-Logo.svg[Apache OFBiz Logo, pdfwidth=4.25in, align=center]
:source-highlighter: rouge
endif::[]
The birt plugin is one of the OFBiz plugins.
== OFBiz Flexible Reports
One of the functionalities of the birt plugin are the "OFBiz Flexible Reports"
NOTE: This feature will begin to be officially available with the R17.12 branch first release
There is an anounce with some history in the OFBiz blog:
https://blogs.apache.org/ofbiz/entry/the-birt-flexible-reports-a[Reporting in Apache OFBiz® and the OFBiz Flexible Reports]
=== Technical Documentation
include::_include/bt-creating reports.adoc[leveloffset=+1]
include::_include/bt-using the birt report designer.adoc[leveloffset=+1]
include::_include/bt-report master creation.adoc[leveloffset=+1]
=== User documentation
include::_include/bt-how to use flexible reports.adoc[leveloffset=+1]
Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 KiB

@@ -263,7 +263,8 @@ public final class BirtWorker {
String reportForm = (String) resultElectronicText.get("textData");
if (!reportForm.startsWith("<?xml")) {
StringBuffer xmlHeaderForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:targetNamespace=\"http://ofbiz"
+ ".apache.org/dtds/widget-form.xsd\">");
xmlHeaderForm.append(reportForm);
xmlHeaderForm.append("</forms>");
reportForm = xmlHeaderForm.toString();
@@ -47,8 +47,8 @@ import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.widget.model.ThemeFactory;
import org.apache.ofbiz.widget.renderer.ScreenRenderer;
@@ -91,6 +91,9 @@ public class BirtEmailServices {
String birtImageDirectory = (String) serviceContext.remove(BirtWorker.getBirtImageDirectory());
String birtContentType = (String) serviceContext.remove(BirtWorker.getBirtContentType());
VisualTheme visualTheme = (VisualTheme) context.get("visualTheme");
if (visualTheme == null) {
visualTheme = ThemeFactory.resolveVisualTheme(null);
}
if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null);
if (bodyParameters == null) {
bodyParameters = MapStack.create();
@@ -311,7 +311,9 @@ public class BirtServices {
try {
GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", reportContentId).queryOne();
String dataResourceId = content.getString("dataResourceId");
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3"
+ ".org/2001/XMLSchema-instance\" xsi:targetNamespace=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
newForm.append(overrideFilters);
newForm.append("</forms>");
Document xmlForm = UtilXml.readXmlDocument(newForm.toString());
@@ -725,7 +727,7 @@ public class BirtServices {
// user file is deleted straight away to prevent the use of the report as script entry (security)
Path path = Paths.get(nameTempRpt);
Files.deleteIfExists(path);
} catch (Exception e) {
} catch (DesignFileException | IOException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorInuploadRptDesignNoFile", locale));
}
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Accounting Manager</display-name>
<description>Accounting Manager Module of the Apache OFBiz Project</description>
@@ -63,6 +63,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -71,6 +76,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -89,6 +98,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+13 -11
View File
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - BIRT Component</display-name>
<description>BIRT Component of the Apache OFBiz Project</description>
@@ -35,16 +35,6 @@ under the License.
<param-name>mainDecoratorLocation</param-name>
<param-value>component://birt/widget/birt/BirtScreens.xml</param-value>
</context-param>
<context-param>
<description>Enable widget boundary comments. See org.apache.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
<param-name>widgetVerbose</param-name>
<param-value>false</param-value>
</context-param>
<context-param>
<description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
</context-param>
<filter>
<display-name>ControlFilter</display-name>
@@ -64,6 +54,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -72,6 +67,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -142,6 +141,9 @@ under the License.
<url-pattern>/extract</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Facility Manager</display-name>
<description>Facility Manager Module of the Apache OFBiz Project</description>
@@ -63,6 +63,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -71,6 +76,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -100,6 +109,10 @@ under the License.
<url-pattern>/ShippingAPI.dll</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Order Manager</display-name>
<description>Order Manager Module of the Apache OFBiz Project</description>
@@ -58,6 +58,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -66,6 +71,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -96,6 +105,10 @@ under the License.
<url-pattern>/products/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
@@ -53,7 +53,7 @@ import org.apache.ofbiz.webapp.stats.VisitHandler;
// Used to filter website on the basis of hosted pathAlias.
public class WebSiteFilter implements Filter {
public static final String MODULE = WebSiteFilter.class.getName();
public static final String module = WebSiteFilter.class.getName();
protected FilterConfig m_config = null;
@@ -87,7 +87,7 @@ public class WebSiteFilter implements Filter {
webSite = EntityQuery.use(delegator).from("WebSite").where("isDefault", "Y").cache().queryFirst();
}
} catch (GenericEntityException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
if (webSite != null) {
webSiteId = webSite.getString("webSiteId");
@@ -95,7 +95,7 @@ public class WebSiteFilter implements Filter {
try {
productStore = webSite.getRelatedOne("ProductStore", false);
} catch (GenericEntityException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
String newLocale = request.getParameter("newLocale");
@@ -122,7 +122,7 @@ public class WebSiteFilter implements Filter {
try {
cart.setCurrency(dispatcher, productStore.getString("defaultCurrencyUomId"));
} catch (CartItemModifyException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
}
session.removeAttribute("webSiteId");
@@ -151,7 +151,7 @@ public class WebSiteFilter implements Filter {
try {
security = SecurityFactory.getInstance(delegator);
} catch (SecurityConfigurationException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
request.setAttribute("delegator", delegator);
request.setAttribute("dispatcher", dispatcher);
+5 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - CMS Site</display-name>
<description>CMS Site for the Apache OFBiz Project</description>
@@ -75,6 +75,10 @@ under the License.
<url-pattern>/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
+14 -1
View File
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Ebay</display-name>
<description>eBay component of the Apache OFBiz Project</description>
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -86,6 +95,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+1 -1
View File
@@ -491,7 +491,7 @@ under the License.
<attribute name="itemId" mode="IN" type="String" optional="false"/>
<attribute name="listingType" mode="IN" type="String" optional="true"/>
<attribute name="title" mode="IN" type="String" optional="true"/>
<attribute name="description" mode="IN" type="String" allow-html="any"/>
<attribute name="description" mode="IN" type="String" allow-html="safe"/>
<attribute name="price" mode="IN" type="String" optional="true"/>
<attribute name="currencyId" mode="IN" type="String" optional="true"/>
<attribute mode="IN" name="imageData" optional="true" type="java.nio.ByteBuffer"/>
@@ -40,6 +40,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.imageio.ImageIO;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
@@ -2258,12 +2259,20 @@ public class EbayStore {
// Upload image to ofbiz path /runtime/tmp .
ByteBuffer byteWrap = (ByteBuffer) context.get("imageData");
File file = new File(System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName);
String fileToCheck = System.getProperty("ofbiz.home"), "runtime" + File.separator + "tmp" + File.separator + imageFileName;
File file = new File(fileToCheck);
FileOutputStream fileOutputStream = new FileOutputStream(file, false);
FileChannel wChannel = fileOutputStream.getChannel();
wChannel.write(byteWrap);
wChannel.close();
fileOutputStream.close();
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image")) {
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
return ServiceUtil.returnError(errorMessage);
}
// Set path file picture to api and set picture details.
String [] pictureFiles = {System.getProperty("ofbiz.home") + File.separator + "runtime" + File.separator + "tmp" + File.separator + imageFileName};
+14 -1
View File
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - eBay Store</display-name>
<description>eBay Store component of the Apache OFBiz Project</description>
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -86,6 +95,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+15
View File
@@ -789,6 +789,21 @@
<value xml:lang="zh">继续步骤</value>
<value xml:lang="zh-TW">繼續步驟</value>
</property>
<property key="EcommerceCookieConsentTitle">
<value xml:lang="en">This website uses cookies</value>
</property>
<property key="EcommerceCookieConsentMessage">
<value xml:lang="en">We use cookies to provide our services. By using this website, you agree to this.</value>
</property>
<property key="EcommerceCookieConsentMoreLinkLabel">
<value xml:lang="en">More</value>
</property>
<property key="EcommerceCookieConsentAcceptButtonLabel">
<value xml:lang="en">Accept</value>
</property>
<property key="EcommerceCookieConsentAdvancedButtonLabel">
<value xml:lang="en">Customize</value>
</property>
<property key="EcommerceDataResourceId">
<value xml:lang="da">Dataresurse Id</value>
<value xml:lang="de">Datenressource ID</value>
@@ -286,4 +286,46 @@
<ContentAssoc contentId="CPROMO-001DESCEN" contentIdTo="CPROMO-001DESCFR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2007-12-28 00:00:00.0"/>
<!-- Services category -->
<DataResource dataResourceId="DRSERV-001DESCFR" dataResourceTypeId="ELECTRONIC_TEXT" localeString="fr"/>
<DataResource dataResourceId="DRSERV-001DESCEN" dataResourceTypeId="ELECTRONIC_TEXT" localeString="en"/>
<ElectronicText dataResourceId="DRSERV-001DESCFR" textData="Prestations de service"/>
<ElectronicText dataResourceId="DRSERV-001DESCEN" textData="Services"/>
<Content contentId="CSERV-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRSERV-001DESCFR" description="DESCRIPTION FR Prestations de service" localeString="fr"/>
<Content contentId="CSERV-001DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRSERV-001DESCEN" description="DESCRIPTION EN Services" localeString="en"/>
<ProductCategoryContent productCategoryId="SERV-001" contentId="CSERV-001DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2007-12-28 00:00:00.0"/>
<ContentAssoc contentId="CSERV-001DESCEN" contentIdTo="CSERV-001DESCFR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2007-12-28 00:00:00.0"/>
<!-- Dropship Products category -->
<DataResource dataResourceId="DRDS-001DESCFR" dataResourceTypeId="ELECTRONIC_TEXT" localeString="fr"/>
<DataResource dataResourceId="DRDS-001DESCEN" dataResourceTypeId="ELECTRONIC_TEXT" localeString="en"/>
<ElectronicText dataResourceId="DRDS-001DESCFR" textData="Produits vendus en mode DropShip"/>
<ElectronicText dataResourceId="DRDS-001DESCEN" textData="DropShip Products"/>
<Content contentId="CDS-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRDS-001DESCFR" description="DESCRIPTION FR Produits DropShip" localeString="fr"/>
<Content contentId="CDS-001DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRDS-001DESCEN" description="DESCRIPTION EN DropShip Products" localeString="en"/>
<ProductCategoryContent productCategoryId="dropShip" contentId="CDS-001DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2007-12-28 00:00:00.0"/>
<ContentAssoc contentId="CDS-001DESCEN" contentIdTo="CDS-001DESCFR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2007-12-28 00:00:00.0"/>
<!-- Account Activation category -->
<DataResource dataResourceId="DRAA-001DESCFR" dataResourceTypeId="ELECTRONIC_TEXT" localeString="fr"/>
<DataResource dataResourceId="DRAA-001DESCEN" dataResourceTypeId="ELECTRONIC_TEXT" localeString="en"/>
<ElectronicText dataResourceId="DRAA-001DESCFR" textData="Activation de compte"/>
<ElectronicText dataResourceId="DRAA-001DESCEN" textData="Account Activation"/>
<Content contentId="CAA-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRAA-001DESCFR" description="DESCRIPTION FR Activation de compte" localeString="fr"/>
<Content contentId="CAA-001DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRAA-001DESCEN" description="DESCRIPTION EN Account Activation" localeString="en"/>
<ProductCategoryContent productCategoryId="FA-100" contentId="CAA-001DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2007-12-28 00:00:00.0"/>
<ContentAssoc contentId="CAA-001DESCEN" contentIdTo="CAA-001DESCFR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2007-12-28 00:00:00.0"/>
</entity-engine-xml>
@@ -98,4 +98,24 @@ under the License.
contentName="Store Policies 2" description="Store Policies 2 Description" mimeTypeId="text/html" localeString="en_US" createdDate="2001-05-13 12:00:00.000" createdByUserLogin="admin"/>
<ContentAssoc contentId="WebStoreCONTENT" contentIdTo="STORE_POLICIES2" mapKey="policies2" contentAssocTypeId="SUB_CONTENT"
fromDate="2001-05-13 12:00:00.000" createdDate="2001-05-13 12:00:00.000" createdByUserLogin="admin"/>
<DataResource dataResourceId="COOKIE_POLICY" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Store Policies"/>
<ElectronicText dataResourceId="COOKIE_POLICY">
<textData><![CDATA[
<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
<p>
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.
Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.
Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
</p>
]]></textData>
</ElectronicText>
<Content contentId="COOKIE_POLICY" contentTypeId="DOCUMENT" ownerContentId="WebStoreCONTENT" dataResourceId="COOKIE_POLICY"
contentName="Cookie Policy" description="Cookie Policy Description" mimeTypeId="text/html" localeString="en_US" createdDate="2001-05-13 12:00:00.000" createdByUserLogin="admin"/>
<ContentAssoc contentId="WebStoreCONTENT" contentIdTo="COOKIE_POLICY" mapKey="cookiePolicy" contentAssocTypeId="SUB_CONTENT"
fromDate="2001-05-13 12:00:00.000" createdDate="2001-05-13 12:00:00.000" createdByUserLogin="admin"/>
</entity-engine-xml>
@@ -21,6 +21,7 @@ import org.apache.ofbiz.product.category.*
import org.apache.ofbiz.base.util.UtilValidate
parentCategoryStr = parameters.parentCategoryStr
productCategoryId=parameters.category_id
if(!UtilValidate.isEmpty(parentCategoryStr)) {
pathList = parentCategoryStr.split('/')
cateList = []
@@ -47,6 +47,7 @@ if (!parameters.clearSearch || !"N".equals(parameters.clearSearch)) {
ProductSearchSession.searchClear(session)
}
request.getSession().setAttribute("dispatcher",dispatcher)
ProductSearchSession.processSearchParameters(parameters, request)
prodCatalogId = CatalogWorker.getCurrentCatalogId(request)
result = ProductSearchSession.getProductSearchResult(request, delegator, prodCatalogId)
@@ -86,7 +86,7 @@ if (featureIdByType) {
if (searcher) {
Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), "")
TopScoreDocCollector collector = TopScoreDocCollector.create(100) //defaulting to 100 results
TopScoreDocCollector collector = TopScoreDocCollector.create(100, 100) //defaulting to 100 results
searcher.search(combQuery.build(), collector)
ScoreDoc[] hits = collector.topDocs().scoreDocs
Debug.logInfo("in search, hits:" + collector.getTotalHits(), "")
@@ -143,7 +143,7 @@ if (shoppingListId) {
context.shoppingListItemDatas = shoppingListItemDatas
// pagination for the shopping list
viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 1)
viewSize = parameters.VIEW_SIZE ?: visualTheme.getModelTheme().getDefaultViewSize()?:20
viewSize = parameters.VIEW_SIZE ? Integer.valueOf(parameters.VIEW_SIZE) : visualTheme.getModelTheme().getDefaultViewSize()?:20
listSize = shoppingListItemDatas ? shoppingListItemDatas.size() : 0
lowIndex = ((viewIndex - 1) * viewSize) + 1
@@ -168,6 +168,20 @@ under the License.
</if-compare>
</else>
</if-compare>
<if-compare operator="not-equals" field="parameters.UNUSEEMAIL" value="on">
<if>
<condition>
<not>
<if-regexp field="parameters.USERNAME" expr="^[.a-zA-Z0-9_-]+$"></if-regexp>
</not>
</condition>
<then>
<add-error>
<fail-property resource="PartyUiLabels" property="NotValidUserName"/>
</add-error>
</then>
</if>
</if-compare>
<!-- Create the Home Phone -->
<if-not-empty field="parameters.CUSTOMER_HOME_CONTACT">
+4 -2
View File
@@ -56,12 +56,14 @@ under the License.
server="default-server"
location="webapp/ecommerce"
mount-point="/ecommerce"
app-bar-display="false"/>
app-bar-display="false"
use-autologin-cookie="true"/>
<webapp name="ecomseo"
title="SEO enhanced eCommerce"
server="default-server"
location="webapp/ecomseo"
mount-point="/ecomseo"
app-bar-display="false"/>
app-bar-display="false"
use-autologin-cookie="true"/>
</ofbiz-component>
@@ -0,0 +1,57 @@
<#--
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.
-->
<#if productPromoCategoryIncludeList?has_content || productPromoCategoryExcludeList?has_content || productPromoCategoryAlwaysList?has_content>
<div class="card">
<div class="card-header">
${uiLabelMap.OrderPromotionCategories}
</div>
<div class="card-body">
<#if productPromoCategoryIncludeList?has_content>
<div>${uiLabelMap.OrderPromotionProductsInCategories}:</div>
<#list productPromoCategoryIncludeList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
-&nbsp;<a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryExcludeList?has_content>
<div>${uiLabelMap.OrderExcludeCategories}</div>
<#list productPromoCategoryExcludeList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
-&nbsp;<a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryAlwaysList?has_content>
<div>${uiLabelMap.OrderAlwaysList}</div>
<#list productPromoCategoryAlwaysList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
<div>
-&nbsp;<a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
</#list>
</#if>
</div>
</div>
</#if>
@@ -0,0 +1,28 @@
<#--
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.
-->
<div class="card">
<div class="card-header">
${uiLabelMap.OrderPromotionDetails}
</div>
<div class="card-body">
<div>${StringUtil.wrapString(productPromo.promoText!)}</div>
<div>${uiLabelMap.OrderGeneratedDescription} ${promoAutoDescription!}</div>
</div>
</div>
@@ -0,0 +1,63 @@
<#--
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.
-->
<#if productIds?has_content>
<div class="card promotion-products">
<div class="card-header">
${uiLabelMap.OrderProductsForPromotion}
</div>
<div class="card-body">
<table class="table table-responsive-sm">
<thead>
<tr>
<th>${uiLabelMap.CommonQualifier}</th>
<th>${uiLabelMap.CommonBenefit}</th>
<th class="text-right">
<#if (listSize > 0)>
<#if (viewIndex > 0)>
<a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId!}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
<#if (listSize > highIndex)>
| <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId!}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
</#if>
</b>
</#if>
</th>
</tr>
</thead>
<tbody>
<#if (listSize > 0)>
<#list productIds[lowIndex..highIndex-1] as productId>
<tr>
<td>[<#if productIdsCond.contains(productId)>x<#else>&nbsp;</#if>]</td>
<td>[<#if productIdsAction.contains(productId)>x<#else>&nbsp;</#if>]</td>
<td>
${setRequestAttribute("optProductId", productId)}
${setRequestAttribute("listIndex", productId_index)}
${screens.render(productsummaryScreen)}
</td>
</tr>
</#list>
</#if>
</tbody>
</table>
</div>
</div>
</#if>
@@ -0,0 +1,38 @@
<#--
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.
-->
<div class="card">
<div class="card-header">${uiLabelMap.OrderSpecialOffers}</div>
<div class="card-body">
<table class="table table-responsive-sm">
<#-- show promotions text -->
<tbody>
<#list productPromosAllShowable as productPromo>
<tr>
<td><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a></td>
<td>${StringUtil.wrapString(productPromo.promoText!)}</td>
</tr>
</#list>
</tbody>
</table>
</div>
</div>
<#if (shoppingCartSize > 0)>
${screens.render(promoUseDetailsInlineScreen)}
</#if>
+12 -12
View File
@@ -142,7 +142,7 @@ under the License.
</a>-->
<#if (shoppingCartSize > 0)>
<li class="list-inline-item">
<a href=";">
<a href="javascript:document.cartform.submit();">
${uiLabelMap.EcommerceRecalculateCart}
</a>
</li>
@@ -262,7 +262,7 @@ under the License.
</#if>
<#assign smallImageUrl =
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(
cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "url")! />
cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher, "html")! />
<#if !smallImageUrl?string?has_content>
<#assign smallImageUrl = "/images/defaultImage.jpg" />
</#if>
@@ -445,13 +445,13 @@ under the License.
<td>
</#if>
<input class="inputBox form-control" type="number" name="update_${cartLineIndex}"
value="${cartLine.getQuantity()?string.number}" />
value="${cartLine.getQuantity()?string.number}" min="1" />
</td>
</tr>
</table>
<#else><#-- fixedAssetExist -->
<input class="inputBox form-control" type="number" name="update_${cartLineIndex}"
value="${cartLine.getQuantity()?string.number}" />
value="${cartLine.getQuantity()?string.number}" min="1" />
</#if>
</#if>
</td>
@@ -562,9 +562,7 @@ under the License.
<#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
<a href="<@ofbizUrl>createCustRequestFromCart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
${uiLabelMap.OrderCreateCustRequestFromCart}
</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="<@ofbizUrl>createQuoteFromCart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
${uiLabelMap.OrderCreateQuoteFromCart}</a>&nbsp;&nbsp;
</a>
<#else>
${uiLabelMap.OrderYouMust}
<a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
@@ -648,19 +646,21 @@ under the License.
</div>
<#if associatedProducts?has_content>
<div>
<div>
<div class="card">
<div class="card-header">
<h3>${uiLabelMap.EcommerceYouMightAlsoIntrested}:</h3>
</div>
<div>
<div class="card-body">
<#-- random complementary products -->
<div class="row row-eq-height">
<#list associatedProducts as assocProduct>
<div>
${setRequestAttribute("optProduct", assocProduct)}
${setRequestAttribute("listIndex", assocProduct_index)}
${screens.render("component://ecommerce/widget/CatalogScreens.xml#productsummary")}
</div>
</#list>
</div>
</div>
</div>
</#if>
+4 -4
View File
@@ -86,7 +86,7 @@ under the License.
</#if>
<tr id="cartItemDisplayRow_${cartLine_index}">
<td headers="orderItem">
<img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
<img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${StringUtil.wrapString(smallImageUrl!)!}</@ofbizContentUrl>"
alt = "Product Image" /></td>
<td headers="description">${cartLine.getName(dispatcher)!}</td>
<td class="amount" headers="unitPrice">${cartLine.getDisplayPrice()}</td>
@@ -181,10 +181,10 @@ under the License.
</#if>
<#assign smallImageUrl = Static["org.apache.ofbiz.product.product.ProductContentWrapper"]
.getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL",
locale, dispatcher, "url")! />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if>
locale, dispatcher, "html")! />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg" /></#if>
<#if smallImageUrl?string?has_content>
<img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>"
<img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${StringUtil.wrapString(smallImageUrl!)!}</@ofbizContentUrl>"
alt="Product Image" />
</#if>
</#if>
+162 -116
View File
@@ -16,122 +16,168 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<#assign searchOptionsHistoryList =
Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
<#assign currentCatalogId =
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
<h2>${uiLabelMap.ProductAdvancedSearchInCategory}</h2>
<form id="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>">
<fieldset class="inline">
<input type="hidden" name="VIEW_SIZE" value="10"/>
<input type="hidden" name="PAGING" value="Y"/>
<input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"/>
<#if searchCategory?has_content>
<input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
<label>${uiLabelMap.ProductCategory}</label>
<p>${(searchCategory.description)?if_exists}</p>
<div>
<label>${uiLabelMap.ProductIncludeSubCategories}</label>
<label for="SEARCH_SUB_CATEGORIES_YES">${uiLabelMap.CommonYes}</label>
<input type="radio" name="SEARCH_SUB_CATEGORIES" id="SEARCH_SUB_CATEGORIES_YES" value="Y"
checked="checked"/>
<label for="SEARCH_SUB_CATEGORIES_NO">${uiLabelMap.CommonNo}</label>
<input type="radio" name="SEARCH_SUB_CATEGORIES" id="SEARCH_SUB_CATEGORIES_NO" value="N"/>
</div>
</#if>
<div>
<label for="SEARCH_STRING">${uiLabelMap.ProductKeywords}</label>
<input type="text" name="SEARCH_STRING" id="SEARCH_STRING" size="20"
value="${requestParameters.SEARCH_STRING?if_exists}"/>
<label for="SEARCH_OPERATOR_ANY">${uiLabelMap.CommonAny}</label>
<input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ANY"
value="OR" <#if "OR" == searchOperator>checked="checked"</#if>/>
<label for="SEARCH_OPERATOR_ALL">${uiLabelMap.CommonAll}</label>
<input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ALL"
value="AND" <#if "AND" == searchOperator>checked="checked"</#if>/>
</div>
<#list productFeatureTypeIdsOrdered as productFeatureTypeId>
<#assign findPftMap =
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
<#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)>
<#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
<div>
<label for="pft_${productFeatureTypeId}">${(productFeatureType.get("description",locale))?if_exists}</label>
<select name="pft_${productFeatureTypeId}" id="pft_${productFeatureTypeId}">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list productFeatures as productFeature>
<option value="${productFeature.productFeatureId}">
${productFeature.description?default(productFeature.productFeatureId)}
</option>
</#list>
</select>
</div>
</#list>
<div>
<label for="sortOrder">${uiLabelMap.ProductSortedBy}</label>
<select name="sortOrder" id="sortOrder">
<option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
<option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
<option value="SortProductField:totalQuantityOrdered">${uiLabelMap.ProductPopularityByOrders}</option>
<option value="SortProductField:totalTimesViewed">${uiLabelMap.ProductPopularityByViews}</option>
<option value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option>
<option value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option>
<option value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option>
<#if productFeatureTypes?? && productFeatureTypes?has_content>
<#list productFeatureTypes as productFeatureType>
<option value="SortProductFeature:${productFeatureType.productFeatureTypeId}">
${productFeatureType.description?default(productFeatureType.productFeatureTypeId)}
</option>
</#list>
<div class="card">
<#assign searchOptionsHistoryList = Static["org.apache.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)/>
<#assign currentCatalogId = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)/>
<div class="card-header">
<strong>${uiLabelMap.ProductAdvancedSearchInCategory}</strong>
</div>
<div class="card-body">
<form id="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>">
<fieldset>
<input type="hidden" name="VIEW_SIZE" value="10"/>
<input type="hidden" name="PAGING" value="Y"/>
<input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"/>
<#if searchCategory?has_content>
<input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
<label>${uiLabelMap.ProductCategory}</label>
<p>${(searchCategory.description)?if_exists}</p>
<fieldset class="form-group">
<div class="row">
<label class="col-form-label col-sm-3 pt-0">${uiLabelMap.ProductIncludeSubCategories}</label>
<div class="col-sm-9">
<div class="form-check">
<input type="radio" name="SEARCH_SUB_CATEGORIES" class="form-check-input" id="SEARCH_SUB_CATEGORIES_YES" value="Y"
checked="checked"/>
<label class="form-check-label" for="SEARCH_SUB_CATEGORIES_YES">${uiLabelMap.CommonYes}</label>
</div>
<div class="form-check">
<input type="radio" name="SEARCH_SUB_CATEGORIES" class="form-check-input" id="SEARCH_SUB_CATEGORIES_NO" value="N"/>
<label class="form-check-label" for="SEARCH_SUB_CATEGORIES_NO">${uiLabelMap.CommonNo}</label>
</div>
</div>
</fieldset>
</#if>
</select>
<label for="sortAscendingHigh">${uiLabelMap.EcommerceLowToHigh}</label>
<input type="radio" name="sortAscending" id="sortAscendingHigh" value="Y" checked="checked"/>
<label for="sortAscendingLow">${uiLabelMap.EcommerceHighToLow}</label>
<input type="radio" name="sortAscending" id="sortAscendingLow" value="N"/>
</div>
<#if searchConstraintStrings?has_content>
<div>
<label>${uiLabelMap.ProductLastSearch}</label>
<#list searchConstraintStrings as searchConstraintString>
<p>${searchConstraintString}</p>
<fieldset class="form-group">
<div class="row">
<label class="col-form-label col-sm-3 pt-0">${uiLabelMap.ProductKeywords}</label>
<div class="col-sm-6">
<input type="text" class="form-control form-control-sm" name="SEARCH_STRING" id="SEARCH_STRING" size="20"
value="${requestParameters.SEARCH_STRING?if_exists}"/>
<div class="form-check">
<input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ANY"
value="OR" <#if "OR" == searchOperator>checked="checked"</#if>/>
<label class="form-check-label" for="SEARCH_OPERATOR_ANY">${uiLabelMap.CommonAny}</label>
<div>
<div class="form-check">
<input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ALL"
value="AND" <#if "AND" == searchOperator>checked="checked"</#if>/>
<label class="form-check-label" for="SEARCH_OPERATOR_ALL">${uiLabelMap.CommonAll}</label>
</div>
</div>
</fieldset>
<#list productFeatureTypeIdsOrdered as productFeatureTypeId>
<#assign findPftMap =
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
<#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)>
<#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
<div class="form-group row">
<label for="${productFeatureTypeId}" class="col-sm-3 col-form-label">${(productFeatureType.get("description",locale))?if_exists}</label>
<div class="col-sm-6">
<select name="pft_${productFeatureTypeId}" id="pft_${productFeatureTypeId}" class="form-control form-control-sm">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list productFeatures as productFeature>
<option value="${productFeature.productFeatureId}">
${productFeature.description?default(productFeature.productFeatureId)}
</option>
</#list>
</select>
</div>
</div>
</#list>
<p>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</p>
<div>
<label for="clearSearchNew">${uiLabelMap.ProductNewSearch}</label>
<input type="radio" name="clearSearch" id="clearSearchNew" value="Y" checked="checked"/>
<label for="clearSearchRefine">${uiLabelMap.ProductRefineSearch}</label>
<input type="radio" name="clearSearch" id="clearSearchRefine" value="N"/>
</div>
</div>
</#if>
<div>
<input type="submit" name="submit" class="button" value="${uiLabelMap.CommonFind}"/>
</div>
<#if searchOptionsHistoryList?has_content>
<h2>${uiLabelMap.OrderLastSearches}...</h2>
<div>
<a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="button">
${uiLabelMap.OrderClearSearchHistory}
</a>
<h3>${uiLabelMap.OrderClearSearchHistoryNote}</h3>
</div>
<#list searchOptionsHistoryList as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
<div>
<p>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</p>
<a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&amp;clearSearch=N</@ofbizUrl>"
class="button">${uiLabelMap.CommonSearch}</a>
<a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>"
class="button">${uiLabelMap.CommonRefine}</a>
</div>
<#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)>
<#list constraintStrings as constraintString>
<p> - ${constraintString}</p>
</#list>
<#if searchOptions_has_next>
<fieldset class="form-group">
<div class="row">
<label for="sortOrder" class="col-sm-3 col-form-label pt-0">${uiLabelMap.ProductSortedBy}</label>
<div class="col-sm-6">
<select name="sortOrder" id="sortOrder" class="form-control form-control-sm">
<option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
<option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
<option value="SortProductField:totalQuantityOrdered">${uiLabelMap.ProductPopularityByOrders}</option>
<option value="SortProductField:totalTimesViewed">${uiLabelMap.ProductPopularityByViews}</option>
<option value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option>
<option value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option>
<option value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option>
<#if productFeatureTypes?? && productFeatureTypes?has_content>
<#list productFeatureTypes as productFeatureType>
<option value="SortProductFeature:${productFeatureType.productFeatureTypeId}">
${productFeatureType.description?default(productFeatureType.productFeatureTypeId)}
</option>
</#list>
</#if>
</select>
<div class="form-check">
<input type="radio" class="form-check-input" name="sortAscending" id="sortAscendingHigh" value="Y" checked="checked"/>
<label class="form-check-label" for="sortAscendingHigh">${uiLabelMap.EcommerceLowToHigh}</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="sortAscending" id="sortAscendingLow" value="N"/>
<label class="form-check-label" for="sortAscendingLow">${uiLabelMap.EcommerceHighToLow}</label>
</div>
</div>
</div>
</fieldset>
<#if searchConstraintStrings?has_content>
<div>
<div class="row">
<label class="col-sm-3">${uiLabelMap.ProductLastSearch}</label>
<div class="col-sm-7">
<#list searchConstraintStrings as searchConstraintString>
<p>${searchConstraintString}</p>
</#list>
<p>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</p>
</div>
</div>
<div class="form-group row">
<div class="col-sm-3"></div>
<div class="col-sm-7">
<div class="form-check">
<input class="form-check-input" type="radio" name="clearSearch" id="clearSearchNew" value="Y" checked="checked"/>
<label class="form-check-label" for="clearSearchNew">${uiLabelMap.ProductNewSearch}</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="clearSearch" id="clearSearchRefine" value="N"/>
<label class="form-check-label" for="clearSearchRefine">${uiLabelMap.ProductRefineSearch}</label>
</div>
</div>
</div>
</div>
</#if>
</#list>
</#if>
</fieldset>
</form>
<div>
<input type="submit" name="submit" class="btn btn-outline-secondary" value="${uiLabelMap.CommonFind}"/>
</div>
<#if searchOptionsHistoryList?has_content>
<div class="card m-3">
<div class="card-header">
<strong>${uiLabelMap.OrderLastSearches}...</strong>
</div>
<div class="card-body">
<div>
<a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="button">
${uiLabelMap.OrderClearSearchHistory}
</a>
<h4>${uiLabelMap.OrderClearSearchHistoryNote}</h4>
</div>
<#list searchOptionsHistoryList as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
<div>
<p>${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1}</p>
<a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&amp;clearSearch=N</@ofbizUrl>"
class="button">${uiLabelMap.CommonSearch}</a>
<a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>"
class="button">${uiLabelMap.CommonRefine}</a>
</div>
<#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)>
<#list constraintStrings as constraintString>
<p> - ${constraintString}</p>
</#list>
<#if searchOptions_has_next>
</#if>
</#list>
</div>
</div>
</#if>
</fieldset>
</form>
</div>
</div>
@@ -48,7 +48,7 @@
<div class="product-prevnext px-2 py-1">
<select name="pageSelect" onchange="callDocumentByPaginate(this[this.selectedIndex].value);" class="form-control">
<option value="#">${uiLabelMap.CommonPage} ${viewIndex?int + 1} ${uiLabelMap.CommonOf} ${viewIndexMax}</option>
<#if (viewIndex?int > 1)>
<#if (viewIndexMax?int > 1)>
<#list 1..viewIndexMax as curViewNum>
<option value="${productCategoryId}~${viewSize}~${curViewNum-1?int}">${uiLabelMap.CommonGotoPage} ${curViewNum}</option>
</#list>
@@ -476,6 +476,7 @@ ${virtualJavaScript!}
</td>
</tr>
<#-- Long description of product -->
<#if productContentWrapper.get("LONG_DESCRIPTION", "html") != "">
<tr>
<td colspan="2">
<div>${productContentWrapper.get("LONG_DESCRIPTION", "html")!}</div>
@@ -486,6 +487,7 @@ ${virtualJavaScript!}
<hr class='sepbar'/>
</td>
</tr>
</#if>
<#-- Any attributes/etc may go here -->
<#-- Product Configurator -->
<tr>
@@ -516,7 +518,7 @@ ${virtualJavaScript!}
<a name='#${question.getConfigItem().getString("configItemId")}'></a>
<div>${StringUtil.wrapString(question.description!)}</div>
<#assign instructions = question.content.get("INSTRUCTIONS", "html")!>
<#if instructions?has_content>
<#if instructions?has_content && instructions != "">
<a href="javascript:showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${instructions}');"
class="btn btn-outline-secondary btn-sm">Instructions</a>
</#if>
@@ -672,6 +674,7 @@ ${virtualJavaScript!}
</td>
</tr>
<#-- Product Reviews -->
<#if productReviews?has_content>
<tr>
<td colspan="2">
<div>${uiLabelMap.OrderCustomerReviews}:</div>
@@ -687,7 +690,6 @@ ${virtualJavaScript!}
<hr class='sepbar'/>
</td>
</tr>
<#if productReviews?has_content>
<#list productReviews as productReview>
<#assign postedUserLogin = productReview.getRelatedOne("UserLogin", false)>
<#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)!>
@@ -52,8 +52,9 @@ under the License.
<label class="form-check-label" for="SEARCH_OPERATOR_AND"><input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
</div>
</div>
<input type="submit" value="${uiLabelMap.CommonFind}" class="btn btn-outline-secondary" />
<div class="form-group">
<input type="submit" value="${uiLabelMap.CommonFind}" class="btn btn-outline-secondary" />
</div>
</form>
<form name="advancedsearchform" id="keywordsearchbox_advancedsearchform" method="post" action="<@ofbizUrl>advancedsearch</@ofbizUrl>">
<#if 0 &lt; otherSearchProdCatalogCategories?size>
@@ -70,7 +71,9 @@ under the License.
<#else>
<input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" />
</#if>
<input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="btn btn-outline-secondary" />
<div class="form-group">
<input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="btn btn-outline-secondary" />
</div>
</form>
</div>
</div>
@@ -28,7 +28,7 @@ under the License.
<div id="minilastviewedcategories" class="card">
<div class="card-header">
${uiLabelMap.EcommerceLastCategories}
<a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>">[${uiLabelMap.CommonClear}]</a>
<a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>" class="float-right">[${uiLabelMap.CommonClear}]</a>
</div>
<div class="card-body">
<ul class="browsecategorylist">
@@ -25,26 +25,21 @@ under the License.
<#else>
<#assign limit=(lastViewedProducts?size-1)/>
</#if>
<div id="minilastviewedproducts" class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.EcommerceLastProducts}</li>
<li>
<div id="minilastviewedproducts" class="card">
<div class="card-header">
${uiLabelMap.EcommerceLastProducts}
<div class="float-right">
<a href="<@ofbizUrl>clearLastViewed</@ofbizUrl>">
[${uiLabelMap.CommonClear}]
</a>
</li>
<#if (lastViewedProducts?size > maxToShow)>
<li>
<a href="<@ofbizUrl>lastviewedproducts</@ofbizUrl>">
[${uiLabelMap.CommonMore}]
</a>
</li>
</#if>
</ul>
<br class="clear"/>
<#if (lastViewedProducts?size > maxToShow)>
<a href="<@ofbizUrl>lastviewedproducts</@ofbizUrl>">
[${uiLabelMap.CommonMore}]
</a>
</#if>
</div>
</div>
<div class="screenlet-body">
<div class="card-body">
<ul>
<#list lastViewedProducts[0..limit] as productId>
<li>
@@ -28,12 +28,10 @@ under the License.
${uiLabelMap.CommonFrom}
</#if>
<#if totalPrice??>
<li>
${uiLabelMap.ProductAggregatedPrice}:
<span class='basePrice'>
<@ofbizCurrency amount=totalPrice isoCode=priceResult.currencyUsed/>
</span>
</li>
<#else>
<span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
<@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span>
@@ -17,13 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
<#if reorderProducts?has_content>
<div id="minireorderprods" class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.ProductQuickReorder}...</li>
</ul>
<div id="minireorderprods" class="card">
<div class="card-header">
${uiLabelMap.ProductQuickReorder}...
</div>
<div class="screenlet-body">
<div class="card-body">
<#list reorderProducts as miniProduct>
<div>
${setRequestAttribute("miniProdQuantity", reorderQuantities.get(miniProduct.productId))}
+59 -56
View File
@@ -124,10 +124,12 @@ ${virtualVariantJavaScript!}
function toggleAmt(toggle) {
if (toggle == 'Y') {
changeObjectVisibility("add_amount", "visible");
document.getElementById("add_amount").style.height = "auto";
}
if (toggle == 'N') {
changeObjectVisibility("add_amount", "hidden");
document.getElementById("add_amount").style.height = "0px";
}
}
@@ -334,6 +336,8 @@ $(function(){
</#if>
</#macro>
${screens.render("component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productvariantjs")}
${variantInfoJavaScript!}
<div id="product-detail" class="card">
<#assign productAdditionalImage1 = productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
<#assign productAdditionalImage2 = productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
@@ -341,19 +345,25 @@ $(function(){
<#assign productAdditionalImage4 = productContentWrapper.get("ADDITIONAL_IMAGE_4", "url")! />
<#-- Category next/previous -->
<#if category??>
<div id="paginationBox">
<#if previousProductId??>
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId! productId=previousProductId!/>"
>${uiLabelMap.CommonPrevious}</a>&nbsp;|&nbsp;
</#if>
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId!/>"
class="linktext">${(category.categoryName)?default(category.description)!}</a>
<#if nextProductId??>&nbsp;|&nbsp;
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId! productId=nextProductId!/>"
>${uiLabelMap.CommonNext}</a>
<div class="row">
<div class="col-auto mt-3 ml-2">
<#if previousProductId??>
<a class="btn btn-outline-secondary" href="<@ofbizCatalogAltUrl productCategoryId=categoryId! productId=previousProductId!/>">${uiLabelMap.CommonPrevious}</a>
</#if>
</div>
<#if category.categoryName?has_content>
<div class="col-auto"
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId!/>" class="linktext">${(category.categoryName)?default(category.description)!}</a>
</div>
</#if>
<div class="col-auto mt-3">
<#if nextProductId??>
<a class="btn btn-outline-secondary" href="<@ofbizCatalogAltUrl productCategoryId=categoryId! productId=nextProductId!/>">${uiLabelMap.CommonNext}</a>
</#if>
</div>
</div>
</#if>
<hr/>
@@ -662,12 +672,12 @@ $(function(){
</div>
</#if>
<#-- Variant Selection -->
<div class="form-group">
<#if "Y" == product.isVirtual!?upper_case>
<#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
<#list featureLists as featureList>
<#list featureList as feature>
<#if feature_index == 0>
<div>
${feature.description}:
<select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" class="form-control"
onchange="javascript:checkRadioButton();">
@@ -687,8 +697,8 @@ $(function(){
</div>
</#list>
<input type="hidden" name="add_product_id" value="${product.productId}"/>
<div id="addCart1" style="display:none;">
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonQuantity}:</strong></span>&nbsp;
<div id="addCart1" class="form-group" style="display:none;">
<label><strong>${uiLabelMap.CommonQuantity}:</strong></label>
<input type="text" class="form-control" size="5" name="quantity" value="1"/>
<a href="javascript:javascript:addItem();" class="btn btn-outline-secondary"><span
style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
@@ -697,7 +707,7 @@ $(function(){
<div id="addCart2" style="display:block;">
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonQuantity}:</strong></span>&nbsp;
<input type="text" class="form-control" size="5" value="1" disabled="disabled"/>
<a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonPleaseSelectAllFeaturesFirst}");"
<a href="javascript:showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${uiLabelMap.CommonPleaseSelectAllFeaturesFirst}');"
class="btn btn-outline-secondary"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
&nbsp;
</div>
@@ -711,15 +721,13 @@ $(function(){
</select>
</div>
</#list>
<span id="product_uom"></span>
<span id="product_uom"></span><br/>
<div class="variant-price" style="display: none;">
<strong><span class="product_id_display"> </span></strong>
<strong><span class="variant_price_display"> </span></strong>
</div>
<input type="hidden" name="product_id" value="${product.productId}"/>
<input type="hidden" name="add_product_id" value="NULL"/>
<div>
<strong><span id="product_id_display"> </span></strong>
<strong>
<div id="variant_price_display"></div>
</strong>
</div>
<#else>
<input type="hidden" name="add_product_id" value="NULL"/>
<#assign inStock = false />
@@ -729,26 +737,24 @@ $(function(){
<input type="hidden" name="add_product_id" value="${product.productId}"/>
<#if mainProducts?has_content>
<input type="hidden" name="product_id" value=""/>
<select name="productVariantId" class="form-control" onchange="javascript:displayProductVirtualVariantId(this.value);">
<option value="">Select Unit Of Measure</option>
<select name="productVariantId" class="form-control" onchange="javascript:variantUomSelection(this);">
<option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
<#list mainProducts as mainProduct>
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
</#list>
</select><br/>
<div>
<strong><span id="product_id_display"> </span></strong>
<strong>
<div id="variant_price_display"></div>
</strong>
<div class="variant-price" style="display: none;">
<strong><span class="product_id_display"> </span></strong>
<strong><span class="variant_price_display"> </span></strong>
</div>
</#if>
<#if (availableInventory??) && (availableInventory <= 0) && "N" == product.requireAmount?default("N")>
<#assign inStock = false />
</#if>
</#if>
</div>
<#-- check to see if introductionDate hasnt passed yet -->
<#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
<p>&nbsp;</p>
<div style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div>
<#-- check to see if salesDiscontinuationDate has passed -->
<#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)>
@@ -761,9 +767,9 @@ $(function(){
<#else>
<#assign hiddenStyle = "hidden"/>
</#if>
<div id="add_amount" class="${hiddenStyle}">
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonAmount}:</strong></span>&nbsp;
<input type="text" class="form-control" size="5" name="add_amount" value=""/>
<div id="add_amount" class="${hiddenStyle} form-group">
<label>${uiLabelMap.CommonAmount}:</label>
<input type="text" class="form-control" name="add_amount" value=""/>
</div>
<#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
<div>
@@ -788,10 +794,14 @@ $(function(){
<a href="javascript:addItem()" class="btn btn-outline-secondary"><span
style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
<#else>
<div class="input-group"><input name="quantity" class="form-control" id="quantity" value="1" size="4" maxLength="4" type="text"
<#if "Y" == product.isVirtual!?upper_case>disabled="disabled"</#if>/><span class="input-group-btn"><a
href="javascript:addItem()" id="addToCart" name="addToCart"
class="btn btn-outline-secondary">${uiLabelMap.OrderAddToCart}</a></span></div>
<div class="form-group">
<label>${uiLabelMap.CommonQuantity}:</label>
<div class="input-group">
<input name="quantity" class="form-control" id="quantity" value="1" size="4" maxLength="4" type="text"
<#if "Y" == product.isVirtual!?upper_case>disabled="disabled"</#if>/><span class="input-group-btn">
<a href="javascript:addItem()" id="addToCart" name="addToCart" class="btn btn-outline-secondary">${uiLabelMap.OrderAddToCart}</a></span>
</div>
</div>
<@showUnavailableVarients/>
</#if>
<#else>
@@ -828,7 +838,6 @@ $(function(){
</div>
<div>
<#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
<hr/>
<form name="addToShoppingList" method="post"
action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
<fieldset>
@@ -914,7 +923,7 @@ $(function(){
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);">
<img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt=""/>
</a>
<li/>
</li>
</#if>
<#assign indexer = indexer + 1 />
</#list>
@@ -947,13 +956,13 @@ $(function(){
<#-- Any attributes/etc may go here -->
<#-- Product Reviews -->
<hr>
<div id="reviews">
<div>${uiLabelMap.OrderCustomerReviews}:</div>
<h4>${uiLabelMap.OrderCustomerReviews}:</h4>
<#if averageRating?? && (averageRating &gt; 0) && numRatings?? && (numRatings &gt; 1)>
<div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings??>
(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
</#if>
<hr/>
<#if productReviews?has_content>
<#list productReviews as productReview>
<#assign postedUserLogin = productReview.getRelatedOne("UserLogin", false) />
@@ -977,13 +986,10 @@ $(function(){
class="linktext">${uiLabelMap.ProductReviewThisProduct}!</a>
</div>
<#else>
<div>${uiLabelMap.ProductProductNotReviewedYet}.</div>
<div>
<a href="<@ofbizUrl>reviewProduct?category_id=${categoryId!}&amp;product_id=${product.productId}</@ofbizUrl>"
class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
</div>
</div>
<p>${uiLabelMap.ProductProductNotReviewedYet}. <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId!}&amp;product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
</p>
</#if>
</div>
<#-- Upgrades/Up-Sell/Cross-Sell -->
<#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>
<#assign pageProduct = product />
@@ -1066,12 +1072,11 @@ $(function(){
</#list>
</div>
</#if>
<hr>
<div class="product-tags">
<p class="titleProductTags">
<h3>${uiLabelMap.EcommerceProductTags}</h3></p>
<h4>${uiLabelMap.EcommerceProductTags}</h4>
<#if productTags??>
<p class="titleAddTags"><strong>${uiLabelMap.EcommerceProductTagsDetail}:</strong></p>
<p>
<ul>
<li>
<#assign no = 0 />
@@ -1087,11 +1092,9 @@ $(function(){
</#list>
</li>
</ul>
</p>
</#if>
<p class="titleAddTags"><strong>${uiLabelMap.EcommerceAddYourTags}:</strong></p>
<p>
<div class="form-group">
<label>${uiLabelMap.EcommerceAddYourTags}:</label>
<form method="post" action="<@ofbizUrl>addProductTags</@ofbizUrl>" name="addProductTags">
<input type="hidden" name="productId" value="${product.productId!}"/>
<div class="input-group">
@@ -1099,10 +1102,10 @@ $(function(){
<span class="input-group-btn"><input class="buttonProductTags btn btn-outline-secondary" type="submit" value="${uiLabelMap.EcommerceAddTags}" name="addTag"/></span>
</div>
</form>
<span>${uiLabelMap.EcommerceAddTagsDetail}</span>
</p>
</div>
<hr/>
<span>${uiLabelMap.EcommerceAddTagsDetail}</span>
</div>
<form action="<@ofbizUrl>tagsearch</@ofbizUrl>" method="post" name="productTagsearchform" id="productTagsearchform">
<input type="hidden" name="keywordTypeId" value="KWT_TAG"/>
<input type="hidden" name="statusId" value="KW_APPROVED"/>
+2 -2
View File
@@ -20,10 +20,10 @@ under the License.
<#if requestParameters.product_id??>
<form id="reviewProduct" method="post" action="<@ofbizUrl>createProductReview</@ofbizUrl>">
<fieldset class="inline">
<input type="hidden" name="productStoreId" value="${productStore.productStoreId}" />
<input type="hidden" name="productStoreId" value="${(productStore.productStoreId)!}" />
<input type="hidden" name="productId" value="${requestParameters.product_id}" />
<input type="hidden" name="product_id" value="${requestParameters.product_id}" />
<input type="hidden" name="category_id" value="${requestParameters.category_id}" />
<input type="hidden" name="category_id" value="${(requestParameters.category_id)!}" />
<div>
<span><label for="one">${uiLabelMap.EcommerceRating}:</label></span>
<span>
@@ -51,6 +51,8 @@
}
//-->
</script>
${screens.render("component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productvariantjs")}
${variantInfoJavaScript!}
<#if product??>
<#-- variable setup -->
<#if "Y" == backendPath?default("N")>
@@ -72,16 +74,15 @@
<#assign productDetailId = "productDetailId"/>
<#assign productDetailId = productDetailId + product.productId/>
<div class="col-md-3 products-card">
<div class="col-md-4 products-card card-deck">
<div class="card text-center">
<a href="${productUrl}">
<img class="card-img-top" src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image">
</a>
<div class="card-body">
<h4 class="card-title"><a href="${productUrl}" class="btn btn-link">${productContentWrapper.get("PRODUCT_NAME", "html")!}</a></h4>
<div class="cart-text">
<div class="card-text">
<div>${productContentWrapper.get("DESCRIPTION", "html")!}<#if daysToShip??>&nbsp;-&nbsp;${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div>
<#-- Display category-specific product comments -->
<#if prodCatMem?? && prodCatMem.comments?has_content>
<p>${prodCatMem.comments}</p>
@@ -196,15 +197,15 @@
</div>
<#if mainProducts?has_content>
<input type="hidden" name="product_id" value=""/>
<select name="productVariantId" onchange="javascript:displayProductVirtualId(this.value, '${product.productId}', this.form);">
<option value="">Select Unit Of Measure</option>
<select name="productVariantId" onchange="javascript:variantUomSelection(this);" style="width: 100%;">
<option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
<#list mainProducts as mainProduct>
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
</#list>
</select>
<div style="display: inline-block;">
<strong><span id="product_id_display"> </span></strong>
<strong><span id="variant_price_display"> </span></strong>
<div class="variant-price" style="display: none;">
<strong><span class="product_id_display"> </span></strong>
<strong><span class="variant_price_display"> </span></strong>
</div>
</#if>
</div>
@@ -16,13 +16,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<#if productCategoryList?has_content>
<div class="card">
<h4 class="card-header">
Popular Categories
</h4>
<div class="card-body">
<p class="card-text">
<div class="row">
<#list productCategoryList as childCategoryList>
@@ -70,9 +69,9 @@ under the License.
<#list productCategoryMembers as productCategoryMember>
<#if (i > 2)>
<#if productCategoryMembers[i]?has_content>
<a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>">
<li><a class="linktext" href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId/>">
<span>More...</span>
</a>
</a></li>
</#if>
<#break>
</#if>
@@ -100,7 +99,6 @@ under the License.
</#list>
</div>
</#list>
</p>
</div>
</div>
</#if>
+16 -16
View File
@@ -41,58 +41,58 @@ under the License.
<input type="hidden" name="emailType" value="CONT_NOTI_EMAIL"/>
<div class="form-group row">
<label for="${uiLabelMap.EcommerceSubject}" class="col-1 col-form-label">${uiLabelMap.EcommerceSubject}</label>
<div class="col-11">
<label for="${uiLabelMap.EcommerceSubject}" class="col-2 col-form-label">${uiLabelMap.EcommerceSubject}</label>
<div class="col-10">
<input type="text" name="subject" id="subject" class="required form-control form-control-sm" value="${requestParameters.subject!}"/>
</div>
</div>
<div class="form-group row">
<label for="${uiLabelMap.CommonMessage}" class="col-1 col-form-label">${uiLabelMap.CommonMessage}</label>
<div class="col-11">
<label for="${uiLabelMap.CommonMessage}" class="col-2 col-form-label">${uiLabelMap.CommonMessage}</label>
<div class="col-10">
<textarea name="content" id="message" class="required form-control form-control-sm" rows="4">
${requestParameters.content!}
</textarea>
</div>
</div>
<div class="form-group row">
<label for="${uiLabelMap.FormFieldTitle_emailAddress}" class="col-1 col-form-label">${uiLabelMap.FormFieldTitle_emailAddress}</label>
<div class="col-11">
<label for="${uiLabelMap.FormFieldTitle_emailAddress}" class="col-2 col-form-label">${uiLabelMap.FormFieldTitle_emailAddress}</label>
<div class="col-10">
<input type="email" name="emailAddress" id="emailAddress" class="required form-control form-control-sm" value="${requestParameters.emailAddress!}"/>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group row">
<label for="${uiLabelMap.PartyFirstName}" class="col-2 col-form-label">${uiLabelMap.PartyFirstName}</label>
<div class="col-10">
<label for="${uiLabelMap.PartyFirstName}" class="col-4 col-form-label">${uiLabelMap.PartyFirstName}</label>
<div class="col-8">
<input type="text" name="firstName" id="firstName" class="required form-control form-control-sm" value="${requestParameters.firstName!}"/>
</div>
</div>
</div>
<div class="col-6">
<div class="form-group row">
<label for="${uiLabelMap.PartyLastName}" class="col-2 col-form-label">${uiLabelMap.PartyLastName}</label>
<div class="col-10">
<label for="${uiLabelMap.PartyLastName}" class="col-4 col-form-label">${uiLabelMap.PartyLastName}</label>
<div class="col-8">
<input type="text" name="lastName" id="lastName" class="required form-control form-control-sm" value="${requestParameters.lastName!}"/>
</div>
</div>
</div>
</div>
<div class="form-group row">
<label for="${uiLabelMap.CommonCaptchaCode}" class="col-1 col-form-label">${uiLabelMap.CommonCaptchaCode}</label>
<div class="col-11">
<label for="${uiLabelMap.CommonCaptchaCode}" class="col-2 col-form-label">${uiLabelMap.CommonCaptchaCode}</label>
<div class="col-10">
<img id="captchaImage" src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&amp;unique=${nowTimestamp.getTime()}</@ofbizUrl>" alt=""/>
</div>
</div>
<div class="row">
<div class="col-1"></div>
<div class="col-11">
<div class="col-2"></div>
<div class="col-10">
<a href="javascript:reloadCaptcha('captchaImage');">${uiLabelMap.CommonReloadCaptchaCode}</a>
</div>
</div>
<div class="form-group row">
<label for="${uiLabelMap.CommonVerifyCaptchaCode}" class="col-1 col-form-label">${uiLabelMap.CommonVerifyCaptchaCode}</label>
<div class="col-11">
<label for="${uiLabelMap.CommonVerifyCaptchaCode}" class="col-2 col-form-label">${uiLabelMap.CommonVerifyCaptchaCode}</label>
<div class="col-10">
<input type="text" autocomplete="off" maxlength="30" size="23" name="captcha" class="form-control form-control-sm"/>
</div>
</div>
@@ -24,7 +24,6 @@ under the License.
<#if !creditCard??>
<h2>${uiLabelMap.AccountingAddNewCreditCard}</h2>
<form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform">
<div>
<#else>
<h2>${uiLabelMap.AccountingEditCreditCard}</h2>
<form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform">
@@ -32,6 +31,7 @@ under the License.
</#if>
<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="btn btn-outline-secondary">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcreditcardform.submit()" class="btn btn-outline-secondary">${uiLabelMap.CommonSave}</a>
<div>
${screens.render("component://ecommerce/widget/CustomerScreens.xml#creditCardFields")}
<label class="mb-2">${uiLabelMap.PartyBillingAddress}</label>
<#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
+4 -3
View File
@@ -76,13 +76,13 @@ under the License.
<strong>${uiLabelMap.CommonMessages}</strong>
</div>
<div class="card-body">
<table class="table table-responsive-sm">
<#if (!receivedCommunicationEvents?has_content && !sentCommunicationEvents?has_content)>
<div class="alert alert-light" role="alert">
${uiLabelMap.EcommerceNoMessages}.
</div>
<#else>
<thead>
<table class="table table-responsive-sm">
<thead class="thead-light">
<tr>
<th>
${uiLabelMap.CommonFrom}
@@ -106,7 +106,8 @@ under the License.
<#list sentCommunicationEvents! as sentCommunicationEvent>
<@showMessage communicationEvent=sentCommunicationEvent isSentMessage=true index=sentCommunicationEvent_index/>
</#list>
</#if>
</table>
</#if>
</div>
</div>
@@ -65,7 +65,7 @@ under the License.
</div>
<div class="form-group">
<label for="preferredContactMechId">${uiLabelMap.CommonEmail} *</label>
<select id="preferredContactMechId" name="preferredContactMechId" class="selectBox">
<select id="preferredContactMechId" name="preferredContactMechId" class="form-control">
<#list partyAndContactMechList as partyAndContactMech>
<option value="${partyAndContactMech.contactMechId}">
<#if partyAndContactMech.infoString?has_content>
@@ -82,9 +82,12 @@ under the License.
</#list>
</select>
</div>
<input type="submit" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/>
<input type="button" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
<div class="form-group">
<input type="submit" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/>
<input type="button" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
onclick="javascript:unsubscribeByContactMech();"/>
</div>
</form>
<#else>
<#-- Not logged in so ask them to log in and then sign up or clear the user association -->
+2 -5
View File
@@ -405,13 +405,10 @@ will generally always be reserved for the logo at the top of the page.
<#if getUsername>
<@fieldErrors fieldName="USERNAME"/>
<#if !requestParameters.preferredUsername?has_content>
<div class="row">
<div class="form-check col-12">
<label class="form-check-label">
<div class="form-check">
<label class="form-check-label"></label>
<input type="checkbox" name="UNUSEEMAIL" class="checkbox form-check-input" id="UNUSEEMAIL" value="on"
onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
</label>
</div>
</div>
</#if>
+9 -8
View File
@@ -46,10 +46,10 @@ under the License.
<input type="hidden" name="origCommEventId" value="${orgComm}"/>
</#if>
<div class="row">
<div class="col-1">
<div class="col-2">
<strong>${uiLabelMap.CommonFrom} :</strong>
</div>
<div class="col-11">
<div class="col-10">
${sessionAttributes.autoName!} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}?&nbsp;<a
href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
</div>
@@ -60,13 +60,14 @@ under the License.
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyIdTo, true)>
<input type="hidden" name="partyIdTo" value="${partyIdTo}"/>
<div class="row">
<div class="col-1">
<div class="col-2">
<strong>${uiLabelMap.CommonTo} :</strong>
</div>
<div class="col-11">
<div class="col-10">
${partyToName?default("N/A")}
</div>
</div>
<hr/>
</#if>
<#assign defaultSubject = (communicationEvent.subject)?default("")>
<#if (defaultSubject?length == 0)>
@@ -79,19 +80,19 @@ under the License.
</#if>
</#if>
<div class="row">
<div class="col-1">
<div class="col-2">
<strong>${uiLabelMap.EcommerceSubject} :</strong>
</div>
<div class="col-11">
<div class="col-10">
<input type="input" class="inputBox form-control form-control-sm" name="subject" size="20" value="${defaultSubject}"/>
</div>
</div>
<hr/>
<div class="row">
<div class="col-1">
<div class="col-2">
<strong>${uiLabelMap.CommonMessage} :</strong>
</div>
<div class="col-11">
<div class="col-10">
<textarea name="content" class="textAreaBox form-control form-control-sm" rows="5"></textarea>
</div>
</div>
+17 -5
View File
@@ -181,7 +181,7 @@ under the License.
<input type="hidden" name="productStoreId" value="${productStoreId}" />
<input type="hidden" name="defaultShipAddr" value="${contactMech.contactMechId}" />
<input type="hidden" name="partyId" value="${party.partyId}" />
<input type="submit" value="${uiLabelMap.EcommerceSetDefault}" class="button" />
<input type="submit" value="${uiLabelMap.EcommerceSetDefault}" class="btn btn-outline-secondary" />
</form>
</#if>
<#else>
@@ -464,10 +464,20 @@ under the License.
<input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
<input type="hidden" name="roleTypeId" value="OWNER"/>
<label class="mr-2">${uiLabelMap.EcommerceUploadNewFile}</label>
<label class="custom-file mr-2">
<input type="file" name="uploadedFile" class="custom-file-input"/>
<span class="custom-file-control"></span>
</label>
<div class="custom-file mr-2">
<input type="file" class="custom-file-input" id="customFile" required/>
<label class="custom-file-label" for="customFile">Choose file</label>
<div class="invalid-feedback">Example invalid custom file feedback</div>
</div>
<script>
$('#customFile').on('change',function(){
//get the file name
var fileName = $(this).val();
fileName = fileName.replace('C:\\fakepath\\', " ");
//replace the "Choose a file" label
$(this).next('.custom-file-label').html(fileName);
})
</script>
<select name="partyContentTypeId" class="custom-select mr-2">
<option value="">${uiLabelMap.PartySelectPurpose}</option>
<#list partyContentTypes as partyContentType>
@@ -585,6 +595,7 @@ under the License.
<table class="table table-responsive-sm">
<#list surveys as surveyAppl>
<#assign survey = surveyAppl.getRelatedOne("Survey", false) />
<tbody>
<tr>
<td>${survey.surveyName!}&nbsp;-&nbsp;${survey.description!}</td>
<td>
@@ -599,6 +610,7 @@ under the License.
<td><a href="<@ofbizUrl>takesurvey?productStoreSurveyId=${surveyAppl.productStoreSurveyId}</@ofbizUrl>" class="btn btn-outline-secondary">${surveyLabel}</a></td>
</#if>
</tr>
</tbody>
</#list>
</table>
</div>
@@ -21,18 +21,14 @@ under the License.
<div>
${content}
</div>
<#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" />
<form method="post" action="${verifyUrl}">
<fieldset>
<label>E-mail: ${emailAddress}</label>
<input type="hidden" name="contactListId" value="${contactListId}"/>
<input type="hidden" name="partyId" value="${partyId}"/>
<input type="hidden" name="preferredContactMechId" value="${preferredContactMechId!}"/>
<input type="hidden" name="fromDate" value="${fromDate}"/>
<input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING"/>
<input type="hidden" name="optInVerifyCode" value="${optInVerifyCode!}"/>
<input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription."/>
</fieldset>
</form>
<#if baseLocation == "/ecomseo">
<#assign baseLocation = "/ecommerce">
</#if>
<#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListId+'&amp;partyId='+partyId+'&amp;fromDate='+fromDate+'&amp;statusId=CLPT_UNSUBS_PENDING&amp;optInVerifyCode='+optInVerifyCode+'&amp;baseLocation='+baseLocation!>
<#if preferredContactMechId??>
<#assign verifyUrl= verifyUrl+"&amp;preferredContactMechId="+preferredContactMechId>
</#if>
<a href="${verifyUrl}">Click here to unsubscribe your newsletter subscription.</a>
</body>
</html>
@@ -20,7 +20,9 @@ under the License.
<body>
<p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p>
<p>Successfully subscribed from ${contactList.contactListName} contact list.</p>
<#if baseLocation == "/ecomseo">
<#assign baseLocation = "/ecommerce">
</#if>
<#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&amp;partyId='+contactListParty.partyId+'&amp;fromDate='+contactListParty.fromDate+'&amp;statusId=CLPT_UNSUBS_PENDING&amp;optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&amp;baseLocation='+baseLocation!>
<#if (contactListParty.preferredContactMechId)??>
<#assign verifyUrl= verifyUrl+"&amp;preferredContactMechId="+contactListParty.preferredContactMechId>
@@ -20,12 +20,5 @@ under the License.
<body>
<p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p>
<p>Successfully unsubscribed from ${contactList.contactListName} contact list.</p>
<#--assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&amp;partyId='+contactListParty.partyId+'&amp;fromDate='+contactListParty.fromDate+'&amp;statusId=CLPT_SUBS_PENDING&amp;optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&amp;baseLocation='+baseLocation!>
<#if (contactListParty.preferredContactMechId)??>
<#assign verifyUrl= verifyUrl+"&amp;preferredContactMechId="+contactListParty.preferredContactMechId>
</#if>
<a href="${verifyUrl}">If this was by mistake, click here subscribe again.</a-->
</body>
</html>
@@ -32,6 +32,9 @@ under the License.
<p>We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p>
<p>To complete your unsubscription click the on the following link:</p>
<#if baseLocation == "/ecomseo">
<#assign baseLocation = "/ecommerce">
</#if>
<#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&amp;communicationEventId='+communicationEventId!+'&amp;partyId='+contactListParty.partyId+'&amp;fromDate='+contactListParty.fromDate+'&amp;statusId=CLPT_UNSUBSCRIBED&amp;optInVerifyCode='+contactListPartyStatus.optInVerifyCode>
<#if (contactListParty.preferredContactMechId)??>
<#assign verifyUrl= verifyUrl+"&amp;preferredContactMechId="+contactListParty.preferredContactMechId>
@@ -32,6 +32,9 @@ under the License.
<p>We have received a request for subscription to the ${contactList.contactListName} contact list.</p>
<p>To complete your subscription click the on the following link:</p>
<#if baseLocation == "/ecomseo">
<#assign baseLocation = "/ecommerce">
</#if>
<#assign verifyUrl = baseEcommerceSecureUrl+'/'+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&amp;partyId='+contactListParty.partyId+'&amp;fromDate='+contactListParty.fromDate+'&amp;statusId=CLPT_ACCEPTED&amp;optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&amp;baseLocation='+baseLocation!>
<#if (contactListParty.preferredContactMechId)??>
<#assign verifyUrl= verifyUrl+"&amp;preferredContactMechId="+contactListParty.preferredContactMechId>
+15
View File
@@ -16,6 +16,21 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<script>
$(document).ready(function() {
if (jQuery.fn.bsgdprcookies !== undefined) {
jQuery('body').bsgdprcookies({
title: '${uiLabelMap.EcommerceCookieConsentTitle}',
message: '${uiLabelMap.EcommerceCookieConsentMessage}',
moreLink: '/ecommerce/control/CookiePolicy',
moreLinkLabel: ' ${uiLabelMap.EcommerceCookieConsentMoreLinkLabel}',
acceptButtonLabel: '${uiLabelMap.EcommerceCookieConsentAcceptButtonLabel}',
advancedButtonLabel: '${uiLabelMap.EcommerceCookieConsentAdvancedButtonLabel}',
allowAdvancedOptions: false
});
}
});
</script>
<div class="container-fluid">
<div class="row align-items-center">
<div class="col">
+6 -1
View File
@@ -34,7 +34,12 @@ under the License.
<#assign shortcutIcon = layoutSettings.shortcutIcon/>
</#if>
<#if shortcutIcon?has_content>
<link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"/>
<link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+".ico"}</@ofbizContentUrl>" type="image/x-icon">
<link rel="icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+".png"}</@ofbizContentUrl>" type="image/png">
<link rel="icon" sizes="32x32" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-32.png"}</@ofbizContentUrl>" type="image/png">
<link rel="icon" sizes="64x64" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-64.png"}</@ofbizContentUrl>" type="image/png">
<link rel="icon" sizes="96x96" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-96.png"}</@ofbizContentUrl>" type="image/png">
<#--<link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"/>-->
</#if>
<#if layoutSettings.styleSheets?has_content>
<#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet,
+8 -2
View File
@@ -25,6 +25,12 @@ under the License.
<hr/>
</td>
</tr>
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
<tr>
<td width="26%" align="right" valign="top">
<div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div>
</td>
<td width="5">&nbsp;</td>
<td width="74%">&nbsp;</td>
</tr>
${screens.render("component://ecommerce/widget/CustomerScreens.xml#creditCardFields")}
@@ -0,0 +1,371 @@
<#--
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.
-->
<script type="text/javascript">
//<![CDATA[
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; checkout
form.action="<@ofbizUrl>checkout</@ofbizUrl>";
form.submit();
} else if ("CS" == mode) {
// continue shopping
form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
form.submit();
} else if ("NA" == mode) {
// new address
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>";
form.submit();
} else if ("EA" == mode) {
// edit address
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&contactMechId="+value+"</@ofbizUrl>";
form.submit();
} else if ("NC" == mode) {
// new credit card
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
form.submit();
} else if ("EC" == mode) {
// edit credit card
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
} else if ("GC" == mode) {
// edit gift card
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
} else if ("NE" == mode) {
// new eft account
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
form.submit();
} else if ("EE" == mode) {
// edit eft account
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=quickcheckout&partyId=${shoppingCart.getPartyId()}&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
} else if ("SP" == mode) {
// split payment
form.action="<@ofbizUrl>updateCheckoutOptions/checkoutpayment?partyId=${shoppingCart.getPartyId()}</@ofbizUrl>";
form.submit();
} else if ("SA" == mode) {
// selected shipping address
form.action="<@ofbizUrl>updateCheckoutOptions/quickcheckout</@ofbizUrl>";
form.submit();
} else if ("SC" == mode) {
// selected ship to party
form.action="<@ofbizUrl>cartUpdateShipToCustomerParty</@ofbizUrl>";
form.submit();
}
}
//]]>
</script>
<#assign shipping = !shoppingCart.containAllWorkEffortCartItems()> <#-- contains items which need shipping? -->
<form method="post" name="checkoutInfoForm">
<input type="hidden" name="checkoutpage" value="quick"/>
<input type="hidden" name="BACK_PAGE" value="quickcheckout"/>
<div class="card">
<h4 class="card-header">
<#if shipping == true>
1.&nbsp;${uiLabelMap.OrderWhereShallWeShipIt}?
<#else>
1)&nbsp;${uiLabelMap.OrderInformationAboutYou}
</#if>
</h4>
<div class="card-body" >
<div class="form-group">
<label for="shipToCustomerPartyId">${uiLabelMap.OrderShipToParty}:</label>
<select name="shipToCustomerPartyId" id="shipToCustomerPartyId" class="form-control" onchange="javascript:submitForm(document.checkoutInfoForm, 'SC', null);">
<#list cartParties as cartParty>
<option value="${cartParty}">${cartParty}</option>
</#list>
</select>
</div>
<div class="btn-toolbar mb-2">
<a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="btn btn-outline-secondary mr-2">${uiLabelMap.CommonAdd} ${uiLabelMap.PartyAddNewAddress}</a>
<#if (shoppingCart.getTotalQuantity() > 1) && !shoppingCart.containAllWorkEffortCartItems()> <#-- no splitting when only rental items -->
<a href="<@ofbizUrl>splitship</@ofbizUrl>" class="btn btn-outline-secondary">${uiLabelMap.OrderSplitIntoMultipleShipments}</a>
<#if (shoppingCart.getShipGroupSize() > 1)>
<div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}.</div>
</#if>
</#if>
</div>
<#if shippingContactMechList?has_content>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<div class="form-check">
<input type="radio" name="shipping_contact_mech_id" id="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
<label for="shipping_contact_mech_id">
<#if shippingAddress.toName?has_content><strong>${uiLabelMap.CommonTo}:</strong>&nbsp;${shippingAddress.toName}</#if>
<#if shippingAddress.attnName?has_content><strong>${uiLabelMap.PartyAddrAttnName}:</strong>&nbsp;${shippingAddress.attnName}</#if>
<#if shippingAddress.address1?has_content><strong>${uiLabelMap.OrderAddress}:</strong>&nbsp;${shippingAddress.address1}</#if>
<#if shippingAddress.address2?has_content>${shippingAddress.address2}</#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
<#if shippingAddress.stateProvinceGeoId?has_content>${shippingAddress.stateProvinceGeoId}</#if>
<#if shippingAddress.postalCode?has_content>${shippingAddress.postalCode}</#if>
<#if shippingAddress.countryGeoId?has_content>${shippingAddress.countryGeoId}</#if>
</label>
</div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="btn btn-secondary">${uiLabelMap.CommonUpdate}</a>
<#if shippingContactMech_has_next>
</#if>
</#list>
</#if>
</div>
</div>
<div class="card" >
<h4 class="card-header">
<#if shipping == true>
2.&nbsp;${uiLabelMap.OrderHowShallWeShipIt}?
<#else>
2.&nbsp;${uiLabelMap.OrderOptions}?
</#if>
</h4>
<div class="card-body" >
<#if shipping == true>
<div class="row">
<#list carrierShipmentMethodList as carrierShipmentMethod>
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<div class="col-lg-4 col-sm-6">
<div class="form-check">
<input type="radio" name="shipping_method" id="shipping_method_${carrierShipmentMethod_index}" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
<label for="shipping_method_${carrierShipmentMethod_index}">
<#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
<#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!}&nbsp;</#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
</label>
</div>
</div>
</#list>
</div>
<#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
<label>
<input type="radio" name="shipping_method" value="Default" checked="checked"/>
${uiLabelMap.OrderUseDefault}.
</label>
</#if>
<h5>${uiLabelMap.OrderShipAllAtOnce}?</h5>
<label>
<input type="radio" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false"/>
${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.
</label>
<label>
<input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true"/>
${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.
</label>
<#else>
<input type="hidden" name="shipping_method" value="NO_SHIPPING@_NA_"/>
<input type="hidden" name="may_split" value="false"/>
<input type="hidden" name="is_gift" value="false"/>
</#if>
<h5>${uiLabelMap.OrderSpecialInstructions}</h5>
<textarea rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
<#if shipping == true>
<#if productStore.showCheckoutGiftOptions! != "N" && giftEnable! != "N">
<div>
<h5>${uiLabelMap.OrderIsThisGift}</h5>
<div class="form-check">
<input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_gift" value="true">
<label for="is_gift">${uiLabelMap.CommonYes}</label>
<input type="radio" <#if "N" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name="is_gift" id="is_not_gift" value="false">
<label for="is_not_gift">${uiLabelMap.CommonNo}</label>
</div>
</div>
<h5>${uiLabelMap.OrderGiftMessage}</h5>
<textarea rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
<#else>
<input type="hidden" name="is_gift" value="false"/>
</#if>
</#if>
<h5>${uiLabelMap.PartyEmailAddresses}</h5>
<div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
<div>
<strong>
<#list emailList as email>
${email.infoString!}<#if email_has_next>,</#if>
</#list>
</strong>
</div>
<div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink??>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr"
<#else><@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
<br />
<label for="order_additional_emails">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</label>
<input type="text" class="form-control" name="order_additional_emails" id="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()!}"/>
</div>
</div>
<#-- Payment Method Selection -->
<div class="card" >
<h4 class="card-header">
3.&nbsp${uiLabelMap.OrderHowShallYouPay}?
</h4>
<div class="card-body" >
<h5>${uiLabelMap.CommonAdd}:</h5>
<div class="btn-toolbar form-group">
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<a href="javascript:submitForm(document.checkoutInfoForm, 'NC', '');" class="btn btn-outline-secondary mr-2">${uiLabelMap.AccountingCreditCard}</a>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<a href="javascript:submitForm(document.checkoutInfoForm, 'NE', '');" class="btn btn-outline-secondary mr-2">${uiLabelMap.AccountingEFTAccount}</a>
</#if>
<a href="javascript:submitForm(document.checkoutInfoForm, 'SP', '');" class="btn btn-outline-secondary">${uiLabelMap.AccountingSplitPayment}</a>
</div>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
<div class="form-check">
<input type="radio" id="checkOutEXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_COD??>
<div class="form-check">
<input type="radio" id="checkOutEXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_COD">${uiLabelMap.OrderCOD}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
<div class="form-check">
<input type="radio" id="checkOutEXT_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
<div class="form-check">
<input type="radio" id="checkOutEXT_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutEXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
<#-- financial accounts -->
<#list finAccounts as finAccount>
<div class="form-check">
<input type="radio" name="checkOutFIN_ACCOUNT${finAccount.finAccountId}" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>
<label for="checkOutFIN_ACCOUNT${finAccount.finAccountId}">${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId}</label>
</div>
</#list>
<#if !paymentMethodList?has_content>
<#if (!finAccounts?has_content)>
<h5><strong>${uiLabelMap.AccountingNoPaymentMethods}</strong></h5>
</#if>
<#else>
<#list paymentMethodList as paymentMethod>
<#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
<div class="form-check">
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
<label>CC:&nbsp;${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
</div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
<#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
&nbsp;${uiLabelMap.OrderCardSecurityCode}&nbsp;<input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
</#if>
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<div class="form-check">
<input type="radio" name="checkOutPaymentId" id="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
<label for="checkOutPaymentId">${uiLabelMap.AccountingEFTAccount}:&nbsp;${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label>
</div>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
<#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
</#if>
<#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
<#if giftCard?has_content && giftCard.cardNumber?has_content>
<#assign giftCardNumber = "">
<#assign pcardNumber = giftCard.cardNumber>
<#if pcardNumber?has_content>
<#assign psize = pcardNumber?length - 4>
<#if 0 < psize>
<#list 0 .. psize-1 as foo>
<#assign giftCardNumber = giftCardNumber + "*">
</#list>
<#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]>
<#else>
<#assign giftCardNumber = pcardNumber>
</#if>
</#if>
</#if>
<label>
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
<span>${uiLabelMap.AccountingGift}:&nbsp;${giftCardNumber}</span>
</label>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
<#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if>
</#if>
</#if>
</#list>
</#if>
<#-- special billing account functionality to allow use w/ a payment method -->
<#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??>
<#if billingAccountList?has_content>
<label for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>
<select name="billingAccountId" id="billingAccountId" class="form-control">
<option value=""></option>
<#list billingAccountList as billingAccount>
<#assign availableAmount = billingAccount.accountBalance?double>
<#assign accountLimit = billingAccount.accountLimit?double>
<option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>
<input type="text" size="5" name="billingAccountAmount" value=""/>
${uiLabelMap.OrderBillUpTo}
</#if>
</#if>
<#-- end of special billing account functionality -->
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<div class="form-check">
<input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y"/>
<label for="addGiftCard">${uiLabelMap.AccountingUseGiftCardNotOnFile}</label>
</div>
<div class="form-group">
<label for="giftCardNumber">${uiLabelMap.AccountingNumber}</label>
<input type="text" class="form-control" name="giftCardNumber" id="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
</div>
<#if shoppingCart.isPinRequiredForGC(delegator)>
<div class="form-group">
<label for="giftCardPin">${uiLabelMap.AccountingPIN}</label>
<input type="text" class="form-control" name="giftCardPin" id="giftCardPin" value="${(requestParameters.giftCardPin)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
</div>
</#if>
<div class="form-group">
<label for="giftCardAmount">${uiLabelMap.AccountingAmount}</label>
<input type="text" class="form-control" name="giftCardAmount" id="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
</div>
</#if>
</div>
</div>
<#-- End Payment Method Selection -->
</form>
<div class="row">
<div class="col-auto mr-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" class="btn btn-secondary">${uiLabelMap.OrderBacktoShoppingCart}</a>
</div>
<div class="col-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="btn btn-primary">${uiLabelMap.OrderContinueToFinalOrderReview}</a>
</div>
</div>
@@ -0,0 +1,276 @@
<#--
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.
-->
<!-- TODO : Need formatting -->
<script type="text/javascript">
//<![CDATA[
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; checkout
form.action="<@ofbizUrl>checkoutoptions</@ofbizUrl>";
form.submit();
} else if ("CS" == mode) {
// continue shopping
form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
form.submit();
} else if ("NC" == mode) {
// new credit card
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment</@ofbizUrl>";
form.submit();
} else if ("EC" == mode) {
// edit credit card
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
} else if ("GC" == mode) {
// edit gift card
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
} else if ("NE" == mode) {
// new eft account
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment</@ofbizUrl>";
form.submit();
} else if ("EE" == mode) {
// edit eft account
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
}else if(mode = "EG")
//edit gift card
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
form.submit();
}
//]]>
$(document).ready(function(){
var issuerId = "";
if ($('#checkOutPaymentId_IDEAL').attr('checked') == true) {
$('#issuers').show();
issuerId = $('#issuer').val();
$('#issuerId').val(issuerId);
} else {
$('#issuers').hide();
$('#issuerId').val('');
}
$('input:radio').click(function(){
if ($(this).val() == "EXT_IDEAL") {
$('#issuers').show();
issuerId = $('#issuer').val();
$('#issuerId').val(issuerId);
} else {
$('#issuers').hide();
$('#issuerId').val('');
}
});
$('#issuer').change(function(){
issuerId = $(this).val();
$('#issuerId').val(issuerId);
});
});
</script>
<#assign cart = shoppingCart! />
<form method="post" id="checkoutInfoForm" action="">
<input type="hidden" name="checkoutpage" value="payment" />
<input type="hidden" name="BACK_PAGE" value="checkoutoptions" />
<input type="hidden" name="issuerId" id="issuerId" value="" />
<div class="card">
<h4 class="card-header">
3)&nbsp;${uiLabelMap.OrderHowShallYouPay}?
</h4>
<div class="card-body">
<#-- Payment Method Selection -->
<div>
<label>${uiLabelMap.CommonAdd}:</label>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NC', '');" class="button">${uiLabelMap.AccountingCreditCard}</a>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NE', '');" class="button">${uiLabelMap.AccountingEFTAccount}</a>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
</div>
<div class="form-check">
<label class="form-check-label" for="checkOutPaymentId_OFFLINE">
<input type="radio" class="form-check-input" id="checkOutPaymentId_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.OrderMoneyOrder}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_COD??>
<div class="form-check">
<label class="form-check-label" for="checkOutPaymentId_COD">
<input class="form-check-input" type="radio" id="checkOutPaymentId_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.OrderCOD}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??>
<div class="form-check">
<label class="form-check-label" for="checkOutPaymentId_WORLDPAY">
<input class="form-check-input" type="radio" id="checkOutPaymentId_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.AccountingPayWithWorldPay}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
<div class="form-check">
<label class="form-check-label" for="checkOutPaymentId_PAYPAL">
<input class="form-check-input" type="radio" id="checkOutPaymentId_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_IDEAL??>
<div class="form-check">
<label class="form-check-label" for="checkOutPaymentId_IDEAL">
<input class="form-check-input" type="radio" id="checkOutPaymentId_IDEAL" name="checkOutPaymentId" value="EXT_IDEAL" <#if "EXT_IDEAL" == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.AccountingPayWithiDEAL}</label>
</div>
<div id="issuers">
<div><label >${uiLabelMap.AccountingBank}</label></div>
<select name="issuer" id="issuer">
<#if issuerList?has_content>
<#list issuerList as issuer>
<option value="${issuer.getIssuerID()}" >${issuer.getIssuerName()}</option>
</#list>
</#if>
</select>
</div>
</#if>
<hr>
<#if !paymentMethodList?has_content>
<div>
<strong>${uiLabelMap.AccountingNoPaymentMethods}.</strong>
</div>
<#else>
<#list paymentMethodList as paymentMethod>
<#if "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false) />
<#if giftCard?has_content && giftCard.cardNumber?has_content>
<#assign giftCardNumber = "" />
<#assign pcardNumber = giftCard.cardNumber />
<#if pcardNumber?has_content>
<#assign psize = pcardNumber?length - 4 />
<#if 0 &lt; psize>
<#list 0 .. psize-1 as foo>
<#assign giftCardNumber = giftCardNumber + "*" />
</#list>
<#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3] />
<#else>
<#assign giftCardNumber = pcardNumber />
</#if>
</#if>
</#if>
<div>
<input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
<label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingGift}:${giftCardNumber}</label>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EG', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
<strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>"/>
</div>
</#if>
<#elseif "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) />
<div>
<input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> />
<label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EC', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
<label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>" />
</div>
</#if>
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) />
<div>
<label for="checkOutPayment_${paymentMethod.paymentMethodId}">
<input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> />
${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label>
<#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if>
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EE', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
</div>
</#if>
</#if>
</#list>
</#if>
<#-- special billing account functionality to allow use w/ a payment method -->
<#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??>
<#if billingAccountList?has_content>
<div class="form-group">
<select class="form-control" name="billingAccountId" id="billingAccountId">
<option value=""></option>
<#list billingAccountList as billingAccount>
<#assign availableAmount = billingAccount.accountBalance>
<#assign accountLimit = billingAccount.accountLimit>
<option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] ${uiLabelMap.EcommerceAvailable} <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> ${uiLabelMap.EcommerceLimit} <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>
<label for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>
</div>
<div>
<input type="text" size="5" id="billingAccountAmount" name="billingAccountAmount" value="" />
<label for="billingAccountAmount">${uiLabelMap.OrderBillUpTo}</label>
</div>
</#if>
</#if>
<#-- end of special billing account functionality -->
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" />
<input type="hidden" name="singleUseGiftCard" value="Y" />
<label class="form-check-label" for="addGiftCard">${uiLabelMap.AccountingUseGiftCardNotOnFile}</label>
</div>
<div>
<label for="giftCardNumber">${uiLabelMap.AccountingNumber}</label>
<input type="text" class="form-control" id="giftCardNumber" name="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
</div>
<#if cart.isPinRequiredForGC(delegator)>
<div>
<label for="giftCardPin">${uiLabelMap.AccountingPIN}</label>
<input type="text" class="form-control" class="inputBox" id="giftCardPin" name="giftCardPin" value="${(requestParameters.giftCardPin)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
</div>
</#if>
<div>
<label for="giftCardAmount">${uiLabelMap.AccountingAmount}</label>
<input type="text" size="6" class="form-control" id="giftCardAmount" name="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onfocus="document.getElementById('addGiftCard').checked=true;" />
</div>
</#if>
<div>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??><a href="<@ofbizUrl>setBilling?paymentMethodType=CC&amp;singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseCreditCard}</a></#if>
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD??><a href="<@ofbizUrl>setBilling?paymentMethodType=GC&amp;singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseGiftCard}</a></#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??><a href="<@ofbizUrl>setBilling?paymentMethodType=EFT&amp;singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseEFTAccount}</a></#if>
</div>
<#-- End Payment Method Selection -->
</div>
</div>
</form>
<div class="row">
<div class="col-auto mr-auto">
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'CS', '');" class="btn btn-secondary">${uiLabelMap.OrderBacktoShoppingCart}</a>
</div>
<div class="col-auto">
<a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'DN', '');" class="btn btn-primary">${uiLabelMap.OrderContinueToFinalOrderReview}</a>
</div>
</div>
+17 -21
View File
@@ -34,7 +34,7 @@ under the License.
// -->
</script>
<h1>${uiLabelMap.OrderFinalCheckoutReview}</h1>
<h2>${uiLabelMap.OrderFinalCheckoutReview}</h2>
<#if !isDemoStore?? && isDemoStore>
<p>${uiLabelMap.OrderDemoFrontNote}.</p>
</#if>
@@ -43,27 +43,23 @@ under the License.
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
<br/>
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
<table border="0" cellpadding="1" width="100%">
<tr>
<td colspan="4">
&nbsp;
</td>
<td align="right">
<form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<#if (requestParameters.checkoutpage)?has_content>
<input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/>
</#if>
<#if (requestAttributes.issuerId)?has_content>
<input type="hidden" name="issuerId" value="${requestAttributes.issuerId}"/>
</#if>
<input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
class="mediumSubmit"/>
</form>
<div class="row">
<div class="col-auto ml-auto">
<form method="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<#if (requestParameters.checkoutpage)?has_content>
<input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/>
</#if>
<#if (requestAttributes.issuerId)?has_content>
<input type="hidden" name="issuerId" value="${requestAttributes.issuerId}"/>
</#if>
<input type="button" name="processButton" class="btn btn-primary" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();"
class="mediumSubmit"/>
</form>
<#-- doesn't work with Safari, seems to work with IE, Mozilla
<a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}]&nbsp;</a> -->
</td>
</tr>
</table>
<a href="#" onclick="processOrder();" >[${uiLabelMap.OrderSubmitOrder}]&nbsp;</a> -->
</div>
</div>
<#else>
<h3>${uiLabelMap.OrderErrorShoppingCartEmpty}.</h3>
</#if>
@@ -0,0 +1,136 @@
<#--
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.
-->
<script type="text/javascript">
//<![CDATA[
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; checkout
form.action="<@ofbizUrl>checkoutoptions</@ofbizUrl>";
form.submit();
} else if ("CS" == mode) {
// continue shopping
form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
form.submit();
} else if ("NA" == mode) {
// new address
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>";
form.submit();
} else if ("EA" == mode) {
// edit address
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutoptions&contactMechId="+value+"</@ofbizUrl>";
form.submit();
}
}
function toggleBillingAccount(box) {
var amountName = box.value + "_amount";
box.checked = true;
box.form.elements[amountName].disabled = false;
for (var i = 0; i < box.form.elements[box.name].length; i++) {
if (!box.form.elements[box.name][i].checked) {
box.form.elements[box.form.elements[box.name][i].value + "_amount"].disabled = true;
}
}
}
//]]>
</script>
<#assign cart = shoppingCart!/>
<form method="post" name="checkoutInfoForm" style="margin:0;">
<input type="hidden" name="checkoutpage" value="shippingaddress"/>
<div class="card">
<h4 class="card-header">
1)&nbsp;${uiLabelMap.OrderWhereShallWeShipIt}?
</h4>
<div class="card-body">
<table class="table table-responsive-sm">
<tr>
<td colspan="2">
<a href="<@ofbizUrl>splitship</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitShipment}</a>
<a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
<#if (cart.getShipGroupSize() > 1)>
<div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}</div>
</#if>
</td>
</tr>
<#if shippingContactMechList?has_content>
<#list shippingContactMechList as shippingContactMech>
<#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
<#assign checkThisAddress = (shippingContactMech_index == 0 && !cart.getShippingContactMechId()?has_content) || (cart.getShippingContactMechId()?default("") == shippingAddress.contactMechId)/>
<tr>
<td>
<label>
<input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked="checked"</#if> />
<span>
<#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b>&nbsp;${shippingAddress.toName}<br /></#if>
<#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>&nbsp;${shippingAddress.attnName}<br /></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1},</#if>
<#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
<#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
<#if shippingAddress.stateProvinceGeoId?has_content>${shippingAddress.stateProvinceGeoId}</#if>
<#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if>
<#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EA', '${shippingAddress.contactMechId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</span>
</label>
</td>
</tr>
</#list>
</#if>
</table>
<h5>${uiLabelMap.AccountingAgreementInformation}</h5>
<table class="table table-responsive-sm">
<#if agreements??>
<#if agreements.size()!=1>
<tr>
<td>
${uiLabelMap.OrderSelectAgreement}
</td>
<td>
<select name="agreementId" class="form-control">
<#list agreements as agreement>
<option value='${agreement.agreementId!}'>${agreement.agreementId} - ${agreement.description!}</option>
</#list>
</select>
</td>
</tr>
<#else>
<#list agreements as agreement>
<label><input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order.</label>
</#list>
</#if>
</#if>
</table>
<br />
<#-- Party Tax Info -->
<strong>&nbsp;${uiLabelMap.PartyTaxIdentification}</strong>
${screens.render("component://ecommerce/widget/OrderScreens.xml#customertaxinfo")}
</div>
</div>
</form>
<div class="row">
<div class="col-auto mr-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" class="btn btn-secondary">${uiLabelMap.OrderBacktoShoppingCart}</a>
</div>
<div class="col-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="btn btn-primary">${uiLabelMap.CommonNext}</a>
</div>
</div>
@@ -61,189 +61,100 @@ under the License.
<form method="post" name="checkoutInfoForm" style="margin:0;">
<fieldset>
<input type="hidden" name="checkoutpage" value="shippingoptions"/>
<div class="screenlet" style="height: 100%;">
<div class="screenlet-title-bar">
<div class="h3">2)&nbsp;${uiLabelMap.OrderHowShallWeShipIt}?</div>
</div>
<div class="screenlet-body" style="height: 100%;">
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<div class="card">
<h4 class="card-header">
2)&nbsp;${uiLabelMap.OrderHowShallWeShipIt}?
</h4>
<div class="card-body">
<#list carrierShipmentMethodList as carrierShipmentMethod>
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<tr>
<td width="1%" valign="top">
<input type="radio" name="shipping_method" value="${shippingMethod}"
<#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if>/>
</td>
<td valign="top">
<div>
<#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
<#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!}
&nbsp;</#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> -
<#if (shippingEst > -1)>
<@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/>
<#else>
${uiLabelMap.OrderCalculatedOffline}
</#if>
</#if>
</div>
</td>
</tr>
<div class="form-check">
<input class="form-check-input" type="radio" id="shipping_method_${carrierShipmentMethod?index}" name="shipping_method" value="${shippingMethod}"
<#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if>/>
<#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
<label class="form-check-label" for="shipping_method_${carrierShipmentMethod?index}">
<#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!}
&nbsp;</#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> -
<#if (shippingEst > -1)>
<@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/>
<#else>
${uiLabelMap.OrderCalculatedOffline}
</#if>
</#if>
</label>
</div>
</#list>
<#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
<tr>
<td width="1%" valign="top">
<input type="radio" name="shipping_method" value="Default" checked="checked"/>
</td>
<td valign="top">
<div>${uiLabelMap.OrderUseDefault}.</div>
</td>
</tr>
<div class="form-check">
<input type="radio" name="shipping_method" class="form-check-input" value="Default" checked="checked"/>
<label class="form-check-label" for="shipping_method">${uiLabelMap.OrderUseDefault}.</label>
</div>
</#if>
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
</td>
</tr>
<tr>
<td valign="top">
<input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
name="may_split" value="false"/>
</td>
<td valign="top">
<div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
</td>
</tr>
<tr>
<td valign="top">
<input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio"
name="may_split" value="true"/>
</td>
<td valign="top">
<div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
</td>
</tr>
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderSpecialInstructions}</h2>
</td>
</tr>
<tr>
<td colspan="2">
<textarea class="textAreaBox" cols="30" rows="3" wrap="hard"
name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
</td>
</tr>
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderPoNumber}</h2>&nbsp;
<#if shoppingCart.getPoNumber()?? && shoppingCart.getPoNumber() != "(none)">
<#assign currentPoNumber = shoppingCart.getPoNumber()>
</#if>
<input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber!}"/>
</td>
</tr>
<hr>
<h4>${uiLabelMap.OrderShipAllAtOnce}?</h4>
<div class="form-check">
<input type="radio" class="form-check-input" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> id="may_split_no" name="may_split" value="false"/>
<label class="form-check-label" for="may_split_no">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
</div>
<div class="form-check">
<input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" class="form-check-input" id="may_split_yes" name="may_split" value="true"/>
<label for="may_split_yes" class="form-check-label">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
</div>
<hr>
<h4>${uiLabelMap.OrderSpecialInstructions}</h4>
<textarea class="form-control" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
<hr>
<h4>${uiLabelMap.OrderPoNumber}</h4>
<#if shoppingCart.getPoNumber()?? && shoppingCart.getPoNumber() != "(none)">
<#assign currentPoNumber = shoppingCart.getPoNumber()>
</#if>
<input type="text" class="form-control" name="correspondingPoId" value="${currentPoNumber!}"/>
<#if productStore.showCheckoutGiftOptions! != "N">
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<div>
<h2>${uiLabelMap.OrderIsThisGift}</h2>
<input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
name="is_gift" value="true"/><span>${uiLabelMap.CommonYes}</span>
<input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
name="is_gift" value="false"/><span>${uiLabelMap.CommonNo}</span>
</div>
</td>
</tr>
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderGiftMessage}</h2>
</td>
</tr>
<tr>
<td colspan="2">
<textarea class="textAreaBox" cols="30" rows="3" wrap="hard"
name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
</td>
</tr>
<hr>
<h4>${uiLabelMap.OrderIsThisGift}</h4>
<div class="form-check">
<input type="radio" class="form-check-input" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" id="is_gift_true" value="true"/><label class="form-check-label" for="is_gift_true">${uiLabelMap.CommonYes}</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input"<#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" id="is_gift_false" value="false"/><label class="form-check-label" for="is_gift_false">${uiLabelMap.CommonNo}</label>
</div>
<hr>
<h4>${uiLabelMap.OrderGiftMessage}</h4>
<textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
<#else>
<input type="hidden" name="is_gift" value="false"/>
<input type="hidden" name="is_gift" value="fcheckpoutalse"/>
</#if>
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.PartyEmailAddresses}</h2>
</td>
</tr>
<tr>
<td colspan="2">
<div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
<div>
<b>
<#list emailList as email>
${email.infoString!}<#if email_has_next>,</#if>
</#list>
</b>
</div>
<div>
${uiLabelMap.OrderUpdateEmailAddress}
<a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>" class="buttontext">
${uiLabelMap.PartyProfile}
</a>.
</div>
<br/>
<div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
<input type="text" class="inputBox" size="30" name="order_additional_emails"
value="${shoppingCart.getOrderAdditionalEmails()!}"/>
</td>
</tr>
</table>
</div>
<hr>
<h4>${uiLabelMap.PartyEmailAddresses}</h4>
<div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
<strong>
<#list emailList as email>
${email.infoString!}<#if email_has_next>,</#if>
</#list>
</strong>
<div>
${uiLabelMap.OrderUpdateEmailAddress}
<a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>" class="buttontext">
${uiLabelMap.PartyProfile}
</a>.
</div>
<hr>
<label for="order_additional_emails">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</label>
<input type="text" class="form-control" name="order_additional_emails" id="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()!}"/>
</div>
</div>
</fieldset>
</form>
<table width="100%">
<tr valign="top">
<td>&nbsp;
<div class="row">
<div class="col-auto mr-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');"
class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a>
</td>
<td align="right">
class="btn btn-secondary">${uiLabelMap.OrderBacktoShoppingCart}</a>
</div>
<div class="col-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');"
class="buttontextbig">${uiLabelMap.CommonNext}</a>
</td>
</tr>
</table>
class="btn btn-primary">${uiLabelMap.CommonNext}</a>
</div>
</div>
@@ -0,0 +1,47 @@
<#--
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.
-->
<#if partyTaxAuthInfoAndDetailList??>
<#list partyTaxAuthInfoAndDetailList as partyTaxAuthInfoAndDetail>
<ul class="list-unstyled">
<li><a href="<@ofbizUrl>deleteCustomerTaxAuthInfo?partyId=${partyId}&amp;taxAuthPartyId=${partyTaxAuthInfoAndDetail.taxAuthPartyId}&amp;taxAuthGeoId=${partyTaxAuthInfoAndDetail.taxAuthGeoId}&amp;fromDate=${partyTaxAuthInfoAndDetail.fromDate}</@ofbizUrl>" class="buttontext">X</a>
[${partyTaxAuthInfoAndDetail.geoCode}] ${partyTaxAuthInfoAndDetail.geoName} (${partyTaxAuthInfoAndDetail.groupName!}): ${uiLabelMap.PartyTaxId} [${partyTaxAuthInfoAndDetail.partyTaxId?default("N/A")}], ${uiLabelMap.PartyTaxIsExempt} [${partyTaxAuthInfoAndDetail.isExempt?default("N")}]</li>
</ul>
</#list>
<div>
<div class="form-group">
<label>${uiLabelMap.PartyTaxAddInfo}:</label>
<select class="form-control" name="taxAuthPartyGeoIds">
<option></option>
<#list taxAuthorityAndDetailList as taxAuthorityAndDetail>
<option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName!})</option>
</#list>
</select>
</div>
<div class="form-group">
<label for="partyTaxId">${uiLabelMap.CommonId}: </label>
<input type="text" name="partyTaxId" class="form-control" maxlength="40"/>
</div>
<#if "Y" == productStore.showTaxIsExempt?default("Y")>
<label>${uiLabelMap.PartyTaxIsExempt} </label>
<input type="checkbox" name="isExempt" value="Y"/>
<#else>
<input type="hidden" name="isExempt" value="N"/>
</#if>
</div>
</#if>

Some files were not shown because too many files have changed in this diff Show More