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

(-)a/acqui/basket.pl (-3 / +7 lines)
Lines 613-628 sub edi_close_and_order { Link Here
613
        }
613
        }
614
        exit;
614
        exit;
615
    } else {
615
    } else {
616
617
        my $ean_description = $query->param('ean_description');
618
        my $ean_branch      = $query->param('ean_branch');
619
616
        $template->param(
620
        $template->param(
617
            edi_confirm     => 1,
621
            edi_confirm     => 1,
618
            booksellerid    => $booksellerid,
622
            booksellerid    => $booksellerid,
619
            basketno        => $basket->{basketno},
623
            basketno        => $basket->{basketno},
620
            basketname      => $basket->{basketname},
624
            basketname      => $basket->{basketname},
621
            basketgroupname => $basket->{basketname},
625
            basketgroupname => $basket->{basketname},
626
            ean             => $ean             ? $ean             : '',
627
            ean_description => $ean_description ? $ean_description : '',
628
            ean_branch      => $ean_branch      ? $ean_branch      : '',
622
        );
629
        );
623
        if ($ean) {
624
            $template->param( ean => $ean );
625
        }
626
630
627
    }
631
    }
628
    return;
632
    return;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-4 / +9 lines)
Lines 150-155 Link Here
150
                                                            class="btn btn-default btn-xs submit-form-link"
150
                                                            class="btn btn-default btn-xs submit-form-link"
151
                                                            href="#"
151
                                                            href="#"
152
                                                            data-ean="[% eanacct.ean | html %]"
152
                                                            data-ean="[% eanacct.ean | html %]"
153
                                                            data-ean_description="[% eanacct.description | html %]"
154
                                                            data-ean_branch="[% eanacct.branch.branchname | html %]"
153
                                                            data-basketno="[% basketno | html %]"
155
                                                            data-basketno="[% basketno | html %]"
154
                                                            data-action="basket.pl"
156
                                                            data-action="basket.pl"
155
                                                            data-method="post"
157
                                                            data-method="post"
Lines 1015-1021 Link Here
1015
            <div id="closebasket_needsconfirmation" class="alert alert-warning">
1017
            <div id="closebasket_needsconfirmation" class="alert alert-warning">
1016
                <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
1018
                <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
1017
                    [% INCLUDE 'csrf-token.inc' %]
1019
                    [% INCLUDE 'csrf-token.inc' %]
1018
                    <h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname | html %]?</h1>
1020
                    <h1>Are you sure you want to generate this EDIFACT order?</h1>
1021
                    <ul>
1022
                        <li> An EDIFACT order will be generated for <b> [% ean_branch | html %] ([% ean | html %]) [% IF ean_description %][% ean_description | html %][% END %]</b></li>
1023
                        <li> The basket <b>[% basketname | html %]</b> will be closed </li>
1024
                    </ul>
1019
                    [% IF CAN_user_acquisition_group_manage %]
1025
                    [% IF CAN_user_acquisition_group_manage %]
1020
                        <p>
1026
                        <p>
1021
                            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
1027
                            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
Lines 1028-1038 Link Here
1028
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
1034
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
1029
                    <input type="hidden" name="confirm" value="1" />
1035
                    <input type="hidden" name="confirm" value="1" />
1030
                    <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
1036
                    <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
1031
                    <button type="submit" class="btn btn-default approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
1037
                    <button type="submit" class="btn btn-default approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, generate order and close basket (Y)</button>
1032
                </form>
1038
                </form>
1033
                <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
1039
                <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
1034
                    <input type="hidden" name="basketno" value="[% basketno | html %]" />
1040
                    <input type="hidden" name="basketno" value="[% basketno | html %]" />
1035
                    <button type="submit" class="btn btn-default deny" accesskey="N"><i class="fa fa-fw fa-times"></i> No, don't close (N)</button>
1041
                    <button type="submit" class="btn btn-default deny" accesskey="N"><i class="fa fa-fw fa-times"></i> Cancel (C)</button>
1036
                </form>
1042
                </form>
1037
            </div>
1043
            </div>
1038
            <!-- /#closebasket_needsconfirmation -->
1044
            <!-- /#closebasket_needsconfirmation -->
1039
- 

Return to bug 39572