| Line 5074... |
Line 5074... |
| 5074 |
toDate = datetime.datetime.now()
|
5074 |
toDate = datetime.datetime.now()
|
| 5075 |
fromDate = toDate-timedelta(days = interval-1, hours=toDate.hour, minutes=toDate.minute, seconds=toDate.second)
|
5075 |
fromDate = toDate-timedelta(days = interval-1, hours=toDate.hour, minutes=toDate.minute, seconds=toDate.second)
|
| 5076 |
orders = get_amazon_orders_marked_sent()
|
5076 |
orders = get_amazon_orders_marked_sent()
|
| 5077 |
for order in orders:
|
5077 |
for order in orders:
|
| 5078 |
row = Order.query.filter(Order.shipping_timestamp.between (fromDate,toDate)).filter(Order.id==order.orderId).first()
|
5078 |
row = Order.query.filter(Order.shipping_timestamp.between (fromDate,toDate)).filter(Order.id==order.orderId).first()
|
| - |
|
5079 |
if row is None:
|
| - |
|
5080 |
continue
|
| 5079 |
amazonShippedOrders.append(to_t_order(row))
|
5081 |
amazonShippedOrders.append(to_t_order(row))
|
| 5080 |
return amazonShippedOrders
|
5082 |
return amazonShippedOrders
|
| 5081 |
|
5083 |
|
| 5082 |
def get_amazon_orders_cancelled(interval):
|
5084 |
def get_amazon_orders_cancelled(interval):
|
| 5083 |
amazonCancelledOrders = []
|
5085 |
amazonCancelledOrders = []
|
| 5084 |
toDate = datetime.datetime.now()
|
5086 |
toDate = datetime.datetime.now()
|
| 5085 |
fromDate = toDate-timedelta(days = interval-1, hours=toDate.hour, minutes=toDate.minute, seconds=toDate.second)
|
5087 |
fromDate = toDate-timedelta(days = interval-1, hours=toDate.hour, minutes=toDate.minute, seconds=toDate.second)
|
| 5086 |
orders = get_amazon_orders_marked_sent()
|
5088 |
orders = get_amazon_orders_marked_sent()
|
| 5087 |
for order in orders:
|
5089 |
for order in orders:
|
| 5088 |
row = Order.query.filter(Order.refund_timestamp.between (fromDate,toDate)).filter(Order.id==order.orderId).first()
|
5090 |
row = Order.query.filter(Order.refund_timestamp.between (fromDate,toDate)).filter(Order.id==order.orderId).first()
|
| - |
|
5091 |
if row is None:
|
| - |
|
5092 |
continue
|
| 5089 |
if ( row.status == 15 or row.status == 18 or row.status == 34 ):
|
5093 |
if ( row.status == 15 or row.status == 18 or row.status == 34 ):
|
| 5090 |
amazonCancelledOrders.append(to_t_order(row))
|
5094 |
amazonCancelledOrders.append(to_t_order(row))
|
| 5091 |
return amazonCancelledOrders
|
5095 |
return amazonCancelledOrders
|
| 5092 |
|
5096 |
|
| 5093 |
if __name__ == '__main__':
|
5097 |
if __name__ == '__main__':
|