Merge pull request #301 from yrestom/develop

Version: 4.3.0
ucraft-com · Apr 24, 2023 · 1b6d9c8 · 1b6d9c8
2 parents ab2f171 + 8e82d67
commit 1b6d9c8
Show file tree

Hide file tree

Showing 9 changed files with 475 additions and 229 deletions.
diff --git a/posawesome/__init__.py b/posawesome/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = "4.2.3"
+__version__ = "4.3.0"
 
 
 def console(*data):

diff --git a/posawesome/fixtures/custom_field.json b/posawesome/fixtures/custom_field.json
@@ -321,7 +321,7 @@
   "allow_in_quick_entry": 0,
   "allow_on_submit": 0,
   "bold": 0,
-  "collapsible": 0,
+  "collapsible": 1,
   "collapsible_depends_on": null,
   "columns": 0,
   "default": null,
@@ -3610,15 +3610,15 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": "1",
+  "default": null,
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_local_storage",
+  "fieldname": "posa_search_serial_no",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -3633,12 +3633,12 @@
   "insert_after": "posa_allow_submissions_in_background_job",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Use Browser Local Storage",
+  "label": "Search by Serial Number",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2020-11-13 22:14:13.683091",
+  "modified": "2021-06-20 20:47:47.966800",
   "module": null,
-  "name": "POS Profile-posa_local_storage",
+  "name": "POS Profile-posa_search_serial_no",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -3663,15 +3663,15 @@
   "collapsible": 0,
   "collapsible_depends_on": null,
   "columns": 0,
-  "default": null,
+  "default": "1",
   "depends_on": null,
   "description": null,
   "docstatus": 0,
   "doctype": "Custom Field",
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_search_serial_no",
+  "fieldname": "posa_tax_inclusive",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -3683,15 +3683,68 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_local_storage",
+  "insert_after": "posa_search_serial_no",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Search by Serial Number",
+  "label": "Tax Inclusive",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-06-20 20:47:47.966800",
+  "modified": "2021-09-06 16:33:33.398280",
   "module": null,
-  "name": "POS Profile-posa_search_serial_no",
+  "name": "POS Profile-posa_tax_inclusive",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 0,
+  "unique": 0,
+  "width": null
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": null,
+  "depends_on": null,
+  "description": null,
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "POS Profile",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "column_break_dqsba",
+  "fieldtype": "Column Break",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "posa_tax_inclusive",
+  "is_system_generated": 0,
+  "is_virtual": 0,
+  "label": null,
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2023-04-24 14:44:48.969896",
+  "module": null,
+  "name": "POS Profile-column_break_dqsba",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -3724,7 +3777,7 @@
   "dt": "POS Profile",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "posa_tax_inclusive",
+  "fieldname": "posa_local_storage",
   "fieldtype": "Check",
   "hidden": 0,
   "hide_border": 0,
@@ -3736,15 +3789,68 @@
   "in_list_view": 0,
   "in_preview": 0,
   "in_standard_filter": 0,
-  "insert_after": "posa_search_serial_no",
+  "insert_after": "column_break_dqsba",
   "is_system_generated": 0,
   "is_virtual": 0,
-  "label": "Tax Inclusive",
+  "label": "Use Browser Local Storage",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-09-06 16:33:33.398280",
+  "modified": "2020-11-13 22:14:13.683091",
   "module": null,
-  "name": "POS Profile-posa_tax_inclusive",
+  "name": "POS Profile-posa_local_storage",
+  "no_copy": 0,
+  "non_negative": 0,
+  "options": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 0,
+  "unique": 0,
+  "width": null
+ },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": "0",
+  "depends_on": null,
+  "description": "Use Redis cache on the server to speedup initial loads of POS Awesome ",
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "POS Profile",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "posa_use_server_cache",
+  "fieldtype": "Check",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "posa_local_storage",
+  "is_system_generated": 0,
+  "is_virtual": 0,
+  "label": "Use Server Cache",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2023-04-24 14:44:49.219453",
+  "module": null,
+  "name": "POS Profile-posa_use_server_cache",
   "no_copy": 0,
   "non_negative": 0,
   "options": null,
@@ -3762,6 +3868,59 @@
   "unique": 0,
   "width": null
  },
+ {
+  "allow_in_quick_entry": 0,
+  "allow_on_submit": 0,
+  "bold": 0,
+  "collapsible": 0,
+  "collapsible_depends_on": null,
+  "columns": 0,
+  "default": "30",
+  "depends_on": "posa_use_server_cache",
+  "description": "Cache the values for n minutes",
+  "docstatus": 0,
+  "doctype": "Custom Field",
+  "dt": "POS Profile",
+  "fetch_from": null,
+  "fetch_if_empty": 0,
+  "fieldname": "posa_server_cache_duration",
+  "fieldtype": "Int",
+  "hidden": 0,
+  "hide_border": 0,
+  "hide_days": 0,
+  "hide_seconds": 0,
+  "ignore_user_permissions": 0,
+  "ignore_xss_filter": 0,
+  "in_global_search": 0,
+  "in_list_view": 0,
+  "in_preview": 0,
+  "in_standard_filter": 0,
+  "insert_after": "posa_use_server_cache",
+  "is_system_generated": 0,
+  "is_virtual": 0,
+  "label": "Server Cache Duration",
+  "length": 0,
+  "mandatory_depends_on": null,
+  "modified": "2023-04-24 14:44:49.341660",
+  "module": null,
+  "name": "POS Profile-posa_server_cache_duration",
+  "no_copy": 0,
+  "non_negative": 1,
+  "options": null,
+  "permlevel": 0,
+  "precision": "",
+  "print_hide": 0,
+  "print_hide_if_no_value": 0,
+  "print_width": null,
+  "read_only": 0,
+  "read_only_depends_on": null,
+  "report_hide": 0,
+  "reqd": 0,
+  "search_index": 0,
+  "translatable": 0,
+  "unique": 0,
+  "width": null
+ },
  {
   "allow_in_quick_entry": 0,
   "allow_on_submit": 0,

diff --git a/posawesome/hooks.py b/posawesome/hooks.py
@@ -236,6 +236,9 @@
                     "POS Profile-posa_allow_change_posting_date",
                     "POS Profile-posa_default_card_view",
                     "POS Profile-posa_default_sales_order",
+                    "POS Profile-column_break_dqsba",
+                    "POS Profile-posa_use_server_cache",
+                    "POS Profile-posa_server_cache_duration",
                 ),
             ]
         ],