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
             return True
     if order.cod:
         logging.info("Refunding COD order with status " + str(order.status))
-        status_transition = { OrderStatus.LOST_IN_TRANSIT : OrderStatus.LOST_IN_TRANSIT_REFUNDED,
+        status_transition = refund_status_transition
-                     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)
         if order.courier_delivery_time:
             order.courier_delivery_time = order.courier_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.courier_delivery_time, further_delay))
         else:
             order.courier_delivery_time = order.expected_delivery_time + datetime.timedelta(days=adjust_delivery_time(order.expected_delivery_time, further_delay))
         session.commit()
+        exist = TransactionRequiringExtraProcessing.query.filter_by(transaction_id = order.transaction_id).first()
+        if not exist:
-        try:
+            try:
-            transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()
+                transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()
-            transaction_requiring_extra_processing.category = 'DELAYED_DELIVERY'
+                transaction_requiring_extra_processing.category = 'DELAYED_DELIVERY'
-            transaction_requiring_extra_processing.transaction_id = order.transaction_id
+                transaction_requiring_extra_processing.transaction_id = order.transaction_id
-            session.commit()
+                session.commit()
-        except Exception as e:
+            except Exception as e:
-            print 'Could not persist transaction id: ' + str(order.transaction_id) + ' for further processing due to: ' + str(e)
+                print 'Could not persist transaction id: ' + str(order.transaction_id) + ' for further processing due to: ' + str(e)
         return True
     except:
         print sys.exc_info()[0]
         return False
      - 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 would be returned on basis warehouse and company
         orgId=2
         (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
+def add_shipment_delay(shipmentDelayDetail):
+    returnList = []
+    for delayObj in shipmentDelayDetail:
+        print delayObj.orderId
+        print delayObj.delayReason
+        print delayObj.delayReasonText
+        print delayObj.delay
+        order = get_order(delayObj.orderId)
+        if order.status not in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.ACCEPTED]:
+            returnList.append(delayObj.orderId)
+            continue
+        try:
+            result = add_delay_reason(delayObj.orderId, delayObj.delayReason, delayObj.delay, delayObj.delayReasonText)
+        except:
+            returnList.append(delayObj.orderId)
+            continue
+        if not result:
+            returnList.append(delayObj.orderId)
+    return returnList
 #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

Subversion Repositories SmartDukaan

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