Marion Muszynski
076e581fbc
fix conflict
2016-09-21 16:41:53 +02:00
Marion Muszynski
652c5c2278
add waiting box
2016-09-21 16:40:26 +02:00
Marion Muszynski
74678f3a50
fix
2016-09-21 16:28:57 +02:00
Marion Muszynski
b26fefd0f3
fix conflict
2016-09-21 16:24:32 +02:00
Marion Muszynski
2cde4025ac
add loader for paybox direct payment
2016-09-21 16:21:32 +02:00
Marion Muszynski
338da7eb3f
Merge branch 'ticket-GAnalytics' into develop
2016-09-21 16:09:14 +02:00
Marion Muszynski
3b855c7ad9
ec continuation, addition of addToCart event
2016-09-21 16:08:54 +02:00
Marion Muszynski
8df4bed44a
continuation
2016-09-21 14:29:34 +02:00
Marion Muszynski
9673ff3805
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 18:00:48 +02:00
Marion Muszynski
870331cd10
modification to send checkout process to GA
2016-09-20 18:00:18 +02:00
Marion Muszynski
cbcf90c0ec
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:50:04 +02:00
Marion Muszynski
65f7b71332
fix
2016-09-20 16:49:41 +02:00
Marion Muszynski
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
5cf235d874
addition of code ecommerce
2016-09-20 16:47:05 +02:00
Marion Muszynski
a8086dcfdc
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:55:24 +02:00
Marion Muszynski
85cc7b57dc
showing of comments for braderie on product page
2016-09-20 14:55:03 +02:00
Marion Muszynski
ed769a1749
start of ticket GA Enhanced Ecommerce
2016-09-19 18:47:37 +02:00
Marion Muszynski
5aac7f617b
Merge branch 'ticket-8048' into develop
2016-09-19 12:42:21 +02:00
Marion Muszynski
322e3d2729
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:12:56 +02:00
Marion Muszynski
95e044a365
adjusting css
2016-09-15 13:12:38 +02:00
Marion Muszynski
5a9c94e694
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:02:36 +02:00
Marion Muszynski
b83d7b994c
modification in paymentinfo tpl
2016-09-15 13:01:20 +02:00
Marion Muszynski
3e16557de0
Merge branch 'ticket-10883' into develop
2016-09-14 11:04:01 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +02:00
Marion Muszynski
e05ee41c73
Merge branch 'fix-css' into develop
2016-09-12 15:40:41 +02:00
Marion Muszynski
4581e8d20e
fix width of ps description
2016-09-12 15:40:23 +02:00
Marion Muszynski
eb5495cf15
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 14:37:52 +02:00
Marion Muszynski
fca308f3ae
modif css
2016-09-09 14:37:32 +02:00
Marion Muszynski
9e8c06d808
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:14:15 +02:00
Marion Muszynski
1b444a773f
css modif
2016-09-09 13:13:57 +02:00
Marion Muszynski
410ddb43b1
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:10:00 +02:00
Marion Muszynski
3d325dbc7c
small modif
2016-09-09 13:09:43 +02:00
Marion Muszynski
3c7e15e2c3
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:07:18 +02:00
Marion Muszynski
8074d6f063
modif css manage payments
2016-09-09 13:07:01 +02:00
Marion Muszynski
cb3b1de22c
fix to not escape html on vp description
2016-09-09 11:35:36 +02:00
Rodney Figaro
4ac6c52ec4
fix accessories missing after uninstalling the module
2016-09-08 13:24:49 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
40457d1935
Merge branch 'ticket-10296' into develop
2016-09-07 08:58:24 +02:00
Marion Muszynski
b6dc54c290
addition html2text for emarsys and vp description
2016-09-05 15:45:05 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
c9bdecd1d4
Merge branch 'ticket-9260' into develop
2016-08-31 15:35:29 +02:00
Marion Muszynski
5a8d3eb781
small fix
2016-08-31 15:35:09 +02:00
Marion Muszynski
b677946ca7
Merge branch 'ticket-10527'
2016-08-31 15:18:42 +02:00
Marion Muszynski
0221ccb2e7
Merge branch 'ticket-10527' into develop
2016-08-31 15:17:41 +02:00
Marion Muszynski
144733299c
up reassurance sentence at first place
2016-08-31 15:17:21 +02:00
Marion Muszynski
b809ee0c26
Merge branch 'fix-9890' into develop
2016-08-31 15:03:31 +02:00
Marion Muszynski
6ff4e35f7b
fix css
2016-08-31 15:03:11 +02:00
Marion Muszynski
72a0d2d3d7
Merge branch 'ticket-10527' into develop
2016-08-31 14:57:19 +02:00
Marion Muszynski
5c35c6431b
fix
2016-08-31 14:56:59 +02:00
Marion Muszynski
e0c4e0dfe6
Merge branch 'ticket-10527' into develop
2016-08-31 14:55:15 +02:00
Marion Muszynski
abdbb008b5
adding reassurance sentences in payment step
2016-08-31 14:54:30 +02:00
Marion Muszynski
742a8d1ca9
fix conflicts
2016-08-31 13:36:10 +02:00
Marion Muszynski
2dd1baef49
adding reassurance sentences for es
2016-08-31 13:32:59 +02:00
Marion Muszynski
afde5b69a7
Merge branch 'ticket_9890'
2016-08-31 12:19:57 +02:00
Marion Muszynski
1046fd27f2
Merge branch 'ticket_9890' into develop
2016-08-31 12:18:37 +02:00
Marion Muszynski
40c9fb6bff
fix
2016-08-31 12:18:17 +02:00
root
a2d5ed0a14
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
2016-08-31 11:09:42 +02:00
root
163411b776
modif trad
2016-08-31 11:08:56 +02:00
Marion Muszynski
bb5ff6ba97
fix conflicts
2016-08-31 11:04:16 +02:00
Marion Muszynski
c164e03c24
fix conflict
2016-08-31 10:37:12 +02:00
Marion Muszynski
8db5762b5b
modif css mobile
2016-08-31 10:35:33 +02:00
Marion Muszynski
563b9059de
Merge branch 'ticket-9260' into develop
2016-08-30 13:56:13 +02:00
Marion Muszynski
0dde6b5611
fix for old sales
2016-08-30 13:55:47 +02:00
Marion Muszynski
e2c867f5ed
Merge branch 'ticket-9260' into develop
2016-08-30 13:48:00 +02:00
Marion Muszynski
a96b0018c0
upload vp miniature in adminCategory
2016-08-30 13:47:42 +02:00
Marion Muszynski
93e464c78b
Merge branch 'ticket_9890' into develop
2016-08-26 17:16:42 +02:00
Marion Muszynski
0f85417eaf
modif css
2016-08-26 17:16:18 +02:00
Marion Muszynski
c45e018298
Merge branch 'ticket_9890' into develop
2016-08-26 17:08:53 +02:00
Marion Muszynski
bab94ab68b
fix and modif css
2016-08-26 17:08:28 +02:00
Marion Muszynski
cf8f32d6c1
Merge branch 'ticket-9895' into develop
2016-08-25 12:48:36 +02:00
Marion Muszynski
63ee2fb3c9
fix tpl product add to cart
2016-08-23 18:07:24 +02:00
Marion Muszynski
b963f91154
Merge branch 'evo-10581'
2016-08-23 15:22:25 +02:00
Marion Muszynski
343fc553aa
modif for prod
2016-08-23 15:21:43 +02:00
Marion Muszynski
cafdba6107
Merge branch 'ticket-8039'
2016-08-23 14:53:45 +02:00
Marion Muszynski
01e7bedfe9
small fix
2016-08-23 14:53:24 +02:00
Marion Muszynski
e5dbd10cef
Merge branch 'ticket-8039'
2016-08-23 14:50:53 +02:00
Marion Muszynski
52e59458d5
petit fix
2016-08-23 14:50:30 +02:00
Marion Muszynski
b3e04efabe
Merge branch 'evo-10581' into develop
2016-08-23 12:32:54 +02:00
Marion Muszynski
e02097858b
fix css conflicts
2016-08-23 12:31:28 +02:00
Rodney Figaro
b335e6adf1
fix original text in product info size in french rather than in spanish
2016-08-23 12:17:56 +02:00
Rodney Figaro
b95db0bb8c
change css of the size info popup for mobile version
2016-08-23 12:06:39 +02:00
Marion Muszynski
41845cd98d
Merge branch 'ticket-8039'
2016-08-23 11:12:04 +02:00
Marion Muszynski
fe434095da
modif for prod
2016-08-23 11:11:28 +02:00
Rodney Figaro
2a2949882d
display informations on sizes in product details
2016-08-23 10:33:48 +02:00
Marion Muszynski
2a82114fa9
fix conflict
2016-08-22 17:10:12 +02:00
root
880d16d5b0
updateprod
2016-08-18 15:56:46 +02:00
Marion Muszynski
8053859bf4
fix
2016-07-29 13:32:38 +02:00
Marion Muszynski
9d3083eb23
update carrier name when es
2016-07-29 13:31:12 +02:00
Marion Muszynski
2ab551f44a
fix conflict
2016-07-27 16:31:59 +02:00
Marion Muszynski
6711926ac3
fix conflicts
2016-07-25 15:26:26 +02:00
Marion Muszynski
0ccf7667a6
Merge branch 'ticket-deliveryDelay_cart' into develop
2016-07-25 12:20:03 +02:00
Marion Muszynski
e69073572e
modif date
2016-07-25 12:19:36 +02:00
Marion Muszynski
c809342939
Merge branch 'ticket-deliveryDelay_product' into develop
2016-07-25 12:06:23 +02:00
Marion Muszynski
f4f144057d
modif date calcul method to include we and check if the last day is a business day
2016-07-25 12:05:57 +02:00
Marion Muszynski
f1769755de
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-25 11:18:16 +02:00
Marion Muszynski
dd6a758e32
modif css
2016-07-25 11:17:40 +02:00
Marion Muszynski
a2e67137bf
Merge branch 'ticket-payboxAgreement' into develop
2016-07-18 11:45:49 +02:00
Marion Muszynski
fb51c877c4
suite save paybox info
2016-07-18 11:45:18 +02:00
Marion Muszynski
a21a7bbc0e
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-15 12:28:47 +02:00
Marion Muszynski
b8a4934278
adding delivery date estimation
2016-07-15 12:26:58 +02:00
Marion Muszynski
205a9c0aa2
Merge branch 'ticket-deliveryDelay_cart' into develop
2016-07-15 10:33:34 +02:00
Marion Muszynski
e07186fe27
modif css
2016-07-15 10:32:16 +02:00
Marion Muszynski
ba60aeacb9
Merge branch 'ticket-deliveryDelay_product' into develop
2016-07-15 10:21:51 +02:00
Marion Muszynski
6e14b286c2
update css
2016-07-15 10:21:24 +02:00
Marion Muszynski
64a8296a57
Merge branch 'ticket-deliveryDelay_cart' into develop
2016-07-13 17:41:53 +02:00
Marion Muszynski
a6ec43bb68
showing estimation delivery date in cart
2016-07-13 17:40:13 +02:00
Marion Muszynski
7fe43c37b0
fix conflict
2016-07-13 16:38:47 +02:00
Marion Muszynski
02af220b58
showing delivery delay estimation on product tpl
2016-07-13 16:37:00 +02:00
Marion Muszynski
370fb8dd18
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:39:52 +02:00
Marion Muszynski
e33d2da73d
adjusting for delivery delay part
2016-07-13 15:35:00 +02:00
Marion Muszynski
951ffd3e4b
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:17:13 +02:00
Marion Muszynski
dee3c2ba2c
ajusting css
2016-07-13 15:16:48 +02:00
Marion Muszynski
98b264471c
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:10:48 +02:00
Marion Muszynski
67314cbf25
hide bestsellers at payment step
2016-07-13 15:09:33 +02:00
Marion Muszynski
489b94cff5
suite block order summary
2016-07-12 14:50:52 +02:00
Dylan Travers
c2d4fb13c9
Show only if product.quantity > 0
2016-07-08 15:37:30 +02:00
Marion Muszynski
281e562edf
Merge branch 'ticket-10377' into develop
2016-07-06 11:18:41 +02:00
Marion Muszynski
0ee8479f3c
remove grey border on shipping menu of product tpl
2016-07-06 11:18:06 +02:00
Marion Muszynski
ff715abd60
Merge branch 'modif-css'
2016-07-01 16:44:13 +02:00
Marion Muszynski
47335062aa
Merge branch 'ticket-ecotax'
2016-07-01 12:27:13 +02:00
Marion Muszynski
1bb5ccc889
Merge branch 'modif-css' into develop
2016-07-01 11:29:20 +02:00
Marion Muszynski
6a87ea0460
modif add button
2016-07-01 11:29:00 +02:00
Marion Muszynski
c7aa42f883
fix conflict
2016-07-01 11:20:49 +02:00
Marion Muszynski
e40768c734
modif img reduction on product list
2016-07-01 11:18:52 +02:00
Marion Muszynski
155dd48cad
fix conflict
2016-07-01 11:02:09 +02:00
Srv Bebeboutik
c48e673922
fix prod
2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48
fix conflict
2016-06-30 11:15:14 +02:00
Marion Muszynski
e695afb543
Merge branch 'ticket-simplemulti_front' into develop
2016-06-30 10:48:06 +02:00
Marion Muszynski
f99cacd293
small update for mobile site
2016-06-30 10:47:46 +02:00
Marion Muszynski
e7f0c678de
fix conflict
2016-06-29 15:53:34 +02:00
Marion Muszynski
760bd50c06
adding sentence according delivery delay
2016-06-29 15:52:03 +02:00
Marion Muszynski
7fa45bf40f
Merge branch 'ticket-simplemulti_front' into develop
2016-06-29 09:59:37 +02:00
Marion Muszynski
20896d3bbf
adding popup error for mobile
2016-06-29 09:59:03 +02:00
Marion Muszynski
dd9831daa5
Merge branch 'ticket-blockbestsellerProduct'
2016-06-28 15:55:39 +02:00
Marion Muszynski
7f2ebe23f4
Merge branch 'ticket-simplemulti_front' into develop
2016-06-28 15:19:53 +02:00
Marion Muszynski
f8af1f0a71
modif tpl trad
2016-06-28 15:19:31 +02:00
Marion Muszynski
757c557a07
fix conflict
2016-06-28 14:47:38 +02:00
Marion Muszynski
8a0b80e15e
pop error cart
2016-06-28 14:45:48 +02:00
Dylan Travers
c3f3e05427
Change pink color and modify comportement (Use All_quantities and not product_quantity
2016-06-27 12:25:22 +02:00
Marion Muszynski
fffeec4f63
Merge branch 'ticket-ecotax' into develop
2016-06-24 14:35:12 +02:00
Marion Muszynski
ced379c219
ecotax sentence
2016-06-24 14:34:15 +02:00
Marion Muszynski
a72fdf8da2
Merge branch 'ticket-blockbestsellerProduct' into develop
2016-06-24 14:03:16 +02:00
Marion Muszynski
43646dd4bd
modif
2016-06-24 13:54:50 +02:00
Marion Muszynski
f57b04dbde
fix conflict
2016-06-24 12:43:26 +02:00
Marion Muszynski
985bf52e83
update to add product with attribute to cart from bestsellers
2016-06-24 12:41:46 +02:00
Srv Bebeboutik
3b72e67b19
fix from prod
2016-06-24 10:09:27 +02:00
Marion Muszynski
03dd90bec5
update product tpl css
2016-06-23 10:16:07 +02:00
Marion Muszynski
d8307d12ef
Merge branch 'ticket-8039' into develop
2016-06-22 17:51:17 +02:00
Marion Muszynski
d2d845a4d8
small fix
2016-06-22 17:50:52 +02:00
Marion Muszynski
22a8b5cac1
Merge branch 'ticket-8039' into develop
2016-06-22 17:23:56 +02:00
Marion Muszynski
7043f4b24a
other fix
2016-06-22 17:23:34 +02:00
Marion Muszynski
224267f45c
Merge branch 'ticket-8039' into develop
2016-06-22 17:08:37 +02:00
Marion Muszynski
a6c46f9077
petit fix before prod
2016-06-22 17:08:09 +02:00
Marion Muszynski
f3fdc49173
fix conflict
2016-06-22 16:11:15 +02:00
Marion Muszynski
3e65d4ed6d
fix css
2016-06-22 15:50:00 +02:00
Marion Muszynski
77b9c22014
fix conflicts
2016-06-22 15:03:36 +02:00
Marion Muszynski
53af527187
Merge branch 'tiket-productTemplate' into develop
2016-06-22 12:53:47 +02:00
Marion Muszynski
f5cb833c6e
put description more over description short
2016-06-22 12:53:17 +02:00
Marion Muszynski
fcc0b6e2fc
Merge branch 'ticket-10254' into develop
2016-06-20 15:13:43 +02:00
Marion Muszynski
a11f4ad97e
modif button color
2016-06-20 15:13:18 +02:00
Dylan Travers
1e674c4adf
Add 'X item(s) in stock' from ticket n°9890
2016-06-14 10:40:57 +02:00
Marion Muszynski
62009ba633
Merge branch 'ticket-8039' into develop
2016-06-10 16:50:05 +02:00
Marion Muszynski
7af6d9ccd7
adding bg for sale
2016-06-10 16:49:43 +02:00
Marion Muszynski
62a5f4cc32
Merge branch 'tiket-productTemplate' into develop
2016-06-09 11:49:55 +02:00
Marion Muszynski
7945d0c0ad
modif for ecotax style
2016-06-09 11:49:33 +02:00
Marion Muszynski
cf10bd3be0
fix conflicts
2016-06-08 17:15:28 +02:00
Marion Muszynski
ba706ec6c9
Merge branch 'ticket-fidelite'
2016-06-08 16:33:40 +02:00
Marion Muszynski
1b2020f041
Merge branch 'ticket-fidelite' into develop
2016-06-08 16:28:25 +02:00
Marion Muszynski
d47310bc0a
redirect for es version
2016-06-08 16:27:56 +02:00
Marion Muszynski
0fcd71ee7d
Merge branch 'tiket-productTemplate' into develop
2016-06-08 14:29:52 +02:00
Marion Muszynski
2b2ae3fa8a
modif zoomdiv
2016-06-08 14:29:19 +02:00
Marion Muszynski
ab21f10643
Merge branch 'ticket-fidelite'
2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6
modif trad
2016-06-08 12:53:38 +02:00
Marion Muszynski
5c8e35adf2
Merge branch 'ticket-fidelite'
2016-06-08 12:16:37 +02:00
Marion Muszynski
8fc47d1d6e
Merge branch 'ticket-fidelite' into develop
2016-06-08 11:44:35 +02:00
Marion Muszynski
83c4acc83d
opti request
2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776
fix conflicts
2016-06-08 10:53:07 +02:00
Marion Muszynski
f92562ca53
Merge branch 'ticket-fidelite' into develop
2016-06-08 10:38:22 +02:00
Marion Muszynski
b9f7b26a59
modif css shopping cart
2016-06-08 10:37:37 +02:00
Marion Muszynski
4148656a60
Merge branch 'ticket-8041' into develop
2016-06-07 17:43:19 +02:00
Srv Bebeboutik
f96c85f584
trad
2016-06-07 16:01:57 +02:00
Marion Muszynski
1c2c54f808
fix conflict
2016-06-07 14:51:10 +02:00
Marion Muszynski
5a7e53a116
fix conflicts
2016-06-07 14:45:26 +02:00
Srv Bebeboutik
7025bce024
add phrase frais de port popup
2016-06-07 12:52:15 +02:00
Dylan Travers
d099294e5f
Fix error alert message of ticket 9198
2016-06-07 10:20:29 +02:00
Dylan Travers
57584df3c0
Fix bug sentence. Ticket N° 9891
2016-06-07 09:51:09 +02:00
Dylan Travers
9b8795607a
Ajout de la phrase du ticket N°9891
2016-06-06 18:10:47 +02:00
Dylan Travers
54b10d9432
Ajout de la phrase demandée dans le ticket N°9891
2016-06-06 18:02:02 +02:00
Marion Muszynski
7065edffe4
fix conflict
2016-06-06 17:42:00 +02:00
Marion Muszynski
a966ed080e
Merge branch 'ticket-fidelite' into develop
2016-06-06 15:56:56 +02:00
Marion Muszynski
768c3dea8b
petit fix
2016-06-06 15:56:25 +02:00
Marion Muszynski
79c1381705
Merge branch 'ticket-fidelite' into develop
2016-06-06 15:53:52 +02:00
Marion Muszynski
cd3761a104
modif for site_mobile
2016-06-06 15:53:23 +02:00
Srv Bebeboutik
3ec698aa01
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
2016-06-06 12:03:14 +02:00
Srv Bebeboutik
1fab58c2d6
trad fr
2016-06-06 11:36:03 +02:00
Marion Muszynski
72545630a3
fix conflicts
2016-06-06 11:32:25 +02:00
Marion Muszynski
76f698ee8f
Merge branch 'tiket-productTemplate' into develop
2016-06-03 12:07:42 +02:00
Marion Muszynski
99b35ed57a
adding delivery description field for product
2016-06-03 12:07:12 +02:00
Marion Muszynski
15871cea67
Merge branch 'tiket-productTemplate' into develop
2016-06-01 14:40:11 +02:00
Marion Muszynski
289a55b5e4
small update
2016-06-01 14:39:30 +02:00
