Changeset 1001

Timestamp:

01/15/08 18:52:40 (1 year ago)

Author:

bkroeze

Message:

using signals to catch the situation where a contact changes state or country in mid-order, updating tax appropriately. Also pushing tax-aware templates to the shipping option page.

Files:

• satchmo/trunk/satchmo/contact/forms.py (modified) (5 diffs)
• satchmo/trunk/satchmo/contact/models.py (modified) (2 diffs)
• satchmo/trunk/satchmo/contact/signals.py (modified) (1 diff)
• satchmo/trunk/satchmo/payment/common/forms.py (modified) (4 diffs)
• satchmo/trunk/satchmo/tax/templatetags/satchmo_tax.py (modified) (3 diffs)
• satchmo/trunk/satchmo/templates/shipping_options.html (modified) (1 diff)

satchmo/trunk/satchmo/contact/forms.py

@@ -1 +1 @@
-from django import newforms as forms
+from django.dispatch import dispatcher
-from django.utils.translation import ugettext as _
-from satchmo.configuration import config_value, config_get_group, SettingNotSet
@@ -5 +6 @@
-from satchmo.l10n.models import Country
-from satchmo.shop.models import Config
+from signals import satchmo_contact_location_changed
-import datetime
-
@@ -158 +160 @@
-            bill_address = AddressBook(contact=customer)
-                
+        changed_location = False
-        address_keys = bill_address.__dict__.keys()
-        for field in address_keys:
+            if (not changed_location) and field in ('state', 'country', 'city'):
+                if getattr(bill_address, field) != data[field]:
+                    changed_location = True
-            try:
-                setattr(bill_address, field, data[field])
@@ -184 +190 @@
-            
-            for field in address_keys:
+                if (not changed_location) and field in ('state', 'country', 'city'):
+                    if getattr(ship_address, field) != data[field]:
+                        changed_location = True
-                try:
-                    setattr(ship_address, field, data['ship_' + field])
@@ -202 +211 @@
-        phone.save()
-        
+        if changed_location:
+            dispatcher.send(signal=satchmo_contact_location_changed, contact=contact)
+        
-        return customer.id
-

satchmo/trunk/satchmo/contact/models.py

@@ -18 +18 @@
-from satchmo.shop.templatetags.satchmo_currency import moneyfmt
-from satchmo.shop.utils import load_module
-
+, satchmo_contact_location_changed
-import config
-import datetime
@@ -908 +908 @@
-        log.debug("caught cart changed signal - remove_order_on_cart_update")
-        Order.objects.remove_partial_order(request)
-
+
+
+
+
+
+
+
+
+
+
-dispatcher.connect(_remove_order_on_cart_update, signal=satchmo_cart_changed)
+dispatcher.connect(_recalc_total_on_contact_change, signal=satchmo_contact_location_changed)

satchmo/trunk/satchmo/contact/signals.py

@@ -1 +1 @@
-"""Signals sent by the Cart system"""
-
+
+

satchmo/trunk/satchmo/payment/common/forms.py

@@ -1 +1 @@
-from django import newforms as forms
-from django.conf import settings
-
+Request
-from django.template import loader
-from django.utils.translation import ugettext as _
+from satchmo.configuration import config_value
-from satchmo.contact.forms import ContactInfoForm
-from satchmo.contact.models import Contact
@@ -16 +17 @@
-import sys
-
-paymentmodule, cart, contact
+request, paymentmodule, cart, contact, default_view_tax=False
-    """Iterate through legal shipping modules, building the list for display to the user.
-    
@@ -31 +32 @@
-            t = loader.get_template(template)
-            shipcost = method.cost()
-Context(
+RequestContext(request, 
-                'amount': shipcost,
-                'description' : method.description(),
-                'method' : method.method(),
-
+
+
-            shipping_options.append((method.id, t.render(c)))
-            shipping_dict[method.id] = shipcost
@@ -84 +86 @@
-            self.tempContact = None
-            
-
+
+
+
+
+
+
-        self.fields['shipping'].choices = shipping_choices
-        self.shipping_dict = shipping_dict

satchmo/trunk/satchmo/tax/templatetags/satchmo_tax.py

@@ -48 +48 @@
-            item = template.resolve_variable(self.cartitem, context)
-        except template.VariableDoesNotExist:
-al
+la
-        
-        total = item.line_total + taxer.by_price(item.product.taxClass, item.line_total)
+        
-        if self.currency:
-            return moneyfmt(total)
@@ -84 +85 @@
-            return moneyfmt(total)
-        
-        if currency:
-            return moneyfmt(total)
-        return total
-
@@ -146 +145 @@
-        
-    return TaxRateNode(taxclass, order, digits)
+    
+class TaxedPriceNode(template.Node):
+    """Returns the taxed price for an amount.
+    """
+    def __init__(self, price, currency, taxclass):
+        self.price = price
+        self.taxclass = taxclass
+        self.currency = currency
+
+    def render(self, context):
+        taxer = _get_taxprocessor(context['request'])
+        try:
+            price = template.resolve_variable(self.price, context)
+        except template.VariableDoesNotExist:
+            raise template.TemplateSyntaxError("No such variable: %s", self.price)
+
+        total = price + taxer.by_price(self.taxclass, price)
+        
+        if self.currency:
+            return moneyfmt(total)
+                        
+        return total
+        
+def taxed_price(parser, token):
+    """Returns the taxed price for an amount.  If currency evaluates true,
+    then return the total formatted through moneyfmt.
+    Example: {% taxed_price amount [currency] [taxclass] %}
+    """
+    tokens = token.contents.split()
+    if len(tokens) < 2:
+        raise template.TemplateSyntaxError, "'%s' tag requires an amount argument" % tokens[0]
+    
+    price = tokens[1]
+    if len(tokens) > 2:
+        currency = tokens[2]
+    else:
+        currency = False
+    
+    if len(tokens) > 3:
+        taxclass = tokens[3]
+    else:
+        taxclass = "Default"
+
+    return TaxedPriceNode(price, currency, taxclass)
+
+    
-
-register.tag('cartitem_line_taxed_total', cartitem_line_taxed_total)
-register.tag('cart_taxed_total', cart_taxed_total)
+register.tag('taxed_price', taxed_price)
-register.tag('tax_rate', tax_rate)

satchmo/trunk/satchmo/templates/shipping_options.html

@@ -1 +1 @@
-{% load i18n %}
-{% load satchmo_currency %}
-
-
+
+
+
-{% blocktrans %}Sent via {{ method }} arrives approximately {{ expected_delivery }}.{% endblocktrans %}
-<hr>