WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

     AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, \
     HotspotServiceMatrix, SnapdealOrder, FlipkartOrder, DataInsuranceDetailForOrder, \
     AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator, \
     TransactionShipmentSequence, HsOrder, Creditor, UserSanction, CreditHistory, \
     LoanHistory, ShipmentLogisticsCostDetail, ReturnOrderInfo, ReturnTransaction, \
-    ReturnPickupRequest, SellerWarehouse, Seller, Organisation,\
+    ReturnPickupRequest, SellerWarehouse, Seller, Organisation, \
     WarehouseAddressMapping, WarehouseAddressMaster
 from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
 from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
 from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
     MobileRechargeOrder
 from shop2020.model.v1.order.impl.model.ServiceProvider import ServiceProvider
 from shop2020.model.v1.order.impl.model.TelecomCircle import TelecomCircle
 from shop2020.model.v1.order.impl.model.UserWallet import UserWallet
 from shop2020.model.v1.order.impl.model.UserWalletHistory import \
     UserWalletHistory
+from shop2020.model.v1.user.impl.Converters import to_t_address
 from shop2020.thriftpy.alert.ttypes import MonitoredEntity, EntityType
 from shop2020.thriftpy.crm.ttypes import *
 from shop2020.thriftpy.logistics.ttypes import DeliveryType, PickUpType
 from shop2020.thriftpy.model.v1.catalog.ttypes import ItemType, ItemCondition
 from shop2020.thriftpy.model.v1.inventory.ttypes import BillingType, \
     AmazonFCWarehouseLocation, RechargeMode, CreditTxnType, \
     CreditHistory as TCreditHistory, LoanHistory as TLoanHistory, \
     ShipmentLogisticsCostDetail as TShipmentLogisticsCostDetail, \
     ReturnTransactionStatus, ReturnAction, ReturnTxnResolutionStatus, \
     ReplacementShippingType, ReturnTxnPickupStatus, ReceivedReturnType, \
-    ReturnPickupType, RefundType, SellerInfo
+    ReturnPickupType, RefundType, SellerInfo, BuyerInfo
 from shop2020.thriftpy.model.v1.user.ttypes import VoucherType, CouponCategory, \
     User, Sex
 from shop2020.thriftpy.payments.ttypes import PaymentException
 from shop2020.thriftpy.utils.ttypes import UserSmsInfo, SmsType
 from shop2020.thriftpy.warehouse.ttypes import ScanType, \
 from shop2020.utils.EmailAttachmentSender import mail, get_attachment_part, \
     mail_html
 from shop2020.utils.Utils import to_py_date, to_java_date, \
     getSyncOperatorsForRecharge
 from suds.client import Client
-from shop2020.model.v1.user.impl.Converters import to_t_address
 #Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
 #End:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
 #Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
             return True
     if order.cod:
         logging.info("Refunding COD order with status " + str(order.status))
