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 |
|
Rodney Figaro
|
c641b3f04e
|
13161 - sort products per "brands" category in shopping list
|
2017-05-11 16:21:54 +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
|
2d3c944003
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-10 14:18:27 +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
|
1e15cc999a
|
12695 - increase font size of the text displayed in cart summary
|
2017-04-28 12:25:03 +02:00 |
|
Rodney Figaro
|
e6d5829a21
|
12695 - display voucher code input bloc even if voucher has been entered
|
2017-04-27 18:42:37 +02:00 |
|
Rodney Figaro
|
03a449b4a9
|
12695 - replace in translation "recompenses" by "avoirs" in rewards account front page
|
2017-04-27 18:13:39 +02:00 |
|
Rodney Figaro
|
3cdd2cf5ea
|
12695 - change text in shopping cart when no fidelity is possible
|
2017-04-27 18:09:15 +02:00 |
|
Rodney Figaro
|
b052df92c2
|
fix give a gift alignment in shopping cart
|
2017-04-21 10:45:46 +02:00 |
|
Rodney Figaro
|
d3815878a2
|
12695 - restore previous text "Add some products..." in shopping cart
|
2017-04-19 17:34:11 +02:00 |
|
Rodney Figaro
|
23009b7d08
|
12695 - save translations
|
2017-04-19 17:24:05 +02:00 |
|
Rodney Figaro
|
a3192820d0
|
12695 - add link to rewards in block account, fix give a gift shopping-cart display issue
|
2017-04-19 17:16:44 +02:00 |
|
Rodney Figaro
|
e7281a7a34
|
12695 - Fixes all-in-one reward integration in shopping cart
|
2017-04-19 16:33:47 +02:00 |
|
Rodney Figaro
|
455145cef7
|
12695 - add link to rewards account in shopping cart + translations
|
2017-03-24 18:14:55 +01:00 |
|
root
|
9c6b53ceeb
|
skin all in one + mail
|
2017-03-24 09:52:14 +00:00 |
|
Rodney Figaro
|
fac0185cd9
|
make erp activable or not, centralize credentials (not in repo)
|
2017-03-16 11:40:07 +01:00 |
|
root
|
6e7d018592
|
fix bug in price.toFixed in tools.js
|
2017-03-13 15:07:41 +00:00 |
|
Rodney Figaro
|
68a4ded2b2
|
use tax in gifts sentences and update translations in french
|
2017-03-13 14:45:19 +01:00 |
|
Rodney Figaro
|
d35a6c5801
|
12411 - lock the gift product quantity in shopping cart
|
2017-03-13 12:14:31 +01:00 |
|
Rodney Figaro
|
08a80d8eba
|
12411 - fix unused variable
|
2017-03-10 17:42:03 +01:00 |
|
Rodney Figaro
|
cb3fcbcace
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12411-giveagift
|
2017-03-10 17:38:19 +01:00 |
|
root
|
9dfbbccac1
|
remove prop disabled to fix chrome lag
|
2017-03-09 16:50:42 +01:00 |
|
root
|
730ee28e5c
|
fix giveagift unique selection, but per amount ranges
|
2017-03-03 08:10:09 +00:00 |
|
Rodney Figaro
|
5599c75e4c
|
fix merge branches
|
2017-03-02 17:56:38 +01:00 |
|
Rodney Figaro
|
9221835ce6
|
fix advslider by upgrading flexslider, adding flexslider.css and fixing height in css
|
2017-03-02 13:11:30 +01:00 |
|
root
|
50a175b140
|
#12411 - add theme give a gift and update integration
|
2017-02-17 09:45:59 +00:00 |
|
Rodney Figaro
|
5a8926ec78
|
fix undefined variables in history.tpl
|
2017-02-08 17:38:09 +01:00 |
|