Marion Muszynski
13385c964d
Merge branch 'ticket-philea'
2016-09-30 13:08:22 +02:00
Marion Muszynski
c0110a6618
modif css and fix alert missing quantity in orders
2016-09-30 13:06:24 +02:00
Marion Muszynski
8369aa187f
Merge branch 'ticket-philea'
2016-09-29 18:08:48 +02:00
Marion Muszynski
d9fd7547d1
addition of preparation report
2016-09-29 18:08:23 +02:00
Marion Muszynski
4b7d6ac5ae
fix print single attribute
2016-09-29 16:11:06 +02:00
Marion Muszynski
9e8a975d2f
test for code 128 print
2016-09-29 15:56:17 +02:00
Marion Muszynski
14b6ee9e33
fix
2016-09-29 14:24:57 +02:00
Marion Muszynski
b47cf63cdd
fix continuing
2016-09-29 10:32:10 +02:00
Marion Muszynski
e6f254dbcd
fix to print ean whatever if length is 13
2016-09-29 10:17:12 +02:00
Marion Muszynski
5b3ac86cc5
Merge branch 'ticket-philea'
2016-09-28 18:11:43 +02:00
Marion Muszynski
4acbb1dcf6
fix recept_expe
2016-09-28 18:11:07 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +02:00
Marion Muszynski
b36c40446d
addition of CRE and CRP management
2016-09-28 16:56:19 +02:00
Marion Muszynski
e7d82a7a30
fix js slider
2016-09-28 15:05:05 +02:00
Marion Muszynski
09b85f428f
Merge branch 'ticket-payboxAgreement'
2016-09-28 13:03:12 +02:00
Marion Muszynski
7fff52b3b8
fix utf8
2016-09-28 13:02:55 +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
2aad574498
Merge branch 'ticket-payboxAgreement'
2016-09-28 10:49:44 +02:00
Marion Muszynski
a96bc923d1
restrict mail sending to our ip
2016-09-28 10:49:22 +02:00
Marion Muszynski
16e16d6596
update CRE
2016-09-28 10:41:39 +02:00
Marion Muszynski
8ff008b8bf
Merge branch 'ticket-payboxAgreement'
2016-09-27 12:07:51 +02:00
Marion Muszynski
f4ecfd644b
adjusting response data for paybox payment information
2016-09-27 12:07:24 +02:00
Marion Muszynski
7b294b493c
Merge branch 'ticket-payboxAgreement'
2016-09-27 11:37:56 +02:00
Marion Muszynski
829137c244
small fix
2016-09-27 11:37:17 +02:00
Marion Muszynski
7018bd81eb
save refabonne
2016-09-27 11:36:41 +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
0c5950b71d
addition of a teston group before open save cb to every customer
2016-09-26 17:51:14 +02:00
Marion Muszynski
2d855a0071
remove tests for prod
2016-09-26 17:23:26 +02:00
Marion Muszynski
edc56267ca
test on dev env
2016-09-26 15:52:37 +02:00
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
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
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
