Marion Muszynski
|
21925a54ea
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-06 11:58:17 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
eebeaa26e8
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-31 17:00:14 +02:00 |
|
Marion Muszynski
|
b615e9eadb
|
addition of order return history
|
2017-05-31 16:58:27 +02:00 |
|
Marion Muszynski
|
518c5d4329
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-29 16:18:14 +02:00 |
|
Marion Muszynski
|
66dea81ece
|
addition of label generation to resend parcel
|
2017-05-29 16:17:54 +02:00 |
|
Marion Muszynski
|
8afad2627e
|
Merge branch 'ticket-12965-PreventRestokBraderie' into develop
|
2017-05-02 10:44:31 +02:00 |
|
Marion Muszynski
|
6b70af5e17
|
prevent restock when product is in braderie
|
2017-05-02 10:44:13 +02:00 |
|
Marion Muszynski
|
f280695772
|
fix conflicts
|
2017-04-25 15:04:54 +02:00 |
|
Marion Muszynski
|
11790c0eff
|
prevent restockage when it s sent by philea
|
2017-04-25 15:03:41 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
c2cbe1347a
|
Merge branch 'ticket-12455-SAVjoinFile' into develop
|
2017-04-21 13:52:01 +02:00 |
|
Marion Muszynski
|
6b7d57bb43
|
show join file
|
2017-04-21 13:51:47 +02:00 |
|
Marion Muszynski
|
63fc399fbf
|
Merge branch 'ticket-12455-SAVjoinFile' into develop
|
2017-04-21 13:08:04 +02:00 |
|
Marion Muszynski
|
72a2a1f74f
|
save file name in db for mess
|
2017-04-21 13:07:45 +02:00 |
|
Marion Muszynski
|
f2273997dd
|
Merge branch 'ticket-13023-MultilangThumbCat' into develop
|
2017-04-18 12:48:57 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
d017974d15
|
fix link reply
|
2017-04-13 14:24:42 +02:00 |
|
Marion Muszynski
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
dac13d6486
|
fix when no customer but visitor
|
2017-04-10 17:05:01 +02:00 |
|
Marion Muszynski
|
60c76f16be
|
Merge branch 'ticket-12957-BugCustoms' into develop
|
2017-04-07 11:19:17 +02:00 |
|
Marion Muszynski
|
4aafc8ca10
|
fix
|
2017-04-07 11:18:57 +02:00 |
|
Marion Muszynski
|
946eec61cd
|
Merge branch 'ticket-12957-BugCustoms' into develop
|
2017-04-07 10:22:40 +02:00 |
|
Marion Muszynski
|
83bd4d15c3
|
fix insert product customs
|
2017-04-07 10:22:21 +02:00 |
|
Marion Muszynski
|
89f72c7045
|
Merge branch 'ticket-12462-returnMR'
|
2017-04-06 16:24:22 +02:00 |
|
Marion Muszynski
|
db4bc09667
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:18:31 +02:00 |
|
Marion Muszynski
|
db3f82675d
|
fix color
|
2017-04-06 16:18:12 +02:00 |
|
Marion Muszynski
|
6e1bbf4d95
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:10:42 +02:00 |
|
Marion Muszynski
|
2b861808e0
|
addition of conversation history in customer thread
|
2017-04-06 16:10:25 +02:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
7688c352e2
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:43:05 +01:00 |
|
Marion Muszynski
|
caa8a7a54f
|
fix size
|
2017-03-21 14:42:44 +01:00 |
|
Marion Muszynski
|
2e3d56135e
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:40:02 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
0aef5e434f
|
fix conflicts
|
2017-03-21 13:29:38 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
6b4b4c59ae
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-21 11:22:44 +01:00 |
|
Marion Muszynski
|
db43bc59df
|
modification of instructions
|
2017-03-21 11:22:28 +01:00 |
|
Marion Muszynski
|
031d187ba7
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:49:51 +01:00 |
|
Marion Muszynski
|
29d133070d
|
fix re-sending return instructions
|
2017-03-07 17:49:34 +01:00 |
|
Marion Muszynski
|
a2160cde3c
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:33:37 +01:00 |
|
Marion Muszynski
|
29a1b8a743
|
addition of button to resend return instruction
|
2017-03-07 17:33:22 +01:00 |
|
Marion Muszynski
|
b2b75a6fca
|
addition of MR and title/alias fix
|
2017-03-06 12:54:14 +01:00 |
|
Marion Muszynski
|
a6fe73118a
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-03 13:21:23 +01:00 |
|