root
|
72cee7b991
|
test
|
2017-06-19 17:41:42 +02:00 |
|
root
|
cae2d21ea2
|
Merge branch 'addCusto' of gitlab.antadis.net:dev-antadis/roykin into addCusto
|
2017-06-19 17:15:30 +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 |
|
Rodney Figaro
|
e4d60371af
|
fix conflicts
|
2017-06-07 11:06:58 +02:00 |
|
Rodney Figaro
|
f63fb84af8
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-06-02 16:42:18 +02:00 |
|
root
|
74f51c4e3f
|
change bg submenu
|
2017-06-02 16:37:21 +02:00 |
|
Rodney Figaro
|
179dd86c83
|
Merge branch 'ticket/r13265-2-fix-label-bottle' into dev
|
2017-05-30 18:23:55 +02:00 |
|
Rodney Figaro
|
582faf57d1
|
13265 - in shopping cart, replace "bottle" by product unity
|
2017-05-30 18:22:42 +02:00 |
|
Rodney Figaro
|
652bcc3c46
|
Merge branch 'ticket/r13265-2-fix-label-bottle' into dev
|
2017-05-30 18:19:06 +02:00 |
|
Rodney Figaro
|
62ade27516
|
13265 - replace text "bottle" by product unity in product list
|
2017-05-30 18:18:12 +02:00 |
|
Rodney Figaro
|
07c8d42616
|
Merge branch 'ticket/r13144-bug-double-orders' into dev
|
2017-05-29 16:18:02 +02:00 |
|
Rodney Figaro
|
e33755356c
|
13144 - fix double click bug when validating bankwire and cheque payment (causes 2 orders to be created)
|
2017-05-29 16:17:47 +02:00 |
|
Rodney Figaro
|
7e51bf6ab2
|
Merge branch 'ticket/r13144-bug-double-orders' into dev
|
2017-05-29 12:26:03 +02:00 |
|
Rodney Figaro
|
b3e4001f3b
|
13144 - fix form closed twice in payment bankwire tpl
|
2017-05-29 12:23:42 +02:00 |
|
Rodney Figaro
|
e8016490ed
|
Merge branch 'ticket/r13161-remove-guest-in-emails'
|
2017-05-24 10:51:00 +02:00 |
|
Rodney Figaro
|
e747d2b070
|
Merge branch 'ticket/r13265-hide-product-text'
|
2017-05-22 18:38:57 +02:00 |
|
Rodney Figaro
|
290e1070e6
|
Merge branch 'ticket/r13161-remove-guest-in-emails' into dev
|
2017-05-19 15:52:23 +02:00 |
|
Rodney Figaro
|
c1f17ce187
|
13161 - remove "guest" mentions in all emails
|
2017-05-19 15:52:15 +02:00 |
|
Rodney Figaro
|
69616fc8b1
|
12695 - add link "my rewards" in block account
|
2017-05-18 17:49:30 +02:00 |
|
Rodney Figaro
|
1c95a67334
|
12695 - add with adaptations All-In-One Reward module
|
2017-05-18 17:33:50 +02:00 |
|
Rodney Figaro
|
c033432a7c
|
Merge branch 'ticket/r12890-upgrade-give-a-gift-2'
|
2017-05-18 17:09:17 +02:00 |
|
Rodney Figaro
|
ffd2b0398e
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-17 11:16:01 +02:00 |
|
Rodney Figaro
|
8dbf4f6ade
|
13161 - changes pictos/icons (mails, site) and texts
|
2017-05-17 11:15:52 +02:00 |
|
Rodney Figaro
|
a8c83bf508
|
fix conflicts
|
2017-05-16 16:31:36 +02:00 |
|
Rodney Figaro
|
9e506a1a3c
|
13161 - changes texts
|
2017-05-16 16:30:33 +02:00 |
|
Rodney Figaro
|
9d614a89ec
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 10:42:03 +02:00 |
|
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
|
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 |
|
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 |
|
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 |
|