From 9a308a151b90463893f20aa25b160f6ce5bb0002 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 20 Sep 2017 18:16:57 -0400 Subject: [PATCH] LP#1622696 Webstaff credit card payment support Support collecting credit card info for both EG-processed and externally-processed credit card payments, consistent with the XUL client. Refactor the chain of events leading up to payment submission, including verifying warning-level payment amounts, annotating payments, and collecting credit card data so the user is able to perform any or all of these steps and cleanly cancel at any point along the way. Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton Signed-off-by: Mike Rylander --- .../staff/circ/patron/t_cc_payment_dialog.tt2 | 127 +++++++++++++++++++++ Open-ILS/src/templates/staff/css/style.css.tt2 | 7 ++ .../web/js/ui/default/staff/circ/patron/bills.js | 107 ++++++++++++----- 3 files changed, 211 insertions(+), 30 deletions(-) create mode 100644 Open-ILS/src/templates/staff/circ/patron/t_cc_payment_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/circ/patron/t_cc_payment_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_cc_payment_dialog.tt2 new file mode 100644 index 0000000000..44ee85ad7f --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/patron/t_cc_payment_dialog.tt2 @@ -0,0 +1,127 @@ +
+ +

+ [% l('Credit Card Information') %] +

+
+
+
+
[% l('Credit Card Info') %]
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
[% l('Optional Fields') %]
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + +
+ diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 2369cd4415..e5a661a8a3 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -205,6 +205,13 @@ table.list tr.selected td { /* deprecated? */ background-color: rgb(248, 248, 248); } +/* Reduces the vertical space added by form-group's. Especially useful + * for tall modal windows. + */ +.tight-vert-form .form-group { + margin-bottom: 5px; +} + /* ---------------------------------------------------------------------- * Grid 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 c648def4b2..4fa6398c10 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js @@ -24,7 +24,7 @@ function($q , egCore , egWorkLog , patronSvc) { .then(function(summary) {return service.summary = summary}) } - service.applyPayment = function(type, payments, note, check) { + service.applyPayment = function(type, payments, note, check, cc_args) { return egCore.net.request( 'open-ils.circ', 'open-ils.circ.money.payment', @@ -34,7 +34,8 @@ function($q , egCore , egWorkLog , patronSvc) { payment_type : type, check_number : check, payments : payments, - patron_credit : 0 + patron_credit : 0, + cc_args : cc_args }, patronSvc.current.last_xact_id() ).then(function(resp) { @@ -143,10 +144,10 @@ function($q , egCore , egWorkLog , patronSvc) { .controller('PatronBillsCtrl', ['$scope','$q','$routeParams','egCore','egConfirmDialog','$location', 'egGridDataProvider','billSvc','patronSvc','egPromptDialog', 'egAlertDialog', - 'egBilling', + 'egBilling','$uibModal', function($scope , $q , $routeParams , egCore , egConfirmDialog , $location, egGridDataProvider , billSvc , patronSvc , egPromptDialog, egAlertDialog, - egBilling) { + egBilling , $uibModal) { $scope.initTab('bills', $routeParams.id); billSvc.userId = $routeParams.id; @@ -316,10 +317,10 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location, // generates payments, collects user note if needed, and sends payment // to server. - function sendPayment(note) { + function sendPayment(note, cc_args) { var make_payments = generatePayments(); - billSvc.applyPayment( - $scope.payment_type, make_payments, note, $scope.check_number) + billSvc.applyPayment($scope.payment_type, + make_payments, note, $scope.check_number, cc_args) .then(function(payment_ids) { if (!$scope.disable_auto_print && $scope.receipt_on_pay.isChecked) { @@ -498,32 +499,78 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location, return; } - if (($scope.payment_amount > $scope.warn_amount) && ($scope.amount_verified == false)) { - egConfirmDialog.open( - egCore.strings.PAYMENT_WARN_AMOUNT_TITLE, egCore.strings.PAYMENT_WARN_AMOUNT, - { payment_amount : ''+$scope.payment_amount, - ok : function() { - $scope.amount_verfied = true; - $scope.applyPayment(); - }, - cancel : function() { - $scope.payment_amount = 0; + verify_payment_amount().then( + function() { // amount confirmed + add_payment_note().then(function(pay_note) { + add_cc_args().then(function(cc_args) { + sendPayment(pay_note, cc_args); + }) + }); + }, + function() { // amount rejected + console.warn('payment amount rejected'); + $scope.payment_amount = 0; + } + ); + } + + function verify_payment_amount() { + if ($scope.payment_amount < $scope.warn_amount) + return $q.when(); + + return egConfirmDialog.open( + egCore.strings.PAYMENT_WARN_AMOUNT_TITLE, + egCore.strings.PAYMENT_WARN_AMOUNT, + {payment_amount : ''+$scope.payment_amount} + ).result; + } + + function add_payment_note() { + if (!$scope.annotate_payment) return $q.when(); + return egPromptDialog.open( + egCore.strings.ANNOTATE_PAYMENT_MSG, '').result; + } + + function add_cc_args() { + if ($scope.payment_type != 'credit_card_payment') + return $q.when(); + + return $uibModal.open({ + templateUrl : './circ/patron/t_cc_payment_dialog', + controller : [ + '$scope','$uibModalInstance', + function($scope , $uibModalInstance) { + + $scope.context = { + cc : { + where_process : '1', // internal=1 ; external=0 + type : 'VISA', // external only + billing_first : patronSvc.current.first_given_name(), + billing_last : patronSvc.current.family_name() + } } - } - ); - return; - } - $scope.amount_verfied = false; + var addr = patronSvc.current.billing_address() || + patronSvc.current.mailing_address(); + if (addr) { + var cc = $scope.context.cc; + cc.billing_address = addr.street1() + + (addr.street2() ? ' ' + addr.street2() : ''); + cc.billing_city = addr.city(); + cc.billing_state = addr.state(); + cc.billing_zip = addr.post_code(); + } - if ($scope.annotate_payment) { - egPromptDialog.open( - egCore.strings.ANNOTATE_PAYMENT_MSG, '', - {ok : function(value) {sendPayment(value)}} - ); - } else { - sendPayment(); - } + $scope.ok = function() { + $uibModalInstance.close($scope.context.cc); + } + + $scope.cancel = function() { + $uibModalInstance.dismiss(); + } + } + ] + }).result; } $scope.voidAllBillings = function(items) { -- 2.11.0