From b13fc99e9583e2a541497264d8047cb4ddd26dd5 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 1 Nov 2023 19:43:46 -0500 Subject: [PATCH 001/372] Use shared logic to get batch handler --- tailbone/api/batch/core.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tailbone/api/batch/core.py b/tailbone/api/batch/core.py index c98e01f1..f7bc9333 100644 --- a/tailbone/api/batch/core.py +++ b/tailbone/api/batch/core.py @@ -66,9 +66,7 @@ class APIBatchMixin(object): """ app = self.get_rattail_app() key = self.get_batch_class().batch_key - spec = self.rattail_config.get('rattail.batch', '{}.handler'.format(key), - default=self.default_handler_spec) - return app.load_object(spec)(self.rattail_config) + return app.get_batch_handler(key, default=self.default_handler_spec) class APIBatchView(APIBatchMixin, APIMasterView): From 51d7c10bc5ddc3100403899bd448018407b58227 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 1 Nov 2023 19:44:44 -0500 Subject: [PATCH 002/372] Fix config key for default themes list --- tailbone/config.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tailbone/config.py b/tailbone/config.py index be8f2dc2..6106e87e 100644 --- a/tailbone/config.py +++ b/tailbone/config.py @@ -24,8 +24,6 @@ Rattail config extension for Tailbone """ -from __future__ import unicode_literals, absolute_import - import warnings from rattail.config import ConfigExtension as BaseExtension @@ -51,7 +49,7 @@ class ConfigExtension(BaseExtension): configure_session(config, Session) # provide default theme selection - config.setdefault('tailbone', 'themes', 'default, falafel') + config.setdefault('tailbone', 'themes.keys', 'default, falafel') config.setdefault('tailbone', 'themes.expose_picker', 'true') From 7ab3d2b635a94f925f979e0578c639baf3d846ee Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 1 Nov 2023 19:45:35 -0500 Subject: [PATCH 003/372] Update changelog --- CHANGES.rst | 8 ++++++++ tailbone/_version.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 85ec1448..25f12640 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,14 @@ CHANGELOG ========= +0.9.78 (2023-11-01) +------------------- + +* Use shared logic to get batch handler. + +* Fix config key for default themes list. + + 0.9.77 (2023-11-01) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index 5c19859d..956a3695 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.77' +__version__ = '0.9.78' From 55a115e57aa162b3f98a0c91011fdb2c8cc09f2d Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 1 Nov 2023 20:53:11 -0500 Subject: [PATCH 004/372] Add button to confirm all costs for receiving --- tailbone/templates/receiving/view.mako | 149 +++++++++++++++++-------- tailbone/views/purchasing/receiving.py | 54 +++++++++ 2 files changed, 156 insertions(+), 47 deletions(-) diff --git a/tailbone/templates/receiving/view.mako b/tailbone/templates/receiving/view.mako index 30bfd3a9..d639ff24 100644 --- a/tailbone/templates/receiving/view.mako +++ b/tailbone/templates/receiving/view.mako @@ -36,57 +36,105 @@ % endif -<%def name="render_auto_receive_helper()"> - % if master.has_perm('auto_receive') and master.can_auto_receive(batch): +<%def name="render_tools_helper()"> + % if allow_confirm_all_costs or (master.has_perm('auto_receive') and master.can_auto_receive(batch)):

Tools

-
- - Auto-Receive All Items - +
+ + % if allow_confirm_all_costs: + + Confirm All Costs + + +
+ +
+

Confirm All Costs

+
+ +
+

+ You can automatically mark all catalog and invoice + cost amounts as "confirmed" if you wish. +

+

+ Would you like to do this? +

+
+ +
+ + Cancel + + ${h.form(url(f'{route_prefix}.confirm_all_costs', uuid=batch.uuid), **{'@submit': 'confirmAllCostsSubmitting = true'})} + ${h.csrf_token(request)} + + {{ confirmAllCostsSubmitting ? "Working, please wait..." : "Confirm All" }} + + ${h.end_form()} +
+
+ + % endif + + % if master.has_perm('auto_receive') and master.can_auto_receive(batch): + + Auto-Receive All Items + + +
+ +
+

Auto-Receive All Items

+
+ +
+

