[interchange-cvs] interchange - heins modified lib/Vend/Payment/Skipjack.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Sep 4 12:07:01 2002
User: heins
Date: 2002-09-04 16:06:51 GMT
Modified: lib/Vend/Payment Skipjack.pm
Log:
* Back out orderstring chages...caused failure.
Revision Changes Path
2.4 +1 -36 interchange/lib/Vend/Payment/Skipjack.pm
rev 2.4, prev_rev 2.3
Index: Skipjack.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Payment/Skipjack.pm,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- Skipjack.pm 2 Sep 2002 16:51:30 -0000 2.3
+++ Skipjack.pm 4 Sep 2002 16:06:51 -0000 2.4
@@ -1,6 +1,6 @@
# Vend::Payment::Skipjack - Interchange Skipjack support
#
-# $Id: Skipjack.pm,v 2.3 2002/09/02 16:51:30 mheins Exp $
+# $Id: Skipjack.pm,v 2.4 2002/09/04 16:06:51 mheins Exp $
#
# Copyright (C) 1999-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -27,7 +27,7 @@
=20
=3Dhead1 Interchange Skipjack Support
=20
-Vend::Payment::Skipjack $Revision: 2.3 $
+Vend::Payment::Skipjack $Revision: 2.4 $
=20
=3Dhead1 SYNOPSIS
=20
@@ -482,41 +482,6 @@
$amount =3D Vend::Util::round_to_frac_digits($amount,$precision);
}
=20
- if(! $opt->{orderstring}) {
-=09=09
- my @strings;
- my $tax_charged =3D Vend::Tags->salestax({noformat =3D> 1}) > 0;
- my $tf =3D $Vend::Cfg->{NonTaxableField};
-
- for my $item (@$Vend::Items) {
- my $price =3D Vend::Data::item_price($item);
- my $desc =3D $item->{description} || Vend::Data::item_description($item=
);
- $desc =3D~ s/~//g;
- $desc =3D~ s/[\r\n]+/ /g;
- $desc =3D HTML::Entities::encode_entities($desc);
-
- my $taxable;
- if(defined $item->{mv_nontaxable}) {
- $taxable =3D $item->{mv_nontaxable} ? 'N' : 'Y';=20
- }
- elsif($tf) {
- $taxable =3D is_yes(Vend::Data::item_field($item, $tf)) ? 'N' : 'Y';
- }
- else {
- $taxable =3D $tax_charged ? 'Y' : 'N';
- }
- push @strings,
- join "~",
- $item->{code},
- $desc,
- $price,
- $item->{quantity},
- $taxable,
- '';
- }
- $opt->{orderstring} =3D join '||', @strings;
- }
-
my %values;
if($transtype eq 'sale') {
%values =3D (
@@ -532,7 +497,7 @@
Year =3D> $ccey,
Serialnumber =3D> $user,
Transactionamount =3D> $amount,
- Orderstring =3D> $opt->{orderstring},
+ Orderstring =3D> "0001~Generic Order String~$amount~1~N~||",
Shiptophone =3D> $actual{phone_day}
);
}