From b8e8478305ae46db71df7f580d5b084672d05354 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Tue, 16 May 2006 13:11:29 +0000 Subject: [PATCH] let's fix this. --- lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 263265e6c..a9710c0ce 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -1960,7 +1960,7 @@ sub www_viewPurchase { $reg->{endDateHuman} = $self->session->datetime->epochToHuman($reg->{'endDate'}); $purchase->{canAddEvents} = 1 if ($isAdmin || ($userId eq $self->session->var->get('userId')) || ($reg->{userId} eq $self->session->var->get('userId')) || ($reg->{createdByUserId} eq $self->session->var->get('userId'))); my ($isMainEvent) = $self->session->db->quickArray("select productId from EventManagementSystem_products where productId = ? and (prerequisiteId is NULL or prerequisiteId = '')",[$reg->{productId}]); - $purchase->{purchaseEventId} = $reg->{productId} if $isMainEvent; + $purchase->{purchaseEventId} = $reg->{productId} if ($isMainEvent && $reg->{'returned'} eq '0'); push(@{$purchase->{regLoop}},$reg); } push(@purchasesLoop,$purchase); @@ -1998,7 +1998,7 @@ sub www_viewPurchase { $purchase->{canReturnItinerary} = 1 unless $reg->{'returned'}; $purchase->{canAddEvents} = 1 if ($isAdmin || ($userId eq $self->session->var->get('userId')) || ($reg->{userId} eq $self->session->var->get('userId')) || ($reg->{createdByUserId} eq $self->session->var->get('userId'))); my ($isMainEvent) = $self->session->db->quickArray("select productId from EventManagementSystem_products where productId = ? and (prerequisiteId is NULL or prerequisiteId = '')",[$reg->{productId}]); - $purchase->{purchaseEventId} = $reg->{productId} if $isMainEvent; + $purchase->{purchaseEventId} = $reg->{productId} if ($isMainEvent && $reg->{'returned'} eq '0'); push(@{$purchase->{regLoop}},$reg); } $var{canReturnTransaction} = 1 if $purchase->{canReturnItinerary}; @@ -2035,7 +2035,7 @@ sub www_viewPurchase { $purchase->{canReturnItinerary} = 1 unless $reg->{'returned'}; $purchase->{canAddEvents} = 1 if ($isAdmin || ($userId eq $self->session->var->get('userId')) || ($reg->{userId} eq $self->session->var->get('userId')) || ($reg->{createdByUserId} eq $self->session->var->get('userId'))); my ($isMainEvent) = $self->session->db->quickArray("select productId from EventManagementSystem_products where productId = ? and (prerequisiteId is NULL or prerequisiteId = '')",[$reg->{productId}]); - $purchase->{purchaseEventId} = $reg->{productId} if $isMainEvent; + $purchase->{purchaseEventId} = $reg->{productId} if ($isMainEvent && $reg->{'returned'} eq '0'); push(@{$purchase->{regLoop}},$reg); } $var{canReturnTransaction} = 1 if $purchase->{canReturnItinerary};