From cb0c6361cc9ac7d92731f7e0267124205246abc3 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Fri, 22 Jan 2021 14:16:21 -0600
Subject: [PATCH 01/10] [ADD] website_sale_payment_terms: allow ecommerce
 customers to choose payment terms

H4799
---
 website_sale_payment_terms/__init__.py        |   2 +
 website_sale_payment_terms/__manifest__.py    |  26 ++++
 .../controllers/__init__.py                   |   1 +
 .../controllers/main.py                       |  76 +++++++++
 website_sale_payment_terms/models/__init__.py |   5 +
 website_sale_payment_terms/models/account.py  |   7 +
 website_sale_payment_terms/models/payment.py  |  21 +++
 .../models/res_config.py                      |   9 ++
 website_sale_payment_terms/models/sale.py     |  18 +++
 website_sale_payment_terms/models/website.py  |  12 ++
 .../static/src/js/payment_terms.js            | 107 +++++++++++++
 .../views/account_views.xml                   |  17 ++
 .../views/res_config_views.xml                |  27 ++++
 .../views/web_assets.xml                      |  10 ++
 .../views/website_templates.xml               | 145 ++++++++++++++++++
 .../views/website_views.xml                   |  16 ++
 16 files changed, 499 insertions(+)
 create mode 100644 website_sale_payment_terms/__init__.py
 create mode 100644 website_sale_payment_terms/__manifest__.py
 create mode 100644 website_sale_payment_terms/controllers/__init__.py
 create mode 100644 website_sale_payment_terms/controllers/main.py
 create mode 100644 website_sale_payment_terms/models/__init__.py
 create mode 100644 website_sale_payment_terms/models/account.py
 create mode 100644 website_sale_payment_terms/models/payment.py
 create mode 100644 website_sale_payment_terms/models/res_config.py
 create mode 100644 website_sale_payment_terms/models/sale.py
 create mode 100644 website_sale_payment_terms/models/website.py
 create mode 100644 website_sale_payment_terms/static/src/js/payment_terms.js
 create mode 100644 website_sale_payment_terms/views/account_views.xml
 create mode 100644 website_sale_payment_terms/views/res_config_views.xml
 create mode 100644 website_sale_payment_terms/views/web_assets.xml
 create mode 100644 website_sale_payment_terms/views/website_templates.xml
 create mode 100644 website_sale_payment_terms/views/website_views.xml