+ You can automatically set the "received" quantity to + match the "shipped" quantity for all items, based on + the invoice. +

+

+ Would you like to do so? +

+
+ +
+ + Cancel + + ${h.form(url('{}.auto_receive'.format(route_prefix), uuid=batch.uuid), **{'@submit': 'autoReceiveSubmitting = true'})} + ${h.csrf_token(request)} + + {{ autoReceiveSubmitting ? "Working, please wait..." : "Auto-Receive All Items" }} + + ${h.end_form()} +
+
+ + % endif +
- - -
- -
-

Auto-Receive All Items

-
- -
-

- You can automatically set the "received" quantity to - match the "shipped" quantity for all items, based on - the invoice. -

-

- Would you like to do so? -

-
- -
- - Cancel - - ${h.form(url('{}.auto_receive'.format(route_prefix), uuid=batch.uuid), **{'@submit': 'autoReceiveSubmitting = true'})} - ${h.csrf_token(request)} - - {{ autoReceiveSubmitting ? "Working, please wait..." : "Auto-Receive All Items" }} - - ${h.end_form()} -
-
- % endif @@ -117,13 +165,20 @@ ${self.render_status_breakdown()} ${self.render_po_vs_invoice_helper()} ${self.render_execute_helper()} - ${self.render_auto_receive_helper()} + ${self.render_tools_helper()} <%def name="modify_this_page_vars()"> ${parent.modify_this_page_vars()} diff --git a/tailbone/templates/batch/importer/view_row.mako b/tailbone/templates/batch/importer/view_row.mako index 9e08cf43..7d6f121f 100644 --- a/tailbone/templates/batch/importer/view_row.mako +++ b/tailbone/templates/batch/importer/view_row.mako @@ -68,7 +68,7 @@ % endif -<%def name="render_buefy_form()"> +<%def name="render_form()">

diff --git a/tailbone/templates/batch/inventory/desktop_form.mako b/tailbone/templates/batch/inventory/desktop_form.mako index 9f13cbf9..7e4795a8 100644 --- a/tailbone/templates/batch/inventory/desktop_form.mako +++ b/tailbone/templates/batch/inventory/desktop_form.mako @@ -34,7 +34,7 @@ -<%def name="render_form()"> +<%def name="render_form_template()"> @@ -113,7 +113,7 @@ }, data() { return { - groupPermissions: ${json.dumps(buefy_perms.get(selected_group, {}).get('permissions', []))|n}, + groupPermissions: ${json.dumps(perms_data.get(selected_group, {}).get('permissions', []))|n}, permissionGroupTerm: '', permissionTerm: '', selectedGroup: ${json.dumps(selected_group)|n}, diff --git a/tailbone/templates/products/batch.mako b/tailbone/templates/products/batch.mako index 868ad9b1..e0b93bd6 100644 --- a/tailbone/templates/products/batch.mako +++ b/tailbone/templates/products/batch.mako @@ -54,7 +54,7 @@ ${h.end_form()} -<%def name="render_form()"> +<%def name="render_form_template()"> diff --git a/tailbone/templates/products/view.mako b/tailbone/templates/products/view.mako index 5de6d099..c4da08ba 100644 --- a/tailbone/templates/products/view.mako +++ b/tailbone/templates/products/view.mako @@ -108,7 +108,7 @@ <%def name="lookup_codes_grid()"> - ${lookup_codes['grid'].render_buefy_table_element(data_prop='lookupCodesData')|n} + ${lookup_codes['grid'].render_table_element(data_prop='lookupCodesData')|n} <%def name="lookup_codes_panel()"> @@ -121,7 +121,7 @@ <%def name="sources_grid()"> - ${vendor_sources['grid'].render_buefy_table_element(data_prop='vendorSourcesData')|n} + ${vendor_sources['grid'].render_table_element(data_prop='vendorSourcesData')|n} <%def name="sources_panel()"> @@ -175,7 +175,7 @@

- ${regular_price_history_grid.render_buefy_table_element(data_prop='regularPriceHistoryData', loading='regularPriceHistoryLoading', paginated=True, per_page=10)|n} + ${regular_price_history_grid.render_table_element(data_prop='regularPriceHistoryData', loading='regularPriceHistoryLoading', paginated=True, per_page=10)|n}