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

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

Subversion Repositories SmartDukaan