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

 def get_order_list(order_ids):
     orders = Order.query.filter(Order.id.in_(tuple(order_ids)))
     return orders
+def get_order_list_for_vendor(order_ids, vendor_id):
+    if vendor_id == -1:
+        return get_order_list(order_ids)
+    else:
+        orders = Order.query.filter_by(vendorId = vendor_id).filter(Order.id.in_(tuple(order_ids)))
+        return orders
 def get_orders_for_customer(customer_id, from_date, to_date, statuses):
     if not customer_id:
         raise TransactionServiceException(101, "bad customer id")
     query = Order.query.filter(Order.customer_id == customer_id)
     if statuses:
             order.statusDescription = "Order Cancelled"
         elif order.status == OrderStatus.BILLED:
             __create_return_order(order)
             order.statusDescription = "Order Cancelled"
         elif order.status in [OrderStatus.RTO_RECEIVED_PRESTINE, OrderStatus.RTO_RECEIVED_DAMAGED, OrderStatus.RTO_LOST_IN_TRANSIT]:
+            if order.status != OrderStatus.RTO_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             order.statusDescription = "RTO Refunded"
         elif order.status in [OrderStatus.LOST_IN_TRANSIT]:
-            __create_return_order(order)
+            #__create_return_order(order)
             order.statusDescription = "Lost in Transit Refunded"
         elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
+            if order.status != OrderStatus.DOA_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "DOA Refunded"
         elif order.status in [OrderStatus.RET_PRODUCT_UNUSABLE, OrderStatus.RET_PRODUCT_USABLE, OrderStatus.RET_RECEIVED_DAMAGED, OrderStatus.RET_LOST_IN_TRANSIT] :
+            if order.status != OrderStatus.RET_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Return Refunded"
         elif order.status == OrderStatus.CANCEL_REQUEST_CONFIRMED:
             if order.previousStatus 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.status not in status_transition.keys():
             raise TransactionServiceException(114, "This order can't be refunded")
         if order.status in [OrderStatus.RTO_RECEIVED_PRESTINE, OrderStatus.RTO_RECEIVED_DAMAGED, OrderStatus.RTO_LOST_IN_TRANSIT] :
+            if order.status != OrderStatus.RTO_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "RTO Refunded"
         elif order.status in [OrderStatus.LOST_IN_TRANSIT]:
-            __create_return_order(order)
+            #__create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Lost in Transit Refunded"
         elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
+            if order.status != OrderStatus.DOA_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "DOA Refunded"
         elif order.status in [OrderStatus.RET_PRODUCT_UNUSABLE, OrderStatus.RET_PRODUCT_USABLE, OrderStatus.RET_RECEIVED_DAMAGED, OrderStatus.RET_LOST_IN_TRANSIT] :
+            if order.status != OrderStatus.RET_LOST_IN_TRANSIT:
-            __create_return_order(order)
+                __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Return Refunded"
         elif order.status in [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)
             order.statusDescription = "Order Refunded"
         query = query.filter(Order.billing_timestamp <= billing_date_to)
     return query.all()
 def get_orders_where_vendor_not_paid(vendor_id):
-    query = Order.query.filter_by(vendorId = vendor_id)
-    query = query.filter(Order.billing_timestamp != None)
+    query = Order.query.filter(Order.billing_timestamp != None)
     query = query.filter(Order.vendor_paid != True)
-    orderStatusGroup = OrderStatusGroups()
+    if vendor_id != -1:
-    query = query.filter(not_(Order.status.in_(orderStatusGroup.refundedOrders)))
+        query = query.filter_by(vendorId = vendor_id)
-    #query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
-    #(15,31,32,33,34,48,54,70,72,74)
     return query.all()
 def save_bluedart_settlements(map_awb_and_amount):
     payment_client = PaymentClient().get_client()
         settlement.paymentGatewayId = payment.gatewayId
         settlement.netCollection = amount
         session.commit()
 def save_payment_settlements(settlementDate, paymentGatewayId, referenceId, serviceTax, otherCharges, netCollection):
+    originalOrderId = None
+    if paymentGatewayId == 4:
+        cod_order = Order.get_by(id = referenceId)
+        if cod_order.originalOrderId:
+            originalOrderId = cod_order.originalOrderId
+        else:
+            originalOrderId = referenceId
     settlement = PaymentSettlement()
     settlement.settlementDate = settlementDate
     settlement.paymentGatewayId = paymentGatewayId
+    if originalOrderId is not None:
+        settlement.originalOrderId = originalOrderId
     settlement.referenceId = referenceId
     settlement.serviceTax = serviceTax
     settlement.otherCharges = otherCharges
     settlement.netCollection = netCollection
     session.commit()
-def get_settlement_for_referenceId(reference_id, payment_gateway_id, is_refund = False):
+def get_settlement_for_Prepaid(reference_id, is_refund = False):
-    query = PaymentSettlement.query.filter_by(referenceId = reference_id)
+    query = PaymentSettlement.query.filter_by(referenceId = reference_id).filter(PaymentSettlement.paymentGatewayId != 4)
     if is_refund:
         query = query.filter(PaymentSettlement.netCollection < 0)
     else:
         query = query.filter(PaymentSettlement.netCollection > 0)
+    return query.first()
+def get_settlement_for_Cod(orderId, is_refund = False):
+    query = PaymentSettlement.query.filter_by(originalOrderId = orderId)
-    if payment_gateway_id:
+    if is_refund:
+        query = query.filter(PaymentSettlement.netCollection < 0)
+    else:
-        query = query.filter_by(paymentGatewayId = payment_gateway_id)
+        query = query.filter(PaymentSettlement.netCollection > 0)
     return query.first()
 def save_ebs_settlement_summary(settlement_id, settlement_date, transaction_date_from, transaction_date_to, amount):
     summary = EBSSettlementSummary()
         original_order_id = paid_order.originalOrderId
         for order in Order.query.filter(Order.originalOrderId == original_order_id).all():
             order.vendor_paid = True
             session.commit()
-            original_order_id = order.originalOrderId
         original_order = Order.get_by(id = original_order_id)
         if original_order:  original_order.vendor_paid = True
         session.commit()
     agent.orderId = orderId
     agent.verificationAgent = agentEmailId
     session.commit()
+def update_order_only_as_paid_to_vendor(order_id):
+    paid_order = Order.get_by(id = order_id)
+    if paid_order is None:
+        raise TransactionServiceException(116, "No order found for the given order id")
+    paid_order.vendor_paid = True
+    session.commit()
 def get_refunded_orders_marked_paid():
     orderStatusGroup = OrderStatusGroups()
     return Order.query.filter(Order.vendor_paid == 1).filter(Order.status.in_(orderStatusGroup.refundedOrders)).all()
 def close_session():

Subversion Repositories SmartDukaan

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