240 Commits

Author SHA1 Message Date
Michael RICOIS
cc26558cae Mail language 2017-11-29 12:22:58 +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
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
root
78bd7eb479 fixes from prod 2017-11-23 15:05:07 +01:00
Marion Muszynski
577323636c fix email address when letters are missing 2017-11-21 17:38:25 +01:00
Marion Muszynski
a9a557adf9 show if order comes from api or website 2017-11-20 11:32:59 +01:00
Christophe LATOUR
60b585feaf Unique cart between web and application 2017-11-17 12:55:17 +01:00
Christophe LATOUR
d24b02706e Fix secure_key error 2017-11-17 10:47:51 +01:00
Michael RICOIS
98f7319989 Intégration sensefuel 2017-11-15 17:31:44 +01:00
Michael RICOIS
339e5b4b18 Add function to detect request from api 2017-11-13 11:13:45 +01:00
Michael RICOIS
7c2864d4a1 Fix forget check 2017-11-06 12:25:16 +01:00
Marion Muszynski
96a0f240f2 Merge branch 'add-CacheRedis' 2017-10-25 14:31:25 +02:00
root
9c97f5ff94 fix and translation from prod 2017-10-18 12:10:35 +02:00
Marion Muszynski
ff34c7b32e add mr and dropshipping sended check for invoice 2017-10-12 15:03:08 +02:00
Marion Muszynski
5600a6da36 fix returnable qty 2017-10-11 16:14:59 +02:00
Marion Muszynski
e7af6fd655 limit address characters 2017-10-09 16:00:13 +02:00
Marion Muszynski
73e88054bd fix when customer is deleted 2017-10-04 12:58:54 +02:00
Marion Muszynski
d762e3e613 fix delete thumb image when uploading image cat 2017-10-04 11:06:59 +02:00
Marion Muszynski
cab30809b1 add option to load the good db for redis 2017-09-25 12:24:44 +02:00
Marion Muszynski
801cb2af23 add delete function for category mobile image 2017-09-25 10:59:34 +02:00
Marion Muszynski
4b985fb501 Merge branch 'ticket-13943-ResetBOpassword' 2017-09-21 15:40:57 +02:00
Marion Muszynski
c962994c82 Merge branch 'ticket-14161-UncombinableSale' 2017-09-20 16:53:52 +02:00
Michael RICOIS
e35c4042ad Forget Category override 2017-09-18 17:49:08 +02:00
Marion Muszynski
2c4ff88262 fix 2017-09-18 11:51:23 +02:00
Marion Muszynski
0f5228f6e8 update error mess from add to cart 2017-09-18 11:47:26 +02:00
Marion Muszynski
d8c2c369c9 reset password 2017-09-18 11:00:12 +02:00
Marion Muszynski
ff0a9dd73a fix 2017-09-13 10:48:03 +02:00
Marion Muszynski
783d5c55e8 add exception to best seller query 2017-09-13 10:43:23 +02:00
Marion Muszynski
4435a061e2 add cacheRedis 2017-09-12 11:13:43 +02:00
Marion Muszynski
7b72d11da9 start of cacheRedis 2017-09-07 11:30:57 +02:00
root
61ed06dc22 Revert "Revert "fix from prod""
This reverts commit 38a13c74d6e654a40632251017e8e60e1bc709d3.
2017-09-01 11:22:11 +02:00
root
38a13c74d6 Revert "fix from prod"
This reverts commit cd44650b28c6a00c47aa3079863fdc5c28fdcc33.
2017-09-01 11:16:02 +02:00
root
cd44650b28 fix from prod 2017-09-01 11:06:24 +02:00
Marion Muszynski
a76dd668fe addition of resetbopassword module 2017-08-28 14:30:30 +02:00
Marion Muszynski
6caf8fbd99 fix 2017-08-25 10:54:46 +02:00
Marion Muszynski
b46e35c500 indication of order carrier in order list 2017-08-25 10:44:59 +02:00
Marion Muszynski
a4853d9043 updating Mail alert module 2017-08-22 11:30:56 +02:00
Marion Muszynski
13576c64d8 fix conflicts 2017-08-21 11:04:16 +02:00
Marion Muszynski
851ff949be Merge branch 'ticket-13225-SpecificDelivery' 2017-08-21 10:46:55 +02:00
Marion Muszynski
a1b13d71cc add mr shipping number in order detail tpl 2017-08-18 11:18:06 +02:00
Marion Muszynski
abd8e88343 addition of new delivery delay and cleaning of sale combination 2017-08-17 11:22:54 +02:00
Marion Muszynski
889259d031 fix async bug for saving gift message of cart 2017-08-16 11:04:23 +02:00
Marion Muszynski
4acbde0319 add module alerthack to prevent hacker to post 2017-07-26 11:09:47 +02:00
Marion Muszynski
0e5cbb2638 fix cart 2017-07-18 10:18:38 +02:00
Marion Muszynski
1084d47e72 fix validate gift message 2017-07-18 10:06:57 +02:00
Marion Muszynski
adf8bc8185 add module custom group 2017-07-12 17:14:30 +02:00
Marion Muszynski
deef10a0b2 update and fix braderie 2017-07-10 14:11:35 +02:00
Marion Muszynski
d775d69d33 fix mobile back from product 2017-07-07 11:03:51 +02:00