Subversion Repositories SmartDukaan

Rev

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

Rev 20989 Rev 21043
Line 4736... Line 4736...
4736
                continue
4736
                continue
4737
            
4737
            
4738
            ##As per ticket #743 if amount difference less than 0.5 we should reconcile
4738
            ##As per ticket #743 if amount difference less than 0.5 we should reconcile
4739
            if abs(amount - (order.total_amount + order.shippingCost - order.gvAmount)) > 0.5:
4739
            if abs(amount - (order.total_amount + order.shippingCost - order.gvAmount)) > 0.5:
4740
                #Received amount is less than or more than the order amount. Mustn't let the user proceed.
4740
                #Received amount is less than or more than the order amount. Mustn't let the user proceed.
4741
                unprocessed_awbs[awb] = "Payment of Rs. " + str(amount) + " has been received against the total value of Rs. " + str(order.total_amount-order.gvAmount) + " for order: " + str(order.id)
4741
                unprocessed_awbs[awb] = "Payment of Rs. " + str(amount) + " has been received against the total value of Rs. " + str(order.total_amount + order.shippingCost -order.gvAmount) + " for order: " + str(order.id)
4742
                continue
4742
                continue
4743
            
4743
            
4744
            try:
4744
            try:
4745
                payment_client = PaymentClient().get_client()
4745
                payment_client = PaymentClient().get_client()
4746
                payment_client.partiallyCapturePayment(order.transaction.id, amount, xferBy, xferTxnId, xferDate)
4746
                payment_client.partiallyCapturePayment(order.transaction.id, amount, xferBy, xferTxnId, xferDate)