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

(-)a/installer/onboarding.pl (-12 / +16 lines)
Lines 305-324 if ( $step > 5 && $cur ) { Link Here
305
    my $isocode       = $input->param('isocode');
305
    my $isocode       = $input->param('isocode');
306
    my $rate          = $input->param('rate');
306
    my $rate          = $input->param('rate');
307
    my $active        = $input->param('active');
307
    my $active        = $input->param('active');
308
    my $p_sep_by_space = $input->param('p_sep_by_space');
308
    my $is_a_modif    = $input->param('is_a_modif');
309
    my $is_a_modif    = $input->param('is_a_modif');
309
    my $currency = Koha::Acquisition::Currency->new(
310
    if ($currency_code) {
310
        {   currency => $currency_code,
311
        my $currency = Koha::Acquisition::Currency->new(
311
            symbol   => $symbol,
312
            {   currency => $currency_code,
312
            isocode  => $isocode,
313
                symbol   => $symbol,
313
            rate     => $rate,
314
                isocode  => $isocode,
314
            active   => $active,
315
                rate     => $rate,
316
                active   => $active,
317
                p_sep_by_space => $p_sep_by_space,
318
            }
319
        );
320
        eval { $currency->store; };
321
        if ($@) {
322
            push @messages, { type => 'error', code => 'error_on_insert' };
323
        } else {
324
            push @messages, { type => 'message', code => 'success_on_insert' };
315
        }
325
        }
316
    );
317
    eval { $currency->store; };
318
    if ($@) {
319
        push @messages, { type => 'error', code => 'error_on_insert' };
320
    } else {
321
        push @messages, { type => 'message', code => 'success_on_insert' };
322
    }
326
    }
323
    $cur = Koha::Acquisition::Currencies->get_active;
327
    $cur = Koha::Acquisition::Currencies->get_active;
324
    if ($cur) {
328
    if ($cur) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep6.tt (-14 / +19 lines)
Lines 7-15 Link Here
7
    [% END %]
7
    [% END %]
8
</title>
8
</title>
9
[% INCLUDE 'installer-doc-head-close.inc' %]
9
[% INCLUDE 'installer-doc-head-close.inc' %]
10
[% INCLUDE 'validator-strings.inc' %]
11
[% INCLUDE 'installer-strings.inc' %]
12
<script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script>
13
</head>
10
</head>
14
11
15
<body id="installer" class="installer">
12
<body id="installer" class="installer">
Lines 43-65 Link Here
43
                                   [% IF currency %]
40
                                   [% IF currency %]
44
                                        <span class="label">Currency: </span>
41
                                        <span class="label">Currency: </span>
45
                                        <input type="hidden" name="is_a_modif" value="1" />
42
                                        <input type="hidden" name="is_a_modif" value="1" />
46
                                        <input type="hidden" name="currency_code" id="currency" value="[% currency.currency %]" />[% currency.currency %]
43
                                        <input type="hidden" name="currency_code" id="currency" value="[% currency.currency | html %]" />[% currency.currency | html %]
47
                                    [% ELSE %]
44
                                    [% ELSE %]
48
                                        <label for="currency_code" class="required">Currency: </label>
45
                                        <label for="currency_code" class="required">Currency: </label>
49
                                        <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="requ    ired" /> <span class="required">Required</span>
46
                                        <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="required" /> <span class="required">Required</span>
50
                                    [% END %]
47
                                    [% END %]
51
                                </li>
48
                                </li>
52
                                <li>
49
                                <li>
53
                                        <label for="rate" class="required">Rate: </label>
50
                                    <label for="rate" class="required">Rate: </label>
54
                                        <input type="text" name="rate" id="rate" size="10" maxlength="10" value=1 readonly /> <span class="required">Required</span>
51
                                    <input type="text" name="rate" id="rate" size="10" maxlength="10" value=1 readonly /> <span class="required">Required</span>
55
                                </li>
52
                                </li>
56
                                <li>
53
                                <li>
57
                                        <label for="symbol" class="required">Symbol: </label>
54
                                    <label for="symbol" class="required">Symbol: </label>
58
                                        <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol %]" required="required" class="required" /> <span class="required">Required</span>
55
                                    <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol | html %]" required="required" class="required" /> <span class="required">Required</span>
59
                                </li>
56
                                </li>
60
                                <li>
57
                                <li>
61
                                        <label for="isocode">ISO code: </label>
58
                                    <label for="isocode">ISO code: </label>
62
                                        <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% currency.isocode %]" />
59
                                    <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% currency.isocode | html %]" />
60
                                </li>
61
                                <li>
62
                                    <label for="isocode">Space separation between symbol and value: </label>
63
                                    <input type="checkbox" name="p_sep_by_space" id="p_sep_by_space" size="5" maxlength="5" value="1" />
63
                                </li>
64
                                </li>
64
                                        <input type="hidden" id="active" name="active" value="1"/>
65
                                        <input type="hidden" id="active" name="active" value="1"/>
65
                            </ol>
66
                            </ol>
Lines 75-79 Link Here
75
                [% END %]
76
                [% END %]
76
            </div> <!-- / #onboarding-step6 -->
77
            </div> <!-- / #onboarding-step6 -->
77
        </div> <!-- / .row -->
78
        </div> <!-- / .row -->
78
79
    </div> <!-- / .container-fluid -->
79
[% INCLUDE 'intranet-bottom.inc' %]
80
[% MACRO jsinclude BLOCK %]
81
    [% INCLUDE 'validator-strings.inc' %]
82
    [% INCLUDE 'installer-strings.inc' %]
83
    <script type="text/javascript" src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
84
[% END %]
85
[% INCLUDE 'installer-intranet-bottom.inc' %]
80
- 

Return to bug 18888