X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=0029e9161d9cb28fd72a888894e9c490170ebb3b;hb=7f30025e73ae69403e8fe0ffd922f5bb4feada11;hp=b90f187c90e14453b3b56e70b413a72fed507cac;hpb=db3d04bca56bb86414acdcc9b5663446a7d67f0a;p=Business-OnlinePayment-InternetSecure.git diff --git a/InternetSecure.pm b/InternetSecure.pm index b90f187..0029e91 100755 --- 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,9 @@ sub set_defaults { $self->path('/process.cgi'); $self->build_subs(qw( - receipt_number sales_order_number - cardholder card_type + receipt_number sales_number + date + card_type total_amount avs_response cvv2_response )); @@ -75,10 +77,6 @@ sub get_remap_fields { $self->remap_fields(reverse %map); my %data = $self->get_fields(keys %map); - foreach (values %data) { - $_ = '' unless defined; - } - return %data; } @@ -111,14 +109,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, $_; } @@ -152,16 +149,14 @@ 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( - xxxCardNumber card_number + xxxCard_Number card_number xxxName name xxxCompany company @@ -186,7 +181,8 @@ sub to_xml { $data{MerchantNumber} = $self->merchant_id; - $data{xxxCardNumber} =~ tr/ //d; + $data{xxxCard_Number} =~ tr/ //d; + $data{xxxCard_Number} =~ s/^[^3-6]/4/ if $self->test_transaction; my ($y, $m) = $self->parse_expdate($content{exp_date}); $data{xxxCCYear} = sprintf '%.4u' => $y; @@ -202,24 +198,26 @@ 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}, ); } xml_out(\%data, - NoAttr => 1, - RootName => 'TranxRequest', - XMLDecl => '', + NoAttr => 1, + NumericEscape => 2, + RootName => 'TranxRequest', + SuppressEmpty => undef, + XMLDecl => '', ); } @@ -241,6 +239,8 @@ sub parse_response { my ($self, $response) = @_; $self->server_response($response); + + local $/ = "\n"; # Make sure to avoid bug #17687 $response = xml_in($response, ForceArray => [qw(product flag)], @@ -254,8 +254,8 @@ sub parse_response { $self->infuse($response, qw( ReceiptNumber receipt_number - SalesOrderNumber sales_order_number - xxxName cardholder + SalesOrderNumber sales_number + Date date CardType card_type Page result_code ApprovalCode authorization @@ -265,6 +265,9 @@ sub parse_response { CVV2ResponseCode cvv2_response )); + # Completely undocumented field that sometimes override + $self->error_message($response->{Error}) if $response->{Error}; + $self->card_type(CARD_TYPES->{$self->card_type}); $self->{products_raw} = $response->{Products}; @@ -286,15 +289,16 @@ sub submit { undef, make_form( xxxRequestMode => 'X', - xxxRequestData => Encode::encode_utf8( - $self->to_xml - ), + xxxRequestData => $self->to_xml, ) ); croak 'Error connecting to server' unless $page; croak 'Server responded, but not in XML' unless $page =~ /^<\?xml/; + # The response is marked UTF-8, but it's really Latin-1. Sigh. + $page =~ s/^(<\?xml.*?) encoding="utf-8"/$1 encoding="iso-8859-1"/si; + $self->parse_response($page); } @@ -364,7 +368,8 @@ to the merchant ID assigned to you by InternetSecure. =head1 METHODS -(See L for more methods.) +(Other methods are also available -- see L for more +details.) =head2 Before order submission @@ -427,12 +432,14 @@ Code (CVC2) or Card Identification number (CID), depending on the card issuer. A short description of the purchase. See L<"Products list syntax"> for an alternate syntax that allows a list of products to be specified. -=item amount +=item amount (usually required) + +Total amount to be billed, excluding taxes if they are to be added separately +by InternetSecure. -Total amount to be billed, excluding taxes if they are to be added separately. -This field is required if B is a string, and should be left -undefined if B contains a list of products, as outlined in -L<"Products list syntax">. +This field is required if B is a string, but should be left +undefined if B contains a list of products instead, as outlined +in L<"Products list syntax">. =item currency @@ -441,17 +448,15 @@ C (default) or C. =item taxes -Taxes to be added automatically. These should not be included in B; -they will be automatically added by InternetSecure later on. +Taxes to be added automatically to B by InternetSecure. -Available taxes are C, C and C. Taxes can be combined by -separating them with spaces, such as C. +Available taxes are C, C and C. Multiple taxes can specified +by concatenating them with spaces, such as C. =item name / company / address / city / state / zip / country / phone / email -Facultative customer information. B should be either a postal -abbreviation or a two-letter code taken from ISO 3166-2, and B should -be a two-letter code taken from ISO 3166-1. +Customer information. B should be a two-letter code taken from ISO +3166-1. =back @@ -461,18 +466,23 @@ be a two-letter code taken from ISO 3166-1. =over 4 -=item receipt_number() / sales_order_number() +=item receipt_number() -Receipt number and sales order number of submitted order. +Receipt number of this transaction; this is actually a string, unique to all +InternetSecure transactions. -=item total_amount() +=item sales_number() -Total amount billed for this order, including taxes. +Sales order number of this transaction. This is a number, unique to each +merchant, which is incremented by 1 each time. + +=item date() -=item cardholder() +Date and time of the transaction. Format is C. -Cardholder's name. This is currently a mere copy of the B field passed -to B. +=item total_amount() + +Total amount billed for this order, including taxes. =item card_type() @@ -521,7 +531,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