root
|
c50a5c760c
|
Revert "Ajout du module pour ajouter des clients à l'espace professionnel"
This reverts commit 77752af3d1.
|
2017-06-19 17:43:00 +02:00 |
|
root
|
72cee7b991
|
test
|
2017-06-19 17:41:42 +02:00 |
|
root
|
8c13f2ddba
|
fix frontcontroller
|
2017-06-19 17:28:07 +02:00 |
|
Valentin
|
77752af3d1
|
Ajout du module pour ajouter des clients à l'espace professionnel
|
2017-06-16 12:15:06 +02:00 |
|
Valentin
|
b564cf2ab1
|
Ajout du site de base
|
2017-06-14 11:41:31 +02:00 |
|
RoykinPROD
|
6cead6e18d
|
fix roykin id as default category
|
2017-06-07 15:21:29 +02:00 |
|
Rodney Figaro
|
049dd002aa
|
fix default menu
|
2017-06-07 12:31:42 +02:00 |
|
Rodney Figaro
|
e4d60371af
|
fix conflicts
|
2017-06-07 11:06:58 +02:00 |
|
Rodney Figaro
|
6d0d4e4c59
|
13372 - change default subcategory of TPD Belge
|
2017-05-31 09:07:19 +02:00 |
|
Rodney Figaro
|
46f9628ebb
|
13372 - add category TPD Belge in menu
|
2017-05-31 09:05:10 +02:00 |
|
Rodney Figaro
|
72e8320cc8
|
13372 - add PLV and PLV_ALL categories
|
2017-05-30 18:36:44 +02:00 |
|
Rodney Figaro
|
1c95a67334
|
12695 - add with adaptations All-In-One Reward module
|
2017-05-18 17:33:50 +02:00 |
|
Rodney Figaro
|
8dbf4f6ade
|
13161 - changes pictos/icons (mails, site) and texts
|
2017-05-17 11:15:52 +02:00 |
|
Rodney Figaro
|
645bf55797
|
13161 - rewrite comments in override payment module
|
2017-05-15 11:04:37 +02:00 |
|
Rodney Figaro
|
7857dd6278
|
13161 - add id_category_default in payment module to sort by brands in emails
|
2017-05-15 10:59:04 +02:00 |
|
Rodney Figaro
|
db09be33ce
|
13161 - fix bug in payment module
|
2017-05-15 10:55:24 +02:00 |
|
Rodney Figaro
|
621da01bd8
|
13161 - simplify paymentmodule override
|
2017-05-15 10:53:35 +02:00 |
|
Rodney Figaro
|
9aae6f7bbf
|
13161 - sort product by brands in email confirmation order
|
2017-05-15 10:41:55 +02:00 |
|
Rodney Figaro
|
f46921981d
|
13161 - increase memory limit during logo/bkg upload
|
2017-05-12 17:09:53 +02:00 |
|
Rodney Figaro
|
2cf07ece99
|
13161 - add image upload checking and force resize
|
2017-05-12 16:59:17 +02:00 |
|
Rodney Figaro
|
69c5338121
|
13161 - fix order confirmation cart summary
|
2017-05-12 16:24:07 +02:00 |
|
Rodney Figaro
|
25868a2255
|
13161 - update history order details with products per brands, fix bugs, refactoring
|
2017-05-12 12:49:08 +02:00 |
|
Rodney Figaro
|
1289b0903d
|
13161 - change labels of images in admin category form
|
2017-05-12 11:33:30 +02:00 |
|
Rodney Figaro
|
b76115952b
|
13161 - fix logo/background thumbnail generation in admin category
|
2017-05-12 09:25:11 +02:00 |
|
Rodney Figaro
|
3163cc8461
|
13161 - fix menu bug (no brands) in search page
|
2017-05-11 18:42:41 +02:00 |
|
Rodney Figaro
|
38c4b60cc2
|
13161 - change cart product per brands sorting
|
2017-05-11 18:06:29 +02:00 |
|
Rodney Figaro
|
c641b3f04e
|
13161 - sort products per "brands" category in shopping list
|
2017-05-11 16:21:54 +02:00 |
|
Rodney Figaro
|
05a506cb26
|
13161 - generalize the menu building and redirections in categories
|
2017-05-11 12:55:53 +02:00 |
|
Rodney Figaro
|
7705eea62b
|
13161 - restore level 3 menu
|
2017-05-11 11:55:13 +02:00 |
|
Rodney Figaro
|
4b4c5f4e4a
|
13161 - add first version of logos and background in category
|
2017-05-10 18:41:57 +02:00 |
|
Rodney Figaro
|
8e7e4f4847
|
13161 - change id of roykin category
|
2017-05-10 14:37:48 +02:00 |
|
Rodney Figaro
|
171fc052e8
|
Revert "13161 - define only default sub categories of brands and home"
This reverts commit 9fb708677f.
|
2017-05-10 14:24:53 +02:00 |
|
Rodney Figaro
|
9fb708677f
|
13161 - define only default sub categories of brands and home
|
2017-05-10 14:17:55 +02:00 |
|
Rodney Figaro
|
79c1744cd3
|
13161 - change menus relationship to categories, change categories constants
|
2017-05-10 12:40:14 +02:00 |
|
Rodney Figaro
|
4a60da7510
|
13161 - Category::getCategoriesTree returns array() by default
|
2017-05-10 10:34:43 +02:00 |
|
Rodney Figaro
|
595a52bee7
|
13161 - replace CATEGORY_COLLECTION_ALL in all overrided controllers except CategoryController by a calling of a Category default method
|
2017-05-10 10:15:22 +02:00 |
|
Rodney Figaro
|
6782d1212d
|
12890 - fix filtering give a gift by customer group
|
2017-04-27 17:45:19 +02:00 |
|
Rodney Figaro
|
582f30ef01
|
12890 - give a gift - filter gifts by customer groups and cart product categories, add BO configuration
|
2017-04-19 13:01:30 +02:00 |
|
root
|
7a3a9b161a
|
12425 - fix too slow loading, optimise computation of product price
|
2017-02-02 10:50:13 +01:00 |
|
root
|
2a5c988bce
|
commit changes made during the last 2 months
|
2017-01-26 10:34:09 +01:00 |
|
PLESK5
|
46978baba5
|
update prod
|
2016-10-21 11:41:16 +02:00 |
|
PLESK5
|
0f113d1850
|
add override
|
2016-10-21 11:37:55 +02:00 |
|
lamenuit
|
492538cead
|
push prod
|
2016-07-04 11:57:59 +02:00 |
|
Serveur preprod
|
be83006fb6
|
push dev
|
2016-06-01 11:53:40 +02:00 |
|
Serveur preprod
|
642924ae45
|
recette
|
2016-04-28 10:30:36 +02:00 |
|
Romuald
|
d2804a92a6
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-04-28 10:29:42 +02:00 |
|
Romuald
|
5f8da75004
|
override
|
2016-04-28 10:28:14 +02:00 |
|
Alexandre Simonet
|
97f7ce9c13
|
sync erp tags
|
2016-04-26 16:46:19 +02:00 |
|
Alexandre Simonet
|
53e51a20d6
|
update price calculator
|
2016-04-26 15:05:02 +02:00 |
|
Romuald
|
bb6314cb7a
|
recette
|
2016-04-25 14:38:13 +02:00 |
|