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
Marion Muszynski
fa7a20ab2e
fix price 3
2016-09-14 15:26:12 +02:00
Marion Muszynski
9ef597817e
fix price 2
2016-09-14 15:16:07 +02:00
Marion Muszynski
ccd8ce68cb
fix price
2016-09-14 15:12:05 +02:00
Marion Muszynski
fed2f9d357
Fixed a possible XSS attack flaw
2016-09-14 12:37:07 +02:00
Marion Muszynski
22c1cd62b3
addition of message
2016-09-14 12:22:00 +02:00
Marion Muszynski
91af2d4455
addition of manual updating of loyalty orders
2016-09-14 12:17:23 +02:00
Rodney Figaro
5baa5eaf9a
fix : get best sale of the same sale family with label in front
2016-09-13 10:48:36 +02:00
Rodney Figaro
ebb136206a
remove unused code
2016-09-13 09:34:18 +02:00
Rodney Figaro
bdd6aadc71
show best sales of same sale family rather than the same category
2016-09-12 18:08:28 +02:00
Rodney Figaro
48daa71f67
fix db fields requested by one method in productsale, fix arguments in methods in module
2016-09-12 12:12:05 +02:00
Rodney Figaro
81d4be3108
fixes and cleanup
2016-09-12 11:59:22 +02:00
Marion Muszynski
23c4e93fe8
addition of double checking on valid order
2016-09-09 12:18:58 +02:00
Marion Muszynski
a5a5278eb8
fix request
2016-09-08 17:51:04 +02:00
Marion Muszynski
9ed80d89ab
addition of delivery address checking
2016-09-08 17:48:51 +02:00
Marion Muszynski
c004322a41
addition of url redirect
2016-09-08 17:07:17 +02:00
Marion Muszynski
89b3fc48bb
small fix
2016-09-08 16:47:36 +02:00
Marion Muszynski
3ad121eedb
process success addition
2016-09-08 16:32:14 +02:00
Marion Muszynski
564c008cf6
more mailing addition
2016-09-08 14:51:03 +02:00
Marion Muszynski
251b0eac53
addition of mailing for test
2016-09-08 14:36:31 +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
5c755acd4b
Merge branch 'ticket-philea'
2016-09-08 12:41:24 +02:00
Marion Muszynski
50cc5511ac
fix about phone number
2016-09-08 12:40:32 +02:00
Marion Muszynski
1edec769dd
Merge branch 'ticket-philea'
2016-09-07 17:42:43 +02:00
Marion Muszynski
d839706175
modif code article
2016-09-07 17:42:06 +02:00
Marion Muszynski
7c3fbc75dd
Merge branch 'ticket-philea'
2016-09-07 16:17:36 +02:00
Marion Muszynski
a6fc45e479
adjust send_commande
2016-09-07 16:17:03 +02:00
Marion Muszynski
68fe001982
Merge branch 'ticket-philea'
2016-09-07 15:11:01 +02:00
Marion Muszynski
df7b6dbc05
small fix
2016-09-07 15:10:28 +02:00
Marion Muszynski
f8da29a7e2
fix conflict about vi editor
2016-09-07 15:06:41 +02:00
Marion Muszynski
88b3c10898
fix
2016-09-07 15:03:58 +02:00
Marion Muszynski
66544cc598
Merge branch 'ticket-10296'
2016-09-07 14:45:15 +02:00
Marion Muszynski
b376875be8
modif wordwrap
2016-09-07 14:44:40 +02:00
Marion Muszynski
a7198f0fea
Merge branch 'ticket-philea'
2016-09-07 12:29:37 +02:00
Marion Muszynski
0c118717af
small addition
2016-09-07 12:03:31 +02:00
Marion Muszynski
f790336c29
big modif
2016-09-07 11:42:38 +02:00
Marion Muszynski
266e966b2f
Merge branch 'ticket-10296'
2016-09-07 09:03:09 +02:00
