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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-2 / +3 lines)
Lines 108-119 Link Here
108
            </div>
108
            </div>
109
        [% END %]
109
        [% END %]
110
110
111
        [% SET total_bankable = accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 %]
111
        [% IF ( CAN_user_cash_management_cashup ) %]
112
        [% IF ( CAN_user_cash_management_cashup ) %]
112
            <div id="toolbar" class="btn-toolbar">
113
            <div id="toolbar" class="btn-toolbar">
113
                [% IF cashup_in_progress %]
114
                [% IF cashup_in_progress %]
114
                    <button id="pos_complete_cashup" type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#confirmCashupModal"> <i class="fa-solid fa-check"></i> Complete cashup </button>
115
                    <button id="pos_complete_cashup" type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#confirmCashupModal"> <i class="fa-solid fa-check"></i> Complete cashup </button>
115
                [% ELSE %]
116
                [% ELSE %]
116
                    <button type="button" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#triggerCashupModal"> <i class="fa fa-money-bill-alt"></i> Record cashup </button>
117
                    <button type="button" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#triggerCashupModal" [% IF total_bankable == 0 %]disabled title="No bankable transactions"[% END %]> <i class="fa fa-money-bill-alt"></i> Record cashup </button>
117
                [% END %]
118
                [% END %]
118
            </div>
119
            </div>
119
        [% END %]
120
        [% END %]
Lines 137-143 Link Here
137
            <li>Float: [% register.starting_float | $Price %]</li>
138
            <li>Float: [% register.starting_float | $Price %]</li>
138
            <li>Total income (cash): [% accountlines.credits_total * -1 | $Price %] ([% accountlines.credits_total(payment_type => [ 'CASH', 'SIP00' ]) * -1 | $Price %])</li>
139
            <li>Total income (cash): [% accountlines.credits_total * -1 | $Price %] ([% accountlines.credits_total(payment_type => [ 'CASH', 'SIP00' ]) * -1 | $Price %])</li>
139
            <li>Total outgoing (cash): [% accountlines.debits_total * -1 | $Price %] ([% accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 | $Price %])</li>
140
            <li>Total outgoing (cash): [% accountlines.debits_total * -1 | $Price %] ([% accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 | $Price %])</li>
140
            <li>Total bankable: [% accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 | $Price %]</li>
141
            <li>Total bankable: [% total_bankable | $Price %]</li>
141
        </ul>
142
        </ul>
142
143
143
        [% IF register.last_cashup %]
144
        [% IF register.last_cashup %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt (-2 / +4 lines)
Lines 156-166 Link Here
156
                <tbody>
156
                <tbody>
157
                    [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
157
                    [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
158
                    [% FOREACH register IN registers %]
158
                    [% FOREACH register IN registers %]
159
                        [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
159
                        <tr>
160
                        <tr>
160
                            [% IF CAN_user_cash_management_cashup %]
161
                            [% IF CAN_user_cash_management_cashup %]
161
                                <td>
162
                                <td>
162
                                    [% IF register.cashup_in_progress %]
163
                                    [% IF register.cashup_in_progress %]
163
                                        <input type="checkbox" class="register_checkbox" value="[% register.id | html %]" disabled title="Cashup in progress" />
164
                                        <input type="checkbox" class="register_checkbox" value="[% register.id | html %]" disabled title="Cashup in progress" />
165
                                    [% ELSIF rbankable == 0 %]
166
                                        <input type="checkbox" class="register_checkbox" value="[% register.id | html %]" disabled title="No bankable transactions" />
164
                                    [% ELSE %]
167
                                    [% ELSE %]
165
                                        <input type="checkbox" class="register_checkbox" value="[% register.id | html %]" />
168
                                        <input type="checkbox" class="register_checkbox" value="[% register.id | html %]" />
166
                                    [% END %]
169
                                    [% END %]
Lines 178-184 Link Here
178
                            </td>
181
                            </td>
179
                            <td>[% register.starting_float | $Price %]</td>
182
                            <td>[% register.starting_float | $Price %]</td>
180
                            <td>
183
                            <td>
181
                                [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
182
                                [% SET bankable = bankable + rbankable %]
184
                                [% SET bankable = bankable + rbankable %]
183
                                [% rbankable | $Price %]
185
                                [% rbankable | $Price %]
184
                            </td>
186
                            </td>
Lines 221-226 Link Here
221
                                            data-bankable="[% rbankable | $Price %]"
223
                                            data-bankable="[% rbankable | $Price %]"
222
                                            data-float="[% register.starting_float | $Price %]"
224
                                            data-float="[% register.starting_float | $Price %]"
223
                                            data-registerid="[% register.id | html %]"
225
                                            data-registerid="[% register.id | html %]"
226
                                            [% IF rbankable == 0 %]disabled title="No bankable transactions"[% END %]
224
                                            ><i class="fa-solid fa-money-bill-1"></i> Record cashup</button
227
                                            ><i class="fa-solid fa-money-bill-1"></i> Record cashup</button
225
                                        >
228
                                        >
226
                                    [% END %]
229
                                    [% END %]
227
- 

Return to bug 40445