diff --git a/custom_receipts_for_pos/README.rst b/custom_receipts_for_pos/README.rst index 84f40da89..481dda755 100644 --- a/custom_receipts_for_pos/README.rst +++ b/custom_receipts_for_pos/README.rst @@ -2,10 +2,9 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -POS Receipt Designs -=================== POS Receipt Design - +=================== +Option to select the customised Receipts for each POS Company ------- @@ -13,7 +12,10 @@ Company Credits ------- -Developer: Sadique Kottekkat @cybrosys, Contact: odoo@cybrosys.com +Developer: (V14) Syamili K, + (V15) Sajna Sherin T, + (V16 & V17) Sadique Kottekkat, Abhishek E T @cybrosys +Contact: odoo@cybrosys.com Contacts -------- diff --git a/custom_receipts_for_pos/__init__.py b/custom_receipts_for_pos/__init__.py index 7b2c59c1c..be01e0c33 100644 --- a/custom_receipts_for_pos/__init__.py +++ b/custom_receipts_for_pos/__init__.py @@ -1,22 +1,23 @@ # -*- coding: utf-8 -*- -############################################################################# +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions() +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Sadique Kottekkat () # -# You can modify it under the terms of the GNU LESSER -# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# This program is free software: you can modify +# it under the terms of the GNU Affero General Public License (AGPL) as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE -# (LGPL v3) along with this program. -# If not, see . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # -############################################################################# +################################################################################ from . import models diff --git a/custom_receipts_for_pos/__manifest__.py b/custom_receipts_for_pos/__manifest__.py index 326cd6823..b9ccc03db 100644 --- a/custom_receipts_for_pos/__manifest__.py +++ b/custom_receipts_for_pos/__manifest__.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -################################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies (). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,30 +19,31 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -################################################################################### +################################################################################ { 'name': 'POS Receipt Design', - 'version': '17.0.1.0.1', + 'version': '17.0.1.0.2', 'category': 'Point of Sale', - 'summary': """POS Receipt, Receipt Design, POS Receipt Template, Design Report, Custom Receipt,POS Report, Customis Receipt, Odoo17, Odoo Apps """, - 'description': "Option to select the customised Receipts for each POS," - "So we can easily updated the Recipet Design for better styles", + 'summary': "POS Receipt, Receipt Design, POS Receipt Template, Design " + "Report, Custom Receipt, POS Report, Customise Receipt, Odoo17, " + "Odoo Apps", + 'description': "Option to select the customised Receipts for each POS. So, " + "we can easily updated the Receipt Design for better styles", 'author': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions', - 'website': "https://www.cybrosys.com", + 'website': 'https://www.cybrosys.com', 'depends': ['base', 'point_of_sale'], 'data': [ 'security/ir.model.access.csv', - 'data/pos_receipt_views_data.xml', - 'views/point_of_sale_views.xml', + 'data/pos_receipt_data.xml', 'views/pos_receipt_views.xml', 'views/res_config_settings_views.xml', ], 'assets': { 'point_of_sale._assets_pos': [ 'custom_receipts_for_pos/static/src/js/receipt_design.js', - 'custom_receipts_for_pos/static/src/xml/receipt_design_template_views.xml', + 'custom_receipts_for_pos/static/src/xml/order_receipt.xml', ], }, 'images': ['static/description/banner.png'], diff --git a/custom_receipts_for_pos/data/pos_receipt_views_data.xml b/custom_receipts_for_pos/data/pos_receipt_data.xml similarity index 51% rename from custom_receipts_for_pos/data/pos_receipt_views_data.xml rename to custom_receipts_for_pos/data/pos_receipt_data.xml index 2ffe49fad..c4c56f345 100644 --- a/custom_receipts_for_pos/data/pos_receipt_views_data.xml +++ b/custom_receipts_for_pos/data/pos_receipt_data.xml @@ -1,6 +1,6 @@ - + Design 1 @@ -38,78 +38,74 @@
- - - - - - - - - - - - - - - - +
ProductQtyAmount
- - -
- % discount -
- - -
- -
- - - -
+ + + + + + + + + + + + + + +
ProductQtyAmount
+ + +
+ % discount +
+ + +
+ +
+ + + +

-
+

-
Subtotal :
+
Subtotal :
-
- - +
+ +

