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

fix: EMS Transactions Dropping Free Events

Browse source
This commit is contained in:
Roy Johnson 2006-06-12 21:10:49 +00:00
parent ce50d2808b
commit f5b1e1bd6c
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/6.x.x.txt
View file

@ -33,7 +33,7 @@
- fix: Alternate Apache Port breaks "Commit with Approval" - fix: Alternate Apache Port breaks "Commit with Approval"
- Rearranged the "Getting Started" page in the default content to make it - Rearranged the "Getting Started" page in the default content to make it
easier to follow for noobs. easier to follow for noobs.
- fix: EMS Transactions Dropping Free Events
6.99.3 6.99.3
- Someone removed the status from the submission templates. That has been - Someone removed the status from the submission templates. That has been

30
lib/WebGUI/Commerce/Transaction.pm
View file

@ -42,25 +42,25 @@ sub addItem {
$quantity = shift; $quantity = shift;
$lineItemAmount = shift; $lineItemAmount = shift;
$self->session->db->write("insert into transactionItem ". # If we have a lineItemAmount specified, we have to override price*quantity and use the value passed in instead
"(transactionId, itemName, amount, quantity, itemId, itemType) values ". # We will however maintain the quantity passed and tell the user that the prices displayed are always line item totals.
"(".$self->session->db->quote($self->{_transactionId}).",".$self->session->db->quote($item->name).",".$self->session->db->quote( #
($lineItemAmount ne "") # Again, prices are not per item but per line item. Qty 3 Price 10.00 indicates 3 items for a total of 10.00, not 3 items at 10.00 each
?($lineItemAmount) # It has to be this way to handle discounted items where all items in the quantity are not discounted. For example, 2 items at 5.00 each and the third item is free.
:($item->price) #
).",".$self->session->db->quote( # Hopefully the new commerce system will handle this better. (Maybe making discounted items a different item all together with their own line item to retain the detailed information)
($lineItemAmount ne "") #
?('1') my $totalPrice = ($lineItemAmount eq "") ? $item->price * $quantity : $lineItemAmount;
:($quantity) $self->session->db->write("insert into transactionItem (transactionId, itemName, amount, quantity, itemId, itemType) values (?,?,?,?,?,?)",
).",". [$self->{_transactionId}, $item->name, $totalPrice, $quantity, $item->id, $item->type]);
$self->session->db->quote($item->id).",".$self->session->db->quote($item->type).")");
# Adjust total amount in the transaction table. # Adjust total amount in the transaction table.
$self->session->db->write("update transaction set amount=amount+".$self->session->db->quote(($lineItemAmount ne "") ? ($lineItemAmount) : ($item->price * $quantity))." where transactionId=".$self->session->db->quote($self->{_transactionId})); $self->session->db->write("update transaction set amount=amount+? where transactionId=?",[$totalPrice,$self->{_transactionId}]);
$self->{_properties}{amount} += ($item->price * $quantity); $self->{_properties}{amount} += $totalPrice;
push @{$self->{_items}}, { push @{$self->{_items}}, {
transactionId => $self->{_transactionId}, transactionId => $self->{_transactionId},
itemName => $item->name, itemName => $item->name,
amount => $item->price, amount => $totalPrice,
quantity => $quantity, quantity => $quantity,
itemId => $item->id, itemId => $item->id,
itemType => $item->type, itemType => $item->type,