| Line 18... |
Line 18... |
| 18 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
18 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
| 19 |
from shop2020.config.client.ConfigClient import ConfigClient
|
19 |
from shop2020.config.client.ConfigClient import ConfigClient
|
| 20 |
from shop2020.model.v1 import order
|
20 |
from shop2020.model.v1 import order
|
| 21 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
21 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
| 22 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
22 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
| 23 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary
|
23 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary,\
|
| - |
|
24 |
CODPaymentSettlement
|
| 24 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
25 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
| 25 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
26 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
| 26 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
27 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
| 27 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
28 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
| 28 |
InventoryServiceException
|
29 |
InventoryServiceException
|
| Line 2224... |
Line 2225... |
| 2224 |
if billing_date_to:
|
2225 |
if billing_date_to:
|
| 2225 |
query = query.filter(Order.billing_timestamp <= billing_date_to)
|
2226 |
query = query.filter(Order.billing_timestamp <= billing_date_to)
|
| 2226 |
|
2227 |
|
| 2227 |
return query.all()
|
2228 |
return query.all()
|
| 2228 |
|
2229 |
|
| - |
|
2230 |
def get_orders_where_vendor_not_paid(vendor_id):
|
| - |
|
2231 |
pass
|
| - |
|
2232 |
|
| 2229 |
def save_bluedart_settlements(map_awb_and_amount):
|
2233 |
def save_bluedart_settlements(map_awb_and_amount):
|
| 2230 |
payment_client = PaymentClient().get_client()
|
2234 |
payment_client = PaymentClient().get_client()
|
| 2231 |
|
2235 |
|
| 2232 |
for awb, amount in map_awb_and_amount.iteritems():
|
2236 |
for awb, amount in map_awb_and_amount.iteritems():
|
| 2233 |
order = Order.get_by(airwaybill_no = awb)
|
2237 |
order = Order.get_by(airwaybill_no = awb)
|
| Line 2248... |
Line 2252... |
| 2248 |
settlement.serviceTax = serviceTax
|
2252 |
settlement.serviceTax = serviceTax
|
| 2249 |
settlement.otherCharges = otherCharges
|
2253 |
settlement.otherCharges = otherCharges
|
| 2250 |
settlement.netCollection = netCollection
|
2254 |
settlement.netCollection = netCollection
|
| 2251 |
session.commit()
|
2255 |
session.commit()
|
| 2252 |
|
2256 |
|
| - |
|
2257 |
def save_cod_payment_settlement(orderId, settlementDate, collection):
|
| - |
|
2258 |
settlement = CODPaymentSettlement()
|
| - |
|
2259 |
settlement.orderId = orderId
|
| - |
|
2260 |
settlement.settlementDate = settlementDate
|
| - |
|
2261 |
settlement.collection = collection
|
| - |
|
2262 |
session.commit()
|
| - |
|
2263 |
|
| 2253 |
def get_settlement_for_paymentId(payment_id):
|
2264 |
def get_settlement_for_paymentId(payment_id):
|
| 2254 |
payment_settlement = PaymentSettlement.get_by(paymentId = payment_id)
|
2265 |
payment_settlement = PaymentSettlement.get_by(paymentId = payment_id)
|
| 2255 |
|
2266 |
|
| 2256 |
return payment_settlement
|
2267 |
return payment_settlement
|
| 2257 |
|
2268 |
|