-        status_transition = refund_status_transition
+        status_transition = { OrderStatus.LOST_IN_TRANSIT : OrderStatus.LOST_IN_TRANSIT_REFUNDED,
+                     OrderStatus.RTO_RECEIVED_PRESTINE : OrderStatus.RTO_REFUNDED,
+                     OrderStatus.RTO_RECEIVED_DAMAGED : OrderStatus.RTO_DAMAGED_REFUNDED,
+                     OrderStatus.RTO_LOST_IN_TRANSIT : OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED,
+                     OrderStatus.DOA_CERT_INVALID : OrderStatus.DOA_INVALID_REFUNDED,
+                     OrderStatus.DOA_CERT_VALID : OrderStatus.DOA_VALID_REFUNDED,
+                     OrderStatus.DOA_RECEIVED_DAMAGED : OrderStatus.DOA_REFUNDED_RCVD_DAMAGED,
+                     OrderStatus.DOA_LOST_IN_TRANSIT : OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT,
+                     OrderStatus.RET_PRODUCT_UNUSABLE : OrderStatus.RET_PRODUCT_UNUSABLE_REFUNDED,
+                     OrderStatus.RET_PRODUCT_USABLE : OrderStatus.RET_PRODUCT_USABLE_REFUNDED,
+                     OrderStatus.RET_RECEIVED_DAMAGED : OrderStatus.RET_REFUNDED_RCVD_DAMAGED,
+                     OrderStatus.RET_LOST_IN_TRANSIT : OrderStatus.RET_REFUNDED_LOST_IN_TRANSIT,
+                     OrderStatus.COD_VERIFICATION_PENDING : OrderStatus.COD_VERIFICATION_FAILED,
+                     OrderStatus.SUBMITTED_FOR_PROCESSING : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.INVENTORY_LOW : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.LOW_INV_PO_RAISED : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.LOW_INV_REVERSAL_IN_PROCESS : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.ACCEPTED : OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY,
+                     OrderStatus.BILLED : OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST,
+                     OrderStatus.CANCEL_REQUEST_CONFIRMED : OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST
+                     }
         if order.status not in status_transition.keys():
             raise TransactionServiceException(114, "This order can't be refunded")
         if order.status in [OrderStatus.COD_VERIFICATION_PENDING, OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.ACCEPTED]:
             __update_inventory_reservation(order)
      - transactionId
     """
     transaction = get_transaction(transactionId)
     transaction.status = TransactionStatus.FAILED
     for order in transaction.orders:
-        if order.status in refund_status_transition.keys():
-            refund_order(order.id, refundedBy, reason)
+        refund_order(order.id, refundedBy, reason)
     session.commit()
 def mark_order_cancellation_request_denied(orderId):
     """
     If we decide to not to cancel order, we will move the order to previous status.
     seller = Seller.get_by(id=sellerId)
     if seller is None:
         return None
     else:
         sellerInfo.tin = seller.tin
+        sellerInfo.stateId = seller.state_id
         org = Organisation.get_by(id=seller.organisation_id)
         if org is None:
             return None
         else:
             sellerInfo.organisationName = org.name
         #As of now we have hardcoded the company and
         #seller would be returned on basis warehouse and company
         orgId=1
         (sellerId,) = session.query(Seller.id).join((SellerWarehouse, Seller.id==SellerWarehouse.seller_id)).filter(Seller.organisation_id==orgId).filter(SellerWarehouse.warehouse_id==warehouse_id).first()
         return sellerId
+#Buyer can be anyone based on logic
+def __get_buyer(warehouse_id):
+        #As of now we have hardcoded the company and
+        #seller would be returned on basis warehouse and company
+        orgId=1
+        buyerId=None
+        result = session.query(Seller.id).join((SellerWarehouse, Seller.id==SellerWarehouse.seller_id)).filter(Seller.organisation_id==orgId).filter(SellerWarehouse.warehouse_id==warehouse_id).first()
+        if result:
+            buyerId = result[0]
+        return buyerId
+def get_buyer_by_warehouse(warehouse_id):
+        buyerId = __get_buyer(warehouse_id)
+        if buyerId is None:
+            return None
+        sellerInfo = get_seller_info(buyerId)
+        buyerInfo = BuyerInfo()
+        buyerInfo.cinNumber = sellerInfo.cinNumber
+        buyerInfo.organisationName = sellerInfo.organisationName
+        buyerInfo.regId = sellerInfo.regId
+        buyerInfo.tin = sellerInfo.tin
+        buyerInfo.registeredAddress = sellerInfo.registeredAddress
+        buyerInfo.buyerId = buyerId
+        buyerInfo.stateId = sellerInfo.state_id
+        addressMapping = session.query(WarehouseAddressMaster).join((WarehouseAddressMapping,WarehouseAddressMapping.address_id==WarehouseAddressMaster.id)).filter(WarehouseAddressMapping.warehouse_id==warehouse_id).first()
+        if addressMapping is not None:
+            buyerInfo.addressId = addressMapping.address_id
+            buyerInfo.address = addressMapping
+        else:
+            return None
 if __name__ == '__main__':
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 20024 → 20025