dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,896 Commits 9 Branches 19 Tags
da3ca98dfd1e21ab287b108c07ea2a1008a6ba2d
Commit Graph

117 Commits

Author SHA1 Message Date
Kevin Granger
fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
gRoussac
dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
gRoussac
581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
Kevin Granger
534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
2d65f5a8c0 // Cart rules bootstrap design 2013-09-26 14:55:28 +02:00
Jerome Nadaud
39edb5a546 // Fix cart rules bootstrap design 2013-09-19 19:33:55 +02:00
Jerome Nadaud
e204cbf24e [+] BO : Page header toolbar 2013-08-28 10:17:07 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Kevin Granger
0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Damien Metzger
ca984840b1 // Fixed button order in AdminCartRules 2013-06-18 16:15:51 +02:00
Kevin Granger
6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Kevin Granger
86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
c13c378418 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 2012-12-14 09:48:16 +01:00
Damien Metzger
eb423f1a09 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 2012-12-14 09:48:16 +01:00
vAugagneur
049caca3b7 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
vAugagneur
0e0ca2a473 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
DamienMetzger
3fe8ebec14 [-] BO : forbid the creation of 2 cart rules with the same code #PSCFV-5737 2012-11-21 10:59:37 +01:00
DamienMetzger
ee23354325 [-] BO : forbid the creation of 2 cart rules with the same code #PSCFV-5737 2012-11-21 10:59:37 +01:00
vAugagneur
fe42d0f0fe //translation 2012-10-29 16:41:01 +00:00
vAugagneur
8c669ebee4 //translation 2012-10-29 16:41:01 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
87c5217e5a // fix php notice on cart rule addition without conditions 2012-10-11 09:35:45 +00:00
rGaillard
93df9c2014 // fix php notice on cart rule addition without conditions 2012-10-11 09:35:45 +00:00
dMetzger
dd04ca278a [-] BO : fixed combination of cart rules when saving the rule #PSCFV-4147 2012-09-20 11:52:06 +00:00
dMetzger
81828e46a0 [-] BO : fixed combination of cart rules when saving the rule #PSCFV-4147 2012-09-20 11:52:06 +00:00
dMetzger
aeb59f4a51 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 2012-08-29 09:55:39 +00:00
dMetzger
69d5329cb7 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 2012-08-29 09:55:39 +00:00
dMetzger
4bde02d460 [-] BO : you could not remove a gift once it had been set #PSCFV-3420 2012-07-30 14:35:59 +00:00
dMetzger
1b6177ab62 [-] BO : you could not remove a gift once it had been set #PSCFV-3420 2012-07-30 14:35:59 +00:00
dMetzger
50a439ba3b // Cart rule display in cart summary 2012-05-30 09:29:55 +00:00
dMetzger
fafaaf783e // Cart rule display in cart summary 2012-05-30 09:29:55 +00:00
dMetzger
894c9bc216 [-] BO : Product filter initialization fixed in cart rules #PSCFV-2524 2012-05-22 11:54:54 +00:00
dMetzger
3049c59422 [-] BO : Product filter initialization fixed in cart rules #PSCFV-2524 2012-05-22 11:54:54 +00:00
dMetzger
849c40c006 [-] BO : there was some row doubled in the cart rules because of the multi-shop 2012-05-09 12:50:24 +00:00
dMetzger
5735b5564a [-] BO : there was some row doubled in the cart rules because of the multi-shop 2012-05-09 12:50:24 +00:00
dMetzger
5f90b01b97 [-] BO : in the cart rules, when a reduction is associated to a specific product, the product is automatically added to the restrictions #PSCFV-2195 2012-05-04 11:05:07 +00:00