Skip to content

Commit

Permalink
Merge pull request #1180 from Enigma228322/12.0-porting-pos_menu
Browse files Browse the repository at this point in the history
  • Loading branch information
itpp-bot authored Jun 9, 2020
2 parents e606889 + abe25e6 commit bd8bf2c
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 11 deletions.
8 changes: 4 additions & 4 deletions pos_menu/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Maintainers
-----------
* `IT-Projects LLC <https://it-projects.info>`__

To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store <https://apps.odoo.com/apps/modules/11.0/pos_menu/>`__.
To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store <https://apps.odoo.com/apps/modules/12.0/pos_menu/>`__.

Thank you for understanding!

Expand All @@ -29,12 +29,12 @@ Maintainers
Further information
===================

Demo: http://runbot.it-projects.info/demo/11.0/pos-addons
Demo: http://runbot.it-projects.info/demo/12.0/pos-addons

HTML Description: https://apps.odoo.com/apps/modules/11.0/pos_menu/
HTML Description: https://apps.odoo.com/apps/modules/12.0/pos_menu/

Usage instructions: `<doc/index.rst>`_

Changelog: `<doc/changelog.rst>`_

Tested on Odoo 11.0 dff2e242a5e5288cb3c8408a9b635a4c85034e83
Tested on Odoo 12.0 dff2e242a5e5288cb3c8408a9b635a4c85034e83
6 changes: 5 additions & 1 deletion pos_menu/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright 2019 Anvar Kildebekov <https://www.it-projects.info/team/fedoranvar>
# Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
# License MIT (https://opensource.org/licenses/MIT).

{
"name": """Product Sets for POS""",
"summary": """Add own set of products per each POS""",
Expand Down Expand Up @@ -27,5 +31,5 @@
"post_init_hook": None,
"uninstall_hook": None,
"auto_install": False,
"installable": False,
"installable": True,
}
7 changes: 5 additions & 2 deletions pos_menu/demo/product_set_demo.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
Copyright 2019 Vildan Safin <https://github.com/Enigma228322>
License MIT (https://opensource.org/licenses/MIT). -->
<odoo>
<record id="demo_pos_config_one" model="pos.config">
<field name="name">Shop1</field>
Expand All @@ -10,15 +13,15 @@
<field name="name">Set 1</field>
<field
name="product_ids"
eval="[(6, 0, [ref('point_of_sale.boni_orange_product_template'), ref('point_of_sale.carotte_product_template'), ref('point_of_sale.poire_conference_product_template'), ref('point_of_sale.raisins_noir_product_template')])]"
eval="[(6, 0, [ref('point_of_sale.newspaper_rack_product_template'), ref('point_of_sale.whiteboard_pen_product_template'), ref('point_of_sale.desk_pad_product_template'), ref('point_of_sale.monitor_stand_product_template')])]"
/>
<field name="pos_ids" eval="[(6, 0, [ref('demo_pos_config_one')])]" />
</record>
<record id="pos_tag_2" model="pos.tag">
<field name="name">Set 2</field>
<field
name="product_ids"
eval="[(6, 0, [ref('point_of_sale.partner_product_4_product_template'), ref('point_of_sale.partner_product_5_product_template'), ref('point_of_sale.partner_product_7_product_template'), ref('point_of_sale.partner_product_9_product_template')])]"
eval="[(6, 0, [ref('point_of_sale.newspaper_rack_product_template')])]"
/>
<field name="pos_ids" eval="[(6, 0, [ref('demo_pos_config_two')])]" />
</record>
Expand Down
2 changes: 1 addition & 1 deletion pos_menu/i18n/pos_menu.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
Expand Down
5 changes: 5 additions & 0 deletions pos_menu/models/model.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright 2019 Anvar Kildebekov <https://www.it-projects.info/team/fedoranvar>
# Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
# License MIT (https://opensource.org/licenses/MIT).

from odoo import fields, models


Expand Down Expand Up @@ -43,6 +47,7 @@ def _search_current_session_state(self, operator, value):

class PosTag(models.Model):
_name = "pos.tag"
_description = "POS tag"

name = fields.Char(string="Name")
product_ids = fields.Many2many(
Expand Down
4 changes: 2 additions & 2 deletions pos_menu/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h2>Need our service?</h2>
-o-transform: rotate(-6deg);
-moz-transform: rotate(-6deg);
-ms-transform: rotate(-6deg);">
Tested on Odoo<br/>10.0 community
Tested on Odoo<br/>12.0 community
</div>
<div style="margin-top: 15px;
position: relative;
Expand All @@ -125,7 +125,7 @@ <h2>Need our service?</h2>
-o-transform: rotate(-7deg);
-moz-transform: rotate(-7deg);
-ms-transform: rotate(-7deg);">
Tested on Odoo<br/>10.0 enterprise
Tested on Odoo<br/>12.0 enterprise
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions pos_menu/static/src/js/pos.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* Copyright 2019 Anvar Kildebekov <https://www.it-projects.info/team/fedoranvar>
* Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
* License MIT (https://opensource.org/licenses/MIT). */
odoo.define("pos_menu", function(require) {
"use strict";
var models = require("point_of_sale.models");
Expand Down
7 changes: 6 additions & 1 deletion pos_menu/static/src/js/tour.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* Copyright 2019 Anvar Kildebekov <https://www.it-projects.info/team/fedoranvar>
* Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
* Copyright 2019 Vildan Safin <https://github.com/Enigma228322>
* License MIT (https://opensource.org/licenses/MIT). */
odoo.define("pos_menu.tour", function(require) {
"use strict";

Expand All @@ -8,6 +12,7 @@ odoo.define("pos_menu.tour", function(require) {

function pos_opening(pos) {
return [
tour.STEPS.SHOW_APPS_MENU_ITEM,
{
trigger:
'.o_app[data-menu-xmlid="point_of_sale.menu_point_root"], .oe_menu_toggler[data-menu-xmlid="point_of_sale.menu_point_root"]',
Expand Down Expand Up @@ -66,7 +71,7 @@ odoo.define("pos_menu.tour", function(require) {
}

var steps = [];
var menu = ["Boni Oranges", "Black Grapes", "Carrots", "Conference pears"];
var menu = ["Newspaper Rack", "Whiteboard Pen", "Desk Pad", "Monitor Stand"];
var pos = "Shop1";
steps = steps.concat(pos_opening(pos));
steps = steps.concat(check_menu(menu));
Expand Down
4 changes: 4 additions & 0 deletions pos_menu/tests/test_default.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright 2019 Anvar Kildebekov <https://www.it-projects.info/team/fedoranvar>
# Copyright 2019 Ilmir Karamov <https://www.it-projects.info/team/ilmir-k>
# License MIT (https://opensource.org/licenses/MIT).

import odoo.tests


Expand Down

0 comments on commit bd8bf2c

Please sign in to comment.