Quick Search:

Line History

line history graph

View Mode

Logical Physical

Show Arbitrary Diff

From to

Supports revisions and tags.

History

apamdal 1265 1262 oscommerce 1263 trunk 1862 831 608 19 1 modom 1267 tag:oscommerce-3.0a3 978 weisser 1101 frank 979 678 garrone 700 hpdl 1687 43

latest revision download trunk

1862 annotated / raw | Diffs: previous, other | Lines: 975 ( +482, -326 )

Created: 2009-03-07 00:34:07 +0100 (8 months ago) | Author: hpdl | Changeset: 1862

merge from hpdl r1674-r1693
Rename Product Attributes to Product Variants
Introduce new Product Attributes functionality

Properties

 svn:eol-style = native
 svn:keywords = Id

1498 annotated / raw | Diffs: previous, other | Lines: 819 ( +3, -1 )

Created: 2007-03-29 16:04:50 +0200 (2 years 7 months ago) | Author: hpdl | Changeset: 1498

Copied (2 times):

update version number to 3.0 Alpha 4
update copyright notice / license notice

merge from hpdl r1497

Tags: oscommerce-3.0a4

Properties

 svn:eol-style = native
 svn:keywords = Id

1421 annotated / raw | Diffs: previous, other | Lines: 817 ( +47, -38 )

Created: 2007-03-08 01:24:29 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1421

fix OSC-38

improve cartID logic
only calculate order totals if products exist in the shopping cart
(merge from hpdl r1420)

Properties

 svn:eol-style = native
 svn:keywords = Id

831 annotated / raw | Diffs: previous, other | Lines: 808 ( +10, -3 )

Created: 2006-08-29 14:48:40 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 831

Copied (3 times):

merge from hpdl r825 to r830

E_ALL compatibility updates
set the error reporting level to E_ALL by default

Branch point for: modom tag:oscommerce-3.0a3 weisser

Properties

 svn:eol-style = native
 svn:keywords = Id

814 annotated / raw | Diffs: previous, other | Lines: 801 ( +75, -117 )

Created: 2006-08-27 17:28:23 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 814

merge from hpdl r809, r810, r811

- remove redundant customers_basket_attributes database table; the attributes already exist as part of the product_id string in the main customers_basket table
- merge the customers_info database table into the main customers table

Properties

 svn:eol-style = native
 svn:keywords = Id

758 annotated / raw | Diffs: previous, other | Lines: 843 ( +1, -1 )

Created: 2006-08-23 14:30:07 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 758

merge from hpdl r735 to r737, r745 to r748
-finalize function standardization work

Properties

 svn:eol-style = native
 svn:keywords = Id

757 annotated / raw | Diffs: previous, other | Lines: 843 ( +12, -12 )

Created: 2006-08-23 14:22:54 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 757

merge from hpdl r725, r728, r729, r732, r733, r734
- standardize general.php functions
- new osC_Address class for adadress related functions (incl. address format string being moved to the countries database table)

Properties

 svn:eol-style = native
 svn:keywords = Id

755 annotated / raw | Diffs: previous, other | Lines: 843 ( +0, -6 )

Created: 2006-08-23 14:08:21 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 755

merge from hpdl r692, r696, r701, r702
- use the html_output functions from the catalog side
- replace the call to MAXIMUM_FILE_UPLOAD_SIZE with the osC_Language class
- assign the box heading links in the initialize() method

Properties

 svn:eol-style = native
 svn:keywords = Id

608 annotated / raw | Diffs: previous, other | Lines: 849 ( +10, -6 )

Created: 2006-07-05 12:56:09 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 608

merge from hpdl r555, r556, r571, r583, r584, r587 - r606
multiple product images implementation
close #21

Branch point for: frank garrone

Properties

 svn:eol-style = native
 svn:keywords = Id

554 annotated / raw | Diffs: previous, other | Lines: 845 ( +10, -6 )

Created: 2006-04-29 18:26:53 +0200 (3 years 6 months ago) | Author: hpdl | Changeset: 554

merge from hpdl -r474

Properties

 svn:eol-style = native
 svn:keywords = Id

443 annotated / raw | Diffs: previous, other | Lines: 841 ( +643, -317 )

