root
|
84414c3d66
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-06 11:58:34 +02:00 |
|
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 |
|
root
|
2e97e43ae0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:20:51 +02:00 |
|
Marion Muszynski
|
ff69aa7935
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:20:41 +02:00 |
|
Marion Muszynski
|
3d6388f298
|
fixes
|
2017-06-02 11:20:27 +02:00 |
|
root
|
6ade521b6a
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:16:52 +02:00 |
|
Marion Muszynski
|
785a651dfb
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:16:41 +02:00 |
|
Marion Muszynski
|
efa31b77fa
|
fix
|
2017-06-02 11:16:25 +02:00 |
|
root
|
d0b2205675
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-02 11:15:25 +02:00 |
|
Marion Muszynski
|
f17c39cf53
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-02 11:14:45 +02:00 |
|
Marion Muszynski
|
ec41497ea4
|
ended return after resending
|
2017-06-02 11:14:25 +02:00 |
|
root
|
f492ee3100
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:59:50 +02:00 |
|
Marion Muszynski
|
0cde6166bb
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:59:39 +02:00 |
|
Marion Muszynski
|
2395374281
|
checked cdc for es version
|
2017-06-01 12:59:00 +02:00 |
|
root
|
6bd234cbe2
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:53:39 +02:00 |
|
Marion Muszynski
|
2ba4eb0a09
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:53:29 +02:00 |
|
Marion Muszynski
|
221bc66f44
|
modif for carrier logo
|
2017-06-01 12:53:13 +02:00 |
|
root
|
b89a5ed2e0
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 12:27:38 +02:00 |
|
Marion Muszynski
|
fc042bbd16
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:27:24 +02:00 |
|
Marion Muszynski
|
d97e11d79c
|
change logo and fix colissimo choice in carrier step
|
2017-06-01 12:26:41 +02:00 |
|
root
|
5559a3f253
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-06-01 10:54:42 +02:00 |
|
Marion Muszynski
|
1364d1214a
|
Merge branch 'fix-OnCustomerRemoving'
|
2017-06-01 10:54:00 +02:00 |
|
Marion Muszynski
|
dc0ff8e9b6
|
Merge branch 'fix-OnCustomerRemoving' into develop
|
2017-06-01 10:53:25 +02:00 |
|
Marion Muszynski
|
abe46bae6c
|
set id_customer to 0 on SAV when customer is removing
|
2017-06-01 10:53:07 +02:00 |
|
root
|
88f8ea9c57
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-31 17:00:45 +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 |
|
root
|
4a8b0633de
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-29 16:18:40 +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 |
|
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 |
|
root
|
52e544cb7d
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-18 13:03:21 +02:00 |
|
Marion Muszynski
|
8a5aba0f36
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-18 13:02:56 +02:00 |
|
Marion Muszynski
|
9625e2eb9e
|
continuing
|
2017-05-18 13:02:35 +02:00 |
|
root
|
237d078671
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-05-17 17:25:27 +02:00 |
|
Marion Muszynski
|
a0d6001ec6
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-17 17:25:04 +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 |
|
Marion Muszynski
|
ff124b514a
|
fix bg in lp
|
2017-05-17 16:48:11 +02:00 |
|
Marion Muszynski
|
487a5c4c00
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:39:34 +02:00 |
|
Marion Muszynski
|
14aa04ee1d
|
fix length
|
2017-05-17 16:39:22 +02:00 |
|
Marion Muszynski
|
c8f5eb8273
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:36:46 +02:00 |
|
Marion Muszynski
|
49137526de
|
fix
|
2017-05-17 16:36:35 +02:00 |
|