Rodney Figaro
|
9aae6f7bbf
|
13161 - sort product by brands in email confirmation order
|
2017-05-15 10:41:55 +02:00 |
|
Rodney Figaro
|
9712c1dcf1
|
fix conflicts
|
2017-05-12 18:29:40 +02:00 |
|
Rodney Figaro
|
39c9259ee2
|
12890 - fix text and translations, hide gift PLV products if in cart
|
2017-05-12 18:28:21 +02:00 |
|
Rodney Figaro
|
fc1fc93528
|
fix conflicts
|
2017-05-12 17:54:55 +02:00 |
|
Rodney Figaro
|
bf57e47971
|
13265 - Hide text "nb bottle" in shopping cart
|
2017-05-12 17:54:05 +02:00 |
|
Rodney Figaro
|
766078a8df
|
Merge branch 'ticket/r13265-hide-product-text' into dev
|
2017-05-12 17:50:02 +02:00 |
|
Rodney Figaro
|
0c826b02b2
|
13265 - adapt prices displayed
|
2017-05-12 17:49:54 +02:00 |
|
Rodney Figaro
|
8edc8294e0
|
Merge branch 'ticket/r13265-hide-product-text' into dev
|
2017-05-12 17:46:08 +02:00 |
|
Rodney Figaro
|
e413125621
|
13265 - fix product text
|
2017-05-12 17:46:01 +02:00 |
|
Rodney Figaro
|
f377439f61
|
Merge branch 'ticket/r13265-hide-product-text' into dev
|
2017-05-12 17:42:41 +02:00 |
|
Rodney Figaro
|
63266300b3
|
13265 - remove "sale by box" for product with 1 article
|
2017-05-12 17:42:31 +02:00 |
|
Rodney Figaro
|
f13635d3ca
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 17:10:00 +02:00 |
|
Rodney Figaro
|
f46921981d
|
13161 - increase memory limit during logo/bkg upload
|
2017-05-12 17:09:53 +02:00 |
|
Rodney Figaro
|
b4d7500699
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 16:59:58 +02:00 |
|
Rodney Figaro
|
2cf07ece99
|
13161 - add image upload checking and force resize
|
2017-05-12 16:59:17 +02:00 |
|
Rodney Figaro
|
0c909a97e2
|
Merge branch 'fix_erp_mailer' into dev
|
2017-05-12 16:32:40 +02:00 |
|
Rodney Figaro
|
d318c73293
|
prevent mails from being sent when customers are created during the erp synchro in PREPROD
|
2017-05-12 16:32:24 +02:00 |
|
Rodney Figaro
|
73a82fa8e7
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 16:24:23 +02:00 |
|
Rodney Figaro
|
69c5338121
|
13161 - fix order confirmation cart summary
|
2017-05-12 16:24:07 +02:00 |
|
Rodney Figaro
|
b9bf9c018c
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 16:00:13 +02:00 |
|
Rodney Figaro
|
6109c60f9f
|
13161 - fix unchecked "brands" variable in shopping cart tpl
|
2017-05-12 15:06:58 +02:00 |
|
Rodney Figaro
|
413de3b3ec
|
fix conflit in global css
|
2017-05-12 12:50:42 +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
|
c68a051cfe
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 11:33:45 +02:00 |
|
Rodney Figaro
|
1289b0903d
|
13161 - change labels of images in admin category form
|
2017-05-12 11:33:30 +02:00 |
|
root
|
5b48817a65
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' of gitlab.antadis.net:dev-antadis/roykin into ticket/r13161-Fusion-Levest-Roykin
|
2017-05-12 09:08:53 +00:00 |
|
root
|
515d278d97
|
13161 - change background image front css
|
2017-05-12 09:08:15 +00:00 |
|
Rodney Figaro
|
42149ac043
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 10:42:45 +02:00 |
|
Rodney Figaro
|
4745a769f3
|
13161 - hide families tab in front menu
|
2017-05-12 10:42:28 +02:00 |
|
Rodney Figaro
|
9b68479750
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-12 09:25:43 +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 |
|
root
|
8ee820c22b
|
13161 - Integration
|
2017-05-11 16:34:43 +00: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
|
28ef200c4b
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-10 18:42:30 +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
|
fe8295dd55
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-10 14:38:09 +02:00 |
|
Rodney Figaro
|
8e7e4f4847
|
13161 - change id of roykin category
|
2017-05-10 14:37:48 +02:00 |
|
Rodney Figaro
|
2cf7914a8b
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-10 14:25:17 +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
|
2d3c944003
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-10 14:18:27 +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
|
bc90864f26
|
13161 - fix message alert box integration in search page
|
2017-05-10 12:51:21 +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
|
b1ec03723e
|
Merge branch 'ticket/r13075-erp-fix-update-products'
|
2017-05-05 12:28:04 +02:00 |
|