| Line 51... |
Line 51... |
| 51 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
51 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
| 52 |
from shop2020.config.client.ConfigClient import ConfigClient
|
52 |
from shop2020.config.client.ConfigClient import ConfigClient
|
| 53 |
from shop2020.model.v1 import order
|
53 |
from shop2020.model.v1 import order
|
| 54 |
from shop2020.model.v1.order.impl import DataService, RechargeService
|
54 |
from shop2020.model.v1.order.impl import DataService, RechargeService
|
| 55 |
from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme, to_t_order, \
|
55 |
from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme, to_t_order, \
|
| 56 |
cutoff_date
|
56 |
cutoff_date, to_t_warehouse_address
|
| 57 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
57 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
| 58 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
58 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
| 59 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
|
59 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
|
| 60 |
CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
|
60 |
CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
|
| 61 |
BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
|
61 |
BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
|
| Line 64... |
Line 64... |
| 64 |
AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, \
|
64 |
AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, \
|
| 65 |
HotspotServiceMatrix, SnapdealOrder, FlipkartOrder, DataInsuranceDetailForOrder, \
|
65 |
HotspotServiceMatrix, SnapdealOrder, FlipkartOrder, DataInsuranceDetailForOrder, \
|
| 66 |
AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator, \
|
66 |
AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator, \
|
| 67 |
TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, \
|
67 |
TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, \
|
| 68 |
LoanHistory, ShipmentLogisticsCostDetail, ReturnOrderInfo, ReturnTransaction, \
|
68 |
LoanHistory, ShipmentLogisticsCostDetail, ReturnOrderInfo, ReturnTransaction, \
|
| 69 |
ReturnPickupRequest, SellerWarehouse, Seller, Organisation
|
69 |
ReturnPickupRequest, SellerWarehouse, Seller, Organisation,\
|
| - |
|
70 |
WarehouseAddressMapping, WarehouseAddressMaster
|
| 70 |
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
|
71 |
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
|
| 71 |
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
|
72 |
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
|
| 72 |
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
|
73 |
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
|
| 73 |
MobileRechargeOrder
|
74 |
MobileRechargeOrder
|
| 74 |
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
|
75 |
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
|
| Line 109... |
Line 110... |
| 109 |
from shop2020.utils.EmailAttachmentSender import mail, get_attachment_part, \
|
110 |
from shop2020.utils.EmailAttachmentSender import mail, get_attachment_part, \
|
| 110 |
mail_html
|
111 |
mail_html
|
| 111 |
from shop2020.utils.Utils import to_py_date, to_java_date, \
|
112 |
from shop2020.utils.Utils import to_py_date, to_java_date, \
|
| 112 |
getSyncOperatorsForRecharge
|
113 |
getSyncOperatorsForRecharge
|
| 113 |
from suds.client import Client
|
114 |
from suds.client import Client
|
| - |
|
115 |
from shop2020.model.v1.user.impl.Converters import to_t_address
|
| 114 |
|
116 |
|
| 115 |
|
117 |
|
| 116 |
#Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
118 |
#Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
| 117 |
#End:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
119 |
#End:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
| 118 |
#Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
120 |
#Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
|
| Line 2402... |
Line 2404... |
| 2402 |
#as of now only company 2 - SORPL, 3-New company is operating and cutoff config will decide the company to be used to bill
|
2404 |
#as of now only company 2 - SORPL, 3-New company is operating and cutoff config will decide the company to be used to bill
|
| 2403 |
#until further change - Amit Gupta
|
2405 |
#until further change - Amit Gupta
|
| 2404 |
seller_id = __get_seller()
|
2406 |
seller_id = __get_seller()
|
| 2405 |
order.invoice_number = get_next_invoice_counter(seller_id, order.warehouse_id, order.orderType)
|
2407 |
order.invoice_number = get_next_invoice_counter(seller_id, order.warehouse_id, order.orderType)
|
| 2406 |
order.seller_id = seller_id
|
2408 |
order.seller_id = seller_id
|
| - |
|
2409 |
whaddressmapping = WarehouseAddressMapping.query.filter_by(warehouse_id=order.warehouse_id).one()
|
| - |
|
2410 |
order.warehouse_address_id = whaddressmapping.address_id
|
| 2407 |
session.commit()
|
2411 |
session.commit()
|
| 2408 |
return True
|
2412 |
return True
|
| 2409 |
else:
|
2413 |
else:
|
| 2410 |
return False
|
2414 |
return False
|
| 2411 |
|
2415 |
|
| Line 9332... |
Line 9336... |
| 9332 |
session.commit()
|
9336 |
session.commit()
|
| 9333 |
|
9337 |
|
| 9334 |
if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
|
9338 |
if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
|
| 9335 |
#get seller for current warehouse id
|
9339 |
#get seller for current warehouse id
|
| 9336 |
seller_id = __get_seller()
|
9340 |
seller_id = __get_seller()
|
| - |
|
9341 |
whaddressmapping = WarehouseAddressMapping.query.filter_by(warehouse_id=ordersList[0].warehouse_id).one()
|
| 9337 |
invoiceNumber = get_next_invoice_counter(seller_id, ordersList[0].warehouse_id, ordersList[0].orderType)
|
9342 |
invoiceNumber = get_next_invoice_counter(seller_id, ordersList[0].warehouse_id, ordersList[0].orderType)
|
| 9338 |
|
9343 |
|
| 9339 |
|
9344 |
|
| 9340 |
|
9345 |
|
| 9341 |
invoiceTypeVal = 1
|
9346 |
invoiceTypeVal = 1
|
| Line 9352... |
Line 9357... |
| 9352 |
txnShipSeq.invoiceFormat = invoiceTypeVal
|
9357 |
txnShipSeq.invoiceFormat = invoiceTypeVal
|
| 9353 |
|
9358 |
|
| 9354 |
for order in ordersList:
|
9359 |
for order in ordersList:
|
| 9355 |
order.invoice_number = invoiceNumber
|
9360 |
order.invoice_number = invoiceNumber
|
| 9356 |
order.seller_id = seller_id
|
9361 |
order.seller_id = seller_id
|
| - |
|
9362 |
order.warehouse_address_id = whaddressmapping.address_id
|
| 9357 |
session.commit()
|
9363 |
session.commit()
|
| 9358 |
|
9364 |
|
| 9359 |
return True
|
9365 |
return True
|
| 9360 |
|
9366 |
|
| 9361 |
def get_invoice_format_logistics_txn_id(transactionId, shipementSeq):
|
9367 |
def get_invoice_format_logistics_txn_id(transactionId, shipementSeq):
|
| Line 10985... |
Line 10991... |
| 10985 |
sellerInfo.regId = org.registered_id
|
10991 |
sellerInfo.regId = org.registered_id
|
| 10986 |
sellerInfo.registeredAddress = org.address
|
10992 |
sellerInfo.registeredAddress = org.address
|
| 10987 |
if org.type == 'company':
|
10993 |
if org.type == 'company':
|
| 10988 |
sellerInfo.cinNumber = org.registered_id
|
10994 |
sellerInfo.cinNumber = org.registered_id
|
| 10989 |
return sellerInfo
|
10995 |
return sellerInfo
|
| - |
|
10996 |
|
| - |
|
10997 |
def get_warehouse_address(addressId):
|
| - |
|
10998 |
address = WarehouseAddressMaster.get_by(id=addressId)
|
| 10990 |
|
10999 |
if address:
|
| 10991 |
|
11000 |
return to_t_warehouse_address(address)
|
| 10992 |
return "1"
|
11001 |
return None
|
| 10993 |
|
11002 |
|
| 10994 |
def split_return_order_info(returnOrderId, splitReturnOrderQty):
|
11003 |
def split_return_order_info(returnOrderId, splitReturnOrderQty):
|
| 10995 |
returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
|
11004 |
returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
|
| 10996 |
if returnOrder is None:
|
11005 |
if returnOrder is None:
|
| 10997 |
raise TransactionServiceException(101, "No Return Order is there with this Order Id")
|
11006 |
raise TransactionServiceException(101, "No Return Order is there with this Order Id")
|