116 Commits
Author SHA1 Message Date
Nicolas Malin df7ae11c73 Fixed: Add to cart is not working for products with selectable features (OFBIZ-11970)
Two issues were present, first was due to incorrect markup and the second was due to ajax request and response view of the additem request.
In additem request last saved view or the view of the last request is rendered on successful operation and in this case the last request/view is the one which is used to render UOM dropdown.

Thanks: Akash Jain and Ravi Lodhi
2021-09-28 14:12:10 +02:00
Nicolas Malin 6d5aca3d2a Fixed: Incorrect price for selected variant shown (OFBIZ-12236)
When the webshop (ecommerce component) has been set up for retail (B2C), with the tax setting 'Show prices with VAT tax included' set to 'Y' in store 9000 the appropriat Tax Auth Geo and Tax Auth set in store 9000 the flag 'Include Tax In Price' set to 'Y' for the Tax Auth the price for a virtual product is shown including VAT.

However, for a selected variant the price shown is without VAT

Thanks: Pierre Smits to raise this issue and Priya Sharma for solved it
2021-09-27 16:29:18 +02:00
Jacques Le Roux 905e7b0253 Fixed: The Solr version included in OFBiz has an SSRF vulnerability (CVE-2021-27905) (OFBIZ-12316)
Fixes conflicts from cherry pick
2021-09-15 13:44:06 +02:00
Jacques Le Roux cdf6bd69e5 Fixed: The Solr version included in OFBiz has an SSRF vulnerability (CVE-2021-27905) (OFBIZ-12316)
This post-auth security issue was reported to the security team by weinull orz
<weinull@outlook.com> As he suggested the solution is to update Solr to its last
version (8.9.0)

This solution contains a (justified) rant!

Thanks: weinull orz

Conflicts handled by hand (hence the numerous unnecessary automatic changes due to my editor (Scite) config
#	lucene/build.gradle
#	solr/build.gradle
#	solr/home/solrdefault/conf/solrconfig.xml
#	solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
2021-09-15 10:34:29 +02:00
Jacques Le Roux 18c0c436af Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo, hence the next
2021-07-20 07:38:46 +02:00
Jacques Le Roux f7f7776514 Improved: removes mention of Birt in plugins LICENSE file
We no longer embed files from Birt project. For years now we use Gradle to load
org.eclipse.birt.runtime:viewservlets:4.5.0 that is only "loaded at runtime"
2021-06-17 18:35:18 +02:00
Jacques Le Roux 485e3b89d7 Fixed: Empty field is reflecting on Contact list section on Profile Page (OFBIZ-10386)
Steps to generate:

Open https://demo-trunk.ofbiz.apache.org/ecomseo/viewprofile

On the profile page, Go down to Contact list
Empty fields are displaying before Verify Subscription button

Expected: The field should have some specifications to be filled up

Thanks: Archana Asthana for report, Devanshu Vyas for suggestion, Praveen Patil
for patch and Thirumurugan for confirming
2021-05-29 15:47:48 +02:00
Jacques Le Roux 340c98b3b0 Improved: Comment out the SOAP and HTTP engines (OFBIZ-12212)
The SOAP and HTTP engines are open doors to security issues.
At https://markmail.org/message/pgtjyh23bazq4s2w I proposed to comment them out
as we did for RMI in the past.
Of cause it must be clearly documented how to use them if needed.

Here is the email content:

    After the recent fix for the CVE-2021-26295[1] we discussed with the security
    team about the opportunity need to comment out the SOAP and HTTP engines
    like we did in the past for RMI[2], this obviously for security reason.

    [1] OFBIZ-12167 "Adds a blacklist (to be
    renamed soon to denylist) in Java serialisation (CVE-2021-26295)"
    [2] OFBIZ-6942 "Comment out RMI related
    code because of the Java deserialization issue [CVE-2016-2170] "

I just put a small comment in webtools and scrumm controllers, it should be
enough.

The tests pass

Conflicts handled by hand
  scrum/servicedef/services.xml
2021-03-29 13:23:43 +02:00
Michael Brohl a356edc9b7 Improved: Switch from jCenter to mavenCentral to handle the jCenter
shutdown (OFBIZ-12171)

See comments in framework build.gradle for details.
2021-02-27 14:42:46 +01:00
Jacques Le Roux d94d5910f7 Fixed: Exception error on ecommerce portal while trying to register new user
(OFBIZ-)

Missing import statement in the groovy script on the new customer registration
page.

