Commit Graph
34 Commits
Author SHA1 Message Date
Deepak Dixit a67c08620e Improved: Replace fields with "id-ne", "id-long-ne" and "id-vlong-ne"
with "id", "id-long" and "id-vlong" respectively which are primary keys
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796379 13f79535-47bb-0310-9956-ffa450edef68
2017-05-27 11:28:36 +00:00
Jacques Le Roux 008e962b5c Fixed: add item to order cause exception
(OFBIZ-9167)

-go to https://localhost:8443/ordermgr/control/orderentry
-create order for DemoCustomer
-add an item

console output...
java.lang.NullPointerException
        at org.apache.ofbiz.content.content.ContentWorker.
renderContentAsText(ContentWorker.java:368) ~[ofbiz.jar:?]
[...]

While at it I also found issues with cartLine.getName() in ftl files. It was
also missing the dispatcher. 

This was broken by OFBIZ-9164

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778889 13f79535-47bb-0310-9956-ffa450edef68
2017-01-15 07:37:35 +00:00
Jacques Le Roux 2a2187a872 Fixed: popup calendar fails for ecomseo et ecommerce
(OFBIZ-8345)

go to https://localhost:8443/ecomseo/editShoppingList
create a new shopping list
make changes to "Shopping List Reorder" pane by clicking on date icon.
nothing happens

This was due to a regression introduced with r1721092

Fixed by reverting and removing useless input of type="text

Thanks: Wai for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765055 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 13:05:47 +00:00
Jacques Le Roux 08272c1843 Fixed: deleteCustomerTaxAuthInfo page called from /ecommerce/control/viewprofile
(OFBIZ-4106)

As explained on dev ML, I prefers to remove the possibility of creating "Tax 
Identifications and Exemptions". Because users would actually need to have the 
ACCOUNTING_CREATE or ACCOUNTING_ADMIN permissions to do so (or higher admin 
permissions) and opening the accounting (or total) admin right to a customer 
seems not secure to me.

Moreover the same exists in party and it needs admin rights in both places, 
so does not make sense in ecommerce IMO. 

Sharan : The only case I can think of is that a customer may want to manage 
their own tax info. For example if I know my VAT number or Tax number 
- do I add it to my profile, or do I have to wait for it be verified and 
completed by the accounting administrator?
Generally I think companies would want an accounting administrator to take 
control of this type of tax and exemption information (rather than leave it up 
to the customer themselves) as they will need to be responsible for it 
and report on it to their tax authorities so they need to make sure it is correct.

Thanks: Michał Cukierman for report and Sharan for functional confirmation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1764158 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 17:57:38 +00:00
Jacques Le Roux 494eb5a613 Fixed: cannot edit shopping list for ecommerce and ecomseo
(OFBIZ-8348)

This was previously fixed with r1763686 by Pawan Verma which was correct.
But Scott reported on dev ML that he was surprised by this bare solution. 
We could have kept it because it's js and works, but since we use jQuery and 
for consistencey reason Amardeep suggested to rather 
$('#selectShoppingList').submit()

This reverts r1763686 and applies Amardeep's solution.

It also removes pending work related with OFBIZ-4106. I have asked a question 
about it yesterday and forgot to remove the related change in this unrelated 
commit.

Thanks: Scott for report, Amardeep for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763754 13f79535-47bb-0310-9956-ffa450edef68
2016-10-07 12:17:50 +00:00
Jacques Le Roux 917892d7c2 Fixed: cannot edit shopping list for ecommerce and ecomseo
(OFBIZ-8348)

go to https://localhost:8443/ecomseo
login as DemoCustomer
go to https://localhost:8443/ecomseo/editShoppingList
create 2 shopping lists
ofbiz shows the 2 shopping list. but you cannot select the first shopping list 
for editing

Thanks: Wai for report, Pawan Verma for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763686 13f79535-47bb-0310-9956-ffa450edef68
2016-10-07 07:29:58 +00:00
Jacques Le Roux 48fa5e42d7 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Found an issue due to changes at r1761431. We should only show the 
addCommonToCartForm when in status mode, ie when maySelectItems="y"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1763013 13f79535-47bb-0310-9956-ffa450edef68
2016-10-01 13:54:39 +00:00
Jacques Le Roux 43c0899000 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

The layout of screen "order status" of application "ecommerce"  is busted .

