implement new delivery schema
allow quantity as parameters of addToBasketAjaxActionFromVarietyList
implement combobox for product highlights component
fixes to the combobox
add warehouse_id to carrier
cumulative discount limit per customer
typo
Merge branch 'master' of https://github.com/laposa/onxshop
Merge branch 'master' of https://github.com/laposa/onxshop
refactor search results parsing to allow customization
Merge branch 'master' of https://github.com/laposa/onxshop
promotion error message amend
Merge branch 'master' of https://github.com/laposa/onxshop
refresh basket edit component on basjet change (if present)
when refreshing basket, load it in the context of the page
Merge branch 'master' of https://github.com/laposa/onxshop