Attachment 107892 Details for Bug 26160 – Bug 26160: Make POS items table configurable

[patch] Bug 26160: Make POS items table configurable

Bug-26160-Make-POS-items-table-configurable.patch (text/plain), 3.66 KB, created by Martin Renvoize (ashimema) on 2020-08-06 13:51:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-06 13:51:26 UTC

Size: 3.66 KB

patch

obsolete

>From 8beaa771dd879b74cb1da6edafef3218f53d94c0 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 6 Aug 2020 14:33:32 +0100
>Subject: [PATCH] Bug 26160: Make POS items table configurable
>
>---
> admin/columns_settings.yml                       | 16 ++++++++++++++++
> .../prog/en/modules/admin/columns_settings.tt    |  6 ++++++
> .../intranet-tmpl/prog/en/modules/pos/pay.tt     | 11 +++++++----
> 3 files changed, 29 insertions(+), 4 deletions(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index 1a24b3084b..c147a5e1a3 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -1432,3 +1432,19 @@ modules:
>               columnname: actions
>               cannot_be_toggled: 1
>               cannot_be_modified: 1
>+
>+  pos:
>+    pay:
>+      invoices:
>+        columns:
>+            -
>+              columnname: code
>+            -
>+              columnname: description
>+            -
>+              columnname: cost
>+            -
>+              columnname: actions
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>index 3d7a59e686..e2a5448706 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>@@ -242,6 +242,12 @@
>                                     [% PROCESS pagelist module=modules.members modulename="members" %]
>                                 </div>
> 
>+                                <div class="panel_header"><a href="#pos">Point of sale</a></div>
>+                                <div id="pos">
>+                                    <h3>Point of sale tables</h3>
>+                                    [% PROCESS pagelist module=modules.pos modulename="pos" %]
>+                                </div>
>+
>                                 <div class="panel_header"><a href="#tools">Tools</a></div>
>                                 <div id="tools">
>                                     <h3>Tools tables</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>index 021e4ea611..bcdbbe86c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>@@ -2,6 +2,7 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE Price %]
>+[% USE TablesSettings %]
> [% SET footerjs = 1 %]
> [% PROCESS 'payments.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -175,6 +176,7 @@
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'format_price.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>+    [% INCLUDE 'columns_settings.inc' %]
>     [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %]
>     <script>
>     function moneyFormat(textObj) {
>@@ -329,13 +331,14 @@
>                 sale_table.DataTable().row($(this).parents('tr')).remove().draw(false);
>         });
> 
>-        var items_table = $("#invoices").dataTable($.extend(true,{}, dataTablesDefaults, {
>+        var items_columns_settings = [% TablesSettings.GetColumns('pos', 'pay', 'invoices', 'json') | $raw %];
>+        var items_table = KohaTable("invoices", {
>+               "sPaginationType": "full",
>+               "aaSorting": [[ 0, "asc" ]],
>                "aoColumnDefs": [
>                   { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable":false },
>                ],
>-               "aaSorting": [[ 0, "asc" ]],
>-               "paginationType": "full",
>-        }));
>+        }, items_columns_settings);
> 
>         $(".add_button").on("click", function(e) {
>             e.preventDefault();
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26160: 107892 | 108007 | 108014 | 108102