| Line 48... |
Line 48... |
| 48 |
TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, \
|
48 |
TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, \
|
| 49 |
LoanHistory, ShipmentLogisticsCostDetail, ReturnOrderInfo, ReturnTransaction, \
|
49 |
LoanHistory, ShipmentLogisticsCostDetail, ReturnOrderInfo, ReturnTransaction, \
|
| 50 |
ReturnPickupRequest, SellerWarehouse, Seller, Organisation, \
|
50 |
ReturnPickupRequest, SellerWarehouse, Seller, Organisation, \
|
| 51 |
WarehouseAddressMapping, WarehouseAddressMaster, PMSA, PMSA_Agents, \
|
51 |
WarehouseAddressMapping, WarehouseAddressMaster, PMSA, PMSA_Agents, \
|
| 52 |
AdvancePayments, CodCourierPaymentRemittance, Price_Drop, Price_Drop_IMEI,\
|
52 |
AdvancePayments, CodCourierPaymentRemittance, Price_Drop, Price_Drop_IMEI,\
|
| 53 |
PendingRechargeCommissions
|
53 |
PendingRechargeCommissions, Line_Item_Imei
|
| 54 |
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
|
54 |
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
|
| 55 |
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
|
55 |
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
|
| 56 |
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
|
56 |
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
|
| 57 |
MobileRechargeOrder
|
57 |
MobileRechargeOrder
|
| 58 |
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
|
58 |
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
|
| Line 1915... |
Line 1915... |
| 1915 |
if singleInvoiceAttr.value == "true":
|
1915 |
if singleInvoiceAttr.value == "true":
|
| 1916 |
if serialNumbers:
|
1916 |
if serialNumbers:
|
| 1917 |
finalSerialNo =''
|
1917 |
finalSerialNo =''
|
| 1918 |
for serialNumber in serialNumbers:
|
1918 |
for serialNumber in serialNumbers:
|
| 1919 |
finalSerialNo = finalSerialNo +','+ serialNumber
|
1919 |
finalSerialNo = finalSerialNo +','+ serialNumber
|
| - |
|
1920 |
lineItemImei = Line_Item_Imei()
|
| - |
|
1921 |
lineItemImei.serial_number = serialNumber
|
| - |
|
1922 |
lineItemImei.line_item_id = lineitem.id
|
| 1920 |
|
1923 |
|
| 1921 |
finalSerialNo = finalSerialNo[1:]
|
1924 |
finalSerialNo = finalSerialNo[1:]
|
| 1922 |
|
1925 |
|
| 1923 |
if lineitem.serial_number is None:
|
1926 |
if lineitem.serial_number is None:
|
| 1924 |
lineitem.serial_number = finalSerialNo
|
1927 |
lineitem.serial_number = finalSerialNo
|
| 1925 |
else:
|
1928 |
else:
|
| Line 8663... |
Line 8666... |
| 8663 |
|
8666 |
|
| 8664 |
if dupSerials:
|
8667 |
if dupSerials:
|
| 8665 |
logging.info("*********Duplicates are being scanned***********\n" + ",".join(dupSerials))
|
8668 |
logging.info("*********Duplicates are being scanned***********\n" + ",".join(dupSerials))
|
| 8666 |
raise TransactionServiceException(110, 'Found repeated serialNumbers in: ' + ",".join(dupSerials))
|
8669 |
raise TransactionServiceException(110, 'Found repeated serialNumbers in: ' + ",".join(dupSerials))
|
| 8667 |
lineitem.serial_number = ','.join(serialNumbers)
|
8670 |
lineitem.serial_number = ','.join(serialNumbers)
|
| - |
|
8671 |
for serialNumber in serialNumbers:
|
| - |
|
8672 |
lineItemImei = Line_Item_Imei()
|
| - |
|
8673 |
lineItemImei.serial_number = serialNumber
|
| - |
|
8674 |
lineItemImei.line_item_id = lineitem.id
|
| 8668 |
order.status = OrderStatus.BILLED
|
8675 |
order.status = OrderStatus.BILLED
|
| 8669 |
order.statusDescription = "Order Billed"
|
8676 |
order.statusDescription = "Order Billed"
|
| 8670 |
order.billing_timestamp = datetime.datetime.now()
|
8677 |
order.billing_timestamp = datetime.datetime.now()
|
| 8671 |
order.billed_by = billed_by
|
8678 |
order.billed_by = billed_by
|
| 8672 |
|
8679 |
|