Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
odoo
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
odoo
Commits
d0f2ff08
Commit
d0f2ff08
authored
Apr 01, 2022
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'curtlery_pos_meal_voucher' into 'dev_cooperatic'
Relace Curtlery icon by # when printing pos receipt See merge request
!35
parents
07d82be9
283695de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
curtlery.png
...gette_addons/pos_meal_voucher/static/src/img/curtlery.png
+0
-0
models.js
lacagette_addons/pos_meal_voucher/static/src/js/models.js
+2
-1
pos_meal_voucher.xml
...dons/pos_meal_voucher/static/src/xml/pos_meal_voucher.xml
+2
-2
No files found.
lacagette_addons/pos_meal_voucher/static/src/img/curtlery.png
0 → 100644
View file @
d0f2ff08
726 Bytes
lacagette_addons/pos_meal_voucher/static/src/js/models.js
View file @
d0f2ff08
...
...
@@ -139,7 +139,8 @@ odoo.define("pos_meal_voucher.models", function (require) {
},
currency
:
this
.
pos
.
currency
,
meal_voucher_used
:
this
.
is_meal_voucher_used
(),
total_meal_voucher_eligible
:
this
.
get_total_meal_voucher_eligible
()
total_meal_voucher_eligible
:
this
.
get_total_meal_voucher_eligible
(),
curtlery_img_src
:
" data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAgCAQAAABJYMuwAAABI2lDQ1BJQ0MgcHJvZmlsZQAAKJGdkLFKw1AUhr+0oiLqYnEQhQyOFlzM5FIVgqAQYwWrU5qkWExiSFKKb+Cb6MN0EAQfwQdQcPa/0cHBLF44/B+Hc/7/3gstOwnTcm4X0qwqXL83uBxc2QtvtNlilQ47QVjmPc87ofF8vmIZfekar+a5P898FJehdKbKwryowNoXO9MqN6yic9v3D8UPYjtKs0j8JN6O0siw2fXTZBL+eJrbLMfZxbnpqzZxOeYUD5shE8YkVHSlmTpHOOxJXQoC7ikJpQmxelPNVNyISjm5HIj6It2mIW+jzvOUMpTHWF4m4Y5UniYP87/fax9n9aa1PsuDIqhbbVVrNIL3R1gZwNozLF03ZC3+flvDjFPP/PONXwa+UHRuacLOAAAACXBIWXMAAAsTAAALEwEAmpwYAAABWUlEQVQ4y93UTUvUURTH8c+9IyEygxoxi3KRVApBL6CHhSv3afsWSvgKqpcQbSpw0dYWBe7ciAtLwVWL1r6BVpI2yBRqDcdNTY7+/c8wi4guXLicc7/3d564KfS1ghGvPTYgm/PO1WDCstkQgmzKK6s2bNq04a3LIeOKW+4YVHHPdZO4adztlEgXPPHcXXU1VVU119xgoEM6deyUeOi+fDbGXJpB3YPiG+XYhNFiRzk2IvWDpfMcub+2/a5kzUVNoxhL2dj5Op3YsDdahvHIjEu9qlFth13vHmQun7syrOmowPO1m9pnH8/YD61FlOYWrfTMD9MqbeuOFz51zS0aFu2fsK5bj+i3JH8bi+7tLlpbnqqgbsFgz1g0vIc0bv7fLcn/iEWv2DfNE9CXU4O873v73LLXxqLppZ1f5g9WTonvWtQAB5Zsk/48m5Ih2VEcFn6Z2RAO4iccAzBJUmYVC7MHAAAAAElFTkSuQmCC"
};
if
(
is_xml
(
this
.
pos
.
config
.
receipt_header
)){
...
...
lacagette_addons/pos_meal_voucher/static/src/xml/pos_meal_voucher.xml
View file @
d0f2ff08
...
...
@@ -111,13 +111,13 @@
<t
t-extend=
"XmlReceipt"
>
<!-- Ticket sent to the printer -->
<t
t-jquery=
"div.orderlines line:not([indent]) left"
t-operation=
"prepend"
>
<!-- hack to get product name line (lines with qty have 'indent' attr) -->
<t
t-if=
'receipt.meal_voucher_used === true and line.product_meal_voucher_ok === true'
>
<i
class=
"fa fa-cutlery"
/>
<i
mg
t-att-src=
"receipt.curtlery_img_src"
t-att-alt=
"#"
/>
</t>
</t>
<t
t-jquery=
"div.orderlines"
t-operation=
"after"
>
<t
t-if=
"receipt.meal_voucher_used === true"
>
<line><right>
--------
</right></line>
<line><left><i
class=
"fa fa-cutlery"
/>
Eligible subtotal for
</left></line>
<line><left><i
mg
t-att-src=
"receipt.curtlery_img_src"
t-att-alt=
"#"
/>
Eligible subtotal for
</left></line>
<line>
<left>
meal vouchers:
</left>
<right><value
t-att-value-decimals=
'pos.currency.decimals'
><t
t-esc=
'receipt.total_meal_voucher_eligible'
/></value></right>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment