| Line 2308... |
Line 2308... |
| 2308 |
|
2308 |
|
| 2309 |
def get_orders_where_vendor_not_paid(vendor_id):
|
2309 |
def get_orders_where_vendor_not_paid(vendor_id):
|
| 2310 |
query = Order.query.filter_by(vendorId = vendor_id)
|
2310 |
query = Order.query.filter_by(vendorId = vendor_id)
|
| 2311 |
query = query.filter(Order.billing_timestamp != None)
|
2311 |
query = query.filter(Order.billing_timestamp != None)
|
| 2312 |
query = query.filter(Order.vendor_paid != True)
|
2312 |
query = query.filter(Order.vendor_paid != True)
|
| - |
|
2313 |
orderStatusGroup = OrderStatusGroups()
|
| 2313 |
#query = query.filter(not_(Order.status.in_(OrderStatusGroups.refundedOrders)))
|
2314 |
query = query.filter(not_(Order.status.in_(orderStatusGroup.refundedOrders)))
|
| 2314 |
query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
|
2315 |
# query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
|
| 2315 |
|
2316 |
|
| 2316 |
return query.all()
|
2317 |
return query.all()
|
| 2317 |
|
2318 |
|
| 2318 |
def save_bluedart_settlements(map_awb_and_amount):
|
2319 |
def save_bluedart_settlements(map_awb_and_amount):
|
| 2319 |
payment_client = PaymentClient().get_client()
|
2320 |
payment_client = PaymentClient().get_client()
|
| Line 2337... |
Line 2338... |
| 2337 |
settlement.serviceTax = serviceTax
|
2338 |
settlement.serviceTax = serviceTax
|
| 2338 |
settlement.otherCharges = otherCharges
|
2339 |
settlement.otherCharges = otherCharges
|
| 2339 |
settlement.netCollection = netCollection
|
2340 |
settlement.netCollection = netCollection
|
| 2340 |
session.commit()
|
2341 |
session.commit()
|
| 2341 |
|
2342 |
|
| 2342 |
def get_settlement_for_paymentId(payment_id):
|
2343 |
def get_settlement_for_referenceId(reference_id, is_refund = False):
|
| 2343 |
payment_settlement = PaymentSettlement.get_by(paymentId = payment_id)
|
2344 |
query = PaymentSettlement.query.filter_by(referenceId = reference_id)
|
| 2344 |
|
2345 |
|
| - |
|
2346 |
if is_refund:
|
| - |
|
2347 |
query = query.filter(PaymentSettlement.netCollection < 0)
|
| - |
|
2348 |
else:
|
| - |
|
2349 |
query = query.filter(PaymentSettlement.netCollection > 0)
|
| - |
|
2350 |
|
| 2345 |
return payment_settlement
|
2351 |
return query.first()
|
| 2346 |
|
2352 |
|
| 2347 |
def save_ebs_settlement_summary(settlement_id, settlement_date, transaction_date_from, transaction_date_to, amount):
|
2353 |
def save_ebs_settlement_summary(settlement_id, settlement_date, transaction_date_from, transaction_date_to, amount):
|
| 2348 |
summary = EBSSettlementSummary()
|
2354 |
summary = EBSSettlementSummary()
|
| 2349 |
summary.settlementId = settlement_id
|
2355 |
summary.settlementId = settlement_id
|
| 2350 |
summary.settlementDate = settlement_date
|
2356 |
summary.settlementDate = settlement_date
|