Compare commits
120
Commits
trunk
...
release18.12.02
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ba155e910 | ||
|
|
5864e97680 | ||
|
|
f8c85ccb37 | ||
|
|
fc6cf7bf07 | ||
|
|
df7ae11c73 | ||
|
|
6d5aca3d2a | ||
|
|
905e7b0253 | ||
|
|
cdf6bd69e5 | ||
|
|
18c0c436af | ||
|
|
f7f7776514 | ||
|
|
485e3b89d7 | ||
|
|
340c98b3b0 | ||
|
|
a356edc9b7 | ||
|
|
d94d5910f7 | ||
|
|
f70aef14a4 | ||
|
|
27baf80c98 | ||
|
|
7afe2b73e5 | ||
|
|
e897ffc7ce | ||
|
|
0caff3bb10 | ||
|
|
5ab0a6aa2f | ||
|
|
e3adeec062 | ||
|
|
49b96e47cc | ||
|
|
3cc8f47135 | ||
|
|
cde1c6ac61 | ||
|
|
ccfb388999 | ||
|
|
b8c43a178a | ||
|
|
ad04cda8f0 | ||
|
|
1205ac591c | ||
|
|
faf008c152 | ||
|
|
d4e9a765ff | ||
|
|
ab61110dc5 | ||
|
|
c4a031dcb2 | ||
|
|
8c6c0f5834 | ||
|
|
05d8e9fa3e | ||
|
|
c05bc3af1b | ||
|
|
64b0f25e34 | ||
|
|
7a51784e2a | ||
|
|
b93265d798 | ||
|
|
918d3e8518 | ||
|
|
2b3252cf37 | ||
|
|
09c9bab4d0 | ||
|
|
aa7008407b | ||
|
|
a64dea4ffe | ||
|
|
11250f22d8 | ||
|
|
d52374422e | ||
|
|
fcbb750cf6 | ||
|
|
ba31a241ac | ||
|
|
c7c511eda6 | ||
|
|
b0dd29895f | ||
|
|
706fc86892 | ||
|
|
c117078a61 | ||
|
|
c84b388b85 | ||
|
|
bffd5d9d0d | ||
|
|
6d9314e8bf | ||
|
|
90b2d6c9bf | ||
|
|
8926d686c9 | ||
|
|
bd600a3dd4 | ||
|
|
93f513517f | ||
|
|
8b45efaee3 | ||
|
|
53e1b6f9a4 | ||
|
|
6296ab4078 | ||
|
|
ca08d3f8bb | ||
|
|
b6b745a7a1 | ||
|
|
3045557f32 | ||
|
|
2d3ca0534e | ||
|
|
af2fde4fd3 | ||
|
|
4b7a3b3789 | ||
|
|
20a82a9598 | ||
|
|
ad91ba42c0 | ||
|
|
2520f9357e | ||
|
|
8a0ae58940 | ||
|
|
c432d0483a | ||
|
|
802adf0385 | ||
|
|
4492b0cc55 | ||
|
|
3b54c81e1b | ||
|
|
e9bae9a7bd | ||
|
|
9a9ba5703d | ||
|
|
ff56f6c6b4 | ||
|
|
08f7e7bebe | ||
|
|
840966e2f1 | ||
|
|
94f2947278 | ||
|
|
14e58e127d | ||
|
|
d241da1275 | ||
|
|
e970e53fb1 | ||
|
|
caf1a38c8d | ||
|
|
5b546b1aba | ||
|
|
349deceab7 | ||
|
|
49289bc161 | ||
|
|
c828fa3735 | ||
|
|
45feca67b3 | ||
|
|
40484c0f36 | ||
|
|
31327e2f59 | ||
|
|
9320c40558 | ||
|
|
4952ed4713 | ||
|
|
64ff2f81c1 | ||
|
|
8be85cc8e8 | ||
|
|
b9ac3ac4d2 | ||
|
|
a2fe68212c | ||
|
|
7d6fbeebb9 | ||
|
|
9d0e6c2528 | ||
|
|
15480125b8 | ||
|
|
5a4dcd611d | ||
|
|
a4cee4a745 | ||
|
|
3a73856173 | ||
|
|
6d0cc93ee9 | ||
|
|
aefe7895ac | ||
|
|
c5a05c83ff | ||
|
|
a331d3dee8 | ||
|
|
96fc00f7d0 | ||
|
|
a67d054c35 | ||
|
|
c62accc95c | ||
|
|
7ffe31bed9 | ||
|
|
249ed1b30f | ||
|
|
7bf63fad20 | ||
|
|
dc87292455 | ||
|
|
684a5a1220 | ||
|
|
2ded55743a | ||
|
|
b7949d22a8 | ||
|
|
f2c26f9d97 | ||
|
|
e029947649 |
@@ -0,0 +1,11 @@
|
||||
Improved:
|
||||
Implemented:
|
||||
Documented:
|
||||
Completed:
|
||||
Reverted:
|
||||
Fixed:
|
||||
(OFBIZ-)
|
||||
|
||||
Explanation
|
||||
|
||||
Thanks:
|
||||
@@ -0,0 +1 @@
|
||||
/bin/
|
||||
@@ -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
|
||||
|
||||
@@ -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/).
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 ======================= -->
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 -->
|
||||
|
||||
@@ -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 ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -44,6 +44,7 @@ under the License.
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<title>${(decoratedContent.subcontent.title.render)!"WebSite 1 Generic Title (Set subcontent 'title' on your content!)"}</title>
|
||||
<link rel="shortcut icon" href="/images/ofbiz.ico" />
|
||||
<script src="/common/js/util/dompurify/dist/purify.min.js" type="application/javascript"></script>
|
||||
<script src="/common/js/util/fieldlookup.js" type="application/javascript"></script>
|
||||
<script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script>
|
||||
<link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
|
||||
@@ -125,6 +126,7 @@ under the License.
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<title>${(decoratedContent.subcontent.title.render)!"WebSite 2 Generic Title (Set subcontent 'title' on your content!)"}</title>
|
||||
<link rel="shortcut icon" href="/images/ofbiz.ico" />
|
||||
<script src="/common/js/util/dompurify/dist/purify.min.js" type="application/javascript"></script>
|
||||
<script src="/common/js/util/fieldlookup.js" type="application/javascript"></script>
|
||||
<script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script>
|
||||
<link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 ======================= -->
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 ======================= -->
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
- <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>
|
||||
- <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>
|
||||
- <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!}&VIEW_SIZE=${viewSize}&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!}&VIEW_SIZE=${viewSize}&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> </#if>]</td>
|
||||
<td>[<#if productIdsAction.contains(productId)>x<#else> </#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>
|
||||
@@ -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>
|
||||
<a href="<@ofbizUrl>createQuoteFromCart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
|
||||
${uiLabelMap.OrderCreateQuoteFromCart}</a>
|
||||
</a>
|
||||
<#else>
|
||||
${uiLabelMap.OrderYouMust}
|
||||
<a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
<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>
|
||||
|
||||
</div>
|
||||
@@ -712,21 +661,20 @@ $(function(){
|
||||
<#if !product.virtualVariantMethodEnum?? || "VV_VARIANTTREE" == product.virtualVariantMethodEnum>
|
||||
<#if variantTree?? && (variantTree.size() > 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!>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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??> - ${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> >
|
||||
${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) {
|
||||
|
||||
@@ -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> >
|
||||
${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}? <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>
|
||||
|
||||
@@ -379,7 +379,7 @@ under the License.
|
||||
<strong>${uiLabelMap.CommonUsername} & ${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+'&partyId='+partyId+'&fromDate='+fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+optInVerifyCode+'&baseLocation='+baseLocation!>
|
||||
<#if preferredContactMechId??>
|
||||
<#assign verifyUrl= verifyUrl+"&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+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!>
|
||||
<#if (contactListParty.preferredContactMechId)??>
|
||||
<#assign verifyUrl= verifyUrl+"&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+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!>
|
||||
<#if (contactListParty.preferredContactMechId)??>
|
||||
<#assign verifyUrl= verifyUrl+"&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+'&communicationEventId='+communicationEventId!+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode>
|
||||
<#if (contactListParty.preferredContactMechId)??>
|
||||
<#assign verifyUrl= verifyUrl+"&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+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!>
|
||||
<#if (contactListParty.preferredContactMechId)??>
|
||||
<#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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"> </td>
|
||||
<td width="74%"> </td>
|
||||
</tr>
|
||||
${screens.render("component://ecommerce/widget/CustomerScreens.xml#creditCardFields")}
|
||||
|
||||
|
||||
@@ -214,7 +214,7 @@ function submitForm(form, mode, value) {
|
||||
<#-- Payment Method Selection -->
|
||||
<div class="card" >
|
||||
<h4 class="card-header">
|
||||
3. ${uiLabelMap.OrderHowShallYouPay}?
|
||||
3. ${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>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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}&frequency=6&intervalNumber=1&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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
</#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}&</#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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
</#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">
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user