1210 Commits

Author SHA1 Message Date
Marion Muszynski
0e61522150 change in soflexibility module to prevent xss 2016-09-26 12:24:01 +02:00
Marion Muszynski
3615683240 enable link for prod 2016-09-26 11:46:37 +02:00
Marion Muszynski
e73904e97b Merge branch 'fix-cssAddToCart' 2016-09-26 11:12:02 +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
1679fd3187 Merge branch 'ticket-10805' 2016-09-26 10:41:43 +02:00
Marion Muszynski
205c04d522 fix and translation 2016-09-23 18:04:55 +02:00
Marion Muszynski
8509789d5e link to product page in other window" 2016-09-23 17:53:49 +02:00
Marion Muszynski
7ca4e6918b addition has to clean function to see if there are products to clean 2016-09-23 17:16:26 +02:00
Marion Muszynski
4d2f0e1f9a fix bug updateposition on big product list 2016-09-23 16:59: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
16ba72aa98 Merge branch 'ticket-eanUpgrade' 2016-09-23 13:31:00 +02:00
Marion Muszynski
125842b6f4 correction sentence 2016-09-23 13:30:38 +02:00
Marion Muszynski
47db67e6b5 Merge branch 'ticket-printProductEan' 2016-09-23 13:21:06 +02:00
Marion Muszynski
0141a4e3ac fix url redirect 2016-09-23 13:16:44 +02:00
Marion Muszynski
41c2d81f39 addition of specific attribute ean printing 2016-09-23 13:09:34 +02:00
Marion Muszynski
9ecb1ae139 Merge branch 'fix-braderie' 2016-09-23 11:30:44 +02:00
Marion Muszynski
c508f407b0 change input to a tag 2016-09-23 11:27:32 +02:00
Marion Muszynski
d18e879c5e Merge branch 'fix-braderie' 2016-09-23 11:01:50 +02:00
Marion Muszynski
32301b7dd3 fix open window on click enter 2016-09-23 11:01:28 +02:00
Marion Muszynski
06e84c95da Merge branch 'ticket-eanUpgrade' 2016-09-22 17:17:54 +02:00
Marion Muszynski
4799e10e6a changement transaction sending 2016-09-22 16:49:39 +02:00
Marion Muszynski
6af23598eb modif css 2016-09-22 16:21:32 +02:00
Marion Muszynski
b19cae2d4a change emplacement of fields 2016-09-22 16:13:45 +02:00
Marion Muszynski
308d79108b manage ec choice 2016-09-22 15:52:17 +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
1ee43aad25 generation and print ean via admin product 2016-09-22 13:40:56 +02:00
Marion Muszynski
02a9fb3dbf Merge branch 'ticket-eanUpgrade' 2016-09-22 11:13:12 +02:00
Marion Muszynski
7a8d2c9339 move of comment block 2016-09-22 11:12:49 +02:00
Marion Muszynski
379cd9f5b0 Merge branch 'ticket-eanUpgrade' 2016-09-22 11:03:14 +02:00
Marion Muszynski
c049980a9a up lenght reference of product 2016-09-22 11:02:55 +02:00
Marion Muszynski
6373ce6e24 Merge branch 'ticket-eanUpgrade' 2016-09-22 10:42:26 +02:00
Marion Muszynski
0a542f0944 Merge branch 'fix-adminProduct' 2016-09-22 10:22:37 +02:00
Marion Muszynski
cde8f42b60 fix 2016-09-22 10:22:19 +02:00
Marion Muszynski
18193e6836 Merge branch 'fix-adminProduct' 2016-09-22 09:47:41 +02:00
Marion Muszynski
b040fa269b fix 2016-09-22 09:47:14 +02:00
Marion Muszynski
45b2b58b71 Merge branch 'fix-adminProduct' 2016-09-22 09:44:39 +02:00
Marion Muszynski
e6e0e55633 fix missing argument in getFieldValue 2016-09-22 09:44:06 +02:00
Marion Muszynski
a2591680b7 addition of hook 2016-09-22 09:37:19 +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
2c792510a9 Merge branch 'fix-bugQuantity' 2016-09-21 14:45:52 +02:00
Marion Muszynski
be48ec27d5 fix last_qties for categoryscroll ajax 2016-09-21 14:45:37 +02:00
Marion Muszynski
8df4bed44a continuation 2016-09-21 14:29:34 +02:00
Marion Muszynski
d598b4df54 Merge branch 'ticket-10945' 2016-09-21 10:50:58 +02:00
Marion Muszynski
4230758422 add refund and cancel permission to profile 14 braderie 2016-09-21 10:50:36 +02:00
Marion Muszynski
870331cd10 modification to send checkout process to GA 2016-09-20 18:00:18 +02:00