diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000016.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000016.tmpl new file mode 100644 index 000000000..18d584235 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000016.tmpl @@ -0,0 +1,103 @@ +#PBtmpl0000000000000016 + · + · +
+
+ + + + + + + + + + + + + + + + + +
Transaction descriptionPriceStatusError
()

+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductQuantityPriceAmountSales TaxEach
 
 Subtotal
Shipping
Sales Tax Rate 
Total Sales Tax 
Total
+ +

+ + \ No newline at end of file diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000017.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000017.tmpl new file mode 100644 index 000000000..eeee8b9fc --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000017.tmpl @@ -0,0 +1,17 @@ +#PBtmpl0000000000000017 + +
+ + + + + + + + +
+ + + + + diff --git a/docs/upgrades/upgrade_7.3.22-7.4.0.pl b/docs/upgrades/upgrade_7.3.22-7.4.0.pl index 3b01da439..020ce6324 100644 --- a/docs/upgrades/upgrade_7.3.22-7.4.0.pl +++ b/docs/upgrades/upgrade_7.3.22-7.4.0.pl @@ -38,6 +38,7 @@ addPostCaptchaToCS($session); addFieldsToDatabaseLinks($session); addWikiAttachments($session); addAdminConsoleGroupSettings($session); +updateCommerce($session); finish($session); # this line required @@ -457,7 +458,37 @@ sub addHttpProxyUrlPatternFilter { print "OK!\n" unless ($quiet); } - +#------------------------------------------------- +sub updateCommerce { + my $session = shift; + print "\tUpdating Commerce...." unless ($quiet); + $session->db->write("delete from settings where name='commerceTransactionErrorTemplateId'"); + + #Remove Transaction Error Template + my @templates = $session->db->buildArray("select distinct assetId from template where namespace='Commerce/TransactionError'"); + foreach my $templateId (@templates) { + my $template = WebGUI::Asset->newByDynamicClass($session,$templateId); + $template->purge; + } + + #Add the Check payment gateway to the config file + my $paymentPlugins = $session->config->get('paymentPlugins'); + push(@{$paymentPlugins},'Check'); + $session->config->set('paymentPlugins',$paymentPlugins); + + #Enable the check payment gateway if cash is enabled + my ($cashEnabled) = $session->db->quickArray("select fieldValue from commerceSettings where namespace='Cash' and fieldName='enabled'"); + if($cashEnabled) { + my $sth = $session->db->read("select * from commerceSettings where namespace='Cash'"); + while (my $hash = $sth->hashRef) { + my $array = [$hash->{fieldName},$hash->{fieldValue},'Check',$hash->{type}]; + $session->db->write("insert into commerceSettings values (?,?,?,?)",$array); + } + } + + + print "OK!\n" unless $quiet; +} # ---- DO NOT EDIT BELOW THIS LINE ----