Commit Graph
42 Commits
Author SHA1 Message Date
Christophe Simonis 6c8141a1df [MERGE] forward port of branch saas-10 up to 2483327 2016-04-01 16:15:35 +02:00
David Monjoie f280bfe8a1 [IMP] website_quote: use new pagebreak mechanism 2016-03-25 11:34:26 +01:00
Damien Bouvy 7682760dca [FIX] website_sale,website_quote: form must be in dom to be submitted
Revision 15f27b2 introduced a dynamic form submission to
avoid some payment transaction problems.

It so happens that form submission in jquery necessitates
said form to actually be in the dom (at least for Firefox
and some version of MSIE); this revision ensures that the
form is updated in the dom by the rpc call then properly
submitted.
2016-03-23 16:38:57 +01:00
Denis Ledoux 15f27b2614 [FIX] website_sale: always re-render the pay now button
Before this revision,
when a user tried to pay his cart with a first acquirer
e.g. Ogone
then came back to the shop (using the browser back button)
then chose another acquirer
e.g. Paypal
a new transaction is created, due to the change of acquirer
(following revision cb9d798)
and therefore, the transaction has a new reference compared
to the last payment transaction attempt (e.g. the ogone one)
but, the old reference is still referenced within
the `Pay now` form values, because the page wasn't re-rendered,
because the user pressed the browser back button, and this
doesn't refresh/re-render the page, and, therefore,
the old reference was still referenced within the `Pay Now`
form values.

Therefore, the wrong reference was sent to the acquirer
(e.g. paypal) and this prevented the payment validation
at the payment feedback, as the new reference was expected
in the feedback information, while we receive the older one.

This revision makes sure to always re-render the `Pay now`
form, so the transaction reference, as well as the other
possible changes in the values, are correctly set,
before sending the information to the acquirer.
2016-03-21 10:30:03 +01:00
Christophe Simonis 0a2300318a [MERGE] forward port of branch saas-6 up to 12d9a34 2016-01-18 10:44:50 +01:00
Nicolas Lempereur de336c0ab8 [FIX] website_quote: don't unescape menu title
If we take content with $().text(), to insert it in another node we have to
used $().text(value) also. If like before this commit, we would use $().html()
the content would be unescaped one time too much.

note: equivalent of 8.0's 37ed5ce and 7ad626f commits
2016-01-12 20:10:29 +01:00
Nicolas Martinelli afa28f075a [FIX] website_quote: message if SO not confirmed
Commit 486cd3309 was not correctly forward ported. We also add a
specific message if the quotation is in state 'draft'.

Fixes #9226
2015-12-09 11:35:14 +01:00
Martin Trigaux a9ec2894de [MERGE] forward port of branch saas-6 up to 19fe77b 2015-12-01 08:41:52 +01:00
qsm-odoo fc731ff4ad [FIX] website_quote: signature color
When signing an online quotation the pen color depended on the theme
that was installed (white when theme graphene was installed).
2015-11-27 13:56:45 +01:00
Nicolas Martinelli de8f3f70fd [FIX] website_quote: support of 2 routes to accept quote
Complement of commit d9c2d03. We should still support the old route, in
case users do not update the template.
2015-10-28 14:33:07 +01:00
Denis Ledoux c8d6b36632 [MERGE] forward port of branch saas-6 up to a0c64bebe6 2015-10-28 12:01:30 +01:00
Nicolas Martinelli d9c2d03532 [FIX] website_quote: fix Sign & Confirm
Commit 7636b51 modifies the route from JSON to HTTP by mistake. Indeed,
the route /quote/accept is called from an ajax.jsonRpc request, not from
the `method="POST" t-attf-action="/quote/accept` which can be found in
website_quotation.xml.

The t-attf-action is actually only used to recover the order_id and the
token in website_quotation.js.

opw-652874
Closes #9227
Fixes #9226
2015-10-28 08:02:24 +01:00
Denis Ledoux a0c64bebe6 [MERGE] forward port of branch 8.0 up to 8209368 2015-10-14 12:28:22 +02:00
Damien Bouvy 156b33c89a [IMP] website_quote: prevent double clicking on the confirm button
Double clicking on the confirm button was actually possible and could confirm the orders multiple times (which could be problematic if some action are linked to the so confirmation)
2015-10-12 14:39:41 +02:00
Damien Bouvy 486cd33091 [FIX] website_quote: prevent modifying the quote state if it's already been processed
Before this fix, it was possible to validate then cancel a quote (or the other way around) simply by using two tabs in your browser. From now on, we only validate/cancel a quote if it's the 'sent' state and advise the customer of the situation if he tries to abuse the process.
2015-10-12 10:43:46 +02:00
Nicolas Martinelli dda5eb7dff [FIX] website_quote: remove loading attribute if missing data
In commit bc43417b, a loading attribute is set on any submit button. The
problem is that this attribute is the first thing to be set. Therefore,
we cannot prevent its propagation.