Created: 2006-02-20 00:01:01 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 443

merge from hpdl -r417

- checkout procedure cleanup (logic)
- new "core" service module to load core classes (logic moved from application_top.php)
- install modules by their install() methods during the installation procedure
- remove existing cache files during the installation procedure
- fix spelling mistake in the service modules (preceeds -> precedes)

Tags: oscommerce-3.0a2

Properties

 svn:eol-style = native
 svn:keywords = Id

410 annotated / raw | Diffs: previous, other | Lines: 515 ( +9, -8 )

Created: 2006-01-26 10:17:09 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 410

merge from hpdl -r 383:head ; mainly related to the new XML based languages implementation

Properties

 svn:eol-style = native
 svn:keywords = Id

383 annotated / raw | Diffs: previous, other | Lines: 514 ( +2, -2 )

Created: 2006-01-09 17:35:46 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 383

merge from hpdl r376

Properties

 svn:eol-style = native
 svn:keywords = Id

368 annotated / raw | Diffs: previous, other | Lines: 514 ( +25, -24 )

Created: 2005-12-22 17:27:23 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 368

merge from hpdl -r152 (having problems merging the includes/content directory and hope to get that fixed in the next commit)

Tags: oscommerce-3.0a1

Properties

 svn:eol-style = native
 svn:keywords = Id

151 annotated / raw | Diffs: previous, other | Lines: 513 ( +0, -0 )

Created: 2005-08-02 16:33:25 +0200 (4 years 3 months ago) | Author: mattice | Changeset: 151

Update linefeeds

Properties

 svn:eol-style = native
 svn:keywords = Id

19 annotated / raw | Diffs: previous, other | Lines: 513 ( +197, -70 )

Created: 2005-02-25 03:57:18 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 19

use the new database class

Branch point for: hpdl

Properties

 svn:keywords = Id

5 annotated / raw | Diffs: previous, other | Lines: 386 ( +0, -0 )

Created: 2005-01-31 02:40:15 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 5

Added svn:keywords Id property

Properties

 svn:keywords = Id

1 new annotated / raw | Lines: 386 ( +386, -0 )

Created: 2005-01-31 01:06:19 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 1

Initial import

latest revision download Branch apamdal

1265 new/moved annotated / raw | Diffs: previous, other | Lines: 808 ( +808, -0 )

Created: 2007-02-26 23:27:15 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1265

Moved from: branches/oscommerce/includes/classes/shopping_cart.php 1263

move the oscommerce directory into Anders' branch

Properties

 svn:eol-style = native
 svn:keywords = Id

1262 new/copied annotated / raw | Diffs: previous, other | Lines: 808 ( +808, -0 )

Created: 2007-02-26 23:22:37 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1262

Copied from: trunk/oscommerce/includes/classes/shopping_cart.php 831

create a branch for Anders Pamdal (Tech2000)

Branch point for: oscommerce

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch frank

979 annotated / raw | Diffs: previous, other | Lines: 808 ( +94, -135 )

Created: 2006-09-02 13:38:58 +0200 (3 years 2 months ago) | Author: frank | Changeset: 979

merge from r977

Properties

 svn:eol-style = native
 svn:keywords = Id

678 new annotated / raw | Diffs: previous, other | Lines: 849 ( +0, -0 )

Created: 2006-08-10 23:31:42 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 678

copy trunk to franks branch

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch garrone

700 new annotated / raw | Diffs: previous, other | Lines: 849 ( +0, -0 )

Created: 2006-08-16 11:10:05 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 700

taken from /trunk/oscommerce

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch hpdl

1687 annotated / raw | Diffs: previous, other | Lines: 975 ( +101, -99 )

Created: 2007-09-03 21:43:04 +0200 (2 years 2 months ago) | Author: hpdl | Changeset: 1687

Introduce new Product Attributes feature
Allow for dynamic interaction between product variant combination values and the information shown on the product information page (eg, price and model)

Properties

 svn:eol-style = native
 svn:keywords = Id

1680 annotated / raw | Diffs: previous, other | Lines: 973 ( +2, -2 )

Created: 2007-08-29 23:02:22 +0200 (2 years 2 months ago) | Author: hpdl | Changeset: 1680

