Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master' into custom_products

  • Loading branch information...
commit 8a939437f5f0076401d1e7610a3262c0c43a5344 2 parents e1bb0ef + e2a4903
@AlexHill authored
View
1  .hgtags
@@ -32,3 +32,4 @@ c5b518b69c768e65d504fc604eed1309df8d6059 0.1.5
9cbc4963667f31c3b7be1e85a951f239e8f8091e 0.1.2
058dd00c34ed2c72b19b63c1531bb9571b17e368 0.1.1
5912c2ce614a313de3c0d53448026a8e8bc12c9d 0.1
+3d461454baaaae53163572027c9194119b323e28 0.8.0
View
31 CHANGELOG
@@ -1,3 +1,34 @@
+Version 0.8.0 (Feb 17, 2013)
+----------------------------
+
+ * Provide better exception messages for required settings in each of the payment processors - Stephen McDonald
+ * Pass amount to Stripe as integer intead of string. The Stripe API docs indicate that the "amount" passed to a Stripe. charge object should be an int, not a string. See ``https://stripe.com/docs/api?lang=python#create_charge`` - Lorin Hochstein
+ * Don't put payment specific settings in ``local_settings`` template - Stephen McDonald
+ * Move dummy stripe key setting into its test - Stephen McDonald
+ * Fix AttributeError with empty cart in Django 1.5. Django 1.5 looks for a pk in BaseInlineFormSet's ``__init__``, which it couldn't find on EmptyCart. The fix adds the attribute with value None - Alex Hill
+ * Only run stripe tests if its used, since it breaks Python 2.5 support (stripe package doesn't work in 2.5) - Stephen McDonald
+ * Fix class decorator for stripe tests for Python 2.5 - Stephen McDonald
+ * Fix ``jquery.tools`` references for product image overlay. Closes #83 - Stephen McDonald
+ * Added fields ``'tax_type'`` and ``'tax_total'`` and processors that mimic the functionality of ``'shipping_type'`` and ``'shipping_total'`` - Evan Leis
+ * By default, ``tax_total`` is 0 - Evan Leis
+ * ``tax_free`` session option is unnecessary, updated documentation on ``default_tax_handler`` - Evan Leis
+ * Add ``OrderForm.preprocess()`` class method - Alex Hill
+ * preprocess should be a class method, not static - Alex Hill
+ * Removed redundant JS on checkout page - Alex Hill
+ * Remove stray print() call - Alex Hill
+ * Fix and add comments - Alex Hill
+ * Move variable declarations around for clarity - Alex Hill
+ * Remove unused variable - Alex Hill
+ * Taxation defaults/settings tests - Evan Leis
+ * Added test for ``set_tax`` - Evan Leis
+ * Added documentation. Merged two tests as they are entirely co-dependent - Evan Leis
+ * Fix rendering of payment fields when checkout steps aren't split - Stephen McDonald
+ * Implemented handling for the createdb --nodata management command option, splitting out fixtures into required/optional. Closes #29 - Stephen McDonald
+ * Use dummy test data in order test, since form validation will fail if ``SHOP_CHECKOUT_STEPS_CONFIRMATION`` is False - Stephen McDonald
+ * Added docs for the new tax handling - Stephen McDonald
+ * Added a section about categories as pages to the docs - Stephen McDonald
+ * Bump Mezzanine version to 1.4.0 - Stephen McDonald
+
Version 0.7.0 (Dec 26, 2012)
----------------------------
View
2  cartridge/__init__.py
@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.8.0"
View
BIN  docs/img/graph-small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  docs/img/graph.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  docs/order_model_fields.rst
@@ -22,6 +22,8 @@
* ``user_id``
* ``shipping_type``
* ``shipping_total``
+ * ``tax_type``
+ * ``tax_total``
* ``item_total``
* ``discount_code``
* ``discount_total``
View
7 docs/settings.rst
@@ -98,6 +98,13 @@ Dotted package path and class name of the function that is called upon submissio
Default: ``'cartridge.shop.checkout.default_payment_handler'``
+``SHOP_HANDLER_TAX``
+--------------------
+
+Dotted package path and class name of the function called upon submission of the billing/shipping checkout step. This is where tax calculations can be performed and set using the function ``cartridge.shop.utils.set_tax``.
+
+Default: ``'cartridge.shop.checkout.default_tax_handler'``
+
``SHOP_OPTION_TYPE_CHOICES``
----------------------------
View
2  setup.py
@@ -38,7 +38,7 @@
packages=find_packages(),
install_requires=[
- "mezzanine >= 1.3.0",
+ "mezzanine >= 1.4.0",
"pisa >= 3.0.33",
],
Please sign in to comment.
Something went wrong with that request. Please try again.