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



        order.jacket_number = jacketNumber
        
        if itemNumbers:
            lineitem.item_number = itemNumbers[0]    
                
        '''
        if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:
            if billedOrdersColorMap.has_key(orderId):
                etpColor = billedOrdersColorMap.get(orderId)
                ourColor = order.lineitems[0].color
                if ourColor and etpColor != ourColor and not authorize:
                    raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
                else:
                    billedOrdersColorMap.pop(orderId)
        '''
 
        if billingType == BillingType.EXTERNAL:            
            order.invoice_number = invoice_number
 
        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:

Subversion Repositories SmartDukaan

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

Rev 6786		Rev 6787
Line 1175...		Line 1175...
1175	`order.jacket_number = jacketNumber`	1175	`order.jacket_number = jacketNumber`
1176		1176
1177	`if itemNumbers:`	1177	`if itemNumbers:`
1178	`lineitem.item_number = itemNumbers[0]`	1178	`lineitem.item_number = itemNumbers[0]`
1179		1179
-		1180	`'''`
1180	`if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:`	1181	`if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:`
1181	`if billedOrdersColorMap.has_key(orderId):`	1182	`if billedOrdersColorMap.has_key(orderId):`
1182	`etpColor = billedOrdersColorMap.get(orderId)`	1183	`etpColor = billedOrdersColorMap.get(orderId)`
1183	`ourColor = order.lineitems[0].color`	1184	`ourColor = order.lineitems[0].color`
1184	`if ourColor and etpColor != ourColor and not authorize:`	1185	`if ourColor and etpColor != ourColor and not authorize:`
1185	`raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)`	1186	`raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)`
1186	`else:`	1187	`else:`
1187	`billedOrdersColorMap.pop(orderId)`	1188	`billedOrdersColorMap.pop(orderId)`
-		1189	`'''`
1188		1190
1189	`if billingType == BillingType.EXTERNAL:`	1191	`if billingType == BillingType.EXTERNAL:`
1190	`order.invoice_number = invoice_number`	1192	`order.invoice_number = invoice_number`
1191		1193
1192	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`	1194	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`