WebSVN – SmartDukaan – Diff – //trunk/PyDTR/src/dtr/sources/amazon.py

                 resp["result"] = 'ORDER_NOT_CREATED'
                 return resp
         else:
             try:
+                mo = self.db.merchantOrder.find_one({"orderId":orderId})
+                if mo is not None:
+                    merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)
+                    merchantOrder.createdOn = mo.get("createdOn")
+                    merchantOrder.createdOnInt =  mo.get("createdOnInt")
+                else:
-                merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, False)
+                    merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl, False)
                 soup = BeautifulSoup(rawHtml)
                 try:
                     self.parseOldStlye(merchantOrder, soup)
                 except:
                     try:
                 subOrder = SubOrder(productTitle, productUrl, merchantOrder.placedOn, unitPrice*quantity, status, quantity)
                 subOrder.merchantSubOrderId = str(counter) + " of " + merchantOrder.merchantOrderId
                 subOrder.estimatedDeliveryDate = estimatedDelivery
+                estDlvyTime = datetime.strptime(estimatedDelivery.split('-')[0].strip(), "%A %d %B %Y")
+                createdOn = datetime.fromtimestamp(merchantOrder.createdOnInt)
+                subOrder.trackAfter = int(time.mktime(max(estDlvyTime-timedelta(days=4),createdOn + timedelta(days=3)).timetuple()))
                 subOrder.productCode = productUrl.split('/')[5]
                 subOrder.detailedStatus = detailedStatus
                 (cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, unitPrice*quantity)
                 cashbackStatus = Store.CB_PENDING
                 if cashbackAmount <= 0:
                 productUrl = "http://www.amazon.in" + detailDivs[0].a.get('href')
                 subOrder = SubOrder(productTitle, productUrl, merchantOrder.placedOn, amountPaid, MStore.ORDER_PLACED, quantity)
                 subOrder.productCode = productUrl.split('/')[5]
                 subOrder.unitPrice = unitPrice
                 subOrder.merchantSubOrderId = str(i) + " of " + merchantOrder.merchantOrderId
+                estDlvyTime = datetime.now()
                 if deliverySpan is not None:
                     subOrder.estimatedDeliveryDate = deliverySpan.span.text.strip()
+                    estDate = subOrder.estimatedDeliveryDate.split("-")[0].strip()
+                    subOrder.estimatedDeliveryInt = int(time.mktime((datetime.strptime(estDate, "%A %d %B %Y")).timetuple()))
+                    estDlvyTime = datetime.strptime(estDate, "%A %d %B %Y")
+                createdOn = datetime.fromtimestamp(merchantOrder.createdOnInt)
+                subOrder.trackAfter = int(time.mktime(max(estDlvyTime-timedelta(days=4),createdOn + timedelta(days=3)).timetuple()))/1000
                 subOrder.detailedStatus = subOrderStatus
                 subOrder.deliveryCharges = shippingPrice
                 subOrder.imgUrl = imgDiv.img["src"]
                 (cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, amountPaid)
                 cashbackStatus = Store.CB_PENDING
                 subOrders.append(subOrder)
         merchantOrder.status='success'
         self._updateToOrder(todict(merchantOrder))
     def parseCancelled(self, merchantOrder,soup):
+        try:
-        fonts = soup.body.findAll("table", recursive=False)[1].findAll("font")
+            fonts = soup.body.findAll("table", recursive=False)[1].findAll("font")
-        if fonts[0].text == "Important Message":
+            if fonts[0].text == "Important Message":
-            if fonts[1].text=="This order has been cancelled.":
+                if fonts[1].text=="This order has been cancelled.":
-                merchantOrder.closed = True
+                    merchantOrder.closed = True
-                merchantOrder.status = "cancelled"
+                    merchantOrder.status = "cancelled"
-                merchantOrder.requireDetail = False
+                    merchantOrder.requireDetail = False
-                self._updateToOrder(todict(merchantOrder))
+                    self._updateToOrder(todict(merchantOrder))
+                    return
+                else:
+                    raise ParseException("parseCancelled", "Found detailed status" + fonts[1].text)
             else:
                 raise ParseException("parseCancelled", "Found detailed status" + fonts[1].text)
-        else:
+        except:
             orderDetails = soup.body.find(id="orderDetails")
             if orderDetails is not None and orderDetails.h4.text == "This order has been cancelled.":
                 merchantOrder.closed = True
                 merchantOrder.status = "cancelled"
                 merchantOrder.requireDetail = False
 #                     ('Accept', 'text/html,application/xhtml+xml,application/json,application/xml;q=0.9,*/*;q=0.8'),
 #                     ('Accept-Encoding', 'gzip,deflate,sdch'),
 #                     ('Accept-Language', 'en-US,en;q=0.8'),
 #                     ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.3')]
 #    store.scrapeStoreOrders()
-    store.parseOrderRawHtml(2121, "13232", 14, readSSh("/home/amit/917.html"), "https://www.amazon.in/gp/bOy/spc/handlers/static-submit-decoupled.html/ref=ox_spc_place_order?ie=UTF8&hasWorkingJavascript=")
+    store.parseOrderRawHtml(2121, "13232", 14, readSSh("/home/amit/1313.html"), "https://www.amazon.in/gp/css/summary/edit.html?orderID=171-5857029-0804336")
+    #store.parseOrderRawHtml(2121, "13232", 14, readSSh("/home/amit/f1.html"), "https://www.amazon.in/gp/css/summary/edit.html?orderID=171-5196461-3230730")
     #readSSh("/tmp/User211/2015-04-01 15:31:42.250309")
     #store.scrapeAffiliate()
 def readSSh(fileName):
     try:
             str1 = open(fileName).read()

Subversion Repositories SmartDukaan

(root)//trunk/PyDTR/src/dtr/sources/amazon.py – Rev 14703 → 14722