WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/main.py

         #if subOrder.get
     def _saveToOrder(self, order):
         collection = self.db.merchantOrder
         try:
+            print "************************************************************************"
+            print "order"
+            print order
+            print "************************************************************************"
             order = collection.insert(order)
             return True
         except Exception as e:
             return False
     def populateDerivedFields(self, order):
         closed=True
         for subOrder in order.subOrders:
             if subOrder.closed:
                 continue
+            amount = subOrder.amount if hasattr(subOrder, 'amount') else subOrder.amountPaid
-            cashbackAmount, cashbackPercent = self.getCashbackAmount(subOrder.productCode, subOrder.amountPaid)
+            cashbackAmount, cashbackPercent = self.getCashbackAmount(subOrder.productCode, amount)
             cashbackStatus = Store.CB_PENDING
             if cashbackAmount <= 0:
                 cashbackStatus = Store.CB_NA
             subOrder.cashBackAmount = cashbackAmount
             subOrder.cashBackPercentage = cashbackPercent
     else:
         return obj
 def ungzipResponse(r):
     headers = r.info()
-    if headers['Content-Encoding']=='gzip':
+    if headers.get('Content-Encoding')=='gzip':
         import gzip
         gz = gzip.GzipFile(fileobj=r, mode='rb')
         html = gz.read()
         gz.close()
+    else:
+        html = r.read()
-        return html
+    return html
 def tprint(*msg):
     print datetime.now(), "-", msg
 if __name__ == '__main__':

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/main.py – Rev 17234 → 17388