Commit Graph

2851 Commits

Author SHA1 Message Date
Michael RICOIS
56806d37df Style to display background 2017-11-22 13:03:23 +01:00
Michael RICOIS
60f7126f42 Background 2017-11-22 12:48:38 +01:00
Michael RICOIS
364d14e73c Change display condition 2017-11-22 12:37:10 +01:00
Nolwenn J
bfae062c0c mails fixs 2017-11-22 11:33:50 +01:00
Nolwenn J
b46cf8580d fix mail es 2017-11-22 11:12:27 +01:00
Nolwenn J
2724d07b5b mails 2017-11-22 11:08:26 +01:00
Nolwenn J
bbeef7850d fix 2017-11-22 10:46:35 +01:00
Marion Muszynski
577323636c fix email address when letters are missing 2017-11-21 17:38:25 +01:00
Michael RICOIS
1934b07945 Image white_magnifier 2017-11-21 15:22:17 +01:00
Michael RICOIS
0e97f87299 Hook sensefuel 2017-11-21 14:55:52 +01:00
Marion Muszynski
b1b63b937d order comes from appli information 2017-11-21 14:28:24 +01:00
Marion Muszynski
f567423f9b Merge branch 'fix-cache-privatesale_family_menu' 2017-11-21 14:14:42 +01:00
Marion Muszynski
da6a162fe6 fix 2017-11-21 14:12:21 +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
ac1e7b89ee Fix breadcrumb 2017-11-21 11:13:15 +01:00
Michael RICOIS
3a058c3096 Merge branch 'ticket-14525-parrain' 2017-11-21 10:37:22 +01:00
Michael RICOIS
e580048c80 Fix condition to update properly sponsor with order or not 2017-11-21 10:35:23 +01:00
Nolwenn J
b9025b2883 chge image pour eviter les caches gmail 2017-11-21 10:31:13 +01:00
Michael RICOIS
6f35329b24 Force adding categories (product_type) 2017-11-21 10:23:53 +01:00
Marion Muszynski
331d3f6ded Merge branch 'fix-cache-privatesale_family_menu' 2017-11-21 10:22:46 +01:00
Marion Muszynski
acbc72a32c fix name of key 2017-11-21 10:21:19 +01:00
Nolwenn J
8c420adee9 mails 2017-11-20 18:54:42 +01:00
Marion Muszynski
b6283cf4ae fix futur sale query 2017-11-20 17:21:20 +01:00
Marion Muszynski
446308d40c cache privatesale menu 2017-11-20 17:12:58 +01:00
Nolwenn J
0b6c2a1533 fixs 2017-11-20 16:59:01 +01:00
Marion Muszynski
9675dabe18 Merge branch 'ticket-14716-AppData' 2017-11-20 11:36:08 +01:00
Marion Muszynski
a9a557adf9 show if order comes from api or website 2017-11-20 11:32:59 +01:00
Michael RICOIS
d593832d38 Image recherche sensefuel 2017-11-20 11:19:10 +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
Marion Muszynski
ac0ef73170 Merge branch 'feature/unique_cart_web_and_app' into 'master'
Unique cart between web and application

See merge request dev-antadis/bebeboutik!8
2017-11-20 10:27:08 +01:00
Nolwenn J
7d96ec78d4 fix alt 2017-11-17 14:36:23 +01:00
Nolwenn J
ea53eafe93 fixs 2017-11-17 12:58:36 +01:00
Christophe LATOUR
60b585feaf Unique cart between web and application 2017-11-17 12:55:17 +01:00
Marion Muszynski
5a9d780365 add 2 columns to excel 2017-11-17 11:16:30 +01:00
Marion Muszynski
3c838aa55c Merge branch 'fix/secure_key' into 'master'
Fix secure_key error

See merge request dev-antadis/bebeboutik!7
2017-11-17 10:53:38 +01:00
Christophe LATOUR
d24b02706e Fix secure_key error 2017-11-17 10:47:51 +01:00
Marion Muszynski
5e4e91791a Merge branch 'fix/PDF_send_mail_after_order' into 'master'
fix error 500 (after validate order -> create pdf invoice) :

See merge request dev-antadis/bebeboutik!6
2017-11-17 10:33:52 +01:00
Christophe LATOUR
039ec2b225 fix 500 :
[Thu Nov 16 14:44:30.387531 2017] [:error] [pid 1123] [client 82.229.2.146:56843] exception 'ErrorException' with message 'Undefined offset: 1' in /home/www/bebeboutik.com/www/classes/PDF.php:552
2017-11-16 16:55:03 +01:00
Michael RICOIS
150d86bc96 Merge branch 'ticket-14698-sensefuel' 2017-11-16 10:50:19 +01:00
Nolwenn J
15425cb5de fixs 2017-11-16 10:43:55 +01:00
Michael RICOIS
731857719b Temporary disable sensefuel display 2017-11-16 10:32:18 +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
c612d06c8f Merge branch 'ticket-14747-SaleStats' 2017-11-15 13:02:08 +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
522070b6da Merge branch 'ticket-14456-BugBaliseEd' 2017-11-15 12:41:52 +01:00