Marion Muszynski
|
965eab38e3
|
coloring background in white
|
2017-09-12 12:08:18 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
b2e52a6c1b
|
fix bad link in menu
|
2017-08-30 10:03:09 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
1a38af23c7
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 13:08:33 +02:00 |
|
Marion Muszynski
|
b2aeb501e3
|
simple cot
|
2017-08-22 13:08:19 +02:00 |
|
Marion Muszynski
|
f2612bf9dd
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 13:02:31 +02:00 |
|
Marion Muszynski
|
5afb4d3552
|
fix space
|
2017-08-22 13:02:18 +02:00 |
|
Marion Muszynski
|
acfb1da3ad
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 12:58:46 +02:00 |
|
Marion Muszynski
|
38e6d5a7e9
|
add specific description in product tpl
|
2017-08-22 12:58:28 +02:00 |
|
Marion Muszynski
|
13576c64d8
|
fix conflicts
|
2017-08-21 11:04:16 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|
Marion Muszynski
|
a1b13d71cc
|
add mr shipping number in order detail tpl
|
2017-08-18 11:18:06 +02:00 |
|
Marion Muszynski
|
47965cf5ed
|
fix go next
|
2017-08-17 16:03:52 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
945db4ad17
|
change mobile logo according language
|
2017-08-16 15:03:23 +02:00 |
|
Marion Muszynski
|
889259d031
|
fix async bug for saving gift message of cart
|
2017-08-16 11:04:23 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
1084d47e72
|
fix validate gift message
|
2017-07-18 10:06:57 +02:00 |
|
Marion Muszynski
|
e2533c3033
|
add file upload on mobile contact form
|
2017-07-11 16:19:20 +02:00 |
|
Marion Muszynski
|
c94d2c4431
|
fix conflicts
|
2017-07-11 10:04:00 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
dee10d158c
|
fix alert
|
2017-07-06 17:50:10 +02:00 |
|
Marion Muszynski
|
92b2366ed1
|
fix
|
2017-07-06 17:30:16 +02:00 |
|
Marion Muszynski
|
5670e21fa3
|
continuation of moving message gift to shipping cart
|
2017-07-05 13:15:51 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
Marion Muszynski
|
d726131b76
|
css modification of similar product
|
2017-07-04 10:46:06 +02:00 |
|
Marion Muszynski
|
40fe9a97b8
|
fix css
|
2017-07-03 10:15:21 +02:00 |
|
Marion Muszynski
|
13b68d20ae
|
moving gift message to shopping cart step
|
2017-06-30 12:57:06 +02:00 |
|
Marion Muszynski
|
7a6771ba27
|
add javascript back to last page
|
2017-06-29 14:24:12 +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
|
407da54291
|
ready for first tests
|
2017-06-27 12:10:10 +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 |
|
Marion Muszynski
|
45431b2bb1
|
Merge branch 'ticket-13550-FixPayboxDirect'
|
2017-06-23 10:19:38 +02:00 |
|
Marion Muszynski
|
6c4f773c7c
|
addition of promo on mobile
|
2017-06-22 17:34:21 +02:00 |
|
Marion Muszynski
|
4572379dfc
|
fix multi paiement and css
|
2017-06-22 16:53:29 +02:00 |
|
Marion Muszynski
|
86ccf2ef15
|
check if customer already exists to prevent fb tracking resending for registration
|
2017-06-19 11:05:46 +02:00 |
|
Marion Muszynski
|
96b66b0eae
|
fix translation
|
2017-06-14 11:57:18 +02:00 |
|
Marion Muszynski
|
904f9865e7
|
fix price tax on product page add to cart box
|
2017-06-14 10:58:27 +02:00 |
|
Marion Muszynski
|
58aafd79c1
|
fix trad mobile
|
2017-06-08 15:41:22 +02:00 |
|
Marion Muszynski
|
7d1934296b
|
fix translation module categoryscroll
|
2017-06-08 13:06:19 +02:00 |
|
Marion Muszynski
|
043cfee852
|
fix cookie close bug on mobile
|
2017-06-02 15:19:06 +02:00 |
|
Marion Muszynski
|
cfe960cfa2
|
fix logo carrier when it is a dropshipping
|
2017-06-02 10:21:06 +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
|
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 |
|
Marion Muszynski
|
e6a948861e
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:34:42 +02:00 |
|
Marion Muszynski
|
db786b07ca
|
fix name ps in home mobile
|
2017-05-17 16:34:26 +02:00 |
|
Marion Muszynski
|
633b163638
|
fix gclid in redirection
|
2017-05-17 16:04:42 +02:00 |
|
Marion Muszynski
|
6b058474c3
|
fix - prevent scroll on description short
|
2017-05-17 10:46:22 +02:00 |
|
Marion Muszynski
|
20bca1c110
|
fix mobile
|
2017-05-17 10:28:41 +02:00 |
|
Marion Muszynski
|
dc33a0af8c
|
some fixes
|
2017-05-16 11:35:03 +02:00 |
|
Nolwenn
|
900c528fcf
|
suite recette
|
2017-05-10 11:15:04 +02:00 |
|
Nolwenn
|
0d96ebce2c
|
truncate nom produit
|
2017-05-10 09:50:39 +02:00 |
|
Nolwenn
|
f77ecbda85
|
recette client mobile
|
2017-05-10 09:48:13 +02:00 |
|
root
|
b1082032a2
|
fix from prod
|
2017-05-09 15:54:17 +02:00 |
|
root
|
4c72d94cdf
|
fix from prod
|
2017-05-09 15:48:05 +02:00 |
|
root
|
652c005888
|
fix from prod
|
2017-05-09 15:30:32 +02:00 |
|
Marion Muszynski
|
68537be426
|
Merge branch 'mobile'
|
2017-05-09 14:46:10 +02:00 |
|
Marion Muszynski
|
de1c8e211e
|
addition of new landing page on home
|
2017-04-28 11:05:12 +02:00 |
|
Nolwenn
|
0d7c20c9d2
|
fixs
|
2017-04-27 17:00:47 +02:00 |
|
Nolwenn
|
b27f9ef4c3
|
mobile suite
|
2017-04-27 14:24:48 +02:00 |
|
Nolwenn
|
c33d9a9254
|
mobile suite
|
2017-04-26 17:15:51 +02:00 |
|
Nolwenn
|
ce5649b1f8
|
skin mobile home
|
2017-04-26 11:08:23 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
2d5c17ac1e
|
cleaning before merge
|
2017-04-20 10:50:15 +02:00 |
|
Marion Muszynski
|
a7394fdc93
|
fix bug when product is not found from filter options
|
2017-04-20 10:48:53 +02:00 |
|
Marion Muszynski
|
32e7d65395
|
fix block filter on scroll category
|
2017-04-20 09:47:13 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
66b25a2e07
|
remove quantity delete from cart and blockcart
|
2017-04-13 12:12:46 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
82e2916c8a
|
fix balise p tpl product
|
2017-03-29 15:01:17 +02:00 |
|
Marion Muszynski
|
b585f50621
|
addition of info sentence in product tpl
|
2017-03-29 11:37:34 +02:00 |
|
Marion Muszynski
|
bc8a76bb3d
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart'
|
2017-03-29 10:22:01 +02:00 |
|
Marion Muszynski
|
d060194a88
|
resize sub and add img
|
2017-03-29 10:20:00 +02:00 |
|
Marion Muszynski
|
b390e60aaa
|
changement img for qty up and down
|
2017-03-27 12:42:16 +02:00 |
|
Marion Muszynski
|
396444b912
|
Merge branch 'ticket-12487-HTTPS'
|
2017-03-27 11:28:22 +02:00 |
|
Marion Muszynski
|
9fc6235a0e
|
change sentences and link in order confirmation tpl
|
2017-03-23 15:30:33 +01:00 |
|
Marion Muszynski
|
6f501e8c42
|
fix trad
|
2017-03-23 15:19:18 +01:00 |
|
Marion Muszynski
|
e9aec9809c
|
opening in blockuserinfo
|
2017-03-22 17:11:46 +01:00 |
|
Marion Muszynski
|
2233093d7e
|
Mr fancy box css modif
|
2017-03-21 16:29:14 +01:00 |
|
Marion Muszynski
|
862850afa1
|
fix facebook link
|
2017-03-09 12:48:38 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
92c5988b96
|
differentiation of url order
|
2017-03-03 13:21:08 +01:00 |
|
Marion Muszynski
|
1aca7305b8
|
addition possibility to up/down or remove from blockcart list
|
2017-03-01 17:23:45 +01:00 |
|
Marion Muszynski
|
7a956baf2e
|
addition of sentence in blocktext2
|
2017-03-01 11:34:40 +01:00 |
|
Marion Muszynski
|
c17728cdfe
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-27 16:46:39 +01:00 |
|
Marion Muszynski
|
456c33e769
|
fix badge to have comment
|
2017-02-24 18:07:55 +01:00 |
|
Marion Muszynski
|
5b5e1933c4
|
changement position of badge
|
2017-02-24 14:20:53 +01:00 |
|
Marion Muszynski
|
c4edb90c2b
|
fix js tooltips in product-list
|
2017-02-23 15:37:06 +01:00 |
|
Marion Muszynski
|
3f23070f12
|
fix css tooltip
|
2017-02-23 15:21:42 +01:00 |
|
Marion Muszynski
|
17633b00f8
|
add picto in categoryscroll
|
2017-02-21 11:57:07 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
5159283a8a
|
making order choice required
|
2017-02-07 16:34:03 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +01:00 |
|
Marion Muszynski
|
217c96b383
|
fix css 2
|
2017-01-13 12:47:30 +01:00 |
|
Marion Muszynski
|
17bf597781
|
fix css
|
2017-01-13 12:42:49 +01:00 |
|
Marion Muszynski
|
5192561bac
|
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
|
2017-01-11 15:33:44 +01:00 |
|
Marion Muszynski
|
92bb810bb7
|
fix top again
|
2017-01-09 11:11:05 +01:00 |
|
Marion Muszynski
|
13f86ed0f5
|
fix top of add to cart popup
|
2017-01-09 10:44:12 +01:00 |
|
Marion Muszynski
|
9d79455930
|
fix trad
|
2016-12-21 12:50:35 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
809cc513a4
|
addition of delivery info in product tpl mobile version
|
2016-12-12 15:45:59 +01:00 |
|
Marion Muszynski
|
8c5dec2293
|
beginning
|
2016-12-09 15:26:22 +01:00 |
|
Marion Muszynski
|
ee8cd5807a
|
remove background of vp logo in product tpl
|
2016-12-07 15:39:03 +01:00 |
|
Marion Muszynski
|
655a7515d7
|
remove other personal datas
|
2016-12-06 12:07:23 +01:00 |
|
Marion Muszynski
|
a509d4f0ab
|
remove personal data in ga module
|
2016-12-06 11:53:34 +01:00 |
|
Marion Muszynski
|
22d5994ee4
|
remove console log
|
2016-12-06 11:48:56 +01:00 |
|
Marion Muszynski
|
82fdce66ce
|
remove personal data from url before sending to GA
|
2016-12-06 11:22:25 +01:00 |
|
Marion Muszynski
|
d3564a0a5e
|
addition of goggle tag manager code
|
2016-11-30 14:15:48 +01:00 |
|
Marion Muszynski
|
51e0ed8589
|
fix bug update product quantity in cart
|
2016-11-28 12:02:39 +01:00 |
|
Marion Muszynski
|
cfdab3cc09
|
error cause of id_product for product_id
|
2016-11-25 18:50:38 +01:00 |
|
Marion Muszynski
|
ddad6db847
|
fix tpl order-detail
|
2016-11-25 18:45:07 +01:00 |
|
Marion Muszynski
|
420f2d870c
|
fix trad
|
2016-11-25 10:56:23 +01:00 |
|
Marion Muszynski
|
5d963638fa
|
fix
|
2016-11-25 10:52:50 +01:00 |
|
Marion Muszynski
|
0e6992f29b
|
changement delivery date estimation
|
2016-11-25 10:49:10 +01:00 |
|
Marion Muszynski
|
ef27ddd7af
|
changement sentences according delivery delay
|
2016-11-24 11:59:20 +01:00 |
|
Marion Muszynski
|
4f9add049e
|
addition redirect to all forms
|
2016-11-15 11:48:52 +01:00 |
|
Marion Muszynski
|
a839bafd66
|
addition of redirection to the good form
|
2016-11-15 10:43:45 +01:00 |
|
Marion Muszynski
|
684d096c48
|
modif css and redirection to the good form
|
2016-11-15 10:28:52 +01:00 |
|
Marion Muszynski
|
2645434803
|
openning to customers
|
2016-11-14 14:38:23 +01:00 |
|
Marion Muszynski
|
a5629eb2c7
|
adjusting mobile version
|
2016-11-14 14:19:28 +01:00 |
|
Marion Muszynski
|
04b5314a96
|
change logo width on mobile version
|
2016-11-10 12:30:51 +01:00 |
|
Marion Muszynski
|
57c1043e3a
|
small fix
|
2016-11-07 15:43:36 +01:00 |
|
Marion Muszynski
|
962fac493e
|
fixin product tpl
|
2016-11-07 15:41:52 +01:00 |
|
Marion Muszynski
|
ef7467f787
|
addition of a new delay for xmas
|
2016-11-07 15:28:43 +01:00 |
|
Marion Muszynski
|
10c666cc1b
|
Merge branch 'ticket-ChangeDeliveryAddress'
|
2016-11-07 10:59:02 +01:00 |
|
Marion Muszynski
|
3946f6ceac
|
fix conflict
|
2016-11-02 12:43:27 +01:00 |
|
Marion Muszynski
|
ede0f691a8
|
fix conflicts
|
2016-11-02 12:11:44 +01:00 |
|
Marion Muszynski
|
cb3e299efc
|
addition of multi product choice
|
2016-10-24 18:33:51 +02:00 |
|
Marion Muszynski
|
ab39335846
|
integration of enhanced ecommerce on mobile version
|
2016-10-19 16:23:01 +02:00 |
|
Marion Muszynski
|
5f8d23c3b1
|
open save paypal
|
2016-10-18 13:02:35 +02:00 |
|