diff --git a/website_sale_payment_terms/__init__.py b/website_sale_payment_terms/__init__.py
new file mode 100644
index 00000000..91c5580f
--- /dev/null
+++ b/website_sale_payment_terms/__init__.py
@@ -0,0 +1,2 @@
+from . import controllers
+from . import models
diff --git a/website_sale_payment_terms/__manifest__.py b/website_sale_payment_terms/__manifest__.py
new file mode 100644
index 00000000..6fdfc70f
--- /dev/null
+++ b/website_sale_payment_terms/__manifest__.py
@@ -0,0 +1,26 @@
+{
+    'name': 'Website Payment Terms',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Sales',
+    'version': '13.0.1.0.0',
+    'description':
+        """
+Website Payment Terms
+=====================
+
+Allow customers to choose payment terms if order total meets a configured threshold.
+        """,
+    'depends': [
+        'sale_payment_deposit',
+        'website_sale',
+        'website_sale_delivery',
+    ],
+    'auto_install': False,
+    'data': [
+        'views/account_views.xml',
+        'views/res_config_views.xml',
+        'views/web_assets.xml',
+        'views/website_templates.xml',
+        'views/website_views.xml',
+    ],
+}
diff --git a/website_sale_payment_terms/controllers/__init__.py b/website_sale_payment_terms/controllers/__init__.py
new file mode 100644
index 00000000..12a7e529
--- /dev/null
+++ b/website_sale_payment_terms/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
new file mode 100644
index 00000000..c7bf2301
--- /dev/null
+++ b/website_sale_payment_terms/controllers/main.py
@@ -0,0 +1,76 @@
+from odoo.http import request, route
+from odoo.addons.website_sale.controllers.main import WebsiteSale
+
+
+class WebsiteSalePaymentTerms(WebsiteSale):
+
+    # In case payment_term_id is set by query-string in a link (from website_sale_delivery)
+    @route(['/shop/payment'], type='http', auth="public", website=True)
+    def payment(self, **post):
+        order = request.website.sale_get_order()
+        payment_term_id = post.get('payment_term_id')
+        if order.amount_total <= request.website.payment_deposit_threshold:
+            if payment_term_id:
+                payment_term_id = int(payment_term_id)
+            if order:
+                order._check_payment_term_quotation(payment_term_id)
+                if payment_term_id:
+                    return request.redirect("/shop/payment")
+        else:
+            order.payment_term_id = False
+
+        return super(WebsiteSalePaymentTerms, self).payment(**post)
+
+    # Main JS driven payment term updater.
+    @route(['/shop/update_payment_term'], type='json', auth='public', methods=['POST'], website=True, csrf=False)
+    def update_order_payment_term(self, **post):
+        order = request.website.sale_get_order()
+        payment_term_id = int(post['payment_term_id'])
+        try:
+            if order:
+                order._check_payment_term_quotation(payment_term_id)
+            return self._update_website_payment_term_return(order, **post)
+        except:
+            return {'error': '[101] Unable to update payment terms.'}
+
+    # Return values after order payment_term_id is updated
+    def _update_website_payment_term_return(self, order, **post):
+        if order:
+            return {
+                'payment_term_name': order.payment_term_id.name,
+                'payment_term_id': order.payment_term_id.id,
+                'note': order.payment_term_id.note,
+                'require_payment': order.require_payment,
+            }
+        return {}
+
+    @route(['/shop/reject_term_agreement'], type='http', auth='public', website=True)
+    def reject_term_agreement(self, **kw):
+        order = request.website.sale_get_order()
+        if order:
+            partner = request.env.user.partner_id
+            order.write({'payment_term_id': request.website.sale_get_payment_term(partner),
+                         'require_payment': True})
+        return request.redirect('/shop/cart')
+
+    # Confirm order without taking payment
+    @route(['/shop/confirm_without_payment'], type='http', auth='public', website=True)
+    def confirm_without_payment(self, **post):
+        order = request.website.sale_get_order()
+        if not order:
+            return request.redirect('/shop')
+        if order.require_payment:
+            return request.redirect('/shop/payment')
+        if not order.payment_term_id or (
+                order.payment_term_id.deposit_percentage or order.payment_term_id.deposit_flat):
+            return request.redirect('/shop/payment')
+
+        # made it this far, lets confirm
+        order.sudo().action_confirm()
+        request.session['sale_last_order_id'] = order.id
+
+        # cleans session/context
+        # This should always exist, but it is possible to
+        if request.website and request.website.sale_reset:
+            request.website.sale_reset()
+        return request.redirect('/shop/confirmation')
diff --git a/website_sale_payment_terms/models/__init__.py b/website_sale_payment_terms/models/__init__.py
new file mode 100644
index 00000000..dc24d95a
--- /dev/null
+++ b/website_sale_payment_terms/models/__init__.py
@@ -0,0 +1,5 @@
+from . import account
+from . import payment
+from . import res_config
+from . import sale
+from . import website
diff --git a/website_sale_payment_terms/models/account.py b/website_sale_payment_terms/models/account.py
new file mode 100644
index 00000000..386c5578
--- /dev/null
+++ b/website_sale_payment_terms/models/account.py
@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class AccountPaymentTerm(models.Model):
+    _inherit = 'account.payment.term'
+
+    allow_in_website_sale = fields.Boolean('Allow in website checkout')
diff --git a/website_sale_payment_terms/models/payment.py b/website_sale_payment_terms/models/payment.py
new file mode 100644
index 00000000..748c891e
--- /dev/null
+++ b/website_sale_payment_terms/models/payment.py
@@ -0,0 +1,21 @@
+from odoo import models, _
+
+
+class PaymentTransaction(models.Model):
+    _inherit = 'payment.transaction'
+
+    def render_sale_button(self, order, submit_txt=None, render_values=None):
+        values = {
+            'partner_id': order.partner_id.id,
+            'type': self.type,
+        }
+        if render_values:
+            values.update(render_values)
+        # Not very elegant to do that here but no choice regarding the design.
+        self._log_payment_transaction_sent()
+        return self.acquirer_id.with_context(submit_class='btn btn-primary', submit_txt=submit_txt or _('Pay Now')).sudo().render(
+            self.reference,
+            order.amount_total_deposit or order.amount_total,
+            order.pricelist_id.currency_id.id,
+            values=values,
+        )
diff --git a/website_sale_payment_terms/models/res_config.py b/website_sale_payment_terms/models/res_config.py
new file mode 100644
index 00000000..2595876a
--- /dev/null
+++ b/website_sale_payment_terms/models/res_config.py
@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class WebsiteConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    payment_deposit_threshold = fields.Monetary(string="Payment Deposit Threshold",
+                                                related="website_id.payment_deposit_threshold",
+                                                readonly=False)
diff --git a/website_sale_payment_terms/models/sale.py b/website_sale_payment_terms/models/sale.py
new file mode 100644
index 00000000..b7a98e83
--- /dev/null
+++ b/website_sale_payment_terms/models/sale.py
@@ -0,0 +1,18 @@
+from odoo import fields, models
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    def _check_payment_term_quotation(self, payment_term_id):
+        self.ensure_one()
+        if payment_term_id and self.payment_term_id.id != payment_term_id:
+            # TODO how can we set a default if we can only set ones partner has assigned...
+            # Otherwise.. how do we prevent using any payment term by ID?
+            payment_term = self.env['account.payment.term'].sudo().browse(payment_term_id)
+            if not payment_term.exists():
+                raise Exception('Could not find payment terms.')
+            self.write({
+                'payment_term_id': payment_term_id,
+                'require_payment': bool(payment_term.deposit_percentage) or bool(payment_term.deposit_flat),
+            })
diff --git a/website_sale_payment_terms/models/website.py b/website_sale_payment_terms/models/website.py
new file mode 100644
index 00000000..3388f5f1
--- /dev/null
+++ b/website_sale_payment_terms/models/website.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class Website(models.Model):
+    _inherit = 'website'
+
+    payment_deposit_threshold = fields.Monetary(string='Payment Deposit Threshold',
+                                                help='Allow customers to make a deposit when their order '
+                                                     'total is above this amount.')
+
+    def get_payment_terms(self):
+        return self.env['account.payment.term'].search([('allow_in_website_sale', '=', True)])
diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
new file mode 100644
index 00000000..6eaeaa46
--- /dev/null
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -0,0 +1,107 @@
+odoo.define('website_sale_payment_terms.payment_terms', function (require) {
+    "use strict";
+
+    require('web.dom_ready');
+    var ajax = require('web.ajax');
+    var concurrency = require('web.concurrency');
+    var dp = new concurrency.DropPrevious();
+    var publicWidget = require('web.public.widget');
+    require('website_sale_delivery.checkout');
+
+
+    console.log('Payment Terms V10.1');
+
+    var available_term = $('input[name="payment_term_id"]').length;
+    if (available_term > 0) {
+        console.log('Payment term detected');
+        // Detect pay button and disable on page load - This isn't ideal but there is something I cant find that is preventing disabling this
+        setTimeout(function(){ $('#o_payment_form_pay').prop('disabled', true); }, 500);
+    } else {
+        console.log('no payment term detected');
+    }
+
+    // Calculate amount Due Now
+    function calculate_deposit(t, d, f) {
+        var amount = t * d / 100 + f;
+        if (amount > 0) {
+            amount = amount.toFixed(2);
+            amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+            return amount;
+        } else {
+            amount = 0.00;
+            return amount;
+        }
+    }
+
+    // Payment input clicks update sale.order payment_term_id
+    var _onPaymentTermClick = function (ev) {
+        $('#o_payment_form_pay').prop('disabled', true);
+        var payment_term_id = $(ev.currentTarget).val();
+        var values = {'payment_term_id': payment_term_id};
+        dp.add(ajax.jsonRpc('/shop/update_payment_term', 'call', values).then(_onPaymentTermUpdateAnswer));
+    };
+    var $payment_terms = $("#payment_terms input[name='payment_term_id']");
+    $payment_terms.click(_onPaymentTermClick);
+
+
+    // All input clicks update due amount
+    function updateAmountDue() {
+        var $amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
+        $amount_total = parseFloat($amount_total);
+        var $checked = $('input[name="payment_term_id"]:checked');
+        var $deposit_percentage = $checked.attr('data-deposit-percentage');
+        var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
+        var $due_amount = calculate_deposit($amount_total, $deposit_percentage, $deposit_flat);
+        $('#order_due_today span.oe_currency_value').html($due_amount);
+    }
+
+    // update amount due after delivery options change
+    publicWidget.registry.websiteSaleDelivery.include({
+        _handleCarrierUpdateResult: function (result) {
+            this._super.apply(this, arguments);
+            updateAmountDue();
+        },
+    });
+
+    // Show amount due if operation is a success
+    var _onPaymentTermUpdateAnswer = function (result) {
+        if (!result.error) {
+
+            // Get Payment Term note/description for modal
+            var note = result.note;
+            if (!result.note) {
+                note = result.payment_term_name;
+            }
+
+            // Change forms based on order payment requirement
+            updateAmountDue();
+            if(!result.require_payment) {
+                $('#payment_method').hide();
+                $('#non_payment_method').show();
+                $('#order_due_today').hide();
+            } else {
+                $('#payment_method').show();
+                $('#non_payment_method').hide();
+                $('#order_due_today').show();
+            }
+
+            // Open success modal with message
+            $('#payment_term_success_modal .success-modal-note').text(note);
+            $('#payment_term_success_modal').modal();
+        } else {
+            // Open error modal
+            console.error(result);
+            $('#payment_term_error_modal').modal();
+        }
+    };
+
+});
+
+function deny_payment_terms() {
+    $('#o_payment_form_pay').prop('disabled', true);
+    window.location = '/shop/reject_term_agreement';
+}
+
+function accept_payment_terms() {
+    $('#o_payment_form_pay').prop('disabled', false);
+}
diff --git a/website_sale_payment_terms/views/account_views.xml b/website_sale_payment_terms/views/account_views.xml
new file mode 100644
index 00000000..f2828904
--- /dev/null
+++ b/website_sale_payment_terms/views/account_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_payment_term_form" model="ir.ui.view">
+        <field name="name">view.payment.term.form.inherit.website</field>
+        <field name="model">account.payment.term</field>
+        <field name="inherit_id" ref="account.view_payment_term_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='note']" position="before">
+                <group>
+                    <field name="allow_in_website_sale"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/website_sale_payment_terms/views/res_config_views.xml b/website_sale_payment_terms/views/res_config_views.xml
new file mode 100644
index 00000000..f1cad4b4
--- /dev/null
+++ b/website_sale_payment_terms/views/res_config_views.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.payment.terms</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="website_sale.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='website_tax_inclusion_setting']" position="after">
+                <div class="col-12 col-lg-6 o_setting_box" id="website_payment_deposit_threshold">
+                        <div class="o_setting_right_pane">
+                            <label string="Deposit Threshold" for="payment_deposit_threshold"/>
+                            <div class="text-muted">
+                                Allow customers to make percentage or flat deposits above this amount on website.
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="payment_deposit_threshold" class="o_light_label"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/website_sale_payment_terms/views/web_assets.xml b/website_sale_payment_terms/views/web_assets.xml
new file mode 100644
index 00000000..281bcb1c
--- /dev/null
+++ b/website_sale_payment_terms/views/web_assets.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <template id="web_assets_frontend" inherit_id="website.assets_frontend">
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/website_sale_payment_terms/static/src/js/payment_terms.js"/>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
new file mode 100644
index 00000000..15359791
--- /dev/null
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <!-- Payment terms list items for /shop/payment -->
+    <template id="payment_term_items">
+        <t t-set="partner_term" t-value="order.partner_id.property_payment_term_id"/>
+        <!-- Show current partners payment terms -->
+        <t t-if="partner_term and partner_term not in website_terms">
+            <li class="list-group-item">
+                <input t-att-value="partner_term.id"
+                       t-att-data-deposit-percentage="partner_term.deposit_percentage or '0'"
+                       t-att-data-deposit-flat="partner_term.deposit_flat or '0'"
+                       name="payment_term_id"
+                       t-att-id="'payment_term_%i' % partner_term.id"
+                       type="radio"/>
+                <label t-att-for="'payment_term_%i' % partner_term.id"
+                       t-field="partner_term.name"
+                       class="label-optional"/>
+            </li>
+        </t>
+        <!-- Show default option set by account.payment.term boolean -->
+        <li t-foreach="website_terms" t-as="term" class="list-group-item">
+            <input t-att-value="term.id"
+                   t-att-data-deposit-percentage="term.deposit_percentage or '0'"
+                   t-att-data-deposit-flat="term.deposit_flat or '0'"
+                   t-att-id="'payment_term_%i' % term.id"
+                   type="radio"
+                   name="payment_term_id"/>
+            <label t-att-for="'payment_term_%i' % term.id"
+                   t-field="term.name"
+                   class="label-optional"/>
+        </li>
+    </template>
+
+    <!-- Add placeholder for list of payment terms to /shop/payment -->
+    <template id="payment_terms" inherit_id="website_sale.payment" name="Payment Terms Info">
+        <xpath expr="//div[@id='payment_method']" position="before">
+            <t t-set="website_terms" t-value="website.get_payment_terms()" />
+            <t t-if="website_terms and website_sale_order.amount_total &gt; website.payment_deposit_threshold">
+                <t t-call="website_sale_payment_terms.payment_term_success_modal"/>
+                <t t-call="website_sale_payment_terms.payment_term_error_modal"/>
+                <div id="payment_terms">
+                    <h3 class="mb24 mt24">Payment Terms</h3>
+                    <div class="card border-0">
+                        <ul class="list-group">
+                            <t t-call="website_sale_payment_terms.payment_term_items"/>
+                        </ul>
+                    </div>
+                </div>
+            </t>
+        </xpath>
+        <xpath expr="//div[@id='payment_method']" position="after">
+            <!-- Bypass Validation for users with 0 deposit payment terms -->
+            <div class="mt-3" style="display:none;" id="non_payment_method">
+                <a href="/shop/confirm_without_payment" class="float-right btn btn-primary">
+                    <span>Confirm Order <span class="fa fa-chevron-right"/></span>
+                </a>
+            </div>
+        </xpath>
+    </template>
+
+    <!-- Modal to handle success message -->
+    <template id="payment_term_success_modal">
+        <div class="modal fade" id="payment_term_success_modal" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title text-info">User Agreement</h4>
+                        <button type="button" class="close" data-dismiss="modal">
+                            <i class="fa fa-times"/>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>By clicking Confirm you are agreeing to the payment terms indicated below:</p>
+                        <p class="success-modal-note"></p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button"
+                                class="btn btn-default"
+                                onclick="accept_payment_terms()"
+                                data-dismiss="modal">Accept
+                        </button>
+                        <button type="button"
+                                class="btn btn-default"
+                                onclick="deny_payment_terms()">Deny
+                        </button>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </template>
+
+    <!-- Modal to handle error message -->
+    <template id="payment_term_error_modal">
+        <div class="modal fade" id="payment_term_error_modal" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title text-danger">Whoops!</h4>
+                        <button type="button" class="close" data-dismiss="modal">
+                            <i class="fa fa-times"/>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>Something Went Wrong. Please contact us to resolve this issue.</p>
+                        <sup class="text-danger">Error Code: DEF-PTM</sup>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </template>
+
+    <!-- Add empty div to calculate amount due today in payment_terms.js -->
+    <template id="amount_due_today" inherit_id="website_sale.total">
+        <xpath expr="//tr[@id='order_total']" position="after">
+            <tr id="order_due_today" t-att-style="'' if website_sale_order.amount_total_deposit else 'display: none;'">
+                <td class="text-right text-info">
+                    <strong>Due Now:</strong>
+                </td>
+                <td class="text-xl-right">
+                    <strong t-field="website_sale_order.amount_total_deposit"
+                            t-options='{"widget": "monetary", "display_currency": website_sale_order.pricelist_id.currency_id}'/>
+                </td>
+            </tr>
+        </xpath>
+    </template>
+
+    <template id="confirmation" inherit_id="website_sale.confirmation">
+        <xpath expr="//strong[@t-field='order.amount_total']" position="replace">
+            <strong t-esc="payment_tx_id.amount" t-options="{'widget': 'monetary', 'display_currency': order.pricelist_id.currency_id}" />
+        </xpath>
+    </template>
+
+    <template id="payment_confirmation_status" inherit_id="website_sale.payment_confirmation_status">
+        <xpath expr="//div[hasclass('oe_website_sale_tx_status')]/div[1]" position="attributes">
+            <attribute name="t-if">payment_tx_id</attribute>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/website_sale_payment_terms/views/website_views.xml b/website_sale_payment_terms/views/website_views.xml
new file mode 100644
index 00000000..b65b4e49
--- /dev/null
+++ b/website_sale_payment_terms/views/website_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_website_form" model="ir.ui.view">
+        <field name="name">view.website.form.inherit.payment.terms</field>
+        <field name="model">website</field>
+        <field name="inherit_id" ref="website.view_website_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='other']" position="inside">
+                <field name="currency_id" invisible="1"/>
+                <field name="payment_deposit_threshold"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From 99f8871ba41290e15535e967a71cb984c5bf4098 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Mon, 27 Sep 2021 11:11:19 -0500
Subject: [PATCH 02/10] [FIX] website_sale_payment_terms: give public user read
 access to payment terms