I save the html of the screen into my local file, and It works fine. I don't know the reason exactly, but the patch attached by me works correctly.

jleroux: after review I agree it's the right way to fix it. OrderStatus.ftl indirectly calls OrderItems.ftl through the orderitems screen so nothing is lost when the addCommonToCartForm is moved from OrderStatus.ftl to OrderItems.ft, it's only a rearrangement which fixes the issue.

Thanks: fumiyoshi.to





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761431 13f79535-47bb-0310-9956-ffa450edef68
2016-09-19 13:06:30 +00:00
Jacques Le Roux ab2ff27084 Improves:E-commerce : FTL formatting
(OFBIZ-7949)

Fixes a typo introduced by r1761135 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761316 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 10:29:49 +00:00
Jacques Le Roux 34102ee451 Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Reverts r1761305, after testing more I found you can no longer submit an order. I have an idea of the problem but I prefer to revert all for now


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761308 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:56:07 +00:00
Jacques Le Roux 43146cbaef Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

The layout of screen "order status" of application "ecommerce"  is busted .

I save the html of the screen into my local file, and It works fine.
I don't know the reason exactly, but the patch attached by me works correctly. 

jleroux: after a quick check it seems this does not introduce regression

Thanks: fumiyoshi.to

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761305 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:42:42 +00:00
Jacques Le Roux 40513322ea Fixes: jquery.jgrowl.min.css is linked twice in html page
(OFBIZ-7758)

I am running on trunk rev 1751489 on tomahawk theme. 
In the browser, right-click and view the page source. 
There is duplicate linking of jquery.jgrowl.min.css i.e.

<link rel="stylesheet" href="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" type="text/css"/>

The solution is to remove a hack for JPublish in fex Java classes 
and related changes (mostly "page." in ftl and xml files)

Thanks: Rohit Koushal for the path and James Yong the report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761235 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:43:16 +00:00
Pranay Pandey b714fbb6bb Improved: Ecommerce, Ebay - inline js for toggleAll, checkToggle and selectAll calling from ftls
(OFBIZ-7931)

Removed inline js for toggleAll, checkToggle and selectAll calling from ftls in Ecommerce and Ebay component. Add class="selectAll" on parent checkbox element for select all functionality.

Thanks: Amardeep Singh Jhajj for reporting and providing the patch.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761195 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:04:58 +00:00
Pranay Pandey 06caedf26a Improved: E-commerce : FTL formatting.
(OFBIZ-7949)

For improved FTL code readability. Here is the first patch for the effort. There are still files which are required to be formatted. 

Thanks: Vaibhav Jain for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761135 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 07:17:15 +00:00
Jacques Le Roux 2c2a7beb0b Fixes: Display of State/Province for non US entities in the customer's profile of ecommerce
(OFBIZ-8231)

When I access url https://localhost:8443/ecommerce/control/viewprofile for my profile, State/Province display in addresses shows the geo-id, which is fine for US entities where the GeoID is the state code, but for non-us entities, the GeoID is often something like CountryCode-StateCode, which isn't very nice.

Thanks: fumiyoshi.to for report and patch

jleroux: I have slightly changed the patch for 2 reasons:
* check for null exceptions
* use not deprecated version of getRelatedOne()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1760406 13f79535-47bb-0310-9956-ffa450edef68
2016-09-12 16:47:53 +00:00
Pranay Pandey e44ba95d72 [OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory. 
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> 
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0 
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.

Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758389 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 13:37:27 +00:00
Deepak Dixit 8f3141cd46 (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Ashish Vijaywargiya 923342c1fc Applied patch from jira issue - OFBIZ-7705 - Remove Google Checkout component from specialpurpose as it was discontinued.
Thanks Ravi for removing the reference of Google Checkout from everywhere.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1751393 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 04:24:53 +00:00
Ashish Vijaywargiya 76119bb633 Applied patch from jira issue - OFBIZ-7572 - Remove HtmlFormWrapper dependencies from Content Search screen.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1750303 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 08:02:38 +00:00
Pranay Pandey ade762aeb3 [OFBIZ-7341] Applied patch from the ticket. Fixed image rendering issue on eCommerce customer profile view.
Thanks Mohammed Rehan Khan for reporting the issue and providing patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748394 13f79535-47bb-0310-9956-ffa450edef68
2016-06-14 12:39:03 +00:00
Jacques Le Roux 82c74b62f6 A patch from Mohammed Rehan Khan for "Getting console error while reading property value" https://issues.apache.org/jira/browse/OFBIZ-7331
We are getting same console error on following two screens.

Steps to regenerate: 
1) Go to eCommerce
2) Click on Register link
3) After click on register link, we can see error on console.

