X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=4f0e3db0253671a69b1383155c8f5fa0240b63b3;hb=d3c665aa8eadcd5284daf8f8c9b7525ed6bbc542;hp=9aa2d8d54e11980fac20717d32d40ea1956bf2f1;hpb=aac0b428135cafe2824920e913c319e91fddb0ef;p=Business-OnlinePayment-InternetSecure.git diff --git a/InternetSecure.pm b/InternetSecure.pm index 9aa2d8d..4f0e3db 100755 --- a/InternetSecure.pm +++ b/InternetSecure.pm @@ -12,17 +12,17 @@ use XML::Simple qw(xml_in xml_out); use base qw(Business::OnlinePayment Exporter); -our $VERSION = '0.01'; +our $VERSION = '0.03'; use constant SUCCESS_CODES => qw(2000 90000 900P1); use constant CARD_TYPES => { - VI => 'Visa', + AM => 'American Express', + JB => 'JCB', MC => 'MasterCard', - AX => 'American Express', # FIXME: AM? NN => 'Discover', - # JB? + VI => 'Visa', }; @@ -42,33 +42,28 @@ sub set_defaults { receipt_number sales_number uuid guid date card_type cardholder - total_amount taxes + total_amount tax_amounts avs_response cvv2_response )); - # Just in case someone tries to call taxes() *before* submit() - $self->taxes( {} ); -} - -# 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; + # Just in case someone tries to call tax_amounts() *before* submit() + $self->tax_amounts( {} ); } -# Combine get_fields and remap_fields for convenience +# Combine get_fields and remap_fields for convenience. Unlike OnlinePayment's +# remap_fields, this doesn't modify content(), and can therefore be called +# more than once. Also, unlike OnlinePayment's get_fields in 3.x, this doesn't +# exclude undefs. # sub get_remap_fields { my ($self, %map) = @_; - $self->remap_fields(reverse %map); - my %data = $self->get_fields(keys %map); + my %content = $self->content(); + my %data; + + while (my ($to, $from) = each %map) { + $data{$to} = $content{$from}; + } return %data; } @@ -108,9 +103,14 @@ sub prod_string { my @flags = ($currency); - foreach (ref $data{taxes} ? - @{ $data{taxes} } : - split(' ' => $data{taxes} || '')) { + my @taxes; + if (ref $data{taxes}) { + @taxes = @{ $data{taxes} }; + } elsif ($data{taxes}) { + @taxes = split ' ' => $data{taxes}; + } + + foreach (@taxes) { croak "Unknown tax code $_" unless /^(GST|PST|HST)$/i; push @flags, uc $_; } @@ -137,9 +137,10 @@ sub to_xml { $self->required_fields(qw(action card_number exp_date)); - croak 'Unsupported transaction type' - if $content{type} && $content{type} !~ - /^(Visa|MasterCard|American Express|Discover)$/i; + croak "Unsupported transaction type: $content{type}" + if $content{type} && + ! grep lc($content{type}) eq lc($_), + values %{+CARD_TYPES}; croak 'Unsupported action' unless $content{action} =~ /^Normal Authori[zs]ation$/i; @@ -148,8 +149,6 @@ sub to_xml { croak "Unknown currency code ", $content{currency} unless $content{currency} =~ /^(CAD|USD)$/; - $content{taxes} = uc($content{taxes} || ''); - my %data = $self->get_remap_fields(qw( xxxCard_Number card_number @@ -207,13 +206,14 @@ sub to_xml { ); } - xml_out(\%data, + # The encode() makes sure to a) strip off non-Latin-1 characters, and + # b) turn off the utf8 flag, which confuses XML::Simple + encode('ISO-8859-1', xml_out(\%data, NoAttr => 1, - NumericEscape => 2, RootName => 'TranxRequest', SuppressEmpty => undef, XMLDecl => '', - ); + )); } # Map the various fields from the response, and put their values into our @@ -228,10 +228,10 @@ sub infuse { } } -sub extract_taxes { +sub extract_tax_amounts { my ($self, $response) = @_; - my %taxes; + my %tax_amounts; my $products = $response->{Products}; return unless $products; @@ -242,11 +242,11 @@ sub extract_taxes { grep($_ eq '{TAX}', @$flags) && grep($_ eq '{CALCULATED}', @$flags)) { - $taxes{ $node->{code} } = $node->{subtotal}; + $tax_amounts{ $node->{code} } = $node->{subtotal}; } } - return %taxes; + return %tax_amounts; } # Parse the server's response and set various fields @@ -293,7 +293,7 @@ sub parse_response { $self->card_type(CARD_TYPES->{$self->card_type}); - $self->taxes( { $self->extract_taxes($response) } ); + $self->tax_amounts( { $self->extract_tax_amounts($response) } ); return $self; } @@ -421,6 +421,8 @@ Transaction type, being one of the following: =item - Discover +=item - JCB + =back (This is actually ignored for the moment, and can be left blank or undefined.) @@ -467,10 +469,12 @@ C (default) or C. =item taxes -Taxes to be added automatically to B by InternetSecure. +Taxes to be added automatically to B by InternetSecure. Available +taxes are C, C and C. -Available taxes are C, C and C. Multiple taxes can specified -by concatenating them with spaces, such as C. +This argument can either be a single string of taxes concatenated with spaces +(such as C), or a reference to an array of taxes (such as C<[ "GST", +"PST" ]>). =item name / company / address / city / state / zip / country / phone / email @@ -539,10 +543,11 @@ Date and time of the transaction. Format is C. Total amount billed for this order, including taxes. -=item taxes() +=item tax_amounts() -Returns a I to a hash that maps tax names (such as C) to the -amount that was billed for each. +Returns a I to a hash that maps taxes, which were listed under the +B argument to B(), to the amount that was calculated by +InternetSecure. =item cardholder() @@ -564,6 +569,8 @@ following: =item - Discover +=item - JCB + =back @@ -581,7 +588,7 @@ the following fields: =over 4 -=item amount +=item amount (required) Unit price of this product. @@ -610,15 +617,13 @@ be left undefined. =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.) +When using non-ASCII characters, all data provided to B() should +have been decoded beforehand via the C module, unless your data is in +ISO-8859-1 and you haven't meddled with the C pragma. (Please +don't.) -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. +InternetSecure currently does not handle characters outside of ISO-8859-1, so +these will be replaced with C before being transmitted. =head1 EXPORT