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

                 sourcePricing = catalog_client.getStorePricing(order.lineitems[0].item_id)
                 if order.total_amount >= sourcePricing.minPrice:
                     order.status = OrderStatus.SUBMITTED_FOR_PROCESSING
                     order.statusDescription = "Order Accepted"
                     session.commit()
+                    sod = StoreOrderDetail.get_by(orderId = order.id)
-                    __push_store_collection_to_hotspot(order, "advance", order.advanceAmount)
+                    __push_store_collection_to_hotspot(order, "advance", sod.cashAmount, sod.cardAmount)
                 else:
                     order.status = OrderStatus.COD_VERIFICATION_PENDING
                     order.statusDescription = "Approval Pending"
                     content = "<html><body>"
     if order.status == OrderStatus.COD_VERIFICATION_PENDING:
         order.status = OrderStatus.SUBMITTED_FOR_PROCESSING
         order.statusDescription = "Submitted for processing"
         order.verification_timestamp = datetime.datetime.now()
         session.commit()
         if order.source == OrderSource.STORE:
+            sod = StoreOrderDetail.get_by(orderId = order.id)
-            __push_store_collection_to_hotspot(order, 'advance', order.advanceAmount)
+            __push_store_collection_to_hotspot(order, "advance", sod.cashAmount, sod.cardAmount)
         logging.info("Successfully verified order no: " + str(orderId))
         return True
     else:
         logging.warning("Verify called for order no." + str(orderId) +" which is not in verification pending state");
         return False
                 warehouseClient.scanForOursExternalSaleReturn(order.id, lineitem.transfer_price)
     if order.source == 2 and order.status in (OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.ACCEPTED, OrderStatus.INVENTORY_LOW, OrderStatus.CANCEL_REQUEST_CONFIRMED):
         storeOrderDetail = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == order.id).filter(StoreOrderDetail.storeId == order.storeId).first()
         if order.created_timestamp.date() == datetime.datetime.now().date():
-            __push_store_collection_to_hotspot(order, "RefundFromStore", -(storeOrderDetail.cashRefundAmount + storeOrderDetail.cardRefundAmount))
+            __push_store_collection_to_hotspot(order, "RefundFromStore", -storeOrderDetail.cashRefundAmount, -storeOrderDetail.cardRefundAmount)
             storeOrderDetail.payStatus = StorePaymentStatus.ADV_REFUNDED
         else:
-            __push_store_collection_to_hotspot(order, "RefundFromStore", -(storeOrderDetail.cashRefundAmount))
-            if storeOrderDetail.cardRefundAmount > 0:
+            if order.advanceAmount - storeOrderDetail.cashRefundAmount == 0:
-                storeOrderDetail.payStatus = StorePaymentStatus.REFUND_PENDING
-            else:
                 storeOrderDetail.payStatus = StorePaymentStatus.ADV_REFUNDED
+            else:
+                storeOrderDetail.payStatus = StorePaymentStatus.REFUND_REQUESTED
+            if storeOrderDetail.cashRefundAmount > 0:
+                __push_store_collection_to_hotspot(order, "RefundFromStore", -storeOrderDetail.cashRefundAmount, 0)
     order.status = status_transition[order.status]
     order.refund_timestamp = datetime.datetime.now()
     order.refunded_by = refunded_by
     order.refund_reason = reason
     session.commit()
     pdf.drawText(order_text)
     pdf.showPage()
     pdf.save()
     return filename
-def __push_store_collection_to_hotspot(order, ctype, amount):
+def __push_store_collection_to_hotspot(order, ctype, cashamount, cardamount):
     ts = datetime.datetime.now()
     store =  get_hotspot_store(order.storeId, "")
     soc = StoreOrderCollection()
     soc.hotspotId = store.hotspotId
     soc.orderId = order.id
     soc.collectionType = ctype
-    soc.advanceAmount = int(amount)
+    soc.advanceAmount = int(cashamount + cardamount)
     soc.productName =  str(order.lineitems[0])
     soc.addedAt = ts
     soc.pushedToOcr = False
-    soc.cash = int(amount)
+    soc.cash = int(cashamount)
-    soc.card = 0
+    soc.card = int(cardamount)
     session.commit()
     try:
         rcs = StoreOrderCollection.query.filter(StoreOrderCollection.pushedToOcr == False).all()
         for cs in rcs:
     ds_storeOrderDetail.storeId = thrift_storeOrderDetail.storeId
     ds_storeOrderDetail.payStatus = thrift_storeOrderDetail.payStatus
     ds_storeOrderDetail.cardRefundAmount = thrift_storeOrderDetail.cardRefundAmount
     ds_storeOrderDetail.cashRefundAmount = thrift_storeOrderDetail.cashRefundAmount
     ds_storeOrderDetail.edcBank = thrift_storeOrderDetail.edcBank
+    ds_storeOrderDetail.approvalCode = thrift_storeOrderDetail.approvalCode
     session.commit()
     return True
 def get_store_order_detail(orderId, storeId):
     storeOrderDetail = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == orderId).filter(StoreOrderDetail.storeId == storeId).first()

Subversion Repositories SmartDukaan

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