| Line 473... |
Line 473... |
| 473 |
status = MStore.ORDER_PLACED
|
473 |
status = MStore.ORDER_PLACED
|
| 474 |
shippingEstimate = orderStatus.split("Dispatch estimate").split("-")[0].strip()
|
474 |
shippingEstimate = orderStatus.split("Dispatch estimate").split("-")[0].strip()
|
| 475 |
elif "Delivery estimate" in orderStatus:
|
475 |
elif "Delivery estimate" in orderStatus:
|
| 476 |
status = MStore.ORDER_SHIPPED
|
476 |
status = MStore.ORDER_SHIPPED
|
| 477 |
deliveryEstimate = orderStatus.split("Delivery estimate").split("-")[0].strip()
|
477 |
deliveryEstimate = orderStatus.split("Delivery estimate").split("-")[0].strip()
|
| - |
|
478 |
elif "Arriving" in orderStatus:
|
| - |
|
479 |
status = MStore.ORDER_SHIPPED
|
| - |
|
480 |
deliveryEstimate = datetime.strftime(getDateStringArriving(orderStatus.split("Arriving")[1].strip()), '%d-%b-%y')
|
| 478 |
else:
|
481 |
else:
|
| 479 |
status = self._getStatusFromDetailedStatus(orderStatus)
|
482 |
status = self._getStatusFromDetailedStatus(orderStatus)
|
| 480 |
except:
|
483 |
except:
|
| 481 |
closed=False
|
484 |
closed=False
|
| 482 |
status = None
|
485 |
status = None
|
| 483 |
if status == MStore.ORDER_DELIVERED:
|
486 |
if status == MStore.ORDER_DELIVERED:
|
| 484 |
dateString = sdivs[0].span.text.strip().split("Delivered ")[1].strip()
|
487 |
dateString = sdivs[0].span.text.strip().split("Delivered ")[1].strip()
|
| 485 |
deliveredOn = datetime.strftime(getDateStringDelivered(dateString), '%d-%b-%y')
|
488 |
deliveredOn = datetime.strftime(getDateStringDelivered(dateString), '%d-%b-%y')
|
| 486 |
if status == MStore.ORDER_SHIPPED:
|
489 |
if status == MStore.ORDER_SHIPPED and deliveryEstimate is not None:
|
| 487 |
dateString = sdivs[0].span.text.strip().split("Arriving ")[1].strip()
|
490 |
dateString = sdivs[0].span.text.strip().split("Arriving ")[1].strip()
|
| 488 |
deliveryEstimate = datetime.strftime(getDateStringArriving(dateString), '%d-%b-%y')
|
491 |
deliveryEstimate = datetime.strftime(getDateStringArriving(dateString), '%d-%b-%y')
|
| 489 |
|
492 |
|
| 490 |
productDivs = shipdiv.find('div', {'class':re.compile('.*?a-spacing-top-medium.*?')}).find('div', {'class':'a-row'}).findAll('div', recursive=False)
|
493 |
productDivs = shipdiv.find('div', {'class':re.compile('.*?a-spacing-top-medium.*?')}).find('div', {'class':'a-row'}).findAll('div', recursive=False)
|
| 491 |
trackingUrl = None
|
494 |
trackingUrl = None
|