diff --git a/CHANGELOG b/CHANGELOG index 7287fbf3b..125158543 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,24 @@ +Version 0.11.0 (Jan 17, 2016) +----------------------------- + + * Update excluded files in package build - Stephen McDonald + * Allow propagation of additional constructor arguments. for ``cartridge.shop.forms.OrderForm`` descendants - David Unric + * Limit shop category page processor to exact page - David Sanders + * Add database indexing to ``order.key`` - David Sanders + * Update contributing section to reflect ``project_template`` layout - David Sanders + * Change SKU uniqueness constraint to be per site - Stephen McDonald + * Resolve css/js Media paths using static templatetag - David Sanders + * Change the initial migration so that ``Order.status`` references ``settings.SHOP_ORDER_STATUS_CHOICES``, rather than the literal values - Chris Trengove + * Changed reference in ``initial_form_data`` to ``form_class`` - ChrisKuper + * Fix other instances of checkout not using custom form class - Stephen McDonald + * Add support for Python 3.5 in trove classifiers and travis build - Sam Kingston + * Update checkout JS for Universal Analytics - Alex Hill + * Update to latest ``settings.py`` code from Mezzanine - Stephen McDonald + * Update from deprecated features of urlpatterns - Stephen McDonald + * Update Django/Python versions in travis config - Stephen McDonald + * Added missing context update for cart view ``extra_context`` - Kelvin Wong + * Run shipping/tax handlers on every checkout step, since hidden address fields could be modified on any step - Stephen McDonald + Version 0.10.0 (Jul 26, 2015) ----------------------------- diff --git a/docs/settings.rst b/docs/settings.rst index 1e4f4fcd3..6bfe30f43 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -1,5 +1,7 @@ .. THIS DOCUMENT IS AUTO GENERATED VIA conf.py +.. _SHOP_CARD_TYPES: + ``SHOP_CARD_TYPES`` ------------------- @@ -7,6 +9,8 @@ Sequence of available credit card types for payment. Default: ``('Mastercard', 'Visa', 'Diners', 'Amex')`` +.. _SHOP_CART_EXPIRY_MINUTES: + ``SHOP_CART_EXPIRY_MINUTES`` ---------------------------- @@ -14,6 +18,8 @@ Number of minutes of inactivity until carts are abandoned. Default: ``30`` +.. _SHOP_CATEGORY_USE_FEATURED_IMAGE: + ``SHOP_CATEGORY_USE_FEATURED_IMAGE`` ------------------------------------ @@ -21,6 +27,8 @@ Enable featured images in shop categories Default: ``False`` +.. _SHOP_CHECKOUT_ACCOUNT_REQUIRED: + ``SHOP_CHECKOUT_ACCOUNT_REQUIRED`` ---------------------------------- @@ -28,6 +36,8 @@ If True, users must create a login for the checkout process. Default: ``False`` +.. _SHOP_CHECKOUT_STEPS_CONFIRMATION: + ``SHOP_CHECKOUT_STEPS_CONFIRMATION`` ------------------------------------ @@ -35,6 +45,8 @@ If True, the checkout process has a final confirmation step before completion. Default: ``True`` +.. _SHOP_CHECKOUT_STEPS_SPLIT: + ``SHOP_CHECKOUT_STEPS_SPLIT`` ----------------------------- @@ -42,6 +54,8 @@ If True, the checkout process is split into separate billing/shipping and paymen Default: ``True`` +.. _SHOP_CURRENCY_LOCALE: + ``SHOP_CURRENCY_LOCALE`` ------------------------ @@ -49,6 +63,8 @@ Controls the formatting of monetary values according to the locale module in the Default: ``''`` +.. _SHOP_DEFAULT_SHIPPING_VALUE: + ``SHOP_DEFAULT_SHIPPING_VALUE`` ------------------------------- @@ -56,6 +72,8 @@ Default cost of shipping when no custom shipping is implemented. Default: ``10.0`` +.. _SHOP_DISCOUNT_FIELD_IN_CART: + ``SHOP_DISCOUNT_FIELD_IN_CART`` ------------------------------- @@ -63,6 +81,8 @@ Discount codes can be entered on the cart page. Default: ``True`` +.. _SHOP_DISCOUNT_FIELD_IN_CHECKOUT: + ``SHOP_DISCOUNT_FIELD_IN_CHECKOUT`` ----------------------------------- @@ -70,6 +90,8 @@ Discount codes can be entered on the first checkout step. Default: ``True`` +.. _SHOP_HANDLER_BILLING_SHIPPING: + ``SHOP_HANDLER_BILLING_SHIPPING`` --------------------------------- @@ -77,6 +99,8 @@ Dotted package path and class name of the function called upon submission of the Default: ``'cartridge.shop.checkout.default_billship_handler'`` +.. _SHOP_HANDLER_ORDER: + ``SHOP_HANDLER_ORDER`` ---------------------- @@ -84,6 +108,8 @@ Dotted package path and class name of the function that is called once an order Default: ``'cartridge.shop.checkout.default_order_handler'`` +.. _SHOP_HANDLER_PAYMENT: + ``SHOP_HANDLER_PAYMENT`` ------------------------ @@ -91,6 +117,8 @@ Dotted package path and class name of the function that is called upon submissio Default: ``'cartridge.shop.checkout.default_payment_handler'`` +.. _SHOP_HANDLER_TAX: + ``SHOP_HANDLER_TAX`` -------------------- @@ -98,6 +126,8 @@ Dotted package path and class name of the function called upon submission of the Default: ``'cartridge.shop.checkout.default_tax_handler'`` +.. _SHOP_OPTION_ADMIN_ORDER: + ``SHOP_OPTION_ADMIN_ORDER`` --------------------------- @@ -105,6 +135,8 @@ Sequence of indexes from the ``SHOP_OPTION_TYPE_CHOICES`` setting that control h Default: ``()`` +.. _SHOP_OPTION_TYPE_CHOICES: + ``SHOP_OPTION_TYPE_CHOICES`` ---------------------------- @@ -112,6 +144,8 @@ Sequence of value/name pairs for types of product options (e.g. Size, Colour). Default: ``((1, 'Size'), (2, 'Colour'))`` +.. _SHOP_ORDER_EMAIL_BCC: + ``SHOP_ORDER_EMAIL_BCC`` ------------------------ @@ -119,6 +153,8 @@ All order receipts will be BCCd to this address. Default: ``''`` +.. _SHOP_ORDER_EMAIL_SUBJECT: + ``SHOP_ORDER_EMAIL_SUBJECT`` ---------------------------- @@ -126,6 +162,8 @@ Subject to be used when sending the order receipt email. Default: ``'Order Receipt'`` +.. _SHOP_ORDER_FROM_EMAIL: + ``SHOP_ORDER_FROM_EMAIL`` ------------------------- @@ -133,6 +171,8 @@ Email address from which order receipts should be emailed. Default: ``[dynamic]`` +.. _SHOP_ORDER_STATUS_CHOICES: + ``SHOP_ORDER_STATUS_CHOICES`` ----------------------------- @@ -140,6 +180,8 @@ Sequence of value/name pairs for order statuses. Default: ``((1, 'Unprocessed'), (2, 'Processed'))`` +.. _SHOP_PAYMENT_STEP_ENABLED: + ``SHOP_PAYMENT_STEP_ENABLED`` ----------------------------- @@ -147,6 +189,8 @@ If False, there is no payment step on the checkout process. Default: ``True`` +.. _SHOP_PER_PAGE_CATEGORY: + ``SHOP_PER_PAGE_CATEGORY`` -------------------------- @@ -154,6 +198,8 @@ Number of products to display per category page. Default: ``12`` +.. _SHOP_PRODUCT_SORT_OPTIONS: + ``SHOP_PRODUCT_SORT_OPTIONS`` ----------------------------- @@ -161,6 +207,8 @@ Sequence of description/field+direction pairs defining the options available for Default: ``(('Recently added', '-date_added'), ('Highest rated', '-rating_average'), ('Least expensive', 'unit_price'), ('Most expensive', '-unit_price'))`` +.. _SHOP_USE_RATINGS: + ``SHOP_USE_RATINGS`` -------------------- @@ -168,6 +216,8 @@ Show the product rating form, and allow browsing by rating. Default: ``True`` +.. _SHOP_USE_RELATED_PRODUCTS: + ``SHOP_USE_RELATED_PRODUCTS`` ----------------------------- @@ -175,6 +225,8 @@ Show related products in templates, and allow editing them in the admin. Default: ``True`` +.. _SHOP_USE_UPSELL_PRODUCTS: + ``SHOP_USE_UPSELL_PRODUCTS`` ---------------------------- @@ -182,6 +234,8 @@ Show upsell products in templates, and allow editing them in the admin. Default: ``True`` +.. _SHOP_USE_VARIATIONS: + ``SHOP_USE_VARIATIONS`` ----------------------- @@ -189,6 +243,8 @@ Use product variations. Default: ``True`` +.. _SHOP_USE_WISHLIST: + ``SHOP_USE_WISHLIST`` ---------------------