-
- TOTAL : - +
+ TOTAL : +
-
-
-
-
+

-
-
- -
- - -
- +
+
+
+ +
+ + +
+
-

-
+
Thank You... Please Visit Again ...
]]> @@ -117,13 +113,13 @@ Design 2 -
+

- Phone:
+ Phone:

-
+
Date : @@ -135,10 +131,10 @@ Order :

-
+
Cashier :
- Customer : + Customer :
@@ -150,104 +146,104 @@
- +
- + - - + + - - -
ProductQtyAmountQtyAmount
+ -
+
% discount
-
+
+ - + +

-
+

-
Subtotal :
+
Subtotal :
-
- - +
+ +

-
- TOTAL : - +
+ TOTAL : +


-
- - +
+ +

-
- CHANGE : - +
+ CHANGE : +

-
- Discounts : - +
+ Discounts : +
-
- - +
+ +
-
- Total Taxes : - +
+ Total Taxes : +
-
+
-
+



-
+

@@ -258,7 +254,7 @@


-
+
Thank You... Please Visit Again ...
]]> diff --git a/custom_receipts_for_pos/doc/RELEASE_NOTES.md b/custom_receipts_for_pos/doc/RELEASE_NOTES.md index ada445646..b0332a03d 100644 --- a/custom_receipts_for_pos/doc/RELEASE_NOTES.md +++ b/custom_receipts_for_pos/doc/RELEASE_NOTES.md @@ -9,3 +9,8 @@ #### Version 17.0.1.0.1 ##### BUGFIX - Fixed the error in printing the receipt + +#### 15.06.2024 +#### Version 17.0.1.0.2 +##### BUGFIX +- Fix the receipt selection for each point of sales diff --git a/custom_receipts_for_pos/models/__init__.py b/custom_receipts_for_pos/models/__init__.py index 34f91d4b8..6933d575f 100644 --- a/custom_receipts_for_pos/models/__init__.py +++ b/custom_receipts_for_pos/models/__init__.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -################################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies (). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -################################################################################### +################################################################################ from .import pos_receipt from .import pos_config from .import res_config_settings diff --git a/custom_receipts_for_pos/models/pos_config.py b/custom_receipts_for_pos/models/pos_config.py index aa039b31a..3df28b047 100644 --- a/custom_receipts_for_pos/models/pos_config.py +++ b/custom_receipts_for_pos/models/pos_config.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,22 +19,23 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################### +################################################################################ from odoo import fields, models class PosConfig(models.Model): """ This is an Odoo model for Point of Sale (POS). - It inherits from the 'pos.config' model and extends its functionality. + It inherits the 'pos.config' model to add new fields. """ - _inherit = "pos.config" + _inherit = 'pos.config' - receipt_design = fields.Many2one('pos.receipt', - string="Receipt Design", - help="Choose any receipt design") + receipt_design = fields.Many2one('pos.receipt', string='Receipt Design', + help='Choose any receipt design', + default=lambda self: self.env[ + 'pos.receipt'].search([], limit=1)) design_receipt = fields.Text(related='receipt_design.design_receipt', string='Receipt XML') is_custom_receipt = fields.Boolean(string='Is Custom Receipt', - help='Boolean indicating the receipt' - ' design is custom or not') + help='Indicates the receipt design is ' + 'custom or not') diff --git a/custom_receipts_for_pos/models/pos_receipt.py b/custom_receipts_for_pos/models/pos_receipt.py index 97d10489d..8c03a9cd3 100644 --- a/custom_receipts_for_pos/models/pos_receipt.py +++ b/custom_receipts_for_pos/models/pos_receipt.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################### +################################################################################ from odoo import fields, models @@ -30,6 +30,7 @@ class PosReceipt(models.Model): receipt design. """ _name = 'pos.receipt' + _description = 'POS Receipts' name = fields.Char(string='Name', help='Name of the pos receipt') design_receipt = fields.Text(string='Receipt XML', diff --git a/custom_receipts_for_pos/models/pos_session.py b/custom_receipts_for_pos/models/pos_session.py index 3bf966e09..10c390782 100644 --- a/custom_receipts_for_pos/models/pos_session.py +++ b/custom_receipts_for_pos/models/pos_session.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################### +################################################################################ from odoo import models diff --git a/custom_receipts_for_pos/models/res_config_settings.py b/custom_receipts_for_pos/models/res_config_settings.py index 0bf3f4e79..d7a224c36 100644 --- a/custom_receipts_for_pos/models/res_config_settings.py +++ b/custom_receipts_for_pos/models/res_config_settings.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################### +################################################################################ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Copyright (C) 2024-TODAY Cybrosys Technologies(). # Author: Sadique Kottekkat () # # This program is free software: you can modify @@ -19,8 +19,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################### -from odoo import api, fields, models +################################################################################ +from odoo import fields, models class ResConfigSettings(models.TransientModel): @@ -31,23 +31,10 @@ class ResConfigSettings(models.TransientModel): """ _inherit = 'res.config.settings' - pos_receipt_design = fields.Many2one(related='pos_config_id.receipt_design', - string="Receipt Design", - help="Choose any receipt design", - compute='_compute_pos_is_custom_receipt', - readonly=False, store=True, - default=lambda self: self.env['pos.receipt'].search([], limit=1)) + pos_receipt_design = fields.Many2one( + related='pos_config_id.receipt_design', readonly=False, + string='Receipt Design', help='Choose any receipt design') pos_design_receipt = fields.Text(related='pos_config_id.design_receipt', string='Receipt XML') - pos_is_custom_receipt = fields.Boolean(related='pos_config_id.' - 'is_custom_receipt', - readonly=False, store=True) - - @api.depends('pos_is_custom_receipt', 'pos_config_id') - def _compute_pos_is_custom_receipt(self): - """The compute function for finding the Receipt status""" - for res_config in self: - if res_config.pos_is_custom_receipt: - res_config.pos_receipt_design = res_config.pos_config_id.receipt_design - else: - res_config.pos_receipt_design = False + pos_is_custom_receipt = fields.Boolean( + related='pos_config_id.is_custom_receipt', readonly=False, store=True) diff --git a/custom_receipts_for_pos/security/ir.model.access.csv b/custom_receipts_for_pos/security/ir.model.access.csv index 4fe3ffc47..9ebdf4572 100644 --- a/custom_receipts_for_pos/security/ir.model.access.csv +++ b/custom_receipts_for_pos/security/ir.model.access.csv @@ -1,3 +1,2 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_pos_receipt,access_pos_receipt,model_pos_receipt,base.group_user,1,1,1,1 - +access_pos_receipt_user,access.pos.receipt.user,model_pos_receipt,base.group_user,1,1,1,1 diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/1.png b/custom_receipts_for_pos/static/description/assets/screenshots/1.png index f18bfc7e3..388a0fe9a 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/1.png and b/custom_receipts_for_pos/static/description/assets/screenshots/1.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/2.png b/custom_receipts_for_pos/static/description/assets/screenshots/2.png index d9c91add7..f60e6f415 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/2.png and b/custom_receipts_for_pos/static/description/assets/screenshots/2.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/3.png b/custom_receipts_for_pos/static/description/assets/screenshots/3.png index 5a2ac916e..65601c61e 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/3.png and b/custom_receipts_for_pos/static/description/assets/screenshots/3.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/4.png b/custom_receipts_for_pos/static/description/assets/screenshots/4.png index 7f2ac97d8..be0a6d035 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/4.png and b/custom_receipts_for_pos/static/description/assets/screenshots/4.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/5.png b/custom_receipts_for_pos/static/description/assets/screenshots/5.png index 286f8d20d..699413c9a 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/5.png and b/custom_receipts_for_pos/static/description/assets/screenshots/5.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/6.png b/custom_receipts_for_pos/static/description/assets/screenshots/6.png index e4649c71c..ca4a70e2d 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/6.png and b/custom_receipts_for_pos/static/description/assets/screenshots/6.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/7.png b/custom_receipts_for_pos/static/description/assets/screenshots/7.png index 348689554..2a7a7287a 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/7.png and b/custom_receipts_for_pos/static/description/assets/screenshots/7.png differ diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif b/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif index 4cd82adab..4bf88836d 100644 Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif and b/custom_receipts_for_pos/static/description/assets/screenshots/hero.gif differ diff --git a/custom_receipts_for_pos/static/description/index.html b/custom_receipts_for_pos/static/description/index.html index e0d246f86..28d9806e2 100644 --- a/custom_receipts_for_pos/static/description/index.html +++ b/custom_receipts_for_pos/static/description/index.html @@ -60,13 +60,13 @@
-
+ box-shadow: 1px 2px 3px 0px rgba(0, 0, 0, 0.25);">
- +