---
 website_sale_payment_terms/__manifest__.py              | 1 +
 website_sale_payment_terms/security/ir.model.access.csv | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 website_sale_payment_terms/security/ir.model.access.csv

diff --git a/website_sale_payment_terms/__manifest__.py b/website_sale_payment_terms/__manifest__.py
index 6fdfc70f..4a5d1616 100644
--- a/website_sale_payment_terms/__manifest__.py
+++ b/website_sale_payment_terms/__manifest__.py
@@ -17,6 +17,7 @@ Allow customers to choose payment terms if order total meets a configured thresh
     ],
     'auto_install': False,
     'data': [
+        'security/ir.model.access.csv',
         'views/account_views.xml',
         'views/res_config_views.xml',
         'views/web_assets.xml',
diff --git a/website_sale_payment_terms/security/ir.model.access.csv b/website_sale_payment_terms/security/ir.model.access.csv
new file mode 100644
index 00000000..6e51b316
--- /dev/null
+++ b/website_sale_payment_terms/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_payment_term_public,account.payment.term.public,account.model_account_payment_term,,1,0,0,0

From 14c61df176f3148207e23f1408c6d20d554cca9b Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Mon, 27 Sep 2021 21:21:29 -0500
Subject: [PATCH 03/10] [IMP] website_sale_payment_terms: refactor js into
 widget to facilitate inheritance

---
 .../static/src/js/payment_terms.js            | 221 +++++++++++-------
 .../views/website_templates.xml               |   4 +-
 2 files changed, 140 insertions(+), 85 deletions(-)

diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
index 6eaeaa46..dfcfccb4 100644
--- a/website_sale_payment_terms/static/src/js/payment_terms.js
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -2,106 +2,161 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
     "use strict";
 
     require('web.dom_ready');
-    var ajax = require('web.ajax');
     var concurrency = require('web.concurrency');
+    var core = require('web.core');
     var dp = new concurrency.DropPrevious();
     var publicWidget = require('web.public.widget');
     require('website_sale_delivery.checkout');
 
 
-    console.log('Payment Terms V10.1');
+    console.log('Payment Terms V10.2');
 
-    var available_term = $('input[name="payment_term_id"]').length;
-    if (available_term > 0) {
-        console.log('Payment term detected');
-        // Detect pay button and disable on page load - This isn't ideal but there is something I cant find that is preventing disabling this
-        setTimeout(function(){ $('#o_payment_form_pay').prop('disabled', true); }, 500);
-    } else {
-        console.log('no payment term detected');
-    }
+    publicWidget.registry.websiteSalePaymentTerms = publicWidget.Widget.extend({
+        selector: '.oe_website_sale',
+        events: {
+            "click #payment_terms input[name='payment_term_id']": '_onPaymentTermClick',
+            "click #btn_accept_payment_terms": '_acceptPaymentTerms',
+            "click #btn_deny_payment_terms": '_denyPaymentTerms',
+        },
 
-    // Calculate amount Due Now
-    function calculate_deposit(t, d, f) {
-        var amount = t * d / 100 + f;
-        if (amount > 0) {
-            amount = amount.toFixed(2);
-            amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-            return amount;
-        } else {
-            amount = 0.00;
-            return amount;
-        }
-    }
+        /**
+         * @override
+         */
+        start: function () {
+            core.bus.on('payment_terms_update_amount', this, this.updateAmountDue);
+            return this._super.apply(this, arguments).then(function () {
+                var available_term = $('input[name="payment_term_id"]').length;
+                var $payButton = $('#o_payment_form_pay');
+                if (available_term > 0) {
+                    console.log('Payment term detected');
+                    $payButton.prop('disabled', true);
+                    var disabledReasons = $payButton.data('disabled_reasons') || {};
+                    disabledReasons.payment_terms_selection = true;
+                    $payButton.data('disabled_reasons', disabledReasons);
+                } else {
+                    console.log('no payment term detected');
+                }
+            });
+        },
 
-    // Payment input clicks update sale.order payment_term_id
-    var _onPaymentTermClick = function (ev) {
-        $('#o_payment_form_pay').prop('disabled', true);
-        var payment_term_id = $(ev.currentTarget).val();
-        var values = {'payment_term_id': payment_term_id};
-        dp.add(ajax.jsonRpc('/shop/update_payment_term', 'call', values).then(_onPaymentTermUpdateAnswer));
-    };
-    var $payment_terms = $("#payment_terms input[name='payment_term_id']");
-    $payment_terms.click(_onPaymentTermClick);
+        //--------------------------------------------------------------------------
+        // Public
+        //--------------------------------------------------------------------------
 
+        /*
+         * Calculate amount Due Now
+         *
+         * @public
+         * @param: {number} t Total
+         * @param: {number} d Deposit percentage
+         * @param: {number} f Deposit flat amount
+         */
+        calculateDeposit: function (t, d, f) {
+            var amount = t * d / 100 + f;
+            if (amount > 0) {
+                amount = amount.toFixed(2);
+                amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+                return amount;
+            } else {
+                amount = 0.00;
+                return amount;
+            }
+        },
+
+        /*
+         * All input clicks update due amount
+         *
+         * @public
+         */
+        updateAmountDue: function () {
+            var amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
+            amount_total = parseFloat(amount_total);
+            var $checked = $('input[name="payment_term_id"]:checked');
+            var $deposit_percentage = $checked.attr('data-deposit-percentage');
+            var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
+            var $due_amount = this.calculateDeposit(amount_total, $deposit_percentage, $deposit_flat);
+            $('#order_due_today span.oe_currency_value').html($due_amount);
+        },
+
+        //--------------------------------------------------------------------------
+        // Private
+        //--------------------------------------------------------------------------
+
+        /**
+         * @private
+         * @param {object} ev
+         */
+        _onPaymentTermClick: function (ev) {
+            $('#o_payment_form_pay').prop('disabled', true);
+            var payment_term_id = $(ev.currentTarget).val();
+            var values = {'payment_term_id': payment_term_id};
+            dp.add(this._rpc({
+                'route': '/shop/update_payment_term',
+                'params': values,
+            }).then(this._onPaymentTermUpdateAnswer.bind(this)));
+        },
+
+        /**
+         * Show amount due if operation is a success
+         *
+         * @private
+         * @param {Object} result
+         */
+        _onPaymentTermUpdateAnswer: function (result) {
+            if (!result.error) {
+
+                // Get Payment Term note/description for modal
+                var note = result.note;
+                if (!result.note) {
+                    note = result.payment_term_name;
+                }
+
+                // Change forms based on order payment requirement
+                this.updateAmountDue();
+                if(!result.require_payment) {
+                    $('#payment_method').hide();
+                    $('#non_payment_method').show();
+                    $('#order_due_today').hide();
+                } else {
+                    $('#payment_method').show();
+                    $('#non_payment_method').hide();
+                    $('#order_due_today').show();
+                }
+
+                // Open success modal with message
+                $('#payment_term_success_modal .success-modal-note').text(note);
+                $('#payment_term_success_modal').modal();
+            } else {
+                // Open error modal
+                console.error(result);
+                $('#payment_term_error_modal').modal();
+            }
+        },
+
+        /*
+         * @private
+         */
+        _acceptPaymentTerms: function () {
+            $('#o_payment_form_pay').prop('disabled', false);
+        },
+
+        /*
+         * @private
+         */
+        _denyPaymentTerms: function () {
+            $('#o_payment_form_pay').prop('disabled', true);
+            window.location = '/shop/reject_term_agreement';
+        },
+    });
 
-    // All input clicks update due amount
-    function updateAmountDue() {
-        var $amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
-        $amount_total = parseFloat($amount_total);
-        var $checked = $('input[name="payment_term_id"]:checked');
-        var $deposit_percentage = $checked.attr('data-deposit-percentage');
-        var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
-        var $due_amount = calculate_deposit($amount_total, $deposit_percentage, $deposit_flat);
-        $('#order_due_today span.oe_currency_value').html($due_amount);
-    }
 
     // update amount due after delivery options change
     publicWidget.registry.websiteSaleDelivery.include({
         _handleCarrierUpdateResult: function (result) {
             this._super.apply(this, arguments);
-            updateAmountDue();
+            core.bus.trigger('payment_terms_update_amount');
         },
     });
 
-    // Show amount due if operation is a success
-    var _onPaymentTermUpdateAnswer = function (result) {
-        if (!result.error) {
-
-            // Get Payment Term note/description for modal
-            var note = result.note;
-            if (!result.note) {
-                note = result.payment_term_name;
-            }
-
-            // Change forms based on order payment requirement
-            updateAmountDue();
-            if(!result.require_payment) {
-                $('#payment_method').hide();
-                $('#non_payment_method').show();
-                $('#order_due_today').hide();
-            } else {
-                $('#payment_method').show();
-                $('#non_payment_method').hide();
-                $('#order_due_today').show();
-            }
-
-            // Open success modal with message
-            $('#payment_term_success_modal .success-modal-note').text(note);
-            $('#payment_term_success_modal').modal();
-        } else {
-            // Open error modal
-            console.error(result);
-            $('#payment_term_error_modal').modal();
-        }
-    };
-
+    return publicWidget.registry.websiteSalePaymentTerms;
 });
