Subversion Repositories SmartDukaan

Rev

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

Rev 557 Rev 567
Line 54... Line 54...
54 
    user.name = user_to_add.name
 54 
    user.name = user_to_add.name
55 
    user.communication_email = user_to_add.communicationEmail
 55 
    user.communication_email = user_to_add.communicationEmail
56 
    user.jsession_id = user_to_add.jsessionId
 56 
    user.jsession_id = user_to_add.jsessionId
57 
    user.is_anonymous = False
 57 
    user.is_anonymous = False
58 
    user.sex = user_to_add.sex
 58 
    user.sex = user_to_add.sex
59 
    user.date_of_birth = to_py_date(user_to_add.dateOfBirth)
 59 
    user.date_of_birth = user_to_add.dateOfBirth
60 
    user.active_cart_id = cart.id
 60 
    user.active_cart_id = cart.id
- 
 
 61 
    user.mobile_number = user_to_add.mobileNumber
61 
 
 62 
 
62 
    #initialize userState
 63 
    #initialize userState
63 
    user_state = UserState()
 64 
    user_state = UserState()
64 
    user_state.is_email_verified = False
 65 
    user_state.is_email_verified = False
65 
    user_state.is_sms_verified = False
 66 
    user_state.is_sms_verified = False
Line 120... Line 121...
120 
        else:
 121 
        else:
121 
            return False
 122 
            return False
122 
    except:
 123 
    except:
123 
        return False
 124 
        return False
124 
 
 125 
 
125 
def add_address_for_user(address, user_id, time_stamp, set_default):
 126 
def add_address_for_user(address, user_id, set_default):
126 
    user = get_user_by_id(user_id)
 127 
    user = get_user_by_id(user_id)
127 
    if not user:
 128 
    if not user:
128 
        raise_user_exception(user_id)
 129 
        raise_user_exception(user_id)
129 
    if not address:
 130 
    if not address:
130 
        raise UserContextException(103,"Address cannot be null")
 131 
        raise UserContextException(103,"Address cannot be null")
Line 145... Line 146...
145 
    address_to_add.user = user
 146 
    address_to_add.user = user
146 
    session.commit()
 147 
    session.commit()
147
148
148 
    if set_default is True:
 149 
    if set_default is True:
149 
        user.default_address_id = address_to_add.id
 150 
        user.default_address_id = address_to_add.id
- 
 
 151 
    #set default address if nothing is default
- 
 
 152 
    if user.default_address_id is None:
- 
 
 153 
        user.default_address_id = address_to_add.id
- 
 
 154
150 
    session.commit()
 155 
    session.commit()
151
156
152 
    return True
 157 
    return address_to_add.id
153
158
154 
def remove_address_for_user(user_id, address_id):
 159 
def remove_address_for_user(user_id, address_id):
155 
    address = get_address(address_id)
160 
    address = get_address(address_id)
156
161
157 
    if not address:
 162 
    if not address: