mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-09 23:06:06 +00:00
* 2-0-stable: (208 commits) Re implement orders ctrl update method so we can change redirection logic and add specs for it Improve readability in admin/orders_spec Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates Adapt variants auto complete to spree v2 code with shipments Adapt customer search override to spree v2 and fix customer details spec in admin orders spec Fix distributor change spec in admin orders spec Fix admin orders spec non tax adjustments by adapting to new view Fix failing specs due to Spree 2's new order admin page Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work Use Spree routes Fix shop accidentally becoming order coordinator Match date format in spec with import date filter Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator. Add unit test for VariantStock.can_supply? Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock. Also, added spec to test return value of the reset method: it should return number of updated records. Upgrade views to Spree 2 and apply overrides Updating translations for config/locales/en_US.yml Update name spaces for rake tasks to shorter 'ofn'. Refactor checking no preview image in specs Refactor checking of preview image path in specs ...