initial commit 2

6 files changed, 120 insertions, 0 deletions

diff --git a/addons/website_sale_coupon_delivery/__init__.py b/addons/website_sale_coupon_delivery/__init__.py
new file mode 100644
index 00000000..dd15b5c3
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
diff --git a/addons/website_sale_coupon_delivery/__manifest__.py b/addons/website_sale_coupon_delivery/__manifest__.py
new file mode 100644
index 00000000..697deae5
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/__manifest__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': "Free Delivery with Coupon on eCommerce",
+    'summary': """Allows to offer free shippings in coupon reward on eCommerce""",
+    'description': """Allows to offer free shippings in coupon reward on eCommerce""",
+    'category': 'Website/Website',
+    'version': '1.0',
+    'depends': ['website_sale_delivery', 'sale_coupon_delivery'],
+    'data': [
+        'views/website_sale_coupon_delivery_templates.xml',
+    ],
+    'auto_install': True,
+    'license': 'LGPL-3',
+}
diff --git a/addons/website_sale_coupon_delivery/controllers/__init__.py b/addons/website_sale_coupon_delivery/controllers/__init__.py
new file mode 100644
index 00000000..5d4b25db
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import main
diff --git a/addons/website_sale_coupon_delivery/controllers/main.py b/addons/website_sale_coupon_delivery/controllers/main.py
new file mode 100644
index 00000000..a5a76412
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/controllers/main.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from odoo import http
+from odoo.addons.website_sale_delivery.controllers.main import WebsiteSaleDelivery
+from odoo.http import request
+
+
+class WebsiteSaleCouponDelivery(WebsiteSaleDelivery):
+
+    @http.route()
+    def update_eshop_carrier(self, **post):
+        Monetary = request.env['ir.qweb.field.monetary']
+        result = super(WebsiteSaleCouponDelivery, self).update_eshop_carrier(**post)
+        order = request.website.sale_get_order()
+        free_shipping_lines = None
+
+        if order:
+            order.recompute_coupon_lines()
+            order.validate_taxes_on_sales_order()
+            free_shipping_lines = order._get_free_shipping_lines()
+
+        if free_shipping_lines:
+            currency = order.currency_id
+            amount_free_shipping = sum(free_shipping_lines.mapped('price_subtotal'))
+            result.update({
+                'new_amount_delivery': Monetary.value_to_html(0.0, {'display_currency': currency}),
+                'new_amount_untaxed': Monetary.value_to_html(order.amount_untaxed, {'display_currency': currency}),
+                'new_amount_tax': Monetary.value_to_html(order.amount_tax, {'display_currency': currency}),
+                'new_amount_total': Monetary.value_to_html(order.amount_total, {'display_currency': currency}),
+                'new_amount_order_discounted': Monetary.value_to_html(order.reward_amount - amount_free_shipping, {'display_currency': currency}),
+            })
+        return result
+
+    @http.route()
+    def cart_carrier_rate_shipment(self, carrier_id, **kw):
+        Monetary = request.env['ir.qweb.field.monetary']
+        order = request.website.sale_get_order(force_create=True)
+        free_shipping_lines = order._get_free_shipping_lines()
+        # Avoid computing carrier price delivery is free (coupon). It means if
+        # the carrier has error (eg 'delivery only for Belgium') it will show
+        # Free until the user clicks on it.
+        if free_shipping_lines:
+            return {
+                'carrier_id': carrier_id,
+                'status': True,
+                'is_free_delivery': True,
+                'new_amount_delivery': Monetary.value_to_html(0.0, {'display_currency': order.currency_id}),
+                'error_message': None,
+            }
+        return super(WebsiteSaleCouponDelivery, self).cart_carrier_rate_shipment(carrier_id, **kw)
diff --git a/addons/website_sale_coupon_delivery/static/src/js/website_sale_coupon_delivery.js b/addons/website_sale_coupon_delivery/static/src/js/website_sale_coupon_delivery.js
new file mode 100644
index 00000000..4bffd181
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/static/src/js/website_sale_coupon_delivery.js
@@ -0,0 +1,38 @@
+odoo.define('website_sale_coupon_delivery.checkout', function (require) {
+'use strict';
+
+var core = require('web.core');
+var publicWidget = require('web.public.widget');
+require('website_sale_delivery.checkout');
+
+var _t = core._t;
+
+publicWidget.registry.websiteSaleDelivery.include({
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+     * @override
+     */
+    _handleCarrierUpdateResult: function (result) {
+        this._super.apply(this, arguments);
+        if (result.new_amount_order_discounted) {
+            // Update discount of the order
+            $('#order_discounted').html(result.new_amount_order_discounted);
+        }
+    },
+    /**
+     * @override
+     */
+    _handleCarrierUpdateResultBadge: function (result) {
+        this._super.apply(this, arguments);
+        if (result.new_amount_order_discounted) {
+            // We are in freeshipping, so every carrier is Free but we don't
+            // want to replace error message by 'Free'
+            $('#delivery_carrier .badge:not(.o_wsale_delivery_carrier_error)').text(_t('Free'));
+        }
+    },
+});
+});
diff --git a/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml b/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml
new file mode 100644
index 00000000..f42b869f
--- /dev/null
+++ b/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="assets_frontend" inherit_id="website.assets_frontend">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_sale_coupon_delivery/static/src/js/website_sale_coupon_delivery.js"></script>
+        </xpath>
+    </template>
+
+</odoo>