Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 24082: Add refund action to relevant lines 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
20.05.x
Martin Renvoize 4 years ago
parent
d4d1ffb91c
commit
d16710382e
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
2 changed files with 105 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
  2. 34
      pos/register.pl

72
koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
View File

@ -2,6 +2,7 @@
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE Price %]
[% SET footerjs = 1 %]
[% PROCESS 'accounts.inc' %]
@ -77,7 +78,13 @@
</td>
<td>[% credit.debit.amount | $Price %]</td>
<td></td>
<td></td>
<td>
[% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED' ) %]
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-quantity="[% credit.debit.note | html %]"><i class="fa fa-money"></i> Issue refund</button>
[% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber %]
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-quantity="[% credit.debit.note | html %]"><i class="fa fa-money"></i> Issue refund</button>
[% END %]
</td>
</tr>
[% END %]
[% END %]
@ -138,6 +145,57 @@
</div> <!-- /.modal-dialog -->
</div> <!-- /#confirmCashupModal -->
<!-- Issue refund modal -->
<div class="modal" id="issueRefundModal" tabindex="-1" role="dialog" aria-labelledby="issueRefundLabel">
<form id="refund_form" method="post" enctype="multipart/form-data" class="validated">
<input type="hidden" name="accountline" value="" id="refundline">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="issueRefundLabel">Issue refund from <em>[% register.description | html %]</em></h4>
</div>
<div class="modal-body">
<fieldset class="rows">
<ol>
<li>
<span id="item" class="label">Item: </span><span></span>
</li>
<li>
<span id="paid" class="label">Amount paid: </span><span></span>
</li>
<li>
<label class="required" for="amount">Returned to patron: </label>
<input type="number" step="0.01" id="returned" name="amount" min="0.00" required="required">
<span class="required">Required</span>
</li>
[% SET payment_types = [] %]
[% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
[% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
[% payment_types.push(pt) %]
[% END %]
<li>
<label for="transaction_type">Transaction type: </label>
<select name="transaction_type" id="transaction_type">
[% FOREACH pt IN payment_types %]
<option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
[% END %]
</select>
</li>
</ol>
</fieldset> <!-- /.rows -->
</div> <!-- /.modal-body -->
<div class="modal-footer">
<input type="hidden" name="registerid" value="[% register.id | html %]">
<input type="hidden" name="op" value="refund">
<button type="submit" class="btn btn-default">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div> <!-- /.modal-footer -->
</div> <!-- /.modal-content -->
</div> <!-- /.modal-dialog -->
</form> <!-- /#refund_form -->
</div> <!-- /#issueRefundModal -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
@ -162,6 +220,18 @@
}
}));
$("#issueRefundModal").on("shown.bs.modal", function(e){
var button = $(e.relatedTarget);
var item = button.data('item');
$("#item + span").replaceWith(item);
var accountline = button.data('accountline');
$('#refundline').val(accountline);
var amount = button.data('amount');
$("#paid + span").replaceWith(amount);
$("#returned").attr({ "value": amount, "max": amount });
$("#returned, #transaction_type").focus();
});
$(".printReceipt").click(function() {
var accountlines_id = $(this).data('accountline');
var win = window.open('/cgi-bin/koha/pos/printreceipt.pl?action=print&accountlines_id=' + accountlines_id, '_blank');

34
pos/register.pl
View File

@ -38,6 +38,7 @@ my ( $template, $loggedinuser, $cookie, $user_flags ) = get_template_and_user(
}
);
my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
my $schema = Koha::Database->new->schema;
my $library_id = C4::Context->userenv->{'branch'};
my $registerid = $input->param('registerid');
@ -78,6 +79,39 @@ else {
}
);
}
elsif ( $op eq 'refund' ) {
my $amount = $input->param('amount');
my $quantity = $input->param('quantity');
my $accountline_id = $input->param('accountline');
my $transaction_type = $input->param('transaction_type');
my $accountline = Koha::Account::Lines->find($accountline_id);
$schema->txn_do(
sub {
my $refund = $accountline->reduce(
{
reduction_type => 'Refund',
branch => $library_id,
staff_id => $logged_in_user->id,
interface => 'intranet',
amount => $amount
}
);
my $payout = $refund->payout(
{
payout_type => $transaction_type,
branch => $library_id,
staff_id => $logged_in_user->id,
cash_register => $cash_register->id,
interface => 'intranet',
amount => $amount
}
);
}
);
}
}
output_html_with_http_headers( $input, $cookie, $template->output );

Write Preview
Loading…
Cancel
Save