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

     order.status = OrderStatus.DOA_REQUEST_RECEIVED
     order.statusDescription = "DOA Request Received"
     session.commit()
     return True
-def mark_order_doa_request_authorized(orderId, isAuthorized):
+def mark_order_doa_request_authorized(orderId, isAuthorized, fromStore, isReship):
     order = get_order(orderId)
     if order.status != OrderStatus.DOA_REQUEST_RECEIVED:
         return False
     if isAuthorized:
         order.status = OrderStatus.DOA_REQUEST_AUTHORIZED
         order.statusDescription = "DOA Request Authorized"
+        if order.source == 2:
+            if fromStore:
+                if isReship:
+                    new_order = __clone_order(order, False, False)
+                    order.reship_timestamp = datetime.datetime.now()
+                    order.new_order_id = new_order.id
+                else:
+                    sod = StoreOrderDetail.get_by(orderId = order.id)
+                    if sod.cashAmount > 0:
+                        __push_store_collection_to_hotspot(order, "RefundFromStore", -sod.cashAmount, 0)
+                    if sod.cardAmount == 0:
+                        sod.payStatus = StorePaymentStatus.ADV_REFUNDED
+                    else:
+                        sod.payStatus = StorePaymentStatus.REFUND_REQUESTED
+                    order.refund_timestamp = datetime.datetime.now()
+                    order.refunded_by = "CRM Outbound Team"
+                    sod.cashRefundAmount = sod.cashAmount
+                    sod.cardRefundAmount = sod.cardAmount
     else:
         order.status = OrderStatus.DELIVERY_SUCCESS
         order.statusDescription = "Order delivered"
     session.commit()
     return True
     order.status = OrderStatus.RET_REQUEST_RECEIVED
     order.statusDescription = "Return Request Received"
     session.commit()
     return True
-def mark_order_return_request_authorized(orderId, isAuthorized):
+def mark_order_return_request_authorized(orderId, isAuthorized, fromStore, isReship):
     order = get_order(orderId)
     if order.status != OrderStatus.RET_REQUEST_RECEIVED:
         return False
     if isAuthorized:
         order.status = OrderStatus.RET_REQUEST_AUTHORIZED
         order.statusDescription = "Return Request Authorized"
+        if order.source == 2:
+            if fromStore:
+                if isReship:
+                    new_order = __clone_order(order, False, False)
+                    order.reship_timestamp = datetime.datetime.now()
+                    order.new_order_id = new_order.id
+                else:
+                    sod = StoreOrderDetail.get_by(orderId = order.id)
+                    if sod.cashAmount > 0:
+                        __push_store_collection_to_hotspot(order, "RefundFromStore", -sod.cashAmount, 0)
+                    if sod.cardAmount == 0:
+                        sod.payStatus = StorePaymentStatus.ADV_REFUNDED
+                    else:
+                        sod.payStatus = StorePaymentStatus.REFUND_REQUESTED
+                    order.refund_timestamp = datetime.datetime.now()
+                    order.refunded_by = "CRM Outbound Team"
+                    sod.cashRefundAmount = sod.cashAmount
+                    sod.cardRefundAmount = sod.cardAmount
     else:
         order.status = OrderStatus.DELIVERY_SUCCESS
         order.statusDescription = "Order delivered"
     session.commit()
     return True
                     warehouseClient.scanForOrder(None, scanType, lineitem.quantity, order.id, order.fulfilmentWarehouseId, order.warehouse_id)
             if warehouse.billingType == BillingType.OURS_EXTERNAL and scanType == ScanType.SALE_RET:
                 warehouseClient.scanForOursExternalSaleReturn(order.id, lineitem.transfer_price)
             if scanFreebie:
                 warehouseClient.scanfreebie(order.id, order.freebieItemId, 0, scanType)
     session.commit()
