Commit Graph

117 Commits

Author SHA1 Message Date
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
d762e3e613 fix delete thumb image when uploading image cat 2017-10-04 11:06:59 +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
Michael RICOIS
e35c4042ad Forget Category override 2017-09-18 17:49:08 +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
root
61ed06dc22 Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
2017-09-01 11:22:11 +02:00
root
38a13c74d6 Revert "fix from prod"
This reverts commit cd44650b28.
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
13576c64d8 fix conflicts 2017-08-21 11:04:16 +02:00
Marion Muszynski
889259d031 fix async bug for saving gift message of cart 2017-08-16 11:04:23 +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
13b68d20ae moving gift message to shopping cart step 2017-06-30 12:57:06 +02:00
Marion Muszynski
86ccf2ef15 check if customer already exists to prevent fb tracking resending for registration 2017-06-19 11:05:46 +02:00
Marion Muszynski
abe46bae6c set id_customer to 0 on SAV when customer is removing 2017-06-01 10:53:07 +02:00
Marion Muszynski
e59142f7ce fix qty returnable for philea 2017-05-24 10:12:15 +02:00
Marion Muszynski
d72262dd99 add override employee 2017-04-13 13:01:51 +02:00
Marion Muszynski
8f62586369 fix conflict 2017-04-11 12:08:19 +02:00
Marion Muszynski
89f72c7045 Merge branch 'ticket-12462-returnMR' 2017-04-06 16:24:22 +02:00
Marion Muszynski
2b861808e0 addition of conversation history in customer thread 2017-04-06 16:10:25 +02:00
Marion Muszynski
33cd9f3d08 continuation 2017-03-09 11:37:44 +01:00
Marion Muszynski
f1e3151dac fix ssl 2017-03-09 10:53:26 +01:00
Marion Muszynski
8051a5e9c2 fix redirect loop 2017-03-08 18:05:04 +01:00
Marion Muszynski
0658afedc6 other fixes 2017-03-08 17:50:41 +01:00
Marion Muszynski
6a02d5ae5c add getPageLinkSsl 2017-03-08 17:35:26 +01:00
Marion Muszynski
ebcf6fe55b fix useSSL 2017-03-08 17:27:37 +01:00
Marion Muszynski
9581b90d6c fix protocol 2017-03-08 17:19:26 +01:00
Marion Muszynski
2e6e1d23ec start of changement to full https 2017-03-08 16:10:35 +01:00
Marion Muszynski
ee271d98c8 continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA 2017-03-07 13:25:46 +01:00
Marion Muszynski
2837aea4a5 addition of picto for random product 2017-02-21 11:49:55 +01:00
Marion Muszynski
0bc72ecb87 Merge branch 'ticket-10393' 2017-02-08 14:49:31 +01:00
Marion Muszynski
3b7bde22db addition of mondial relay return process in adminOrder 2017-02-06 16:07:35 +01:00
Marion Muszynski
25447fd61a addition of discount category checking 2017-01-30 15:08:10 +01:00
Marion Muszynski
8204486942 update cron and mail conf_order 2017-01-26 15:32:22 +01:00
Marion Muszynski
c75ac311d8 fix paymentModule 2017-01-12 14:31:57 +01:00
Marion Muszynski
9b2f18c2ef fix wsu laposte, addition in adminLogistics and ajax for MR 2017-01-12 13:03:48 +01:00
Marion Muszynski
4716b247d9 fix 2017-01-11 18:26:36 +01:00
Marion Muszynski
092a1b169b fix 2017-01-11 18:11:29 +01:00
Marion Muszynski
262cac694a change message in mail order_conf 2017-01-11 18:02:31 +01:00
Marion Muszynski
80e0bffe4f fix for dev 2017-01-11 16:58:05 +01:00
Marion Muszynski
c4cbe24bb5 addition of crons and admin_order tpl for Mondial Relay 2017-01-11 15:53:24 +01:00
Marion Muszynski
a29a54f41e addition of new discount of 5 for missing product 2017-01-09 12:03:58 +01:00
Marion Muszynski
228798b4e1 upgrade limit max char for order messages 2017-01-09 10:16:10 +01:00