Christophe Latour
|
adee1404d3
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-23 16:19:05 +02:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Christophe Latour
|
6e9d53cff3
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-19 18:11:43 +02:00 |
|
Marion Muszynski
|
7b78add4b8
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 18:11:33 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Christophe Latour
|
45258c7e10
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-19 17:16:24 +02:00 |
|
Marion Muszynski
|
5c7c20a708
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:16:13 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Christophe Latour
|
1abf2c6581
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-19 17:14:34 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Christophe Latour
|
eaf71bf77c
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-19 16:35:36 +02:00 |
|
Marion Muszynski
|
e6452dbab7
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-10-19 16:35:25 +02:00 |
|
Marion Muszynski
|
151c9a59c2
|
continuing of inte
|
2017-10-19 16:35:09 +02:00 |
|
Christophe Latour
|
4bf2989efe
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-19 15:41:02 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Christophe Latour
|
5189db1b08
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-17 11:34:46 +02:00 |
|
Marion Muszynski
|
508cf3359e
|
Merge branch 'ticket-14231-inteMobile'
|
2017-10-13 11:19:28 +02:00 |
|
Christophe Latour
|
73d9a6bcfd
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-13 11:18:09 +02:00 |
|
Marion Muszynski
|
f36495dcfb
|
Merge branch 'ticket-14231-inteMobile' into develop
|
2017-10-13 11:17:51 +02:00 |
|
Marion Muszynski
|
9823ff1d0b
|
inte order detail mobile
|
2017-10-13 11:17:27 +02:00 |
|
Marion Muszynski
|
b698be44f9
|
Merge branch 'ticket-14486-MRinvoice'
|
2017-10-12 15:05:04 +02:00 |
|
Christophe Latour
|
e6020ae11c
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-12 15:03:47 +02:00 |
|
Marion Muszynski
|
d38c7816ff
|
Merge branch 'ticket-14486-MRinvoice' into develop
|
2017-10-12 15:03:33 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Christophe Latour
|
d959f0c515
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-12 14:00:17 +02:00 |
|
Marion Muszynski
|
f33d4403a5
|
fix conflict
|
2017-10-12 13:59:34 +02:00 |
|
Marion Muszynski
|
13843bc270
|
integration for white bg
|
2017-10-12 13:58:41 +02:00 |
|
Marion Muszynski
|
1bc46e9610
|
Merge branch 'ticket-14447-AF'
|
2017-10-12 10:01:13 +02:00 |
|
Christophe Latour
|
6f4cf378db
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-12 09:59:16 +02:00 |
|
Marion Muszynski
|
abd2344c77
|
fix conflict
|
2017-10-12 09:58:55 +02:00 |
|
Marion Muszynski
|
8d0392bd44
|
fix pink color
|
2017-10-12 09:57:46 +02:00 |
|
Marion Muszynski
|
8b9c4b4812
|
Merge branch 'ticket-14460-BugReturnProcess'
|
2017-10-11 16:18:58 +02:00 |
|
Christophe Latour
|
b93e3951b1
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 16:16:53 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5600a6da36
|
fix returnable qty
|
2017-10-11 16:14:59 +02:00 |
|
Christophe Latour
|
b083d9a115
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 15:31:15 +02:00 |
|
Marion Muszynski
|
5c27461185
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:31:02 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Christophe Latour
|
864e9a8635
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 15:26:45 +02:00 |
|
Marion Muszynski
|
35848aba51
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:26:30 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Christophe Latour
|
3aabcd7210
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 13:30:05 +02:00 |
|
Marion Muszynski
|
33e179bb96
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 13:25:06 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|