Subversion Repositories SmartDukaan

Rev

Rev 4247 | Rev 4258 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4247 Rev 4252
Line 1451... Line 1451...
1451
        if order.status < OrderStatus.DELIVERY_SUCCESS:
1451
        if order.status < OrderStatus.DELIVERY_SUCCESS:
1452
            #Order has not been delivered yet. No way we can receive the payment.
1452
            #Order has not been delivered yet. No way we can receive the payment.
1453
            unprocessed_awbs[awb] = "Payment has been received for order: " + str(order.id) + " before delivery reconciliation"
1453
            unprocessed_awbs[awb] = "Payment has been received for order: " + str(order.id) + " before delivery reconciliation"
1454
            continue
1454
            continue
1455
        
1455
        
-
 
1456
        ##As per ticket #743 if amount difference less than 0.5 we should reconcile
1456
        if amount != order.total_amount:
1457
        if abs(amount - order.total_amount) > 0.5:
1457
            #Received amount is less than or more than the order amount. Mustn't let the user proceed.
1458
            #Received amount is less than or more than the order amount. Mustn't let the user proceed.
1458
            unprocessed_awbs[awb] = "Payment of Rs. " + str(amount) + " has been received against the total value of Rs. " + str(order.total_amount) + " for order: " + str(order.id)
1459
            unprocessed_awbs[awb] = "Payment of Rs. " + str(amount) + " has been received against the total value of Rs. " + str(order.total_amount) + " for order: " + str(order.id)
1459
            continue
1460
            continue
1460
        
1461
        
1461
        try:
1462
        try: