added sample selfcheck fines receipt and plugged in fines printing from self-check UI

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15120 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2800847..8371144 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0111'); -- berick
+INSERT INTO config.upgrade_log (version) VALUES ('0112'); -- berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index dec3a7d..0f6ac05 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2840,3 +2840,56 @@ INSERT INTO action_trigger.environment ( event_def, path) VALUES
     ( 12, 'pickup_lib'),
     ( 12, 'usr');
 
+-- fines receipt
+
+INSERT INTO action_trigger.hook (key, core_type, description, passive) 
+    VALUES (
+        'format.selfcheck.fines',
+        'au',
+        'Formats fines for self-checkout receipt',
+        TRUE
+    );
+
+INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, granularity, template )
+    VALUES (
+        13,
+        TRUE,
+        1,
+        'Self-Checkout Fines Receipt',
+        'format.selfcheck.fines',
+        'NOOP_True',
+        'ProcessTemplate',
+        'print-on-demand',
+$$
+[%- USE date -%]
+[%- SET user = target -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>
+
+    [% user.family_name %], [% user.first_given_name %]
+    <ol>
+    [% FOR xact IN user.open_billable_transactions_summary %]
+        <li>
+            <div>Details: 
+                [% IF xact.xact_type == 'circulation' %]
+                    [%- helpers.get_copy_bib_basics(xact.circulation.target_copy).title -%]
+                [% ELSE %]
+                    [%- xact.last_billing_type -%]
+                [% END %]
+            </div>
+            <div>Total Billed: [% xact.total_owed %]</div>
+            <div>Total Paid: [% xact.total_paid %]</div>
+            <div>Balance Owed : [% xact.balance_owed %]</div>
+        </li>
+    [% END %]
+    </ol>
+</div>
+$$
+);
+
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES
+    ( 13, 'open_billable_transactions_summary.circulation' );
+

diff --git a/Open-ILS/src/sql/Pg/upgrade/0112.data.selfcheck-fines-receipt-template.sql b/Open-ILS/src/sql/Pg/upgrade/0112.data.selfcheck-fines-receipt-template.sql
new file mode 100644 (file)
index 0000000..65ad27f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0112.data.selfcheck-fines-receipt-template.sql
@@ -0,0 +1,56 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0112');
+
+INSERT INTO action_trigger.hook (key, core_type, description, passive) 
+    VALUES (
+        'format.selfcheck.fines',
+        'au',
+        'Formats fines for self-checkout receipt',
+        TRUE
+    );
+
+INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, granularity, template )
+    VALUES (
+        13,
+        TRUE,
+        1,
+        'Self-Checkout Fines Receipt',
+        'format.selfcheck.fines',
+        'NOOP_True',
+        'ProcessTemplate',
+        'print-on-demand',
+$$
+[%- USE date -%]
+[%- SET user = target -%]
+<div>
+    <style> li { padding: 8px; margin 5px; }</style>
+    <div>[% date.format %]</div>
+    <br/>
+
+    [% user.family_name %], [% user.first_given_name %]
+    <ol>
+    [% FOR xact IN user.open_billable_transactions_summary %]
+        <li>
+            <div>Details: 
+                [% IF xact.xact_type == 'circulation' %]
+                    [%- helpers.get_copy_bib_basics(xact.circulation.target_copy).title -%]
+                [% ELSE %]
+                    [%- xact.last_billing_type -%]
+                [% END %]
+            </div>
+            <div>Total Billed: [% xact.total_owed %]</div>
+            <div>Total Paid: [% xact.total_paid %]</div>
+            <div>Balance Owed : [% xact.balance_owed %]</div>
+        </li>
+    [% END %]
+    </ol>
+</div>
+$$
+);
+
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES
+    ( 13, 'open_billable_transactions_summary.circulation' );
+
+COMMIT;

diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index 8e16638..8b90980 100644 (file)
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -610,6 +610,7 @@ SelfCheckManager.prototype.drawFinesPage = function() {
 
     var self = this;
     var handler = function(dataList) {
+        self.finesCount = dataList.length;
         for(var i in dataList) {
             var data = dataList[i];
             var row = self.finesTemplate.cloneNode(true);
@@ -1102,6 +1103,48 @@ SelfCheckManager.prototype.printHoldsReceipt = function(callback) {
 }
 
 
+/**
+ * Print a receipt for this user's items out
+ */
+SelfCheckManager.prototype.printFinesReceipt = function(callback) {
+
+    progressDialog.show(true);
+
+    var params = [
+        this.authtoken, 
+        this.staff.ws_ou(),
+        null,
+        'format.selfcheck.fines',
+        'print-on-demand',
+        [this.patron.id()]
+    ];
+
+    var self = this;
+    fieldmapper.standardRequest(
+        ['open-ils.circ', 'open-ils.circ.fire_user_trigger_events'],
+        {   
+            async : true,
+            params : params,
+            oncomplete : function(r) {
+                progressDialog.hide();
+                var resp = openils.Util.readResponse(r);
+                var output = resp.template_output();
+                if(output) {
+                    self.printData(output.data(), self.finesCount, callback); 
+                } else {
+                    var error = resp.error_output();
+                    if(error) {
+                        throw new Error("Error creating receipt: " + error.data());
+                    } else {
+                        throw new Error("No receipt data returned from server");
+                    }
+                }
+            }
+        }
+    );
+}
+
+
 
 
 /**

diff --git a/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
index 423cc25..36de24f 100644 (file)
--- a/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/fines.tt2
@@ -4,7 +4,7 @@
             <tr>
                 <td>Type</td>
                 <td>Details</td>
-                <td>Total Owed</td>
+                <td>Total Billed</td>
                 <td>Total Paid</td>
                 <td>Balance Owed</td>
             </tr>