| Line 16... |
Line 16... |
| 16 |
from shop2020.clients.UserClient import UserClient
|
16 |
from shop2020.clients.UserClient import UserClient
|
| 17 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
17 |
from shop2020.clients.WarehouseClient import WarehouseClient
|
| 18 |
from shop2020.model.v1 import order
|
18 |
from shop2020.model.v1 import order
|
| 19 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
19 |
from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
|
| 20 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
20 |
Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
|
| 21 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary
|
21 |
OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
|
| - |
|
22 |
CodVerificationAgent
|
| 22 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
23 |
from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
|
| 23 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
24 |
from shop2020.thriftpy.generic.ttypes import ExceptionType
|
| 24 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
25 |
from shop2020.thriftpy.logistics.ttypes import DeliveryType
|
| 25 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
26 |
from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
|
| 26 |
InventoryServiceException, WarehouseType, ItemType, InventoryType
|
27 |
InventoryServiceException, WarehouseType, ItemType, InventoryType
|
| Line 2484... |
Line 2485... |
| 2484 |
original_order_id = order.originalOrderId
|
2485 |
original_order_id = order.originalOrderId
|
| 2485 |
|
2486 |
|
| 2486 |
original_order = Order.get_by(id = original_order_id)
|
2487 |
original_order = Order.get_by(id = original_order_id)
|
| 2487 |
if original_order: original_order.vendor_paid = True
|
2488 |
if original_order: original_order.vendor_paid = True
|
| 2488 |
session.commit()
|
2489 |
session.commit()
|
| - |
|
2490 |
|
| - |
|
2491 |
def update_COD_agent(agentEmailId, orderId):
|
| - |
|
2492 |
order = Order.get_by(id=orderId)
|
| - |
|
2493 |
if not order:
|
| - |
|
2494 |
raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
|
| - |
|
2495 |
agent = CodVerificationAgent()
|
| - |
|
2496 |
agent.orderId = orderId
|
| - |
|
2497 |
agent.verificationAgent = agentEmailId
|
| - |
|
2498 |
session.commit()
|
| - |
|
2499 |
|
| 2489 |
|
2500 |
|
| 2490 |
def get_refunded_orders_marked_paid():
|
2501 |
def get_refunded_orders_marked_paid():
|
| 2491 |
orderStatusGroup = OrderStatusGroups()
|
2502 |
orderStatusGroup = OrderStatusGroups()
|
| 2492 |
return Order.query.filter(Order.vendor_paid == 1).filter(Order.status.in_(orderStatusGroup.refundedOrders)).all()
|
2503 |
return Order.query.filter(Order.vendor_paid == 1).filter(Order.status.in_(orderStatusGroup.refundedOrders)).all()
|
| 2493 |
|
2504 |
|