[interchange-cvs] interchange - jon modified
dist/lib/UI/pages/admin/ship_data.html
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Thu Apr 27 17:00:09 EDT 2006
User: jon
Date: 2006-04-27 21:00:09 GMT
Modified: dist/lib/UI/pages/admin ship_data.html
Log:
Remove admin FedEx support, since fedex-query tag is now gone.
Revision Changes Path
2.5 +4 -35 interchange/dist/lib/UI/pages/admin/ship_data.html
rev 2.5, prev_rev 2.4
Index: ship_data.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/ship_data.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- ship_data.html 23 Apr 2005 18:10:07 -0000 2.4
+++ ship_data.html 27 Apr 2006 21:00:09 -0000 2.5
@@ -1,7 +1,7 @@
[set help_name]shipping.data[/set]
[set ui_class]Admin[/set]
[seti page_title]Shipping options: edit data for method [cgi ui_shipmode][/seti]
-[seti page_banner]Shipping options: edit data for method <I>[cgi ui_shipmode]</I>[/seti]
+[seti page_banner]Shipping options: edit data for method <i>[cgi ui_shipmode]</i>[/seti]
[set page_perm]shipping[/set]
[set icon_name]icon_config.gif[/set]
@_UI_STD_HEAD_@
@@ -72,17 +72,6 @@
$cost .= qq{ origin="$opt->{origin}"} if $opt->{origin};
$cost .= "]";
}
- elsif( ! $done_one_fed++
- and $opt->{ui_ship_type}
- and $opt->{ui_ship_type} =~ /^FEDE:(.*)/
- )
- {
- my $m = $1;
- $cost = "f [fedex-query cache=1 mode=$m weight=";
- $cost .= '"@@TOTAL@' . '@"';
- $cost .= qq{ origin="$opt->{origin}"} if $opt->{origin};
- $cost .= "]";
- }
$modes[$i][5] = $cost;
$i++;
}
@@ -194,7 +183,7 @@
@types = (
'' => 'Number',
f => 'Formula',
- '!' => 'UPS/FedEx WWW Lookup',
+ '!' => 'UPS WWW Lookup',
x => 'Multiply by',
u => 'Internal UPS',
e => 'Message',
@@ -221,27 +210,6 @@
$opt,
];
}
- elsif ($opt->{ui_ship_type} =~ /^FEDE:(.*)/) {
- push @modes,
- [ $inmode,
- $master->[1],
- $master->[2],
- 0,
- 150,
- "f [fedex-query mode=$1 cache=1 weight=" . '@@TOTAL' . '@@]',
- '',
- $opt,
- ],
- [ $inmode,
- $master->[1],
- $master->[2],
- 150,
- 9999999,
- "e Too heavy for FedEx",
- '',
- $opt,
- ];
- }
elsif ($opt->{ui_ship_type} =~ /^UPSI/) {
push @modes,
[ $inmode,
@@ -304,7 +272,7 @@
$ref->[5] =~ s/^\s*([A-Za-z])\s*//;
$selector = $1;
if($selector eq 'f') {
- $selector = '!' if $ref->[5] =~ s/\[((?:ups|fedex).query)/[$1/;
+ $selector = '!' if $ref->[5] =~ s/\[(ups.query)/[$1/;
}
$ref->[5] =~ s/"/"/g;
$ref->[5] =~ s/\[/[/g;
@@ -370,3 +338,4 @@
@_UI_STD_FOOTER_@
<!-- page: @@MV_PAGE@@ -->
+[comment] $Id: ship_data.html,v 2.5 2006/04/27 21:00:09 jon Exp $ [/comment]
More information about the interchange-cvs
mailing list