Attachment #93033 for bug #23321

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




                        [% IF cash_register %]
                            <li>
                                <span class="label">Cash Register ID: </span>[% cash_register.id | html %]
                                <input type="hidden" name="id" value="[% cash_register.id | html %]" />
                            </li>
                        [% END %]



                            <li>
                                <label for="description">Description: </label>
                                <input type="text" name="description" id="description" value="[% cash_register.description | html %]"/>
                            </li>
                            <li>
                                <label for="branch">Library: </label>
                                <select id="branch" name="branch">
                                [% FOREACH branch IN branch_list %]
                                [% IF cash_register.branch == branch.branchcode %]
                                    <option value="[% branch.branchcode | html %]" selected="1">[% branch.branchname | html %]</option>
                                [% ELSE %]
                                    <option value="[% branch.branchcode | html %]">[% branch.branchname | html %]</option>
                                [% END %]
                                [% END %]
                                </select>


                            <li>
                                <label for="starting_float">Initial float: </label>
                                <input type="text" pattern='^\d+(?:\.\d{0,2})$' name="starting_float" id="starting_float" value="[% cash_register.starting_float | html %]" />
                            </li>
                        </ol>
                   </fieldset>

                   [% ELSE %]
                   <tr>
                   [% END %]
                       <td>[% cash_register.name | html %]</td>
                       <td>[% cash_register.description | html %]</td>
                       <td>[% cash_register.library.branchname | html %]</td>
                       <td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td>
                       <td>[% cash_register.starting_float | html %]</td>
                       [% IF cash_register.archived == '0' %]
                       <td class="actions">
                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&amp;id=[% cash_register.id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
                           [% IF cash_register.branch_default %]
                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Drop default</a>
                           [% ELSE %]
                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Make default</a>
                           [% END %]
                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Archive</a>
                       </td>
                       [% ELSE %]
                       <td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&amp;id=[% cash_register.id | uri %]"><i class="fa fa-trash-restore"></i> Restore</a></td>
                       [% END %]
                   </tr>
                   [% END %]




        <select name="cash_register" id="cash_register">
            [% FOREACH register IN registers %]
              [% IF register.id == registerid %]
            <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
              [% ELSE %]
            <option value="[% register.id | html %]">[% register.name | html %]</option>
              [% END %]
            [% END %]
        </select>

        <select name="cash_register" id="cash_register">
            [% FOREACH register IN registers %]
              [% IF register.id == registerid %]
            <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
              [% ELSE %]
            <option value="[% register.id | html %]">[% register.name | html %]</option>
              [% END %]
            [% END %]
        </select>
- 

Return to bug 23321

Lines 68-74 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt (-13 / +13 lines)
68	[% IF cash_register %]	68	[% IF cash_register %]
69	<li>	69	<li>
70	<span class="label">Cash Register ID: </span>[% cash_register.id \| html %]	70	<span class="label">Cash Register ID: </span>[% cash_register.id \| html %]
71	<input type="hidden" name="id" value="[% cash_register.id %]" />	71	<input type="hidden" name="id" value="[% cash_register.id \| html %]" />
72	</li>	72	</li>
73	[% END %]	73	[% END %]
74		74
Lines 80-95 Link Here
80		80
81	<li>	81	<li>
82	<label for="description">Description: </label>	82	<label for="description">Description: </label>
83	<input type="text" name="description" id="description" value="[% cash_register.description %]"/>	83	<input type="text" name="description" id="description" value="[% cash_register.description \| html %]"/>
84	</li>	84	</li>
85	<li>	85	<li>
86	<label for="branch">Library: </label>	86	<label for="branch">Library: </label>
87	<select id="branch" name="branch">	87	<select id="branch" name="branch">
88	[% FOREACH branch IN branch_list %]	88	[% FOREACH branch IN branch_list %]
89	[% IF cash_register.branch == branch.branchcode %]	89	[% IF cash_register.branch == branch.branchcode %]
90	<option value="[% branch.branchcode %]" selected="1">[% branch.branchname %]</option>	90	<option value="[% branch.branchcode \| html %]" selected="1">[% branch.branchname \| html %]</option>
91	[% ELSE %]	91	[% ELSE %]
92	<option value="[% branch.branchcode %]">[% branch.branchname %]</option>	92	<option value="[% branch.branchcode \| html %]">[% branch.branchname \| html %]</option>
93	[% END %]	93	[% END %]
94	[% END %]	94	[% END %]
95	</select>	95	</select>
Lines 97-103 Link Here
97		97
98	<li>	98	<li>
99	<label for="starting_float">Initial float: </label>	99	<label for="starting_float">Initial float: </label>
100	<input type="text" pattern='^\d+(?:\.\d{0,2})$' name="starting_float" id="starting_float" value="[% cash_register.starting_float %]" />	100	<input type="text" pattern='^\d+(?:\.\d{0,2})$' name="starting_float" id="starting_float" value="[% cash_register.starting_float \| html %]" />
101	</li>	101	</li>
102	</ol>	102	</ol>
103	</fieldset>	103	</fieldset>
Lines 141-163 Link Here
141	[% ELSE %]	141	[% ELSE %]
142	<tr>	142	<tr>
143	[% END %]	143	[% END %]
144	<td>[% cash_register.name %]</td>	144	<td>[% cash_register.name \| html %]</td>
145	<td>[% cash_register.description %]</td>	145	<td>[% cash_register.description \| html %]</td>
146	<td>[% cash_register.library.branchname %]</td>	146	<td>[% cash_register.library.branchname \| html %]</td>
147	<td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td>	147	<td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td>
148	<td>[% cash_register.starting_float %]</td>	148	<td>[% cash_register.starting_float \| html %]</td>
149	[% IF cash_register.archived == '0' %]	149	[% IF cash_register.archived == '0' %]
150	<td class="actions">	150	<td class="actions">
151	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&id=[% cash_register.id \| uri %]"><i class="fa fa-pencil"></i> Edit</a>	151	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&id=[% cash_register.id \| uri %]"><i class="fa fa-pencil"></i> Edit</a>
152	[% IF cash_register.branch_default %]	152	[% IF cash_register.branch_default %]
153	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&id=[% cash_register.id %]"><i class="fa fa-archive"></i> Drop default</a>	153	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&id=[% cash_register.id \| uri %]"><i class="fa fa-archive"></i> Drop default</a>
154	[% ELSE %]	154	[% ELSE %]
155	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&id=[% cash_register.id %]"><i class="fa fa-archive"></i> Make default</a>	155	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&id=[% cash_register.id \| uri %]"><i class="fa fa-archive"></i> Make default</a>
156	[% END %]	156	[% END %]
157	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&id=[% cash_register.id %]"><i class="fa fa-archive"></i> Archive</a>	157	<a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&id=[% cash_register.id \| uri %]"><i class="fa fa-archive"></i> Archive</a>
158	</td>	158	</td>
159	[% ELSE %]	159	[% ELSE %]
160	<td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&id=[% cash_register.id %]"><i class="fa fa-trash-restore"></i> Restore</a></td>	160	<td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&id=[% cash_register.id \| uri %]"><i class="fa fa-trash-restore"></i> Restore</a></td>
161	[% END %]	161	[% END %]
162	</tr>	162	</tr>
163	[% END %]	163	[% END %]

Lines 134-142 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-5 / +4 lines)
134	<select name="cash_register" id="cash_register">	134	<select name="cash_register" id="cash_register">
135	[% FOREACH register IN registers %]	135	[% FOREACH register IN registers %]
136	[% IF register.id == registerid %]	136	[% IF register.id == registerid %]
137	<option value="[% register.id %]" selected="selected">[% register.name \| html %]</option>	137	<option value="[% register.id \| html %]" selected="selected">[% register.name \| html %]</option>
138	[% ELSE %]	138	[% ELSE %]
139	<option value="[% register.id %]">[% register.name \| html %]</option>	139	<option value="[% register.id \| html %]">[% register.name \| html %]</option>
140	[% END %]	140	[% END %]
141	[% END %]	141	[% END %]
142	</select>	142	</select>
Lines 263-271 Link Here
263	<select name="cash_register" id="cash_register">	263	<select name="cash_register" id="cash_register">
264	[% FOREACH register IN registers %]	264	[% FOREACH register IN registers %]
265	[% IF register.id == registerid %]	265	[% IF register.id == registerid %]
266	<option value="[% register.id %]" selected="selected">[% register.name \| html %]</option>	266	<option value="[% register.id \| html %]" selected="selected">[% register.name \| html %]</option>
267	[% ELSE %]	267	[% ELSE %]
268	<option value="[% register.id %]">[% register.name \| html %]</option>	268	<option value="[% register.id \| html %]">[% register.name \| html %]</option>
269	[% END %]	269	[% END %]
270	[% END %]	270	[% END %]
271	</select>	271	</select>
272	-