Subversion Repositories SmartDukaan

Rev

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

Rev 3355 Rev 3359
Line 145... Line 145...
145
145
146 
    ds_item.catalog_item_id = item.catalogItemId
 146 
    ds_item.catalog_item_id = item.catalogItemId
147 
 
 147 
 
148 
    ds_item.mrp = item.mrp
 148 
    ds_item.mrp = item.mrp
149 
    ds_item.sellingPrice = item.sellingPrice
 149 
    ds_item.sellingPrice = item.sellingPrice
150
- 
 
151 
    ds_item.mop = item.mop
 - 
 
152 
    ds_item.dealerPrice = item.dealerPrice
 - 
 
153 
    ds_item.transfer_price = item.transferPrice
 - 
 
154 
 
 150 
 
155 
    ds_item.weight = item.weight
 151 
    ds_item.weight = item.weight
156
152
157 
    if ds_item.status != item.itemStatus:
 153 
    if ds_item.status != item.itemStatus:
158 
        add_status_change_log(ds_item, item.itemStatus)
 154 
        add_status_change_log(ds_item, item.itemStatus)
Line 176... Line 172...
176 
    ds_item.bestDealValue = item.bestDealValue
 172 
    ds_item.bestDealValue = item.bestDealValue
177 
    ds_item.bestSellingRank = item.bestSellingRank
 173 
    ds_item.bestSellingRank = item.bestSellingRank
178
174
179 
    ds_item.defaultForEntity = item.defaultForEntity
 175 
    ds_item.defaultForEntity = item.defaultForEntity
180 
    ds_item.risky = item.risky
 176 
    ds_item.risky = item.risky
- 
 
 177
- 
 
 178 
    if item.expectedDelay:
- 
 
 179 
        ds_item.expectedDelay = item.expectedDelay
- 
 
 180
- 
 
 181 
    if item.preferredWarehouse:
- 
 
 182 
        ds_item.preferredWarehouse = item.preferredWarehouse
- 
 
 183
181 
    ds_item.updatedOn = datetime.datetime.now()
 184 
    ds_item.updatedOn = datetime.datetime.now()
182
185
183 
    session.commit();
 186 
    session.commit();
184 
    return ds_item.id
 187 
    return ds_item.id
185 
 
 188 
 
Line 229... Line 232...
229 
    if item.retireDate:
 232 
    if item.retireDate:
230 
        ds_item.retireDate = to_py_date(item.retireDate)
 233 
        ds_item.retireDate = to_py_date(item.retireDate)
231
234
232 
    if item.mrp:
 235 
    if item.mrp:
233 
        ds_item.mrp = item.mrp
 236 
        ds_item.mrp = item.mrp
234 
    if item.mop:
 - 
 
235 
        ds_item.mop = item.mop
 - 
 
236 
    if item.sellingPrice:
 237 
    if item.sellingPrice:
237 
        ds_item.sellingPrice = item.sellingPrice
 238 
        ds_item.sellingPrice = item.sellingPrice
238 
    if item.dealerPrice:
 - 
 
239 
        ds_item.dealerPrice = item.dealerPrice
 - 
 
240 
    if item.transferPrice:
 - 
 
241 
        ds_item.transfer_price = item.transferPrice
 - 
 
242 
    if item.weight:
 239 
    if item.weight:
243 
        ds_item.weight = item.weight
 240 
        ds_item.weight = item.weight
244
241
245 
    if item.featureId:
 242 
    if item.featureId:
246 
        ds_item.feature_id = item.featureId
 243 
        ds_item.feature_id = item.featureId
Line 263... Line 260...
263 
    if item.bestSellingRank:
 260 
    if item.bestSellingRank:
264 
        ds_item.bestSellingRank = item.bestSellingRank
 261 
        ds_item.bestSellingRank = item.bestSellingRank
265 
    ds_item.defaultForEntity = item.defaultForEntity
 262 
    ds_item.defaultForEntity = item.defaultForEntity
266 
    ds_item.risky = item.risky
 263 
    ds_item.risky = item.risky
267
264
- 
 
 265 
    if item.expectedDelay:
- 
 
 266 
        ds_item.expectedDelay = item.expectedDelay
- 
 
 267
- 
 
 268 
    if item.preferredWarehouse:
- 
 
 269 
        ds_item.preferredWarehouse = item.preferredWarehouse
- 
 
 270
268 
    # Check if a similar item already exists in our database
 271 
    # Check if a similar item already exists in our database
269 
    similar_item = Item.query.filter_by(product_group=item.productGroup, brand = item.brand, model_number=item.modelNumber, hotspotCategory=item.hotspotCategory).first()
 272 
    similar_item = Item.query.filter_by(product_group=item.productGroup, brand = item.brand, model_number=item.modelNumber, hotspotCategory=item.hotspotCategory).first()
270 
    print "[SIMILAR ITEM FOUND:] FOR {0} {1} {2} {3} {4}".format(item.productGroup, item.brand, item.modelNumber, item.hotspotCategory, item.color)
 273 
    print "[SIMILAR ITEM FOUND:] FOR {0} {1} {2} {3} {4}".format(item.productGroup, item.brand, item.modelNumber, item.hotspotCategory, item.color)
271
274
272 
    if similar_item is None or similar_item.catalog_item_id is None:
 275 
    if similar_item is None or similar_item.catalog_item_id is None: