| Line 430... |
Line 430... |
| 430 |
'''
|
430 |
'''
|
| 431 |
Returns business dates between two dates
|
431 |
Returns business dates between two dates
|
| 432 |
'''
|
432 |
'''
|
| 433 |
start_date = start_time.date()
|
433 |
start_date = start_time.date()
|
| 434 |
end_date = end_time.date()
|
434 |
end_date = end_time.date()
|
| 435 |
diff = (end_date - start_date).days + 1
|
435 |
diff = (end_date - start_date).days
|
| 436 |
sundays = diff/7 + 1 if (start_date.weekday() + (diff%7) > 6) else diff/7
|
436 |
sundays = diff/7 + 1 if (start_date.weekday() + (diff%7) > 6) else diff/7
|
| 437 |
'''holidays = __get_holidays(start_time, end_time)'''
|
437 |
'''holidays = __get_holidays(start_time, end_time)'''
|
| 438 |
logistics_client = LogisticsClient().get_client()
|
438 |
logistics_client = LogisticsClient().get_client()
|
| 439 |
#TODO: This list should be cached after the first call.
|
439 |
#TODO: This list should be cached after the first call.
|
| 440 |
#Calling logistics server is also unnecessary.
|
440 |
#Calling logistics server is also unnecessary.
|
| Line 758... |
Line 758... |
| 758 |
|
758 |
|
| 759 |
if not delayed and not fda:
|
759 |
if not delayed and not fda:
|
| 760 |
thank_you_html = """As Promised """ + str(order.lineitems[0]) +""" ordered by you has been <b>Delivered On Time.</b>"""
|
760 |
thank_you_html = """As Promised """ + str(order.lineitems[0]) +""" ordered by you has been <b>Delivered On Time.</b>"""
|
| 761 |
elif delayed:
|
761 |
elif delayed:
|
| 762 |
max_discount = 500
|
762 |
max_discount = 500
|
| 763 |
delayedDays = get_business_days_count(order.expected_delivery_time + datetime.timedelta(days = 1), fda_datetime)
|
763 |
delayedDays = get_business_days_count(order.expected_delivery_time, fda_datetime)
|
| 764 |
max_discount = min(max_discount, order.lineitems[0].unit_price/10)
|
764 |
max_discount = min(max_discount, order.lineitems[0].unit_price/10)
|
| 765 |
discount = min(max_discount,delayedDays*50)
|
765 |
discount = min(max_discount,delayedDays*50)
|
| 766 |
promotion_client = PromotionClient().get_client()
|
766 |
promotion_client = PromotionClient().get_client()
|
| 767 |
endOn = order.delivery_timestamp + datetime.timedelta(days = 30)
|
767 |
endOn = order.delivery_timestamp + datetime.timedelta(days = 30)
|
| 768 |
endOn = to_java_date(endOn)
|
768 |
endOn = to_java_date(endOn)
|