lib/active_merchant/billing/gateways/payflow.rb in activemerchant-1.3.1 vs lib/active_merchant/billing/gateways/payflow.rb in activemerchant-1.3.2

@@ -124,23 +124,24 @@
       def add_credit_card(xml, credit_card)
         xml.tag! 'Card' do
           xml.tag! 'CardType', credit_card_type(credit_card)
           xml.tag! 'CardNum', credit_card.number
           xml.tag! 'ExpDate', expdate(credit_card)
-          xml.tag! 'NameOnCard', credit_card.name
+          xml.tag! 'NameOnCard', credit_card.first_name
           xml.tag! 'CVNum', credit_card.verification_value if credit_card.verification_value?
           
           if requires_start_date_or_issue_number?(credit_card)
             xml.tag!('ExtData', 'Name' => 'CardStart', 'Value' => startdate(credit_card)) unless credit_card.start_month.blank? || credit_card.start_year.blank?
             xml.tag!('ExtData', 'Name' => 'CardIssue', 'Value' => format(credit_card.issue_number, :two_digits)) unless credit_card.issue_number.blank?
           end
+          xml.tag! 'ExtData', 'Name' => 'LASTNAME', 'Value' =>  credit_card.last_name
         end
       end
       
       def credit_card_type(credit_card)
-        return '' if credit_card.type.blank?
+        return '' if card_brand(credit_card).blank?
         
-        CARD_MAPPING[credit_card.type.to_sym]
+        CARD_MAPPING[card_brand(credit_card).to_sym]
       end
       
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year)
         month = sprintf("%.2i", creditcard.month)