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

fix: EMS Badge Reporting overlaps with other EMS on the system

Browse source
This commit is contained in:
Doug Bell 2007-09-07 20:50:01 +00:00
parent adddef9e93
commit 4ca4c85d0a
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -27,6 +27,7 @@
- fix: Edit Branch doesn't follow auto commit settings - fix: Edit Branch doesn't follow auto commit settings
- fix: Importing a package doesn't follow auto commit settings - fix: Importing a package doesn't follow auto commit settings
- add: DataForm template variable for the group to view entries - add: DataForm template variable for the group to view entries
- fix: EMS Badge Reporting overlaps with other EMS on the system
7.4.5 7.4.5
- fix: Apostrophy incorrectly escaped as double quote in some places - fix: Apostrophy incorrectly escaped as double quote in some places

9
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -4227,8 +4227,8 @@ sub www_searchBadges {
left join EventManagementSystem_products d ON d.productId=b.productId left join EventManagementSystem_products d ON d.productId=b.productId
left join EventManagementSystem_purchases f ON b.purchaseId=f.purchaseId left join EventManagementSystem_purchases f ON b.purchaseId=f.purchaseId
left join transaction g ON f.transactionId=g.transactionId and g.status="Completed" left join transaction g ON f.transactionId=g.transactionId and g.status="Completed"
where b.returned='0' and b.badgeId=? and g.gateway IS NOT NULL where b.assetId=? and b.returned='0' and b.badgeId=? and g.gateway IS NOT NULL
order by d.startDate,d.endDate,c.title|,[$badgeId]); order by d.startDate,d.endDate,c.title|,[$self->getId, $badgeId]);
# Make sure the transation is complete before we display this badge # Make sure the transation is complete before we display this badge
next unless $events->rows; next unless $events->rows;
@ -4546,8 +4546,9 @@ function resetToInitial() {
from EventManagementSystem_registrations b left join products c on c.productId=b.productId from EventManagementSystem_registrations b left join products c on c.productId=b.productId
left join EventManagementSystem_products d ON d.productId=b.productId left join EventManagementSystem_products d ON d.productId=b.productId
left join EventManagementSystem_purchases f ON b.purchaseId=f.purchaseId left join EventManagementSystem_purchases f ON b.purchaseId=f.purchaseId
left join transaction g ON f.transactionId=g.transactionId where b.returned='0' and b.badgeId=? left join transaction g ON f.transactionId=g.transactionId
order by d.startDate,d.endDate,c.title|,[$badgeId]); where b.assetId = ? and b.returned='0' and b.badgeId=?
order by d.startDate,d.endDate,c.title|,[$self->getId, $badgeId]);
my $ticker = 1; my $ticker = 1;
while (my ($productId, $sku, $title, $price, $gateway, $start, $end, $prereq, $registrationId, $transactionId) = $events->array) { while (my ($productId, $sku, $title, $price, $gateway, $start, $end, $prereq, $registrationId, $transactionId) = $events->array) {
my $isMaster = ($prereq eq ""); my $isMaster = ($prereq eq "");