-
-function deny_payment_terms() {
-    $('#o_payment_form_pay').prop('disabled', true);
-    window.location = '/shop/reject_term_agreement';
-}
-
-function accept_payment_terms() {
-    $('#o_payment_form_pay').prop('disabled', false);
-}
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
index 15359791..01d0ab3d 100644
--- a/website_sale_payment_terms/views/website_templates.xml
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -77,12 +77,12 @@
                     <div class="modal-footer">
                         <button type="button"
                                 class="btn btn-default"
-                                onclick="accept_payment_terms()"
+                                id="btn_accept_payment_terms"
                                 data-dismiss="modal">Accept
                         </button>
                         <button type="button"
                                 class="btn btn-default"
-                                onclick="deny_payment_terms()">Deny
+                                id="btn_deny_payment_terms">Deny
                         </button>
                     </div>
                 </div>

From 4320de51e975916c450435aca70a21b62d43dec2 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Tue, 28 Sep 2021 14:36:02 -0500
Subject: [PATCH 04/10] [IMP] website_sale_payment_terms: leave payment button
 disabled if other modules set disabled reasons

---
 website_sale_payment_terms/static/src/js/payment_terms.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
index dfcfccb4..078df856 100644
--- a/website_sale_payment_terms/static/src/js/payment_terms.js
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -137,14 +137,17 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          * @private
          */
         _acceptPaymentTerms: function () {
-            $('#o_payment_form_pay').prop('disabled', false);
+            var $payButton = $('#o_payment_form_pay');
+            var disabledReasons = $payButton.data('disabled_reasons') || {};
+            disabledReasons.payment_terms_selection = false;
+            $payButton.data('disabled_reasons', disabledReasons);
+            $payButton.prop('disabled', _.contains($payButton.data('disabled_reasons'), true));
         },
 
         /*
          * @private
          */
         _denyPaymentTerms: function () {
-            $('#o_payment_form_pay').prop('disabled', true);
             window.location = '/shop/reject_term_agreement';
         },
     });

From 2372eeff83e9f575c1a82d4da1614a411f11f7f1 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Fri, 22 Oct 2021 20:14:00 -0500
Subject: [PATCH 05/10] [FIX] website_sale_payment_terms: calculate amounts
 based on term lines

add unit tests
refactor JS widget
H5924
---
 website_sale_payment_terms/__manifest__.py    |  2 +-
 .../controllers/main.py                       | 17 +++++-
 website_sale_payment_terms/models/sale.py     | 21 +++++--
 .../static/src/js/payment_terms.js            | 57 +++++++++----------
 website_sale_payment_terms/tests/__init__.py  |  1 +
 .../tests/test_amount_due.py                  | 54 ++++++++++++++++++
 .../views/website_templates.xml               | 16 ++++--
 7 files changed, 124 insertions(+), 44 deletions(-)
 create mode 100644 website_sale_payment_terms/tests/__init__.py
 create mode 100644 website_sale_payment_terms/tests/test_amount_due.py

