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

(-)a/acqui/acqui-home.pl (+9 lines)
Lines 107-112 foreach my $budget ( @{$budget_arr} ) { Link Here
107
    push @budget_loop, $budget;
107
    push @budget_loop, $budget;
108
}
108
}
109
109
110
my $budgets = GetBudgetPeriod();
111
if ($budgets > 0) {
112
    my $stepfund = 2;
113
    $template->param( stepfund => $stepfund );
114
}else{
115
    my $stepfund = 1;
116
    $template->param( stepfund => $stepfund );
117
}
118
110
$template->param(
119
$template->param(
111
    type          => 'intranet',
120
    type          => 'intranet',
112
    loop_budget   => \@budget_loop,
121
    loop_budget   => \@budget_loop,
(-)a/admin/aqbudgetperiods.pl (-1 / +3 lines)
Lines 120-126 elsif ( $op eq 'add_validate' ) { Link Here
120
	} 
120
	} 
121
	else {    # ELSE ITS AN ADD
121
	else {    # ELSE ITS AN ADD
122
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
122
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
123
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl?step=2");
123
    my $step= $input->param( 'step' );
124
    $template->param( step => $step);
125
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
124
    exit;
126
    exit;
125
}
127
}
126
	$op='else';
128
	$op='else';
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc (-51 / +6 lines)
Lines 13-68 Link Here
13
     border-radius:25px;
13
     border-radius:25px;
14
}
14
}
15
</style>
15
</style>
16
17
    <div id="onboardingModal">
16
    <div id="onboardingModal">
18
         <span class="close">&times;</span><br><br>
17
        <span class="close">&times;</span><br><br>
19
    [% IF  displayonboardscreen == "acquisitions" %]
18
    [% IF  displayonboardscreen == "acquisitions" %]
20
        [% IF step == 2 %]
21
        <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
22
            <fieldset class="rows">
23
            <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
24
                [% IF ( budget_period_description ) %]
25
                    [% budget_name %] for Budget '[% budget_period_description %]'
26
                [% END %]
27
            </legend>
28
            <input type="hidden" name="op" value="add_validate" />
29
            <input type="hidden" name="checked" value="0" />
30
            <ol>
31
            [% IF ( budget_parent_id ) %]
32
                 <li>
33
                    <span class="label">Fund parent: </span>
34
                    [% budget_parent_name %]
35
                    [% budget_parent_id %] - [% budget_parent_name %]
36
                    <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
37
                </li>
38
            [% END %]
39
40
            <li>
41
                <label class="required"  for="budget_code">Fund code: </label>
42
                <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
43
            </li>
44
45
            <li>
46
                <label class="required" for="budget_name">Fund name: </label>
47
                <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
48
            </li>
49
50
            <li>
51
                <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
52
                <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
53
            </li>
54
55
            <fieldset class="action">
56
                <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
57
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
58
            </fieldset>
59
        </form>
60
61
    [% ELSE %]
62
        <h2> Create a budget</h2>
19
        <h2> Create a budget</h2>
63
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
20
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
64
            <fieldset class="rows">
21
            <fieldset class="rows">
65
                <input type="hidden" name="op" value="add_validate" />
22
                <input type="hidden" name="op" value="add_validate" />
23
                <input type="hidden" name="step" value="2"/>
66
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
24
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
67
                <ol>
25
                <ol>
68
                    <li>
26
                    <li>
Lines 93-112 Link Here
93
                    </li>
51
                    </li>
94
                </ol>
52
                </ol>
95
            </fieldset>
53
            </fieldset>
96
97
            <fieldset class="action">
54
            <fieldset class="action">
98
                <a href = "/cgi-bin/koha/acqui/acqui-home.pl?step=2">
55
                <a href = "/cgi-bin/koha/acqui/acqui-home.pl">
99
                <input type="submit" class="action" value="Submit" />
56
                <input type="submit" class="action" value="Submit" />
100
                </a>
57
                </a>
101
                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
102
            </fieldset>
58
            </fieldset>
103
        </form>
59
        </form>
104
    </div>
60
    </div>
105
    [% END %]
61
    [% ELSIF displayonboardscreen == "label" %]
62
<h2>testing</h2>
106
63
107
[% ELSIF displayonboardscreen == "label" %]
108
64
109
65
110
66
111
<h2>testing</h2>
67
    [% END %]
112
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc (+57 lines)
Line 0 Link Here
1
<style type="text/css">
2
  #onboardingModal{
3
      z-index:1;
4
      background-color:#5bad3f;
5
      padding:20px;
6
      width:80%;
7
      height:60%;
8
      position:fixed;
9
      left:auto;
10
      top:auto;
11
      right:auto;
12
      bottom:auto;
13
      border-radius:25px;
14
   }
15
</style>
16
17
<div id="onboardingModal">
18
    <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
19
        <fieldset class="rows">
20
            <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
21
                [% IF ( budget_period_description ) %]
22
                    [% budget_name %] for Budget '[% budget_period_description %]'
23
                [% END %]
24
            </legend>
25
            <input type="hidden" name="op" value="add_validate" />
26
            <input type="hidden" name="checked" value="0" />
27
            <ol>
28
                [% IF ( budget_parent_id ) %]
29
                    <li>
30
                        <span class="label">Fund parent: </span>
31
                        [% budget_parent_name %]
32
                        [% budget_parent_id %] - [% budget_parent_name %]
33
                        <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
34
                    </li>
35
                [% END %]
36
                <li>
37
                    <label class="required"  for="budget_code">Fund code: </label>
38
                    <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
39
                </li>
40
41
                <li>
42
                    <label class="required" for="budget_name">Fund name: </label>
43
                    <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
44
                </li>
45
46
                <li>
47
                    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
48
                    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
49
                </li>
50
51
                <fieldset class="action">
52
                    <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
53
                    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
54
                </fieldset>
55
        </fieldset>
56
    </form>
57
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-3 / +6 lines)
Lines 118-125 $(document).ready(function() { Link Here
118
    [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
118
    [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
119
    [% UNLESS ( loop_budget ) %]
119
    [% UNLESS ( loop_budget ) %]
120
        [% IF ( CAN_user_acquisition_period_manage ) %]
120
        [% IF ( CAN_user_acquisition_period_manage ) %]
121
             [% displayonboardscreen = "acquisitions" %]
121
            [% displayonboardscreen = "acquisitions" %]
122
             [% INCLUDE onboardinginclude.inc %]
122
            [% IF stepfund == 1 %]
123
                [% INCLUDE onboardinginclude.inc %]
124
            [% ELSE %]
125
                [% INCLUDE onboardinginclude2.inc %]
126
            [% END %]
123
        [% ELSE %]
127
        [% ELSE %]
124
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
128
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
125
        [% END %]
129
        [% END %]
126
- 

Return to bug 18002