2404 Commits

Author SHA1 Message Date
Michael RICOIS
84886b3c93 Disable Bestsellers block on page "post" 2017-11-21 17:31:56 +01:00
Michael RICOIS
77ae796785 Merge branch 'ticket-10393-guide-achat' into develop 2017-11-21 16:17:28 +01:00
Michael RICOIS
405708b9bc Fix 2017-11-21 16:13:24 +01:00
Michael RICOIS
0e97f87299 Hook sensefuel 2017-11-21 14:55:52 +01:00
Marion Muszynski
c494ce1880 Merge branch 'refonte-adminOrderTpl' into develop 2017-11-21 14:28:42 +01:00
Marion Muszynski
f567423f9b Merge branch 'fix-cache-privatesale_family_menu' 2017-11-21 14:14:42 +01:00
Marion Muszynski
45eded0dd9 Merge branch 'fix-cache-privatesale_family_menu' into develop 2017-11-21 14:12:27 +01:00
Marion Muszynski
da6a162fe6 fix 2017-11-21 14:12:21 +01:00
Marion Muszynski
41e29a2e06 Merge branch 'fix-cache-privatesale_family_menu' into develop 2017-11-21 14:10:24 +01:00
Marion Muszynski
15108dcd34 add cache for bestsellers 2017-11-21 14:10:00 +01:00
Michael RICOIS
0597685e56 Remove debug 2017-11-21 11:14:16 +01:00
Michael RICOIS
3a058c3096 Merge branch 'ticket-14525-parrain' 2017-11-21 10:37:22 +01:00
Michael RICOIS
99b6ff6bcb Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop 2017-11-21 10:36:29 +01:00
Michael RICOIS
b2abb181fe Merge branch 'ticket-14525-parrain' into develop 2017-11-21 10:36:00 +01:00
Michael RICOIS
e580048c80 Fix condition to update properly sponsor with order or not 2017-11-21 10:35:23 +01:00
Michael RICOIS
6f35329b24 Force adding categories (product_type) 2017-11-21 10:23:53 +01:00
Marion Muszynski
273544ed4f Merge branch 'fix-cache-privatesale_family_menu' into develop 2017-11-21 10:21:33 +01:00
Marion Muszynski
acbc72a32c fix name of key 2017-11-21 10:21:19 +01:00
Michael RICOIS
1234f7848d Fix blocklinkmulti 2017-11-21 10:00:56 +01:00
Michael RICOIS
8b0a6077da Style 2017-11-20 17:35:43 +01:00
Michael RICOIS
abee1a1059 Rewrite SQL 2017-11-20 17:35:23 +01:00
Marion Muszynski
f6944a411d Merge branch 'fix-cache-privatesale_family_menu' into develop 2017-11-20 17:21:33 +01:00
Marion Muszynski
b6283cf4ae fix futur sale query 2017-11-20 17:21:20 +01:00
Marion Muszynski
27659bb7b9 Merge branch 'fix-cache-privatesale_family_menu' into develop 2017-11-20 17:13:13 +01:00
Marion Muszynski
446308d40c cache privatesale menu 2017-11-20 17:12:58 +01:00
Michael RICOIS
b996521fcb 404 2017-11-20 14:54:19 +01:00
Michael RICOIS
d2e5f8b3e8 Meta information 2017-11-20 14:54:09 +01:00
Michael RICOIS
bebdc61548 Remove module id 2017-11-20 14:53:33 +01:00
Michael RICOIS
5b8353fa4d Don't display link when empty 2017-11-20 14:37:28 +01:00
Michael RICOIS
89cfe1499d Intégration sensuel, barre de recherche et modification infomrations
login
2017-11-20 11:18:23 +01:00
Marion Muszynski
60b061fc47 continuation 2017-11-20 11:11:18 +01:00
Michael RICOIS
1c5205a2a8 Admin 2017-11-17 11:42:47 +01:00
Marion Muszynski
104890e094 Merge branch 'ticket-14436-WP' into develop 2017-11-17 11:16:54 +01:00
Marion Muszynski
5a9d780365 add 2 columns to excel 2017-11-17 11:16:30 +01:00
Michael RICOIS
ea761282f0 Style 2017-11-16 16:50:01 +01:00
Michael RICOIS
150d86bc96 Merge branch 'ticket-14698-sensefuel' 2017-11-16 10:50:19 +01:00
Michael RICOIS
e9d927613f Merge branch 'ticket-14698-sensefuel' into develop 2017-11-16 10:46:00 +01:00
Michael RICOIS
731857719b Temporary disable sensefuel display 2017-11-16 10:32:18 +01:00
Michael RICOIS
68744ae6e0 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop 2017-11-15 17:39:37 +01:00
Michael RICOIS
be2fff2665 Merge branch 'ticket-14698-sensefuel' into develop 2017-11-15 17:36:00 +01:00
Michael RICOIS
7ef207a6e3 Add README 2017-11-15 17:32:14 +01:00
Michael RICOIS
98f7319989 Intégration sensefuel 2017-11-15 17:31:44 +01:00
Michael RICOIS
5e678c403a Remove xml 2017-11-15 16:36:16 +01:00
Marion Muszynski
6c071a8163 Merge branch 'ticket-14747-SaleStats' into develop 2017-11-15 13:01:17 +01:00
Marion Muszynski
9bf6364b8a add supplier ref for sale stats BDC part 2017-11-15 13:01:03 +01:00
Michael RICOIS
71899c1dfb Original SenseFuel module 2017-11-15 12:47:01 +01:00
Marion Muszynski
d2acbed313 Merge branch 'ticket-14456-BugBaliseEd' into develop 2017-11-15 12:41:22 +01:00
Marion Muszynski
1aaea6641b fix for ed from es version 2017-11-15 12:41:02 +01:00
Marion Muszynski
9b9b88610c Merge branch 'feature/api_return_url_paypal' into 'master'
Adding param to return paypal url instead of redirecting user

See merge request dev-antadis/bebeboutik!5
2017-11-15 11:48:10 +01:00
Marion Muszynski
fde48c205b Merge branch 'feature/api_return_url_paypal' into develop 2017-11-15 11:44:31 +01:00