X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=b99a95ece64c4e4f64feea6edef715d6289a0347;hb=8e8cc151156d365458b7e03a2991a6cfb011b71c;hp=a4cd4ed66824bc32bfbc02fd3f6f29c284e6c566;hpb=b2492009212a9e84abac9f50f9e7ac26ec72f610;p=Business-OnlinePayment-InternetSecure.git diff --git a/InternetSecure.pm b/InternetSecure.pm index a4cd4ed..b99a95e 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,13 +37,25 @@ 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 )); } +# OnlinePayment's get_fields now filters out undefs in 3.x. :( +# +sub get_fields { + my ($self, @fields) = @_; + + my %content = $self->content; + + my %new = map +($_ => $content{$_}), @fields; + + return %new; +} + # OnlinePayment's remap_fields is buggy, so we simply rewrite it # sub remap_fields { @@ -63,10 +76,6 @@ sub get_remap_fields { $self->remap_fields(reverse %map); my %data = $self->get_fields(keys %map); - foreach (values %data) { - $_ = '' unless defined; - } - return %data; } @@ -99,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, $_; } @@ -140,16 +148,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 @@ -174,7 +180,8 @@ sub to_xml { $data{MerchantNumber} = $self->merchant_id; - $data{xxxCardNumber} =~ tr/ //d; + $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; @@ -190,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}, ); } @@ -207,6 +214,7 @@ sub to_xml { xml_out(\%data, NoAttr => 1, RootName => 'TranxRequest', + SuppressEmpty => undef, XMLDecl => '', ); } @@ -230,9 +238,6 @@ sub parse_response { $self->server_response($response); - # FIXME: It's not quite clear whether there should be some decoding, or - # if the result is already utf8.) - $response = xml_in($response, ForceArray => [qw(product flag)], GroupTags => { qw(Products product flags flag) }, @@ -245,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 @@ -256,6 +260,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}; @@ -342,7 +349,7 @@ Business::OnlinePayment::InternetSecure - InternetSecure backend for Business::O Business::OnlinePayment::InternetSecure is an implementation of L that allows for processing online credit card -payments through Internet Secure. +payments through InternetSecure. See L for more information about the generic Business::OnlinePayment interface. @@ -351,7 +358,7 @@ Business::OnlinePayment interface. Object creation is done via L; see its manpage for details. The I processor option is required, and corresponds -to the merchant ID assigned to you by Internet Secure. +to the merchant ID assigned to you by InternetSecure. =head1 METHODS @@ -433,16 +440,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 Internet Secure later on. +they will be automatically added by InternetSecure later on. Available taxes are C, C and C. Taxes can be combined by separating 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 @@ -452,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. @@ -460,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 field passed -to B. - =item card_type() Type of the credit card used for the submitted order, being one of the @@ -484,9 +485,14 @@ following: =item avs_response() / cvv2_response() -Results of the AVS and CVV2 checks. See the Internet Secure documentation for +Results of the AVS and CVV2 checks. See the InternetSecure documentation for the list of possible values. +=item products_raw() + +... + + =back @@ -507,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 @@ -528,14 +534,17 @@ When using a products list, the B field passed to B should be left undefined. -=head2 Character encodings - -... +=head2 Character encoding +Since communication to/from InternetSecure is encoded with UTF-8, all Unicode +characters are theoretically available when submitting information via +B. (Further restrictions may be imposed by InternetSecure itself.) -=head2 products_raw - -... +When using non-ASCII characters, all data provided to B should either +be in the current native encoding (typically latin-1, unless it was modified +via the C pragma), or be decoded via the C module. +Conversely, all data returned after calling B will be automatically +decoded. =head1 EXPORT @@ -549,11 +558,11 @@ L =head1 AUTHOR -Frederic Briere, Efbriere@fbriere.netE +Frédéric Brière, Efbriere@fbriere.netE =head1 COPYRIGHT AND LICENSE -Copyright (C) 2006 by Frederic Briere +Copyright (C) 2006 by Frédéric Brière This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.4 or,