diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 80641aa7e..001c6b58a 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -39,6 +39,7 @@ - fixed #11194: Event Asset Recurrence form is not i18n'ed - fixed #11192: newByLineage tries to instantiate asset even if no assetId found - fixed #11195: Shop, sometimes free checkout does not work + - added: UPS Shipping Driver 7.8.2 - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi) diff --git a/docs/upgrades/upgrade_7.8.2-7.8.3.pl b/docs/upgrades/upgrade_7.8.2-7.8.3.pl index 3aac01b6d..33bd06557 100644 --- a/docs/upgrades/upgrade_7.8.2-7.8.3.pl +++ b/docs/upgrades/upgrade_7.8.2-7.8.3.pl @@ -41,6 +41,7 @@ addPickLanguageMacro($session); installSetLanguage($session); i18nAbleToBeFriend($session); addEMSEnhancements($session); +installUPSDriver($session); finish($session); # this line required @@ -55,6 +56,16 @@ sub addEMSEnhancements { print "Done.\n" unless $quiet; } + +#---------------------------------------------------------------------------- +sub installUPSDriver { + my $session = shift; + print "\tAdding UPS Shipping Driver... " unless $quiet; + $session->config->addToArray('shippingDrivers', 'WebGUI::Shop::ShipDriver::UPS'); + + print "Done.\n" unless $quiet; +} + #---------------------------------------------------------------------------- sub i18nAbleToBeFriend { my $session = shift; @@ -131,6 +142,7 @@ sub addPickLanguageMacro { print "Done.\n" unless $quiet; } +#------------------------------------------------------------------------ sub installSetLanguage { my $session = shift; print "\tAdding SetLanguage content handler... " unless $quiet; diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original index b074415c1..229ea13bb 100644 --- a/etc/WebGUI.conf.original +++ b/etc/WebGUI.conf.original @@ -190,7 +190,8 @@ "shippingDrivers" : [ "WebGUI::Shop::ShipDriver::FlatRate", - "WebGUI::Shop::ShipDriver::USPS" + "WebGUI::Shop::ShipDriver::USPS", + "WebGUI::Shop::ShipDriver::UPS" ], # Specify the list of template parsers available in the system. diff --git a/sbin/installUPSDriver.pl b/sbin/installUPSDriver.pl deleted file mode 100644 index 49c0ef9b6..000000000 --- a/sbin/installUPSDriver.pl +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env perl - -#------------------------------------------------------------------- -# Copyright 2009 Plain Black -#------------------------------------------------------------------- - -$|++; # disable output buffering -our ($webguiRoot, $configFile, $help, $man); - -BEGIN { - $webguiRoot = "/data/WebGUI"; - unshift (@INC, $webguiRoot."/lib"); -} - -use lib '/data/ups-driver'; -use strict; -use Pod::Usage; -use Getopt::Long; -use WebGUI::Session; -use WebGUI::Utility; - -my $quiet = 0; - -# Get parameters here, including $help -GetOptions( - 'configFile=s' => \$configFile, - 'help' => \$help, - 'man' => \$man, -); - -pod2usage( verbose => 1 ) if $help; -pod2usage( verbose => 2 ) if $man; -pod2usage( msg => "Must specify a config file!" ) unless $configFile; - -my $session = start( $webguiRoot, $configFile ); - -installUPSDriver($session); - -# Do your work here -finish($session); - -#---------------------------------------------------------------------------- -# Your sub here - -#---------------------------------------------------------------------------- -sub installUPSDriver - my $session = shift; - print "\tAdding UPS Shipping Driver... \n" unless $quiet; - $session->config->addToArray('shippingDrivers', 'WebGUI::Shop::ShipDriver::UPS'); - - print "Done.\n" unless $quiet; -} - -#---------------------------------------------------------------------------- -sub start { - my $webguiRoot = shift; - my $configFile = shift; - my $session = WebGUI::Session->open($webguiRoot,$configFile); - $session->user({userId=>3}); - - ## If your script is adding or changing content you need these lines, otherwise leave them commented - # - # my $versionTag = WebGUI::VersionTag->getWorking($session); - # $versionTag->set({name => 'Name Your Tag'}); - # - ## - - return $session; -} - -#---------------------------------------------------------------------------- -sub finish { - my $session = shift; - - ## If your script is adding or changing content you need these lines, otherwise leave them commented - # - # my $versionTag = WebGUI::VersionTag->getWorking($session); - # $versionTag->commit; - ## - my $versionTag = WebGUI::VersionTag->getWorking($session); - $versionTag->commit; - - $session->var->end; - $session->close; -} - -#------------------------------------------------- -sub updateTemplates { - my $session = shift; - my $packageDir = "message_center_packages"; - return undef unless (-d $packageDir); - print "\tUpdating packages.\n"; - opendir(DIR,$packageDir); - my @files = readdir(DIR); - closedir(DIR); - my $newFolder = undef; - foreach my $file (@files) { - next unless ($file =~ /\.wgpkg$/); - # Fix the filename to include a path - $file = $packageDir . "/" . $file; - addPackage( $session, $file ); - } -} - -sub addPackage { - my $session = shift; - my $file = shift; - - # Make a storage location for the package - my $storage = WebGUI::Storage->createTemp( $session ); - $storage->addFileFromFilesystem( $file ); - - # Import the package into the import node - my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage ); - - # Make the package not a package anymore - $package->update({ isPackage => 0 }); - - # Set the default flag for templates added - my $assetIds - = $package->getLineage( ['self','descendants'], { - includeOnlyClasses => [ 'WebGUI::Asset::Template' ], - } ); - for my $assetId ( @{ $assetIds } ) { - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); - if ( !$asset ) { - print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n"; - next; - } - $asset->update( { isDefault => 1 } ); - } - - return; -} - - -__END__ - - -=head1 NAME - -utility - A template for WebGUI utility scripts - -=head1 SYNOPSIS - - utility --configFile config.conf ... - - utility --help - -=head1 DESCRIPTION - -This WebGUI utility script helps you... - -=head1 ARGUMENTS - -=head1 OPTIONS - -=over - -=item B<--configFile config.conf> - -The WebGUI config file to use. Only the file name needs to be specified, -since it will be looked up inside WebGUI's configuration directory. -This parameter is required. - -=item B<--help> - -Shows a short summary and usage - -=item B<--man> - -Shows this document - -=back - -=head1 AUTHOR - -Copyright 2009 SDH Consulting Group - -=cut - -#vim:ft=perl