1) Now click on profile link
2) Click on create new contact information link
3) select "postal address" contact type and click on create button
4) After click on create button, we can see error on console.

Console Error:
 Error executing FreeMarker template
     [java] freemarker.template.TemplateModelException: No error description was specified for this error; low-level message: java.lang.ClassNotFoundException: org.ofbiz.base.util.EntityUtilProperties
     [java] 
     [java] ----
     [java] FTL stack trace ("~" means nesting-related):
     [java] 	- Failed at: #assign defaultCountryGeoId = Static[...  [in template "component://ecommerce/template/customer/EditContactMech.ftl" at line 185, column 13]
     [java] ----
     [java] 	at freemarker.ext.beans.ClassBasedModelFactory.get(ClassBasedModelFactory.java:52) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.DynamicKeyName.dealWithStringKey(DynamicKeyName.java:140) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.DynamicKeyName._eval(DynamicKeyName.java:75) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Expression.eval(Expression.java:81) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Dot._eval(Dot.java:41) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Expression.eval(Expression.java:81) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.MethodCall._eval(MethodCall.java:58) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Expression.eval(Expression.java:81) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Assignment.accept(Assignment.java:134) ~[freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:326) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:332) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:332) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:332) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:332) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.visit(Environment.java:332) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at freemarker.core.Environment.process(Environment.java:305) [freemarker-2.3.24.jar:2.3.24]
     [java] 	at org.ofbiz.base.util.template.FreeMarkerWorker.renderTemplate(FreeMarkerWorker.java:261)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748286 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 17:06:26 +00:00
Pranay Pandey 18ad70fe16 [OFBIZ-7296] Fixed Create Request for Quote, Create New Quote and Save links on shopping list details screen.
Thanks Mohammed Rehan Khan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748199 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 12:39:29 +00:00
Pranay Pandey 893a553bf5 [OFBIZ-7291] Correcting anchor location, a line break was disturbing UI with form introduction for security error fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748164 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 09:47:01 +00:00
Pranay Pandey 227f2c8389 [OFBIZ-7291] Applied slightly modified patch from the ticket to fix security error on Remove Shopping List Item link in eCommerce.
Thanks Mohammed Rehan Khan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748156 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 09:35:41 +00:00
Pranay Pandey 8174d2b8f2 [OFBIZ-7270] - Fixed security error on Create New Shopping List in eCommerce.
Thanks Mohammed Rehan Khan for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748133 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 08:15:35 +00:00
Deepak Dixit 3e08dd1c04 (OFBIZ-7164) Fix typo in freemarker else tag.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746691 13f79535-47bb-0310-9956-ffa450edef68
2016-06-03 08:59:56 +00:00
Deepak Dixit c4b52ebe5c (OFBIZ-6810) Removed some unused screen and ftl, found during ftl cleanup. I took extra care while removing these code this should not break anything.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745500 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 15:05:50 +00:00
Deepak Dixit 583f209423 (OFBIZ-7021) Renamed and moved data template to correct location for ecommerce component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745483 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 13:31:26 +00:00
Deepak Dixit 374449d47e (OFBIZ-7021) Renamed specialpurpose ecommerce component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744942 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 13:43:11 +00:00
Pranay Pandey 8695816f1d [OFBIZ-7080] Minor improvement for change password screen title in ecommerce.
Thanks Chandan Khandelwal for reporting this improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744667 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 07:41:16 +00:00
Jacques Le Roux 660b753b56 No functional change, this file is not used so useless, removed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740635 13f79535-47bb-0310-9956-ffa450edef68
2016-04-23 04:32:12 +00:00
Deepak Dixit a8c5938b19 (OFBIZ-6821) Added missing content folder in specialpurpose/ecommerce component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740489 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:02:20 +00:00
Deepak Dixit 6d65904ec1 (OFBIZ-6821) relocate .ftl files in the specialpurpose/ecommerce component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740485 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 11:42:03 +00:00
Deepak Dixit a29b597838 (OFBIZ-6811) Renamed ecommerce/templates to ecommerce/tempalte to make it consistent.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740483 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 11:22:42 +00:00