diff --git a/addons/website_sale_loyalty/__manifest__.py b/addons/website_sale_loyalty/__manifest__.py index 9680bbf092d..f1664682164 100644 --- a/addons/website_sale_loyalty/__manifest__.py +++ b/addons/website_sale_loyalty/__manifest__.py @@ -28,6 +28,7 @@ Coupon & promotion programs can be edited in the Catalog menu of the Website app 'web.assets_frontend': [ 'website_sale_loyalty/static/src/js/coupon_toaster_widget.js', 'website_sale_loyalty/static/src/js/website_sale_gift_card.js', + 'website_sale_loyalty/static/src/js/website_sale_loyalty_delivery.js', ], 'web.assets_tests': [ 'website_sale_loyalty/static/tests/**/*', diff --git a/addons/website_sale_loyalty/controllers/__init__.py b/addons/website_sale_loyalty/controllers/__init__.py index 5d4b25db9c0..f7ed5e10f6d 100644 --- a/addons/website_sale_loyalty/controllers/__init__.py +++ b/addons/website_sale_loyalty/controllers/__init__.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from . import delivery_main from . import main diff --git a/addons/website_sale_loyalty_delivery/controllers/main.py b/addons/website_sale_loyalty/controllers/delivery_main.py similarity index 100% rename from addons/website_sale_loyalty_delivery/controllers/main.py rename to addons/website_sale_loyalty/controllers/delivery_main.py diff --git a/addons/website_sale_loyalty_delivery/static/src/js/website_sale_loyalty_delivery.js b/addons/website_sale_loyalty/static/src/js/website_sale_loyalty_delivery.js similarity index 100% rename from addons/website_sale_loyalty_delivery/static/src/js/website_sale_loyalty_delivery.js rename to addons/website_sale_loyalty/static/src/js/website_sale_loyalty_delivery.js diff --git a/addons/website_sale_loyalty_delivery/static/tests/tours/website_sale_delivery_gift_card.js b/addons/website_sale_loyalty/static/tests/tours/website_sale_delivery_gift_card.js similarity index 100% rename from addons/website_sale_loyalty_delivery/static/tests/tours/website_sale_delivery_gift_card.js rename to addons/website_sale_loyalty/static/tests/tours/website_sale_delivery_gift_card.js diff --git a/addons/website_sale_loyalty/tests/__init__.py b/addons/website_sale_loyalty/tests/__init__.py index 35870353044..a22705b35c1 100644 --- a/addons/website_sale_loyalty/tests/__init__.py +++ b/addons/website_sale_loyalty/tests/__init__.py @@ -1,3 +1,6 @@ +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from . import test_apply_pending_coupon from . import test_sale_coupon_multiwebsite from . import test_shop_sale_coupon +from . import test_website_sale_loyalty_delivery diff --git a/addons/website_sale_loyalty_delivery/tests/test_website_sale_loyalty_delivery.py b/addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py similarity index 100% rename from addons/website_sale_loyalty_delivery/tests/test_website_sale_loyalty_delivery.py rename to addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py diff --git a/addons/website_sale_loyalty_delivery/__init__.py b/addons/website_sale_loyalty_delivery/__init__.py deleted file mode 100644 index dd15b5c32e5..00000000000 --- a/addons/website_sale_loyalty_delivery/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import controllers diff --git a/addons/website_sale_loyalty_delivery/__manifest__.py b/addons/website_sale_loyalty_delivery/__manifest__.py deleted file mode 100644 index 147c595a052..00000000000 --- a/addons/website_sale_loyalty_delivery/__manifest__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -{ - 'name': "Free Delivery with Coupon & Loyalty on eCommerce", - 'summary': """Allows to offer free shippings in loyalty program rewards on eCommerce""", - 'description': """Allows to offer free shippings in loyalty program rewards on eCommerce""", - 'category': 'Website/Website', - 'version': '1.0', - 'depends': ['website_sale', 'website_sale_loyalty', 'sale_loyalty_delivery'], - 'auto_install': True, - 'assets': { - 'web.assets_frontend': [ - 'website_sale_loyalty_delivery/static/src/**/*', - ], - 'web.assets_tests': [ - 'website_sale_loyalty_delivery/static/tests/**/*', - ], - }, - 'license': 'LGPL-3', -} - diff --git a/addons/website_sale_loyalty_delivery/controllers/__init__.py b/addons/website_sale_loyalty_delivery/controllers/__init__.py deleted file mode 100644 index 5d4b25db9c0..00000000000 --- a/addons/website_sale_loyalty_delivery/controllers/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import main diff --git a/addons/website_sale_loyalty_delivery/tests/__init__.py b/addons/website_sale_loyalty_delivery/tests/__init__.py deleted file mode 100644 index 7b3ea25c4b6..00000000000 --- a/addons/website_sale_loyalty_delivery/tests/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import test_website_sale_loyalty_delivery