diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index 020d305b9e8..1791f820511 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -102,7 +102,7 @@ Download
- Print + Print
diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml index 6bada8f26aa..ffcbb7f99c6 100644 --- a/addons/account_payment/views/account_portal_templates.xml +++ b/addons/account_payment/views/account_portal_templates.xml @@ -44,7 +44,7 @@

Pay with

-
+
@@ -55,7 +55,7 @@ - + Pay Now
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index d34c233c8c7..2f2d36f62f2 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -229,7 +229,6 @@ - View diff --git a/addons/portal/static/src/js/portal_signature.js b/addons/portal/static/src/js/portal_signature.js index a7848748279..3c19b3b8f91 100644 --- a/addons/portal/static/src/js/portal_signature.js +++ b/addons/portal/static/src/js/portal_signature.js @@ -91,6 +91,13 @@ odoo.define('portal.signature_form', function (require){ var $success = qweb.render("portal.portal_signature_success", {widget: data}); self.$('#o_portal_sign_draw').parent().replaceWith($success); } + if (data.force_refresh) { + if (data.redirect_url) { + window.location = data.redirect_url; + } else { + window.location.reload(); + } + } }); }, diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py index a26c3d21df8..6b1fd33f87f 100644 --- a/addons/sale/controllers/portal.py +++ b/addons/sale/controllers/portal.py @@ -158,13 +158,9 @@ class CustomerPortal(CustomerPortal): body = _('Quotation viewed by customer') _message_post_helper(res_model='sale.order', res_id=order_sudo.id, message=body, token=order_sudo.access_token, message_type='notification', subtype="mail.mt_note", partner_ids=order_sudo.user_id.sudo().partner_id.ids) - transaction = order_sudo.get_portal_last_transaction() - values = { 'sale_order': order_sudo, - 'message': int(message) if message else False, - 'tx_state': transaction.state if transaction else False, - 'need_payment': order_sudo.invoice_status == 'to invoice' and transaction.state in ['draft', 'cancel'], + 'message': message, 'token': access_token, 'return_url': '/shop/payment/validate', 'bootstrap_formatting': True, @@ -172,7 +168,7 @@ class CustomerPortal(CustomerPortal): 'report_type': 'html', } - if order_sudo.has_to_be_paid() or values['need_payment']: + if order_sudo.has_to_be_paid(): domain = expression.AND([ ['&', ('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id)], ['|', ('specific_countries', '=', False), ('country_ids', 'in', [order_sudo.partner_id.country_id.id])] @@ -192,3 +188,119 @@ class CustomerPortal(CustomerPortal): values.update(get_records_pager(history, order_sudo)) return request.render('sale.sale_order_portal_template', values) + + @http.route(['/my/orders//accept'], type='json', auth="public", website=True) + def portal_quote_accept(self, res_id, access_token=None, partner_name=None, signature=None, order_id=None): + try: + order_sudo = self._document_check_access('sale.order', res_id, access_token=access_token) + except (AccessError, MissingError): + return {'error': _('Invalid order')} + + if not order_sudo.has_to_be_signed(): + return {'error': _('Order is not in a state requiring customer signature.')} + if not signature: + return {'error': _('Signature is missing.')} + + if not order_sudo.has_to_be_paid(): + order_sudo.action_confirm() + + order_sudo.signature = signature + order_sudo.signed_by = partner_name + + pdf = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([order_sudo.id])[0] + _message_post_helper( + res_model='sale.order', + res_id=order_sudo.id, + message=_('Order signed by %s') % (partner_name,), + attachments=[('%s.pdf' % order_sudo.name, pdf)], + **({'token': access_token} if access_token else {})) + + return { + 'force_refresh': True, + 'redirect_url': order_sudo.get_portal_url(query_string='&message=sign_ok'), + } + + @http.route(['/my/orders//decline'], type='http', auth="public", methods=['POST'], website=True) + def decline(self, order_id, access_token=None, **post): + try: + order_sudo = self._document_check_access('sale.order', order_id, access_token=access_token) + except (AccessError, MissingError): + return request.redirect('/my') + + message = post.get('decline_message') + + query_string = False + if order_sudo.has_to_be_signed() and message: + order_sudo.action_cancel() + _message_post_helper(message=message, res_id=order_id, res_model='sale.order', **{'token': access_token} if access_token else {}) + else: + query_string = "&message=cant_reject" + + return request.redirect(order_sudo.get_portal_url(query_string=query_string)) + + # note dbo: website_sale code + @http.route(['/my/orders//transaction/'], type='json', auth="public", website=True) + def payment_transaction_token(self, acquirer_id, order_id, save_token=False, access_token=None, **kwargs): + """ Json method that creates a payment.transaction, used to create a + transaction when the user clicks on 'pay now' button. After having + created the transaction, the event continues and the user is redirected + to the acquirer website. + + :param int acquirer_id: id of a payment.acquirer record. If not set the + user is redirected to the checkout page + """ + # Ensure a payment acquirer is selected + if not acquirer_id: + return False + + try: + acquirer_id = int(acquirer_id) + except: + return False + + order = request.env['sale.order'].sudo().browse(order_id) + if not order or not order.order_line or not order.has_to_be_paid(): + return False + + # Create transaction + vals = { + 'acquirer_id': acquirer_id, + 'type': order._get_payment_type(), + } + + transaction = order._create_payment_transaction(vals) + + return transaction.render_sale_button( + order, + order.get_portal_url(), + submit_txt=_('Pay & Confirm'), + render_values={ + 'type': order._get_payment_type(), + 'alias_usage': _('If we store your payment information on our server, subscription payments will be made automatically.'), + } + ) + + @http.route('/my/orders//transaction/token', type='http', auth='public', website=True) + def payment_token(self, order_id, pm_id=None, **kwargs): + + order = request.env['sale.order'].sudo().browse(order_id) + if not order: + return request.redirect("/my/orders") + if not order.order_line or pm_id is None or not order.has_to_be_paid(): + return request.redirect(order.get_portal_url()) + + # try to convert pm_id into an integer, if it doesn't work redirect the user to the quote + try: + pm_id = int(pm_id) + except ValueError: + return request.redirect(order.get_portal_url()) + + # Create transaction + vals = { + 'payment_token_id': pm_id, + 'type': 'server2server', + } + + order._create_payment_transaction(vals) + + return request.redirect(order.get_portal_url()) diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml index 2e5b5f24553..5f85067b19f 100644 --- a/addons/sale/data/mail_data.xml +++ b/addons/sale/data/mail_data.xml @@ -57,15 +57,15 @@ diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 313c54bd0b0..6657dd04c25 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -14,6 +14,8 @@ from odoo.tools import float_is_zero, float_compare from odoo.addons import decimal_precision as dp +from werkzeug.urls import url_encode + class SaleOrder(models.Model): _name = "sale.order" @@ -28,6 +30,12 @@ class SaleOrder(models.Model): return fields.Date.to_string(datetime.now() + timedelta(days)) return False + def _get_default_require_signature(self): + return self.env.user.company_id.portal_confirmation_sign + + def _get_default_require_payment(self): + return self.env.user.company_id.portal_confirmation_pay + @api.depends('order_line.price_total') def _amount_all(self): """ @@ -136,6 +144,12 @@ class SaleOrder(models.Model): validity_date = fields.Date(string='Validity', readonly=True, copy=False, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Validity date of the quotation, after this date, the customer won't be able to validate the quotation online.", default=_default_validity_date) is_expired = fields.Boolean(compute='_compute_is_expired', string="Is expired") + require_signature = fields.Boolean('Online Signature', default=_get_default_require_signature, readonly=True, + states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, + help='Request a online signature to the customer in order to confirm orders automatically.') + require_payment = fields.Boolean('Online Payment', default=_get_default_require_payment, readonly=True, + states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, + help='Request an online payment to the customer in order to confirm orders automatically.') remaining_validity_days = fields.Integer(compute='_compute_remaining_validity_days', string="Remaining Validity Days") create_date = fields.Datetime(string='Creation Date', readonly=True, index=True, help="Date on which sales order is created.") confirmation_date = fields.Datetime(string='Confirmation Date', readonly=True, index=True, help="Date on which the sales order is confirmed.", oldname="date_confirm", copy=False) @@ -204,10 +218,7 @@ class SaleOrder(models.Model): def _compute_is_expired(self): today = fields.Date.today() for order in self: - if order.validity_date and order.validity_date < today: - order.is_expired = True - else: - order.is_expired = False + order.is_expired = order.state == 'sent' and order.validity_date and order.validity_date < today @api.multi @api.depends('order_line.customer_lead', 'confirmation_date', 'order_line.state') @@ -728,19 +739,12 @@ class SaleOrder(models.Model): return report_pages - def get_portal_confirmation_action(self): - if self.company_id.portal_confirmation_sign and not self.signature: - return 'sign' - if self.company_id.portal_confirmation_pay: - return 'pay' + def has_to_be_signed(self, also_in_draft=False): + return (self.state == 'sent' or (self.state == 'draft' and also_in_draft)) and not self.is_expired and self.require_signature and not self.signature and self.team_id.team_type != 'website' - return 'none' - - def has_to_be_signed(self): - return self.company_id.portal_confirmation_sign - - def has_to_be_paid(self): - return self.company_id.portal_confirmation_pay + def has_to_be_paid(self, also_in_draft=False): + transaction = self.get_portal_last_transaction() + return (self.state == 'sent' or (self.state == 'draft' and also_in_draft)) and not self.is_expired and self.require_payment and transaction.state != 'done' and self.amount_total @api.multi def _notify_get_groups(self, message, groups): @@ -824,6 +828,15 @@ class SaleOrder(models.Model): return transaction + @api.multi + def preview_sale_order(self): + self.ensure_one() + return { + 'type': 'ir.actions.act_url', + 'target': 'self', + 'url': self.get_portal_url(), + } + def _force_lines_to_invoice_policy_order(self): for line in self.order_line: if self.state in ['sale', 'done']: @@ -853,6 +866,33 @@ class SaleOrder(models.Model): self.ensure_one() return '%s %s' % (self.type_name, self.name) + @api.multi + def get_access_action(self, access_uid=None): + """ Instead of the classic form view, redirect to the online quote if it exists. """ + self.ensure_one() + user = access_uid and self.env['res.users'].sudo().browse(access_uid) or self.env.user + + if not self.sale_order_template_id or (not user.share and not self.env.context.get('force_website')): + return super(SaleOrder, self).get_access_action(access_uid) + return { + 'type': 'ir.actions.act_url', + 'url': self.get_portal_url(), + 'target': 'self', + 'res_id': self.id, + } + + def _get_share_url(self, redirect=False, signup_partner=False, pid=None): + self.ensure_one() + if self.state not in ['sale', 'done']: + auth_param = url_encode(self.partner_id.signup_get_auth_param()[self.partner_id.id]) + return self.get_portal_url(query_string='&%s' % auth_param) + return super(SaleOrder, self)._get_share_url(redirect, signup_partner, pid) + + @api.multi + def _get_payment_type(self): + self.ensure_one() + return 'form_save' if self.require_payment else 'form' + class SaleOrderLine(models.Model): _name = 'sale.order.line' diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index 5e8757740ea..49daf9f74df 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -78,7 +78,7 @@ Disc.(%) - Taxes + Taxes Amount Total Price @@ -107,7 +107,7 @@ - + diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index ce4169de48d..bff577dc24e 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -131,36 +131,23 @@

-
  • - Print - - - - - - - - Accept & Sign - - - Accept & Pay - - -
    This offer expired! - Get a new quotation. -
    -     -     -     - - - - Pay Now - - + + Accept & Sign + + + Accept & PayPay now + +
    +
    + Download +
    +
    + Print +
    +
    • -
  • This offer expires in
    - days + daysday
    • -
  • Your advantage + + + - - -

    - - - - +

    ( Incl. tax) @@ -222,34 +201,9 @@
    -
    - - Your message has been successfully sent! -
    -
    - - This order has been validated. Thanks for your trust - and do not hesitate to contact us for - any question. -
    - - - - - - - - +