-

+ box-shadow: 1px 2px 3px 0px rgba(0, 0, 0, 0.25);">
- +

-

+ box-shadow: 1px 2px 3px 0px rgba(0, 0, 0, 0.25);">
- +

-

+ box-shadow: 1px 2px 3px 0px rgba(0, 0, 0, 0.25);">
- + margin-right: 10px; flex-shrink: 0;"> +

@@ -170,7 +170,7 @@
+ style="border: 1px solid #d8d6d6; border-radius: 4px; background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
@@ -191,7 +191,7 @@
+ style="border: 1px solid #d8d6d6; border-radius: 4px; background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
@@ -209,7 +209,7 @@
+ style="border: 1px solid #d8d6d6; border-radius: 4px; background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
@@ -227,7 +227,7 @@
+ style="border: 1px solid #d8d6d6; border-radius: 4px; background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
@@ -277,13 +277,37 @@ style="font-weight: 500;background-color: #fff; border-radius: 4px; padding: 1rem; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
Version 17.0.1.0.0|Released on:05th Feb 2024 + style="color: #714B67;font-weight: 600;">Released on: February 05, 2024

Initial Commit for POS Receipt Designs.

+
+
+
Version + 17.0.1.0.0|Released on: April 17, 2024 +
+

+ Fixed the error in printing the receipt.

