Subversion Repositories SmartDukaan

Rev

Rev 15346 | Rev 15474 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 15346 Rev 15473
Line 291... Line 291...
291
        totalPaid = subTotal        
291
        totalPaid = subTotal        
292
        if promoApplied > 0:
292
        if promoApplied > 0:
293
            totalPaid -= promoApplied
293
            totalPaid -= promoApplied
294
            if shippingPrice <= promoApplied:
294
            if shippingPrice <= promoApplied:
295
                totalPaid  += shippingPrice
295
                totalPaid  += shippingPrice
296
 
296
        
-
 
297
        try:
297
        shipmentDivs = orderDetailsContainer.find('div', {'class':'a-box shipment'}).findAll('div', recursive = False)
298
            shipmentDivs = orderDetailsContainer.find('div', class_='shipment').findAll('div', recursive = False)
-
 
299
        
298
        subOrders = []
300
        subOrders = []
299
        merchantOrder.subOrders = subOrders
301
        merchantOrder.subOrders = subOrders
300
        i=1
302
        i=1
-
 
303
        closedStatus = True
301
        for shipmentDiv in shipmentDivs:
304
        for shipmentDiv in shipmentDivs:
302
            innerBoxes = shipmentDiv.findAll('div', recursive = False)
305
            innerBoxes = shipmentDiv.findAll('div', recursive = False)
303
            statusDiv = innerBoxes[0]
306
            statusDiv = innerBoxes[0]
304
            subOrderStatus = statusDiv.div.span.text.strip()
307
            subOrderStatus = statusDiv.div.span.text.strip()
305
            deliverySpan = statusDiv.div.div.find_next_sibling('div').span
308
            deliverySpan = statusDiv.div.div.find_next_sibling('div').span
Line 329... Line 332...
329
                        subOrder.estimatedDeliveryDate = deliverySpan.span.text.strip()
332
                        subOrder.estimatedDeliveryDate = deliverySpan.span.text.strip()
330
                        estDate = subOrder.estimatedDeliveryDate.split("-")[0].strip()
333
                        estDate = subOrder.estimatedDeliveryDate.split("-")[0].strip()
331
                        subOrder.estimatedDeliveryInt = int(time.mktime((datetime.strptime(estDate, "%A %d %B %Y")).timetuple()))
334
                        subOrder.estimatedDeliveryInt = int(time.mktime((datetime.strptime(estDate, "%A %d %B %Y")).timetuple()))
332
                        estDlvyTime = datetime.strptime(estDate, "%A %d %B %Y")
335
                        estDlvyTime = datetime.strptime(estDate, "%A %d %B %Y")
333
                    except:
336
                    except:
-
 
337
                        if "Delivered on" in deliverySpan.text:
-
 
338
                            subOrder.deliveredOn = deliverySpan.text.split(":")[1].strip() 
334
                        subOrder.estimatedDeliveryDate = "Not available"
339
                        subOrder.estimatedDeliveryDate = "Not available"
-
 
340
                        
335
                createdOn = datetime.fromtimestamp(merchantOrder.createdOnInt)
341
                createdOn = datetime.fromtimestamp(merchantOrder.createdOnInt)
336
                subOrder.trackAfter = int(time.mktime(max(estDlvyTime-timedelta(days=4),createdOn + timedelta(days=3)).timetuple()))
342
                subOrder.trackAfter = int(time.mktime(max(estDlvyTime-timedelta(days=4),createdOn + timedelta(days=3)).timetuple()))
337
                subOrder.detailedStatus = subOrderStatus
343
                subOrder.detailedStatus = subOrderStatus
338
                subOrder.deliveryCharges = shippingPrice
344
                subOrder.deliveryCharges = shippingPrice
339
                subOrder.imgUrl = imgDiv.img["src"]
345
                subOrder.imgUrl = imgDiv.img["src"]
Line 346... Line 352...
346
                    cashbackStatus = Store.CB_NA
352
                    cashbackStatus = Store.CB_NA
347
                subOrder.cashBackStatus = cashbackStatus
353
                subOrder.cashBackStatus = cashbackStatus
348
                subOrder.cashBackAmount = cashbackAmount
354
                subOrder.cashBackAmount = cashbackAmount
349
                if percentage > 0:
355
                if percentage > 0:
350
                    subOrder.cashBackPercentage = percentage
356
                    subOrder.cashBackPercentage = percentage
-
 
357
                if hasattr(subOrder, 'deliveredOn'):                               
-
 
358
                    subOrder.status = Store.ORDER_DELIVERED
-
 
359
                    subOrder.closed = True
-
 
360
                    if subOrder.cashBackStatus == Store.CB_PENDING:
-
 
361
                        subOrder.cashBackStatus = Store.CB_APPROVED
-
 
362
                elif closedStatus:
-
 
363
                    closedStatus= False
351
                subOrders.append(subOrder)
364
                subOrders.append(subOrder)
352
        merchantOrder.status='success'
365
        merchantOrder.status='success'
-
 
366
        merchantOrder.closed = closedStatus
353
        self._updateToOrder(todict(merchantOrder))
367
        self._updateToOrder(todict(merchantOrder))
354
        
368
        
355
    def parseCancelled(self, merchantOrder,soup):
369
    def parseCancelled(self, merchantOrder,soup):
356
        try:
370
        try:
357
            fonts = soup.body.findAll("table", recursive=False)[1].findAll("font")
371
            fonts = soup.body.findAll("table", recursive=False)[1].findAll("font")
Line 582... Line 596...
582
#                     ('Accept', 'text/html,application/xhtml+xml,application/json,application/xml;q=0.9,*/*;q=0.8'),
596
#                     ('Accept', 'text/html,application/xhtml+xml,application/json,application/xml;q=0.9,*/*;q=0.8'),
583
#                     ('Accept-Encoding', 'gzip,deflate,sdch'),                  
597
#                     ('Accept-Encoding', 'gzip,deflate,sdch'),                  
584
#                     ('Accept-Language', 'en-US,en;q=0.8'),                     
598
#                     ('Accept-Language', 'en-US,en;q=0.8'),                     
585
#                     ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.3')]
599
#                     ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.3')]
586
#    store.scrapeStoreOrders()
600
#    store.scrapeStoreOrders()
587
    store.parseOrderRawHtml(1306, "13232", 14, readSSh("/AmazonTrack/User533/403-3748792-1516356"), "https://www.amazon.in/gp/css/summary/edit.html?orderID=403-3748792-1516356")
601
    #store.parseOrderRawHtml(4333, "13232", 14, readSSh("/tmp/4333"), "https://www.amazon.in/gp/buy/thankyou/handlers/display.html?ie=UTF8&from=Visa&fromAnywhere=1&isFromThirdParty=1&purchaseId=404-9350243-7228362&processorId=eJxzSSxJdE4szgAADOkC%2Bg%3D%3D")
588
    #store.trackOrdersForUser(94, "https://www.amazon.in/gp/css/summary/edit.html?orderID=404-5725877-2507524", str1)
602
    store.trackOrdersForUser(1306, "https://www.amazon.in/gp/css/summary/edit.html?orderID=171-0886591-1480333", readSSh("/AmazonTrack/User91/171-0886591-1480333"))
589
    #readSSh("/tmp/User211/2015-04-12 10:32:41.905765")
603
    #readSSh("/tmp/User211/2015-04-12 10:32:41.905765")
590
    #store.scrapeAffiliate()
604
    #store.scrapeAffiliate()
591
def readSSh(fileName):
605
def readSSh(fileName):
592
    try:
606
    try:
593
        str1 = open(fileName).read()
607
        str1 = open(fileName).read()