antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,747 Commits 124 Branches 0 Tags 108 MiB
dc5beb562c
Commit Graph

376 Commits

Author SHA1 Message Date
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
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
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
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
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
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
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
e8bb0d7eac css addition and fixes 2016-10-13 15:53:23 +02:00
Marion Muszynski
2769bf42fd addition of delivery modifier link 2016-10-11 14:47:30 +02:00
Marion Muszynski
da8f9e0c1f Merge branch 'ticket-GAnalytics' 2016-10-10 10:38:46 +02:00
Marion Muszynski
5cf27fac91 adjusting carrier name sent to GA 2016-10-10 10:38:22 +02:00
Marion Muszynski
401db0a5b2 Merge branch 'ticket-GAnalytics' 2016-10-10 10:19:57 +02:00
Marion Muszynski
ba150d8ed9 adjusting payment type sent to GA 2016-10-10 10:19:40 +02:00
Marion Muszynski
46deb152f6 Merge branch 'ticket-GAnalytics' 2016-10-07 15:14:07 +02:00
Marion Muszynski
88e42535a7 fix redirect 2016-10-07 15:11:25 +02:00
Marion Muszynski
0f666b08fc fix when ga is blocked 2016-10-07 15:03:45 +02:00
Marion Muszynski
797b0e499f Merge branch 'ticket-GAnalytics' 2016-10-07 13:57:15 +02:00
Marion Muszynski
2b7ee09f88 fix 2016-10-07 13:57:01 +02:00
Marion Muszynski
46cae17534 fix conflict 2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52 fix name of payment type 2016-10-06 15:58:50 +02:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
016fbd8353 small fix 2016-10-06 15:25:25 +02:00
Marion Muszynski
4f446ca296 continuation of ant_support and sav 2016-10-06 11:55:13 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Rodney Figaro
da5a017c06 add scrolling/slide when products have more than 3 accessories 2016-09-28 12:44:25 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00
Marion Muszynski
6f89c44d2c prepare tests prod 2016-09-27 10:28:39 +02:00
Marion Muszynski
f900950891 adjust rose of add to cart button in add to cart box 2016-09-26 11:10:19 +02:00
Marion Muszynski
8509789d5e link to product page in other window" 2016-09-23 17:53:49 +02:00
Marion Muszynski
035a6d1158 modif css 2016-09-23 15:10:12 +02:00
Rodney Figaro
155bd6a231 fix when no accessories and no family product 2016-09-23 14:51:52 +02:00
Marion Muszynski
4799e10e6a changement transaction sending 2016-09-22 16:49:39 +02:00
Rodney Figaro
c9ad2799d0 move the similar products block into one tab in product details 
- fix the number of products displayed in the 'best sales for family' case
    - replace the slider by an adapted block with visuals differents from the best sales slider.
    - adapt the show cart javascript in order to get the correct height of product blocks on which
      the user click
    - fix selection between accessories and best sales for family in hooks
    - add a hook in order to display the correct label in the new tab
    - restore olds methods for best sales product. Routines related to the best sales family products have their own methods.
    - fix cache generation
 2016-09-22 15:14:39 +02:00
Marion Muszynski
6d8bba532d fix paybox loader 2016-09-21 17:06:43 +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
2cde4025ac add loader for paybox direct payment 2016-09-21 16:21:32 +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
870331cd10 modification to send checkout process to GA 2016-09-20 18:00:18 +02:00
Marion Muszynski
65f7b71332 fix 2016-09-20 16:49:41 +02:00
Marion Muszynski
5cf235d874 addition of code ecommerce 2016-09-20 16:47:05 +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
95e044a365 adjusting css 2016-09-15 13:12:38 +02:00
Marion Muszynski
b83d7b994c modification in paymentinfo tpl 2016-09-15 13:01:20 +02:00
Marion Muszynski
cf3b0cca11 addition of category thumb checking 2016-09-14 11:03:36 +02:00
Marion Muszynski
4581e8d20e fix width of ps description 2016-09-12 15:40:23 +02:00
Marion Muszynski
fca308f3ae modif css 2016-09-09 14:37:32 +02:00
Marion Muszynski
1b444a773f css modif 2016-09-09 13:13:57 +02:00
Marion Muszynski
3d325dbc7c small modif 2016-09-09 13:09:43 +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
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
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
144733299c up reassurance sentence at first place 2016-08-31 15:17:21 +02:00
Marion Muszynski
6ff4e35f7b fix css 2016-08-31 15:03:11 +02:00
Marion Muszynski
5c35c6431b fix 2016-08-31 14:56:59 +02:00
Marion Muszynski
abdbb008b5 adding reassurance sentences in payment step 2016-08-31 14:54:30 +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
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
0dde6b5611 fix for old sales 2016-08-30 13:55:47 +02:00
Marion Muszynski
a96b0018c0 upload vp miniature in adminCategory 2016-08-30 13:47:42 +02:00
Marion Muszynski
0f85417eaf modif css 2016-08-26 17:16:18 +02:00
Marion Muszynski
bab94ab68b fix and modif css 2016-08-26 17:08:28 +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
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
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +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
e69073572e modif date 2016-07-25 12:19:36 +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
dd6a758e32 modif css 2016-07-25 11:17:40 +02:00
Marion Muszynski
fb51c877c4 suite save paybox info 2016-07-18 11:45:18 +02:00
Marion Muszynski
b8a4934278 adding delivery date estimation 2016-07-15 12:26:58 +02:00
Marion Muszynski
e07186fe27 modif css 2016-07-15 10:32:16 +02:00
Marion Muszynski
6e14b286c2 update css 2016-07-15 10:21:24 +02:00
Marion Muszynski
a6ec43bb68 showing estimation delivery date in cart 2016-07-13 17:40:13 +02:00
Marion Muszynski
02af220b58 showing delivery delay estimation on product tpl 2016-07-13 16:37:00 +02:00
Marion Muszynski
e33d2da73d adjusting for delivery delay part 2016-07-13 15:35:00 +02:00
Marion Muszynski
dee3c2ba2c ajusting css 2016-07-13 15:16: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
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
6a87ea0460 modif add button 2016-07-01 11:29:00 +02:00
Marion Muszynski
e40768c734 modif img reduction on product list 2016-07-01 11:18:52 +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
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
dd9831daa5 Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 15:55:39 +02:00
Marion Muszynski
f8af1f0a71 modif tpl trad 2016-06-28 15:19:31 +02:00