View | Details | Raw Unified | Return to bug 36193
Collapse All | Expand All

(-)a/acqui/parcel.pl (-1 / +1 lines)
Lines 82-88 my $op = $input->param('op') // ''; Link Here
82
82
83
# process cancellation first so that list of
83
# process cancellation first so that list of
84
# orders to display is calculated after
84
# orders to display is calculated after
85
if ($op eq 'cancelreceipt') {
85
if ($op eq 'cud-cancelreceipt') {
86
    my $ordernumber = $input->param('ordernumber');
86
    my $ordernumber = $input->param('ordernumber');
87
    my $parent_ordernumber = CancelReceipt($ordernumber);
87
    my $parent_ordernumber = CancelReceipt($ordernumber);
88
    unless($parent_ordernumber) {
88
    unless($parent_ordernumber) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +12 lines)
Lines 294-300 Link Here
294
                          Can't cancel receipt
294
                          Can't cancel receipt
295
                      </span>
295
                      </span>
296
                    [% ELSE %]
296
                    [% ELSE %]
297
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]&op=cancelreceipt&ordernumber=[% order.ordernumber | uri %]">Cancel receipt</a>
297
                        <form id="cancel_receipt_[% order.ordernumber | html %]" method="post" action="/cgi-bin/koha/acqui/parcel.pl">
298
                            [% INCLUDE 'csrf-token.inc' %]
299
                            <input type="hidden" name="op" value="cud-cancelreceipt" />
300
                            <input type="hidden" name="ordernumber" value="[% order.ordernumber | html %]" />
301
                            <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
302
                        </form>
303
                        <a href="#" class="cancel_receipt" data-ordernumber="[% order.ordernumber | html %]">Cancel receipt</a>
298
                    [% END %]
304
                    [% END %]
299
                </td>
305
                </td>
300
            </tr>
306
            </tr>
Lines 359-364 Link Here
359
365
360
        $(document).ready(function(){
366
        $(document).ready(function(){
361
367
368
            $(".cancel_receipt").on( 'click', function(e){
369
                e.preventDefault();
370
                $('#cancel_receipt_' + $(this).data('ordernumber')).submit();
371
            });
372
362
            if ( $("#receivedt").length ) {
373
            if ( $("#receivedt").length ) {
363
                var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
374
                var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, {
364
                    "stateSave": true,
375
                    "stateSave": true,
365
- 

Return to bug 36193