Subversion Repositories SmartDukaan

Rev

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

Rev 724 Rev 766
Line 34... Line 34...
34
            item.model_number = model_number
34
            item.model_number = model_number
35
            item.color = color
35
            item.color = color
36
            item.status = status.IN_PROCESS
36
            item.status = status.IN_PROCESS
37
            item.addedOn = updatedOn
37
            item.addedOn = updatedOn
38
            session.add(item)
38
            session.add(item)
39
            
39
	'''            
40
        #Set the catalog_item_id.
40
        #Set the catalog_item_id.
41
        similar_item = Item.query.filter_by(manufacturer_name = brand, model_number=model_number).first()
41
        similar_item = Item.query.filter_by(manufacturer_name = brand, model_number=model_number).first()
42
        print similar_item
42
        print similar_item
43
        if similar_item is None or similar_item.catalog_item_id is None:
43
        if similar_item is None or similar_item.catalog_item_id is None:
44
            #Use the entity_id_generator
44
            #Use the entity_id_generator
Line 46... Line 46...
46
            item.catalog_item_id = entity_id.id + 1
46
            item.catalog_item_id = entity_id.id + 1
47
            entity_id.id = entity_id.id  + 1
47
            entity_id.id = entity_id.id  + 1
48
        else:
48
        else:
49
            #If it already exists for a brand and model_number, set it as same.
49
            #If it already exists for a brand and model_number, set it as same.
50
            item.catalog_item_id = similar_item.catalog_item_id
50
            item.catalog_item_id = similar_item.catalog_item_id
51
        
-
 
52
        #added category and entity id
-
 
53
        '''
51
        '''
-
 
52
        #added category and entity id
-
 
53
        
54
        item.catalog_item_id = int(catalog_item_id)
54
        item.catalog_item_id = int(catalog_item_id)
55
        item.category = int(category_id)
55
        item.category = int(category_id)
56
        item.status = status.ACTIVE
56
        item.status = status.ACTIVE
57
        '''
-
 
58
        item.hotspotCategory = hotspot_category
57
        item.hotspotCategory = hotspot_category
-
 
58
        
59
        item.model_name = model_name
59
        item.model_name = model_name
60
        if mrp != "":
60
        if mrp != "":
61
            item.mrp = mrp
61
            item.mrp = mrp
-
 
62
	else:
-
 
63
	    item.mrp = dp + dp/5
62
        if mop != "":
64
        if mop != "":
63
            item.mop = mop
65
            item.mop = mop
64
        if dp != "":    
66
        if dp != "":    
65
            item.dealerPrice = dp
67
            item.dealerPrice = dp
66
            item.sellingPrice = dp
68
            item.sellingPrice = dp
-
 
69
        else:
-
 
70
	    item.dealerPrice = mrp - mrp/5
-
 
71
	    item.sellingPrice= mrp - mrp/5
67
        if xfer_price !="":
72
        if xfer_price !="":
68
            item.transfer_price = xfer_price
73
            item.transfer_price = xfer_price
69
        if weight != "":    
74
        if weight != "":    
70
            item.weight = weight
75
            item.weight = weight
71
        if start_date != "":
76
        if start_date != "":