Skip to content

Commit

Permalink
Merge remote-tracking branch 'suutari-ai/sales-units' into sales-units
Browse files Browse the repository at this point in the history
* suutari-ai/sales-units:
  doc: Add Django model autodoc extension
  doc: Document the new units system
  wip: deprecate basket.orderable
  wip: front: text-align right for quantity inputs
  ShopProduct: Fix bug in purchase multiple checking
  smaller_p/larger_p
  wip: basket view: Move unorderable lines to form to make the quantities editable
  wip: basket page styling
  wip: remove qty text from basket view
  wip: front: fix label of unit price in order detail view
  Fix Finnish translation for Quantity
  wip:smart_product_count
  wip: use unit interface (needs basket display quantity support), ALSO fix url in basket nav dropdown
  wip: use display quantity in basket (requires unit interface)
  wip: fix customer usage in basket caching (should be basket.customer, not basket.request.customer)
  wip: basket views: add display unit support (requires get_basket_line)
  wip: add get_basket_line
  front: Fix cache/dirty mix-up
  wip: add OrderSource._get_object cache
  wip: fix ShopProduct.quantity_step and rounded_minimum_purchase_quantity
  wip: add unit interfaces
  wip
  wip:short_name -> symbol (update usages)
  wip: format number util
  wip: admin: display unit editing template
  wip:new unit tests for the units
  wip: line unit mixin
  doc: Document the new units system
  doc: Add Django model autodoc extension
  ShopProduct: Fix bug in purchase multiple checking
  smaller_p/larger_p
  wip: smaller_p/larger_p msg all languages
  rename short_name to symbol
  wip:remove-xxx-todo-marks
  wip: smaller_p/larger_p msg all languages
  wip: swedish trans of the changed msg
  wip
  rename short_name to symbol
  wip:fix typo
  wip:remove commented code
  wip:fix basket update
  wip: improve django_sphinx a bit
  wip: docs and api improvement
  wip:docs
  wip:unit compatibility
  wip:display precision
  wip:trans update(no real changes)
  wip:trans update(no real changes)
  wip:more tests
  wip: improve backward compatibility
  wip:improve backward compatibility
  wip
  wip:tune message
  wip:messages.fi
  wip:base messages (allow bare number)
  wip: remove comment
  wip: front: price -> unit price
  wip:is_countable -> allow_bare_number
  wip MOVE TO FRONT: (unrelated message file update, fi_FI)
  wip:messages
  wip:messages
  wip:messages
  wip:messages
  wip: update one text and its english trans file
  wip: update en translations
  wip
  wip:all
  wip
  wip: remove hidden input hack from product page
  wip
  wip.evertyhing
  wip:doc
  wip
  wip: sales unit display stuff
  • Loading branch information
suutari-ai committed Mar 20, 2017
2 parents de0f099 + 7f8cf57 commit 2cea762
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2cea762

Please sign in to comment.