From 3cb14481336f7959ea1be91858f190ead6ec7537 Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Mon, 7 Mar 2022 12:11:01 +0100 Subject: [PATCH] [REM] website_sale_gift_card: remove website_sale_gift_card module Removes the website_sale_gift_card module as it is being merged inside of website_sale_loyalty. TaskId-2675382 --- addons/website_sale_gift_card/__init__.py | 5 -- addons/website_sale_gift_card/__manifest__.py | 25 ------- .../controllers/__init__.py | 4 -- .../controllers/gift_card_controller.py | 33 --------- .../data/product_demo.xml | 6 -- .../i18n/website_sale_gift_card.pot | 67 ------------------- .../website_sale_gift_card/models/__init__.py | 5 -- .../models/gift_card.py | 15 ----- .../models/sale_order.py | 33 --------- .../static/src/js/website_sale_gift_card.js | 30 --------- .../views/gift_card_menus.xml | 8 --- .../views/gift_card_views.xml | 25 ------- .../website_sale_gift_card/views/template.xml | 63 ----------------- 13 files changed, 319 deletions(-) delete mode 100644 addons/website_sale_gift_card/__init__.py delete mode 100644 addons/website_sale_gift_card/__manifest__.py delete mode 100644 addons/website_sale_gift_card/controllers/__init__.py delete mode 100644 addons/website_sale_gift_card/controllers/gift_card_controller.py delete mode 100644 addons/website_sale_gift_card/data/product_demo.xml delete mode 100644 addons/website_sale_gift_card/i18n/website_sale_gift_card.pot delete mode 100644 addons/website_sale_gift_card/models/__init__.py delete mode 100644 addons/website_sale_gift_card/models/gift_card.py delete mode 100644 addons/website_sale_gift_card/models/sale_order.py delete mode 100644 addons/website_sale_gift_card/static/src/js/website_sale_gift_card.js delete mode 100644 addons/website_sale_gift_card/views/gift_card_menus.xml delete mode 100644 addons/website_sale_gift_card/views/gift_card_views.xml delete mode 100644 addons/website_sale_gift_card/views/template.xml diff --git a/addons/website_sale_gift_card/__init__.py b/addons/website_sale_gift_card/__init__.py deleted file mode 100644 index 7d34c7c054a..00000000000 --- a/addons/website_sale_gift_card/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import controllers -from . import models diff --git a/addons/website_sale_gift_card/__manifest__.py b/addons/website_sale_gift_card/__manifest__.py deleted file mode 100644 index 13c2130da21..00000000000 --- a/addons/website_sale_gift_card/__manifest__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -{ - 'name': "Website Sale Gift Card", - 'summary': "Use gift card in eCommerce", - 'description': """Integrate gift card mechanism in your ecommerce.""", - 'category': 'Website/Website', - 'version': '1.0', - 'depends': ['website_sale', 'sale_gift_card'], - 'data': [ - 'views/template.xml', - 'views/gift_card_views.xml', - 'views/gift_card_menus.xml', - ], - 'demo': [ - 'data/product_demo.xml', - ], - 'assets': { - 'web.assets_frontend': [ - 'website_sale_gift_card/static/**/*', - ], - }, - 'license': 'LGPL-3', -} diff --git a/addons/website_sale_gift_card/controllers/__init__.py b/addons/website_sale_gift_card/controllers/__init__.py deleted file mode 100644 index d4bda54b506..00000000000 --- a/addons/website_sale_gift_card/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 gift_card_controller diff --git a/addons/website_sale_gift_card/controllers/gift_card_controller.py b/addons/website_sale_gift_card/controllers/gift_card_controller.py deleted file mode 100644 index ed0a5360681..00000000000 --- a/addons/website_sale_gift_card/controllers/gift_card_controller.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import http -from odoo.http import request -from odoo.addons.website_sale.controllers import main - - -class GiftCardController(main.WebsiteSale): - - @http.route('/shop/pay_with_gift_card', type='http', methods=['POST'], website=True, auth='public') - def add_gift_card(self, gift_card_code, **post): - gift_card = request.env["gift.card"].sudo().search([('code', '=', gift_card_code.strip())], limit=1) - order = request.env['website'].get_current_website().sale_get_order() - gift_card_status = order._pay_with_gift_card(gift_card) - return request.redirect('/shop/payment' + ('?gift_card_error=%s' % gift_card_status if gift_card_status else '')) - - @http.route() - def shop_payment(self, **post): - order = request.website.sale_get_order() - order._recompute_gift_card_lines() - return super().shop_payment(**post) - - @http.route(['/shop/cart'], type='http', auth="public", website=True) - def cart(self, **post): - order = request.website.sale_get_order() - order._recompute_gift_card_lines() - return super().cart(**post) - - def _get_shop_payment_values(self, order, **kwargs): - values = super()._get_shop_payment_values(order, **kwargs) - values['allow_pay_with_gift_card'] = True - return values diff --git a/addons/website_sale_gift_card/data/product_demo.xml b/addons/website_sale_gift_card/data/product_demo.xml deleted file mode 100644 index 79251b8431b..00000000000 --- a/addons/website_sale_gift_card/data/product_demo.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/addons/website_sale_gift_card/i18n/website_sale_gift_card.pot b/addons/website_sale_gift_card/i18n/website_sale_gift_card.pot deleted file mode 100644 index 65d49a2de5f..00000000000 --- a/addons/website_sale_gift_card/i18n/website_sale_gift_card.pot +++ /dev/null @@ -1,67 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * website_sale_gift_card -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server saas~14.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-12 07:50+0000\n" -"PO-Revision-Date: 2021-07-12 07:50+0000\n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: website_sale_gift_card -#: model:ir.model,name:website_sale_gift_card.model_gift_card -#: model_terms:ir.ui.view,arch_db:website_sale_gift_card.gift_card_view_search -msgid "Gift Card" -msgstr "" - -#. module: website_sale_gift_card -#: model:ir.ui.menu,name:website_sale_gift_card.website_product_gift_card_menu -msgid "Gift Cards" -msgstr "" - -#. module: website_sale_gift_card -#: model_terms:ir.ui.view,arch_db:website_sale_gift_card.pay_with_gift_card_form -msgid "Gift card code..." -msgstr "" - -#. module: website_sale_gift_card -#: model_terms:ir.ui.view,arch_db:website_sale_gift_card.pay_with_gift_card_form -msgid "Pay" -msgstr "" - -#. module: website_sale_gift_card -#: model_terms:ir.ui.view,arch_db:website_sale_gift_card.add_gift_card -msgid "Pay with a gift card" -msgstr "" - -#. module: website_sale_gift_card -#: model:ir.model.fields,help:website_sale_gift_card.field_gift_card__website_id -msgid "Restrict publishing to this website." -msgstr "" - -#. module: website_sale_gift_card -#: model:ir.model,name:website_sale_gift_card.model_sale_order -msgid "Sales Order" -msgstr "" - -#. module: website_sale_gift_card -#: model:ir.model,name:website_sale_gift_card.model_sale_order_line -msgid "Sales Order Line" -msgstr "" - -#. module: website_sale_gift_card -#: model_terms:ir.ui.view,arch_db:website_sale_gift_card.gift_card_view_search -msgid "Valid" -msgstr "" - -#. module: website_sale_gift_card -#: model:ir.model.fields,field_description:website_sale_gift_card.field_gift_card__website_id -msgid "Website" -msgstr "" diff --git a/addons/website_sale_gift_card/models/__init__.py b/addons/website_sale_gift_card/models/__init__.py deleted file mode 100644 index 733bcda9ea8..00000000000 --- a/addons/website_sale_gift_card/models/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from . import gift_card -from . import sale_order diff --git a/addons/website_sale_gift_card/models/gift_card.py b/addons/website_sale_gift_card/models/gift_card.py deleted file mode 100644 index dc0ddf8009c..00000000000 --- a/addons/website_sale_gift_card/models/gift_card.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import models, fields - - -class GiftCard(models.Model): - _name = "gift.card" - _inherit = ['website.multi.mixin', 'gift.card'] - - website_id = fields.Many2one('website', related='buy_line_id.order_id.website_id', store=True, readonly=False) - - def can_be_used(self): - website = self.env['website'].get_current_website() - return super(GiftCard, self).can_be_used() and self.website_id.id in [website.id, False] diff --git a/addons/website_sale_gift_card/models/sale_order.py b/addons/website_sale_gift_card/models/sale_order.py deleted file mode 100644 index 7c356052c03..00000000000 --- a/addons/website_sale_gift_card/models/sale_order.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import models - - -class SaleOrder(models.Model): - _inherit = "sale.order" - - def _compute_website_order_line(self): - super()._compute_website_order_line() - for order in self: - order.website_order_line = order.website_order_line.sorted(lambda ol: ol.gift_card_id.id) - - def _compute_cart_info(self): - super()._compute_cart_info() - for order in self: - gift_card_payment_lines = order.website_order_line.filtered('gift_card_id') - order.cart_quantity -= int(sum(gift_card_payment_lines.mapped('product_uom_qty'))) - - def _cart_update(self, *args, **kwargs): - res = super()._cart_update(*args, **kwargs) - self._recompute_gift_card_lines() - return res - - -class SaleOrderLine(models.Model): - _inherit = "sale.order.line" - - def _build_gift_card(self): - gift_card = super()._build_gift_card() - gift_card['website_id'] = self.order_id.website_id.id - return gift_card diff --git a/addons/website_sale_gift_card/static/src/js/website_sale_gift_card.js b/addons/website_sale_gift_card/static/src/js/website_sale_gift_card.js deleted file mode 100644 index bcd322db27e..00000000000 --- a/addons/website_sale_gift_card/static/src/js/website_sale_gift_card.js +++ /dev/null @@ -1,30 +0,0 @@ -odoo.define('website_sale_gift_card.website_sale_gift_card', function (require) { - 'use strict'; - - var publicWidget = require('web.public.widget'); - - publicWidget.registry.WebsiteSaleGiftCard = publicWidget.Widget.extend({ - selector: '.oe_website_sale_gift_card', - events: { - 'click .js_show_gift_card': '_onShowGiftCardClick', - }, - /** - * @private - * @param {Event} ev - */ - _onShowGiftCardClick: function (ev) { - $(ev.currentTarget).hide(); - this.$('.gift_card_form').removeClass('d-none'); - } - } - ) - publicWidget.registry.WebsiteSaleGiftCardCopy = publicWidget.Widget.extend({ - selector: '.o_purchased_gift_card', - /** - * @override - */ - start: function () { - new ClipboardJS(this.$el.find('.copy-to-clipboard')[0]); - } - }) -}) diff --git a/addons/website_sale_gift_card/views/gift_card_menus.xml b/addons/website_sale_gift_card/views/gift_card_menus.xml deleted file mode 100644 index d5c31266689..00000000000 --- a/addons/website_sale_gift_card/views/gift_card_menus.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/addons/website_sale_gift_card/views/gift_card_views.xml b/addons/website_sale_gift_card/views/gift_card_views.xml deleted file mode 100644 index 71ada7cdb4b..00000000000 --- a/addons/website_sale_gift_card/views/gift_card_views.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - gift.card.form Website - gift.card - - - - - - - - - - - gift.card.search - gift.card - - - - - - - - diff --git a/addons/website_sale_gift_card/views/template.xml b/addons/website_sale_gift_card/views/template.xml deleted file mode 100644 index 872bc8b936d..00000000000 --- a/addons/website_sale_gift_card/views/template.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - -