Subversion Repositories SmartDukaan

Rev

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

Rev 4773 Rev 4781
Line 635... Line 635...
635 
            order.invoice_number = invoice_number
 635 
            order.invoice_number = invoice_number
636 
            # In case of hotspot billing, we should try to verify that color billed in ETP is same as color in order.
 636 
            # In case of hotspot billing, we should try to verify that color billed in ETP is same as color in order.
637 
            if billedOrdersColorMap.has_key(orderId):
 637 
            if billedOrdersColorMap.has_key(orderId):
638 
                etpColor = billedOrdersColorMap.get(orderId)
 638 
                etpColor = billedOrdersColorMap.get(orderId)
639 
                ourColor = order.lineitems[0].color
 639 
                ourColor = order.lineitems[0].color
640 
                if etpColor != ourColor and not authorize:
 640 
                if ourColor and etpColor != ourColor and not authorize:
641 
                    raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
 641 
                    raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
642 
                else:
 642 
                else:
643 
                    billedOrdersColorMap.pop(orderId)
 643 
                    billedOrdersColorMap.pop(orderId)
644
644
645 
        order.status = OrderStatus.BILLED
 645 
        order.status = OrderStatus.BILLED