Michael RICOIS
|
580621fc43
|
cli to send reminder mail
|
2017-11-29 11:12:32 +01:00 |
|
Michael RICOIS
|
eae8fac9ea
|
Prepare mail template
|
2017-11-28 17:14:55 +01:00 |
|
Michael RICOIS
|
81ed63f2fb
|
Prepare script
|
2017-11-28 17:14:35 +01:00 |
|
Michael RICOIS
|
39d6b1659e
|
Merge branch 'ticket-14525-parrain'
|
2017-11-28 11:50:53 +01:00 |
|
Michael RICOIS
|
c6b1e3b1e3
|
Update if customer email is already sponsor before he's registring
|
2017-11-28 11:48:14 +01:00 |
|
Michael RICOIS
|
6c0ce3ca13
|
Merge branch 'ticket-14525-parrain'
|
2017-11-28 10:16:55 +01:00 |
|
Michael RICOIS
|
d4485178f0
|
Add error message
|
2017-11-28 10:11:34 +01:00 |
|
Marion Muszynski
|
50ad39bf5f
|
Merge branch 'feature/override_object_model' into 'master'
Feature/override object model
See merge request dev-antadis/bebeboutik!9
|
2017-11-27 11:46:14 +01:00 |
|
Marion Muszynski
|
74ef1e3173
|
Merge branch 'ticket-14829-FixEmails'
|
2017-11-27 10:45:22 +01:00 |
|
Marion Muszynski
|
1abc3499b9
|
Merge branch 'ticket-14836-refonteProductMobile'
|
2017-11-27 10:41:53 +01:00 |
|
Christophe LATOUR
|
8ef9b301ca
|
adding comment
|
2017-11-24 16:37:42 +01:00 |
|
Christophe LATOUR
|
283457bd5c
|
Overriding Objectmodel :
- replace self with static to be able to override displayFieldName
|
2017-11-24 16:24:38 +01:00 |
|
Marion Muszynski
|
1932ff578d
|
fix inte on product page
|
2017-11-23 17:08:29 +01:00 |
|
Marion Muszynski
|
64251e2fb9
|
addition of fonts
|
2017-11-23 16:49:57 +01:00 |
|
Marion Muszynski
|
cfed6df5d4
|
inte for site_mobile theme
|
2017-11-23 16:48:44 +01:00 |
|
root
|
59f0826643
|
fixes for philea from prod
|
2017-11-23 15:06:35 +01:00 |
|
root
|
78bd7eb479
|
fixes from prod
|
2017-11-23 15:05:07 +01:00 |
|
Marion Muszynski
|
4044bc329c
|
add email fixes
|
2017-11-23 11:10:24 +01:00 |
|
Marion Muszynski
|
3f9a62487a
|
Merge branch 'ticket-14436-WP'
|
2017-11-22 16:33:45 +01:00 |
|
Marion Muszynski
|
8ae9fb7dd2
|
fix
|
2017-11-22 16:31:51 +01:00 |
|
Marion Muszynski
|
577323636c
|
fix email address when letters are missing
|
2017-11-21 17:38:25 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|