WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

 def get_amazon_orders_shipped():
     amazonShippedOrders = []
     ###toDate = datetime.datetime.now()
     ###fromDate = toDate-timedelta(days = interval-1, hours=toDate.hour, minutes=toDate.minute, seconds=toDate.second)
     orders = get_amazon_orders_marked_sent()
+    if not orders:
+        return amazonShippedOrders
     for order in orders:
-        row = Order.query.filter().filter(Order.id==order.orderId).first()
+        row = Order.query.filter(Order.id == order.orderId).first()
-        if row is None:
-            continue
-        if row.shipping_timestamp is not None:
+        if row.shipping_timestamp:
             amazonShippedOrders.append(to_t_order(row))
     return amazonShippedOrders
 def get_amazon_orders_cancelled(interval):
     amazonCancelledOrders = []

Subversion Repositories SmartDukaan