oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 6.7.8 bug fixes

Browse source
This commit is contained in:
JT Smith 2005-11-29 01:28:28 +00:00
parent 89f8729ba5
commit 9749fd7005
7 changed files with 152 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/WebGUI/Asset/Event.pm
View file

@ -21,6 +21,7 @@ use WebGUI::Id;
use WebGUI::International;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::Style;
use WebGUI::URL;
use WebGUI::Asset;
@ -200,7 +201,6 @@ sub setParent {
#-------------------------------------------------------------------
sub view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
my ($output, $event, $id);
my %var = $self->get;
$event = $self;
@ -216,9 +216,21 @@ sub view {
$var{"edit.label"} = WebGUI::International::get(575,"Asset_Event");
$var{"delete.url"} = WebGUI::URL::page('func=deleteEvent;rid='.$self->getValue("EventsCalendar_recurringId"));
$var{"delete.label"} = WebGUI::International::get(576,"Asset_Event");
#get parent so we can get the parent's style. Hopefully the parent is an EventsCalendar. If not, oh well.
my $parent = $self->getParent;
return WebGUI::Style::process($self->processTemplate(\%var,$self->getValue("templateId")),$parent->getValue("styleTemplateId"));
my @others;
my ($start, $garbage) = WebGUI::DateTime::dayStartEnd($self->get("eventStartDate"));
my ($garbage, $end) = WebGUI::DateTime::dayStartEnd($self->get("eventEndDate"));
my $sth = WebGUI::SQL->read("select assetId from EventsCalendar_event where ((eventStartDate >= $start and eventStartDate <= $end) or (eventEndDate >= $start and eventEndDate <= $end)) and assetId<>".quote($self->getId));
while (my ($assetId) = $sth->array) {
my $asset = WebGUI::Asset::Event->new($assetId);
# deal with multiple versions of the same event with conflicting dates
next unless (($asset->get("eventStartDate") >= $start && $asset->get("eventStartDate") <= $end) || ($asset->get("eventEndDate") >= $start && $asset->get("eventEndDate") <= $end));
push(@others,{
url=>$asset->getUrl,
title=>$asset->getTitle,
});
}
$var{others_loop} = \@others;
return $self->processTemplate(\%var,$self->getValue("templateId"));
}
@ -264,6 +276,13 @@ sub www_edit {
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'Asset_Event'));
}
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canView);
return WebGUI::Style::process($self->view,$self->getParent->getValue("styleTemplateId"));
}
1;

1
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -353,6 +353,7 @@ sub view {
isStartOfWeek=>($dayOfWeekCounter==1),
isEndOfWeek=>($dayOfWeekCounter==7),
isToday=>($date[0]."-".$date[1]."-".$dayCounter eq $now[0]."-".$now[1]."-".$now[2]),
hasEvents=>(exists $events{$dayCounter}),
event_loop=>\@{$events{$dayCounter}},
url=>$events{$dayCounter}->[0]->{url}
});

6
lib/WebGUI/Commerce/Payment/ITransact.pm
View file

@ -707,13 +707,13 @@ my %transactionData = %{$self->{_transactionParams}};
" <EmailText>
<EmailTextItem>".$self->get('emailMessage')."</EmailTextItem>
<EmailTextItem>ID: $transactionData{ORGID}</EmailTextItem>
</EmailText>\n";
</EmailText>
<OrderItems>\n";
$items = WebGUI::Commerce::Transaction->new($transactionData{ORGID})->getItems;
foreach (@{$items}) {
$xml .=
" <OrderItems>
<Item>
" <Item>
<Description>".$_->{itemName}."</Description>
<Cost>".$_->{amount}."</Cost>
<Qty>".$_->{quantity}."</Qty>

3
lib/WebGUI/Operation/Commerce.pm
View file

@ -10,6 +10,7 @@ use WebGUI::Commerce::Payment;
use WebGUI::Commerce::Shipping;
use WebGUI::AdminConsole;
use WebGUI::TabForm;
use WebGUI::Setting;
use WebGUI::Style;
use WebGUI::Commerce;
use WebGUI::Operation;
@ -512,7 +513,7 @@ sub www_editCommerceSettingsSave {
fieldValue => $session{form}{$_}
});
} elsif ($_ ne 'op') {
WebGUI::SQL->write('update settings set value='.quote($session{form}{$_}).' where name='.quote($_));
WebGUI::Setting::set($_,$session{form}{$_});
}
}