Allow default product variants to be defined so the combination is selected by default on the product information page

Properties

 svn:eol-style = native
 svn:keywords = Id

1677 annotated / raw | Diffs: previous, other | Lines: 973 ( +255, -98 )

Created: 2007-08-29 02:33:19 +0200 (2 years 2 months ago) | Author: hpdl | Changeset: 1677

Modularize product variant groups
Allow assignment of multiple variant group values (depends on the product variant group module used)
Change logic of the shopping cart class to reference added products by a customer specific item ID instead of the product ID. This allows one product to be added multiple times to the shopping cart (eg, when accepting custom variant values for a product (ie, front text and back text for a t-shirt))
rename osc_customers_basket database table to osc_shopping_carts

Properties

 svn:eol-style = native
 svn:keywords = Id

1674 annotated / raw | Diffs: previous, other | Lines: 816 ( +287, -290 )

Created: 2007-08-21 00:56:00 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 1674

introduce new product variants feature

Properties

 svn:eol-style = native
 svn:keywords = Id

1497 annotated / raw | Diffs: previous, other | Lines: 819 ( +3, -1 )

Created: 2007-03-29 15:40:05 +0200 (2 years 7 months ago) | Author: hpdl | Changeset: 1497

update version number to 3.0 Alpha 4
update copyright notice / license notice

Properties

 svn:eol-style = native
 svn:keywords = Id

1420 annotated / raw | Diffs: previous, other | Lines: 817 ( +47, -38 )

Created: 2007-03-08 01:21:12 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1420

improve cartID logic
only calculate order totals if products exist in the shopping cart

Properties

 svn:eol-style = native
 svn:keywords = Id

830 annotated / raw | Diffs: previous, other | Lines: 808 ( +4, -0 )

Created: 2006-08-29 14:44:39 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 830

logic updates
set error reporting to E_ALL by default

Properties

 svn:eol-style = native
 svn:keywords = Id

826 annotated / raw | Diffs: previous, other | Lines: 804 ( +6, -3 )

Created: 2006-08-29 13:39:48 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 826

add the tax to the total if display price with tax is disabled

Properties

 svn:eol-style = native
 svn:keywords = Id

810 annotated / raw | Diffs: previous, other | Lines: 801 ( +4, -1 )

Created: 2006-08-27 03:13:17 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 810

remove the while statement, remove the product from the cart if an attribute pair no longer exists

Properties

 svn:eol-style = native
 svn:keywords = Id

809 annotated / raw | Diffs: previous, other | Lines: 798 ( +72, -117 )

Created: 2006-08-27 03:02:21 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 809

remove redundant customers_basket_attributes database table

Properties

 svn:eol-style = native
 svn:keywords = Id

748 annotated / raw | Diffs: previous, other | Lines: 843 ( +1, -1 )

Created: 2006-08-23 13:26:56 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 748

change the class method as it was calculating with currency values

Properties

 svn:eol-style = native
 svn:keywords = Id

734 annotated / raw | Diffs: previous, other | Lines: 843 ( +6, -6 )

Created: 2006-08-20 19:56:47 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 734

finalize the standardization of the general.php functions

Properties

 svn:eol-style = native
 svn:keywords = Id

733 annotated / raw | Diffs: previous, other | Lines: 843 ( +2, -2 )

Created: 2006-08-20 17:32:32 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 733

standardize some more general.php functions

Properties

 svn:eol-style = native
 svn:keywords = Id

732 annotated / raw | Diffs: previous, other | Lines: 843 ( +4, -4 )

Created: 2006-08-20 02:18:00 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 732

standardize address related functions into a new osC_Address class
move the address format to the country level (countries database table)

Properties

 svn:eol-style = native
 svn:keywords = Id

692 annotated / raw | Diffs: previous, other | Lines: 843 ( +0, -6 )

Created: 2006-08-16 02:53:12 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 692

use the html_output functions from the catalog side

Properties

 svn:eol-style = native
 svn:keywords = Id

599 annotated / raw | Diffs: previous, other | Lines: 849 ( +2, -4 )

Created: 2006-07-03 19:36:46 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 599

remove the products_images_groups_id reference in the osc_products_images table; resize an original image to all image groups available

