[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829132442-2td1iateub2j2eug
This commit is contained in:
@@ -28,9 +28,9 @@
|
||||
function(result) {
|
||||
_.each(result, function (item) {
|
||||
if (item.header) {
|
||||
menu.append('<li class="nav-header">' + item.name + '</li>');
|
||||
menu.append('<li class="dropdown-header">' + item.name + '</li>');
|
||||
} else {
|
||||
menu.append(_.str.sprintf('<li><a href="#" data-view-id="%s"><strong class="icon-check%s"></strong> %s</a></li>',
|
||||
menu.append(_.str.sprintf('<li role="presentation"><a href="#" data-view-id="%s" role="menuitem"><strong class="icon-check%s"></strong> %s</a></li>',
|
||||
item.id, item.active ? '' : '-empty', item.name));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -9,7 +9,7 @@ OpenERP Blog
|
||||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'sale', 'website_crm_partner_assign'],
|
||||
'depends': ['website', 'sale', 'website_worldmap'],
|
||||
'data': [
|
||||
'views/website_contract.xml',
|
||||
],
|
||||
|
||||
@@ -14,24 +14,28 @@ class website_contract(http.Controller):
|
||||
partner_obj = request.registry['res.partner']
|
||||
account_obj = request.registry['account.analytic.account']
|
||||
|
||||
domain = []
|
||||
# check contracts
|
||||
contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
|
||||
contract_project_ids = [contract.partner_id.id
|
||||
for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id]
|
||||
domain = ['|', ('id', "in", contract_project_ids), ('id', "child_of", contract_project_ids)]
|
||||
|
||||
if post.get('search'):
|
||||
domain += ['|',
|
||||
('name', 'ilike', "%%%s%%" % post.get("search")),
|
||||
('website_description', 'ilike', "%%%s%%" % post.get("search"))]
|
||||
|
||||
|
||||
# public partner profile
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
|
||||
worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
|
||||
if request.uid != website.get_public_user().id:
|
||||
contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
|
||||
contract_project_ids = [contract.partner_id.id
|
||||
for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id]
|
||||
# search for check access rules
|
||||
partner_ids += partner_obj.search(request.cr, request.uid, domain + ['|', ('id', "in", contract_project_ids), ('id', "child_of", contract_project_ids)])
|
||||
# search without website_published
|
||||
partner_ids += partner_obj.search(request.cr, request.uid, domain)
|
||||
partner_ids = list(set(partner_ids))
|
||||
|
||||
|
||||
# group by country
|
||||
countries = partner_obj.read_group(request.cr, request.uid, domain, ["id", "country_id"], groupby="country_id", orderby="country_id")
|
||||
countries.insert(0, {'country_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))})
|
||||
|
||||
@@ -35,11 +35,20 @@
|
||||
<t t-call="website.pager">
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
<form action="/references/" method="get" class="navbar-search pull-right pagination">
|
||||
<input type="text" name="search" class="search-query col-md-2 form-control" placeholder="Search" t-att-value="searches.get('search') or '' or ''" />
|
||||
<form action="/references/" method="get" class="navbar-search pull-right pagination">
|
||||
<input type="text" name="search" class="search-query col-md-2 form-control" placeholder="Search" t-att-value="searches.get('search') or '' or ''" />
|
||||
<select class="search-query col-md-2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
|
||||
<a class="pull-left" t-attf-href="/references/#{ partner.id }/">
|
||||
@@ -57,19 +66,13 @@
|
||||
</t>
|
||||
</template>
|
||||
|
||||
<template id="ref_country" inherit_id="website_contract.index" inherit_option_id="website_contract.index" name="Left Country Categories">
|
||||
<template id="ref_country" inherit_id="website_contract.index" inherit_option_id="website_contract.index" name="Left World Map">
|
||||
<xpath expr="//div[@id='ref_content']" position="before">
|
||||
<div class="col-md-4">
|
||||
<ul class="nav nav-pills nav-stacked">
|
||||
<li class="nav-header">World Map</li>
|
||||
<iframe t-attf-src="/worldmap/?width=320&height=240&partner_ids=#{ worldmap_partner_ids }&partner_url=/references/"
|
||||
style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
|
||||
<li class="nav-header">Location</li>
|
||||
<t t-foreach="countries">
|
||||
<li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''">
|
||||
<a t-attf-href="/references/#{ search_path }&country=#{ country_id[0] }"><t t-esc="country_id[1]"/><small>(<t t-esc="country_id_count"/>)</small></a>
|
||||
</li>
|
||||
</t>
|
||||
</ul>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
@@ -5,7 +5,6 @@ from openerp.osv import osv, fields
|
||||
class res_partner(osv.osv):
|
||||
_inherit = 'res.partner'
|
||||
_columns = {
|
||||
'website_published': fields.boolean('Available in the website'),
|
||||
'website_description': fields.html('Description for the website'),
|
||||
'website_short_description': fields.text('Sort description for the website'),
|
||||
}
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{
|
||||
'name': 'Website Worldmap',
|
||||
'name': 'Public Partners References',
|
||||
'category': 'Website',
|
||||
'summary': '',
|
||||
'summary': 'Publish Customer References',
|
||||
'version': '1.0',
|
||||
'description': """
|
||||
OpenERP Website Worldmap
|
||||
========================
|
||||
OpenERP Blog
|
||||
============
|
||||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'website_crm', 'crm_partner_assign'],
|
||||
'depends': ['website', 'website_worldmap'],
|
||||
'data': [
|
||||
'views/worldmap.xml',
|
||||
'views/website_crm_partner_assign.xml',
|
||||
],
|
||||
'qweb': ['static/src/xml/*.xml'],
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
import main
|
||||
|
||||
# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -2,82 +2,79 @@
|
||||
|
||||
import openerp
|
||||
from openerp.addons.web import http
|
||||
from openerp.tools.translate import _
|
||||
from openerp.addons.web.http import request
|
||||
import simplejson
|
||||
import werkzeug.wrappers
|
||||
from datetime import datetime
|
||||
import urllib
|
||||
|
||||
from urllib import quote_plus
|
||||
class website_crm_partner_assign(http.Controller):
|
||||
|
||||
class contactus(http.Controller):
|
||||
|
||||
@http.route(['/crm/contactus'], type='http', auth="admin")
|
||||
def contactus(self, *arg, **post):
|
||||
@http.route(['/partners/', '/partners/page/<int:page>/'], type='http', auth="public")
|
||||
def partners(self, page=0, **post):
|
||||
website = request.registry['website']
|
||||
post['user_id'] = False
|
||||
request.registry['crm.lead'].create(request.cr, request.uid, post)
|
||||
values = website.get_rendering_context()
|
||||
company = values['res_company']
|
||||
values.update({
|
||||
'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=8&size=298x298" % quote_plus('%s, %s %s, %s' % (company.street, company.city, company.zip, company.country_id and company.country_id.name_get()[0][1] or ''))
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
def dom_without(without):
|
||||
domain = [('grade_id', '!=', False)]
|
||||
domain += openerp.SUPERUSER_ID != request.uid and [('website_published', '=', True)] or [(1, "=", 1)]
|
||||
for key, search in domain_search.items():
|
||||
if key != without:
|
||||
domain += search
|
||||
return domain
|
||||
|
||||
# search domains
|
||||
domain_search = {}
|
||||
if post.get('search'):
|
||||
domain_search["search"] += ['|',
|
||||
('name', 'ilike', "%%%s%%" % post.get("search")),
|
||||
('website_description', 'ilike', "%%%s%%" % post.get("search"))]
|
||||
if post.get("grade", "all") != 'all':
|
||||
domain_search["grade"] = [("grade_id", "=", int(post.get("grade")))]
|
||||
if post.get("country", "all") != 'all':
|
||||
domain_search["country"] = [("country_id", "=", int(post.get("country")))]
|
||||
|
||||
|
||||
# public partner profile
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, dom_without(False) )
|
||||
worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
|
||||
|
||||
# group by country
|
||||
domain = dom_without("country")
|
||||
countries = partner_obj.read_group(request.cr, request.uid, domain, ["id", "country_id"], groupby="country_id", orderby="country_id")
|
||||
countries.insert(0, {'country_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))})
|
||||
|
||||
# group by grade
|
||||
domain = dom_without("grade")
|
||||
grades = partner_obj.read_group(request.cr, request.uid, domain, ["id", "grade_id"], groupby="grade_id", orderby="grade_id")
|
||||
grades.insert(0, {'grade_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'grade_id': ("all", _("All Grade"))})
|
||||
|
||||
|
||||
step = 20
|
||||
pager = website.pager(url="/partners/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post)
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
|
||||
|
||||
|
||||
values = website.get_rendering_context({
|
||||
'countries': countries,
|
||||
'grades': grades,
|
||||
'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids),
|
||||
'worldmap_partner_ids': worldmap_partner_ids,
|
||||
'pager': pager,
|
||||
'searches': post,
|
||||
'search_path': "?%s" % urllib.urlencode(post),
|
||||
})
|
||||
return website.render("website_crm.thanks", values)
|
||||
return website.render("website_crm_partner_assign.index", values)
|
||||
|
||||
@http.route(['/worldmap/'], type='http', auth="admin")
|
||||
def worldmap(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
values = website.get_rendering_context()
|
||||
values['partner_ids'] = post.get('partner_ids', "")
|
||||
values['width'] = post.get('width', 900)
|
||||
values['height'] = post.get('height', 460)
|
||||
values['partner_url'] = post.get('partner_url')
|
||||
return website.render("website_crm_partner_assign.worldmap", values)
|
||||
|
||||
@http.route(['/worldmap/partners.json'], type='http', auth="admin")
|
||||
def worldmap_data(self, *arg, **post):
|
||||
@http.route(['/partners/<int:ref_id>/'], type='http', auth="public")
|
||||
def partners_ref(self, ref_id=0, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
domain = [("id", "in", [int(p) for p in post.get('partner_ids', "").split(",") if p])]
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_published', '=', True), ('id', '=', ref_id)])
|
||||
if request.uid != website.get_public_user().id:
|
||||
partner_ids += partner_obj.search(request.cr, request.uid, domain)
|
||||
partner_ids = list(set(partner_ids))
|
||||
partner_ids += partner_obj.search(request.cr, request.uid, [('id', '=', ref_id)])
|
||||
|
||||
data = {
|
||||
"counter": len(partner_ids),
|
||||
"partners": []
|
||||
}
|
||||
for partner in partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, context={'show_address': True}):
|
||||
data["partners"].append({
|
||||
'id': partner.id,
|
||||
'name': partner.name,
|
||||
'address': '\n'.join(partner.name_get()[0][1].split('\n')[1:]),
|
||||
'type': partner.grade_id.name,
|
||||
'latitude': partner.partner_latitude,
|
||||
'longitude': partner.partner_longitude,
|
||||
})
|
||||
values = website.get_rendering_context({
|
||||
'partner_id': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids[0], context={'show_address': True}),
|
||||
})
|
||||
return website.render("website_crm_partner_assign.details", values)
|
||||
|
||||
mime = 'application/json'
|
||||
body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {"))
|
||||
return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
|
||||
|
||||
@http.route(['/worldmap/set_partner_position/'], type='http', auth="admin")
|
||||
def worldmap_set_partner_position(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
partner_id = post.get('partner_id') and int(post['partner_id'])
|
||||
latitude = post.get('latitude') and float(post['latitude'])
|
||||
longitude = post.get('longitude') and float(post['longitude'])
|
||||
|
||||
if request.uid != website.get_public_user().id and partner_id and (latitude or longitude):
|
||||
values = {
|
||||
'partner_latitude': latitude,
|
||||
'partner_longitude': longitude,
|
||||
'date_localization': datetime.now().strftime('%Y-%m-%d'),
|
||||
}
|
||||
partner_obj.write(request.cr, request.uid, [partner_id], values)
|
||||
|
||||
|
||||
# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!-- Layout add nav and footer -->
|
||||
|
||||
<template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
|
||||
<xpath expr="//body/footer//a[@href='/page/website.aboutus']" position="after">
|
||||
<li><a href="/partners/">Partners</a></li>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<!-- Page -->
|
||||
|
||||
<template id="layout" name="Partners Layout">
|
||||
<t t-call="website.layout">
|
||||
<t t-set="title">Partners</t>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<t t-raw="ref_content" />
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
<template id="index" name="Partners">
|
||||
<t t-call="website_crm_partner_assign.layout">
|
||||
<t t-set="ref_content">
|
||||
<h1 class="span12 text-center">Want services on OpenERP?</h1>
|
||||
<h2 class="span12 text-center">Contact a local partner</h2>
|
||||
<div class="span12" id="ref_content">
|
||||
<div class='navbar navbar-inverse'>
|
||||
<div class='navbar-inner'>
|
||||
<t t-call="website.pager" >
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
<form action="/partners/" method="get" class="navbar-search pull-right pagination">
|
||||
<input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
|
||||
<select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
<select class="search-query span2 mt4" name="grade" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="grades">
|
||||
<t t-if="grade_id">
|
||||
<option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
|
||||
<t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
|
||||
<a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
|
||||
<img class="media-object" t-att-src="partner.img('image_small')"/>
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
|
||||
<a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
|
||||
<div t-field="partner.website_short_description"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
<template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
|
||||
<xpath expr="//div[@id='ref_content']" position="before">
|
||||
<div class="span4">
|
||||
<ul class="nav nav-list">
|
||||
<li class="nav-header">World Map</li>
|
||||
<iframe t-attf-src="/worldmap/?width=320&height=240&partner_ids=#{ worldmap_partner_ids }&partner_url=/partners/"
|
||||
style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
|
||||
</ul>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr="//div[@id='ref_content']" position="attributes">
|
||||
<attribute name="class">span8</attribute>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="details" name="Partner Detail">
|
||||
<t t-call="website_crm_partner_assign.layout">
|
||||
<t t-set="ref_content">
|
||||
<t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
|
||||
<h1 class="span12 text-center" t-field="partner_id.name"/>
|
||||
<div class="span4">
|
||||
<div class="text-center">
|
||||
<img t-att-src="partner_id.img('image_medium')"/>
|
||||
</div>
|
||||
<address>
|
||||
<table style="margin: auto;" class="well">
|
||||
<colgroup>
|
||||
<col width="100"/>
|
||||
<col/>
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<t t-set="address" t-value="'<br/>'.join(partner_id.name_get()[0][1].split('\n')[1:])"/>
|
||||
<tr t-if="address or editable"><th>Address</th><td class="span2" t-raw="address"/></tr>
|
||||
<tr t-if="partner_id.website or editable"><th>Website</th><td class="span2" t-field="partner_id.website"/></tr>
|
||||
<tr t-if="partner_id.phone or editable"><th>Tel</th><td class="span2" t-field="partner_id.phone"/></tr>
|
||||
<tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2" t-field="partner_id.mobile"/></tr>
|
||||
<tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2" t-field="partner_id.fax"/></tr>
|
||||
<tr t-if="partner_id.email or editable"><th>Email</th><td class="span2" t-field="partner_id.email"/></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</address>
|
||||
</div>
|
||||
<div class="span8 mt32" t-field="partner_id.website_description"/>
|
||||
</t>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -5,5 +5,9 @@ from openerp.osv import osv, fields
|
||||
class res_partner(osv.osv):
|
||||
_inherit = 'res.partner'
|
||||
_columns = {
|
||||
'website_published': fields.boolean('Available in the website'),
|
||||
'website_description': fields.html('Description for the website'),
|
||||
'website_short_description': fields.text('Sort description for the website'),
|
||||
}
|
||||
|
||||
def img(self, cr, uid, ids, field='image_small', context=None):
|
||||
return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
import controllers
|
||||
import website_worldmap
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
'name': 'Website Worldmap',
|
||||
'category': 'Website',
|
||||
'summary': '',
|
||||
'version': '1.0',
|
||||
'description': """
|
||||
OpenERP Website Worldmap
|
||||
========================
|
||||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'crm_partner_assign'],
|
||||
'data': [
|
||||
'views/worldmap.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
import main
|
||||
|
||||
# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
@@ -0,0 +1,69 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import openerp
|
||||
from openerp.addons.web import http
|
||||
from openerp.addons.web.http import request
|
||||
import simplejson
|
||||
import werkzeug.wrappers
|
||||
from datetime import datetime
|
||||
|
||||
class contactus(http.Controller):
|
||||
|
||||
@http.route(['/worldmap/'], type='http', auth="admin")
|
||||
def worldmap(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
values = website.get_rendering_context()
|
||||
values['partner_ids'] = post.get('partner_ids', "")
|
||||
values['width'] = post.get('width', 900)
|
||||
values['height'] = post.get('height', 460)
|
||||
values['partner_url'] = post.get('partner_url')
|
||||
return website.render("website_worldmap.worldmap", values)
|
||||
|
||||
@http.route(['/worldmap/partners.json'], type='http', auth="admin")
|
||||
def worldmap_data(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
domain = [("id", "in", [int(p) for p in post.get('partner_ids', "").split(",") if p])]
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
|
||||
if request.uid != website.get_public_user().id:
|
||||
partner_ids += partner_obj.search(request.cr, request.uid, domain)
|
||||
partner_ids = list(set(partner_ids))
|
||||
|
||||
data = {
|
||||
"counter": len(partner_ids),
|
||||
"partners": []
|
||||
}
|
||||
for partner in partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, context={'show_address': True}):
|
||||
data["partners"].append({
|
||||
'id': partner.id,
|
||||
'name': partner.name,
|
||||
'address': '\n'.join(partner.name_get()[0][1].split('\n')[1:]),
|
||||
'type': partner.grade_id.name,
|
||||
'latitude': partner.partner_latitude,
|
||||
'longitude': partner.partner_longitude,
|
||||
})
|
||||
|
||||
mime = 'application/json'
|
||||
body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {"))
|
||||
return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
|
||||
|
||||
@http.route(['/worldmap/set_partner_position/'], type='http', auth="admin")
|
||||
def worldmap_set_partner_position(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
partner_id = post.get('partner_id') and int(post['partner_id'])
|
||||
latitude = post.get('latitude') and float(post['latitude'])
|
||||
longitude = post.get('longitude') and float(post['longitude'])
|
||||
|
||||
if request.uid != website.get_public_user().id and partner_id and (latitude or longitude):
|
||||
values = {
|
||||
'partner_latitude': latitude,
|
||||
'partner_longitude': longitude,
|
||||
'date_localization': datetime.now().strftime('%Y-%m-%d'),
|
||||
}
|
||||
partner_obj.write(request.cr, request.uid, [partner_id], values)
|
||||
|
||||
|
||||
# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
+1
-1
@@ -14,7 +14,7 @@ function initialize(pt) {
|
||||
infoWindow.close();
|
||||
});
|
||||
|
||||
var partners = new google.maps.MarkerImage("/website_crm_partner_assign/static/src/img/partners.png",new google.maps.Size(25, 25));
|
||||
var partners = new google.maps.MarkerImage("/website_worldmap/static/src/img/partners.png",new google.maps.Size(25, 25));
|
||||
|
||||
var markers = [];
|
||||
|
||||
+2
-2
@@ -28,9 +28,9 @@
|
||||
<script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
|
||||
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
|
||||
<script type="text/javascript" t-attf-src="/worldmap/partners.json?partner_ids=#{ partner_ids }"></script>
|
||||
<script type="text/javascript" src="/website_crm_partner_assign/static/src/js/markerclusterer_compiled.js"></script>
|
||||
<script type="text/javascript" src="/website_worldmap/static/src/js/markerclusterer_compiled.js"></script>
|
||||
<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
|
||||
<script type="text/javascript" src="/website_crm_partner_assign/static/src/js/worldmap.js"></script>
|
||||
<script type="text/javascript" src="/website_worldmap/static/src/js/worldmap.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" t-attf-style="width: #{ width }px; height: #{ height }px"></div>
|
||||
@@ -0,0 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from openerp.osv import osv, fields
|
||||
|
||||
class res_partner(osv.osv):
|
||||
_inherit = 'res.partner'
|
||||
_columns = {
|
||||
'website_published': fields.boolean('Available in the website'),
|
||||
}
|
||||
Reference in New Issue
Block a user