Thanks: Pradeep Choudhary
2021-02-27 14:10:31 +01:00
Jacques Le Roux f70aef14a4 Improved: Default ordering of webapps titles in main menu (OFBIZ-12166)
This 1st step sorts the plugins. We need to discuss more...
2021-02-15 12:35:59 +01:00
Deepak Dixit 27baf80c98 Fixed: Fitering on StatusId in FindTask does not work (#56)
(OFBIZ-10914)
2021-02-12 15:42:03 +05:30
Pawan Verma 7afe2b73e5 Fixed: Visit disabling causes NullPointerException on ecomm groovy script(OFBIZ-12173)
Used UtilHttp.getSessionId() instead of visit to get session Id.

Thanks: Giulio, Jacopo and Deepak.
2021-02-12 09:26:36 +05:30
Deepak Dixit e897ffc7ce Updated code as per lucene dependency update (OFBIZ-12100) 2021-01-04 14:42:10 +05:30
Deepak Dixit 0caff3bb10 Fixed: Updated lucene and solr dependecy to fix the test case failure relate…d to tika-parser dependency update
(OFBIZ-12100)
Manually backported cahnges from commit #1c355bb6d89739cb796bc1e17a7ad2a4a4fa8995
2021-01-04 14:40:10 +05:30
Jacques Le Roux 5ab0a6aa2f 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:14 +01:00
Jacques Le Roux e3adeec062 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:21:24 +01:00
Jacques Le Roux 49b96e47cc * 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:54:55 +01:00
Saurabh Dixit 3cc8f47135 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
2020-11-30 11:38:26 +01:00
Jacques Le Roux cde1c6ac61 Fixed: Wrong quote marks (OFBIZ-11972)
Thanks: Alex Bodnaru
2020-10-06 16:03:28 +02:00
holivier ccfb388999 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-05 11:32:12 +02:00
Jacques Le Roux b8c43a178a 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:
#	birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
#	birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
2020-10-04 11:38:14 +02:00
Jacques Le Roux ad04cda8f0 Fixed: Complete Birt Flexible Reports documentation (OFBIZ-9188)
Removes "NOTE: This feature will begin to be officially available with the
R17.12 branch first release"

# Conflicts resolved by hand
#	birt/src/docs/asciidoc/_include/bt-creating reports.adoc
#	birt/src/docs/asciidoc/birt.adoc
2020-10-03 11:07:58 +02:00
Jacques Le Roux 1205ac591c Improved: display/selection of unit of measure is broken/plugins (OFBIZ-11993)
Better code

Thanks: Alex

Conflicts handled by hand ProductDetail.ftl
2020-09-14 08:00:48 +02:00
Akash Jain faf008c152 Fixed: Error on removing scrum members (OFBIZ-7249)
Thanks, Anurag Chandak for report.
2020-09-01 15:18:05 +05:30
Suraj Khurana d4e9a765ff Fixed: Typo in class name.
(OFBIZ-11978)
Thanks Alex Bodnaru for reporting and providing the patch.
2020-09-01 15:11:22 +05:30
Jacques Le Roux ab61110dc5 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:07:56 +02:00
Jacques Le Roux c4a031dcb2 Fixed: multiflex css is linking to wrong location (OFBIZ-11977)
Thanks: Alex
2020-08-30 11:19:10 +02:00
Akash Jain 8c6c0f5834 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:18:46 +05:30
Akash Jain 05d8e9fa3e Fixed: Product link on Order confirmation page is not responding (OFBIZ-11735)
Thanks, Rashi Dhagat for reporting.
2020-08-03 18:16:29 +05:30
Jacques Le Roux c05bc3af1b Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0 (OFBIZ-10136)
Fixes a typo
2020-07-25 10:06:52 +02:00
Aditya Sharma 64b0f25e34 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:07 +05:30
Jacques Le Roux 7a51784e2a 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:11:48 +02:00
Pawan Verma b93265d798 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:17 +05:30
Jacques Le Roux 918d3e8518 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

Thanks: Priya Sharma for testing
2020-06-23 14:36:33 +02:00
Aditya Sharma 2b3252cf37 Improved: Breadcrumbs should be shown on all the pages of eCommerce application
(OFBIZ-2584)
Right now in OOTB eCommerce application breadcrumbs are only shown for catalog pages. It should be available on other pages too.

Added breadcrumb for ContactUs and Anonymous ContactUs page

Thanks Pranay Pandey for reporting the issue and Aishwary Shrivastava for providing the patch
2020-06-02 19:23:36 +05:30
Jacques Le Roux 09c9bab4d0 Improved: adds pull_request_template.md (OFBIZ-11722) 2020-05-31 09:47:17 +02:00
Pawan Verma aa7008407b Fixed: Improve the buttons on edit credit card page
(OFBIZ-10975)

Thanks: Sourabh and Suraj for your contribution.
2020-05-10 14:12:38 +05:30
Jacques Le Roux a64dea4ffe Reverted: Revert "Adds the meta CSRF token for Ajax"
This reverts commit 11250f22d8.

Revert "Improved: POC for CSRF Token"

This reverts commit d52374422e.

I forgot that I committed these changes in ecommerce w/o committing in framework
2020-04-27 18:30:03 +02:00
Jacques Le Roux 11250f22d8 Adds the meta CSRF token for Ajax 2020-04-04 18:36:02 +02:00
Jacques Le Roux d52374422e Improved: POC for CSRF Token
(OFBIZ-11306)

There is no need to change it in common-controller because, apart the ecommerce
application, there are no applications that requires an anonymous flow.
It should be only changed in ecommerce controller.
2020-04-04 18:36:02 +02:00
Pawan Verma fcbb750cf6 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:42:52 +01:00
Jacques Le Roux ba31a241ac 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:53:57 +01:00
Jacques Le Roux c7c511eda6 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:21 +01:00
Jacques Le Roux b0dd29895f 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:27:24 +01:00
Pierre Smits 706fc86892 Implemented: have a license
(OFBIZ-11451)
2020-03-13 16:06:45 +01:00
Suraj Khurana c117078a61 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:20:33 +05:30
Jacques Le Roux c84b388b85 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:01 +01:00
Jacques Le Roux bffd5d9d0d Improved: no functional change
This file inadvertently slipped in with a previous commit, it's not needed.
2020-02-19 14:09:44 +01:00
Jacques Le Roux 6d9314e8bf 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:03:19 +01:00
Jacques Le Roux 90b2d6c9bf 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:04 +01:00
Jacques Le Roux 8926d686c9 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:03 +01:00
Jacques Le Roux bd600a3dd4 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:54:31 +01:00
Aditya Sharma 93f513517f 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:27:43 +05:30
Aditya Sharma 8b45efaee3 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:27:24 +05:30
Aditya Sharma 53e1b6f9a4 Improved: no functional change
Added .gitignore file
2020-02-10 10:48:36 +05:30
Nicolas Malin 6296ab4078 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:03:41 +01:00
Pawan Verma ca08d3f8bb 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:56:28 +05:30
Jacques Le Roux b6b745a7a1 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 06:27:33 +01:00
akash 3045557f32 Fixed: User is unable to create return.
(OFBIZ-10850)
Thanks, Ashish and Ankush Upadhyay for your contribution.
2020-01-25 18:37:54 +05:30
Pawan Verma 2d3ca0534e Merge branch 'release18.12' of https://gitbox.apache.org/repos/asf/ofbiz-plugins into release18.12 2020-01-25 11:42:55 +05:30
Pawan Verma af2fde4fd3 Fixed: Corrected file path for ProcessPaymentSettings.groovy
(OFBIZ-11324)
2020-01-25 11:42:34 +05:30
James Yong 4b7a3b3789 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:30:13 +08:00
Mathieu Lirzin 20a82a9598 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”.

(cherry picked from commit 1158664ba3)

# Conflicts handled by hand
#	msggateway/webapp/msggateway/WEB-INF/web.xml
2019-12-19 06:50:23 +01:00
Jacopo Cappellato ad91ba42c0 Fixed: Add missing view permissions checks to various screens. 2019-11-16 08:16:44 +01:00
Jacques Le Roux 2520f9357e 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:05:30 +01:00
Jacques Le Roux 8a0ae58940 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:40:40 +01:00
Jacques Le Roux c432d0483a "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/release18.12@1868547 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:20:10 +00:00
Jacques Le Roux 802adf0385 "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/release18.12@1867850 13f79535-47bb-0310-9956-ffa450edef68
2019-10-01 17:32:53 +00:00
Jacques Le Roux 4492b0cc55 "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/release18.12@1867720 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 11:00:35 +00:00
Jacques Le Roux 3b54c81e1b "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/release18.12@1867713 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 09:34:24 +00:00
Nicolas Malin e9bae9a7bd Improved: Any ecommerce user has the ability to reset anothers password (including admin) via "Forget Your Password"
(OFBIZ-4361)

Update ecommerce plugin to use the forget passord process with jwtToken :
  * Add jwtToken managment on update password page
  * Change changepassword to passwordChange on controller for align with common-controller



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1867648 13f79535-47bb-0310-9956-ffa450edef68
2019-09-27 19:26:26 +00:00
Pawan Verma 9a9ba5703d 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/release18.12@1865833 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 09:48:03 +00:00
Jacques Le Roux ff56f6c6b4 "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/release18.12@1865399 13f79535-47bb-0310-9956-ffa450edef68
2019-08-18 15:17:30 +00:00
Jacques Le Roux 08f7e7bebe "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/release18.12@1865350 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:39:20 +00:00
Aditya Sharma 840966e2f1 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/release18.12@1863852 13f79535-47bb-0310-9956-ffa450edef68
2019-07-27 09:37:36 +00:00
Jacques Le Roux 94f2947278 "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/release18.12@1862469 13f79535-47bb-0310-9956-ffa450edef68
2019-07-03 13:32:10 +00:00
Jacques Le Roux 14e58e127d "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/release18.12@1861987 13f79535-47bb-0310-9956-ffa450edef68
2019-06-24 10:32:05 +00:00
Jacques Le Roux d241da1275 "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/release18.12@1861906 13f79535-47bb-0310-9956-ffa450edef68
2019-06-23 09:11:49 +00:00
Swapnil Mane e970e53fb1 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/release18.12@1861826 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 09:15:26 +00:00
Suraj Khurana caf1a38c8d 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/release18.12@1860803 13f79535-47bb-0310-9956-ffa450edef68
2019-06-08 06:47:15 +00:00
Deepak Dixit 5b546b1aba 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/release18.12@1860649 13f79535-47bb-0310-9956-ffa450edef68
2019-06-05 09:46:02 +00:00
Suraj Khurana 349deceab7 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/release18.12@1859907 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 05:07:01 +00:00
Jacques Le Roux 49289bc161 "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/release18.12@1859894 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 17:16:44 +00:00
Jacques Le Roux c828fa3735 "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/release18.12@1859737 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 16:41:59 +00:00
Jacques Le Roux 45feca67b3 "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/release18.12@1859013 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 14:33:36 +00:00
Jacopo Cappellato 40484c0f36 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/release18.12@1858439 13f79535-47bb-0310-9956-ffa450edef68
2019-04-30 14:58:45 +00:00
Jacques Le Roux 31327e2f59 "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/release18.12@1858313 13f79535-47bb-0310-9956-ffa450edef68
2019-04-28 10:52:24 +00:00
Suraj Khurana 9320c40558 Applied fix from trunk for revision: 1858289
===

Fixed: Shortkeys missing on WebPOS.
(OFBIZ-10961)
It was broken after jQuery update on rev #1850712.
Thanks Padmavati Rawat for reporting and Rohit Koushal for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858290 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 16:40:08 +00:00
Suraj Khurana 4952ed4713 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/release18.12@1858286 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 16:15:02 +00:00
Deepak Dixit 64ff2f81c1 Applied fix from trunk for revision: 1858265
===

Improved: UI issue on ecommerce main page
(OFBIZ-10849)
1. Navigate to demo-trunk ecom
2. Scroll the page and see the last category section in the right column of the screen.
3. The last category section seems to be distorted because of the empty list Screenshot attached for the same.

The patch contains the following:
- Fixed the category section rendering.

- Improved the markup of survey section of the main page.
- Improved the UI/UX of view cart screen 

Thanks  Garima jain  and Nitish Mishra for  your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858266 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 11:43:45 +00:00
Suraj Khurana 8be85cc8e8 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/release18.12@1858245 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 06:44:36 +00:00
Jacques Le Roux b9ac3ac4d2 "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/release18.12@1858142 13f79535-47bb-0310-9956-ffa450edef68
2019-04-25 14:28:18 +00:00
Jacques Le Roux a2fe68212c 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/release18.12@1857587 13f79535-47bb-0310-9956-ffa450edef68
2019-04-15 14:42:28 +00:00
Jacques Le Roux 7d6fbeebb9 "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/release18.12@1857175 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 11:51:06 +00:00
Deepak Dixit 9d0e6c2528 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/release18.12@1857121 13f79535-47bb-0310-9956-ffa450edef68
2019-04-08 16:53:30 +00:00
Jacques Le Roux 15480125b8 "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/release18.12@1856918 13f79535-47bb-0310-9956-ffa450edef68
2019-04-04 12:19:18 +00:00
Jacques Le Roux 5a4dcd611d "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/release18.12@1856803 13f79535-47bb-0310-9956-ffa450edef68
2019-04-02 07:57:15 +00:00
Jacques Le Roux a4cee4a745 "Applied fix from plugins for revision: 1856212 "
------------------------------------------------------------------------
r1856212 | jleroux | 2019-03-25 18:47:52 +0100 (lun. 25 mars 2019) | 9 lignes

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/release18.12@1856214 13f79535-47bb-0310-9956-ffa450edef68
2019-03-25 17:50:29 +00:00
Aditya Sharma 3a73856173 Applied fix from trunk for revision: 1855084
===

Improved: Replace document.write() occurrences with some legitimate code
(OFBIZ-10759)
Removed document.write.lastFocusedName as code works without it


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1855092 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 06:51:09 +00:00
Suraj Khurana 6d0cc93ee9 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/release18.12@1855089 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 06:39:33 +00:00
Deepak Dixit aefe7895ac Applied fix from trunk for revision: 1853904
===

Improved: Updated plugin code to fix console warning related to deprecated method. Removed Double constructor call as its depracated since jdk 9. Also replace the CellType::getCellTypeEnum method call with CellTyoe::getCellType
(OFBIZ-10757)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854692 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 10:52:01 +00:00
Deepak Dixit c5a05c83ff Applied fix from trunk for revision: 1854684
===

Preparation for JDK11 update, Updated following code to fix warning with respect to JDK11
- Replaced Class::newInstance occurrences
(OFBIZ-10757)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854690 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 10:46:27 +00:00
Jacques Le Roux a331d3dee8 Improved: no functional change
Copies Solr doc from trunk

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854518 13f79535-47bb-0310-9956-ffa450edef68
2019-02-28 10:31:29 +00:00
Swapnil Mane 96fc00f7d0 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/release18.12@1852990 13f79535-47bb-0310-9956-ffa450edef68
2019-02-05 11:56:38 +00:00
Jacques Le Roux a67d054c35 "Applied fix from plugins for revision: 1851885 "
------------------------------------------------------------------------
r1851885 | jleroux | 2019-01-23 08:14:21 +0100 (mer. 23 janv. 2019) | 10 lignes

Fixed: Implemented: Navigate from a domain to another with automated signed in 
authentication
(OFBIZ-10307)

Non functional change

Removes now useless "webappName" var after I put in the SecuredUserLoginId 
cookies.

Thanks: Michael for spotting it in OFBIZ-10814
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851887 13f79535-47bb-0310-9956-ffa450edef68
2019-01-23 07:17:11 +00:00
Aditya Sharma c62accc95c Applied fix from trunk for revision: 1851316
===

Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Added an example in FormWidgetExamples for the field.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851318 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 04:59:33 +00:00
Deepak Dixit 7ffe31bed9 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/release18.12@1851186 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 19:16:59 +00:00
Deepak Dixit 249ed1b30f 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/release18.12@1851142 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:50:54 +00:00
Deepak Dixit 7bf63fad20 Applied fix from trunk for revision: 1851139
===

Only formatting , No function chages
(OFBIZ-10790)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851141 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:48:31 +00:00
Deepak Dixit dc87292455 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/release18.12@1851136 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:16:36 +00:00
Jacques Le Roux 684a5a1220 "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/release18.12@1851073 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:15:16 +00:00
Deepak Dixit 2ded55743a Applied fix from trunk for revision: 1851009
===

Improved: Update multifex theme as per new markup 
(OFBIZ-10118)
Thanks Ayushi Rathod, Parakh Maheshwari and Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851010 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:23:45 +00:00
Deepak Dixit b7949d22a8 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/release18.12@1851004 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:04:35 +00:00
Aditya Sharma f2c26f9d97 Applied fix from trunk for revision: 1850712
===

Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on() method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with explicit boolean return.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1850714 13f79535-47bb-0310-9956-ffa450edef68
2019-01-08 05:25:10 +00:00
Nicolas Malin e029947649 Created feature branch 18.12 for the ofbiz-plugins.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1849862 13f79535-47bb-0310-9956-ffa450edef68
2018-12-28 14:37:05 +00:00
272 changed files with 28780 additions and 1263 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
+227
View File
@@ -0,0 +1,227 @@
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 "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/).
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="AssetMaintApplication">
<value xml:lang="de">Instandhaltungsanwendung</value>
<value xml:lang="en">Asset Maintenance Application</value>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="IsMgrApplication">
<value xml:lang="en">Information Systems Management Application</value>
<value xml:lang="fr">Gestion du parc informatique</value>
+1 -1
View File
@@ -19,7 +19,7 @@
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
+3 -1
View File
@@ -20,7 +20,7 @@
<ofbiz-component name="assetmaint" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<!-- define resource loaders; most common is to use the component resource loader -->
<resource-loader name="main" type="component"/>
@@ -41,6 +41,7 @@
<webapp name="assetmaint"
title="AssetMaint"
position="19"
server="default-server"
location="webapp/assetmaint"
base-permission="ASSETMAINT"
@@ -49,6 +50,7 @@
<webapp name="ismgr"
title="IS Mgr"
position="20"
server="default-server"
app-bar-display="false"
location="webapp/ismgr"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<!-- ECAs used to extend service permission checking -->
<eca service="fixedAssetPermissionCheck" event="return" run-on-failure="true">
+1 -1
View File
@@ -14,7 +14,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>Assetmaint Services: Fixed Asset </description>
<vendor>OFBiz</vendor>
<version>1.0</version>
+1 -1
View File
@@ -20,7 +20,7 @@
<test-suite suite-name="assetmainttests"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
<test-case case-name="assetmaint-tests">
<simple-method-test location="component://assetmaint/minilang/test/FixedAssetMaintTests.xml"/>
+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>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BusinessIntelligenceApplication">
<value xml:lang="en">Business Intelligence Application</value>
<value xml:lang="fr">Application d'informatique décisionnelle</value>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitygroup.xsd">
<!-- ========================================================= -->
<!-- Dimensions -->
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
<!-- ========================================================= -->
+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"/>
+2 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="bi" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
@@ -43,6 +43,7 @@ under the License.
<webapp name="bi"
title="Business Intelligence"
position="16"
menu-name="secondary"
server="default-server"
location="webapp/bi"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<!-- dimension entities -->
<eca service="createProduct" event="global-commit-post-run">
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<service name="storeGenericDimension" engine="java"
location="org.apache.ofbiz.bi.util.DimensionServices" invoke="storeGenericDimension" auth="true">
+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"/>
+1 -1
View File
@@ -20,7 +20,7 @@
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BirtErrorCannotDetermineDataSource">
<value xml:lang="en">Failed to determine data source for report</value>
<value xml:lang="fr">La détermination de la source de données à échoué</value>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BirtApplication">
<value xml:lang="en">Eclipse BIRT Application</value>
<value xml:lang="fr">Application Eclipse Birt</value>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<title>View definitions for master report services</title>
<description>None</description>
<version>1.0</version>
+5 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="birt" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
@@ -47,11 +47,13 @@ under the License.
<webapp name="accounting"
title="Accounting"
server="default-server"
position="5"
location="webapp/accounting"
base-permission="OFBTOOLS,ACCOUNTING"
mount-point="/accounting"/>
<webapp name="facility"
title="Facility"
position="3"
description="FacilityComponentDescription"
server="default-server"
location="webapp/facility"
@@ -59,6 +61,7 @@ under the License.
mount-point="/facility"/>
<webapp name="order"
title="Order"
position="4"
description="OrderComponentDescription"
server="default-server"
location="webapp/ordermgr"
@@ -67,6 +70,7 @@ under the License.
<webapp name="birt"
title="BIRT"
position="17"
server="default-server"
location="webapp/birt"
base-permission="OFBTOOLS,WEBTOOLS"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>OFBiz BIRT Services</description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -2,8 +2,6 @@
==== 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
-2
View File
@@ -30,8 +30,6 @@ 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]
Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 196 KiB

