| Line 154... |
Line 154... |
| 154 |
closed = True
|
154 |
closed = True
|
| 155 |
shipments = orderEle.findAll('div',{'class':re.compile('.*?a-box.*?')}, recursive=False)
|
155 |
shipments = orderEle.findAll('div',{'class':re.compile('.*?a-box.*?')}, recursive=False)
|
| 156 |
shipments.pop(0)
|
156 |
shipments.pop(0)
|
| 157 |
for shipment in shipments:
|
157 |
for shipment in shipments:
|
| 158 |
shipdiv = shipment.find('div', {'class':'a-box-inner'})
|
158 |
shipdiv = shipment.find('div', {'class':'a-box-inner'})
|
| - |
|
159 |
sdivs = shipment.div.div.findAll('div', recursive=False)
|
| 159 |
orderStatus = shipdiv.find('span', {'class':'a-size-medium a-text-bold'}).text.strip()
|
160 |
orderStatus = sdivs[0].text.strip()
|
| - |
|
161 |
status = self._getStatusFromDetailedStatus(orderStatus)
|
| - |
|
162 |
if status == MStore.ORDER_DELIVERED:
|
| - |
|
163 |
deliveredOn = sdivs[1].find('span').text
|
| - |
|
164 |
deliveredOn = deliveredOn.split(":")[1].strip()
|
| - |
|
165 |
else:
|
| 160 |
deliveryestimatespan = shipdiv.find('span', {'class':'a-color-success'})
|
166 |
deliveryestimatespan = sdivs[1].find('span', {'class':'a-color-success'})
|
| 161 |
deliveryEstimate = None
|
167 |
deliveryEstimate = None
|
| 162 |
if deliveryestimatespan is not None:
|
168 |
if deliveryestimatespan is not None:
|
| 163 |
deliveryEstimate = deliveryestimatespan.find('span', {'class':'a-text-bold'}).text.strip()
|
169 |
deliveryEstimate = deliveryestimatespan.find('span', {'class':'a-text-bold'}).text.strip()
|
| 164 |
productDivs = shipdiv.find('div', {'class':re.compile('.*?a-spacing-top-medium.*?')}).find('div', {'class':'a-row'}).findAll('div', recursive=False)
|
170 |
productDivs = shipdiv.find('div', {'class':re.compile('.*?a-spacing-top-medium.*?')}).find('div', {'class':'a-row'}).findAll('div', recursive=False)
|
| 165 |
trackingUrl = None
|
171 |
trackingUrl = None
|
| 166 |
for buttonDiv in shipdiv.findAll('span', {'class':'a-button-inner'}):
|
172 |
for buttonDiv in shipdiv.findAll('span', {'class':'a-button-inner'}):
|
| 167 |
if buttonDiv.find('a').text.strip()=='Track package':
|
173 |
if buttonDiv.find('a').text.strip()=='Track package':
|
| 168 |
trackingUrl = buttonDiv.find('a')['href'].strip()
|
174 |
trackingUrl = buttonDiv.find('a')['href'].strip()
|
| 169 |
if not trackingUrl.startswith("http"):
|
175 |
if not trackingUrl.startswith("http"):
|
| Line 179... |
Line 185... |
| 179 |
updateMap = {}
|
185 |
updateMap = {}
|
| 180 |
closedStatus = False
|
186 |
closedStatus = False
|
| 181 |
updateMap['subOrders.$.imgUrl'] = imgUrl
|
187 |
updateMap['subOrders.$.imgUrl'] = imgUrl
|
| 182 |
updateMap['subOrders.$.lastTracked'] = timestamp
|
188 |
updateMap['subOrders.$.lastTracked'] = timestamp
|
| 183 |
updateMap['subOrders.$.detailedStatus'] = orderStatus
|
189 |
updateMap['subOrders.$.detailedStatus'] = orderStatus
|
| 184 |
status = self._getStatusFromDetailedStatus(orderStatus)
|
- |
|
| 185 |
cashbackStatus = subOrder.get("cashBackStatus")
|
190 |
cashbackStatus = subOrder.get("cashBackStatus")
|
| 186 |
updateMap['subOrders.$.status'] = status
|
191 |
updateMap['subOrders.$.status'] = status
|
| 187 |
|
192 |
|
| 188 |
if status==MStore.ORDER_DELIVERED:
|
193 |
if status==MStore.ORDER_DELIVERED:
|
| 189 |
closedStatus = True
|
194 |
closedStatus = True
|