+    if order.source == 2:
+        if order.new_order_id:
+            reship_order(order.id)
+        else:
+            storeOrderDetail = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == order.id).filter(StoreOrderDetail.storeId == order.storeId).first()
+            if storeOrderDetail.payStatus not in (StorePaymentStatus.ADV_REFUNDED , StorePaymentStatus.REFUND_INITIATED, \
+                                          StorePaymentStatus.REFUND_REQUESTED, StorePaymentStatus.REFUNDED):
+                refund_order(order.id, "Store", "N/A")
     return True
 def validate_doa(order_id, is_valid):
     order = get_order(order_id)
     if order.status != OrderStatus.DOA_RECEIVED_PRESTINE:
     Parameters:
      - orderId
     """
     order = get_order(order_id)
+    alreadyReshipped = False
+    if order.source == 2 and order.new_order_id:
+        alreadyReshipped = True
     if order.status == OrderStatus.RTO_RECEIVED_PRESTINE:
-        new_order = __clone_order(order, True, order.cod)
         order.status = OrderStatus.RTO_RESHIPPED
         order.statusDescription = "Order Reshipped"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, True, order.cod)
         update_trust_level(order)
         __scan_for_reship_order(order_id, new_order)
     elif order.status == OrderStatus.RTO_RECEIVED_DAMAGED:
-        new_order = __clone_order(order, False, order.cod)
-        ret_order = __create_return_order(order)
         order.status = OrderStatus.RTO_DAMAGED_RESHIPPED
         order.statusDescription = "Order Reshipped Received Damaged"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, order.cod)
+        ret_order = __create_return_order(order)
     elif order.status == OrderStatus.RTO_LOST_IN_TRANSIT:
-        new_order = __clone_order(order, False, order.cod)
         order.status = OrderStatus.RTO_LOST_IN_TRANSIT_RESHIPPED
         order.statusDescription = "Order Reshipped Lost In Transit"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, order.cod)
     elif order.status == OrderStatus.LOST_IN_TRANSIT:
-        new_order = __clone_order(order, False, order.cod)
         order.status = OrderStatus.LOST_IN_TRANSIT_RESHIPPED
         order.statusDescription = "Order Reshipped Lost In Transit"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, order.cod)
     elif order.status == OrderStatus.DOA_CERT_INVALID:
-        new_order = __clone_order(order, True, False)
         order.status = OrderStatus.DOA_INVALID_RESHIPPED
         order.statusDescription = "Order Reshipped"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, True, False)
         __scan_for_reship_order(order_id, new_order)
     elif order.status == OrderStatus.DOA_CERT_VALID:
-        new_order = __clone_order(order, False, False)
-        ret_order = __create_return_order(order)
         order.status = OrderStatus.DOA_VALID_RESHIPPED
         order.statusDescription = "Order Reshipped"
-        session.commit()
+        if not alreadyReshipped:
-    elif order.status == OrderStatus.DOA_RECEIVED_DAMAGED:
-        new_order = __clone_order(order, False, False)
+            new_order = __clone_order(order, False, False)
         ret_order = __create_return_order(order)
+    elif order.status == OrderStatus.DOA_RECEIVED_DAMAGED:
         order.status = OrderStatus.DOA_RESHIPPED_RCVD_DAMAGED
         order.statusDescription = "Order Reshipped Received Damaged"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, False)
+        ret_order = __create_return_order(order)
     elif order.status == OrderStatus.DOA_LOST_IN_TRANSIT:
-        new_order = __clone_order(order, False, False)
         order.status = OrderStatus.DOA_RESHIPPED_LOST_IN_TRANSIT
         order.statusDescription = "Order Reshipped Lost In Transit"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, False)
     elif order.status == OrderStatus.RET_PRODUCT_USABLE:
-        new_order = __clone_order(order, False, False)
         order.status = OrderStatus.RET_PRODUCT_USABLE_RESHIPPED
         order.statusDescription = "Order Reshipped"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, False)
     elif order.status == OrderStatus.RET_PRODUCT_UNUSABLE:
-        new_order = __clone_order(order, False, False)
-        ret_order = __create_return_order(order)
         order.status = OrderStatus.RET_PRODUCT_UNUSABLE_RESHIPPED
         order.statusDescription = "Order Reshipped"
-        session.commit()
+        if not alreadyReshipped:
-    elif order.status == OrderStatus.RET_RECEIVED_DAMAGED:
-        new_order = __clone_order(order, False, False)
+            new_order = __clone_order(order, False, False)
         ret_order = __create_return_order(order)
+    elif order.status == OrderStatus.RET_RECEIVED_DAMAGED:
         order.status = OrderStatus.RET_RESHIPPED_RCVD_DAMAGED
         order.statusDescription = "Order Reshipped Received Damaged"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, False)
+        ret_order = __create_return_order(order)
     elif order.status == OrderStatus.RET_LOST_IN_TRANSIT:
-        new_order = __clone_order(order, False, False)
         order.status = OrderStatus.RET_RESHIPPED_LOST_IN_TRANSIT
         order.statusDescription = "Order Reshipped Lost In Transit"
-        session.commit()
+        if not alreadyReshipped:
+            new_order = __clone_order(order, False, False)
     else:
         raise TransactionServiceException(112, "This order can't be reshipped")
+    if not alreadyReshipped:
-    order.reship_timestamp = datetime.datetime.now()
+        order.reship_timestamp = datetime.datetime.now()
-    order.new_order_id = new_order.id
+        order.new_order_id = new_order.id
-    session.commit()
+        session.commit()
+        return new_order.id
+    else:
+        return order.new_order_id
-    return new_order.id
 def __scan_for_reship_order(order_id, new_order):
     inventoryClient = InventoryClient().get_client()
     warehouse = inventoryClient.getWarehouse(new_order.warehouse_id)
     if warehouse.billingType == BillingType.OURS:
                 storeOrderDetail.payStatus = StorePaymentStatus.REFUND_REQUESTED
             if storeOrderDetail.cashRefundAmount > 0:
                 __push_store_collection_to_hotspot(order, "RefundFromStore", -storeOrderDetail.cashRefundAmount, 0)
+    elif order.source == 2 and order.status in (OrderStatus.RTO_RECEIVED_PRESTINE, OrderStatus.RTO_RECEIVED_DAMAGED, \
+                                                OrderStatus.RET_PRODUCT_UNUSABLE, OrderStatus.RET_PRODUCT_USABLE, \
+                                                OrderStatus.RET_RECEIVED_DAMAGED, OrderStatus.RET_LOST_IN_TRANSIT ,\
+                                                OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, \
+                                                OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT):
+        storeOrderDetail = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == order.id).filter(StoreOrderDetail.storeId == order.storeId).first()
+        if storeOrderDetail.payStatus not in (StorePaymentStatus.ADV_REFUNDED , StorePaymentStatus.REFUND_INITIATED, \
+                                          StorePaymentStatus.REFUND_REQUESTED, StorePaymentStatus.REFUNDED):
+            storeOrderDetail.payStatus = StorePaymentStatus.REFUND_REQUESTED
+        else:
+            order.status = status_transition[order.status]
+            order.refund_reason = reason
+            session.commit()
+            return True
     order.status = status_transition[order.status]
     order.refund_timestamp = datetime.datetime.now()
     order.refunded_by = refunded_by
     order.refund_reason = reason
     session.commit()
         new_order.lineitems[0].item_number   = order.lineitems[0].item_number
         new_order.accepted_timestamp = current_time
         new_order.billing_timestamp = current_time
         new_order.status = OrderStatus.BILLED
         new_order.statusDescription = 'Order Billed'
+        session.commit()
     else:
         session.commit()
         inventoryClient = InventoryClient().get_client()
         inventoryClient.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)
+    if order.source == 2:
+        new_order.advanceAmount = order.advanceAmount
+        new_order.storeId = order.storeId
+        oldSod = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == order.id).filter(StoreOrderDetail.storeId == order.storeId).first()
+        newSod = StoreOrderDetail()
+        newSod.orderId = new_order.id
+        newSod.storeId = oldSod.storeId
+        newSod.advanceAmount = oldSod.advanceAmount
+        newSod.approvalCode = oldSod.approvalCode
+        newSod.cardAmount = oldSod.cardAmount
+        newSod.cashAmount = oldSod.cashAmount
+        newSod.cashRefundAmount = oldSod.cashRefundAmount
+        newSod.cardRefundAmount = oldSod.cardRefundAmount
+        newSod.edcBank = oldSod.edcBank
+        newSod.payStatus = oldSod.payStatus
+        newSod.cardType = oldSod.cardType
+        session.commit()
     return new_order
 def __create_return_order(order):
     ret_order = ReturnOrder(order)
     return ret_order
 def get_orders_by_mobile_number(mobileNumber):
     return Order.query.filter(Order.customer_mobilenumber == mobileNumber).all()
 def get_orders_by_amazon_id(amazonId):
     orderIds = []
-    amazonOrders = AmazonOrder.query.filter(AmazonOrder.amazonOrderItemCode == amazonId).all()
+    amazonOrders = AmazonOrder.query.filter(AmazonOrder.amazonOrderCode == amazonId).all()
     for amazonOrder in amazonOrders:
         orderIds.append(amazonOrder.orderId)
     return get_order_list(orderIds)
 if __name__ == '__main__':

Subversion Repositories SmartDukaan

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