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

     return query.all()
 def get_orders_where_vendor_not_paid(vendor_id):
     query = Order.query.filter_by(vendorId = vendor_id)
     query = query.filter(Order.billing_timestamp != None)
-    query = query.filter(Order.status != OrderStatus.PAYMENT_PENDING)
+    query = query.filter(Order.vendor_paid != True)
-    query = query.filter(Order.vendor_paid == False)
+    #query = query.filter(not_(Order.status.in_(OrderStatusGroups.refundedOrders)))
+    query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
     return query.all()
 def save_bluedart_settlements(map_awb_and_amount):
     payment_client = PaymentClient().get_client()
 <body>
 <div>
     <p>Dear Customer,</p>
     <p>
         We are pleased to inform that we have shipped the order: $order_id for your product $product_name on $shipping_datetime.
-        The shipment will be delivered to you via Bluedart/Aramex Courier Service vide AWB# $awb.
+        The shipment will be delivered to you via $courier_name Courier Service vide AWB# $awb.
     </p>
     <p>
         Expected delivery date for your order is $expected_delivery_date.
         The product can be delivered to you between business hours of 10am to 6pm.
         You can login to your account on our site and under "Open Orders", please click the AWB and check the current shipment updates for your product.
     </p>
     <p>
         For scheduling the delivery of your product at some specific timings, we recommend you to contact the helpline for Bluedart/Aramex with your complete AWB#.
     </p>
-    <p>Bluedart: 011-66111234<br />Aramex:  0124- 39419900</p>
+    <p>$courier_name: $courier_phone</p>
     <p>
         Warm Regards,<br />
         Saholic Team
     </p>
 </div>
 </body>
 </html>
     """
+    logistics_providers = {1: {'name': 'BlueDart', 'phone': '011-66111234'}, 2: {'name': 'Aramex', 'phone': '0124- 39419900'}}
+    provider_name = logistics_providers[order.logistics_provider_id]['name']
+    provider_phone = logistics_providers[order.logistics_provider_id]['phone']
     dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
     shipping_date = dt.strftime("%A, %d %B %Y %I:%M%p")
     product = "%s %s %s" % (order.lineitems[0].brand, order.lineitems[0].model_name, order.lineitems[0].model_number)
     new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (order.promised_delivery_time - order.promised_shipping_time).days))
     new_expected_delivery_date = new_expected_delivery_timestamp.strftime("%A, %d %B %Y")
-    info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date)
+    info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date, courier_name = provider_name, courier_phone = provider_phone)
     return Template(html).substitute(info)
 def enqueue_shipping_confirmation_email(orders):
     # Calling helper service on production
     helperClient = HelperClient(host_key = "helper_service_server_host_prod").get_client()
     for order in orders:
         try:
             emailSubject = 'Shipping Details for Order ID: ' + str(order.id)
             emailBody = get_shipping_confirmation_email_body(order)
             helperClient.saveUserEmailForSending(order.customer_email, None, emailSubject, emailBody, '', 'ShippingConfirmation')
     query = query.filter(Order.created_timestamp >= start_datetime)
     query = query.filter(Order.created_timestamp <= end_datetime)
     return query.all()
 def update_orders_as_paid_to_vendor(order_id):
-    query = Order.query.filter(Order.originalOrderId == order_id)
-    query = query.filter(Order.id == order_id)
+    paid_order = Order.get_by(id = order_id)
+    if paid_order.originalOrderId is None:
+        paid_order.vendor_paid = True
-    for order in query.all():
+        session.commit()
+        for order in Order.query.filter(Order.originalOrderId == order_id).all():
+            order.vendor_paid = True
+            session.commit()
+    else:
+        original_order_id = None
+        for order in Order.query.filter(Order.originalOrderId == order_id).all():
-        order.vendor_paid = True
+            order.vendor_paid = True
+            session.commit()
+            original_order_id = order.originalOrderId
+        original_order = Order.get_by(id = original_order_id)
+        if original_order:  original_order.vendor_paid = True
         session.commit()
 def close_session():
     if session.is_active:
         print "session is active. closing it."

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 5123 → 5139