diff --git a/website_sale_payment_terms/__manifest__.py b/website_sale_payment_terms/__manifest__.py
index 4a5d1616..c6eac7f5 100644
--- a/website_sale_payment_terms/__manifest__.py
+++ b/website_sale_payment_terms/__manifest__.py
@@ -12,7 +12,7 @@ Allow customers to choose payment terms if order total meets a configured thresh
         """,
     'depends': [
         'sale_payment_deposit',
-        'website_sale',
+        # 'website_sale',
         'website_sale_delivery',
     ],
     'auto_install': False,
diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
index c7bf2301..a6a8c843 100644
--- a/website_sale_payment_terms/controllers/main.py
+++ b/website_sale_payment_terms/controllers/main.py
@@ -1,8 +1,8 @@
 from odoo.http import request, route
-from odoo.addons.website_sale.controllers.main import WebsiteSale
+from odoo.addons.website_sale_delivery.controllers.main import WebsiteSaleDelivery
 
 
-class WebsiteSalePaymentTerms(WebsiteSale):
+class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
 
     # In case payment_term_id is set by query-string in a link (from website_sale_delivery)
     @route(['/shop/payment'], type='http', auth="public", website=True)
@@ -36,11 +36,14 @@ class WebsiteSalePaymentTerms(WebsiteSale):
     # Return values after order payment_term_id is updated
     def _update_website_payment_term_return(self, order, **post):
         if order:
+            Monetary = request.env['ir.qweb.field.monetary']
+            currency = order.currency_id
             return {
                 'payment_term_name': order.payment_term_id.name,
                 'payment_term_id': order.payment_term_id.id,
                 'note': order.payment_term_id.note,
-                'require_payment': order.require_payment,
+                'amount_due_today': order.amount_due_today,
+                'amount_due_today_html': Monetary.value_to_html(order.amount_due_today, {'display_currency': currency}),
             }
         return {}
 
@@ -74,3 +77,11 @@ class WebsiteSalePaymentTerms(WebsiteSale):
         if request.website and request.website.sale_reset:
             request.website.sale_reset()
         return request.redirect('/shop/confirmation')
+
+    def _update_website_sale_delivery_return(self, order, **post):
+        res = super(WebsiteSalePaymentTerms, self)._update_website_sale_delivery_return(order, **post)
+        Monetary = request.env['ir.qweb.field.monetary']
+        currency = order.currency_id
+        if order:
+            res['amount_due_today'] = Monetary.value_to_html(order.amount_due_today, {'display_currency': currency})
+        return res
diff --git a/website_sale_payment_terms/models/sale.py b/website_sale_payment_terms/models/sale.py
index b7a98e83..2544aa0d 100644
--- a/website_sale_payment_terms/models/sale.py
+++ b/website_sale_payment_terms/models/sale.py
@@ -1,9 +1,23 @@
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    amount_due_today = fields.Float('Due Now', compute='_compute_amount_due_today',
+                                    help='Amount due at checkout on the website.')
+
+    @api.depends('amount_total', 'payment_term_id')
+    def _compute_amount_due_today(self):
+        today_string = fields.Date.to_string(fields.Date.today())
+        for order in self:
+            amount = order.amount_total
+            if order.payment_term_id:
+                term_amount = [amt for date_string, amt in order.payment_term_id.compute(order.amount_total) if date_string == today_string]
+                term_amount = term_amount and term_amount[0] or 0.0
+                amount = term_amount if term_amount > order.amount_total_deposit else order.amount_total_deposit
+            order.amount_due_today = amount
+
     def _check_payment_term_quotation(self, payment_term_id):
         self.ensure_one()
         if payment_term_id and self.payment_term_id.id != payment_term_id:
@@ -12,7 +26,4 @@ class SaleOrder(models.Model):
             payment_term = self.env['account.payment.term'].sudo().browse(payment_term_id)
             if not payment_term.exists():
                 raise Exception('Could not find payment terms.')
-            self.write({
-                'payment_term_id': payment_term_id,
-                'require_payment': bool(payment_term.deposit_percentage) or bool(payment_term.deposit_flat),
-            })
+            self.payment_term_id = payment_term
diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
index 078df856..b2af366a 100644
--- a/website_sale_payment_terms/static/src/js/payment_terms.js
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -9,12 +9,10 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
     require('website_sale_delivery.checkout');
 
 
-    console.log('Payment Terms V10.2');
-
     publicWidget.registry.websiteSalePaymentTerms = publicWidget.Widget.extend({
-        selector: '.oe_website_sale',
+        selector: '.oe_payment_terms',
         events: {
-            "click #payment_terms input[name='payment_term_id']": '_onPaymentTermClick',
+            "click input[name='payment_term_id']": '_onPaymentTermClick',
             "click #btn_accept_payment_terms": '_acceptPaymentTerms',
             "click #btn_deny_payment_terms": '_denyPaymentTerms',
         },
@@ -23,7 +21,7 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          * @override
          */
         start: function () {
-            core.bus.on('payment_terms_update_amount', this, this.updateAmountDue);
+            console.log('Payment Terms V10.3');
             return this._super.apply(this, arguments).then(function () {
                 var available_term = $('input[name="payment_term_id"]').length;
                 var $payButton = $('#o_payment_form_pay');
@@ -51,32 +49,32 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          * @param: {number} d Deposit percentage
          * @param: {number} f Deposit flat amount
          */
-        calculateDeposit: function (t, d, f) {
-            var amount = t * d / 100 + f;
-            if (amount > 0) {
-                amount = amount.toFixed(2);
-                amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-                return amount;
-            } else {
-                amount = 0.00;
-                return amount;
-            }
-        },
+        // calculateDeposit: function (t, d, f) {
+        //     var amount = t * d / 100 + f;
+        //     if (amount > 0) {
+        //         amount = amount.toFixed(2);
+        //         amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+        //         return amount;
+        //     } else {
+        //         amount = 0.00;
+        //         return amount;
+        //     }
+        // },
 
         /*
          * All input clicks update due amount
          *
          * @public
          */
-        updateAmountDue: function () {
-            var amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
-            amount_total = parseFloat(amount_total);
-            var $checked = $('input[name="payment_term_id"]:checked');
-            var $deposit_percentage = $checked.attr('data-deposit-percentage');
-            var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
-            var $due_amount = this.calculateDeposit(amount_total, $deposit_percentage, $deposit_flat);
-            $('#order_due_today span.oe_currency_value').html($due_amount);
-        },
+        // updateAmountDue: function () {
+        //     var amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
+        //     amount_total = parseFloat(amount_total);
+        //     var $checked = $('input[name="payment_term_id"]:checked');
+        //     var $deposit_percentage = $checked.attr('data-deposit-percentage');
+        //     var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
+        //     var $due_amount = this.calculateDeposit(amount_total, $deposit_percentage, $deposit_flat);
+        //     $('#order_due_today span.oe_currency_value').html($due_amount);
+        // },
 
         //--------------------------------------------------------------------------
         // Private
@@ -104,7 +102,8 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          */
         _onPaymentTermUpdateAnswer: function (result) {
             if (!result.error) {
-
+                console.log("_onPaymentTermUpdateAnswer");
+                console.log(result);
                 // Get Payment Term note/description for modal
                 var note = result.note;
                 if (!result.note) {
@@ -112,8 +111,8 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
                 }
 
                 // Change forms based on order payment requirement
-                this.updateAmountDue();
-                if(!result.require_payment) {
+                $('#order_due_today .monetary_field').html(result.amount_due_today_html);
+                if(result.amount_due_today == 0.0) {
                     $('#payment_method').hide();
                     $('#non_payment_method').show();
                     $('#order_due_today').hide();
@@ -157,7 +156,7 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
     publicWidget.registry.websiteSaleDelivery.include({
         _handleCarrierUpdateResult: function (result) {
             this._super.apply(this, arguments);
-            core.bus.trigger('payment_terms_update_amount');
+            $('#order_due_today .monetary_field').html(result.amount_due_today);
         },
     });
 
diff --git a/website_sale_payment_terms/tests/__init__.py b/website_sale_payment_terms/tests/__init__.py
new file mode 100644
index 00000000..a9caa7cd
--- /dev/null
+++ b/website_sale_payment_terms/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_amount_due
diff --git a/website_sale_payment_terms/tests/test_amount_due.py b/website_sale_payment_terms/tests/test_amount_due.py
new file mode 100644
index 00000000..e772009e
--- /dev/null
+++ b/website_sale_payment_terms/tests/test_amount_due.py
@@ -0,0 +1,54 @@
+from odoo.tests import tagged, TransactionCase
+
+
+@tagged('post_install', '-at_install')
+class TestWebsiteSalePaymentTerms(TransactionCase):
+    def setUp(self):
+        super(TestWebsiteSalePaymentTerms, self).setUp()
+        self.so = self.env['sale.order'].create({
+            'partner_id': self.ref('base.res_partner_12'),
+            'order_line': [(0, 0, {
+                'product_id': self.env['product.product'].create({'name': 'Product A', 'list_price': 100}).id,
+                'product_uom_qty': 1,
+                'name': 'Product A',
+                'tax_id': False,
+            })]
+        })
+
+    def test_00_immediate(self):
+        # Double-check that we're asking for money if no payment terms are set
+        self.assertEqual(self.so.amount_due_today, self.so.amount_total)
+
+        immediate_terms = self.browse_ref('account.account_payment_term_immediate')
+        self.so._check_payment_term_quotation(immediate_terms.id)
+        self.assertEqual(self.so.amount_due_today, self.so.amount_total)
+
+    def test_10_thirty_percent(self):
+        thirty_percent_terms = self.browse_ref('account.account_payment_term_advance_60days')
+        self.so._check_payment_term_quotation(thirty_percent_terms.id)
+        self.assertEqual(self.so.amount_due_today, 30.0)
+
+    def test_20_fifteen_days(self):
+        fifteen_days_terms = self.browse_ref('account.account_payment_term_15days')
+        self.so._check_payment_term_quotation(fifteen_days_terms.id)
+        self.assertEqual(self.so.amount_due_today, 0.0)
+
+    def test_30_deposit_requested(self):
+        """
+        Ask for deposit if deposit amount is greater
+        """
+        thirty_percent_terms = self.browse_ref('account.account_payment_term_advance_60days')
+        thirty_percent_terms.deposit_percentage = 40
+        thirty_percent_terms.deposit_flat = 5
+        self.so._check_payment_term_quotation(thirty_percent_terms.id)
+        self.assertEqual(self.so.amount_due_today, 45.0)
+
+    def test_40_low_deposit(self):
+        """
+        Ask for terms amount if greater than requested deposit
+        """
+        thirty_percent_terms = self.browse_ref('account.account_payment_term_advance_60days')
+        thirty_percent_terms.deposit_percentage = 20
+        thirty_percent_terms.deposit_flat = 5
+        self.so._check_payment_term_quotation(thirty_percent_terms.id)
+        self.assertEqual(self.so.amount_due_today, 30.0)
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
index 01d0ab3d..5c3212d4 100644
--- a/website_sale_payment_terms/views/website_templates.xml
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -3,6 +3,8 @@
 
     <!-- Payment terms list items for /shop/payment -->
     <template id="payment_term_items">
+        <p t-esc="order.sudo().payment_term_id"/>
+        <p t-esc="website_sale_order.sudo().payment_term_id"/>
         <t t-set="partner_term" t-value="order.partner_id.property_payment_term_id"/>
         <!-- Show current partners payment terms -->
         <t t-if="partner_term and partner_term not in website_terms">
@@ -12,7 +14,8 @@
                        t-att-data-deposit-flat="partner_term.deposit_flat or '0'"
                        name="payment_term_id"
                        t-att-id="'payment_term_%i' % partner_term.id"
-                       type="radio"/>
+                       t-att-checked="term == order.payment_term_id"
+                   type="radio"/>
                 <label t-att-for="'payment_term_%i' % partner_term.id"
                        t-field="partner_term.name"
                        class="label-optional"/>
@@ -24,6 +27,7 @@
                    t-att-data-deposit-percentage="term.deposit_percentage or '0'"
                    t-att-data-deposit-flat="term.deposit_flat or '0'"
                    t-att-id="'payment_term_%i' % term.id"
+                   t-att-checked="term == order.payment_term_id"
                    type="radio"
                    name="payment_term_id"/>
             <label t-att-for="'payment_term_%i' % term.id"
@@ -37,9 +41,9 @@
         <xpath expr="//div[@id='payment_method']" position="before">
             <t t-set="website_terms" t-value="website.get_payment_terms()" />
             <t t-if="website_terms and website_sale_order.amount_total &gt; website.payment_deposit_threshold">
-                <t t-call="website_sale_payment_terms.payment_term_success_modal"/>
-                <t t-call="website_sale_payment_terms.payment_term_error_modal"/>
-                <div id="payment_terms">
+                <div class="oe_payment_terms">
+                    <t t-call="website_sale_payment_terms.payment_term_success_modal"/>
+                    <t t-call="website_sale_payment_terms.payment_term_error_modal"/>
                     <h3 class="mb24 mt24">Payment Terms</h3>
                     <div class="card border-0">
                         <ul class="list-group">
@@ -118,12 +122,12 @@
     <!-- Add empty div to calculate amount due today in payment_terms.js -->
     <template id="amount_due_today" inherit_id="website_sale.total">
         <xpath expr="//tr[@id='order_total']" position="after">
-            <tr id="order_due_today" t-att-style="'' if website_sale_order.amount_total_deposit else 'display: none;'">
+            <tr id="order_due_today" t-att-class="'' if website_sale_order.amount_due_today else 'd-none'">
                 <td class="text-right text-info">
                     <strong>Due Now:</strong>
                 </td>
                 <td class="text-xl-right">
-                    <strong t-field="website_sale_order.amount_total_deposit"
+                    <strong t-field="website_sale_order.amount_due_today" class="monetary_field"
                             t-options='{"widget": "monetary", "display_currency": website_sale_order.pricelist_id.currency_id}'/>
                 </td>
             </tr>

From 7d758539c00719d387cd67cacc27b1770bdf8121 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Sat, 23 Oct 2021 15:49:24 -0500
Subject: [PATCH 06/10] [IMP] website_sale_payment_terms: remember term choice
 and restore Return to Cart button

H5924
---
 .../controllers/main.py                       |  2 +-
 .../static/src/js/payment_terms.js            | 53 +++----------------
 .../views/website_templates.xml               | 28 ++++++----
 3 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
index a6a8c843..f699ab8b 100644
--- a/website_sale_payment_terms/controllers/main.py
+++ b/website_sale_payment_terms/controllers/main.py
@@ -9,7 +9,7 @@ class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
     def payment(self, **post):
         order = request.website.sale_get_order()
         payment_term_id = post.get('payment_term_id')
-        if order.amount_total <= request.website.payment_deposit_threshold:
+        if order.amount_total > request.website.payment_deposit_threshold:
             if payment_term_id:
                 payment_term_id = int(payment_term_id)
             if order:
diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
index b2af366a..d54876cf 100644
--- a/website_sale_payment_terms/static/src/js/payment_terms.js
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -24,58 +24,21 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
             console.log('Payment Terms V10.3');
             return this._super.apply(this, arguments).then(function () {
                 var available_term = $('input[name="payment_term_id"]').length;
-                var $payButton = $('#o_payment_form_pay');
                 if (available_term > 0) {
-                    console.log('Payment term detected');
+                    var $payButton = $('#o_payment_form_pay');
                     $payButton.prop('disabled', true);
                     var disabledReasons = $payButton.data('disabled_reasons') || {};
-                    disabledReasons.payment_terms_selection = true;
+                    if ($('input[name="payment_term_id"][checked]')) {
+                        disabledReasons.payment_terms_selection = false;
+                    } else {
+                        disabledReasons.payment_terms_selection = true;
+                    }
                     $payButton.data('disabled_reasons', disabledReasons);
-                } else {
-                    console.log('no payment term detected');
+                    $payButton.prop('disabled', _.contains($payButton.data('disabled_reasons'), true));
                 }
             });
         },
 
-        //--------------------------------------------------------------------------
-        // Public
-        //--------------------------------------------------------------------------
-
-        /*
-         * Calculate amount Due Now
-         *
-         * @public
-         * @param: {number} t Total
-         * @param: {number} d Deposit percentage
-         * @param: {number} f Deposit flat amount
-         */
-        // calculateDeposit: function (t, d, f) {
-        //     var amount = t * d / 100 + f;
-        //     if (amount > 0) {
-        //         amount = amount.toFixed(2);
-        //         amount = amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-        //         return amount;
-        //     } else {
-        //         amount = 0.00;
-        //         return amount;
-        //     }
-        // },
-
-        /*
-         * All input clicks update due amount
-         *
-         * @public
-         */
-        // updateAmountDue: function () {
-        //     var amount_total = $('#order_total span.oe_currency_value').html().replace(',', '');
-        //     amount_total = parseFloat(amount_total);
-        //     var $checked = $('input[name="payment_term_id"]:checked');
-        //     var $deposit_percentage = $checked.attr('data-deposit-percentage');
-        //     var $deposit_flat = parseFloat($checked.attr('data-deposit-flat'));
-        //     var $due_amount = this.calculateDeposit(amount_total, $deposit_percentage, $deposit_flat);
-        //     $('#order_due_today span.oe_currency_value').html($due_amount);
-        // },
-
         //--------------------------------------------------------------------------
         // Private
         //--------------------------------------------------------------------------
@@ -115,11 +78,9 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
                 if(result.amount_due_today == 0.0) {
                     $('#payment_method').hide();
                     $('#non_payment_method').show();
-                    $('#order_due_today').hide();
                 } else {
                     $('#payment_method').show();
                     $('#non_payment_method').hide();
-                    $('#order_due_today').show();
                 }
 
                 // Open success modal with message
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
index 5c3212d4..93de8c70 100644
--- a/website_sale_payment_terms/views/website_templates.xml
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -3,9 +3,8 @@
 
     <!-- Payment terms list items for /shop/payment -->
     <template id="payment_term_items">
-        <p t-esc="order.sudo().payment_term_id"/>
-        <p t-esc="website_sale_order.sudo().payment_term_id"/>
         <t t-set="partner_term" t-value="order.partner_id.property_payment_term_id"/>
+        <t t-set="selected_term" t-value="order.payment_term_id or partner_term"/>
         <!-- Show current partners payment terms -->
         <t t-if="partner_term and partner_term not in website_terms">
             <li class="list-group-item">
@@ -14,7 +13,7 @@
                        t-att-data-deposit-flat="partner_term.deposit_flat or '0'"
                        name="payment_term_id"
                        t-att-id="'payment_term_%i' % partner_term.id"
-                       t-att-checked="term == order.payment_term_id"
+                       t-att-checked="term == selected_term"
                    type="radio"/>
                 <label t-att-for="'payment_term_%i' % partner_term.id"
                        t-field="partner_term.name"
@@ -27,7 +26,7 @@
                    t-att-data-deposit-percentage="term.deposit_percentage or '0'"
                    t-att-data-deposit-flat="term.deposit_flat or '0'"
                    t-att-id="'payment_term_%i' % term.id"
-                   t-att-checked="term == order.payment_term_id"
+                   t-att-checked="term == selected_term"
                    type="radio"
                    name="payment_term_id"/>
             <label t-att-for="'payment_term_%i' % term.id"
@@ -53,12 +52,23 @@
                 </div>
             </t>
         </xpath>
+        <xpath expr="//div[@id='payment_method']" position="attributes">
+            <attribute name="t-att-style">'display: block;' if website_sale_order.amount_due_today else 'display: none;'</attribute>
+        </xpath>
         <xpath expr="//div[@id='payment_method']" position="after">
             <!-- Bypass Validation for users with 0 deposit payment terms -->
-            <div class="mt-3" style="display:none;" id="non_payment_method">
-                <a href="/shop/confirm_without_payment" class="float-right btn btn-primary">
-                    <span>Confirm Order <span class="fa fa-chevron-right"/></span>
-                </a>
+            <div class="mt-3" t-att-style="'display: none;' if website_sale_order.amount_due_today else 'display: block;'" id="non_payment_method">
+                <div class="float-left mt-2">
+                    <a role="button" href="/shop/cart" class="btn btn-secondary">
+                        <i class="fa fa-chevron-left"/>
+                        Return to Cart
+                    </a>
+                </div>
+                <div class="float-right mt-2" >
+                    <a href="/shop/confirm_without_payment" class="float-right btn btn-primary">
+                        <span>Confirm Order <span class="fa fa-chevron-right"/></span>
+                    </a>
+                </div>
             </div>
         </xpath>
     </template>
@@ -122,7 +132,7 @@
     <!-- Add empty div to calculate amount due today in payment_terms.js -->
     <template id="amount_due_today" inherit_id="website_sale.total">
         <xpath expr="//tr[@id='order_total']" position="after">
-            <tr id="order_due_today" t-att-class="'' if website_sale_order.amount_due_today else 'd-none'">
+            <tr id="order_due_today">
                 <td class="text-right text-info">
                     <strong>Due Now:</strong>
                 </td>

From b79f9487b9b9aa899eff3ad079985fd33baa158c Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Mon, 25 Oct 2021 13:41:51 -0500
Subject: [PATCH 07/10] [FIX] website_sale_payment_terms: fix errors in the
 payment process

* clear order terms if user rejects agreement
* set payment transaction amount to amount_due_today
* fix bad view inheritance spec
* fix default selected term when partner_term is not in website_terms
* do not render payment bypass form if amount_total is 0

H5924
---
 .../controllers/main.py                       |  4 +-
 website_sale_payment_terms/models/__init__.py |  1 +
 website_sale_payment_terms/models/payment.py  | 27 +++++-
 .../models/sale_patch.py                      | 86 +++++++++++++++++++
 .../views/account_views.xml                   |  8 +-
 .../views/website_templates.xml               |  4 +-
 6 files changed, 119 insertions(+), 11 deletions(-)
 create mode 100644 website_sale_payment_terms/models/sale_patch.py

diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
index f699ab8b..94625114 100644
--- a/website_sale_payment_terms/controllers/main.py
+++ b/website_sale_payment_terms/controllers/main.py
@@ -51,9 +51,7 @@ class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
     def reject_term_agreement(self, **kw):
         order = request.website.sale_get_order()
         if order:
-            partner = request.env.user.partner_id
-            order.write({'payment_term_id': request.website.sale_get_payment_term(partner),
-                         'require_payment': True})
+            order.payment_term_id = False
         return request.redirect('/shop/cart')
 
     # Confirm order without taking payment
diff --git a/website_sale_payment_terms/models/__init__.py b/website_sale_payment_terms/models/__init__.py
index dc24d95a..b17172fe 100644
--- a/website_sale_payment_terms/models/__init__.py
+++ b/website_sale_payment_terms/models/__init__.py
@@ -2,4 +2,5 @@ from . import account
 from . import payment
 from . import res_config
 from . import sale
+from . import sale_patch
 from . import website
diff --git a/website_sale_payment_terms/models/payment.py b/website_sale_payment_terms/models/payment.py
index 748c891e..5bebe138 100644
--- a/website_sale_payment_terms/models/payment.py
+++ b/website_sale_payment_terms/models/payment.py
@@ -1,4 +1,6 @@
 from odoo import models, _
+import logging
+_logger = logging.getLogger(__name__)
 
 
 class PaymentTransaction(models.Model):
@@ -15,7 +17,30 @@ class PaymentTransaction(models.Model):
         self._log_payment_transaction_sent()
         return self.acquirer_id.with_context(submit_class='btn btn-primary', submit_txt=submit_txt or _('Pay Now')).sudo().render(
             self.reference,
-            order.amount_total_deposit or order.amount_total,
+            order.amount_due_today,
             order.pricelist_id.currency_id.id,
             values=values,
         )
+
+    # Override to confirm payments totaling the amount_due_today
+    def _check_amount_and_confirm_order(self):
+        self.ensure_one()
+        for order in self.sale_order_ids.filtered(lambda so: so.state in ('draft', 'sent')):
+            amount = order.amount_due_today
+            if order.currency_id.compare_amounts(self.amount, amount) == 0:
+                order.with_context(send_email=True).action_confirm()
+            else:
+                _logger.warning(
+                    '<%s> transaction AMOUNT MISMATCH for order %s (ID %s): expected %r, got %r',
+                    self.acquirer_id.provider, order.name, order.id,
+                    amount, self.amount,
+                )
+                order.message_post(
+                    subject=_("Amount Mismatch (%s)") % self.acquirer_id.provider,
+                    body=_(
+                        "The order was not confirmed despite response from the acquirer (%s): order total is %r but acquirer replied with %r.") % (
+                             self.acquirer_id.provider,
+                             amount,
+                             self.amount,
+                         )
+                )
diff --git a/website_sale_payment_terms/models/sale_patch.py b/website_sale_payment_terms/models/sale_patch.py
new file mode 100644
index 00000000..07d85994
--- /dev/null
+++ b/website_sale_payment_terms/models/sale_patch.py
@@ -0,0 +1,86 @@
+from odoo.exceptions import ValidationError
+from odoo.addons.sale.models.sale import SaleOrder
+
+
+def _create_payment_transaction(self, vals):
+    # Code copied from sale_payment_deposit to use order.amount_due_today
+    #
+    # This is a copy job from odoo.addons.sale.models.sale due to the closed nature of the vals.update(dict) call
+    # Ultimately, only the 'vals.update' with the new amount is really used.
+    '''Similar to self.env['payment.transaction'].create(vals) but the values are filled with the
+    current sales orders fields (e.g. the partner or the currency).
+    :param vals: The values to create a new payment.transaction.
+    :return: The newly created payment.transaction record.
+    '''
+    # Ensure the currencies are the same.
+
+    # extract variable for use later.
+    sale = self[0]
+
+    currency = sale.pricelist_id.currency_id
+    if any([so.pricelist_id.currency_id != currency for so in self]):
+        raise ValidationError(_('A transaction can\'t be linked to sales orders having different currencies.'))
+
+    # Ensure the partner are the same.
+    partner = sale.partner_id
+    if any([so.partner_id != partner for so in self]):
+        raise ValidationError(_('A transaction can\'t be linked to sales orders having different partners.'))
+
+    # Try to retrieve the acquirer. However, fallback to the token's acquirer.
+    acquirer_id = vals.get('acquirer_id')
+    acquirer = False
+    payment_token_id = vals.get('payment_token_id')
+
+    if payment_token_id:
+        payment_token = self.env['payment.token'].sudo().browse(payment_token_id)
+
+        # Check payment_token/acquirer matching or take the acquirer from token
+        if acquirer_id:
+            acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+            if payment_token and payment_token.acquirer_id != acquirer:
+                raise ValidationError(_('Invalid token found! Token acquirer %s != %s') % (
+                payment_token.acquirer_id.name, acquirer.name))
+            if payment_token and payment_token.partner_id != partner:
+                raise ValidationError(_('Invalid token found! Token partner %s != %s') % (
+                payment_token.partner.name, partner.name))
+        else:
+            acquirer = payment_token.acquirer_id
+
+    # Check an acquirer is there.
+    if not acquirer_id and not acquirer:
+        raise ValidationError(_('A payment acquirer is required to create a transaction.'))
+
+    if not acquirer:
+        acquirer = self.env['payment.acquirer'].browse(acquirer_id)
+
+    # Check a journal is set on acquirer.
+    if not acquirer.journal_id:
+        raise ValidationError(_('A journal must be specified of the acquirer %s.' % acquirer.name))
+
+    if not acquirer_id and acquirer:
+        vals['acquirer_id'] = acquirer.id
+
+    # Override for Deposit
+    amount = sum(self.mapped('amount_total'))
+    # This is a patch, all databases will run this code even if this field doesn't exist.
+    if hasattr(sale, 'amount_due_today'):
+        amount = sum(self.mapped('amount_due_today'))
+
+    vals.update({
+        'amount': amount,
+        'currency_id': currency.id,
+        'partner_id': partner.id,
+        'sale_order_ids': [(6, 0, self.ids)],
+    })
+
+    transaction = self.env['payment.transaction'].create(vals)
+
+    # Process directly if payment_token
+    if transaction.payment_token_id:
+        transaction.s2s_do_transaction()
+
+    return transaction
+
+
+# Patch core implementation.
+SaleOrder._create_payment_transaction = _create_payment_transaction
diff --git a/website_sale_payment_terms/views/account_views.xml b/website_sale_payment_terms/views/account_views.xml
index f2828904..b480a686 100644
--- a/website_sale_payment_terms/views/account_views.xml
+++ b/website_sale_payment_terms/views/account_views.xml
@@ -4,12 +4,10 @@
     <record id="view_payment_term_form" model="ir.ui.view">
         <field name="name">view.payment.term.form.inherit.website</field>
         <field name="model">account.payment.term</field>
-        <field name="inherit_id" ref="account.view_payment_term_form"/>
+        <field name="inherit_id" ref="sale_payment_deposit.view_payment_term_form_inherit"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='note']" position="before">
-                <group>
-                    <field name="allow_in_website_sale"/>
-                </group>
+            <xpath expr="//field[@name='deposit_flat']" position="after">
+                <field name="allow_in_website_sale"/>
             </xpath>
         </field>
     </record>
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
index 93de8c70..b5b782b6 100644
--- a/website_sale_payment_terms/views/website_templates.xml
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -13,7 +13,7 @@
                        t-att-data-deposit-flat="partner_term.deposit_flat or '0'"
                        name="payment_term_id"
                        t-att-id="'payment_term_%i' % partner_term.id"
-                       t-att-checked="term == selected_term"
+                       t-att-checked="partner_term == selected_term"
                    type="radio"/>
                 <label t-att-for="'payment_term_%i' % partner_term.id"
                        t-field="partner_term.name"
@@ -57,7 +57,7 @@
         </xpath>
         <xpath expr="//div[@id='payment_method']" position="after">
             <!-- Bypass Validation for users with 0 deposit payment terms -->
-            <div class="mt-3" t-att-style="'display: none;' if website_sale_order.amount_due_today else 'display: block;'" id="non_payment_method">
+            <div class="mt-3" t-if="website_sale_order.amount_total" t-att-style="'display: none;' if website_sale_order.amount_due_today else 'display: block;'" id="non_payment_method">
                 <div class="float-left mt-2">
                     <a role="button" href="/shop/cart" class="btn btn-secondary">
                         <i class="fa fa-chevron-left"/>

From b94b27e33f45732a4dfc999b8025da739be84d25 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Tue, 26 Oct 2021 11:09:38 -0500
Subject: [PATCH 08/10] [FIX] website_sale_payment_terms: use amount_due_today
 to validate confirm without payment

H5924
---
 website_sale_payment_terms/controllers/main.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
index 94625114..40857f03 100644
--- a/website_sale_payment_terms/controllers/main.py
+++ b/website_sale_payment_terms/controllers/main.py
@@ -60,10 +60,7 @@ class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
         order = request.website.sale_get_order()
         if not order:
             return request.redirect('/shop')
-        if order.require_payment:
-            return request.redirect('/shop/payment')
-        if not order.payment_term_id or (
-                order.payment_term_id.deposit_percentage or order.payment_term_id.deposit_flat):
+        if order.amount_due_today:
             return request.redirect('/shop/payment')
 
         # made it this far, lets confirm

From 862914cd69b33282e30a406f1d3ef758c223d182 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Mon, 1 Nov 2021 15:35:03 -0500
Subject: [PATCH 09/10] [MIG] website_sale_payment_terms: migrated to 14.0

H5924
---
 website_sale_payment_terms/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website_sale_payment_terms/__manifest__.py b/website_sale_payment_terms/__manifest__.py
index c6eac7f5..b7b4a354 100644
--- a/website_sale_payment_terms/__manifest__.py
+++ b/website_sale_payment_terms/__manifest__.py
@@ -2,7 +2,7 @@
     'name': 'Website Payment Terms',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'category': 'Sales',
-    'version': '13.0.1.0.0',
+    'version': '14.0.1.0.0',
     'description':
         """
 Website Payment Terms

