| Line 2226... |
Line 2226... |
| 2226 |
query = query.filter(Order.billing_timestamp <= billing_date_to)
|
2226 |
query = query.filter(Order.billing_timestamp <= billing_date_to)
|
| 2227 |
|
2227 |
|
| 2228 |
return query.all()
|
2228 |
return query.all()
|
| 2229 |
|
2229 |
|
| 2230 |
def get_orders_where_vendor_not_paid(vendor_id):
|
2230 |
def get_orders_where_vendor_not_paid(vendor_id):
|
| - |
|
2231 |
query = Order.query.filter_by(vendorId = vendor_id)
|
| - |
|
2232 |
query = query.filter(Order.billing_timestamp != None)
|
| - |
|
2233 |
query = query.filter(Order.status != OrderStatus.PAYMENT_PENDING)
|
| - |
|
2234 |
query = query.filter(Order.vendor_paid == False)
|
| 2231 |
pass
|
2235 |
return query.all()
|
| 2232 |
|
2236 |
|
| 2233 |
def save_bluedart_settlements(map_awb_and_amount):
|
2237 |
def save_bluedart_settlements(map_awb_and_amount):
|
| 2234 |
payment_client = PaymentClient().get_client()
|
2238 |
payment_client = PaymentClient().get_client()
|
| 2235 |
|
2239 |
|
| 2236 |
for awb, amount in map_awb_and_amount.iteritems():
|
2240 |
for awb, amount in map_awb_and_amount.iteritems():
|
| Line 2327... |
Line 2331... |
| 2327 |
<html>
|
2331 |
<html>
|
| 2328 |
<body>
|
2332 |
<body>
|
| 2329 |
<div>
|
2333 |
<div>
|
| 2330 |
<p>Dear Customer,</p>
|
2334 |
<p>Dear Customer,</p>
|
| 2331 |
<p>
|
2335 |
<p>
|
| 2332 |
We are pleased to inform that we have shipped the order : $order_id for your product $product_name on $shipping_datetime.
|
2336 |
We are pleased to inform that we have shipped the order: $order_id for your product $product_name on $shipping_datetime.
|
| 2333 |
The shipment will be delivered to you via Bluedart/Aramex Courier Service vide AWB# $awb.
|
2337 |
The shipment will be delivered to you via Bluedart/Aramex Courier Service vide AWB# $awb.
|
| 2334 |
</p>
|
2338 |
</p>
|
| 2335 |
<p>
|
2339 |
<p>
|
| 2336 |
Expected delivery date for your order is $expected_delivery_date.
|
2340 |
Expected delivery date for your order is $expected_delivery_date.
|
| 2337 |
The product can be delivered to you between business hours of 10am to 6pm.
|
2341 |
The product can be delivered to you between business hours of 10am to 6pm.
|
| Line 2348... |
Line 2352... |
| 2348 |
</div>
|
2352 |
</div>
|
| 2349 |
</body>
|
2353 |
</body>
|
| 2350 |
</html>
|
2354 |
</html>
|
| 2351 |
"""
|
2355 |
"""
|
| 2352 |
dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
|
2356 |
dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
|
| 2353 |
shipping_date = dt.strftime("%A, %d. %B %Y %I:%M%p")
|
2357 |
shipping_date = dt.strftime("%A, %d %B %Y %I:%M%p")
|
| 2354 |
product = "%s %s %s" % (order.lineitems[0].brand, order.lineitems[0].model_name, order.lineitems[0].model_number)
|
2358 |
product = "%s %s %s" % (order.lineitems[0].brand, order.lineitems[0].model_name, order.lineitems[0].model_number)
|
| 2355 |
new_expected_delivery_date = adjust_delivery_time(datetime.datetime.now(), (order.promised_delivery_time - order.promised_shipping_time).days)
|
2359 |
new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (order.promised_delivery_time - order.promised_shipping_time).days))
|
| 2356 |
|
- |
|
| - |
|
2360 |
new_expected_delivery_date = new_expected_delivery_timestamp.strftime("%A, %d %B %Y")
|
| 2357 |
info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date)
|
2361 |
info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date)
|
| 2358 |
email_html = Template(html).substitute(info)
|
2362 |
return Template(html).substitute(info)
|
| 2359 |
|
2363 |
|
| 2360 |
def enqueue_shipping_confirmation_email(orders):
|
2364 |
def enqueue_shipping_confirmation_email(orders):
|
| 2361 |
|
2365 |
|
| 2362 |
helperClient = HelperClient().get_client()
|
2366 |
helperClient = HelperClient().get_client()
|
| 2363 |
|
2367 |
|
| 2364 |
for order in orders:
|
2368 |
for order in orders:
|
| 2365 |
try:
|
2369 |
try:
|
| 2366 |
emailSubject = 'Shipping Details for Order ID: ' + str(order.id)
|
2370 |
emailSubject = 'Shipping Details for Order ID: ' + str(order.id)
|
| 2367 |
emailBody = get_shipping_confirmation_email_body(order)
|
2371 |
emailBody = get_shipping_confirmation_email_body(order)
|
| 2368 |
helperClient.saveUserEmailForSending(order, None, emailSubject, emailBody, '', 'ShippingConfirmation')
|
2372 |
helperClient.saveUserEmailForSending(order.customer_email, None, emailSubject, emailBody, '', 'ShippingConfirmation')
|
| 2369 |
except Exception as e:
|
2373 |
except Exception as e:
|
| 2370 |
print e
|
2374 |
print e
|
| 2371 |
|
2375 |
|
| 2372 |
def close_session():
|
2376 |
def close_session():
|
| 2373 |
if session.is_active:
|
2377 |
if session.is_active:
|