[interchange-cvs] interchange - jon modified 4 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Fri Mar 24 16:32:52 EST 2006
User: jon
Date: 2006-03-24 21:32:52 GMT
Modified: . Makefile.PL MANIFEST
Modified: code/UI_Tag available_www_shipping.coretag
Removed: extra/Business Fedex.pm
Log:
Remove obsolete Business::Fedex module and hooks.
Revision Changes Path
2.57 +1 -9 interchange/Makefile.PL
rev 2.57, prev_rev 2.56
Index: Makefile.PL
===================================================================
RCS file: /var/cvs/interchange/Makefile.PL,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -u -r2.56 -r2.57
--- Makefile.PL 28 Dec 2005 00:59:24 -0000 2.56
+++ Makefile.PL 24 Mar 2006 21:32:51 -0000 2.57
@@ -154,7 +154,7 @@
Interchange V$VERSION
- Copyright (C) 2002-2005 Interchange Development Group.
+ Copyright (C) 2002-2006 Interchange Development Group.
Copyright (C) 1996-2002 Red Hat, Inc.
Interchange is free under the terms of the GNU General Public License.
@@ -215,14 +215,6 @@
if ($@) {
push @extra_lib_dirs, 'Tie';
push @extra_lib_files, 'Tie/ShadowHash.pm';
- }
-
- eval {
- require Business::Fedex;
- };
- if ($@) {
- push @extra_lib_dirs, 'Business';
- push @extra_lib_files, 'Business/Fedex.pm';
}
eval {
2.191 +0 -6 interchange/MANIFEST
rev 2.191, prev_rev 2.190
Index: MANIFEST
===================================================================
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.190
retrieving revision 2.191
diff -u -u -r2.190 -r2.191
--- MANIFEST 22 Mar 2006 17:27:31 -0000 2.190
+++ MANIFEST 24 Mar 2006 21:32:52 -0000 2.191
@@ -987,9 +987,6 @@
dist/standard/variables/THEME_CSS
eg/compact
eg/filter/calculated.filter
-eg/globalsub/authorizenet
-eg/globalsub/signio
-eg/globalsub/test_card
eg/gpg_display
eg/grant.sql
eg/ifdef
@@ -1020,8 +1017,6 @@
extensions/benchtimes/catalog.cfg.add
extensions/benchtimes/interchange.cfg.add
extensions/benchtimes/README
-extensions/ECML/ecml.coretag
-extensions/ECML/Vend/ECML.pm
extensions/Interchange.pm
extensions/quickbooks/legacy/qb.catalog.cfg
extensions/quickbooks/legacy/trans_quickbooks
@@ -1042,7 +1037,6 @@
extensions/quickbooks/usertag/get_quicken_orders.tag
extensions/quickbooks/usertag/import_quicken_items.tag
extensions/quickbooks/vars/TRANS_QUICKBOOKS
-extra/Business/Fedex.pm
extra/Business/UPS.pm
extra/File/Spec.pm
extra/File/Spec/OS2.pm
1.4 +5 -29 interchange/code/UI_Tag/available_www_shipping.coretag
rev 1.4, prev_rev 1.3
Index: available_www_shipping.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/available_www_shipping.coretag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- available_www_shipping.coretag 8 Nov 2005 18:14:39 -0000 1.3
+++ available_www_shipping.coretag 24 Mar 2006 21:32:52 -0000 1.4
@@ -1,15 +1,14 @@
-# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
+# Copyright 2002-2006 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: available_www_shipping.coretag,v 1.3 2005/11/08 18:14:39 jon Exp $
+# $Id: available_www_shipping.coretag,v 1.4 2006/03/24 21:32:52 jon Exp $
UserTag available_www_shipping Order only
-UserTag available_www_shipping Version $Revision: 1.3 $
+UserTag available_www_shipping Version $Revision: 1.4 $
UserTag available_www_shipping Routine <<EOR
sub {
my ($only) = @_;
my $ups;
- my $fedex;
- my $other;
+
if(! $only or $only =~ /ups/i) {
eval {
require Business::UPS;
@@ -17,14 +16,7 @@
$ups = $@ ? 0 : 1;
}
- if(! $only or $only =~ /fed/i) {
- eval {
- require Business::Fedex;
- };
- $fedex = $@ ? 0 : 1;
- }
my @ups_modes;
- my @fed_modes;
if($ups) {
push @ups_modes,
'1DM' => {type => 'UPS', description => 'Next Day Air Early AM'},
@@ -48,20 +40,8 @@
;
}
- if($fedex) {
- push @fed_modes,
- 'FEG' => {type => 'FED', description => 'FedEx Ground'},
- 'FEH' => {type => 'FED', description => 'FedEx Home Delivery'},
- 'FPO' => {type => 'FED', description => 'FedEx Priority Overnight'},
- 'FSO' => {type => 'FED', description => 'FedEx Standard Overnight'},
- 'F2D' => {type => 'FED', description => 'FedEx 2-Day'},
- 'FES' => {type => 'FED', description => 'FedEx Express Saver'},
- 'FIP' => {type => 'FED', description => 'FedEx International Priority'},
- 'FIE' => {type => 'FED', description => 'FedEx International Economy'},
- ;
- }
if (wantarray) {
- return @ups_modes, @fed_modes;
+ return @ups_modes;
}
else {
my $out = '';
@@ -69,10 +49,6 @@
for ($i = 0; $i < @ups_modes; $i += 2) {
my $ref = $ups_modes[$i + 1];
$out .= qq{UPSE:$ups_modes[$i]\t$ref->{type}: $ref->{description}\n};
- }
- for ($i = 0; $i < @fed_modes; $i += 2) {
- my $ref = $fed_modes[$i + 1];
- $out .= qq{FEDE:$fed_modes[$i]\t$ref->{type}: $ref->{description}\n};
}
return $out;
}
More information about the interchange-cvs
mailing list