Rename sales_order_number() to order_number()

[Business-OnlinePayment-InternetSecure.git] / InternetSecure.pm

diff --git a/InternetSecure.pm b/InternetSecure.pm
index 3887c8b..b99a95e 100755 (executable)
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -18,8 +18,9 @@ our $VERSION = '0.01';
 use constant CARD_TYPES => {
                                VI => 'Visa',
                                MC => 'MasterCard',
-                               AX => 'American Express',
+                               AX => 'American Express', # FIXME: AM?
                                NN => 'Discover',
+                               # JB?
                        };
 
 
@@ -36,8 +37,8 @@ sub set_defaults {
        $self->path('/process.cgi');
 
        $self->build_subs(qw(
-                               receipt_number  sales_order_number
-                               cardholder      card_type
+                               receipt_number  order_number
+                               card_type
                                total_amount
                                avs_response    cvv2_response
                        ));
@@ -107,14 +108,13 @@ sub parse_expdate {
 # Convert a single product into a product string
 #
 sub prod_string {
-       my ($self, $currency, $taxes, %data) = @_;
+       my ($self, $currency, %data) = @_;
 
        croak "Missing amount in product" unless defined $data{amount};
 
        my @flags = ($currency);
 
-       $taxes = uc $data{taxes} if defined $data{taxes};
-       foreach (split ' ' => $taxes) {
+       foreach (split ' ' => uc($data{taxes} || '')) {
                croak "Unknown tax code $_" unless /^(GST|PST|HST)$/;
                push @flags, $_;
        }
@@ -148,13 +148,11 @@ sub to_xml {
        croak 'Unsupported action'
                unless $content{action} =~ /^Normal Authori[zs]ation$/i;
        
-       $content{currency} ||= 'CAD';
-       $content{currency} = uc $content{currency};
+       $content{currency} = uc($content{currency} || 'CAD');
        croak "Unknown currency code ", $content{currency}
                unless $content{currency} =~ /^(CAD|USD)$/;
        
-       $content{taxes} ||= '';
-       $content{taxes} = uc $content{taxes};
+       $content{taxes} = uc($content{taxes} || '');
 
        my %data = $self->get_remap_fields(qw(
                        xxxCard_Number          card_number
@@ -183,6 +181,7 @@ sub to_xml {
        $data{MerchantNumber} = $self->merchant_id;
 
        $data{xxxCard_Number} =~ tr/ //d;
+       $data{xxxCard_Number} =~ s/^[0-36-9]/4/ if $self->test_transaction;
 
        my ($y, $m) = $self->parse_expdate($content{exp_date});
        $data{xxxCCYear} = sprintf '%.4u' => $y;
@@ -198,16 +197,16 @@ sub to_xml {
        
        if (ref $content{description}) {
                $data{Products} = join '|' => map $self->prod_string(
-                                                       $content{currency},
-                                                       $content{taxes},
-                                                       %$_),
-                                               @{ $content{description} };
+                                               $content{currency},
+                                               taxes => $content{taxes},
+                                               %$_),
+                                       @{ $content{description} };
        } else {
                $self->required_fields(qw(amount));
                $data{Products} = $self->prod_string(
                                        $content{currency},
-                                       $content{taxes},
-                                       amount => $content{amount},
+                                       taxes       => $content{taxes},
+                                       amount      => $content{amount},
                                        description => $content{description},
                                );
        }
@@ -251,8 +250,7 @@ sub parse_response {
 
        $self->infuse($response, qw(
                        ReceiptNumber           receipt_number
-                       SalesOrderNumber        sales_order_number
-                       xxxName                 cardholder
+                       SalesOrderNumber        order_number
                        CardType                card_type
                        Page                    result_code
                        ApprovalCode            authorization
@@ -262,6 +260,9 @@ sub parse_response {
                        CVV2ResponseCode        cvv2_response
                ));
        
+       # Completely undocumented field that sometimes override <Verbiage>
+       $self->error_message($response->{Error}) if $response->{Error};
+       
        $self->card_type(CARD_TYPES->{$self->card_type});
        
        $self->{products_raw} = $response->{Products};
@@ -446,9 +447,8 @@ separating them with spaces, such as C<GST HST>.
 
 =item name / company / address / city / state / zip / country / phone / email
 
-Facultative customer information.  B<state> should be either a postal
-abbreviation or a two-letter code taken from ISO 3166-2, and B<country> should
-be a two-letter code taken from ISO 3166-1.
+Customer information.  B<Country> should be a two-letter code taken from ISO
+3166-1.
 
 =back
 
@@ -458,7 +458,7 @@ be a two-letter code taken from ISO 3166-1.
 
 =over 4
 
-=item receipt_number() / sales_order_number()
+=item receipt_number() / order_number()
 
 Receipt number and sales order number of submitted order.
 
@@ -466,11 +466,6 @@ Receipt number and sales order number of submitted order.
 
 Total amount billed for this order, including taxes.
 
-=item cardholder()
-
-Cardholder's name.  This is currently a mere copy of the B<name> field passed
-to B<submit()>.
-
 =item card_type()
 
 Type of the credit card used for the submitted order, being one of the
@@ -518,7 +513,7 @@ Unit price of this product.
 
 =item quantity
 
-Ordered quantity of this product.  This can be a decimal value.
+Ordered quantity of this product.
 
 =item sku