Properties

 svn:eol-style = native
 svn:keywords = Id

583 annotated / raw | Diffs: previous, other | Lines: 851 ( +4, -2 )

Created: 2006-06-29 15:12:20 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 583

new administration tool functionality for the multiple product images implementation

* image groups still need to be configurable via the administration tool
* showing the multiple images on the product info page still needs to be done

Properties

 svn:eol-style = native
 svn:keywords = Id

556 annotated / raw | Diffs: previous, other | Lines: 849 ( +6, -6 )

Created: 2006-05-01 01:57:23 +0200 (3 years 6 months ago) | Author: hpdl | Changeset: 556

rename osc_images and osc_images_groups to osc_products_images and osc_products_images_groups .. the original idea was also going to include category images but this will now be specific to product images

add 80x100 sizes to the default image group

Properties

 svn:eol-style = native
 svn:keywords = Id

555 annotated / raw | Diffs: previous, other | Lines: 849 ( +10, -6 )

Created: 2006-05-01 00:28:59 +0200 (3 years 6 months ago) | Author: hpdl | Changeset: 555

Start the multiple product images implementation

Properties

 svn:eol-style = native
 svn:keywords = Id

500 annotated / raw | Diffs: previous, other | Lines: 845 ( +2, -2 )

Created: 2006-04-18 08:27:10 +0200 (3 years 7 months ago) | Author: hpdl | Changeset: 500

replace True/true/False/false parameter values with integar values, that is then translated to the language used

Properties

 svn:eol-style = native
 svn:keywords = Id

479 annotated / raw | Diffs: previous, other | Lines: 845 ( +8, -4 )

Created: 2006-04-16 00:34:12 +0200 (3 years 7 months ago) | Author: hpdl | Changeset: 479

also return the zone code and telephone number for the shipping and billing address

Properties

 svn:eol-style = native
 svn:keywords = Id

439 annotated / raw | Diffs: previous, other | Lines: 841 ( +112, -52 )

Created: 2006-02-19 17:33:18 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 439

checkout procedure fixes

Properties

 svn:eol-style = native
 svn:keywords = Id

438 annotated / raw | Diffs: previous, other | Lines: 781 ( +30, -11 )

Created: 2006-02-16 15:50:54 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 438

move some logic from application_top.php to a new "core" service module, that takes care of setting up the objects we need (this fixes the relationships between classes where some depended on certain classes/objects being instantiated first)

finalize checkout procedure cleanup (yay! :))

Properties

 svn:eol-style = native
 svn:keywords = Id

435 annotated / raw | Diffs: previous, other | Lines: 762 ( +68, -11 )

Created: 2006-02-16 11:02:53 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 435

order totals cleanup

Properties

 svn:eol-style = native
 svn:keywords = Id

425 annotated / raw | Diffs: previous, other | Lines: 705 ( +25, -21 )

Created: 2006-02-14 12:31:42 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 425

insert the installed modules in the osc_templates_boxes table .. this table will be renamed to osc_modules later on, and will contain all installed modules (boxes, payment, shipping, order total, ..)

Properties

 svn:eol-style = native
 svn:keywords = Id

424 annotated / raw | Diffs: previous, other | Lines: 701 ( +4, -0 )

Created: 2006-02-09 21:23:55 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 424

checkout procedure cleanups

Properties

 svn:eol-style = native
 svn:keywords = Id

422 annotated / raw | Diffs: previous, other | Lines: 697 ( +4, -0 )

Created: 2006-02-09 14:36:08 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 422

checkout procedure cleanup; move free shipping logic to a new 'free shipping' shipping module

Properties

 svn:eol-style = native
 svn:keywords = Id

421 annotated / raw | Diffs: previous, other | Lines: 693 ( +144, -1 )

Created: 2006-02-08 18:53:17 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 421

the start of cleaning up the checkout procedure (additional commits pending)

Properties

 svn:eol-style = native
 svn:keywords = Id

420 annotated / raw | Diffs: previous, other | Lines: 550 ( +184, -165 )

Created: 2006-02-01 07:21:29 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 420

finalize the sanitization of the shopping cart class

Properties

 svn:eol-style = native
 svn:keywords = Id

419 annotated / raw | Diffs: previous, other | Lines: 531 ( +40, -42 )