+
+
+
+
+
Version + 17.0.1.0.0|Released on: May 21, 2024 +
+

+ Fix the receipt selection for each point of sales.

+
+
@@ -300,11 +324,11 @@
@@ -313,11 +337,11 @@
@@ -326,11 +350,11 @@
@@ -343,11 +367,11 @@
@@ -360,7 +384,7 @@
-

BOM Multiple Product Selection

+

Service Charges POS

@@ -372,7 +396,7 @@
-

Catch Weight Management: Manufacturing

+

Make MRP Orders from POS

@@ -401,9 +425,9 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative;border-radius: 4px;">
-
service-icon
@@ -415,7 +439,7 @@
-
service-icon
@@ -425,9 +449,9 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative; border-radius: 4px;">
-
service-icon
@@ -439,7 +463,7 @@
-
service-icon
@@ -449,10 +473,10 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative; border-radius: 4px;">
-
service-icon
@@ -462,9 +486,9 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative;border-radius: 4px;">
-
service-icon
@@ -474,9 +498,9 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative;border-radius: 4px;">
-
service-icon
@@ -488,7 +512,7 @@
-
service-icon
@@ -498,9 +522,9 @@
+ style="background-color: #fff; padding: 25px; text-align: center; box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(0, 0, 0, 0.06) 0px 1px 2px 0px; position: relative;border-radius: 4px;">
-
service-icon
@@ -519,35 +543,35 @@
-
+

Trading

Easily procure and sell your products

-
+
+ style="border-right: 1px solid rgb(209, 209, 209);border-bottom: 1px solid rgb(209, 209, 209); padding: 30px;">

POS

Easy configuration and convivial experience

-
+
+ style="border-right: 1px solid rgb(209, 209, 209);border-bottom: 1px solid rgba(0, 0, 0, 0.2); padding: 30px; box-shadow: 0 5px 10px rgba(228, 227, 227, 0.373)">

Education

A platform for educational management

-
+
+ style="border-bottom: 1px solid rgb(209, 209, 209); padding: 30px;">

Manufacturing

@@ -556,34 +580,34 @@
+ style="border-right: 1px solid rgb(209, 209, 209); padding: 30px;">

E-commerce & Website

Mobile friendly, awe-inspiring product pages

-
+
+ style="border-right: 1px solid rgb(209, 209, 209); padding: 30px;box-shadow: 0 -5px 10px rgba(228, 227, 227, 0.373);">

Service Management

Keep track of services and invoice

-
+
+ style="border-right: 1px solid rgb(209, 209, 209); padding: 30px;">

Restaurant

Run your bar or restaurant methodically

-
+
+ style=" padding: 30px;box-shadow: -5px 0 10px rgba(228, 227, 227, 0.373);">

Hotel Management

