njeudy
/
vertical-cooperative
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[IMP] allow to fill the cooperator subscription form from the connected 

user data if logged.
pull/1/head
houssine 7 years ago
parent
7c6ff0939b
commit
14b23b53d2
2 changed files with 51 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      easy_my_coop/controllers/main.py
  2. 4
      easy_my_coop_online_payment/controllers/main.py

54
easy_my_coop/controllers/main.py
View File

@ -19,7 +19,7 @@ class WebsiteSubscription(http.Controller):
def display_become_cooperator_page(self, **kwargs):
values = {}
values = self.fill_values(values,is_company=False)
values = self.fill_values(values,False,True)
for field in ['email','firstname','lastname','birthdate','iban','share_product_id','no_registre','address','city','zip_code','country_id','phone','lang','nb_parts','total_parts','error_msg']:
if kwargs.get(field):
@ -32,7 +32,7 @@ class WebsiteSubscription(http.Controller):
def display_become_company_cooperator_page(self, **kwargs):
values = {}
values = self.fill_values(values,is_company=True)
values = self.fill_values(values,True)
for field in ['is_company','company_register_number','company_name','company_email','company_type','email','firstname','lastname','birthdate','iban','share_product_id','no_registre','address','city','zip_code','country_id','phone','lang','nb_parts','total_parts','error_msg']:
if kwargs.get(field):
@ -51,15 +51,41 @@ class WebsiteSubscription(http.Controller):
values = self.preRenderThanks(values, kwargs)
return request.website.render(kwargs.get("view_callback", "easy_my_coop.cooperator_thanks"), values)
def fill_values(self, values, is_company):
company = request.website.company_id
def get_values_from_user(self, values, is_company):
# the subscriber is connected
if request.env.user.login != 'public':
if is_company:
print ''
else:
values['logged'] = 'on'
partner = request.env.user.partner_id
values['firstname'] = partner.firstname
values['lastname'] = partner.lastname
values['email'] = partner.email
values['address'] = partner.street
values['zip_code'] = partner.zip
values['city'] = partner.city
values['country_id'] = partner.country_id.id
values['gender'] = partner.gender
values['no_registre'] = partner.national_register_number
values['birthdate'] = partner.birthdate
if partner.bank_ids:
values['iban'] = partner.bank_ids[0].acc_number
values['lang'] = partner.lang
values['phone'] = partner.phone
return values
def fill_values(self, values, is_company, load_from_user=False):
company = request.website.company_id
if load_from_user:
values = self.get_values_from_user(values,is_company)
values['countries'] = self.get_countries()
values['langs'] = self.get_langs()
values['products'] = self.get_products_share(is_company)
fields_desc = request.env['subscription.request'].sudo().fields_get(['company_type','gender'])
values['company_types'] = fields_desc['company_type']['selection']
values['genders'] = fields_desc['gender']['selection']
if not values.get('share_product_id'):
products = request.env['product.template'].sudo().get_web_share_products(is_company)
for product in products:
@ -102,6 +128,7 @@ class WebsiteSubscription(http.Controller):
@http.route(['/subscription/subscribe_share'], type='http', auth="public", website=True)
def share_subscription(self, **kwargs):
user_obj = request.env['res.users']
post_file = [] # List of file to add to ir_attachment once we have the ID
post_description = [] # Info to add after the message
values = {}
@ -114,6 +141,8 @@ class WebsiteSubscription(http.Controller):
elif field_name not in _TECHNICAL: # allow to add some free fields or blacklisted field like ID
post_description.append("%s: %s" % (field_name, field_value))
logged = kwargs.get("logged")=='on'
is_company = False
if kwargs.get("is_company") == 'on':
is_company = True
@ -129,6 +158,15 @@ class WebsiteSubscription(http.Controller):
return request.website.render(kwargs.get("view_from", redirect), values)
if not logged and kwargs.has_key('email'):
user = user_obj.sudo().search([('login','=',kwargs.get("email"))])
if user:
values = self.fill_values(values,is_company)
values.update(kwargs)
values["error_msg"] = "There is an existing account for this mail address. Please login before fill in the form"
return request.website.render(redirect, values)
# fields validation : Check that required field from model subscription_request exists
required_fields = request.env['subscription.request'].sudo().get_required_field()
error = set(field for field in required_fields if not values.get(field))
@ -162,19 +200,21 @@ class WebsiteSubscription(http.Controller):
total_amount = float(kwargs.get('total_parts'))
if max_amount > 0 and total_amount > max_amount:
values = self.fill_values(values)
values = self.fill_values(values,is_company)
values["error_msg"] = "You can't suscribe for an amount that exceed " + str(max_amount) + company.currency_id.symbol
return request.website.render("easy_my_coop.becomecooperator", values)
if values["is_company"] == True:
if kwargs.get("company_register_number"):
if is_company:
if kwargs.get("company_register_number", is_company):
values["company_register_number"] = re.sub('[^0-9a-zA-Z]+', '', kwargs.get("company_register_number"))
subscription_id = request.env['subscription.request'].sudo().create_comp_sub_req(values)
else:
if kwargs.get("no_registre"):
values["no_registre"] = re.sub('[^0-9a-zA-Z]+', '', kwargs.get("no_registre"))
subscription_id = request.env['subscription.request'].sudo().create(values)
values.update(subscription_id = subscription_id)
if subscription_id:
for field_value in post_file:
attachment_value = {

4
easy_my_coop_online_payment/controllers/main.py
View File

@ -14,8 +14,8 @@ from openerp.addons.website_payment.controllers.main import website_payment
class SubscriptionOnlinePayment(WebsiteSubscription):
def fill_values(self, values, is_company):
values = super(SubscriptionOnlinePayment,self).fill_values(values, is_company)
def fill_values(self, values, is_company, load_from_user=False):
values = super(SubscriptionOnlinePayment,self).fill_values(values, is_company,load_from_user)
fields_desc = request.env['subscription.request'].sudo().fields_get(['payment_type'])
values['payment_types'] = fields_desc['payment_type']['selection']

Write Preview
Loading…
Cancel
Save