Subversion Repositories SmartDukaan

Rev

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

Rev 6899 Rev 6903
Line 144... Line 144...
144
    if item.modelNumber:
144
    if item.modelNumber:
145
        ds_item.model_number = item.modelNumber
145
        ds_item.model_number = item.modelNumber
146
    ds_item.color = item.color
146
    ds_item.color = item.color
147
    ds_item.model_name = item.modelName
147
    ds_item.model_name = item.modelName
148
    ds_item.category = item.category
148
    ds_item.category = item.category
-
 
149
    if item.category in [10001, 10002, 10003, 10004, 10005]:
-
 
150
        ds_item.preferredInsurer = 1
-
 
151
                
149
    ds_item.comments = item.comments
152
    ds_item.comments = item.comments
150
    
153
    
151
    ds_item.catalog_item_id = item.catalogItemId
154
    ds_item.catalog_item_id = item.catalogItemId
152
 
155
 
153
    ds_item.mrp = item.mrp
156
    ds_item.mrp = item.mrp
Line 238... Line 241...
238
            if ds_item.preferredVendor:
241
            if ds_item.preferredVendor:
239
                oldPreferredVendorName = inventoryClient.getVendor(ds_item.preferredVendor).name
242
                oldPreferredVendorName = inventoryClient.getVendor(ds_item.preferredVendor).name
240
            message += "Preferred vendor is changed from '{0}' to '{1}'.\n".format(oldPreferredVendorName, newPreferredVendorName)        
243
            message += "Preferred vendor is changed from '{0}' to '{1}'.\n".format(oldPreferredVendorName, newPreferredVendorName)        
241
        ds_item.preferredVendor = item.preferredVendor
244
        ds_item.preferredVendor = item.preferredVendor
242
          
245
          
243
    if item.preferredInsurer != ds_item.preferredInsurer:
-
 
244
        message += "Preferred Insurer is changed from '{0}' to '{1}'.\n".format(ds_item.preferredInsurer,item.preferredInsurer)
-
 
245
        ds_item.preferredInsurer = item.preferredInsurer
-
 
246
                
-
 
247
    
-
 
248
    if item.isWarehousePreferenceSticky != ds_item.isWarehousePreferenceSticky:
246
    if item.isWarehousePreferenceSticky != ds_item.isWarehousePreferenceSticky:
249
        flag = "ON" if item.isWarehousePreferenceSticky else "OFF"
247
        flag = "ON" if item.isWarehousePreferenceSticky else "OFF"
250
        message += "Warehouse preference sticky is {0}.\n".format(flag)
248
        message += "Warehouse preference sticky is {0}.\n".format(flag)
251
 
249
 
252
    ds_item.isWarehousePreferenceSticky = item.isWarehousePreferenceSticky
250
    ds_item.isWarehousePreferenceSticky = item.isWarehousePreferenceSticky
Line 1390... Line 1388...
1390
    session.query(EntityTag.tag).filter_by(tag=displayName,entityId=catalogId).delete()
1388
    session.query(EntityTag.tag).filter_by(tag=displayName,entityId=catalogId).delete()
1391
    session.commit()
1389
    session.commit()
1392
    return True
1390
    return True
1393
 
1391
 
1394
def get_insurance_amount(itemId, insurerId, quantity):
1392
def get_insurance_amount(itemId, insurerId, quantity):
-
 
1393
    item = Item.get_by(id = itemId)
1395
    itemInsurerMapping = ItemInsurerMapping.query.filter(ItemInsurerMapping.itemId == itemId).filter(ItemInsurerMapping.insurerId == insurerId).first()
1394
    itemInsurerMapping = ItemInsurerMapping.query.filter(ItemInsurerMapping.itemId == itemId).filter(ItemInsurerMapping.insurerId == insurerId).first()
1396
    if not itemInsurerMapping:
1395
    if not itemInsurerMapping:
1397
        return 0
1396
        #Default insurance premium is 1.5%
-
 
1397
        return round(item.sellingPrice * (1.5/100) * quantity)
1398
    insuranceAmount = 0.0
1398
    insuranceAmount = 0.0
1399
    if itemInsurerMapping.premiumType == PremiumType._NAMES_TO_VALUES.get("PERCENT"):
1399
    if itemInsurerMapping.premiumType == PremiumType._NAMES_TO_VALUES.get("PERCENT"):
1400
        item = Item.get_by(id = itemId)
-
 
1401
        insuranceAmount = item.sellingPrice * (itemInsurerMapping.premiumAmount/100) * quantity
1400
        insuranceAmount = item.sellingPrice * (itemInsurerMapping.premiumAmount/100) * quantity
1402
    else :
1401
    else :
1403
        insuranceAmount = itemInsurerMapping.premiumAmount * quantity
1402
        insuranceAmount = itemInsurerMapping.premiumAmount * quantity
1404
        
1403
        
1405
    return insuranceAmount
1404
    return insuranceAmount