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

535 Commits

Author SHA1 Message Date
Marion Muszynski
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
72a789159a Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-13 15:53:46 +02:00
Marion Muszynski
e8bb0d7eac css addition and fixes 2016-10-13 15:53:23 +02:00
Marion Muszynski
385561fc7c fix conflcit 2016-10-12 12:42:41 +02:00
Marion Muszynski
2769bf42fd addition of delivery modifier link 2016-10-11 14:47:30 +02:00
Marion Muszynski
8729c7a6aa fix conflict 2016-10-11 11:49:33 +02:00
Marion Muszynski
1ff084929e fix conflict 2016-10-11 11:41:40 +02:00
Marion Muszynski
a93a5b14f2 modif css 2016-10-11 11:40:18 +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
7fb403426b Merge branch 'ticket-GAnalytics' into develop 2016-10-07 15:11:45 +02:00
Marion Muszynski
88e42535a7 fix redirect 2016-10-07 15:11:25 +02:00
Marion Muszynski
b50bcf4848 fix conflict 2016-10-07 15:05:20 +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
973fb9bdf1 Merge branch 'ticket-GAnalytics' into develop 2016-10-06 15:25:44 +02:00
Marion Muszynski
016fbd8353 small fix 2016-10-06 15:25:25 +02:00
Marion Muszynski
79b0ca62cd fix conflict 2016-10-06 11:56:59 +02:00
Marion Muszynski
4f446ca296 continuation of ant_support and sav 2016-10-06 11:55:13 +02:00
Marion Muszynski
541a0ed663 fix conflict 2016-10-05 11:27:50 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Marion Muszynski
5355871476 Merge branch 'ticket-8048' into develop 2016-09-28 14:06:59 +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
6ec5d67fa3 fix conflict 2016-09-28 11:50:08 +02:00
Marion Muszynski
5fb300b503 modif css 2016-09-28 11:47: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
351a9754b6 Merge branch 'fix-cssAddToCart' into develop 2016-09-26 11:10:36 +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
eb1a6f66d2 Merge branch 'ticket-8048' into develop 2016-09-23 17:54:17 +02:00
Marion Muszynski
8509789d5e link to product page in other window" 2016-09-23 17:53:49 +02:00
Marion Muszynski
2db3d0c0e0 Merge branch 'ticket-8048' into develop 2016-09-23 15:10:39 +02:00
Marion Muszynski
035a6d1158 modif css 2016-09-23 15:10:12 +02:00
Marion Muszynski
62c434fd57 Merge branch 'ticket-8048' into develop 2016-09-23 14:56:53 +02:00
Rodney Figaro
155bd6a231 fix when no accessories and no family product 2016-09-23 14:51:52 +02:00
Marion Muszynski
808a5a797b Merge branch 'ticket-GAnalytics' into develop 2016-09-22 16:50:02 +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
e18f56ae11 Merge branch 'ticket-GAnalytics' into develop 2016-09-21 17:07:03 +02:00
Marion Muszynski
6d8bba532d fix paybox loader 2016-09-21 17:06:43 +02:00
Marion Muszynski
65a3704d28 Merge branch 'ticket-GAnalytics' into develop 2016-09-21 16:42:12 +02:00
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