In cart_modifiers methods ``get_extra_cart_price_field`` and ``get_extra_cart_item_price_field``
accepts the additional field ``state`` to pass customized data from ``Cart.update()``
down to these methods.
Fixes backwards compatibility issues where state was missing
Added safty check for callability of as_text() method
Merge branch 'master' into add-callable
Merge pull request #226 from jrief/add-callable

Add callable
Set order to status COMPLETED if payment was received and marked manually in the backend
British English should be deprecated in software development
Merge branch 'master' of https://github.com/divio/django-shop into accept-payment-on-backend
Replaced the state dict by the request object in all cart modifiers
Must also replace ``state`` against ``request`` in ``CartItem.update``
Added build file for travis-ci
Update README.rst
Update README.rst
Merge pull request #227 from jrief/accept-payment-on-backend

Accept payment on backend
Merge pull request #228 from jrief/travis-ci

Add support for Travis Continuos Integration
Added travis-ci build status to README
Merge branch 'master' of https://github.com/divio/django-shop into travis-ci
Added Travis-CI build status
Merge pull request #229 from jrief/travis-ci

Travis ci
Merge pull request #217 from jrief/cart_modifiers-fix-missing-state

Add state object to cart modifier methods get_extra_cart_price_field and get_extra_cart_item_price_field