'];
+ html.push('
');
+
+ block.element.setHtml(html.join(' '));
+ var $panel = $(block.element.$);
+ $panel.on('click', 'button', function () {
+ self.clicked(this);
+ });
+ },
+ clicked: function (button) {
+ editor.focus();
+ editor.fire('saveSnapshot');
+
+ var $button = $(button),
+ $link = $(get_selected_link(editor).$);
+ if (!$link.hasClass('btn')) {
+ $link.addClass('btn btn-default');
+ }
+ switch($button.data('type')) {
+ case 'reset':
+ $link.removeClass('btn')
+ .removeClass(_.keys(this.types).join(' '))
+ .removeClass(_.keys(this.sizes).join(' '));
+ break;
+ case 'types':
+ $link.removeClass(_.keys(this.types).join(' '))
+ .addClass($button.data('set-class'));
+ break;
+ case 'sizes':
+ $link.removeClass(_.keys(this.sizes).join(' '))
+ .addClass($button.data('set-class'));
+ }
+ this._.panel.hide();
+
+ editor.fire('saveSnapshot');
+ },
+
+ });
+ }
+ });
+
CKEDITOR.plugins.add('oeref', {
requires: 'widget',
@@ -224,157 +388,6 @@
}
});
- CKEDITOR.plugins.add('bootstrapcombo', {
- requires: 'richcombo',
-
- init: function (editor) {
- var config = editor.config;
-
- editor.ui.addRichCombo('BootstrapLinkCombo', {
- // default title
- label: "Links",
- // hover
- title: "Link styling",
- toolbar: 'styles,10',
- allowedContent: ['a'],
-
- panel: {
- css: [
- '/website/static/lib/bootstrap/css/bootstrap.css',
- CKEDITOR.skin.getPath( 'editor' )
- ].concat( config.contentsCss ),
- multiSelect: true,
- },
-
- types: {
- 'basic': 'btn-default',
- 'primary': 'btn-primary',
- 'success': 'btn-success',
- 'info': 'btn-info',
- 'warning': 'btn-warning',
- 'danger': 'btn-danger',
- },
-
- sizes: {
- 'large': 'btn-lg',
- 'default': '',
- 'small': 'btn-sm',
- 'extra small': 'btn-xs',
- },
-
- init: function () {
- this.add('', 'Reset');
- this.startGroup("Types");
- for(var type in this.types) {
- if (!this.types.hasOwnProperty(type)) { continue; }
- var cls = this.types[type];
- var el = _.str.sprintf(
- '%s',
- cls, type);
- this.add(type, el);
- }
- this.startGroup("Sizes");
- for (var size in this.sizes) {
- if (!this.sizes.hasOwnProperty(size)) { continue; }
- cls = this.sizes[size];
-
- el = _.str.sprintf(
- '%s',
- cls, size);
- this.add(size, el);
- }
- this.commit();
- },
- onRender: function () {
- var self = this;
- editor.on('selectionChange', function (e) {
- var path = e.data.path, el;
-
- if (!(el = path.contains('a'))) {
- self.element = null;
- self.disable();
- return;
- }
-
- self.enable();
- // This is crap, but getting the currently selected
- // element from within onOpen absolutely does not
- // work, so store the "current" element in the
- // widget instead
- self.element = el;
- });
- setTimeout(function () {
- // Because I can't find any normal hook where the
- // bloody button's bloody element is available
- self.disable();
- }, 0);
- },
- onOpen: function () {
- this.showAll();
- this.unmarkAll();
-
- for(var val in this.types) {
- if (!this.types.hasOwnProperty(val)) { continue; }
- var cls = this.types[val];
- if (!this.element.hasClass(cls)) { continue; }
-
- this.mark(val);
- break;
- }
-
- var found;
- for(val in this.sizes) {
- if (!this.sizes.hasOwnProperty(val)) { continue; }
- cls = this.sizes[val];
- if (!cls || !this.element.hasClass(cls)) { continue; }
-
- found = true;
- this.mark(val);
- break;
- }
- if (!found && this.element.hasClass('btn')) {
- this.mark('default');
- }
- },
- onClick: function (value) {
- editor.focus();
- editor.fire('saveShapshot');
-
- // basic btn setup
- var el = this.element;
- if (!el.hasClass('btn')) {
- el.addClass('btn');
- el.addClass('btn-default');
- }
-
- if (!value) {
- this.setClass(this.types);
- this.setClass(this.sizes);
- el.removeClass('btn');
- } else if (value in this.types) {
- this.setClass(this.types, value);
- } else if (value in this.sizes) {
- this.setClass(this.sizes, value);
- }
-
- editor.fire('saveShapshot');
- },
- setClass: function (classMap, value) {
- var element = this.element;
- _(classMap).each(function (cls) {
- if (!cls) { return; }
- element.removeClass(cls);
- }.bind(this));
-
- var cls = classMap[value];
- if (cls) {
- element.addClass(cls);
- }
- }
- });
- },
- });
-
var editor = new website.EditorBar();
var $body = $(document.body);
editor.prependTo($body).then(function () {
@@ -788,7 +801,7 @@
fillEmptyBlocks: false,
filebrowserImageUploadUrl: "/website/attach",
// Support for sharedSpaces in 4.x
- extraPlugins: 'sharedspace,customdialogs,tablebutton,oeref,bootstrapcombo',
+ extraPlugins: 'sharedspace,customdialogs,tablebutton,oeref,linkstyle',
// Place toolbar in controlled location
sharedSpaces: { top: 'oe_rte_toolbar' },
toolbar: [{
@@ -800,7 +813,7 @@
"Superscript", "TextColor", "BGColor", "RemoveFormat"
]},{
name: 'span', items: [
- "Link", "Blockquote", "BulletedList",
+ "Link", "LinkStyle", "Blockquote", "BulletedList",
"NumberedList", "Indent", "Outdent"
]},{
name: 'justify', items: [
@@ -810,7 +823,7 @@
"Image", "TableButton"
]},{
name: 'styles', items: [
- "Styles", "BootstrapLinkCombo"
+ "Styles"
]}
],
// styles dropdown in toolbar
@@ -1182,26 +1195,30 @@
},
});
website.editor.RTEImageDialog = website.editor.ImageDialog.extend({
- init: function () {
- this._super.apply(this, arguments);
+ init: function (editor, image) {
+ this._super(editor);
+
+ this.element = image;
this.on('start', this, this.proxy('started'));
this.on('save', this, this.proxy('saved'));
},
started: function (holder) {
- var selection = this.editor.getSelection();
- var el = selection && selection.getSelectedElement();
- this.element = null;
-
- if (el && el.is('img')) {
- this.element = el;
- _(this.image_styles).each(function (style) {
- if (el.hasClass(style)) {
- holder.style = style;
- }
- });
- holder.url = el.getAttribute('src');
+ if (!this.element) {
+ var selection = this.editor.getSelection();
+ this.element = selection && selection.getSelectedElement();
}
+
+ var el = this.element;
+ if (!el || !el.is('img')) {
+ return;
+ }
+ _(this.image_styles).each(function (style) {
+ if (el.hasClass(style)) {
+ holder.style = style;
+ }
+ });
+ holder.url = el.getAttribute('src');
},
saved: function (data) {
var element, editor = this.editor;
diff --git a/addons/website/static/src/js/website.menu.js b/addons/website/static/src/js/website.menu.js
index 40551b2dd75..b3554b9e7c5 100644
--- a/addons/website/static/src/js/website.menu.js
+++ b/addons/website/static/src/js/website.menu.js
@@ -5,15 +5,12 @@
website.menu = {};
website.add_template_file('/website/static/src/xml/website.menu.xml');
- var globalEditor;
-
website.EditorBar.include({
events: _.extend({}, website.EditorBar.prototype.events, {
'click a[data-action="edit-structure"]': 'editStructure',
}),
editStructure: function () {
var self = this;
- globalEditor = self;
var context = website.get_context();
openerp.jsonRpc('/web/dataset/call_kw', 'call', {
model: 'website.menu',
@@ -24,7 +21,6 @@
},
}).then(function (menu) {
var result = new website.menu.EditMenuDialog(menu).appendTo(document.body);
- self.trigger('tour:menu_editor_dialog_ready');
return result;
});
},
@@ -171,7 +167,6 @@
$link_text.focus();
});
});
- globalEditor.trigger('tour:new_menu_entry_dialog_ready');
return result;
},
save: function () {
@@ -192,7 +187,6 @@
}
},
destroy: function () {
- globalEditor.trigger('tour:new_menu_entry_dialog_closed');
this._super.apply(this, arguments);
},
});
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 7277f80ba95..34edfe9d259 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -82,7 +82,7 @@
var self = this;
var speed = parseFloat(self.$target.attr("data-scroll-background-ratio") || 0);
- if (speed == 1) {
+ if (speed === 1 || this.$target.css("background-image") === "none") {
this.$target.css("background-attachment", "fixed").css("background-position", "0px 0px");
return;
} else {
@@ -101,7 +101,7 @@
} else {
offset = - self.$target.offset().top * speed;
}
- self.$target.attr("data-scroll-background-offset", offset);
+ self.$target.attr("data-scroll-background-offset", offset > 0 ? 0 : offset);
$(window).scroll();
};
img.src = this.$target.css("background-image").replace(/url\(['"]*|['"]*\)/g, "");
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 7d7aade081f..a4f51c6ab39 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -77,6 +77,7 @@
hack_to_add_snippet_id();
});
+ website.snippet.styles = {};
website.snippet.selector = [];
website.snippet.BuildingBlock = openerp.Widget.extend({
template: 'website.snippets',
@@ -138,22 +139,19 @@
},
fetch_snippet_templates: function () {
var self = this;
- this.style_templates = {};
openerp.jsonRpc("/website/snippets", 'call', {})
.then(function (html) {
var $html = $(html);
- var $styles = $html.find("#snippet_styles");
- $styles.find("> [data-snippet-id]").each(function () {
+ var $styles = $html.find("[data-snippet-style-id]");
+ $styles.each(function () {
var $style = $(this);
- var snipped_id = $style.data('snippet-id');
- self.style_templates[snipped_id] = {
- 'snipped-id' : snipped_id,
+ var style_id = $style.data('snippet-style-id');
+ website.snippet.styles[style_id] = {
+ 'snippet-style-id' : style_id,
'selector': $style.data('selector'),
- 'class': $style.data("class"),
- 'label': $style.find(".oe_snippet_label").text(),
- 'group': $style.find(".oe_snippet_group").text()
+ '$el': $style,
};
});
$styles.addClass("hidden");
@@ -529,13 +527,212 @@
});
+ website.snippet.styleRegistry = {};
+ website.snippet.StyleEditor = openerp.Class.extend({
+ // initialisation (don't overwrite)
+ init: function (parent, $target, snippet_id) {
+ this.parent = parent;
+ this.$target = $target;
+ var styles = this.$target.data("snippet-style-ids") || {};
+ styles[snippet_id] = this;
+ this.$target.data("snippet-style-ids", styles);
+ this.$overlay = this.$target.data('overlay');
+ this['snippet-style-id'] = snippet_id;
+ this.$el = website.snippet.styles[snippet_id].$el.find(">li").clone();
+
+ this.required = this.$el.data("required");
+
+ this.set_active();
+ this.$el.find('li[data-class] a').on('mouseover mouseout click', _.bind(this._mouse, this));
+ this.$target.on('snippet-style-reset', _.bind(this.set_active, this));
+
+ this.start();
+ },
+ _mouse: function (event) {
+ var self = this;
+
+ if (event.type === 'mouseout') {
+ if (!this.over) return;
+ this.over = false;
+ } else if (event.type === 'click') {
+ this.over = false;
+ }else {
+ this.over = true;
+ }
+
+ var $prev, $next;
+ if (event.type === 'mouseout') {
+ $prev = $(event.currentTarget).parent();
+ $next = this.$el.find("li[data-class].active");
+ } else {
+ $prev = this.$el.find("li[data-class].active");
+ $next = $(event.currentTarget).parent();
+ }
+ if (!$prev.length) {
+ $prev = false;
+ }
+ if ($prev && $prev[0] === $next[0]) {
+ $next = false;
+ if (this.required) {
+ return;
+ }
+ }
+
+ var np = {'$next': $next, '$prev': $prev};
+
+ if (event.type === 'click') {
+ setTimeout(function () {
+ self.set_active();
+ self.$target.trigger("snippet-style-change", [self, np]);
+ },0);
+ this.select(event, {'$next': $next, '$prev': $prev});
+ } else {
+ setTimeout(function () {
+ self.$target.trigger("snippet-style-preview", [self, np]);
+ },0);
+ this.preview(event, np);
+ }
+ },
+ // start is call just after the init
+ start: function () {
+ },
+ /* select
+ * called when a user select an item
+ * variables: np = {$next, $prev}
+ * $next is false if they are no next item selected
+ * $prev is false if they are no previous item selected
+ */
+ select: function (event, np) {
+ var self = this;
+ // add or remove html class
+ if (np.$prev) {
+ this.$target.removeClass(np.$prev.data('class' || ""));
+ }
+ if (np.$next) {
+ this.$target.addClass(np.$next.data('class') || "");
+ }
+ },
+ /* preview
+ * called when a user is on mouse over or mouse out of an item
+ * variables: np = {$next, $prev}
+ * $next is false if they are no next item selected
+ * $prev is false if they are no previous item selected
+ */
+ preview: function (event, np) {
+ var self = this;
+
+ // add or remove html class
+ if (np.$prev) {
+ this.$target.removeClass(np.$prev.data('class') || "");
+ }
+ if (np.$next) {
+ this.$target.addClass(np.$next.data('class') || "");
+ }
+ },
+ /* set_active
+ * select and set item active or not (add highlight item and his parents)
+ * called before start
+ */
+ set_active: function () {
+ var self = this;
+ this.$el.find('li').removeClass("active");
+ var $active = this.$el.find('li[data-class]')
+ .filter(function () {
+ var $li = $(this);
+ return ($li.data('class') && self.$target.hasClass($li.data('class')));
+ })
+ .first()
+ .addClass("active");
+ this.$el.find('li:has(li[data-class].active)').addClass("active");
+ }
+ });
+
+
+ website.snippet.styleRegistry['size'] = website.snippet.StyleEditor.extend({
+ select: function(event, np) {
+ this._super(event, np);
+ this.parent.parent.cover_target(this.$overlay, this.$target);
+ },
+ preview: function (event, np) {
+ this._super(event, np);
+ this.parent.parent.cover_target(this.$overlay, this.$target);
+ }
+ });
+
+ website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
+ _get_bg: function () {
+ return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
+ },
+ _set_bg: function (src) {
+ this.$target.css("background-image", src && src !== "" ? 'url(' + src + ')' : "");
+ },
+ start: function () {
+ this._super();
+ var src = this._get_bg();
+ this.$el.find("li[data-class].active.oe_custom_bg").data("src", src);
+ },
+ select: function(event, np) {
+ var self = this;
+ this._super(event, np);
+ if (np.$next) {
+ if (np.$next.hasClass("oe_custom_bg")) {
+ var editor = new website.editor.ImageDialog();
+ editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || "";});
+ editor.on('save', self, function (o) {
+ self._set_bg(o.url);
+ np.$next.data("src", o.url);
+ self.$target.trigger("snippet-style-change", [self, np]);
+ });
+ editor.on('cancel', self, function () {
+ if (!np.$prev || np.$prev.data("src") === "") {
+ np.$next.removeClass('active');
+ self.$target.removeClass(np.$next.data("class"));
+ self.$target.trigger("snippet-style-change", [self, np]);
+ }
+ });
+ editor.appendTo($('body'));
+ } else {
+ this._set_bg(np.$next.data("src"));
+ }
+ } else {
+ this._set_bg(false);
+ }
+ },
+ preview: function (event, np) {
+ this._super(event, np);
+ if (np.$next) {
+ this._set_bg(np.$next.data("src"));
+ }
+ },
+ set_active: function () {
+ var self = this;
+ var bg = self.$target.css("background-image");
+ this.$el.find('li').removeClass("active");
+ var $active = this.$el.find('li[data-class]')
+ .filter(function () {
+ var $li = $(this);
+ return ($li.data('src') && bg.indexOf($li.data('src')) >= 0) ||
+ (!$li.data('src') && self.$target.hasClass($li.data('class')));
+ })
+ .first();
+ if (!$active.length) {
+ $active = this.$target.css("background-image") !== 'none' ?
+ this.$el.find('li[data-class].oe_custom_bg') :
+ this.$el.find('li[data-class=""]');
+ }
+ $active.addClass("active");
+ this.$el.find('li:has(li[data-class].active)').addClass("active");
+ }
+ });
+
+
website.snippet.editorRegistry = {};
website.snippet.Editor = openerp.Class.extend({
- init: function (parent, dom, force_snippet_id) {
+ init: function (parent, dom) {
this.parent = parent;
this.$target = $(dom);
this.$overlay = this.$target.data('overlay');
- this.snippet_id = force_snippet_id || this.$target.data("snippet-id");
+ this.snippet_id = this.$target.data("snippet-id");
this._readXMLData();
this.load_style_options();
this.get_parent_block();
@@ -652,90 +849,21 @@
},
load_style_options: function () {
- if (this.$target.data('snippetStyles')) {
- return;
- }
-
var self = this;
var $styles = this.$overlay.find('.oe_options');
var $ul = $styles.find('ul:first');
- _.each(this.parent.style_templates, function (val) {
+ _.each(website.snippet.styles, function (val) {
if (!self.parent.dom_filter(val.selector).is(self.$target)) {
return;
}
- var $li = $("").data(val);
- $li.append($('').text(val.label));
- if (self.$target.hasClass( val.class )) {
- $li.addClass("active");
- }
-
- if (val.group.length) {
- var $group = $ul.find("li.dropdown-submenu").filter(function () {
- return $("a:first", this).text() === val.group;
- });
- if (!$group.length) {
- $group = $('');
+ _(this.types).each(function (label, key) {
+ html.push(_.str.sprintf(
+ '',
+ key, key, label));
+ });
+ html.push('
');
+ html.push('');
+ _(this.sizes).each(function (label, key) {
+ html.push(_.str.sprintf(
+ '',
+ key, key, label));
+ });
+ html.push('
');
+ html.push('');
+ html.push('
-
- /'], type='http', auth="public", multilang=True)
+ @website.route(['/event/', '/event/page/'], type='http', auth="public", multilang=True)
def events(self, page=1, **searches):
cr, uid, context = request.cr, request.uid, request.context
event_obj = request.registry['event.event']
@@ -163,20 +163,30 @@ class website_event(http.Controller):
return request.website.render("website_event.index", values)
- @website.route(['/event/'], type='http', auth="public", multilang=True)
- def event(self, event_id=None, **post):
- event_obj = request.registry['event.event']
- event = event_obj.browse(request.cr, request.uid, event_id, dict(request.context, show_address_only=1))
+ @website.route(['/event//page/'], type='http', auth="public", multilang=True)
+ def event_page(self, event, page, **post):
values = {
- 'event_id': event,
- 'main_object': event,
+ 'event': event,
+ }
+ return request.website.render(page, values)
+
+ @website.route(['/event/'], type='http', auth="public", multilang=True)
+ def event(self, event=None, **post):
+ if event.menu_id and event.menu_id.child_id:
+ return request.redirect(event.menu_id.child_id[0].url)
+ return request.redirect('/event/register/'+str(event.id))
+
+ @website.route(['/event/register/'], type='http', auth="public", multilang=True)
+ def event_register(self, event=None, **post):
+ values = {
+ 'event': event,
'range': range,
- 'float': float,
}
return request.website.render("website_event.event_description_full", values)
- @website.route(['/event//add_cart'], type='http', auth="public", multilang=True)
+ @website.route(['/event/add_cart'], type='http', auth="public", multilang=True)
def add_cart(self, event_id=None, **post):
+ assert event_id, 'An event is required'
user_obj = request.registry['res.users']
order_line_obj = request.registry.get('sale.order.line')
ticket_obj = request.registry.get('event.event.ticket')
diff --git a/addons/website_event/data/event_data.xml b/addons/website_event/data/event_data.xml
index d2e717ebb3e..92bed149032 100644
--- a/addons/website_event/data/event_data.xml
+++ b/addons/website_event/data/event_data.xml
@@ -18,20 +18,5 @@
open
-
-
- view_event_twitter_form
- event.event
-
-
-
-
-
-
-
-
-
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 4da5b931d32..a08ca75e952 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -5,6 +5,7 @@
True
+
True
openerp
diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py
index b405c73b291..7220f416d80 100644
--- a/addons/website_event/models/event.py
+++ b/addons/website_event/models/event.py
@@ -22,6 +22,8 @@
from openerp.osv import osv, fields
from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
+
# defined for access rules
class product(osv.osv):
@@ -35,6 +37,51 @@ class event(osv.osv):
_name = 'event.event'
_inherit = ['event.event','website.seo.metadata']
+ def _get_new_menu_pages(self, cr, uid, event, context=None):
+ context = context or {}
+ todo = [
+ (_('Introduction'), 'website_event.template_intro'),
+ (_('Location'), 'website_event.template_location')
+ ]
+ web = self.pool.get('website')
+ result = []
+ for name,path in todo:
+ name2 = name+' '+event.name
+ newpath = web.new_page(cr, uid, name2, path, ispage=False, context=context)
+ url = "/event/"+str(event.id)+"/page/" + newpath
+ result.append((name, url))
+ return result
+
+ def _set_show_menu(self, cr, uid, ids, name, value, arg, context=None):
+ menuobj = self.pool.get('website.menu')
+ eventobj = self.pool.get('event.event')
+ for event in self.browse(cr, uid, [ids], context=context):
+ if event.menu_id and not value:
+ menuobj.unlink(cr, uid, [event.menu_id.id], context=context)
+ elif value and not event.menu_id:
+ root = menuobj.create(cr, uid, {
+ 'name': event.name
+ }, context=context)
+ tocreate = self._get_new_menu_pages(cr, uid, event, context)
+ tocreate.append((_('Register'), '/event/register/'+str(event.id)))
+ sequence = 0
+ for name,url in tocreate:
+ menuobj.create(cr, uid, {
+ 'name': name,
+ 'url': url,
+ 'parent_id': root,
+ 'sequence': sequence
+ }, context=context)
+ sequence += 1
+ eventobj.write(cr, uid, [event.id], {'menu_id': root}, context=context)
+ return True
+
+ def _get_show_menu(self, cr, uid, ids, field_name, arg, context=None):
+ res = dict.fromkeys(ids, '')
+ for event in self.browse(cr, uid, ids, context=context):
+ res[event.id] = bool(event.menu_id)
+ return res
+
def _website_url(self, cr, uid, ids, field_name, arg, context=None):
res = dict.fromkeys(ids, '')
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
@@ -44,7 +91,7 @@ class event(osv.osv):
_columns = {
'twitter_hashtag': fields.char('Twitter Hashtag'),
- 'website_published': fields.boolean('Available in the website'),
+ 'website_published': fields.boolean('Visible in Website'),
# TDE TODO FIXME: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
'website_message_ids': fields.one2many(
'mail.message', 'res_id',
@@ -55,9 +102,11 @@ class event(osv.osv):
help="Website communication history",
),
'website_url': fields.function(_website_url, string="Website url"),
+ 'show_menu': fields.function(_get_show_menu, fnct_inv=_set_show_menu, type='boolean', string='Dedicated Menu'),
+ 'menu_id': fields.many2one('website.menu', 'Event Menu'),
}
_defaults = {
- 'website_published': False,
+ 'show_menu': False,
}
def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 8bbd470d1e6..a724b024813 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -3,8 +3,6 @@
var website = openerp.website;
- var render = website.tour.render;
-
website.EditorBar.include({
start: function () {
this.registerTour(new website.EventTour(this));
@@ -15,7 +13,6 @@
website.EventTour = website.Tour.extend({
id: 'event-tutorial',
name: "Create an event",
- startPath: '/event',
init: function (editor) {
var self = this;
self.steps = [
@@ -25,7 +22,7 @@
backdrop: true,
title: "Event",
content: "We will show how to create a new event.",
- template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
+ template: self.popover({ next: "Start Tutorial", end: "Skip It" }),
},
{
stepId: 'content-menu',
@@ -34,7 +31,6 @@
reflex: true,
title: "Edit the content",
content: "Click here to add content to your site.",
- template: render('website.tour_popover'),
},
{
stepId: 'new-post-entry',
@@ -42,8 +38,7 @@
placement: 'left',
title: "New event",
content: "Click here to create an event.",
- template: render('website.tour_popover'),
- onShow: function () {
+ triggers: function () {
$(document).one('shown.bs.modal', function () {
$('.modal button.btn-primary').click(function () {
self.movetoStep('event-page');
@@ -58,7 +53,6 @@
placement: 'right',
title: "Choose the event name",
content: "Choose a name for the new event and click 'Continue'.",
- template: render('website.tour_popover'),
},
{
stepId: 'event-page',
@@ -66,7 +60,7 @@
backdrop: true,
title: "New event created",
content: "You just created a new event. We are now going to edit it.",
- template: render('website.tour_popover', { next: "OK" }),
+ template: self.popover({ next: "OK" }),
},
{
stepId: 'add-block',
@@ -75,16 +69,15 @@
reflex: true,
title: "Layout your event",
content: "Insert blocks like text-image to layout the body of your event.",
- template: render('website.tour_popover'),
},
];
return this._super();
},
- continueTour: function () {
+ resume: function () {
return this.isCurrentStep('event-page') && !this.tour.ended();
},
- isTriggerUrl: function () {
- return (this.continueTour() && this.testUrl(/^\/event\/[0-9]+\/\?enable_editor=1/)) || this._super();
+ trigger: function () {
+ return (this.resume() && this.testUrl(/^\/event\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index fbb75e49736..4f13491f59a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -72,7 +72,7 @@
Darken
- Background
+
+
+
+ Layout
+
+
-
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 89e1eabc568..d43ac9dfd0c 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -3,8 +3,6 @@
var website = openerp.website;
- var render = website.tour.render;
-
website.EditorBar.include({
start: function () {
this.registerTour(new website.BlogTour(this));
@@ -15,7 +13,6 @@
website.BlogTour = website.Tour.extend({
id: 'blog-tutorial',
name: "Create a blog post",
- startPath: '/blog/cat/1/',
init: function (editor) {
var self = this;
self.steps = [
@@ -25,7 +22,7 @@
backdrop: true,
title: "Blog",
content: "We will show how to create a new blog post.",
- template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
+ template: self.popover({ next: "Start Tutorial", end: "Skip It" }),
},
{
stepId: 'content-menu',
@@ -34,7 +31,6 @@
reflex: true,
title: "Edit the content",
content: "Click here to add content to your site.",
- template: render('website.tour_popover'),
},
{
stepId: 'new-post-entry',
@@ -42,8 +38,7 @@
placement: 'left',
title: "New blog post",
content: "Click here to create a blog post.",
- template: render('website.tour_popover'),
- onShow: function () {
+ triggers: function () {
$(document).one('shown.bs.modal', function () {
$('.modal button.btn-primary').click(function () {
self.movetoStep('post-page');
@@ -58,7 +53,22 @@
placement: 'right',
title: "Choose the post category",
content: "Select the 'News' category and click 'Continue'.",
- template: render('website.tour_popover'),
+ triggers: function () {
+ $('.modal select').change(function () {
+ var $this = $(this);
+ var selected = $this.find("[value="+$this.val()+"]").text();
+ if (selected.toLowerCase() === 'news') {
+ self.movetoStep('continue-category');
+ }
+ });
+ },
+ },
+ {
+ stepId: 'continue-category',
+ element: '.modal button.btn-primary',
+ placement: 'right',
+ title: "Choose the post category",
+ content: "Click 'Continue' to create the post.",
},
{
stepId: 'post-page',
@@ -66,7 +76,7 @@
backdrop: true,
title: "New blog post created",
content: "You just created a new blog post. We are now going to edit it.",
- template: render('website.tour_popover', { next: "OK" }),
+ template: self.popover({ next: "OK" }),
},
{
stepId: 'post-title',
@@ -74,16 +84,15 @@
placement: 'top',
title: "Pick a title",
content: "Choose a catchy title for your blog post.",
- template: render('website.tour_popover', { next: "OK" }),
+ template: self.popover({ next: "OK" }),
},
{
- stepId: 'add-block',
+ stepId: 'add-image-block',
element: 'button[data-action=snippet]',
placement: 'bottom',
title: "Layout your blog post",
content: "Insert blocks like text-image to layout the body of your blog post.",
- template: render('website.tour_popover'),
- onShow: function () {
+ triggers: function () {
$('button[data-action=snippet]').click(function () {
self.movetoStep('drag-image-text');
});
@@ -95,30 +104,76 @@
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the 'Image Text' block and drop it in your page.",
- template: render('website.tour_popover'),
- onShow: function () {
- var $body = $(document.body);
- function beginDrag () {
- $('.popover.tour').remove();
- function goToNextStep () {
- $('#snippets').toggle();
- self.stop();
- $body.off('mouseup', goToNextStep);
- }
- $body.off('mousedown', beginDrag);
- $body.on('mouseup', goToNextStep);
- }
- $body.on('mousedown', beginDrag);
+ triggers: function () {
+ self.onSnippetDraggedMoveTo('add-text-block');
},
},
+ {
+ stepId: 'add-text-block',
+ element: 'button[data-action=snippet]',
+ placement: 'bottom',
+ title: "Add another block",
+ content: "Let's add another blog to your post.",
+ triggers: function () {
+ $('button[data-action=snippet]').click(function () {
+ self.movetoStep('drag-text-block');
+ });
+ }
+ },
+ {
+ stepId: 'drag-text-block',
+ element: '#website-top-navbar [data-snippet-id=text-block].ui-draggable',
+ placement: 'bottom',
+ title: "Drag & Drop a block",
+ content: "Drag the 'Text Block' block and drop it below the image block.",
+ triggers: function () {
+ self.onSnippetDraggedMoveTo('activate-text-block-title');
+ },
+ },
+ {
+ stepId: 'activate-text-block-title',
+ element: '#wrap [data-snippet-id=text-block] .text-center[data-snippet-id=colmd]',
+ placement: 'top',
+ title: "Activate on the title",
+ content: "Click on the title to activate it.",
+ triggers: function () {
+ $('#wrap [data-snippet-id=text-block] .text-center[data-snippet-id=colmd]').click(function () {
+ self.movetoStep('remove-text-block-title');
+ });
+ },
+ },
+ {
+ stepId: 'remove-text-block-title',
+ element: '.oe_snippet_remove:last',
+ placement: 'top',
+ reflex: true,
+ title: "Delete the title",
+ content: "Click on the cross to delete the title.",
+ },
+ {
+ stepId: 'publish-post',
+ element: 'button.js_publish_btn',
+ placement: 'right',
+ reflex: true,
+ title: "Publish your blog post",
+ content: "Click to publish your blog post.",
+ },
+ {
+ stepId: 'save-changes',
+ element: 'button[data-action=save]',
+ placement: 'right',
+ reflex: true,
+ title: "Save your modifications",
+ content: "Once you click on save, your post is updated.",
+ },
];
return this._super();
},
- continueTour: function () {
+ resume: function () {
return this.isCurrentStep('post-page') && !this.tour.ended();
},
- isTriggerUrl: function () {
- return (this.continueTour() && this.testUrl(/^\/blog\/[0-9]+\/\?enable_editor=1/)) || this._super();
+ trigger: function () {
+ return (this.resume() && this.testUrl(/^\/blog\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 24ef7f3cea9..a2ac7314c9d 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -36,7 +36,7 @@ from openerp import tools
import urllib
class website_event(http.Controller):
- @website.route(['/event/', '/event/page/- + not published
@@ -165,48 +165,78 @@
-
+
- Events
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+ Event Location
+Event Introduction
+
+
+
- to - + to +
-
+
- ,
-
+ ,
+
-
-
-
+
- -
+
-
-
+
diff --git a/addons/website_event/views/website_event_sale_backend.xml b/addons/website_event/views/website_event_sale_backend.xml
index 5c247c98c0c..b0df167c58b 100644
--- a/addons/website_event/views/website_event_sale_backend.xml
+++ b/addons/website_event/views/website_event_sale_backend.xml
@@ -2,10 +2,10 @@
-
+
event.event.website.form
event.event
-
@@ -19,10 +19,10 @@
Website view:
-
-
+
+ ).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see ).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see '], type='http', auth="public", multilang=True)
+ def event_track_view(self, track, **post):
+ # TODO: not implemented
+ values = { 'track': track, 'event': track.event_id}
+ return request.website.render("website_event_track.track_view", values)
+
+ @website.route(['/event/tracks/'], type='http', auth="public", multilang=True)
+ def event_tracks(self, event, tag=None, **post):
+ # TODO: filter on tracks: tags, search keywords
+ values = {
+ 'event': event,
+ 'tracks': event.track_ids,
+ 'tags': event.track_tag_ids,
+ 'searches': {}
+ }
+ print 'ICI'
+ return request.website.render("website_event_track.tracks", values)
+
+ @website.route(['/event/detail/'], type='http', auth="public", multilang=True)
+ def event_detail(self, event, **post):
+ values = { 'event': event }
+ return request.website.render("website_event_track.event_home", values)
+
+ @website.route(['/event/track_proposal/'], type='http', auth="public", multilang=True)
+ def event_detail(self, event=None, **post):
+ values = { 'event': event }
+ return request.website.render("website_event_track.event_track_proposal", values)
+
diff --git a/addons/website_event_track/data/event_data.xml b/addons/website_event_track/data/event_data.xml
new file mode 100644
index 00000000000..fe681518b55
--- /dev/null
+++ b/addons/website_event_track/data/event_data.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Proposals
+
+
+ Confirmed
+
+
+ Published
+
+
+ Announced
+
+
+ Completed
+
+
+
+
diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml
new file mode 100644
index 00000000000..34b2da55e29
--- /dev/null
+++ b/addons/website_event_track/data/event_demo.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+ Webinar
+
+
+ Exhibition
+
+
+ Conference
+
+
+
+ Technical
+
+
+ Business
+
+
+ Lightning Talks
+
+
+ Round Table
+
+
+
+ Room 1
+
+
+ Room 2
+
+
+ Room 3
+
+
+ Room 4
+
+
+
+
+ True
+ True
+ True
+
+
+ True
+
+
+
+
diff --git a/addons/website_event_track/data/event_view.xml b/addons/website_event_track/data/event_view.xml
new file mode 100644
index 00000000000..a2b930e4a8d
--- /dev/null
+++ b/addons/website_event_track/data/event_view.xml
@@ -0,0 +1,290 @@
+
+
+
+
+
+ event.track
+ Event Tracks
+ form
+ kanban,tree,form,calendar,graph
+ {'search_default_event_id': active_id, 'default_event_id': active_id, 'group_by': 'stage_id'}
+
+
+ Click to add a track.
+
+ Tracks define the agenda of your event. These can be
+ a talk, a round table, a meeting, etc.
+
+
+
+
+
+
+
+ Event Locations
+ event.track.location
+
+
+
+
+
+ Event Location
+ event.track.location
+
+
+
+
+
+
+ Event Locations
+ event.track.location
+
+
+
+
+
+ Event Stages
+ event.track.stage
+
+
+
+
+
+ Event Stage
+ event.track.stage
+
+
+
+
+
+
+ Event Stages
+ event.track.stage
+
+
+
+
+
+ Track Tags
+ event.track.tag
+
+
+
+
+
+ Tracks Tag
+ event.track.tag
+
+
+
+
+
+
+ Track Tags
+ event.track.tag
+
+
+
+
+
+
+ Event Tags
+ event.tag
+
+
+
+
+
+ Event Tag
+ event.tag
+
+
+
+
+
+
+ Event Tags
+ event.tag
+
+
+
+
+
+
+ Event Tracks
+ event.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ event.track.kanban
+ event.track
+
+
+
+
+
+
+
+
+
+
+
+ event.track.calendar
+ event.track
+
+
+
+
+
+
+ Event Tracks
+ event.track
+
+
+
+
+
+
+
+
+
+ event.track.form
+ event.track
+
+
+
+
+
+
+ Tracks Graph
+ event.track
+
+
+
+
+
+
+
+
diff --git a/addons/website_event_track/models/__init__.py b/addons/website_event_track/models/__init__.py
new file mode 100644
index 00000000000..e7c003730cf
--- /dev/null
+++ b/addons/website_event_track/models/__init__.py
@@ -0,0 +1 @@
+import event
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
new file mode 100644
index 00000000000..bd071d63e61
--- /dev/null
+++ b/addons/website_event_track/models/event.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ event tracks: Public
+ [('website_published', '=', True)]
+
+
+
+
diff --git a/addons/website_event_track/security/ir.model.access.csv b/addons/website_event_track/security/ir.model.access.csv
new file mode 100644
index 00000000000..11e63faffb3
--- /dev/null
+++ b/addons/website_event_track/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_tag_manager,event.tag manager,model_event_tag,event.group_event_user,1,1,1,1
+access_event_location_manager,event.track.location manager,model_event_track_location,event.group_event_user,1,1,1,1
+access_event_track_manager,event.track manager,model_event_track,event.group_event_user,1,1,1,1
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
new file mode 100644
index 00000000000..82e8c4538eb
--- /dev/null
+++ b/addons/website_event_track/views/website_event.xml
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /event/publish
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Not Implmented
+
+
+
+
+
+
+
+
+
+
+
+ Call for Proposals
+
+
+
+ Proposals are closed!
+
+ This event does not accept proposals.
+
+
+
+
+
+
+
+ Introduction
+
+
+ We will accept a broad range of
+ presentations, from reports on academic and
+ commercial projects to tutorials and case
+ studies. As long as the presentation is
+ interesting and potentially useful to the
+ audience, it will be considered for
+ inclusion in the programme.
+
+
+
+ Application
+
+ Fill this form to propose your talk.
+
+
+
+
+
+
+
+
+
+
+
+ Talks Types
+
+
+
+ -
+ Regular Talks. These are standard talks with slides,
+ alocated in slots of 30 minutes.
+
-
+ Lightning Talks. These are 10 minutes talks on many
+ different topics. Most topics are accepted in lightning talks.
+
+
+
+
+
+
+
+
+ Submission Agreement
+
+
+
+ We require speakers to accept an agreement in which they commit to:
+
+
+ -
+ Timely release of presentation material (slides),
+ for publishing on our website.
+
-
+ Allow video and audio recording of their
+ presentation, for publishing on our website.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 74b719c9e57..e2b201bb855 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -27,9 +27,9 @@ class WebsiteMembership(http.Controller):
post_country_id = int(post.get('country_id', '0'))
# base domain for groupby / searches
- base_line_domain = [(1, '=', 1)]
+ base_line_domain = []
if membership_id:
- base_line_domain += [('membership_id', '=', membership_id)]
+ base_line_domain.append(('membership_id', '=', membership_id))
membership = product_obj.browse(cr, uid, membership_id, context=context)
else:
membership = None
@@ -41,7 +41,7 @@ class WebsiteMembership(http.Controller):
countries = partner_obj.read_group(
cr, uid, [('member_lines', 'in', membership_line_ids)], ["id", "country_id"],
groupby="country_id", orderby="country_id", context=request.context)
- countries_total = sum([country_dict['country_id_count'] for country_dict in countries])
+ countries_total = sum(country_dict['country_id_count'] for country_dict in countries)
countries.insert(0, {
'country_id_count': countries_total,
'country_id': (0, _("All Countries"))
@@ -50,16 +50,15 @@ class WebsiteMembership(http.Controller):
# displayed membership lines
line_domain = list(base_line_domain)
if post_country_id:
- line_domain += [('partner.country_id', '=', post_country_id)]
+ line_domain.append(('partner.country_id', '=', post_country_id))
membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context)
membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context)
partner_ids = [m.partner and m.partner.id for m in membership_lines]
- google_map_partner_ids = ",".join([str(pid) for pid in partner_ids])
+ google_map_partner_ids = ",".join(map(str, partner_ids))
# format domain for group_by and memberships
- membership_domain = [('membership', '=', True)]
- membership_ids = product_obj.search(cr, uid, membership_domain, context=context)
+ membership_ids = product_obj.search(cr, uid, [('membership', '=', True)], context=context)
memberships = product_obj.browse(cr, uid, membership_ids, context=context)
# request pager for lines
@@ -77,16 +76,14 @@ class WebsiteMembership(http.Controller):
}
return request.website.render("website_membership.index", values)
- @website.route(['/members//'], type='http', auth="public", multilang=True)
- def partners_ref(self, partner_id=0, **post):
- partner_obj = request.registry['res.partner']
- partner_ids = partner_obj.search(request.cr, request.uid, [('id', '=', partner_id)], context=request.context)
- if not partner_ids:
- return self.members(post)
+ @website.route(['/members//'], type='http', auth="public", multilang=True)
+ def partners_ref(self, partner, **post):
+ if not partner.exists():
+ return self.members(**post)
values = {
- 'partner_id': partner_obj.browse(
- request.cr, request.uid, partner_ids[0],
+ 'partner_id': request.registry['res.partner'].browse(
+ request.cr, request.uid, partner.id,
context=dict(request.context, show_address=True)),
}
return request.website.render("website_membership.partner", values)
diff --git a/addons/website_payment/__init__.py b/addons/website_payment/__init__.py
new file mode 100644
index 00000000000..edccdf73182
--- /dev/null
+++ b/addons/website_payment/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2013-Today OpenERP SA ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see ).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see ).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+
+ Paypal (Test)
+ /payment/paypal/test
+ 90
+
+
+
+ Ogone (Test)
+ /payment/ogone/test
+ 91
+
+
+
+ Transfer (Test)
+ /payment/transfer/test
+ 92
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Paypal payment: form based
+
+
+
+
+
+
+
+
+ Ogone payment
+
+
+
+
+
+
+
+
+ Transfer payment
+
+
+
+
+
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 634078fe149..f3e370d989d 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP E-Commerce
""",
'author': 'OpenERP SA',
- 'depends': ['website', 'sale', 'product'],
+ 'depends': ['website', 'sale', 'product', 'payment_acquirer'],
'data': [
'website_sale_data.xml',
'views/website_sale.xml',
diff --git a/addons/website_sale/controllers/__init__.py b/addons/website_sale/controllers/__init__.py
index e11f9ba81bb..ef613dca3d5 100644
--- a/addons/website_sale/controllers/__init__.py
+++ b/addons/website_sale/controllers/__init__.py
@@ -1,3 +1,2 @@
+import website
import main
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 2159304157c..e4190389b98 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -1,63 +1,13 @@
# -*- coding: utf-8 -*-
import random
-import uuid
import simplejson
-
-import werkzeug.exceptions
+import urllib
from openerp import SUPERUSER_ID
-from openerp.osv import osv
from openerp.addons.web import http
from openerp.addons.web.http import request
from openerp.addons.website.models import website
-def get_order(order_id=None):
- order_obj = request.registry.get('sale.order')
- # check if order allready exists and have access
- if order_id:
- try:
- order = order_obj.browse(request.cr, request.uid, order_id, context=request.context)
- order.pricelist_id
- if order:
- return order
- except:
- return False
-
- fields = [k for k, v in order_obj._columns.items()]
- order_value = order_obj.default_get(request.cr, SUPERUSER_ID, fields, context=request.context)
- if request.httprequest.session.get('ecommerce_pricelist'):
- order_value['pricelist_id'] = request.httprequest.session['ecommerce_pricelist']
- order_value['partner_id'] = request.registry.get('res.users').browse(request.cr, SUPERUSER_ID, request.uid, context=request.context).partner_id.id
- order_value.update(order_obj.onchange_partner_id(request.cr, SUPERUSER_ID, [], order_value['partner_id'], context=request.context)['value'])
-
- # add website_session_id key for access rules
- if not request.httprequest.session.get('website_session_id'):
- request.httprequest.session['website_session_id'] = str(uuid.uuid4())
-
- order_value["website_session_id"] = request.httprequest.session['website_session_id']
- order_id = order_obj.create(request.cr, SUPERUSER_ID, order_value, context=request.context)
- order = order_obj.browse(request.cr, SUPERUSER_ID, order_id, context=request.context)
- request.httprequest.session['ecommerce_order_id'] = order.id
-
- return order_obj.browse(request.cr, request.uid, order_id,
- context=dict(request.context, pricelist=order.pricelist_id.id))
-
-def get_current_order():
- if request.httprequest.session.get('ecommerce_order_id'):
- order = get_order(request.httprequest.session.get('ecommerce_order_id'))
- if not order:
- request.httprequest.session['ecommerce_order_id'] = False
- return order
- else:
- return False
-
-class Website(osv.osv):
- _inherit = "website"
- def preprocess_request(self, cr, uid, ids, request, context=None):
- request.context.update({
- 'website_sale_order': get_current_order(),
- })
- return super(Website, self).preprocess_request(cr, uid, ids, request, context=None)
class CheckoutInfo:
mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
@@ -89,6 +39,7 @@ class CheckoutInfo:
def from_post(self, post):
return dict((field_name, post[field_name]) for field_name in self.all_fields() if post[field_name])
+
class Ecommerce(http.Controller):
_order = 'website_sequence desc, website_published desc'
@@ -96,7 +47,7 @@ class Ecommerce(http.Controller):
def get_attribute_ids(self):
attributes_obj = request.registry.get('product.attribute')
- attributes_ids = attributes_obj.search(request.cr, request.uid, [(1, "=", 1)], context=request.context)
+ attributes_ids = attributes_obj.search(request.cr, request.uid, [], context=request.context)
return attributes_obj.browse(request.cr, request.uid, attributes_ids, context=request.context)
def get_categories(self):
@@ -289,27 +240,33 @@ class Ecommerce(http.Controller):
filter[index.index(cat_id)].append( cat[2] )
post.pop(key)
- return request.redirect("/shop/?filter=%s%s%s%s" % (
+ return request.redirect("/shop/?filter=%s%s%s" % (
simplejson.dumps(filter),
- post.get("search") and "&search=%s" % post.get("search") or "",
- post.get("category") and "&category=%s" % post.get("category") or ""
+ post.get("search") and ("&search=%s" % post.get("search")) or "",
+ post.get("category") and ("&category=%s" % post.get("category")) or ""
))
def attributes_to_ids(self, attributes):
obj = request.registry.get('product.attribute.product')
- domain = [(1, '=', 1)]
+ domain = []
for key_val in attributes:
- domain += [("attribute_id", "=", key_val[0])]
+ domain.append(("attribute_id", "=", key_val[0]))
if isinstance(key_val[1], list):
- domain += [("value", ">=", key_val[1][0]), ("value", "<=", key_val[1][1])]
+ domain.append(("value", ">=", key_val[1][0]))
+ domain.append(("value", "<=", key_val[1][1]))
else:
- domain += [("value_id", "in", key_val[1:])]
+ domain.append(("value_id", "in", key_val[1:]))
att_ids = obj.search(request.cr, request.uid, domain, context=request.context)
att = obj.read(request.cr, request.uid, att_ids, ["product_id"], context=request.context)
return [r["product_id"][0] for r in att]
- @website.route(['/shop/', '/shop/page//'], type='http', auth="public", multilang=True)
- def category(self, category=0, filter="", page=0, **post):
+ @website.route([
+ '/shop/',
+ '/shop/page//',
+ '/shop/category//',
+ '/shop/category//page//'
+ ], type='http', auth="public", multilang=True)
+ def category(self, category=0, page=0, filter='', search='', **post):
# TDE-NOTE: shouldn't we do somethign about product_template without variants ???
# TDE-NOTE: is there a reason to call a method category when the route is
# basically a shop without category_id speceified ?
@@ -322,27 +279,26 @@ class Ecommerce(http.Controller):
# remove product_product_consultant from ecommerce editable mode, this product never be publish
ref = request.registry.get('ir.model.data').get_object_reference(request.cr, SUPERUSER_ID, 'product', 'product_product_consultant')
- domain += [("id", "!=", ref[1])]
+ domain.append(("id", "!=", ref[1]))
- if post.get("search"):
+ if search:
domain += ['|', '|', '|',
- ('name', 'ilike', "%%%s%%" % post.get("search")),
- ('description', 'ilike', "%%%s%%" % post.get("search")),
- ('website_description', 'ilike', "%%%s%%" % post.get("search")),
- ('product_variant_ids.public_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
+ ('name', 'ilike', "%%%s%%" % search),
+ ('description', 'ilike', "%%%s%%" % search),
+ ('website_description', 'ilike', "%%%s%%" % search),
+ ('product_variant_ids.public_categ_id.name', 'ilike', "%%%s%%" % search)]
if category:
- cat_id = int(category)
- domain = [('product_variant_ids.public_categ_id.id', 'child_of', cat_id)] + domain
+ domain.append(('product_variant_ids.public_categ_id.id', 'child_of', category))
if filter:
filter = simplejson.loads(filter)
if filter:
ids = self.attributes_to_ids(filter)
- domain = [('id', 'in', ids or [0] )] + domain
+ domain.append(('id', 'in', ids or [0]))
step = 20
- product_count = len(product_obj.search(request.cr, request.uid, domain, context=request.context))
+ product_count = product_obj.search_count(request.cr, request.uid, domain, context=request.context)
pager = request.website.pager(url="/shop/", total=product_count, page=page, step=step, scope=7, url_args=post)
request.context['pricelist'] = self.get_pricelist()
@@ -353,7 +309,7 @@ class Ecommerce(http.Controller):
styles = []
if not request.context['is_public_user']:
style_obj = request.registry.get('website.product.style')
- style_ids = style_obj.search(request.cr, request.uid, [(1, '=', 1)], context=request.context)
+ style_ids = style_obj.search(request.cr, request.uid, [], context=request.context)
styles = style_obj.browse(request.cr, request.uid, style_ids, context=request.context)
values = {
@@ -361,9 +317,9 @@ class Ecommerce(http.Controller):
'product_ids': product_ids,
'product_ids_for_holes': fill_hole,
'search': {
- 'search': post.get('search') or '',
+ 'search': search,
'category': category,
- 'filter': filter or '',
+ 'filter': filter,
},
'pager': pager,
'styles': styles,
@@ -433,7 +389,7 @@ class Ecommerce(http.Controller):
request.httprequest.session['ecommerce_pricelist'] = pricelist_id
- order = get_current_order()
+ order = request.registry['website'].get_current_order(request.cr, request.uid, context=request.context)
if order:
values = {'pricelist_id': pricelist_id}
values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
@@ -445,9 +401,9 @@ class Ecommerce(http.Controller):
order_line_obj = request.registry.get('sale.order.line')
order_obj = request.registry.get('sale.order')
- order = get_current_order()
+ order = request.registry.get('website').get_current_order(request.cr, request.uid, context=request.context)
if not order:
- order = get_order()
+ order = request.registry.get('website')._get_order(request.cr, request.uid, context=request.context)
request.context = dict(request.context, pricelist=self.get_pricelist())
@@ -497,9 +453,15 @@ class Ecommerce(http.Controller):
@website.route(['/shop/mycart/'], type='http', auth="public", multilang=True)
def mycart(self, **post):
- order = get_current_order()
+ cr, uid, context = request.cr, request.uid, request.context
prod_obj = request.registry.get('product.product')
+ # must have a draft sale order with lines at this point, otherwise reset
+ order = context.get('website_sale_order')
+ if order and order.state != 'draft':
+ request.registry['website'].sale_reset_order(cr, uid, context=context)
+ return request.redirect('/shop/')
+
if 'promo' in post:
self.change_pricelist(post.get('promo'))
@@ -511,7 +473,7 @@ class Ecommerce(http.Controller):
product_ids.append(line.product_id.id)
suggested_ids = list(set(suggested_ids) - set(product_ids))
if suggested_ids:
- suggested_ids = prod_obj.search(request.cr, request.uid, [('id', 'in', suggested_ids)], context=request.context)
+ suggested_ids = prod_obj.search(cr, uid, [('id', 'in', suggested_ids)], context=context)
# select 3 random products
suggested_products = []
@@ -522,7 +484,7 @@ class Ecommerce(http.Controller):
values = {
'int': int,
'get_categories': self.get_categories,
- 'suggested_products': prod_obj.browse(request.cr, request.uid, suggested_products, request.context),
+ 'suggested_products': prod_obj.browse(cr, uid, suggested_products, context),
}
return request.website.render("website_sale.mycart", values)
@@ -534,7 +496,7 @@ class Ecommerce(http.Controller):
@website.route(['/shop/add_cart_json/'], type='json', auth="public")
def add_cart_json(self, product_id=None, order_line_id=None, remove=None):
quantity = self.add_product_to_cart(product_id=product_id, order_line_id=order_line_id, number=(remove and -1 or 1))
- order = get_current_order()
+ order = self.registry['website'].get_current_order(request.cr, request.uid, context=request.context)
return [quantity, order.get_total_quantity(), order.amount_total, request.website.render("website_sale.total", {
'website_sale_order': order
}).strip()]
@@ -547,18 +509,23 @@ class Ecommerce(http.Controller):
def checkout(self, **post):
cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
- order = get_current_order()
-
+ # must have a draft sale order with lines at this point, otherwise reset
+ order = context.get('website_sale_order')
if not order or order.state != 'draft' or not order.order_line:
- return self.mycart(**post)
+ request.registry['website'].sale_reset_order(cr, uid, context=context)
+ return request.redirect('/shop/')
+ # if transaction pending / done: redirect to confirmation
+ tx = context.get('website_sale_transaction')
+ if tx and tx.state != 'draft':
+ return request.redirect('/shop/payment/confirmation/%s' % order.id)
orm_partner = registry.get('res.partner')
orm_user = registry.get('res.users')
orm_country = registry.get('res.country')
- country_ids = orm_country.search(cr, SUPERUSER_ID, [(1, "=", 1)], context=context)
+ country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
state_orm = registry.get('res.country.state')
- states_ids = state_orm.search(cr, SUPERUSER_ID, [(1, "=", 1)], context=context)
+ states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
info = CheckoutInfo()
@@ -598,18 +565,23 @@ class Ecommerce(http.Controller):
def confirm_order(self, **post):
cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
- order = get_current_order()
-
+ # must have a draft sale order with lines at this point, otherwise redirect to shop
+ order = request.registry['website'].get_current_order(request.cr, request.uid, context=request.context)
if not order or order.state != 'draft' or not order.order_line:
- return self.mycart(**post)
+ request.registry['website'].sale_reset_order(cr, uid, context=context)
+ return request.redirect('/shop/')
+ # if transaction pending / done: redirect to confirmation
+ tx = context.get('website_sale_transaction')
+ if tx and tx.state != 'draft':
+ return request.redirect('/shop/payment/confirmation/%s' % order.id)
orm_parter = registry.get('res.partner')
orm_user = registry.get('res.users')
orm_country = registry.get('res.country')
- country_ids = orm_country.search(cr, SUPERUSER_ID, [(1, "=", 1)], context=context)
+ country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
orm_state = registry.get('res.country.state')
- states_ids = orm_state.search(cr, SUPERUSER_ID, [(1, "=", 1)], context=context)
+ states_ids = orm_state.search(cr, SUPERUSER_ID, [], context=context)
states = orm_state.browse(cr, SUPERUSER_ID, states_ids, context)
info = CheckoutInfo()
@@ -641,7 +613,7 @@ class Ecommerce(http.Controller):
company_id = (company_ids and company_ids[0]) or orm_parter.create(cr, SUPERUSER_ID, {'name': company_name, 'is_company': True}, context)
billing_info = dict(checkout)
- billing_info['parent_id'] = company_id;
+ billing_info['parent_id'] = company_id
if not context['is_public_user']:
partner_id = orm_user.browse(cr, uid, uid, context=context).partner_id.id
@@ -657,6 +629,7 @@ class Ecommerce(http.Controller):
'street': post['shipping_street'],
'city': post['shipping_city'],
'name': post['shipping_name'],
+ 'email': post['email'],
'type': 'delivery',
'parent_id': partner_id,
'country_id': post['shipping_country_id'],
@@ -685,31 +658,183 @@ class Ecommerce(http.Controller):
@website.route(['/shop/payment/'], type='http', auth="public", multilang=True)
def payment(self, **post):
- order = get_current_order()
+ """ Payment step. This page proposes several payment means based on available
+ payment.acquirer. State at this point :
- if not order or not order.order_line:
- return self.mycart(**post)
+ - a draft sale order with lines; otherwise, clean context / session and
+ back to the shop
+ - no transaction in context / session, or only a draft one, if the customer
+ did go to a payment.acquirer website but closed the tab without
+ paying / canceling
+ """
+ cr, uid, context = request.cr, request.uid, request.context
+ payment_obj = request.registry.get('payment.acquirer')
+
+ # if no sale order at this stage: back to checkout beginning
+ order = context.get('website_sale_order')
+ if not order or not order.state == 'draft' or not order.order_line:
+ request.registry['website'].sale_reset_order(cr, uid, context=context)
+ return request.redirect("/shop/")
+ # alread a transaction: forward to confirmation
+ tx = context.get('website_sale_transaction')
+ if tx and not tx.state == 'draft':
+ print 'embetatn'
+ # return request.redirect('/shop/confirmation/%s' % order.id)
+
+ partner_id = False
+ shipping_partner_id = False
+ if order:
+ if order.partner_id.id:
+ partner_id = order.partner_id.id
+ shipping_partner_id = order.partner_id.id
+ if order.partner_shipping_id.id:
+ shipping_partner_id = order.partner_shipping_id.id
values = {
- 'partner': False,
- 'order': order,
+ 'partner': partner_id,
+ 'order': order
}
- values.update( request.registry.get('sale.order')._get_website_data(request.cr, request.uid, order, request.context) )
+ values.update(request.registry.get('sale.order')._get_website_data(cr, uid, order, context))
- payment_obj = request.registry.get('portal.payment.acquirer')
- payment_ids = payment_obj.search(request.cr, SUPERUSER_ID, [('visible', '=', True)], context=request.context)
- values['payments'] = payment_obj.browse(request.cr, SUPERUSER_ID, payment_ids, request.context)
- for payment in values['payments']:
- content = payment_obj.render(request.cr, SUPERUSER_ID, payment.id, order, order.name, order.pricelist_id.currency_id, order.amount_total)
- payment._content = content
+ # fetch all registered payment means
+ if tx:
+ payment_ids = [tx.acquirer_id.id]
+ else:
+ payment_ids = payment_obj.search(cr, SUPERUSER_ID, [('portal_published', '=', True)], context=context)
+ values['payments'] = payment_obj.browse(cr, uid, payment_ids, context=context)
+ for pay in values['payments']:
+ pay._content = payment_obj.render(
+ cr, uid, pay.id,
+ order.name,
+ order.amount_total,
+ order.pricelist_id.currency_id,
+ partner_id=shipping_partner_id,
+ tx_custom_values={
+ 'return_url': '/shop/payment/validate',
+ },
+ context=context)
return request.website.render("website_sale.payment", values)
- @website.route(['/shop/payment_validate/'], type='http', auth="public", multilang=True)
- def payment_validate(self, **post):
- request.httprequest.session['ecommerce_order_id'] = False
- request.httprequest.session['ecommerce_pricelist'] = False
- return request.redirect("/shop/")
+ @website.route(['/shop/payment/transaction/'],
+ type='http', methods=['POST'], auth="public")
+ def payment_transaction(self, acquirer_id, **post):
+ """ Hook method that creates a payment.transaction and redirect to the
+ acquirer, using post values to re-create the post action.
+
+ :param int acquirer_id: id of a payment.acquirer record. If not set the
+ user is redirected to the checkout page
+ :param dict post: should coutain all post data for the acquirer
+ """
+ # @TDEFIXME: don't know why we received those data, but should not be send to the acquirer
+ post.pop('submit.x', None)
+ post.pop('submit.y', None)
+ cr, uid, context = request.cr, request.uid, request.context
+ payment_obj = request.registry.get('payment.acquirer')
+ transaction_obj = request.registry.get('payment.transaction')
+ order = request.registry['website'].get_current_order(request.cr, request.uid, context=request.context)
+
+ if not order or not order.order_line or acquirer_id is None:
+ return request.redirect("/shop/checkout/")
+
+ # find an already existing transaction
+ tx = context.get('website_sale_transaction')
+ if not tx:
+ tx_id = transaction_obj.create(cr, uid, {
+ 'acquirer_id': acquirer_id,
+ 'type': 'form',
+ 'amount': order.amount_total,
+ 'currency_id': order.pricelist_id.currency_id.id,
+ 'partner_id': order.partner_id.id,
+ 'reference': order.name,
+ 'sale_order_id': order.id,
+ }, context=context)
+ request.httprequest.session['website_sale_transaction_id'] = tx_id
+ elif tx and tx.state == 'draft': # button cliked but no more info -> rewrite on tx or create a new one ?
+ tx.write({
+ 'acquirer_id': acquirer_id,
+ })
+
+ acquirer_form_post_url = payment_obj.get_form_action_url(cr, uid, acquirer_id, context=context)
+ acquirer_total_url = '%s?%s' % (acquirer_form_post_url, urllib.urlencode(post))
+ return request.redirect(acquirer_total_url)
+
+ @website.route('/shop/payment/get_status/', type='json', auth="public", multilang=True)
+ def payment_get_status(self, order, **post):
+ cr, uid, context = request.cr, request.uid, request.context
+ if not order:
+ return {
+ 'state': 'error',
+ }
+
+ tx_ids = request.registry['payment.transaction'].search(
+ cr, uid, [
+ '|', ('sale_order_id', '=', order.id), ('reference', '=', order.name)
+ ], context=context)
+ if not tx_ids:
+ return {
+ 'state': 'error'
+ }
+ tx = request.registry['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
+ return {
+ 'state': tx.state,
+ }
+
+ @website.route('/shop/payment/validate/', type='http', auth="public", multilang=True)
+ def payment_validate(self, transaction_id=None, sale_order_id=None, **post):
+ """ Method that should be called by the server when receiving an update
+ for a transaction. State at this point :
+
+ - UDPATE ME
+ """
+ cr, uid, context = request.cr, request.uid, request.context
+ email_act = None
+ sale_order_obj = request.registry['sale.order']
+
+ if transaction_id is None:
+ tx = context.get('website_sale_transaction')
+ else:
+ tx = request.registry['payment.transaction'].browse(cr, uid, transaction_id, context=context)
+
+ if sale_order_id is None:
+ order = context.get('website_sale_order')
+ else:
+ order = request.registry['sale.order'].browse(cr, uid, sale_order_id, context=context)
+
+ if tx.state == 'done':
+ # confirm the quotation
+ sale_order_obj.action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
+ # send by email
+ email_act = sale_order_obj.action_quotation_send(cr, SUPERUSER_ID, [order.id], context=request.context)
+ elif tx.state == 'pending':
+ # send by email
+ email_act = sale_order_obj.action_quotation_send(cr, SUPERUSER_ID, [order.id], context=request.context)
+ elif tx.state == 'cancel':
+ # cancel the quotation
+ sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)
+
+ if email_act:
+ create_ctx = email_act.get('context', context)
+ compose_id = request.registry['mail.compose.message'].create(cr, uid, {}, context=create_ctx)
+ request.registry['mail.compose.message'].send_mail(cr, uid, [compose_id], context=create_ctx)
+
+ # clean context and session, then redirect to the confirmation page
+ request.registry['website'].sale_reset_order(cr, uid, context=context)
+
+ return request.redirect('/shop/confirmation/%s' % order.id)
+
+ @website.route(['/shop/confirmation/'], type='http', auth="public", multilang=True)
+ def payment_confirmation(self, order, **post):
+ """ End of checkout process controller. Confirmation is basically seing
+ the status of a sale.order. State at this point :
+
+ - should not have any context / session info: clean them
+ - take a sale.order id, because we request a sale.order and are not
+ session dependant anymore
+ """
+ cr, uid, context = request.cr, request.uid, request.context
+
+ return request.website.render("website_sale.confirmation", {'order': order})
@website.route(['/shop/change_sequence/'], type='json', auth="public")
def change_sequence(self, id, top):
diff --git a/addons/website_sale/controllers/website.py b/addons/website_sale/controllers/website.py
new file mode 100644
index 00000000000..949b2263617
--- /dev/null
+++ b/addons/website_sale/controllers/website.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+import uuid
+
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
+from openerp.addons.web.http import request
+
+
+class Website(osv.Model):
+ _inherit = "website"
+
+ def _get_order(self, cr, uid, order_id=None, context=None):
+ order_obj = request.registry.get('sale.order')
+ # check if order allready exists and have access
+ if order_id:
+ if not order_id in order_obj.exists(cr, uid, [order_id], context=context):
+ return False
+ try:
+ order = order_obj.browse(cr, uid, order_id, context=context)
+ if order:
+ return order
+ except:
+ return False
+
+ fields = [k for k, v in order_obj._columns.items()]
+ order_value = order_obj.default_get(cr, SUPERUSER_ID, fields, context=context)
+ if request.httprequest.session.get('ecommerce_pricelist'):
+ order_value['pricelist_id'] = request.httprequest.session['ecommerce_pricelist']
+ order_value['partner_id'] = request.registry.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
+ order_value.update(order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], order_value['partner_id'], context=context)['value'])
+
+ # add website_session_id key for access rules
+ if not request.httprequest.session.get('website_session_id'):
+ request.httprequest.session['website_session_id'] = str(uuid.uuid4())
+
+ order_value["website_session_id"] = request.httprequest.session['website_session_id']
+ order_id = order_obj.create(cr, SUPERUSER_ID, order_value, context=context)
+ order = order_obj.browse(cr, SUPERUSER_ID, order_id, context=context)
+ request.httprequest.session['ecommerce_order_id'] = order.id
+
+ return order_obj.browse(cr, uid, order_id,
+ context=dict(request.context, pricelist=order.pricelist_id.id))
+
+ def get_current_order(self, cr, uid, context=None):
+ if request.httprequest.session.get('ecommerce_order_id'):
+ order = self._get_order(cr, uid, order_id=request.httprequest.session['ecommerce_order_id'], context=context)
+ if not order:
+ request.httprequest.session['ecommerce_order_id'] = False
+ return order
+ return False
+
+ def _get_transaction(self, cr, uid, tx_id=None, context=None):
+ transaction_obj = request.registry['payment.transaction']
+ if tx_id:
+ tx_ids = transaction_obj.search(cr, uid, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)
+ if tx_ids:
+ return transaction_obj.browse(cr, uid, tx_ids[0], context=context)
+ return False
+
+ def get_current_transaction(self, cr, uid, context=None):
+ if request.httprequest.session.get('website_sale_transaction_id'):
+ tx = self._get_transaction(cr, uid, tx_id=request.httprequest.session['website_sale_transaction_id'], context=context)
+ if not tx:
+ request.httprequest.session['website_sale_transaction_id'] = False
+ return tx
+ return False
+
+ def sale_reset_order(self, cr, uid, context=None):
+ request.httprequest.session.update({
+ 'ecommerce_order_id': False,
+ 'ecommerce_pricelist': False,
+ 'website_sale_transaction_id': False,
+ })
+ request.context.update({
+ 'website_sale_order': False,
+ 'website_sale_transaction': False,
+ })
+
+ def preprocess_request(self, cr, uid, ids, request, context=None):
+ request.context.update({
+ 'website_sale_order': self.get_current_order(cr, uid, context=context),
+ 'website_sale_transaction': self.get_current_transaction(cr, uid, context=context)
+ })
+ return super(Website, self).preprocess_request(cr, uid, ids, request, context=None)
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 83ede423d37..3193b41a4fd 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -2,6 +2,7 @@
from openerp.osv import orm, fields
from openerp.addons.web import http
+
class Website(orm.Model):
_inherit = 'website'
@@ -16,3 +17,12 @@ class Website(orm.Model):
'pricelist_id': fields.function(
_get_pricelist, type='many2one', obj='product.pricelist')
}
+
+
+class PaymentTransaction(orm.Model):
+ _inherit = 'payment.transaction'
+
+ _columns = {
+ # link with the sale order
+ 'sale_order_id': fields.many2one('sale.order', 'Sale Order'),
+ }
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 6b67836ac84..8f22205eb8c 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -3,8 +3,6 @@
var website = openerp.website;
- var render = website.tour.render;
-
website.EditorBar.include({
start: function () {
this.registerTour(new website.EditorShopTour(this));
@@ -15,7 +13,6 @@
website.EditorShopTour = website.Tour.extend({
id: 'shop-tutorial',
name: "Create a product",
- startPath: '/shop',
init: function (editor) {
var self = this;
self.steps = [
@@ -25,7 +22,7 @@
backdrop: true,
title: "Welcome to your shop",
content: "You successfully installed the e-commerce. This guide will help you to create your product and promote your sales.",
- template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
+ template: self.popover({ next: "Start Tutorial", end: "Skip It" }),
},
{
stepId: 'content-menu',
@@ -34,7 +31,6 @@
reflex: true,
title: "Create your first product",
content: "Click here to add a new product.",
- template: render('website.tour_popover'),
},
{
stepId: 'edit-entry',
@@ -42,8 +38,7 @@
placement: 'left',
title: "Create a new product",
content: "Select 'New Product' to create it and manage its properties to boost your sales.",
- template: render('website.tour_popover'),
- onShow: function () {
+ triggers: function () {
$(document).one('shown.bs.modal', function () {
$('.modal button.btn-primary').click(function () {
self.movetoStep('product-page');
@@ -58,7 +53,6 @@
placement: 'right',
title: "Choose name",
content: "Enter a name for your new product.",
- template: render('website.tour_popover'),
},
{
@@ -67,7 +61,7 @@
backdrop: true,
title: "New product created",
content: "This page contains all the information related to the new product.",
- template: render('website.tour_popover', { next: "OK" }),
+ template: self.popover({ next: "OK" }),
},
{
stepId: 'edit-price',
@@ -75,7 +69,7 @@
placement: 'left',
title: "Change the public price",
content: "Edit the sale price of this product by clicking on the amount. The price is the sale price used in all sale order when selling this product.",
- template: render('website.tour_popover', { next: "OK" }),
+ template: self.popover({ next: "OK" }),
},
{
stepId: 'add-block',
@@ -84,16 +78,15 @@
reflex: true,
title: "Describe the product for your audience",
content: "Insert blocks like text-image, or gallery to fully describe the product and make your visitors want to buy this product.",
- template: render('website.tour_popover'),
},
];
return this._super();
},
- continueTour: function () {
+ resume: function () {
return this.isCurrentStep('product-page') && !this.tour.ended();
},
- isTriggerUrl: function (url) {
- return (this.continueTour() && this.testUrl(/^\/shop\/product\/[0-9]+\/\?enable_editor=1/)) || this._super();
+ trigger: function (url) {
+ return (this.resume() && this.testUrl(/^\/shop\/product\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index 366b4fadce5..87be89b59c6 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -19,4 +19,60 @@
}
}),
});
+
+
+ $(document).on('click', '.js_publish_management .js_go_to_top,.js_publish_management .js_go_to_bottom', function (event) {
+ var $a = $(event.currentTarget);
+ var $data = $a.parents(".js_publish_management:first");
+ openerp.jsonRpc('/shop/change_sequence/', 'call', {'id': $data.data('id'), 'top': $a.hasClass('js_go_to_top')});
+ });
+
+ $(document).on('click', '.js_options ul[name="style"] a', function (event) {
+ var $a = $(event.currentTarget);
+ var $li = $a.parent();
+ var $data = $a.parents(".js_options:first");
+ var $product = $a.parents(".oe_product:first");
+
+ $li.parent().removeClass("active");
+ openerp.jsonRpc('/shop/change_styles/', 'call', {'id': $data.data('id'), 'style_id': $a.data("id")})
+ .then(function (result) {
+ $product.toggleClass($a.data("class"));
+ $li.toggleClass("active", result);
+ });
+ });
+
+ $(document).on('mouseenter', '#products_grid .js_options ul[name="size"] table', function (event) {
+ $(event.currentTarget).addClass("oe_hover");
+ });
+ $(document).on('mouseleave', '#products_grid .js_options ul[name="size"] table', function (event) {
+ $(event.currentTarget).removeClass("oe_hover");
+ });
+ $(document).on('mouseover', '#products_grid .js_options ul[name="size"] td', function (event) {
+ var $td = $(event.currentTarget);
+ var $table = $td.parents("table:first");
+ var x = $td.index()+1;
+ var y = $td.parent().index()+1;
+
+ var tr = [];
+ for (var yi=0; yi
-
-
-
-
+
+
+
@@ -25,7 +24,7 @@
-
+
-
+
@@ -69,7 +68,7 @@
-
-
+
-
- -
-
- +
-
- + diff --git a/addons/website_event/views/website_event_sale_backend.xml b/addons/website_event/views/website_event_sale_backend.xml index 5c247c98c0c..b0df167c58b 100644 --- a/addons/website_event/views/website_event_sale_backend.xml +++ b/addons/website_event/views/website_event_sale_backend.xml @@ -2,10 +2,10 @@
@@ -265,24 +295,24 @@ - - + event.event.website.form event.event -+ @@ -19,10 +19,10 @@ Website view:
+ Click to add a track. +
+ Tracks define the agenda of your event. These can be + a talk, a round table, a meeting, etc. +
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /event/publish
+
+
+
+
+
+
+
+ Not Implmented
+ +
+
+
+
+
+
+
+
+
+
+ Call for Proposals
+ +Proposals are closed!
++ This event does not accept proposals. +
+
+
+
+
+
+
+
+
+
+
+
+ + Introduction +
++ We will accept a broad range of + presentations, from reports on academic and + commercial projects to tutorials and case + studies. As long as the presentation is + interesting and potentially useful to the + audience, it will be considered for + inclusion in the programme. +
+Application
++ Fill this form to propose your talk. + +
+
+
+
+
+
+
+
+
+ Talks Types
+
+
+ -
+
- + Regular Talks. These are standard talks with slides, + alocated in slots of 30 minutes. +
- + Lightning Talks. These are 10 minutes talks on many + different topics. Most topics are accepted in lightning talks. + +
+
+
+
+ Submission Agreement
+
+
+ + We require speakers to accept an agreement in which they commit to: +
+-
+
- + Timely release of presentation material (slides), + for publishing on our website. +
- + Allow video and audio recording of their + presentation, for publishing on our website. + +
+
+
+
+
+
+
+ Paypal payment: form based
+
+
+
+
+
+ Ogone payment
+
+
+
+
+
+
+ Transfer payment
+
+
-
+
@@ -118,7 +117,7 @@
-