Commits

Author Commit Message Labels Comments Date
Tay Ray Chuan
ContactInfoForm: display 'Not Applicable' choice for states at the very least If country is None, or if there aren't any states for that country, return a list with a single choice, "Not Applicable". In ContactInfoForm's init, don't bother checking the choices, since we can be sure that it is a non-empty list.
Tay Ray Chuan
ContactInfoForm: remove redundant check in area_choices_for_country()
Tay Ray Chuan
Merge branch rc/fixes
Tay Ray Chuan
satchmo_product_admin.edit_subtypes: update url lookups Django expects non-dotted app labels; cuddle it. This fixes #1120.
Chris Moffitt
Documentation updates based on recent changes.
Chris Moffitt
Updating the Russian translations via Transifex submissions. Thanks!
Tay Ray Chuan
Merge branch rc/fixes
Tay Ray Chuan
product: ensure various save() implementations take **kwargs Although the force_insert and force_update options aren't implemented, accept them via **kwargs anyway, so that we are well-behaved django citizens.
Tay Ray Chuan
Merge in product re-org
Tay Ray Chuan
Merge payment authorization capture changes Conflicts: satchmo/apps/payment/tests.py satchmo/apps/payment/utils.py
Tay Ray Chuan
payment.utils.capture_authorizations: don't use get_or_create_purchase() There is no such method on Order. While we're at it, only retrieve processors used in the order's authorizations, instead of every active payment module. This fixes #1117, and the test test_authorize_listener. Reported-by: davis
Tay Ray Chuan
payment.utils.get_processor_by_key: add docstring
Tay Ray Chuan
payment.test: add test for authorization capture listener This fails due to an AttributeError.
Tay Ray Chuan
payment.tests: don't retrieve order twice for status
Tay Ray Chuan
strip trailing whitespace
Tay Ray Chuan
Merge branch rc/fixes
Tay Ray Chuan
shop.signals: try and use ``code`` in doc comments
Tay Ray Chuan
satchmo_utils.thumbnail: reword comment
Chris Moffitt
Change ProductVariation import.
Bruce Kroeze
fixing product imports and databases for sample projects
Bruce Kroeze
product split migrations
Bruce Kroeze
product split migrations
Bruce Kroeze
product split migrations
Bruce Kroeze
adding migrations for product split
Bruce Kroeze
splitting products into separate modules
Bruce Kroeze
removing SSL from configuration
Tay Ray Chuan
Merge in text email changes
Tay Ray Chuan
text email: remove extra newlines for order items block
Tay Ray Chuan
text email: use {% include %} instead of {% extends %} Since we are unable to introduce new blocks and reflow inherited blocks, use {% include %}s instead, like we do for html email templates. Shift the payment block out of _order_detail.txt into order_complete and order_notice; this is so that we can say "Your <credit card>..." in order_complete.
Chris Moffitt
Merging.
  1. Prev
  2. Next