Site Sections: Satchmo Main | Wiki | Demo Store |

Changeset 1375

Show
Ignore:
Timestamp:
08/05/08 00:00:05 (4 months ago)
Author:
bkroeze
Message:

fixing incorrect merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • satchmo/trunk/satchmo/shop/models.py

    r1374 r1375  
    244244         
    245245        try: 
    246             itemToModify =  self.cartitem_set.filter(product__id = chosen_item.id)[0] 
     246            item_to_modify =  self.cartitem_set.filter(product__id = chosen_item.id)[0] 
    247247            # Custom Products will not be added, they will each get their own line item 
    248248            #TODO: More sophisticated checks to make sure the options really are different 
    249             if 'CustomProduct' in itemToModify.product.get_subtypes(): 
    250                 itemToModify = CartItem(cart=self, product=chosen_item, quantity=0) 
     249            if 'CustomProduct' in item_to_modify.product.get_subtypes(): 
     250                item_to_modify = CartItem(cart=self, product=chosen_item, quantity=0) 
    251251                needs_add = True 
    252252        except IndexError: #It doesn't exist so create a new one 
    253             itemToModify = CartItem(cart=self, product=chosen_item, quantity=0) 
     253            item_to_modify = CartItem(cart=self, product=chosen_item, quantity=0) 
    254254            needs_add = True 
    255255             
    …… 
    261261             
    262262        if needs_add: 
    263             self.cartitem_set.add(itemToModify) 
     263            self.cartitem_set.add(item_to_modify) 
    264264 
    265265        item_to_modify.quantity += number_added