From e4b36315656319f03f7cd242e8cfa9bfbfc6e109 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Thu, 27 Jan 2022 17:57:17 -0600
Subject: [PATCH 10/10] [MIG] website_sale_payment_terms: migrate to 15.0

1. Use new web assets management
2. Set company currency in unit tests
3. Refactor payment transaction creation
---
 website_sale_payment_terms/__manifest__.py    |  8 +-
 .../controllers/main.py                       | 12 ++-
 website_sale_payment_terms/models/__init__.py |  1 -
 website_sale_payment_terms/models/payment.py  | 16 ----
 .../models/sale_patch.py                      | 86 -------------------
 .../static/src/js/payment_terms.js            | 27 ++++--
 .../tests/test_amount_due.py                  |  1 +
 .../views/web_assets.xml                      | 10 ---
 8 files changed, 35 insertions(+), 126 deletions(-)
 delete mode 100644 website_sale_payment_terms/models/sale_patch.py
 delete mode 100644 website_sale_payment_terms/views/web_assets.xml

diff --git a/website_sale_payment_terms/__manifest__.py b/website_sale_payment_terms/__manifest__.py
index b7b4a354..05beddc5 100644
--- a/website_sale_payment_terms/__manifest__.py
+++ b/website_sale_payment_terms/__manifest__.py
@@ -2,7 +2,7 @@
     'name': 'Website Payment Terms',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'category': 'Sales',
