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

                     resp['result'] = 'DETAIL_NOT_CREATED_KNOWN'
                 else:
                     try:
                         self.parseNewStlye(merchantOrder, soup)
                         resp['result'] = 'DETAIL_CREATED'
-                        return
                     except:
                         try:
                             traceback.print_exc()
                             self.parseOldStlye(merchantOrder, soup)
                             resp['result'] = 'DETAIL_CREATED'
-                            return
                         except:
                             traceback.print_exc()
                             try:
                                 self.parseCancelled(merchantOrder, soup)
                                 resp['result'] = 'ORDER_CANCELLED'
-                                return
                             except:
                                 try:
                                     if soup.find("h1").text.strip() in ["Your Account"] or soup.find("h1").span.text=="Account":
                                         resp['result'] = 'DETAIL_NOT_CREATED_KNOWN'
                                     else:
                                 except:
                                     if soup.find(id="ap_signin_pagelet_title").find("h1").text.strip()=="Sign In":
                                         resp['result'] = 'DETAIL_NOT_CREATED_KNOWN'
                                     else:
                                         raise
-                order = self.db.merchantOrder.find_one({"orderId":orderId})
-                if order is not None:
+                if resp['result'] == 'DETAIL_NOT_CREATED_KNOWN':
                     self.db.merchantOrder.update({"orderId":orderId}, {"$set":{"status":"html_required"}})
             except:
-                order = self.db.merchantOrder.find_one({"orderId":orderId})
-                if order is not None:
-                    self.db.merchantOrder.update({"orderId":orderId}, {"$set":{"status":"parse_failed"}})
+                self.db.merchantOrder.update({"orderId":orderId}, {"$set":{"status":"parse_failed"}})
                 print "Error occurred"
                 resp['result'] = 'DETAIL_NOT_CREATED_UNKNOWN'
                 traceback.print_exc()
         return resp
                 j=i+1
                 if not deliverySpanTop:
                     if i%2==1:
                         continue
                     j=i/2 + 1
-                    deliverySpan = productDiv.div.div.span
+                    deliverySpan = statusDiv.div.div.span
-                    productDiv = productDivs[i+1].div
                 imgDiv  = productDiv.div.div
                 detailDiv = imgDiv.find_next_sibling('div')
                 detailDivs = detailDiv.findAll('div', recursive=False)
                 arr = detailDivs[0].a.text.strip().split(" of ", 1)
                 (productTitle, quantity) = (arr[-1], (1 if len(arr)==1 else int(arr[0])) )
                         subOrder.estimatedDeliveryDate = "Not available"
                 createdOn = datetime.fromtimestamp(merchantOrder.createdOnInt)
                 subOrder.trackAfter = int(time.mktime(max(estDlvyTime-timedelta(days=4),createdOn + timedelta(days=3)).timetuple()))
                 subOrder.detailedStatus = subOrderStatus
+                status=MStore.ORDER_PLACED
+                try:
+                    status = self._getStatusFromDetailedStatus(subOrderStatus)
+                except:
+                    try:
+                        dateString = subOrderStatus.split("Delivered ")[1].strip()
+                        subOrder.status = MStore.ORDER_DELIVERED
+                        subOrder.detailedStatus = 'Delivered'
+                        subOrder.deliveredOn = datetime.strftime(getDateStringDelivered(dateString), '%d-%b-%y')
+                    except:
+                        try:
+                            dateString = subOrderStatus.split("Arriving ")[1].split("by")[0].strip()
+                            subOrder.status = MStore.ORDER_SHIPPED
+                            subOrder.deliveryEstimate = datetime.strftime(getDateStringArriving(dateString), '%d-%b-%y')
+                        except:
+                            print "Unknown status Alert -", status
                 subOrder.deliveryCharges = shippingPrice
                 if trackingUrl:
                     subOrder.tracingkUrl  = trackingUrl
                 subOrder.imgUrl = imgDiv.img["src"]
                 (cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, amountPaid)
                     cashbackStatus = Store.CB_NA
                 subOrder.cashBackStatus = cashbackStatus
                 subOrder.cashBackAmount = cashbackAmount
                 if percentage > 0:
                     subOrder.cashBackPercentage = percentage
-                if hasattr(subOrder, 'deliveredOn'):
+                if hasattr(subOrder, 'deliveredOn') or subOrder.status==Store.ORDER_DELIVERED:
                     subOrder.status = Store.ORDER_DELIVERED
                     subOrder.closed = True
                     if subOrder.cashBackStatus == Store.CB_PENDING:
                         subOrder.cashBackStatus = Store.CB_APPROVED
                 elif closedStatus:
 #            o = session.query(OrdersRaw).filter_by(id = orderId).one()
 #            o.status = 'ORDER_CREATED'
 #            session.commit()
 #        finally:
 #            session.close()
+    store.trackOrdersForUser(10466, 'https://www.amazon.in/gp/css/summary/edit.html?orderID=403-7498756-0837158', readSSh('/AmazonTrack/User10466/403-7498756-0837158'))
-    store.trackOrdersForUser(12243, 'https://www.amazon.in/gp/css/summary/edit.html?orderID=171-1842941-8579542', readSSh('/AmazonTrack/User12243/171-1842941-8579542'))
+    store.trackOrdersForUser(10466, 'https://www.amazon.in/gp/css/summary/edit.html?orderID=403-2539406-8617932', readSSh('/AmazonTrack/User10466/403-2539406-8617932'))
+    #store.parseOrderRawHtml(3324325, '12', 10466, readSSh('/home/amit/s1.html'), 'https://www.amazon.in/gp/css/summary/edit.html?orderID=403-7498756-0837158')
 def getSummaryFile(directory):
     date1 = datetime(2015,1,1)
     finalFile = None
     try:
     finally:
         session.close()
 if __name__ == '__main__':
-#        readSSh("~/46417.html")
-        main()
-        #getDateStringArriving()
 #    readSSh("/AmazonTrack/User2942/402-2467356-7564367")
+#    readSSh("/AmazonTrack/User10466/orderSummary18-11:21:32:36")
+#    readSSh("/AmazonTrack/User10466/403-7498756-0837158")
+    main()

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/sources/amazon.py – Rev 17480 → 17599