@@ -599,7 +623,7 @@
-
diff --git a/custom_receipts_for_pos/static/src/js/receipt_design.js b/custom_receipts_for_pos/static/src/js/receipt_design.js index f5f93d830..517b762fa 100644 --- a/custom_receipts_for_pos/static/src/js/receipt_design.js +++ b/custom_receipts_for_pos/static/src/js/receipt_design.js @@ -1,40 +1,37 @@ /** @odoo-module */ import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt"; import { patch } from "@web/core/utils/patch"; -import { Orderline } from "@point_of_sale/app/generic_components/orderline/orderline"; import { useState, Component, xml } from "@odoo/owl"; import { useService } from "@web/core/utils/hooks"; patch(OrderReceipt.prototype, { setup(){ super.setup(); - this.state = useState({ - template: true, - }) + this.state = useState({ + template: true, + }) this.pos = useState(useService("pos")); }, get templateProps() { return { - data: this.props.data, - order: this.pos.orders, - receipt: this.pos.orders[0].export_for_printing(), - orderlines:this.pos.orders[0].get_orderlines(), - paymentlines:this.pos.orders[0].get_paymentlines() - } + data: this.props.data, + order: this.pos.orders, + receipt: this.pos.orders[0].export_for_printing(), + orderlines:this.pos.orders[0].get_orderlines(), + paymentlines:this.pos.orders[0].get_paymentlines() + }; }, get templateComponent() { - var mainRef = this + var mainRef = this; return class extends Component { setup() {} static template = xml`${mainRef.pos.config.design_receipt}` - } + }; }, get isTrue() { if (this.env.services.pos.config.is_custom_receipt == false) { - return true - } - else { - return false + return true; } + return false; } }); diff --git a/custom_receipts_for_pos/static/src/xml/receipt_design_template_views.xml b/custom_receipts_for_pos/static/src/xml/order_receipt.xml similarity index 94% rename from custom_receipts_for_pos/static/src/xml/receipt_design_template_views.xml rename to custom_receipts_for_pos/static/src/xml/order_receipt.xml index df664c710..61606e743 100644 --- a/custom_receipts_for_pos/static/src/xml/receipt_design_template_views.xml +++ b/custom_receipts_for_pos/static/src/xml/order_receipt.xml @@ -10,12 +10,12 @@ -
  • - - -
    • +
  • + + +
    • diff --git a/custom_receipts_for_pos/views/point_of_sale_views.xml b/custom_receipts_for_pos/views/point_of_sale_views.xml deleted file mode 100644 index bb34d165d..000000000 --- a/custom_receipts_for_pos/views/point_of_sale_views.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Receipt Designs - pos.receipt - tree,form - current - - - diff --git a/custom_receipts_for_pos/views/pos_config_views.xml b/custom_receipts_for_pos/views/pos_config_views.xml deleted file mode 100644 index 1ed8aa374..000000000 --- a/custom_receipts_for_pos/views/pos_config_views.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - pos.config.view - pos.config - - - -
      -
      - -
      -
      -
      -
      -       -       -       -       diff --git a/custom_receipts_for_pos/views/pos_receipt_views.xml b/custom_receipts_for_pos/views/pos_receipt_views.xml index 5e50b9ac5..f027e825e 100644 --- a/custom_receipts_for_pos/views/pos_receipt_views.xml +++ b/custom_receipts_for_pos/views/pos_receipt_views.xml @@ -1,22 +1,23 @@ - - - pos.receipt.form + + + pos.receipt.view.form pos.receipt
      - +
      - + + + pos.receipt.view.tree pos.receipt @@ -24,4 +25,14 @@ + + + Receipt Designs + pos.receipt + tree,form + current + + +       \ No newline at end of file diff --git a/custom_receipts_for_pos/views/res_config_settings_views.xml b/custom_receipts_for_pos/views/res_config_settings_views.xml index ea9a10853..e1622f5c9 100644 --- a/custom_receipts_for_pos/views/res_config_settings_views.xml +++ b/custom_receipts_for_pos/views/res_config_settings_views.xml @@ -3,7 +3,7 @@ - res.config.settings.view.form.inherit.point_of_sale + res.config.settings.view.form.inherit.custom.receipts.for.pos res.config.settings @@ -20,12 +20,10 @@ Use Custom Receipt Design
    - +
    - +