Changeset 622 for modules/trunk/GoogleMerchant/views.py

Timestamp:

02/17/10 15:25:48 (7 months ago)

Author:

av

Message:

fixed google price for minimum_quantity_for_purchase; ignored products with empty urls

Files:

• modules/trunk/GoogleMerchant/views.py (modified) (4 diffs)

modules/trunk/GoogleMerchant/views.py

@@ -8 +8 @@
 from djw.core.ProductCatalog.models import Product
 from django.http import Http404
+# dependense
+from djw.custom.ProductCatalog_custom.models import customizedProduct
 
 # todo: move function to djhdgutils
@@ -23 +25 @@
         self._product = product
         self._country = country
+        self._customized_product = customizedProduct.objects.get(
+            product=product)
         super(GProduct, self).__init__(*args, **kwargs)
 
@@ -33 +37 @@
     def price(self):
         if settings.PRICE_FOR_COUNTRY:
-            return settings.PRICE_FOR_COUNTRY(self.product, self._country)
+            single_price = settings.PRICE_FOR_COUNTRY(self.product,
+                                                    self._country)
         else:
-            return self.product.price
+            single_price = self.product.price
+
+        min_quantity_price = single_price * self._customized_product\
+            .minimum_quantity_for_purchase
+
+        return min_quantity_price
 
 
@@ -56 +66 @@
     google_products = [GProduct(p, country)
                        for p in Product.objects.all()
+                       if p.get_absolute_url() != ''
                        ]