Revert "LP1759343: Bills Annotation Persistance"

This reverts commit 10eea7f19e457cc9e35ea2b0bc1db58944209d5a.

This branch was backported to rel_3_1 where it does not belong.

Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
deleted file mode 100644 (file)
index ed749c9..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
-
-COMMIT;
-

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
index 13a9230..16c29fe 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -81,7 +81,7 @@
         <div class="form-group">
           <label for="annotate-payment" class="control-label col-md-5">[% l('Annotate') %]</label>
           <div class="col-md-1">
-            <input id="annotate-payment" type="checkbox" ng-model="annotate_payment" ng-change="onAnnotatePaymentChanged()"/>
+            <input id="annotate-payment" type="checkbox" ng-model="annotate_payment"/>
           </div>
           <div class="col-md-6">
             <button

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 295ad84..b644718 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -194,17 +194,12 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     $scope.amount_verified = false;
     $scope.disable_auto_print = false;
 
-    // Load persistant settings
+    // check receipt_on_pay setting default persisted
     egCore.hatch.getItem('circ.bills.receiptonpay')
                 .then(function(rcptOnPay){
                     if (rcptOnPay) $scope.receipt_on_pay.isChecked = rcptOnPay;
                 });
 
-    egCore.hatch.getItem('circ.bills.annotatepayment')
-                .then(function(annoPay){
-                    if (annoPay) $scope.annotate_payment = annoPay;
-                });
-
     // pre-define list-returning funcs in case we access them
     // before the grid instantiates
     $scope.gridControls = {
@@ -411,10 +406,6 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
         egCore.hatch.setItem('circ.bills.receiptonpay', $scope.receipt_on_pay.isChecked);
     }
 
-    $scope.onAnnotatePaymentChanged = function(){
-        egCore.hatch.setItem('circ.bills.annotatepayment', $scope.annotate_payment);
-    }
-
     function printReceipt(type, payment_ids, payments_made, note) {
         var payment_blobs = [];
         var cusr = patronSvc.current;