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

(-)a/C4/Suggestions.pm (+7 lines)
Lines 486-491 sub ModSuggestion { Link Here
486
            or $suggestion->{$field} eq '' );
486
            or $suggestion->{$field} eq '' );
487
    }
487
    }
488
488
489
    if ($suggestion->{STATUS} and $suggestion->{STATUS} eq 'ORDERED') {
490
        $suggestion->{ordereddate} = dt_from_string;
491
        if (C4::Context->userenv) {
492
            $suggestion->{orderedby} = C4::Context->userenv->{number};
493
        }
494
    }
495
489
    my $rs = Koha::Database->new->schema->resultset('Suggestion')->find($suggestion->{suggestionid});
496
    my $rs = Koha::Database->new->schema->resultset('Suggestion')->find($suggestion->{suggestionid});
490
    my $status_update_table = 1;
497
    my $status_update_table = 1;
491
    eval {
498
    eval {
(-)a/installer/data/mysql/atomicupdate/Bug-13392-add-suggestions-ordereddate-and-suggestions-orderedby.sql (+4 lines)
Line 0 Link Here
1
ALTER TABLE suggestions
2
ADD COLUMN orderedby INT(11) NULL DEFAULT NULL AFTER rejecteddate,
3
ADD COLUMN ordereddate DATE NULL DEFAULT NULL AFTER orderedby,
4
ADD CONSTRAINT suggestions_orderedby_fk FOREIGN KEY (orderedby) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE;
(-)a/installer/data/mysql/kohastructure.sql (+3 lines)
Lines 2180-2185 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
2180
   accepteddate date default NULL, -- date the suggestion was marked as accepted
2180
   accepteddate date default NULL, -- date the suggestion was marked as accepted
2181
   rejectedby INT(11) default NULL, -- borrowernumber for the librarian who rejected the suggestion, foreign key linking to the borrowers table
2181
   rejectedby INT(11) default NULL, -- borrowernumber for the librarian who rejected the suggestion, foreign key linking to the borrowers table
2182
   rejecteddate date default NULL, -- date the suggestion was marked as rejected
2182
   rejecteddate date default NULL, -- date the suggestion was marked as rejected
2183
   orderedby INT(11) NULL DEFAULT NULL, -- borrowernumber for the librarian who ordered the suggestion
2184
   ordereddate DATE NULL DEFAULT NULL, -- date the suggestion was marked as ordered
2183
  `STATUS` varchar(10) NOT NULL default '', -- suggestion status (ASKED, CHECKED, ACCEPTED, or REJECTED)
2185
  `STATUS` varchar(10) NOT NULL default '', -- suggestion status (ASKED, CHECKED, ACCEPTED, or REJECTED)
2184
  `note` mediumtext, -- note entered on the suggestion
2186
  `note` mediumtext, -- note entered on the suggestion
2185
  `author` varchar(80) default NULL, -- author of the suggested item
2187
  `author` varchar(80) default NULL, -- author of the suggested item
Lines 2209-2214 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
2209
  KEY `biblionumber` (`biblionumber`),
2211
  KEY `biblionumber` (`biblionumber`),
2210
  KEY `branchcode` (`branchcode`),
2212
  KEY `branchcode` (`branchcode`),
2211
  CONSTRAINT `suggestions_budget_id_fk` FOREIGN KEY (`budgetid`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE SET NULL ON UPDATE CASCADE
2213
  CONSTRAINT `suggestions_budget_id_fk` FOREIGN KEY (`budgetid`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE SET NULL ON UPDATE CASCADE
2214
  CONSTRAINT suggestions_orderedby_fk FOREIGN KEY (orderedby) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE
2212
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
2215
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
2213
2216
2214
--
2217
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (+5 lines)
Lines 274-279 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
274
                <td>[% accepteddate | $KohaDates %]</td>
274
                <td>[% accepteddate | $KohaDates %]</td>
275
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td>
275
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td>
276
            </tr>
276
            </tr>
277
            <tr>
278
                <th><span class="label">Suggestion ordered</span></th>
279
                <td>[% ordereddate | $KohaDates %]</td>
280
                <td>[% IF ( orderedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% orderedby_borrowernumber %]">[% orderedby_surname %], [% orderedby_firstname %]</a> [% Branches.GetName( orderedby_branchcode ) %] ([% orderedby_description %])[% END %]</td>
281
            </tr>
277
            </tbody>
282
            </tbody>
278
        </table></li></ol>
283
        </table></li></ol>
279
    </fieldset>
284
    </fieldset>
(-)a/suggestion/suggestion.pl (-2 / +1 lines)
Lines 273-279 if ($op=~/else/) { Link Here
273
    );
273
    );
274
}
274
}
275
275
276
foreach my $element ( qw(managedby suggestedby acceptedby) ) {
276
foreach my $element ( qw(managedby suggestedby acceptedby orderedby) ) {
277
#    $debug || warn $$suggestion_ref{$element};
277
#    $debug || warn $$suggestion_ref{$element};
278
    if ($$suggestion_ref{$element}){
278
    if ($$suggestion_ref{$element}){
279
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
279
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
280
- 

Return to bug 13392