diff --git a/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg b/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg index f19fdad66..d307e6ac4 100644 Binary files a/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg and b/docs/upgrades/packages-7.5.3/shopping-cart-collateral-items-1.wgpkg differ diff --git a/lib/WebGUI/Shop/PayDriver.pm b/lib/WebGUI/Shop/PayDriver.pm index 4b3fc7576..12ded5667 100644 --- a/lib/WebGUI/Shop/PayDriver.pm +++ b/lib/WebGUI/Shop/PayDriver.pm @@ -533,15 +533,12 @@ sub sendNotifications { my $session = $self->session; my %var = (); # this needs to be filled in with transaction data for these emails - - - my $i18n = WebGUI::International->new($session,'PayDriver'); my $inbox = WebGUI::Inbox->new($session); $inbox->addMessage({ userId => $transaction->get('userId'), subject => $i18n->get('thank you for your order'), - message => WebGUI::Asset::Template->new($session, $self->get('emailReceiptTemplateId'))->process(\%var), + message => WebGUI::Asset::Template->new($session, $self->get('receiptEmailTemplateId'))->process(\%var), status => 'completed', }); $inbox->addMessage({ diff --git a/lib/WebGUI/Shop/PayDriver/Cash.pm b/lib/WebGUI/Shop/PayDriver/Cash.pm index 44f3f0f5f..ccfcce9d6 100644 --- a/lib/WebGUI/Shop/PayDriver/Cash.pm +++ b/lib/WebGUI/Shop/PayDriver/Cash.pm @@ -235,13 +235,8 @@ sub www_pay { my $billingAddress = $self->getBillingAddress( $session->scratch->get( 'ShopPayDriverCash_billingAddressId' ) ); - # Create a transaction and complete the purchase - my $transaction = WebGUI::Shop::Transaction->create( $session, { - cart => $cart, - paymentAddress => $billingAddress, - paymentMethod => $self, - }); - $transaction->completePurchase( $cart, 'CASH', 'OK', 'Cash payment' ); + # Complete the transaction + $self->processTransaction( $billingAddress ); return $session->style->userStyle('Thank you for ordering'); }