Since Bootstrap sets this 'loading' attribute in a setTimeout, we need
to remove it in a setTimeout as well.
2015-10-01 17:01:23 +02:00
Fabien Pinckaers 3658a894bc [IMP] modules description, no external link 2015-09-04 11:59:55 +02:00
Damien Bouvy 8998b03b82 [FIX] website_quote: missing deps in website_quotation.js 2015-07-28 14:33:47 +02:00
Christophe Simonis 2cf91d16a5 [MERGE] forward port of branch saas-6 up to 63e92cb 2015-07-22 16:17:54 +02:00
Christophe Matthieu 71732dceb6 [IMP] web: module can be asynchronous loaded if it return a deferred
Each module can return a deferred. In that case, the module is marked as loaded
only when the deferred is resolved, and its value is equal to the resolved value.
The module can be rejected (unloaded). This will be logged in the console as info.

Remove if_dom_contains from the website, the modules return a rejected deferred if
the DOM doesn't contains the seleted values.
2015-07-22 12:15:24 +02:00
qsm-odoo eddcb46c82 [ADD] website, website_quote: new jSignature lib
Note: This is a custom version of the lib which allows to
enable/disable the signature area and which introduces the
compatibility with IE + bug fix of the official version.
2015-07-16 18:03:06 +02:00
Christophe Simonis 6c64869de1 [FIX] website{,_quote,_sale}: do not use undefined variable openerp 2015-07-08 15:21:07 +02:00
Damien Bouvy 298b66129c [FIX] website_quote: acquirer button is not always a div, can be a span or smthg else 2015-07-03 08:58:42 +02:00
Damien Bouvy 32c7f1e48d [FIX] website_quote: the confirm button is not necessarly in that specific div 2015-06-26 17:33:41 +02:00
Christophe Simonis a304194936 [MERGE] forward port of branch saas-6 up to 81b5c60 2015-06-25 00:26:31 +02:00
Damien Bouvy de8d90e12e [IMP] website_quote: add payment management
Until now, you could only sign and confirm a sale order from the frontend.

From now on, you can also pay sale orders if the 'Immediate Payment'
option is checked on the sale order.
2015-06-15 14:57:16 +02:00
Damien Bouvy 5047f4ecad [IMP] website_quote: UOM onchange, respect pricelists on SO, layout fixes
* add on_change_uom behaviour to quote templates lines
* fixes frontend layout issues
* use action_button_confirm instead of signal_workflow
  when confirming the quote in the frontend to trigger
  all events properly
* adapt prices using pricelist on onchange_template_id
   on sale orders
2015-05-28 19:04:13 +02:00
Christophe Simonis fe2b5f35a4 [MERGE] forward port of branch saas-6 up to bf1e999 2015-05-28 14:27:38 +02:00
Christophe Simonis 0da722aa6a [MERGE] forward port of branch 8.0 up to bff6dff 2015-05-11 15:12:24 +02:00
Nicolas Lempereur 4237207000 [FIX] website_quote: css issue for mobile view
When seen from a mobile, the shortcut menu was over the content of the
quote and hid it.

This fix sets the menu inline in the page when he has no place to be on a
column on its own.

opw-633890
2015-05-06 13:24:50 +02:00
Géry Debongnie 4fdf74fe21 [IMP] web+addons: improvement to module system
The module system needs to know the dependencies of a given module
before executing the function.  This is why the dependencies were
defined once in an array, and then were described one more times in the
call to require.

But a trick can simplify this: the boot function can parse the string
representation of the module and extract the calls to require from it.
It is more work for the processor, but it leads to simpler module
definitions.
2015-03-18 09:23:37 +01:00
Géry Debongnie f05d9aea0a [REF] website_quote: update to the new module system 2015-03-18 09:23:36 +01:00
Nandan Jani 6ffef2b053 [IMP] website_quote: improve navspy tracking, make history work and cleanup
Backport of master commit 742acbb454
2015-03-13 17:03:05 +01:00
Nandan Jani 742acbb454 [IMP] website_quote : make history work and clean the template and refactor js. Improved update quote button when quotation is accepted it will display back to sale order button, and updated Edit Template link. 2015-03-10 15:29:19 +01:00
Christophe Simonis 4eb385fc0b [MERGE] forward port of branch 8.0 up to 0ec3c75 2015-01-23 14:57:07 +01:00
Aaron Bohy 3cae676619 [FIX] Use local copies of png instead of fetching them from websites
Debian does not allow fetching data from external website at runtime.
This fixes the privacy-breach-generic lintian warnings for Debian packaging.
The removed youtube url was a dead link...
2015-01-23 11:23:04 +01:00
Mahendra barad bf92a5b2fa [IMP] website_quote: onboarding
Views and labels improvements
2014-10-13 09:20:31 +02:00
Fabien Meghazi 8d08e06758 [FIX] Bundlification remains (Fixes #2463) 2014-09-17 14:50:12 +02:00
Christophe Matthieu 009cc5278e [FIX] website_quote: scroll spy is crazy if the user change quote template. Must remove id created by the javascript of scroll spy. 2014-08-07 18:39:35 +02:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Fabien Pinckaers 7e877e0b84 [IMP] manifest website_quote
bzr revid: fp@tinyerp.com-20140125234748-pvw8emcigm92cg8f
2014-01-26 00:47:48 +01:00
Fabien Pinckaers 7d892584d8 [IMP] renaming to website_quote for coherence with controllers
bzr revid: fp@tinyerp.com-20140125230911-k439s96bw718l23d
2014-01-26 00:09:11 +01:00