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
35700db205
Merge branch 'ticket-payboxAgreement' into develop
2016-09-26 17:51:35 +02:00
Marion Muszynski
0c5950b71d
addition of a teston group before open save cb to every customer
2016-09-26 17:51:14 +02:00
Marion Muszynski
6047e4607c
Merge branch 'ticket-payboxAgreement' into develop
2016-09-26 17:23:44 +02:00
Marion Muszynski
2d855a0071
remove tests for prod
2016-09-26 17:23:26 +02:00
Marion Muszynski
b9155ff9cb
Merge branch 'ticket-payboxAgreement' into develop
2016-09-26 15:52:57 +02:00
Marion Muszynski
edc56267ca
test on dev env
2016-09-26 15:52:37 +02:00
Marion Muszynski
a87bb60fc9
Merge branch 'ticket-payboxAgreement' into develop
2016-09-26 11:47:05 +02:00
Marion Muszynski
3615683240
enable link for prod
2016-09-26 11:46:37 +02:00
Marion Muszynski
2b86a3155c
Merge branch 'ticket-8048' into develop
2016-09-23 18:05:17 +02:00
Marion Muszynski
205c04d522
fix and translation
2016-09-23 18:04:55 +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
5edc9724a3
Merge branch 'ticket-10805' into develop
2016-09-23 17:00:11 +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
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
638bca8e04
Merge branch 'ticket-printProductEan' into develop
2016-09-23 13:17:04 +02:00
Marion Muszynski
0141a4e3ac
fix url redirect
2016-09-23 13:16:44 +02:00
Marion Muszynski
e78e5098e3
Merge branch 'ticket-printProductEan' into develop
2016-09-23 13:09:56 +02:00
Marion Muszynski
41c2d81f39
addition of specific attribute ean printing
2016-09-23 13:09:34 +02:00
Marion Muszynski
c508f407b0
change input to a tag
2016-09-23 11:27:32 +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
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
Marion Muszynski
6349f63424
Merge branch 'ticket-eanUpgrade' into develop
2016-09-22 16:21:49 +02:00
Marion Muszynski
6af23598eb
modif css
2016-09-22 16:21:32 +02:00
Marion Muszynski
432b96df7f
Merge branch 'ticket-eanUpgrade' into develop
2016-09-22 16:14:07 +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
1a3ce467c5
Merge branch 'ticket-printProductEan' into develop
2016-09-22 13:41:39 +02:00
Marion Muszynski
1ee43aad25
generation and print ean via admin product
2016-09-22 13:40:56 +02:00
Marion Muszynski
6373ce6e24
Merge branch 'ticket-eanUpgrade'
2016-09-22 10:42:26 +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
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
4230758422
add refund and cancel permission to profile 14 braderie
2016-09-21 10:50:36 +02:00
Marion Muszynski
430cabc449
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:49:30 +02:00
Marion Muszynski
58d2b92b0c
continuing braderie upgrade
2016-09-20 14:49:02 +02:00
Marion Muszynski
c6d74f9f1c
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 11:03:15 +02:00
Marion Muszynski
ffe2e24a7a
reset quantity value in braderie after product was added
2016-09-20 11:02:50 +02:00
Marion Muszynski
61b198a9c1
Merge branch 'ticket-eanUpgrade' into develop
2016-09-19 18:07:21 +02:00
