From 99560240a112fd984d7218fe0e195a9593c9d975 Mon Sep 17 00:00:00 2001 From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Tue, 26 Apr 2011 20:44:46 +0000 Subject: [PATCH] Hold, Transit, and Hold/Transit Slips used to suppress the printer dialog, but we lost that when we moved to templated slips. This adds a sticky Printer Prompt checkbox to Check In for controlling that behavior. git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_1@20329 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 1 + Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul | 1 + Open-ILS/xul/staff_client/server/circ/util.js | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 582673bd65..405dccabbc 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2176,6 +2176,7 @@ <!ENTITY staff.circ.checkin_overlay.actions.label "Actions for Selected Items"> <!ENTITY staff.circ.checkin_overlay.actions.accesskey "S"> <!ENTITY staff.circ.checkin_overlay.checkin_export.label "Export"> +<!ENTITY staff.circ.checkin_overlay.printer_prompt.label "Printer Prompt"> <!ENTITY staff.circ.checkin_overlay.trim_list.label "Trim List (20 rows)"> <!ENTITY staff.circ.checkin_overlay.async_checkin.label "Fast Entry (Asynchronous)"> <!ENTITY staff.circ.checkin_overlay.strict_barcode.label "Strict Barcode"> diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul index e208d5b606..522a740a1d 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul +++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul @@ -155,6 +155,7 @@ label="&staff.checkin.print_receipt.label;" command="cmd_checkin_print" accesskey="&staff.checkin.print_receipt.accesskey;"/> + <checkbox id="printer_prompt" label="&staff.circ.checkin_overlay.printer_prompt.label;" checked="true" oils_persist="checked"/> <checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> <checkbox id="async_checkin" label="&staff.circ.checkin_overlay.async_checkin.label;" checked="false" oils_persist="checked"/> <checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 3e13c55600..35870e4ef7 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -2819,6 +2819,9 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che 'list' : print_list, 'data' : print_data }; + if ($('printer_prompt')) { + if (! $('printer_prompt').checked) { params.no_prompt = true; } + } print.tree_list( params ); } } catch(E) { @@ -3209,6 +3212,9 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che 'list' : print_list, 'data' : print_data }; + if ($('printer_prompt')) { + if (! $('printer_prompt').checked) { params.no_prompt = true; } + } print.tree_list( params ); } } catch(E) { -- 2.11.0