Commit Graph
19 Commits
Author SHA1 Message Date
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Bruno Busco efadece8f4 VisualThemes for Ecommerce (https://issues.apache.org/jira/browse/OFBIZ-2106)
The ProductStore entity has now a visualThemeId that selects the VisualTheme to be used in the Ecommerce.
This can be set in the EditProductStore form selecting a theme between the themes that belong to the "ECOMMERCE" VisualThemeSet

To the following ProductStore fields has been applied the entity deprecation pattern:
<field name="oldStyleSheet" col-name="STYLE_SHEET" type="url"></field>
<field name="oldHeaderLogo" col-name="HEADER_LOGO" type="url"></field>
<field name="oldHeaderMiddleBackground" col-name="HEADER_MIDDLE_BACKGROUND" type="url"></field>
<field name="oldHeaderRightBackground" col-name="HEADER_RIGHT_BACKGROUND" type="url"></field>

The first part of the ecommerce header.ftl (the part defining the <HEAD> tag content) has been moved to a new headerHead.ftl file. This allows all the theme defined header.ftl to include this common part that is mainly inclusion of theme defined resources and should never change (code reuse).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746544 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 17:18:25 +00:00
Jacques Le Roux 72fe2a0d44 I finally prefer to have a demo taxAuthorityRateSeqId defined
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722901 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 14:30:39 +00:00
Jacques Le Roux f3f8039a63 Useful to have VAT/GST/Sale Taxes working by default in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722836 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 10:34:22 +00:00
Marco Risaliti 630a24c1e5 PAYMENT SET REF. button is not working correctly because it sets now only the first payment of the cart (Issue OFBIZ-1998)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@704645 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 19:48:26 +00:00
Marco Risaliti 5d79692a89 Add a new "paymentReasonId" on PosTerminalInternTx entity and store payment reason id during Pos Paid IN/OUT (Issue OFBIZ-1991)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@703568 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 19:56:17 +00:00
Marco Risaliti 78633b3500 Add a new "terminalName" on PosTerminal entity and then show it on web pos login (Issue OFBIZ-1981)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@701675 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 17:19:07 +00:00
Jacques Le Roux 92dacb9091 Remove
taxCategory
    taxVatCode
    taxDutyCode
fields from Product entity and all things related. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690360 13f79535-47bb-0310-9956-ffa450edef68
2008-08-29 18:29:57 +00:00
Jacques Le Roux 06bd215978 Link to Wiki page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684192 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 08:08:10 +00:00
Jacques Le Roux f1e0a5365e This was needed since one of the commits related to https://issues.apache.org/jira/browse/OFBIZ-1630 and related tasks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@647274 13f79535-47bb-0310-9956-ffa450edef68
2008-04-11 19:27:33 +00:00
Jacques Le Roux d19a70fa29 A patch from Chris Lombardi "POS payment failures should not be retried and notified by email" (https://issues.apache.org/jira/browse/OFBIZ-1627) - OFBIZ-1627
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@639207 13f79535-47bb-0310-9956-ffa450edef68
2008-03-20 08:54:17 +00:00
Jacques Le Roux 9d62001e36 A modified patch from Chris Lombardi "Ability to add items with modifiers in POS" (https://issues.apache.org/jira/browse/OFBIZ-1109) - OFBIZ-1109
There are some additions I did, and still some things to do... An new Jira issue should be opened

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604993 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 20:41:23 +00:00
Scott Gray 14d06af365 Set the defaultInventoryItemTypeId for the retail facility
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@601235 13f79535-47bb-0310-9956-ffa450edef68
2007-12-05 07:46:13 +00:00
Si Chen 1ba91a5073 Implementing ProductStore.autoApproveOrder (indicator) to govern whether orders are automatically approved during processPayment execution when payment is authorized. If empty or Y, orders will be approved.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@517347 13f79535-47bb-0310-9956-ffa450edef68
2007-03-12 19:23:02 +00:00
Si Chen cd670b7c09 OFBIZ-558: Support rollback of shipping on failed credit card capture
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@517342 13f79535-47bb-0310-9956-ffa450edef68
2007-03-12 19:13:15 +00:00
Si Chen c17af030f4 OFBIZ-781: Implement setting to control auto-approval of sales invoice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@515660 13f79535-47bb-0310-9956-ffa450edef68
2007-03-07 17:45:29 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
David E. Jones 64d21975bf Created new specialpurpose directory for special purpose components that are based on the more general components under the applications directory, but reuse resources in order to create applications meant for a special purpose, or a particular type of user or task; also adjusted build files, component load files, etc
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@476486 13f79535-47bb-0310-9956-ffa450edef68
2006-11-18 10:32:43 +00:00