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
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
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
6373ce6e24
Merge branch 'ticket-eanUpgrade'
2016-09-22 10:42:26 +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
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
58d2b92b0c
continuing braderie upgrade
2016-09-20 14:49:02 +02:00
Marion Muszynski
ffe2e24a7a
reset quantity value in braderie after product was added
2016-09-20 11:02:50 +02:00
Marion Muszynski
96ba6fbaca
second fix
2016-09-19 18:07:02 +02:00
Marion Muszynski
cd540ac533
fix attribute image
2016-09-19 18:01:20 +02:00
Marion Muszynski
81769c64e7
addition of product image in braderie
2016-09-19 17:50:14 +02:00
Marion Muszynski
0e4e134544
Merge branch 'ticket-philea'
2016-09-19 15:40:17 +02:00
Marion Muszynski
fa825f9cc7
modif css
2016-09-19 15:39:50 +02:00
Marion Muszynski
588b23161d
Merge branch 'ticket-philea'
2016-09-19 15:34:37 +02:00
Marion Muszynski
d9b117774d
css fix
2016-09-19 15:33:43 +02:00
Marion Muszynski
dafde1fd0f
Merge branch 'ticket-philea'
2016-09-19 11:58:48 +02:00
Marion Muszynski
a51cf6fb55
continuing to add some stuff
2016-09-19 11:58:14 +02:00
Marion Muszynski
50da985ca7
Merge branch 'ticket-philea'
2016-09-16 17:33:55 +02:00
Marion Muszynski
e1f82aba03
small fix
2016-09-16 17:33:23 +02:00
Marion Muszynski
d0b55456b9
Merge branch 'ticket-philea'
2016-09-16 17:18:04 +02:00
Marion Muszynski
4e42740019
message modification
2016-09-16 17:17:41 +02:00
Marion Muszynski
4179f1513d
Merge branch 'ticket-philea'
2016-09-16 16:36:46 +02:00
Marion Muszynski
56136b51ec
addition of report management
2016-09-16 16:36:16 +02:00
Marion Muszynski
967a9659cf
Merge branch 'ticket-philea'
2016-09-15 16:30:12 +02:00
Marion Muszynski
0980058b1d
matching ART CDC
2016-09-15 16:29:54 +02:00
Marion Muszynski
e9d46cd1a4
Merge branch 'ticket-10884'
2016-09-15 16:05:12 +02:00
Marion Muszynski
86f79df2c2
Merge branch 'ticket-10133'
2016-09-15 15:33:00 +02:00
Marion Muszynski
bb457294ea
fix mod translation
2016-09-15 15:24:10 +02:00
Marion Muszynski
88a7ca8e96
fix export by date
2016-09-15 11:14:09 +02:00
Marion Muszynski
bafca862a3
adjusting loyalty updating
2016-09-15 10:51:50 +02:00
Marion Muszynski
cf18d95f8b
moving of sale export block to privatesale logisitique
2016-09-14 17:42:08 +02:00
Marion Muszynski
2e7ff69817
addition of date to find the good ps in bulkupdate export part
2016-09-14 17:00:01 +02:00
Marion Muszynski
415c1ba7ad
text modification
2016-09-14 16:10:41 +02:00
Marion Muszynski
c8ecf874fe
stupid mistake
2016-09-14 16:00:50 +02:00
Marion Muszynski
75f702d132
right fix
2016-09-14 15:54:25 +02:00
