 dMetzger
|
d5c2094706
|
// Temp fix for cart rule and multi-shipping - not fully functionnal yet but still better than before
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-01 09:45:39 +00:00 |
|
|
dMetzger
|
f6b91055d5
|
[+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:55:40 +00:00 |
|
|
dMetzger
|
319309528a
|
[-] FO : automatic refresh of the cart when a cart rule is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13577 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 18:24:23 +00:00 |
|
|
dMetzger
|
be71b2ddb1
|
[-] FO : cart rule fix (product restrictions mixing attributes and other criteria)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13567 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:05 +00:00 |
|
|
dMetzger
|
5339d45d07
|
[+] BO : BO width can now be fixed or flexible (you can set it up in your employee account)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13560 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:42:23 +00:00 |
|
|
dMetzger
|
7e73e088e5
|
[-] FO : ajax cart now display cart rules correctly #PSTEST-724
// Small addition to the controller override
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13527 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 11:02:49 +00:00 |
|
|
dMetzger
|
5face77ed4
|
// BO : Small optimization on the payment page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13484 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 08:51:10 +00:00 |
|
|
dMetzger
|
609a45f25b
|
[*] BO : you can now choose the combination of the free product of a cart rule
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:04:41 +00:00 |
|
|
dMetzger
|
ae8471b7d6
|
[-] BO : small fixes on AdminCartRules #PSFV-506
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13455 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 10:25:21 +00:00 |
|
|
dMetzger
|
2c7720ab08
|
// You shall not DIE!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 09:14:01 +00:00 |
|
|
dMetzger
|
50955422a8
|
// Removed misplaced debug file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13420 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-17 09:56:47 +00:00 |
|
|
dMetzger
|
89286d1b44
|
[-] Installer : set_time_limit is set to infinite then set to 300 seconds... Second one changed.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13278 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-14 08:25:38 +00:00 |
|
|
dMetzger
|
ec0798fe8a
|
[-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-13 17:47:40 +00:00 |
|
|
dMetzger
|
5e0bcc234d
|
// Go for the eyes Boo, go for the eyes!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13200 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-09 17:27:37 +00:00 |
|
|
dMetzger
|
a056a78177
|
// A few dozens queries less on every pages...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13197 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-09 17:15:05 +00:00 |
|
|
dMetzger
|
3a0862130f
|
// Deprecated code removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13185 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-09 15:39:14 +00:00 |
|
|
dMetzger
|
5f95dda75d
|
// Small display fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13181 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-09 15:07:52 +00:00 |
|
|
dMetzger
|
e22f837ebc
|
[-] BO : cart rule with attributes filter and reduction on the selection of products fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13047 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 17:00:47 +00:00 |
|
|
dMetzger
|
48e590a257
|
// Fixed small bug which occured when you refreshed a reduction on a selection of product on an order that did not match the selection anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13039 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 16:29:47 +00:00 |
|
|
dMetzger
|
33df5d5ea7
|
[*] BO : reduction on a selection of products finalized
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13038 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 16:26:49 +00:00 |
|
|
dMetzger
|
744bf28826
|
[*] BO : shop restriction added to the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13032 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 14:57:39 +00:00 |
|
|
dMetzger
|
a73e776822
|
// Updated version in the installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13030 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 14:19:58 +00:00 |
|
|
dMetzger
|
f3b1c0a36b
|
[-] FO : total to pay on check and bankwire confirmation fixed PSTEST-661
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13026 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 14:05:06 +00:00 |
|
|
dMetzger
|
5e69751519
|
// Box shadow in the back office is now smaller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13023 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 13:41:53 +00:00 |
|
|
dMetzger
|
a239000042
|
// Small display fix on back office homepage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13021 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 13:33:39 +00:00 |
|
|
dMetzger
|
9fa90c4183
|
[-] BO : wrong error message was displayed on cart rules deletion PSTEST-644
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12998 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-03 16:17:02 +00:00 |
|
|
dMetzger
|
790abcfc31
|
// Removed Georgia in the CSS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12992 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-03 15:48:15 +00:00 |
|
|
dMetzger
|
debbc4480b
|
// Wrong help text PSTEST-594
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12968 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-03 11:12:18 +00:00 |
|
|
dMetzger
|
aa35ada6a9
|
// Cart rules translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12920 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-02 10:03:07 +00:00 |
|
|
dMetzger
|
8870ab1daf
|
[-] Installer : Engine and charset were missing for some tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12893 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-01 13:27:59 +00:00 |
|
|
dMetzger
|
f1dece04f2
|
[-] BO : partial use fixed for cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12762 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-27 15:56:57 +00:00 |
|
|
dMetzger
|
113d3a5174
|
// Small fixes for cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12756 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-27 14:38:04 +00:00 |
|
|
dMetzger
|
8a4b9f7afe
|
[-] FO : free gift fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12726 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 17:17:18 +00:00 |
|
|
dMetzger
|
ff44291d38
|
[-] FO : uncombinable cart rules are not combinable anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 15:17:23 +00:00 |
|
|
dMetzger
|
b274997203
|
[-] BO : voucher creation in the order detail fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12718 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 14:34:58 +00:00 |
|
|
dMetzger
|
b39c0061a7
|
[*] BO : new dimension added to the product filter in the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12714 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 13:30:16 +00:00 |
|
|
dMetzger
|
c09956731c
|
// Code cleaning (norm)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-20 16:09:37 +00:00 |
|
|
dMetzger
|
aa402d73bd
|
// Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12585 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-20 15:58:40 +00:00 |
|
|
dMetzger
|
232ff76928
|
[-] BO : fixed bug which appeared in the customer service when some employees were deleted
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12099 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-04 09:15:51 +00:00 |
|
|
dMetzger
|
347e5ba45b
|
[-] Project : fixed rare bug in Tools::displayPrice that occur when the currency is not valid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11987 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-02 13:37:51 +00:00 |
|
|
dMetzger
|
6c7337d2cb
|
// Fixed rounding bug on cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 10:41:00 +00:00 |
|
|
dMetzger
|
1af8b45b5f
|
// Toolbar removed from cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10619 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:07:22 +00:00 |
|
|
dMetzger
|
42e3ab3b90
|
// BO login bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10617 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 22:04:01 +00:00 |
|
|
dMetzger
|
7648f8ece0
|
// Order processing bugs fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10603 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:02:51 +00:00 |
|
|
dMetzger
|
c604df470d
|
// Cart rules fixed in admin customers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10594 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:22:23 +00:00 |
|
|
dMetzger
|
c32038a6f4
|
// Removed the underlined space in the BO list headers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 18:20:08 +00:00 |
|
|
dMetzger
|
f670f7573f
|
[+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 17:45:52 +00:00 |
|
|
dMetzger
|
bb7050715b
|
// bug fix for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 13:38:41 +00:00 |
|
|
dMetzger
|
dce036f929
|
// 2 bug fixes for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10523 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 13:24:15 +00:00 |
|
|
dMetzger
|
ca68421dae
|
// Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10510 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 10:49:44 +00:00 |
|
|
dMetzger
|
63436b787b
|
// CartRule fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10489 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 08:49:05 +00:00 |
|
|
dMetzger
|
b854caf867
|
// Avoid some crashes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10488 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 08:39:49 +00:00 |
|
|
dMetzger
|
8fdcb10f78
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:18:04 +00:00 |
|
|
dMetzger
|
a98752eb22
|
// Vouchers are shrinkable again (must be tested more thoroughly)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10292 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 15:53:31 +00:00 |
|
|
dMetzger
|
db15eec68b
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10290 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 14:50:20 +00:00 |
|
|
dMetzger
|
873b94a743
|
// Temporary fix for free_shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-03 14:36:45 +00:00 |
|
|
dMetzger
|
d1088bde51
|
// installer fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9804 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 15:46:04 +00:00 |
|
|
dMetzger
|
17a8dbc05b
|
// Retro compatibility and updater improved for Discount/CartRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 14:23:44 +00:00 |
|
|
dMetzger
|
b475167130
|
// Birthdaypresent is deprecated - no longer supported
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9791 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 11:01:58 +00:00 |
|
|
dMetzger
|
953cb8b872
|
// Retro compatibility for Discount
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9789 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 10:47:01 +00:00 |
|
|
dMetzger
|
cb2307abaf
|
// A few table name replaced
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9772 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-01 19:06:26 +00:00 |
|
|
dMetzger
|
486622522c
|
[+] Project : Vouchers are now replaced by cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-01 18:50:42 +00:00 |
|
|
dMetzger
|
b280534764
|
// SQL file charset set to UTF-8
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8794 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 09:31:54 +00:00 |
|
|
dMetzger
|
b24d2fa274
|
// Removed id_color_defaut from installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8711 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-22 08:54:11 +00:00 |
|
|
dMetzger
|
6bc3640449
|
// Removed leading "*" before PHP opening tag in AdminDB.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8658 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-20 09:30:36 +00:00 |
|
|
dMetzger
|
d2cb63d1e3
|
// $_SERVER['request_uri'] replaced by $_SERVER['REQUEST_URI']
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8631 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-19 08:59:46 +00:00 |
|
|
dMetzger
|
287a5f42dc
|
[+] BO : you can now set detailed permissions for each module in the back end
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7818 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-31 16:39:53 +00:00 |
|
|
dMetzger
|
a2b32fb056
|
[-] IN : missing entries in accesses table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7817 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-31 11:58:31 +00:00 |
|
|
dMetzger
|
eb9d9719be
|
[-] MO : modules exceptions stability improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6140 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-05-02 12:36:27 +00:00 |
|
|
dMetzger
|
92316e3710
|
[*] MO : theme installer can now manage module exceptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6128 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-29 13:41:10 +00:00 |
|
|
dMetzger
|
39eca4ab76
|
[-] BO : module XML config files stability improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6122 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-29 10:06:51 +00:00 |
|