-    'version': '14.0.1.0.0',
+    'version': '15.0.1.0.0',
     'description':
         """
 Website Payment Terms
@@ -20,8 +20,12 @@ Allow customers to choose payment terms if order total meets a configured thresh
         'security/ir.model.access.csv',
         'views/account_views.xml',
         'views/res_config_views.xml',
-        'views/web_assets.xml',
         'views/website_templates.xml',
         'views/website_views.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            '/website_sale_payment_terms/static/src/js/payment_terms.js',
+        ],
+    },
 }
diff --git a/website_sale_payment_terms/controllers/main.py b/website_sale_payment_terms/controllers/main.py
index 40857f03..1c6a371a 100644
--- a/website_sale_payment_terms/controllers/main.py
+++ b/website_sale_payment_terms/controllers/main.py
@@ -4,9 +4,14 @@ from odoo.addons.website_sale_delivery.controllers.main import WebsiteSaleDelive
 
 class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
 
+    def _get_shop_payment_values(self, order, **kwargs):
+        values = super(WebsiteSalePaymentTerms, self)._get_shop_payment_values(order, **kwargs)
+        values['amount'] = order.amount_due_today
+        return values
+
     # In case payment_term_id is set by query-string in a link (from website_sale_delivery)
-    @route(['/shop/payment'], type='http', auth="public", website=True)
-    def payment(self, **post):
+    @route('/shop/payment', type='http', auth='public', website=True, sitemap=False)
+    def shop_payment(self, **post):
         order = request.website.sale_get_order()
         payment_term_id = post.get('payment_term_id')
         if order.amount_total > request.website.payment_deposit_threshold:
@@ -19,7 +24,7 @@ class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
         else:
             order.payment_term_id = False
 
-        return super(WebsiteSalePaymentTerms, self).payment(**post)
+        return super(WebsiteSalePaymentTerms, self).shop_payment(**post)
 
     # Main JS driven payment term updater.
     @route(['/shop/update_payment_term'], type='json', auth='public', methods=['POST'], website=True, csrf=False)
@@ -79,4 +84,5 @@ class WebsiteSalePaymentTerms(WebsiteSaleDelivery):
         currency = order.currency_id
         if order:
             res['amount_due_today'] = Monetary.value_to_html(order.amount_due_today, {'display_currency': currency})
+            res['amount_due_today_raw'] = order.amount_due_today
         return res
diff --git a/website_sale_payment_terms/models/__init__.py b/website_sale_payment_terms/models/__init__.py
index b17172fe..dc24d95a 100644
--- a/website_sale_payment_terms/models/__init__.py
+++ b/website_sale_payment_terms/models/__init__.py
@@ -2,5 +2,4 @@ from . import account
 from . import payment
 from . import res_config
 from . import sale
-from . import sale_patch
 from . import website
diff --git a/website_sale_payment_terms/models/payment.py b/website_sale_payment_terms/models/payment.py
index 5bebe138..f9d9e1ae 100644
--- a/website_sale_payment_terms/models/payment.py
+++ b/website_sale_payment_terms/models/payment.py
@@ -6,22 +6,6 @@ _logger = logging.getLogger(__name__)
 class PaymentTransaction(models.Model):
     _inherit = 'payment.transaction'
 
-    def render_sale_button(self, order, submit_txt=None, render_values=None):
-        values = {
-            'partner_id': order.partner_id.id,
-            'type': self.type,
-        }
-        if render_values:
-            values.update(render_values)
-        # Not very elegant to do that here but no choice regarding the design.
-        self._log_payment_transaction_sent()
-        return self.acquirer_id.with_context(submit_class='btn btn-primary', submit_txt=submit_txt or _('Pay Now')).sudo().render(
-            self.reference,
-            order.amount_due_today,
-            order.pricelist_id.currency_id.id,
-            values=values,
-        )
-
     # Override to confirm payments totaling the amount_due_today
     def _check_amount_and_confirm_order(self):
         self.ensure_one()
diff --git a/website_sale_payment_terms/models/sale_patch.py b/website_sale_payment_terms/models/sale_patch.py
deleted file mode 100644
index 07d85994..00000000
--- a/website_sale_payment_terms/models/sale_patch.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from odoo.exceptions import ValidationError
-from odoo.addons.sale.models.sale import SaleOrder
-
-
-def _create_payment_transaction(self, vals):
-    # Code copied from sale_payment_deposit to use order.amount_due_today
-    #
-    # This is a copy job from odoo.addons.sale.models.sale due to the closed nature of the vals.update(dict) call
-    # Ultimately, only the 'vals.update' with the new amount is really used.
-    '''Similar to self.env['payment.transaction'].create(vals) but the values are filled with the
-    current sales orders fields (e.g. the partner or the currency).
-    :param vals: The values to create a new payment.transaction.
-    :return: The newly created payment.transaction record.
-    '''
-    # Ensure the currencies are the same.
-
-    # extract variable for use later.
-    sale = self[0]
-
-    currency = sale.pricelist_id.currency_id
-    if any([so.pricelist_id.currency_id != currency for so in self]):
-        raise ValidationError(_('A transaction can\'t be linked to sales orders having different currencies.'))
-
-    # Ensure the partner are the same.
-    partner = sale.partner_id
-    if any([so.partner_id != partner for so in self]):
-        raise ValidationError(_('A transaction can\'t be linked to sales orders having different partners.'))
-
-    # Try to retrieve the acquirer. However, fallback to the token's acquirer.
-    acquirer_id = vals.get('acquirer_id')
-    acquirer = False
-    payment_token_id = vals.get('payment_token_id')
-
-    if payment_token_id:
-        payment_token = self.env['payment.token'].sudo().browse(payment_token_id)
-
-        # Check payment_token/acquirer matching or take the acquirer from token
-        if acquirer_id:
-            acquirer = self.env['payment.acquirer'].browse(acquirer_id)
-            if payment_token and payment_token.acquirer_id != acquirer:
-                raise ValidationError(_('Invalid token found! Token acquirer %s != %s') % (
-                payment_token.acquirer_id.name, acquirer.name))
-            if payment_token and payment_token.partner_id != partner:
-                raise ValidationError(_('Invalid token found! Token partner %s != %s') % (
-                payment_token.partner.name, partner.name))
-        else:
-            acquirer = payment_token.acquirer_id
-
-    # Check an acquirer is there.
-    if not acquirer_id and not acquirer:
-        raise ValidationError(_('A payment acquirer is required to create a transaction.'))
-
-    if not acquirer:
-        acquirer = self.env['payment.acquirer'].browse(acquirer_id)
-
-    # Check a journal is set on acquirer.
-    if not acquirer.journal_id:
-        raise ValidationError(_('A journal must be specified of the acquirer %s.' % acquirer.name))
-
-    if not acquirer_id and acquirer:
-        vals['acquirer_id'] = acquirer.id
-
-    # Override for Deposit
-    amount = sum(self.mapped('amount_total'))
-    # This is a patch, all databases will run this code even if this field doesn't exist.
-    if hasattr(sale, 'amount_due_today'):
-        amount = sum(self.mapped('amount_due_today'))
-
-    vals.update({
-        'amount': amount,
-        'currency_id': currency.id,
-        'partner_id': partner.id,
-        'sale_order_ids': [(6, 0, self.ids)],
-    })
-
-    transaction = self.env['payment.transaction'].create(vals)
-
-    # Process directly if payment_token
-    if transaction.payment_token_id:
-        transaction.s2s_do_transaction()
-
-    return transaction
-
-
-# Patch core implementation.
-SaleOrder._create_payment_transaction = _create_payment_transaction
diff --git a/website_sale_payment_terms/static/src/js/payment_terms.js b/website_sale_payment_terms/static/src/js/payment_terms.js
index d54876cf..47e5dfd8 100644
--- a/website_sale_payment_terms/static/src/js/payment_terms.js
+++ b/website_sale_payment_terms/static/src/js/payment_terms.js
@@ -21,7 +21,7 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          * @override
          */
         start: function () {
-            console.log('Payment Terms V10.3');
+            console.log('Payment Terms V10.4');
             return this._super.apply(this, arguments).then(function () {
                 var available_term = $('input[name="payment_term_id"]').length;
                 if (available_term > 0) {
@@ -57,6 +57,15 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
             }).then(this._onPaymentTermUpdateAnswer.bind(this)));
         },
 
+        /**
+         * Update the total cost according to the selected shipping method
+         * 
+         * @private
+         * @param {float} amount : The new total amount of to be paid
+         */
+        _updatePaymentAmount: function(amount){
+            core.bus.trigger('update_shipping_cost', amount);
+        },
         /**
          * Show amount due if operation is a success
          *
@@ -65,12 +74,10 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
          */
         _onPaymentTermUpdateAnswer: function (result) {
             if (!result.error) {
-                console.log("_onPaymentTermUpdateAnswer");
-                console.log(result);
                 // Get Payment Term note/description for modal
-                var note = result.note;
-                if (!result.note) {
-                    note = result.payment_term_name;
+                var note = $.parseHTML(result.note);
+                if (!$(note).text()) {
+                    note = $.parseHTML('<p>' + result.payment_term_name + '</p>');
                 }
 
                 // Change forms based on order payment requirement
@@ -79,12 +86,13 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
                     $('#payment_method').hide();
                     $('#non_payment_method').show();
                 } else {
+                    this._updatePaymentAmount(result.amount_due_today);
                     $('#payment_method').show();
                     $('#non_payment_method').hide();
                 }
 
                 // Open success modal with message
-                $('#payment_term_success_modal .success-modal-note').text(note);
+                $('#payment_term_success_modal .success-modal-note').html(note);
                 $('#payment_term_success_modal').modal();
             } else {
                 // Open error modal
@@ -117,7 +125,10 @@ odoo.define('website_sale_payment_terms.payment_terms', function (require) {
     publicWidget.registry.websiteSaleDelivery.include({
         _handleCarrierUpdateResult: function (result) {
             this._super.apply(this, arguments);
-            $('#order_due_today .monetary_field').html(result.amount_due_today);
+            if (result.amount_due_today_raw !== undefined) {
+                this._updateShippingCost(result.amount_due_today_raw);
+                $('#order_due_today .monetary_field').html(result.amount_due_today);
+            }
         },
     });
 
diff --git a/website_sale_payment_terms/tests/test_amount_due.py b/website_sale_payment_terms/tests/test_amount_due.py
index e772009e..3c1f7677 100644
--- a/website_sale_payment_terms/tests/test_amount_due.py
+++ b/website_sale_payment_terms/tests/test_amount_due.py
@@ -5,6 +5,7 @@ from odoo.tests import tagged, TransactionCase
 class TestWebsiteSalePaymentTerms(TransactionCase):
     def setUp(self):
         super(TestWebsiteSalePaymentTerms, self).setUp()
+        self.env.company.currency_id = self.browse_ref('base.USD')
         self.so = self.env['sale.order'].create({
             'partner_id': self.ref('base.res_partner_12'),
             'order_line': [(0, 0, {
diff --git a/website_sale_payment_terms/views/web_assets.xml b/website_sale_payment_terms/views/web_assets.xml
deleted file mode 100644
index 281bcb1c..00000000
--- a/website_sale_payment_terms/views/web_assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-
-    <template id="web_assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale_payment_terms/static/src/js/payment_terms.js"/>
-        </xpath>
-    </template>
-
-</odoo>