Marion Muszynski
|
c33ade1b1c
|
addition of refund description
|
2017-06-08 17:07:36 +02:00 |
|
Marion Muszynski
|
0ddbca1945
|
Merge branch 'ticket-13166-ReturnProcess_2'
|
2017-06-08 16:05:39 +02:00 |
|
Marion Muszynski
|
b954a729a4
|
addition of return comment
|
2017-06-08 16:05:19 +02:00 |
|
Marion Muszynski
|
f1f9bfef4b
|
Merge branch 'ticket-9103-TradCategoryscroll'
|
2017-06-08 15:41:39 +02:00 |
|
Marion Muszynski
|
58aafd79c1
|
fix trad mobile
|
2017-06-08 15:41:22 +02:00 |
|
Marion Muszynski
|
a1accd6814
|
Merge branch 'ticket-9103-TradCategoryscroll'
|
2017-06-08 13:10:01 +02:00 |
|
Marion Muszynski
|
7d1934296b
|
fix translation module categoryscroll
|
2017-06-08 13:06:19 +02:00 |
|
Marion Muszynski
|
6d4cf5d1bd
|
fill and translate meta auto
|
2017-06-08 12:23:30 +02:00 |
|
Marion Muszynski
|
732dde9165
|
Merge branch 'ticket-9103-saleBg'
|
2017-06-08 11:52:49 +02:00 |
|
Marion Muszynski
|
35bcc57509
|
upload fr img for es when only fr sale bg is loaded
|
2017-06-08 11:51:34 +02:00 |
|
Marion Muszynski
|
0fc01207fc
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:30:50 +02:00 |
|
Marion Muszynski
|
98ddbdd50f
|
add possibility to resend all order products
|
2017-06-07 15:30:36 +02:00 |
|
Marion Muszynski
|
3f19e5c5cd
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 15:07:34 +02:00 |
|
Marion Muszynski
|
bed6683539
|
fix and add shipping number list in order
|
2017-06-07 15:07:19 +02:00 |
|
Marion Muszynski
|
6b8b75c74d
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-07 12:01:34 +02:00 |
|
Marion Muszynski
|
e5266e5bbf
|
fix missing functions and color return product
|
2017-06-07 12:01:15 +02:00 |
|
Marion Muszynski
|
8f83232c06
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-07 10:21:36 +02:00 |
|
Marion Muszynski
|
1646e22344
|
addition of script for expected stock
|
2017-06-07 10:21:15 +02:00 |
|
Marion Muszynski
|
b9e1f91c85
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:19:54 +02:00 |
|
Marion Muszynski
|
06054727e0
|
reverse order of returns
|
2017-06-06 12:19:05 +02:00 |
|
Marion Muszynski
|
c5f4008314
|
Merge branch 'ticket-13166-ReturnProcess'
|
2017-06-06 12:00:59 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
6707cbb33e
|
Merge branch 'fix-cookieMobile'
|
2017-06-02 15:19:21 +02:00 |
|
Marion Muszynski
|
043cfee852
|
fix cookie close bug on mobile
|
2017-06-02 15:19:06 +02:00 |
|
Marion Muszynski
|
3d6388f298
|
fixes
|
2017-06-02 11:20:27 +02:00 |
|
Marion Muszynski
|
efa31b77fa
|
fix
|
2017-06-02 11:16:25 +02:00 |
|
Marion Muszynski
|
ec41497ea4
|
ended return after resending
|
2017-06-02 11:14:25 +02:00 |
|
Marion Muszynski
|
076d725227
|
Merge branch 'fix-CarrierLogo'
|
2017-06-02 10:21:24 +02:00 |
|
Marion Muszynski
|
cfe960cfa2
|
fix logo carrier when it is a dropshipping
|
2017-06-02 10:21:06 +02:00 |
|
root
|
38827b2287
|
fix from prod
|
2017-06-01 17:47:41 +02:00 |
|
Marion Muszynski
|
cec9908432
|
Merge branch 'fix-carriers'
|
2017-06-01 17:44:56 +02:00 |
|
Marion Muszynski
|
a04ec97082
|
fix
|
2017-06-01 17:44:43 +02:00 |
|
Marion Muszynski
|
3324df2b5d
|
Merge branch 'ticket-13306-ModifES'
|
2017-06-01 13:24:19 +02:00 |
|
Marion Muszynski
|
2395374281
|
checked cdc for es version
|
2017-06-01 12:59:00 +02:00 |
|
Marion Muszynski
|
221bc66f44
|
modif for carrier logo
|
2017-06-01 12:53:13 +02:00 |
|
Marion Muszynski
|
d97e11d79c
|
change logo and fix colissimo choice in carrier step
|
2017-06-01 12:26:41 +02:00 |
|
Marion Muszynski
|
1364d1214a
|
Merge branch 'fix-OnCustomerRemoving'
|
2017-06-01 10:54:00 +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
|
b615e9eadb
|
addition of order return history
|
2017-05-31 16:58:27 +02:00 |
|
Marion Muszynski
|
66dea81ece
|
addition of label generation to resend parcel
|
2017-05-29 16:17:54 +02:00 |
|
root
|
f2e1d87de9
|
fix payment paybox with new error code from prod
|
2017-05-24 12:04:47 +02:00 |
|
Marion Muszynski
|
6bedf15606
|
Merge branch 'ticket-12462-fixReturn'
|
2017-05-24 10:12:31 +02:00 |
|
Marion Muszynski
|
e59142f7ce
|
fix qty returnable for philea
|
2017-05-24 10:12:15 +02:00 |
|
Marion Muszynski
|
4e3d2c5b88
|
Merge branch 'ticket-13335-fixBulkupdate'
|
2017-05-23 11:32:19 +02:00 |
|
Marion Muszynski
|
36b9b16d8a
|
fix when we want to export by date
|
2017-05-23 11:32:01 +02:00 |
|
Marion Muszynski
|
9625e2eb9e
|
continuing
|
2017-05-18 13:02:35 +02:00 |
|
Marion Muszynski
|
ef732eb1c5
|
start of resend parcel part
|
2017-05-17 17:24:47 +02:00 |
|
Marion Muszynski
|
0cd37b3fe8
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:51:18 +02:00 |
|
Marion Muszynski
|
a13fe6f2ad
|
fix
|
2017-05-17 16:51:05 +02:00 |
|
Marion Muszynski
|
fd1a80a401
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:48:24 +02:00 |
|