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

(-)a/C4/Acquisition.pm (+23 lines)
Lines 93-98 BEGIN { Link Here
93
        &NotifyOrderUsers
93
        &NotifyOrderUsers
94
94
95
        &FillWithDefaultValues
95
        &FillWithDefaultValues
96
97
        &ModNotesOrder
96
    );
98
    );
97
}
99
}
98
100
Lines 1371-1376 sub ModOrder { Link Here
1371
1373
1372
#------------------------------------------------------------#
1374
#------------------------------------------------------------#
1373
1375
1376
=head3 ModNotesOrder
1377
1378
    ModNotesOrder($orders);
1379
1380
Modifies internal and vendor note off all items in orders
1381
1382
=cut
1383
1384
sub ModNotesOrder{
1385
    my $orders = shift;
1386
    my $dbh = C4::Context->dbh;
1387
    my $sth = $dbh->prepare("UPDATE aqorders SET order_internalnote = ?, order_vendornote = ? WHERE ordernumber = ?");
1388
    foreach my $ordernumber (keys %$orders) {
1389
        $sth->execute($orders->{$ordernumber}->{'i'}, $orders->{$ordernumber}->{'v'}, $ordernumber) if ($orders->{$ordernumber}->{'i'} || $orders->{$ordernumber}->{'v'});
1390
    }
1391
}
1392
1393
 #------------------------------------------------------------#
1394
1374
=head3 ModItemOrder
1395
=head3 ModItemOrder
1375
1396
1376
    ModItemOrder($itemnumber, $ordernumber);
1397
    ModItemOrder($itemnumber, $ordernumber);
Lines 2125-2130 sub GetLateOrders { Link Here
2125
        aqorders.ecost            AS unitpricelib,
2146
        aqorders.ecost            AS unitpricelib,
2126
        aqorders.claims_count     AS claims_count,
2147
        aqorders.claims_count     AS claims_count,
2127
        aqorders.claimed_date     AS claimed_date,
2148
        aqorders.claimed_date     AS claimed_date,
2149
        aqorders.order_internalnote AS internalnote,
2150
        aqorders.order_vendornote   AS vendornote,
2128
        aqbudgets.budget_name     AS budget,
2151
        aqbudgets.budget_name     AS budget,
2129
        borrowers.branchcode      AS branch,
2152
        borrowers.branchcode      AS branch,
2130
        aqbooksellers.name        AS supplier,
2153
        aqbooksellers.name        AS supplier,
(-)a/acqui/lateorders-export.pl (+2 lines)
Lines 53-58 for my $ordernumber ( @ordernumbers ) { Link Here
53
            basketno => $order->{basketno},
53
            basketno => $order->{basketno},
54
            claims_count => $order->{claims_count},
54
            claims_count => $order->{claims_count},
55
            claimed_date => $order->{claimed_date},
55
            claimed_date => $order->{claimed_date},
56
            internalnote => $order->{internaldate},
57
            vendornote   => $order->{vendornote},
56
        }
58
        }
57
    ;
59
    ;
58
}
60
}
(-)a/acqui/lateorders.pl (+14 lines)
Lines 122-127 if ($op and $op eq "send_alert"){ Link Here
122
    }
122
    }
123
}
123
}
124
124
125
if ($op && $op eq "save"){
126
    my $listorders;
127
    my $ordernumber;
128
    my @orders = $input->param;
129
130
    foreach my $order (@orders){
131
        if ( $order ne "op"){
132
            my @split = split (/_/,$order);
133
            $listorders->{$split[0]}->{$split[1]} = $input->param($order);
134
        }
135
    }
136
    ModNotesOrder($listorders);
137
}
138
125
my @parameters = ( $delay );
139
my @parameters = ( $delay );
126
push @parameters, $estimateddeliverydatefrom_dt
140
push @parameters, $estimateddeliverydatefrom_dt
127
    ? $estimateddeliverydatefrom_dt->ymd()
141
    ? $estimateddeliverydatefrom_dt->ymd()
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
3
4
[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- END -%]
4
[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- delimiter -%]INTERNAL NOTE[%- delimiter -%]VENDOR NOTE[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +29 lines)
Lines 67-72 Link Here
67
            <th>Fund</th>
67
            <th>Fund</th>
68
            <th>Claims count</th>
68
            <th>Claims count</th>
69
            <th class="title-string">Claimed date</th>
69
            <th class="title-string">Claimed date</th>
70
            <th>Internal note</th>
71
            <th>Vendor note</th>
70
        </tr>
72
        </tr>
71
      </thead>
73
      </thead>
72
      <tbody>
74
      <tbody>
Lines 131-136 Link Here
131
                    <span title="0000-00-00"></span>
133
                    <span title="0000-00-00"></span>
132
                [% END %]
134
                [% END %]
133
            </td>
135
            </td>
136
            <td><input name="internalnote" id="internalnote" type="text" value="[% lateorder.internalnote %]"></td>
137
            <td><input name="vendornote" id="vendornote" type="text" value="[% lateorder.vendornote %]"></td>
134
        </tr>
138
        </tr>
135
      [% END %]
139
      [% END %]
136
      </tbody>
140
      </tbody>
Lines 138-144 Link Here
138
        <tr>
142
        <tr>
139
            <th colspan="5">Total</th>
143
            <th colspan="5">Total</th>
140
            <th>[% total %]</th>
144
            <th>[% total %]</th>
141
            <th colspan="6">&nbsp;</th>
145
            <th colspan="8">&nbsp;</th>
142
        </tr>
146
        </tr>
143
      </tfoot>
147
      </tfoot>
144
    </table>
148
    </table>
Lines 149-154 Link Here
149
        [% UNLESS lateorder.budget_lock %]
153
        [% UNLESS lateorder.budget_lock %]
150
            <input type="submit"  value="Claim order" />
154
            <input type="submit"  value="Claim order" />
151
        [% END %]
155
        [% END %]
156
        <input type="button" value="Save notes" id="savenotes"/>
152
    </p>
157
    </p>
153
</form>
158
</form>
154
[% ELSE %]<p>There are no late orders.</p>
159
[% ELSE %]<p>There are no late orders.</p>
Lines 249-254 Link Here
249
                location.href = url;
254
                location.href = url;
250
                return false;
255
                return false;
251
            });
256
            });
257
            // Update all notes
258
            $("#savenotes").click(function(){
259
                var all_nodes = $(late_orderst.fnGetNodes());
260
                var req = new XMLHttpRequest();
261
                var url = '/cgi-bin/koha/acqui/lateorders.pl';
262
                var data = new FormData();
263
                data.append("op","save");
264
                for (var i = 0; i < all_nodes.length; i++) {
265
                    var order = $(all_nodes[i]).find("input[name='ordernumber']");
266
                    var internalnote = $(all_nodes[i]).find("input[name='internalnote']");
267
                    var vendornote = $(all_nodes[i]).find("input[name='vendornote']");
268
                    data.append(order[0].value + "_i",internalnote[0].value);
269
                    data.append(order[0].value + "_v",vendornote[0].value);
270
                }
271
272
                req.open("POST",url);
273
                req.send(data);
274
                req.onreadystatechange = function () {
275
                    if (req.readyState == '4' ){
276
                        alert(_("all notes is modified correctly"));
277
                    }
278
                }
279
            });
252
        });
280
        });
253
    </script>
281
    </script>
254
[% END %]
282
[% END %]
255
- 

Return to bug 12502