Merge branch 'dev_cooperatic' into '1492-order-press-enter'

# Conflicts:
#   orders/static/js/orders_helper.js
2 jobs from 1492-order-press-enter in 1 minute 32 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #2449
lint:js

00:24

passed #2450
unit:django

01:08