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

380 Commits

Author SHA1 Message Date
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
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
ced379c219 ecotax sentence 2016-06-24 14:34:15 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +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
d2d845a4d8 small fix 2016-06-22 17:50:52 +02:00
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +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
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
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +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
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
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +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
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
289a55b5e4 small update 2016-06-01 14:39:30 +02:00
Marion Muszynski
e04cd105b8 modif code hex 2016-06-01 12:57:10 +02:00
Marion Muszynski
700c5dc9e0 css modif 2016-06-01 12:51:53 +02:00
Marion Muszynski
71ba5e170a small update 2016-06-01 12:47:48 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
ed9658e97e comment facebook like 2016-05-31 16:33:28 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +02:00
Marion Muszynski
fd0de8d0aa other fix tpl 2016-05-30 17:16:54 +02:00
Marion Muszynski
633643d0c7 fix pagination 2016-05-30 17:13:22 +02:00
Marion Muszynski
93344e1770 fix shopping-cart tpl 2016-05-30 16:33:03 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
64cfa67dbf clean js console 2016-05-19 14:47:38 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
9eda48a6b4 modif img payment_2 2016-05-17 16:33:20 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
70d2b78a74 modif site_mobile 2016-05-13 14:47:22 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +02:00
Marion Muszynski
183ad376d0 modif for delay flag 2016-05-10 16:13:48 +02:00
Marion Muszynski
8e8e2793ae modif arroaw slider 2016-05-04 16:19:18 +02:00
Marion Muszynski
e85b593e35 modif trad 2016-05-04 16:00:32 +02:00
Marion Muszynski
231dbe444e modif css 2016-05-04 15:36:41 +02:00
Marion Muszynski
402ac44f49 slider blockbestsellers in product page 2016-05-04 15:31:28 +02:00
Marion Muszynski
c8fb4bf96b petite modif 2016-05-03 15:57:35 +02:00
Marion Muszynski
831cdefdf8 modif translation 2016-05-03 15:48:17 +02:00
Marion Muszynski
63db0cc73c adding in blocuserinfo 2016-05-03 15:38:20 +02:00
Thibault UBUNTU
25bf39f711 trad es 2016-05-03 12:08:55 +02:00
Marion Muszynski
bf39d6aa82 modif css 2016-05-02 17:48:16 +02:00
Marion Muszynski
388a6bfc10 modif css 2016-05-02 17:46:53 +02:00
Marion Muszynski
990ddefe16 border radius add to cart 2016-05-02 17:20:18 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2033c1e937 update flag position 2016-04-29 16:14:41 +02:00
Marion Muszynski
f4597e397e modif flag expe in product tpl 2016-04-29 16:04:17 +02:00
Marion Muszynski
9f104f2c8f modif tpl product 2016-04-27 16:35:02 +02:00
Marion Muszynski
73a43c2042 modif tpl product 2016-04-27 16:24:35 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
20beed5ed7 modif css 2016-04-26 17:06:16 +02:00
Marion Muszynski
2217bf5414 modif tpl 2016-04-26 17:01:44 +02:00
Marion Muszynski
e85ce5fb93 modif next for thumb 2016-04-26 16:52:04 +02:00
Marion Muszynski
82a536aa5f modif tpl 2016-04-26 16:43:28 +02:00
Marion Muszynski
5b40878629 modif tpl 2016-04-26 16:39:06 +02:00
Marion Muszynski
cbf6deeb91 begin new product tpl 2016-04-26 16:19:40 +02:00
Marion Muszynski
be4026ba1a modif tpl 2016-04-25 12:45:13 +02:00
Marion Muszynski
cd742921f3 update tpl 2016-04-22 16:30:18 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
15f3b6fa20 modif tpl 2016-04-21 12:01:10 +02:00
Marion Muszynski
c8befd1ede total modification of loyalty module 2016-04-21 11:14:33 +02:00
Thibault UBUNTU
bbee57249a version mobile 2016-04-20 17:35:03 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
fd5bccadd7 begin loyalty 2016-04-20 15:33:56 +02:00
Thibault UBUNTU
c37df06d47 add reassurance text 2016-04-20 15:32:12 +02:00
Thibault UBUNTU
848dbdedc0 load payment paypal 2016-04-20 14:20:07 +02:00
Marion Muszynski
0073cb8dde fix css 2016-04-15 11:37:01 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00