[interchange-cvs] interchange - heins modified 2 files

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-07-21 14:08:50 GMT
Modified:  lib/Vend Order.pm Payment.pm
Log:
* A couple of minor changes making mv_order_number and payment order ID
  honor a sql_counter setting.

Revision  Changes    Path
2.28      +7 -3      interchange/lib/Vend/Order.pm


rev 2.28, prev_rev 2.27
Index: Order.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: /anon_cvs/repository/interchange/lib/Vend/Order.pm,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -r2.27 -r2.28
--- Order.pm	7 Jul 2002 04:02:27 -0000	2.27
+++ Order.pm	21 Jul 2002 14:08:50 -0000	2.28
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.27 2002/07/07 04:02:27 mheins Exp $
+# $Id: Order.pm,v 2.28 2002/07/21 14:08:50 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,7 +28,7 @@
 package Vend::Order;
 require Exporter;
=20
-$VERSION =3D substr(q$Revision: 2.27 $, 10);
+$VERSION =3D substr(q$Revision: 2.28 $, 10);
=20
 @ISA =3D qw(Exporter);
=20
@@ -1542,7 +1542,11 @@
 											);
 		}
 		elsif($route->{increment}) {
-			$::Values->{mv_order_number} =3D counter_number();
+			$::Values->{mv_order_number} =3D counter_number(
+												$main->{counter},
+												$main->{sql_counter},
+												$main->{first_order_number},
+											);
 		}
 		my $pagefile;
 		my $page;



2.5       +5 -3      interchange/lib/Vend/Payment.pm


rev 2.5, prev_rev 2.4
Index: Payment.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: /anon_cvs/repository/interchange/lib/Vend/Payment.pm,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- Payment.pm	18 Jul 2002 16:13:56 -0000	2.4
+++ Payment.pm	21 Jul 2002 14:08:50 -0000	2.5
@@ -1,6 +1,6 @@
 # Vend::Payment - Interchange payment processing routines
 #
-# $Id: Payment.pm,v 2.4 2002/07/18 16:13:56 mheins Exp $
+# $Id: Payment.pm,v 2.5 2002/07/21 14:08:50 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -22,7 +22,7 @@
 package Vend::Payment;
 require Exporter;
=20
-$VERSION =3D substr(q$Revision: 2.4 $, 10);
+$VERSION =3D substr(q$Revision: 2.5 $, 10);
=20
 @ISA =3D qw(Exporter);
=20
@@ -242,7 +242,9 @@
 	elsif($opt->{counter}) {
 		$opt->{order_id} =3D Vend::Interpolate::tag_counter(
 						$opt->{counter},
-						{ start =3D> $opt->{counter_start} || 100000 },
+						{ start =3D> $opt->{counter_start} || 100000,
+						  sql   =3D> $opt->{sql_counter},
+						},
 					);
 	}
 	else {