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

(-)a/C4/Suggestions.pm (+7 lines)
Lines 491-496 sub ModSuggestion { Link Here
491
            or $suggestion->{$field} eq '' );
491
            or $suggestion->{$field} eq '' );
492
    }
492
    }
493
493
494
    if ($suggestion->{STATUS} and $suggestion->{STATUS} eq 'ORDERED') {
495
        $suggestion->{ordereddate} = dt_from_string;
496
        if (C4::Context->userenv) {
497
            $suggestion->{orderedby} = C4::Context->userenv->{number};
498
        }
499
    }
500
494
    my $rs = Koha::Database->new->schema->resultset('Suggestion')->find($suggestion->{suggestionid});
501
    my $rs = Koha::Database->new->schema->resultset('Suggestion')->find($suggestion->{suggestionid});
495
    my $status_update_table = 1;
502
    my $status_update_table = 1;
496
    eval {
503
    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 3008-3013 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
3008
   accepteddate date default NULL, -- date the suggestion was marked as accepted
3008
   accepteddate date default NULL, -- date the suggestion was marked as accepted
3009
   rejectedby INT(11) default NULL, -- borrowernumber for the librarian who rejected the suggestion, foreign key linking to the borrowers table
3009
   rejectedby INT(11) default NULL, -- borrowernumber for the librarian who rejected the suggestion, foreign key linking to the borrowers table
3010
   rejecteddate date default NULL, -- date the suggestion was marked as rejected
3010
   rejecteddate date default NULL, -- date the suggestion was marked as rejected
3011
   orderedby INT(11) NULL DEFAULT NULL, -- borrowernumber for the librarian who ordered the suggestion
3012
   ordereddate DATE NULL DEFAULT NULL, -- date the suggestion was marked as ordered
3011
  `STATUS` varchar(10) NOT NULL default '', -- suggestion status (ASKED, CHECKED, ACCEPTED, or REJECTED)
3013
  `STATUS` varchar(10) NOT NULL default '', -- suggestion status (ASKED, CHECKED, ACCEPTED, or REJECTED)
3012
  `note` mediumtext, -- note entered on the suggestion
3014
  `note` mediumtext, -- note entered on the suggestion
3013
  `author` varchar(80) default NULL, -- author of the suggested item
3015
  `author` varchar(80) default NULL, -- author of the suggested item
Lines 3037-3042 CREATE TABLE `suggestions` ( -- purchase suggestions Link Here
3037
  KEY `biblionumber` (`biblionumber`),
3039
  KEY `biblionumber` (`biblionumber`),
3038
  KEY `branchcode` (`branchcode`),
3040
  KEY `branchcode` (`branchcode`),
3039
  CONSTRAINT `suggestions_budget_id_fk` FOREIGN KEY (`budgetid`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE SET NULL ON UPDATE CASCADE
3041
  CONSTRAINT `suggestions_budget_id_fk` FOREIGN KEY (`budgetid`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE SET NULL ON UPDATE CASCADE
3042
  CONSTRAINT suggestions_orderedby_fk FOREIGN KEY (orderedby) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE
3040
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3043
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3041
3044
3042
--
3045
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (+5 lines)
Lines 277-282 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
277
                <td>[% accepteddate | $KohaDates %]</td>
277
                <td>[% accepteddate | $KohaDates %]</td>
278
                <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>
278
                <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>
279
            </tr>
279
            </tr>
280
            <tr>
281
                <th><span class="label">Suggestion ordered</span></th>
282
                <td>[% ordereddate | $KohaDates %]</td>
283
                <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>
284
            </tr>
280
            </tbody>
285
            </tbody>
281
        </table></li></ol>
286
        </table></li></ol>
282
    </fieldset>
287
    </fieldset>
(-)a/suggestion/suggestion.pl (-2 / +1 lines)
Lines 278-284 if ($op=~/else/) { Link Here
278
    );
278
    );
279
}
279
}
280
280
281
foreach my $element ( qw(managedby suggestedby acceptedby) ) {
281
foreach my $element ( qw(managedby suggestedby acceptedby orderedby) ) {
282
#    $debug || warn $$suggestion_ref{$element};
282
#    $debug || warn $$suggestion_ref{$element};
283
    if ($$suggestion_ref{$element}){
283
    if ($$suggestion_ref{$element}){
284
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
284
        my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
285
- 

Return to bug 13392