| 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
|
- |
|
| 25 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
24 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
| 26 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
25 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
| 27 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
26 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
| 28 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
27 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
| 29 |
InventoryServiceException
|
28 |
InventoryServiceException
|
| Line 290... |
Line 289... |
| 290 |
#TODO: This list should be cached after the first call.
|
289 |
#TODO: This list should be cached after the first call.
|
| 291 |
#Calling logistics server is also unnecessary.
|
290 |
#Calling logistics server is also unnecessary.
|
| 292 |
holidays = logistics_client.getHolidays(fromDate, to_time)
|
291 |
holidays = logistics_client.getHolidays(fromDate, to_time)
|
| 293 |
holidays = [to_py_date(holiday).date() for holiday in holidays]
|
292 |
holidays = [to_py_date(holiday).date() for holiday in holidays]
|
| 294 |
return holidays
|
293 |
return holidays
|
| 295 |
|
- |
|
| 296 |
|
294 |
|
| 297 |
def adjust_delivery_time(start_time, delivery_days):
|
295 |
def adjust_delivery_time(start_time, delivery_days):
|
| 298 |
'''
|
296 |
'''
|
| 299 |
Returns the actual no. of days which will pass while 'delivery_days'
|
297 |
Returns the actual no. of days which will pass while 'delivery_days'
|
| 300 |
no. of business days will pass since 'order_time'.
|
298 |
no. of business days will pass since 'order_time'.
|
| Line 2248... |
Line 2246... |
| 2248 |
settlement.paymentId = payment.paymentId
|
2246 |
settlement.paymentId = payment.paymentId
|
| 2249 |
settlement.paymentGatewayId = payment.gatewayId
|
2247 |
settlement.paymentGatewayId = payment.gatewayId
|
| 2250 |
settlement.netCollection = amount
|
2248 |
settlement.netCollection = amount
|
| 2251 |
session.commit()
|
2249 |
session.commit()
|
| 2252 |
|
2250 |
|
| 2253 |
def save_payment_settlements(settlementDate, paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection):
|
2251 |
def save_payment_settlements(settlementDate, paymentGatewayId, referenceId, serviceTax, otherCharges, netCollection):
|
| 2254 |
|
2252 |
|
| 2255 |
settlement = PaymentSettlement()
|
2253 |
settlement = PaymentSettlement()
|
| 2256 |
settlement.settlementDate = settlementDate
|
2254 |
settlement.settlementDate = settlementDate
|
| 2257 |
settlement.paymentGatewayId = paymentGatewayId
|
2255 |
settlement.paymentGatewayId = paymentGatewayId
|
| 2258 |
settlement.paymentId = paymentId
|
2256 |
settlement.referenceId = referenceId
|
| 2259 |
settlement.serviceTax = serviceTax
|
2257 |
settlement.serviceTax = serviceTax
|
| 2260 |
settlement.otherCharges = otherCharges
|
2258 |
settlement.otherCharges = otherCharges
|
| 2261 |
settlement.netCollection = netCollection
|
2259 |
settlement.netCollection = netCollection
|
| 2262 |
session.commit()
|
2260 |
session.commit()
|
| 2263 |
|
2261 |
|
| 2264 |
def save_cod_payment_settlement(orderId, settlementDate, collection):
|
- |
|
| 2265 |
settlement = CODPaymentSettlement()
|
- |
|
| 2266 |
settlement.orderId = orderId
|
- |
|
| 2267 |
settlement.settlementDate = settlementDate
|
- |
|
| 2268 |
settlement.collection = collection
|
- |
|
| 2269 |
session.commit()
|
- |
|
| 2270 |
|
- |
|
| 2271 |
def get_settlement_for_paymentId(payment_id):
|
2262 |
def get_settlement_for_paymentId(payment_id):
|
| 2272 |
payment_settlement = PaymentSettlement.get_by(paymentId = payment_id)
|
2263 |
payment_settlement = PaymentSettlement.get_by(paymentId = payment_id)
|
| 2273 |
|
2264 |
|
| 2274 |
return payment_settlement
|
2265 |
return payment_settlement
|
| 2275 |
|
2266 |
|