Created: 2006-01-28 14:12:43 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 419

call the _calculate() method whenever the content in the shopping cart changes, to always have realtime values available

Properties

 svn:eol-style = native
 svn:keywords = Id

418 annotated / raw | Diffs: previous, other | Lines: 533 ( +235, -217 )

Created: 2006-01-28 13:46:34 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 418

the start of sanitizing the shopping cart class

Properties

 svn:eol-style = native
 svn:keywords = Id

387 annotated / raw | Diffs: previous, other | Lines: 515 ( +9, -8 )

Created: 2006-01-18 17:49:58 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 387

the start of moving the language definitions over to xml files which can easily be imported into the database

currently only for the english language and currently stores a cached version of the definitions from the xml file instead of retrieving the values from the database

new xml class to take care of xml files

Properties

 svn:eol-style = native
 svn:keywords = Id

377 annotated / raw | Diffs: previous, other | Lines: 514 ( +2, -2 )

Created: 2006-01-09 15:47:49 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 377

retrieve the language data from the language class instead of the session scope

Properties

 svn:eol-style = native
 svn:keywords = Id

247 annotated / raw | Diffs: previous, other | Lines: 514 ( +2, -1 )

Created: 2005-11-14 16:16:34 +0100 (4 years ago) | Author: hpdl | Changeset: 247

update product links to use the product_keyword

Properties

 svn:eol-style = native
 svn:keywords = Id

246 annotated / raw | Diffs: previous, other | Lines: 513 ( +1, -1 )

Created: 2005-11-14 16:06:41 +0100 (4 years ago) | Author: hpdl | Changeset: 246

add products_keyword and products_tags to the products description table, and move products_model from the products table to it

use the products_keyword value to link to products

administration tool updates still pending

there is a small problem when changing languages on a product information page with the product_keyword being different - will be fixed!

Properties

 svn:eol-style = native
 svn:keywords = Id

199 annotated / raw | Diffs: previous, other | Lines: 513 ( +6, -6 )

Created: 2005-09-22 17:56:13 +0200 (4 years 2 months ago) | Author: hpdl | Changeset: 199

update the session class

don't use the session class as a storage handler, but as a controller

added ctype_* checking on the session ID

Properties

 svn:eol-style = native
 svn:keywords = Id

184 annotated / raw | Diffs: previous, other | Lines: 513 ( +17, -17 )

Created: 2005-09-07 16:48:20 +0200 (4 years 2 months ago) | Author: hpdl | Changeset: 184

update the customer class

Properties

 svn:eol-style = native
 svn:keywords = Id

153 annotated / raw | Diffs: previous, other | Lines: 513 ( +0, -0 )

Created: 2005-08-04 14:57:59 +0200 (4 years 3 months ago) | Author: hpdl | Changeset: 153

merge from trunk r149

Properties

 svn:eol-style = native
 svn:keywords = Id

43 new annotated / raw | Diffs: previous, other | Lines: 513 ( +0, -0 )

Created: 2005-03-08 21:54:59 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 43

creating private branch

Properties

 svn:keywords = Id

latest revision download Branch modom

1267 new annotated / raw | Diffs: previous, other | Lines: 808 ( +808, -0 )

Created: 2007-02-26 23:30:14 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1267

copy trunk to Melinda's branch

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch oscommerce

1263 new annotated / raw | Diffs: previous, other | Lines: 808 ( +808, -0 )

Created: 2007-02-26 23:25:38 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1263

Moved to: branches/apamdal/oscommerce/includes/classes/shopping_cart.php 1265

create an oscommerce directory for Anders' branch

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch tag:oscommerce-3.0a3

978 new/copied annotated / raw | Diffs: previous, other | Lines: 808 ( +808, -0 )

Created: 2006-09-01 16:55:30 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 978

tag 3.0alpha3

Tags: oscommerce-3.0a3

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch weisser

1101 new annotated / raw | Diffs: previous, other | Lines: 808 ( +0, -0 )

Created: 2006-11-03 22:08:33 +0100 (3 years ago) | Author: hpdl | Changeset: 1101

oscommerce branch based on /trunk/oscommerce

Properties

 svn:eol-style = native
 svn:keywords = Id