Marion Muszynski
|
3a2438d01d
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:55:40 +02:00 |
|
Marion Muszynski
|
ac862f6d92
|
fix trusted badge
|
2017-07-10 15:54:46 +02:00 |
|
Marion Muszynski
|
0ac95d23a5
|
Merge branch 'ticket-13695-BugBraderie'
|
2017-07-10 15:29:57 +02:00 |
|
Marion Muszynski
|
ea25a41e2e
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:04:05 +02:00 |
|
Marion Muszynski
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +02:00 |
|
Marion Muszynski
|
ee1f66436c
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:39:00 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
84d7e1f715
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:15:35 +02:00 |
|
Marion Muszynski
|
dfe25a8005
|
show mr delivery address on invoice pdf
|
2017-07-07 12:15:20 +02:00 |
|
Marion Muszynski
|
71936e370d
|
Merge branch 'ticket-13661-mobileReturn'
|
2017-07-07 11:05:33 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
04ceecce9f
|
Merge branch 'ticket-13521-ExtractProducts'
|
2017-07-06 16:42:54 +02:00 |
|
Marion Muszynski
|
471b9a77e7
|
add link to download product base
|
2017-07-06 16:42:39 +02:00 |
|
Marion Muszynski
|
fd18fd3421
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-05 12:19:31 +02:00 |
|
Marion Muszynski
|
c4193b7119
|
hide error message after 4s
|
2017-07-05 12:19:14 +02:00 |
|
Marion Muszynski
|
4df600b0cc
|
add error message
|
2017-07-05 12:13:40 +02:00 |
|
Marion Muszynski
|
ec2f428160
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 17:51:54 +02:00 |
|
Marion Muszynski
|
a0e0aa7d71
|
change redirect
|
2017-07-04 17:51:34 +02:00 |
|
Marion Muszynski
|
91536bdb4d
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 16:23:26 +02:00 |
|
Marion Muszynski
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
root
|
383d48726c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-07-04 15:32:36 +02:00 |
|
root
|
dd218bb37a
|
push from prod
|
2017-07-04 15:32:17 +02:00 |
|
Marion Muszynski
|
0e9d19a20f
|
Merge branch 'ticket-11985-CarrierSelection'
|
2017-07-04 15:29:42 +02:00 |
|
Marion Muszynski
|
72965b110b
|
add auto carrier selection
|
2017-07-04 15:29:26 +02:00 |
|
Marion Muszynski
|
84e306d811
|
Merge branch 'ticket-12803-ModifSimilarProduct'
|
2017-07-04 15:02:39 +02:00 |
|
Marion Muszynski
|
18da9c8c75
|
change image size
|
2017-07-04 10:57:31 +02:00 |
|
Marion Muszynski
|
d726131b76
|
css modification of similar product
|
2017-07-04 10:46:06 +02:00 |
|
Marion Muszynski
|
967eac2c06
|
Merge branch 'ticket-13505-retourMobile'
|
2017-06-29 14:24:30 +02:00 |
|
Marion Muszynski
|
7a6771ba27
|
add javascript back to last page
|
2017-06-29 14:24:12 +02:00 |
|
Marion Muszynski
|
97ec91fdfa
|
Merge branch 'fix-deleteCustomer'
|
2017-06-28 15:01:13 +02:00 |
|
Marion Muszynski
|
c6c5ad32ca
|
fix delete customer
|
2017-06-28 15:00:53 +02:00 |
|
Marion Muszynski
|
b0eac9b37e
|
Merge branch 'ticket-13560-BannerMobile'
|
2017-06-28 12:45:38 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
0dc183b5a8
|
Merge branch 'ticket-13166-RetourProcess_3'
|
2017-06-27 10:12:40 +02:00 |
|
Marion Muszynski
|
db8e0ffcce
|
addition of selection by ean
|
2017-06-27 10:12:22 +02:00 |
|
Marion Muszynski
|
c4c8ca8ef6
|
Merge branch 'ticket-13166-RetourProcess_3'
|
2017-06-26 11:58:14 +02:00 |
|
Marion Muszynski
|
a2a0385822
|
upgrading of return process
|
2017-06-26 11:52:56 +02:00 |
|
Marion Muszynski
|
9c51d607c1
|
Merge branch 'ticket-13166-upgradeReturnPart2'
|
2017-06-23 12:28:05 +02:00 |
|
Marion Muszynski
|
2a5e3d861b
|
fix label
|
2017-06-23 12:27:50 +02:00 |
|
Marion Muszynski
|
5f28f49b51
|
modification reason,instruction and comment
|
2017-06-23 12:24:55 +02:00 |
|
Marion Muszynski
|
86c27e3ba3
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 11:01:01 +02:00 |
|
Marion Muszynski
|
94fe7668a4
|
add promo in sale page
|
2017-06-23 11:00:46 +02:00 |
|
Marion Muszynski
|
013edd892f
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 10:41:36 +02:00 |
|
Marion Muszynski
|
fd003a8443
|
add img promo
|
2017-06-23 10:41:25 +02:00 |
|
Marion Muszynski
|
2c78e0ac86
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 10:40:33 +02:00 |
|
Marion Muszynski
|
c44bcdb281
|
add promo es on mobile version
|
2017-06-23 10:40:19 +02:00 |
|