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

(-)a/acqui/basket.pl (-1 / +16 lines)
Lines 118-124 $template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2'; Link Here
118
118
119
my @messages;
119
my @messages;
120
120
121
if ( $op eq 'delete_confirm' ) {
121
if ( $op eq 'cud-delete-order' ) {
122
    output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
123
        unless $logged_in_patron->has_permission( { acquisition => 'order_manage' } );
124
125
    # We only allow deleting cancelled line without biblionumber for now
126
    my $ordernumber = $query->param('ordernumber');
127
    my $order       = Koha::Acquisition::Orders->search(
128
        {
129
            biblionumber => undef,
130
            ordernumber  => $ordernumber, orderstatus => 'cancelled'
131
        }
132
    );
133
    $order->delete if $order;
134
    $op = 'list';
135
136
} elsif ( $op eq 'delete_confirm' ) {
122
137
123
    output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
138
    output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
124
      unless $logged_in_patron->has_permission( { acquisition => 'delete_baskets' } );
139
      unless $logged_in_patron->has_permission( { acquisition => 'delete_baskets' } );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +24 lines)
Lines 751-756 Link Here
751
                                                    <th>GST %</th>
751
                                                    <th>GST %</th>
752
                                                    <th>GST</th>
752
                                                    <th>GST</th>
753
                                                    <th>Fund</th>
753
                                                    <th>Fund</th>
754
                                                    <th>Delete order</th>
754
                                                </tr>
755
                                                </tr>
755
                                            </thead>
756
                                            </thead>
756
                                            <tbody>
757
                                            <tbody>
Lines 811-821 Link Here
811
                                                        <td class="number">[% order.total_tax_included | $Price %]</td>
812
                                                        <td class="number">[% order.total_tax_included | $Price %]</td>
812
                                                        <td class="number">[% order.tax_rate * 100 | html %]</td>
813
                                                        <td class="number">[% order.tax_rate * 100 | html %]</td>
813
                                                        <td class="number">[% order.tax_value | $Price %]</td>
814
                                                        <td class="number">[% order.tax_value | $Price %]</td>
814
                                                        <td>[% order.budget_name | html %]
815
                                                        <td>[% order.budget_name | html %]</td>
816
                                                        <td>
817
                                                            [% UNLESS closedate %]<a class="delete_order" href="#" data-ordernumber="[% order.ordernumber | html %]" data-biblionumber="[% order.biblionumber | html %]">Delete</a>[% END %]
818
                                                        </td>
815
                                                    </tr>
819
                                                    </tr>
816
                                                [% END # /FOREACH order %]
820
                                                [% END # /FOREACH order %]
817
                                            </tbody>
821
                                            </tbody>
818
                                        </table> <!-- /#cancelledorderst -->
822
                                        </table> <!-- /#cancelledorderst -->
823
                                        <form id="delete_order_form" method="post">
824
                                            <input type="hidden" name="op" value="cud-delete-order"/>
825
                                            <input type="hidden" name="ordernumber" value=""/>
826
                                            <input type="hidden" name="basketno" value="[% basketno | html %]"/>
827
                                        </form>
819
                                    </div> <!-- /#cancelledorders -->
828
                                    </div> <!-- /#cancelledorders -->
820
                                [% END # /IF (cancelledorders_loop) %]
829
                                [% END # /IF (cancelledorders_loop) %]
821
                                <br />
830
                                <br />
Lines 1081-1086 Link Here
1081
                    window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno | html %]";
1090
                    window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno | html %]";
1082
                }
1091
                }
1083
            }
1092
            }
1093
1094
            $(document).ready(function() {
1095
                $(".delete_order").on('click', function(e) {
1096
                    e.preventDefault();
1097
                    if( $(this).data('biblionumber') ) {
1098
                        alert( _("Please delete the linked bibliographic record first.") );
1099
                        return false;
1100
                    } else if( !confirm(_("Are you sure you want to delete this order line?")) ) {
1101
                        return false;
1102
                    }
1103
                    $('#delete_order_form input[name="ordernumber"]').val( $(this).data('ordernumber') );
1104
                    $('#delete_order_form').submit();
1105
                });
1106
            });
1084
        </script>
1107
        </script>
1085
    [% ELSE %]
1108
    [% ELSE %]
1086
        <script>
1109
        <script>
1087
- 

Return to bug 18360