Changeset 1004

Timestamp:

01/16/08 04:46:10 (1 year ago)

Author:

chris

Message:

Initial commit of the UPS shipping module.

Files:

• satchmo/trunk/satchmo/product/models.py (modified) (7 diffs)
• satchmo/trunk/satchmo/shipping/config.py (modified) (1 diff)
• satchmo/trunk/satchmo/shipping/modules/ups (added)
• satchmo/trunk/satchmo/shipping/modules/ups/__init__.py (added)
• satchmo/trunk/satchmo/shipping/modules/ups/config.py (added)
• satchmo/trunk/satchmo/shipping/modules/ups/shipper.py (added)
• satchmo/trunk/satchmo/shop/config.py (modified) (1 diff)
• satchmo/trunk/satchmo/templates/shipping (added)
• satchmo/trunk/satchmo/templates/shipping/ups (added)
• satchmo/trunk/satchmo/templates/shipping/ups/request.xml (added)

satchmo/trunk/satchmo/product/models.py

@@ -20 +20 @@
-from sets import Set
-import logging
+from django.core.validators import RequiredIfOtherFieldGiven
-try:
-    from django.utils.safestring import mark_safe
@@ -41 +42 @@
-def protected_dir():
-    return normalize_dir(config_value('PRODUCT', 'PROTECTED_DIR'))
+
+def dimension_units():
+    if config_value('SHOP','MEASUREMENT_SYSTEM')[0] == 'metric':
+        return ([('cm','cm')])
+    else:
+        return ([('in','in')])
+
+def weight_units():
+    if config_value('SHOP','MEASUREMENT_SYSTEM')[0] == 'metric':
+        return ([('kg','kg')])
+    else:
+        return ([('lb','lb')])
+
+length_validator = RequiredIfOtherFieldGiven('length', _("A unit of measure must be entered for the length"))
+width_validator = RequiredIfOtherFieldGiven('width', _("A unit of measure must be entered for the width"))
+height_validator = RequiredIfOtherFieldGiven('height', _("A unit of measure must be entered for the height"))
+weight_validator = RequiredIfOtherFieldGiven('weight', _("A unit of measure must be entered for the weight"))
-
-class Category(models.Model):
@@ -371 +389 @@
-    name = models.CharField(_("Full Name"), max_length=255, help_text=_("This is what the product will be called in the default site language.  To add non-default translations, use the Product Translation section below."))
-    slug = models.SlugField(_("Slug Name"), unique=True, prepopulate_from=('name',), core=True, blank=False)
-
+, help_text=_("Defaults to slug if left blank")
-    short_description = models.TextField(_("Short description of product"), help_text=_("This should be a 1 or 2 line description in the default site language for use in product listing screens"), max_length=200, default='', blank=True)
-    description = models.TextField(_("Description of product"), help_text=_("This field can contain HTML and should be a few paragraphs in the default site language explaining the background of the product, and anything that would help the potential customer make their purchase."), default='', blank=True)
@@ -382 +400 @@
-    ordering = models.IntegerField(_("Ordering"), default=0, help_text=_("Override alphabetical order in category display"))
-    weight = models.DecimalField(_("Weight"), max_digits=8, decimal_places=2, null=True, blank=True)
+    weight_units = models.CharField(_("Weight units"), max_length=3, choices=weight_units(), null=True, blank=True, validator_list=[weight_validator])
-    length = models.DecimalField(_("Length"), max_digits=6, decimal_places=2, null=True, blank=True)
+    length_units = models.CharField(_("Length units"), max_length=3, choices=dimension_units(), null=True, blank=True, validator_list=[length_validator])
-    width = models.DecimalField(_("Width"), max_digits=6, decimal_places=2, null=True, blank=True)
+    width_units = models.CharField(_("Width units"), max_length=3, choices=dimension_units(), null=True, blank=True, validator_list=[width_validator])
-    height = models.DecimalField(_("Height"), max_digits=6, decimal_places=2, null=True, blank=True)
+    height_units = models.CharField(_("Height units"), max_length=3, choices=dimension_units(), null=True, blank=True, validator_list=[height_validator])
-    related_items = models.ManyToManyField('self', blank=True, null=True, verbose_name=_('Related Items'), related_name='related_products')
-    also_purchased = models.ManyToManyField('self', blank=True, null=True, verbose_name=_('Previously Purchased'), related_name='also_products')
@@ -495 +517 @@
-        else:
-            return False;
+            
+    def _has_full_dimensions(self):
+        """Return true if the dimensions all have units and values. Used in shipping calcs. """
+        if self.length and self.length_units and self.width and self.width_units and self.height and self.height_units:
+            return True
+        return False
+    has_full_dimensions = property(_has_full_dimensions)
+    
+    def _has_full_weight(self):
+        """Return True if we have weight and weight units"""
+        if self.weight and self.weight_units:
+            return True
+        return False
+    has_full_weight = property(_has_full_weight)            
-
-    def __unicode__(self):
@@ -509 +545 @@
-        (None, {'fields': ('category', 'name', 'slug', 'sku', 'description', 'short_description', 'date_added', 'active', 'featured', 'items_in_stock','ordering')}),
-        (_('Meta Data'), {'fields': ('meta',), 'classes': 'collapse'}),
-width','height',),'weight'
+length_units','width','width_units','height','height_units'),('weight','weight_units')
-        (_('Tax'), {'fields':('taxable', 'taxClass'), 'classes': 'collapse'}),
-        (_('Related Products'), {'fields':('related_items','also_purchased'),'classes':'collapse'}),
@@ -523 +559 @@
-        if not self.id:
-            self.date_added = datetime.date.today()
-
+
+
-        super(Product, self).save()
-

satchmo/trunk/satchmo/shipping/config.py

@@ -20 +20 @@
-# just add satchmo.shipping.modules.tiered to your INSTALLED_APPS, you don't
-# need to add it to CUSTOM_SHIPPING_MODULES either.
-
+, 'ups'
-
-for module in _default_modules:
-
-    
-
-
+#
+
+#
+#
-
-# --- Load any extra shipping modules. ---

satchmo/trunk/satchmo/shop/config.py

@@ -28 +28 @@
-        description= _("Number of featured items to display"),
-        default=20))
-
+
+
+
+
+
+
+
+
-#### Google Group ####
-