@@ -259,7 +259,10 @@ 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\" "
+ "xmlns=\"http://ofbiz.apache.org/Widget-Form\" "
+ "xsi:schemaLocation=\"http://ofbiz.apache.org/Widget-Form "
+ "http://ofbiz.apache.org/dtds/widget-form.xsd\">");
xmlHeaderForm.append(reportForm);
xmlHeaderForm.append("</forms>");
reportForm = xmlHeaderForm.toString();
@@ -46,8 +46,8 @@ import org.apache.ofbiz.common.email.NotificationServices;
import org.apache.ofbiz.entity.Delegator;
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;
@@ -90,6 +90,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();
@@ -317,7 +317,11 @@ 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\" "
+ "xmlns=\"http://ofbiz.apache.org/Widget-Form\" "
+ "xsi:schemaLocation=\"http://ofbiz.apache.org/Widget-Form "
+ "http://ofbiz.apache.org/dtds/widget-form.xsd\">");
newForm.append(overrideFilters);
newForm.append("</forms>");
Document xmlForm = UtilXml.readXmlDocument(newForm.toString());
@@ -745,7 +749,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>
+8 -3
View File
@@ -20,13 +20,18 @@ under the License.
<ofbiz-component name="cmssite" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CmsMultiSiteDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CmsSiteDemoData.xml"/>
<webapp name="cmssite" title="CMS Site" menu-name="secondary" app-bar-display="false"
server="default-server" location="webapp/cmssite" mount-point="/cmssite"/>
<webapp name="cmssite"
title="CMS Site"
menu-name="secondary"
app-bar-display="false"
server="default-server"
location="webapp/cmssite"
mount-point="/cmssite"/>
</ofbiz-component>
@@ -51,7 +51,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;
@@ -85,7 +85,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");
@@ -93,7 +93,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");
@@ -120,7 +120,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");
@@ -149,7 +149,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>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="buildEbayConfig.exceptionInGetOrdersFromEbay">
<value xml:lang="en">Exception in getting orders from Ebay.</value>
<value xml:lang="it">Eccezione nel ricevere gli ordini da eBay.</value>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
+2 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="ebay" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
@@ -37,6 +37,7 @@ under the License.
<webapp name="ebay"
title="Ebay"
position="23"
menu-name="secondary"
server="default-server"
location="webapp/ebay"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<!-- if the order has been imported from eBay, set the order status in eBay to completed -->
<eca service="changeOrderStatus" event="commit" run-on-error="false">
<condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>eBay Component Services</description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -743,16 +743,16 @@ public class EbayOrderServices {
double shippingSurcharge = 0;
if (UtilValidate.isNotEmpty(incuranceCost)) {
shippingInsuranceCost = new Double(incuranceCost);
shippingInsuranceCost = Double.parseDouble(incuranceCost);
}
if (UtilValidate.isNotEmpty(additionalCost)) {
shippingServiceAdditionalCost = new Double(additionalCost);
shippingServiceAdditionalCost = Double.parseDouble(additionalCost);
}
if (UtilValidate.isNotEmpty(surchargeCost)) {
shippingSurcharge = new Double(surchargeCost);
shippingSurcharge = Double.parseDouble(surchargeCost);
}
double shippingTotalAdditionalCost = shippingInsuranceCost + shippingServiceAdditionalCost + shippingSurcharge;
String totalAdditionalCost = new Double(shippingTotalAdditionalCost).toString();
String totalAdditionalCost = Double.toString(shippingTotalAdditionalCost);
shippingServiceSelectedCtx.put("shippingTotalAdditionalCost", totalAdditionalCost);
}
orderCtx.put("shippingServiceSelectedCtx", shippingServiceSelectedCtx);
@@ -1063,7 +1063,7 @@ public class EbayOrderServices {
String shippingCost = (String) shippingServiceSelectedCtx.get("shippingServiceCost");
if (UtilValidate.isNotEmpty(shippingCost)) {
double shippingAmount = new Double(shippingCost);
double shippingAmount = Double.parseDouble(shippingCost);
if (shippingAmount > 0) {
GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount, 0.0);
if (shippingAdjustment != null) {
@@ -1074,7 +1074,7 @@ public class EbayOrderServices {
// Apply additional shipping costs as order adjustment
String shippingTotalAdditionalCost = (String) shippingServiceSelectedCtx.get("shippingTotalAdditionalCost");
if (UtilValidate.isNotEmpty(shippingTotalAdditionalCost)) {
double shippingAdditionalCost = new Double(shippingTotalAdditionalCost);
double shippingAdditionalCost = Double.parseDouble(shippingTotalAdditionalCost);
if (shippingAdditionalCost > 0) {
GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost, 0.0);
if (shippingAdjustment != null) {
@@ -1087,11 +1087,11 @@ public class EbayOrderServices {
String salesTaxAmount = (String) shippingDetailsCtx.get("salesTaxAmount");
String salesTaxPercent = (String) shippingDetailsCtx.get("salesTaxPercent");
if (UtilValidate.isNotEmpty(salesTaxAmount)) {
double salesTaxAmountTotal = new Double(salesTaxAmount);
double salesTaxAmountTotal = Double.parseDouble(salesTaxAmount);
if (salesTaxAmountTotal > 0) {
double salesPercent = 0.0;
if (UtilValidate.isNotEmpty(salesTaxPercent)) {
salesPercent = new Double(salesTaxPercent);
salesPercent = Double.parseDouble(salesTaxPercent);
}
GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmountTotal, salesPercent);
if (salesTaxAdjustment != null) {
@@ -545,19 +545,19 @@ public class ImportOrdersFromEbay {
double shippingSurcharge = 0;
if (UtilValidate.isNotEmpty(incuranceCost)) {
shippingInsuranceCost = new Double(incuranceCost);
shippingInsuranceCost = Double.parseDouble(incuranceCost);
}
if (UtilValidate.isNotEmpty(additionalCost)) {
shippingServiceAdditionalCost = new Double(additionalCost);
shippingServiceAdditionalCost = Double.parseDouble(additionalCost);
}
if (UtilValidate.isNotEmpty(surchargeCost)) {
shippingSurcharge = new Double(surchargeCost);
shippingSurcharge = Double.parseDouble(surchargeCost);
}
double shippingTotalAdditionalCost = shippingInsuranceCost + shippingServiceAdditionalCost + shippingSurcharge;
String totalAdditionalCost = new Double(shippingTotalAdditionalCost).toString();
String totalAdditionalCost = Double.toString(shippingTotalAdditionalCost);
order.put("shippingTotalAdditionalCost", totalAdditionalCost);
}
@@ -681,7 +681,7 @@ public class ImportOrdersFromEbay {
// Apply shipping costs as order adjustment
String shippingCost = (String) parameters.get("shippingServiceCost");
if (UtilValidate.isNotEmpty(shippingCost)) {
double shippingAmount = new Double(shippingCost);
double shippingAmount = Double.parseDouble(shippingCost);
if (shippingAmount > 0) {
GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount, 0.0);
if (shippingAdjustment != null) {
@@ -693,7 +693,7 @@ public class ImportOrdersFromEbay {
// Apply additional shipping costs as order adjustment
String shippingTotalAdditionalCost = (String) parameters.get("shippingTotalAdditionalCost");
if (UtilValidate.isNotEmpty(shippingTotalAdditionalCost)) {
double shippingAdditionalCost = new Double(shippingTotalAdditionalCost);
double shippingAdditionalCost = Double.parseDouble(shippingTotalAdditionalCost);
if (shippingAdditionalCost > 0) {
GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost, 0.0);
if (shippingAdjustment != null) {
@@ -706,11 +706,11 @@ public class ImportOrdersFromEbay {
String salesTaxAmount = (String) parameters.get("salesTaxAmount");
String salesTaxPercent = (String) parameters.get("salesTaxPercent");
if (UtilValidate.isNotEmpty(salesTaxAmount)) {
double salesTaxAmountTotal = new Double(salesTaxAmount);
double salesTaxAmountTotal = Double.parseDouble(salesTaxAmount);
if (salesTaxAmountTotal > 0) {
double salesPercent = 0.0;
if (UtilValidate.isNotEmpty(salesTaxPercent)) {
salesPercent = new Double(salesTaxPercent);
salesPercent = Double.parseDouble(salesTaxPercent);
}
GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmountTotal, salesPercent);
if (salesTaxAdjustment != null) {
+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
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="EbayAcceptTheBestOffer1">
<value xml:lang="en">use this percent value to accept the Best Offer if it is greater or equal</value>
<value xml:lang="zh">如果大于或等于这个百分比,使用它作为最佳报价</value>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
+2 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="ebaystore" enabled="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
@@ -39,6 +39,7 @@ under the License.
<webapp name="ebaystore"
title="eBay Store"
position="24"
menu-name="secondary"
server="default-server"
location="webapp/ebaystore"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<eca service="createEbayProductStorePref" event="commit">
<condition field-name="enabled" operator="equals" value="Y"/>
<condition field-name="serviceName" operator="is-not-empty"/>
+2 -2
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>eBay Component Services</description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -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"/>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>eBay Component Services</description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -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;
@@ -1978,7 +1979,7 @@ public class EbayStore {
double reservPrice = 0;
if (UtilValidate.isNotEmpty(sst)) {
AmountType amt = sst.getCurrentPrice();
currentPrice = amt != null ? (new Double(amt.getValue())) : 0;
currentPrice = amt != null ? (Double.parseDouble(amt.getValue())) : 0;
bidCount = sst.getBidCount() != null ? sst.getBidCount() : 0;
}
cols.put("buyItNowPrice", item.getBuyItNowPrice().getValue());
@@ -2010,7 +2011,7 @@ public class EbayStore {
java.util.Calendar startTime = item.getListingDetails() == null ? null : item.getListingDetails().getStartTime();
cols.put("startTime", startTime != null ? eBayUtil.toAPITimeString(startTime.getTime()) : "");
AmountType amt = item.getStartPrice();
cols.put("StartPrice", amt != null ? (new Double(amt.getValue()).toString()) : "");
cols.put("StartPrice", amt != null ? (Double.toString(amt.getValue())) : "");
Integer quantity = item.getQuantity();
String quantityStr = null;
@@ -2033,7 +2034,7 @@ public class EbayStore {
cols.put("title", item.getTitle() != null ? item.getTitle() : "");
AmountType amt = item.getStartPrice();
cols.put("price", amt != null ? (new Double(amt.getValue()).toString()) : "");
cols.put("price", amt != null ? (Double.toString(amt.getValue())) : "");
java.util.Calendar startTime = item.getListingDetails() == null ? null : item.getListingDetails().getStartTime();
cols.put("startTime", startTime != null ? eBayUtil.toAPITimeString(startTime.getTime()) : "");
@@ -2216,7 +2217,7 @@ public class EbayStore {
result.put("title", title);
result.put("description", description);
AmountType amt = item.getStartPrice();
result.put("price", amt != null ? (new Double(amt.getValue()).toString()) : "");
result.put("price", amt != null ? (Double.toString(amt.getValue())) : "");
result.put("currencyId", amt.getCurrencyID().toString());
result.put("listingType", listingType);
} catch (Exception e) {
@@ -2267,12 +2268,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};
@@ -1334,7 +1334,7 @@ public class EbayStoreAutoPreferences {
UserType buyer = bestOfferType.getBuyer();
String buyerUserID = buyer.getUserID();
AmountType price = bestOfferType.getPrice();
String offerPrice = new Double(price.getValue()).toString();
String offerPrice = Double.toString(price.getValue());
Double doCerrentPrice = Double.parseDouble(offerPrice);
int offerQuantity = bestOfferType.getQuantity();
String[] bestOfferIDs = { bestOfferID };
@@ -187,7 +187,7 @@ public class EbayStoreOrder {
String shippingTotalAdditionalCost = context.get("shippingTotalAdditionalCost").toString();
if (UtilValidate.isNotEmpty(shippingTotalAdditionalCost)) {
double shippingAdditionalCost = new Double(shippingTotalAdditionalCost);
double shippingAdditionalCost = Double.parseDouble(shippingTotalAdditionalCost);
if (shippingAdditionalCost > 0) {
GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost, 0.0);
if (shippingAdjustment != null) {
@@ -199,11 +199,11 @@ public class EbayStoreOrder {
String salesTaxAmount = context.get("salesTaxAmount").toString();
String salesTaxPercent = context.get("salesTaxPercent").toString();
if (UtilValidate.isNotEmpty(salesTaxAmount)) {
double salesTaxAmountTotal = new Double(salesTaxAmount);
double salesTaxAmountTotal = Double.parseDouble(salesTaxAmount);
if (salesTaxAmountTotal > 0) {
double salesPercent = 0.0;
if (UtilValidate.isNotEmpty(salesTaxPercent)) {
salesPercent = new Double(salesTaxPercent);
salesPercent = Double.parseDouble(salesTaxPercent);
}
GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmountTotal, salesPercent);
if (salesTaxAdjustment != null) {
@@ -404,7 +404,7 @@ public class EbayStoreOrder {
if (salesTaxAmount.doubleValue() > 0) {
double salesPercent = 0.0;
if (UtilValidate.isNotEmpty(shippingDetailsCtx.get("salesTaxPercent"))) {
salesPercent = new Double(shippingDetailsCtx.get("salesTaxPercent").toString());
salesPercent = Double.parseDouble(shippingDetailsCtx.get("salesTaxPercent").toString());
}
GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmount.doubleValue(), salesPercent);
if (salesTaxAdjustment != null) {
+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>
+16 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="EcommerceAboutUs">
<value xml:lang="en">About Us</value>
<value xml:lang="fr">A propos</value>
@@ -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>
@@ -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(), "")
@@ -18,6 +18,7 @@
*/
import org.apache.ofbiz.base.util.UtilProperties
import org.apache.ofbiz.base.util.UtilHttp
import org.apache.ofbiz.base.util.UtilMisc
import org.apache.ofbiz.product.store.ProductStoreWorker
@@ -54,5 +55,5 @@ if (userInfoMap) {
request.getSession().setAttribute("userInfoMap", userInfoMap)
}
donePage = "main;" + parameters.visit.sessionId
donePage = "main;" + UtilHttp.getSessionId(request)
context.donePage = donePage
@@ -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">
+1 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="ecommerce" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
@@ -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>
+24 -24
View File
@@ -72,26 +72,28 @@ under the License.
</script>
<#assign fixedAssetExist = shoppingCart.containAnyWorkEffortCartItems() />
<#-- change display format when rental items exist in the shoppingcart -->
<div>
<#if ((sessionAttributes.lastViewedProducts)?has_content && sessionAttributes.lastViewedProducts?size > 0)>
<#assign continueLink = "/product?product_id=" + sessionAttributes.lastViewedProducts.get(0) />
<#else>
<#assign continueLink = "/main" />
</#if>
<a href="<@ofbizUrl>${continueLink}</@ofbizUrl>" class="submenutext">
${uiLabelMap.EcommerceContinueShopping}
</a>
<#if (shoppingCartSize > 0)>
<a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="submenutext">
${uiLabelMap.OrderCheckout}
<div class="card">
<div class="card-header">
<#if ((sessionAttributes.lastViewedProducts)?has_content && sessionAttributes.lastViewedProducts?size > 0)>
<#assign continueLink = "/product?product_id=" + sessionAttributes.lastViewedProducts.get(0) />
<#else>
<#assign continueLink = "/main" />
</#if>
<a href="<@ofbizUrl>${continueLink}</@ofbizUrl>" class="submenutext">
${uiLabelMap.EcommerceContinueShopping}
</a>
<#else>
<span class="submenutextrightdisabled">
${uiLabelMap.OrderCheckout}
</span>
</#if>
${uiLabelMap.CommonQuickAdd}
<div>
<#if (shoppingCartSize > 0)>
<a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="submenutext">
${uiLabelMap.OrderCheckout}
</a>
<#else>
<span class="submenutextrightdisabled">
${uiLabelMap.OrderCheckout}
</span>
</#if>
${uiLabelMap.CommonQuickAdd}
</div>
<div class="card-body">
<div>
<form method="post"
action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" class="form-inline"
@@ -139,7 +141,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>
@@ -255,7 +257,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>
@@ -555,9 +557,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">
+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>
@@ -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>
@@ -676,6 +678,7 @@ ${virtualJavaScript!}
</td>
</tr>
<#-- Product Reviews -->
<#if productReviews?has_content>
<tr>
<td colspan="2">
<div>${uiLabelMap.OrderCustomerReviews}:</div>
@@ -691,7 +694,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,7 +52,7 @@ under the License.
<#else>
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">
${category.description!}
${category.description?default(categoryId)!}
</a>
</#if>
</li>
@@ -34,7 +34,7 @@ under the License.
</span>
<#else>
<span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
<@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span>
<@ofbizCurrency amount=price isoCode=priceResult.currencyUsed/></span>
</#if>
</#if>
</li>
+45 -97
View File
@@ -27,49 +27,22 @@ ${virtualVariantJavaScript!}
<script type="application/javascript">
//<![CDATA[
var detailImageUrl = null;
function setAddProductId(name) {
document.addform.add_product_id.value = name;
if (document.addform.quantity == null) return;
if (name == '' || name == 'NULL' || isVirtual(name) == true) {
document.addform.quantity.disabled = true;
var elem = document.getElementById('product_id_display');
var txt = document.createTextNode('');
if(elem.hasChildNodes()) {
elem.replaceChild(txt, elem.firstChild);
} else {
elem.appendChild(txt);
}
} else {
document.addform.quantity.disabled = false;
var elem = document.getElementById('product_id_display');
var txt = document.createTextNode(name);
if(elem.hasChildNodes()) {
elem.replaceChild(txt, elem.firstChild);
} else {
elem.appendChild(txt);
}
function setAddProductId2(sku, with_bak) {
document.addform.add_product_id.value = sku;
var disable = (sku == '' || sku == 'NULL' || isVirtual(sku) == true);
if (document.addform.quantity != null) {
document.addform.quantity.disabled = disable;
}
var txt = disable ? '' : sku;
$('#product_id_display').text(txt);
if (with_bak) {
document.addform.product_id_bak.value = txt;
}
}
function setVariantPrice(sku) {
if (sku == '' || sku == 'NULL' || isVirtual(sku) == true) {
var elem = document.getElementById('variant_price_display');
var txt = document.createTextNode('');
if(elem.hasChildNodes()) {
elem.replaceChild(txt, elem.firstChild);
} else {
elem.appendChild(txt);
}
}
else {
var elem = document.getElementById('variant_price_display');
var price = getVariantPrice(sku);
var txt = document.createTextNode(price);
if(elem.hasChildNodes()) {
elem.replaceChild(txt, elem.firstChild);
} else {
elem.appendChild(txt);
}
}
function setVariantPrice2(sku) {
var disable = (sku == '' || sku == 'NULL' || isVirtual(sku) == true);
var txt = disable ? '' : getVariantPrice2(sku);
$('#variant_price_display').text(txt || '');
}
function isVirtual(product) {
var isVirtual = false;
@@ -124,10 +97,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";
}
}
@@ -166,29 +141,33 @@ ${virtualVariantJavaScript!}
} else {
var Variable1 = eval("list" + OPT[(currentFeatureIndex+1)] + selectedValue + "()");
}
// reset uom select
$('#product_uom').text('');
// set the product ID to NULL to trigger the alerts
setAddProductId('NULL');
setAddProductId2('NULL');
// set the variant price to NULL
setVariantPrice('NULL');
setVariantPrice2('NULL');
} else {
// this is the final selection -- locate the selected index of the last selection
var indexSelected = document.forms["addform"].elements[name].selectedIndex;
// using the selected index locate the sku
var sku = document.forms["addform"].elements[name].options[indexSelected].value;
// display alternative packaging dropdown
ajaxUpdateArea("product_uom", "<@ofbizUrl>ProductUomDropDownOnly</@ofbizUrl>", "productId=" + sku);
// set the product ID
setAddProductId(sku);
setAddProductId2(sku, true);
// set the variant price
setVariantPrice(sku);
setVariantPrice2(sku);
// check for amount box
toggleAmt(checkAmtReq(sku));
toggleAmt(checkAmtReq2(sku));
}
}
@@ -214,7 +193,7 @@ ${virtualVariantJavaScript!}
return (y[0]+"-"+y[1]+"-"+y[2]);
}
function showAlert(msg){
function showAlert(msg) {
showErrorAlert("${uiLabelMap.CommonErrorMessage2}", msg);
}
@@ -274,37 +253,6 @@ ${virtualVariantJavaScript!}
}
</#if>
function displayProductVirtualVariantId(variantId) {
if(variantId){
document.addform.product_id.value = variantId;
}else{
document.addform.product_id.value = '';
variantId = '';
}
var elem = document.getElementById('product_id_display');
var txt = document.createTextNode(variantId);
if(elem.hasChildNodes()) {
elem.replaceChild(txt, elem.firstChild);
} else {
elem.appendChild(txt);
}
var priceElem = document.getElementById('variant_price_display');
var price = getVariantPrice(variantId);
var priceTxt = null;
if(price){
priceTxt = document.createTextNode(price);
}else{
priceTxt = document.createTextNode('');
}
if(priceElem.hasChildNodes()) {
priceElem.replaceChild(priceTxt, priceElem.firstChild);
} else {
priceElem.appendChild(priceTxt);
}
}
//]]>
$(function(){
$('a[id^=productTag_]').click(function(){
var id = $(this).attr('id');
@@ -334,6 +282,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")! />
@@ -668,11 +618,10 @@ $(function(){
</div>
</#if>
<#-- Variant Selection -->
<div class="form-group">
<label>${uiLabelMap.CommonAmount}:</label>
<#if "Y" == product.isVirtual!?upper_case>
<#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
<#list featureLists as featureList>
<div class="form-group">
<#list featureList as feature>
<#if feature_index == 0>
${feature.description}:
@@ -704,7 +653,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>
@@ -712,21 +661,20 @@ $(function(){
<#if !product.virtualVariantMethodEnum?? || "VV_VARIANTTREE" == product.virtualVariantMethodEnum>
<#if variantTree?? && (variantTree.size() &gt; 0)>
<#list featureSet as currentType>
<div>
<div class="form-group">
<select name="FT${currentType}" class="form-control" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);">
<option>${featureTypes.get(currentType)}</option>
</select>
</div>
</#list>
<span id="product_uom"></span>
<span id="product_uom"></span><br/>
<input type="hidden" name="product_id_bak" value=""/>
<div class="variant-price" style="display: inline-block;">
<strong><span id="product_id_display" class="product_id_display"> </span></strong>
<strong><span id="variant_price_display" 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 />
@@ -736,17 +684,16 @@ $(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>
<input type="hidden" name="product_id_bak" value="${product.productId}"/>
<div class="variant-price" style="display: inline-block;">
<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")>
@@ -769,6 +716,7 @@ $(function(){
<#assign hiddenStyle = "hidden"/>
</#if>
<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!>
+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>
<label for="one">${uiLabelMap.EcommerceRating}:</label>
<div class="form-check form-check-inline">
+10 -8
View File
@@ -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-4 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,16 @@
</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: inline-block;">
<input type="hidden" name="product_id_bak" value="${product.productId}"/>
<strong><span class="product_id_display"> </span></strong>
<strong><span class="variant_price_display"> </span></strong>
</div>
</#if>
</div>
@@ -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.
-->
<#if product?? && mainProducts??>
<div class="form-group">
<select name="parentProductId" onchange="javascript:variantUomSelection(this);" class="form-control">
<option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
<#list mainProducts as mainProduct>
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
</#list>
</select>
</div>
</#if>
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
<div class="breadcrumbs">
<a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> &gt;
${uiLabelMap.CommonContactUs}
</div>
<div class="card m-3">
<div class="card-header">
<strong>${uiLabelMap.CommonContactUs}</strong>
@@ -26,12 +26,16 @@ under the License.
${uiLabelMap.CommonSave}
</a>
<form id="changepasswordform" method="post" action="<@ofbizUrl>updatePassword/${donePage}</@ofbizUrl>">
<#if !parameters.TOKEN?has_content>
<label class="mt-4 asteriskInput" for="currentPassword">${uiLabelMap.PartyOldPassword}</label>
<div class="row">
<div class="col-sm-6">
<input type="password" class="form-control" name="currentPassword" autocomplete="off" id="currentPassword"/>
</div>
</div>
<#else>
<input type="hidden" name="TOKEN" value="${parameters.TOKEN}"/>
</#if>
<label class="required" for="newPassword">${uiLabelMap.PartyNewPassword}</label>
<div class="row">
<div class="col-sm-6">
@@ -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...
@@ -23,7 +23,6 @@ under the License.
lastFocusedName = null;
function setLastFocused(formElement) {
lastFocusedName = formElement.name;
document.write.lastFocusedName;
}
function clickUsername() {
if (document.getElementById('UNUSEEMAIL').checked) {
+13 -8
View File
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
<div class="breadcrumbs">
<a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> &gt;
${uiLabelMap.CommonContactUs}
</div>
<div class="card m-3">
<div class="card-header">
<div class="boxlink">
@@ -46,10 +50,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 +64,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 +84,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>
+15 -5
View File
@@ -379,7 +379,7 @@ under the License.
<strong>${uiLabelMap.CommonUsername} &amp; ${uiLabelMap.CommonPassword}</strong>
</div>
<div class="col-lg-9 text-right">
<a href="<@ofbizUrl>changepassword</@ofbizUrl>">${uiLabelMap.PartyChangePassword}</a>
<a href="<@ofbizUrl>passwordChange</@ofbizUrl>">${uiLabelMap.PartyChangePassword}</a>
</div>
</div>
</div>
@@ -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"/>
<div class="custom-file mr-2">
<input type="file" class="custom-file-input" id="customFile" required/>
<span class="custom-file-control"></span>
</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>
@@ -499,7 +509,7 @@ under the License.
<th>${uiLabelMap.CommonThruDate}</th>
<th>${uiLabelMap.CommonStatus}</th>
<th>${uiLabelMap.CommonEmail}</th>
<th></th>
<th>${uiLabelMap.MarketingContactListOptInVerifyCode}</th>
<th></th>
</tr>
<#list contactListPartyList as contactListParty>
@@ -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">
+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")}
+2 -2
View File
@@ -214,7 +214,7 @@ function submitForm(form, mode, value) {
<#-- Payment Method Selection -->
<div class="card" >
<h4 class="card-header">
3.&nbsp${uiLabelMap.OrderHowShallYouPay}?
3.&nbsp;${uiLabelMap.OrderHowShallYouPay}?
</h4>
<div class="card-body" >
<h5>${uiLabelMap.CommonAdd}:</h5>
@@ -369,4 +369,4 @@ function submitForm(form, mode, value) {
<div class="col-auto">
<a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="btn btn-primary">${uiLabelMap.OrderContinueToFinalOrderReview}</a>
</div>
</div>
</div>
+1 -1
View File
@@ -45,7 +45,7 @@ under the License.
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
<div class="row">
<div class="col-auto ml-auto">
<form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<form method="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<#if (requestParameters.checkoutpage)?has_content>
<input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/>
</#if>
@@ -30,11 +30,11 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("NA" == mode) {
// new address
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutshippingaddress</@ofbizUrl>";
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=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>";
form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutoptions&contactMechId="+value+"</@ofbizUrl>";
form.submit();
}
}
+10 -3
View File
@@ -21,6 +21,14 @@ under the License.
<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
<div class="card">
<#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
<form method="post" id="sendMeThisEveryMonthForm" name="sendMeThisEveryMonthForm" action="<@ofbizUrl fullPath='true'>createShoppingListFromOrder</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="frequency" value="6"/>
<input type="hidden" name="intervalNumber" value="1"/>
<input type="hidden" name="shoppingListTypeId" value="SLT_AUTO_REODR"/>
</form>
</#if>
<#if "Y" == maySelectItems?default("N")>
<form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
<input type="hidden" name="add_all" value="false" />
@@ -36,8 +44,7 @@ under the License.
class="btn btn-sm float-right">${uiLabelMap.OrderAddAllToCart}</a>
<a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
class="btn btn-sm float-right">${uiLabelMap.OrderAddCheckedToCart}</a>
<a href="<@ofbizUrl fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&amp;frequency=6&amp;intervalNumber=1&amp;shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
class="btn btn-sm float-right">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
<button form="sendMeThisEveryMonthForm" class="btn btn-sm float-right" type="submit">${uiLabelMap.OrderSendMeThisEveryMonth}</button>
</#if>
</strong>
</div>
@@ -145,7 +152,7 @@ under the License.
<#else>
<#assign product = orderItem.getRelatedOne("Product", true)!/> <#-- should always exist because of FK constraint, but just in case -->
<td>
<a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>"
<a href="<@ofbizCatalogAltUrl secure="false" productId=orderItem.productId/>"
class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a>
<#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
<#if orderItemAttributes?has_content>
+49 -46
View File
@@ -16,51 +16,54 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<div class="card m-3">
<#if product??>
<div class="card-header">
<strong>
${product.productId}
</strong>
</div>
<div class="card-body">
<div class="row">
<div class="col-sm-10">
<a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
</div>
<div class="col-sm-10">
<#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
<#else>
&nbsp;
</#if>
</div>
<div class="col-sm-10">
<#if totalPrice??>
<div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
<#else>
<div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>">
<b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
</div>
</#if>
</div>
<div class="col-sm-10">
<#-- check to see if introductionDate hasn't passed yet -->
<#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
${uiLabelMap.ProductNotYetAvailable}
<#-- check to see if salesDiscontinuationDate has passed -->
<#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)>
${uiLabelMap.ProductNoLongerAvailable}
<#-- check to see if the product is a virtual product -->
<#elseif "Y" == product.isVirtual?default("N")>
<a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&amp;</#if>product_id=${product.productId}</@ofbizUrl>">${uiLabelMap.OrderChooseVariations}...</a>
<#else>
<input type="text" size="5" class="form-control form-control-sm" name="quantity_${product.productId}" value=""/>
</#if>
</div>
</div>
<#else>
<div class="alert alert-light" role="alert">${uiLabelMap.ProductErrorProductNotFound}.</div>
<#if productCategory?has_content>
<h2>${productCategory.categoryName!}</h2>
<form name="choosequickaddform" method="post" action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'>
<select name='category_id'>
<option value='${productCategory.productCategoryId}'>${productCategory.categoryName!}</option>
<option value='${productCategory.productCategoryId}'>--</option>
<#list quickAddCats as quickAddCatalogId>
<#assign loopCategory = delegator.findOne("ProductCategory", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId), true)>
<#if loopCategory?has_content>
<option value='${quickAddCatalogId}'>${loopCategory.categoryName!}</option>
</#if>
</#list>
</select>
<div><a href="javascript:document.choosequickaddform.submit()" class="buttontext">${uiLabelMap.ProductChooseQuickAddCategory}</a></div>
</form>
<#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
<div>
<#if productCategory.categoryImageUrl??>
<img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" />
</#if>
${productCategory.longDescription!}
</div>
</div>
</#if>
</#if>
<#if productCategoryMembers?? && 0 < productCategoryMembers?size>
<form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform">
<fieldset>
<input type='hidden' name='category_id' value='${categoryId}' />
<div class="quickaddall">
<a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
</div>
<div class="quickaddtable">
<#list productCategoryMembers as productCategoryMember>
<#assign product = productCategoryMember.getRelatedOne("Product", true)>
<p>
${setRequestAttribute("optProductId", productCategoryMember.productId)}
${screens.render(quickaddsummaryScreen)}
</p>
</#list>
</div>
<div class="quickaddall">
<a href="javascript:document.bulkaddform.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
</div>
</fieldset>
</form>
<#else>
<label>${uiLabelMap.ProductNoProductsInThisCategory}.</label>
</#if>
+4 -4
View File
@@ -25,17 +25,17 @@ under the License.
</div>
<div class="card-body">
<div class="row">
<div class="col-sm-10">
<div class="col-sm-3">
<a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" >${productContentWrapper.get("PRODUCT_NAME", "html")!}</a>
</div>
<div class="col-sm-10">
<div class="col-sm-3">
<#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double>
${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
<#else>
&nbsp;
</#if>
</div>
<div class="col-sm-10">
<div class="col-sm-3">
<#if totalPrice??>
<div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
<#else>
@@ -44,7 +44,7 @@ under the License.
</div>
</#if>
</div>
<div class="col-sm-10">
<div class="col-sm-3">
<#-- check to see if introductionDate hasn't passed yet -->
<#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)>
${uiLabelMap.ProductNotYetAvailable}
@@ -53,7 +53,7 @@ under the License.
${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOrderHeader")}
<br />
<div id="orderItemsSection">${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}</div>
<form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<form method="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
<table border="0" cellpadding="1" width="100%">
<tr>
<td colspan="4">
+1 -1
View File
@@ -57,7 +57,7 @@ under the License.
<#if returnableItems?has_content>
<#assign rowCount = 0>
<#list returnableItems.keySet() as orderItem>
<#if !orderItem.orderAdjustmentId?has_content> <#-- filter orderAdjustments -->
<#if "OrderAdjustment" != orderItem.getEntityName()> <#-- filter orderAdjustments -->
<input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
<input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
<input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/>

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