activemerchant 1.104.0 → 1.105.0

data/lib/active_merchant/billing/gateways/litle.rb

@@ -164,21 +164,21 @@ module ActiveMerchant #:nodoc:
       }
 
       AVS_RESPONSE_CODE = {
-          '00' => 'Y',
-          '01' => 'X',
-          '02' => 'D',
-          '10' => 'Z',
-          '11' => 'W',
-          '12' => 'A',
-          '13' => 'A',
-          '14' => 'P',
-          '20' => 'N',
-          '30' => 'S',
-          '31' => 'R',
-          '32' => 'U',
-          '33' => 'R',
-          '34' => 'I',
-          '40' => 'E'
+        '00' => 'Y',
+        '01' => 'X',
+        '02' => 'D',
+        '10' => 'Z',
+        '11' => 'W',
+        '12' => 'A',
+        '13' => 'A',
+        '14' => 'P',
+        '20' => 'N',
+        '30' => 'S',
+        '31' => 'R',
+        '32' => 'U',
+        '33' => 'R',
+        '34' => 'I',
+        '40' => 'E'
       }
 
       def void_type(kind)

data/lib/active_merchant/billing/gateways/merchant_warrior.rb

@@ -60,9 +60,12 @@ module ActiveMerchant #:nodoc:
         commit('refundCard', post)
       end
 
-      def void(money, identification, options = {})
+      def void(identification, options = {})
         post = {}
-        add_amount(post, money, options)
+        # The amount parameter is required for void transactions
+        # on the Merchant Warrior gateway.
+        post['transactionAmount'] = options[:amount]
+        post['hash'] = void_verification_hash(identification)
         add_transaction(post, identification)
         commit('processVoid', post)
       end
@@ -161,6 +164,16 @@ module ActiveMerchant #:nodoc:
         )
       end
 
+      def void_verification_hash(transaction_id)
+        Digest::MD5.hexdigest(
+          (
+            @options[:api_passphrase].to_s +
+            @options[:merchant_uuid].to_s +
+            transaction_id
+          ).downcase
+        )
+      end
+
       def parse(body)
         xml = REXML::Document.new(body)
 

data/lib/active_merchant/billing/gateways/monei.rb

@@ -260,10 +260,10 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         xml = Nokogiri::XML(body)
         {
-            :unique_id => xml.xpath('//Response/Transaction/Identification/UniqueID').text,
-            :status => translate_status_code(xml.xpath('//Response/Transaction/Processing/Status/@code').text),
-            :reason => translate_status_code(xml.xpath('//Response/Transaction/Processing/Reason/@code').text),
-            :message => xml.xpath('//Response/Transaction/Processing/Return').text
+          :unique_id => xml.xpath('//Response/Transaction/Identification/UniqueID').text,
+          :status => translate_status_code(xml.xpath('//Response/Transaction/Processing/Status/@code').text),
+          :reason => translate_status_code(xml.xpath('//Response/Transaction/Processing/Reason/@code').text),
+          :message => xml.xpath('//Response/Transaction/Processing/Return').text
         }
       end
 
@@ -311,26 +311,26 @@ module ActiveMerchant #:nodoc:
       # Private: Translate Monei status code to native ruby symbols
       def translate_status_code(code)
         {
-            '00' => :success,
-            '40' => :neutral,
-            '59' => :waiting_bank,
-            '60' => :rejected_bank,
-            '64' => :waiting_risk,
-            '65' => :rejected_risk,
-            '70' => :rejected_validation,
-            '80' => :waiting,
-            '90' => :new
+          '00' => :success,
+          '40' => :neutral,
+          '59' => :waiting_bank,
+          '60' => :rejected_bank,
+          '64' => :waiting_risk,
+          '65' => :rejected_risk,
+          '70' => :rejected_validation,
+          '80' => :waiting,
+          '90' => :new
         }[code]
       end
 
       # Private: Translate AM operations to Monei operations codes
       def tanslate_payment_code(action)
         {
-            :purchase => 'CC.DB',
-            :authorize => 'CC.PA',
-            :capture => 'CC.CP',
-            :refund => 'CC.RF',
-            :void => 'CC.RV'
+          :purchase => 'CC.DB',
+          :authorize => 'CC.PA',
+          :capture => 'CC.CP',
+          :refund => 'CC.RF',
+          :void => 'CC.RV'
         }[action]
       end
     end

data/lib/active_merchant/billing/gateways/moneris.rb

@@ -417,27 +417,27 @@ module ActiveMerchant #:nodoc:
 
       def actions
         {
-            'purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
-            'preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
-            'command' => [:order_id],
-            'refund' => [:order_id, :amount, :txn_number, :crypt_type],
-            'indrefund' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-            'completion' => [:order_id, :comp_amount, :txn_number, :crypt_type],
-            'purchasecorrection' => [:order_id, :txn_number, :crypt_type],
-            'cavv_preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
-            'cavv_purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
-            'card_verification' => [:order_id, :cust_id, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :cof_info],
-            'transact' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-            'Batchcloseall' => [],
-            'opentotals' => [:ecr_number],
-            'batchclose' => [:ecr_number],
-            'res_add_cc' => [:pan, :expdate, :crypt_type, :avs_info, :cof_info],
-            'res_temp_add' => [:pan, :expdate, :crypt_type, :duration],
-            'res_delete' => [:data_key],
-            'res_update_cc' => [:data_key, :pan, :expdate, :crypt_type, :avs_info, :cof_info],
-            'res_purchase_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
-            'res_preauth_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
-            'res_card_verification_cc' => [:order_id, :data_key, :expdate, :crypt_type, :cof_info]
+          'purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
+          'preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
+          'command' => [:order_id],
+          'refund' => [:order_id, :amount, :txn_number, :crypt_type],
+          'indrefund' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          'completion' => [:order_id, :comp_amount, :txn_number, :crypt_type],
+          'purchasecorrection' => [:order_id, :txn_number, :crypt_type],
+          'cavv_preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
+          'cavv_purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
+          'card_verification' => [:order_id, :cust_id, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :cof_info],
+          'transact' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          'Batchcloseall' => [],
+          'opentotals' => [:ecr_number],
+          'batchclose' => [:ecr_number],
+          'res_add_cc' => [:pan, :expdate, :crypt_type, :avs_info, :cof_info],
+          'res_temp_add' => [:pan, :expdate, :crypt_type, :duration],
+          'res_delete' => [:data_key],
+          'res_update_cc' => [:data_key, :pan, :expdate, :crypt_type, :avs_info, :cof_info],
+          'res_purchase_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
+          'res_preauth_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
+          'res_card_verification_cc' => [:order_id, :data_key, :expdate, :crypt_type, :cof_info]
         }
       end
     end

data/lib/active_merchant/billing/gateways/openpay.rb

@@ -220,9 +220,9 @@ module ActiveMerchant #:nodoc:
         msg = 'Invalid response received from the Openpay API.  Please contact soporte@openpay.mx if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"
         {
-            'category' => 'request',
-            'error_code' => '9999',
-            'description' => msg
+          'category' => 'request',
+          'error_code' => '9999',
+          'description' => msg
         }
       end
     end

data/lib/active_merchant/billing/gateways/orbital.rb

@@ -622,10 +622,10 @@ module ActiveMerchant #:nodoc:
 
         Response.new(success?(response, message_type), message_from(response), response,
           {
-             :authorization => authorization_string(response[:tx_ref_num], response[:order_id]),
-             :test => self.test?,
-             :avs_result => OrbitalGateway::AVSResult.new(response[:avs_resp_code]),
-             :cvv_result => OrbitalGateway::CVVResult.new(response[:cvv2_resp_code])
+            :authorization => authorization_string(response[:tx_ref_num], response[:order_id]),
+            :test => self.test?,
+            :avs_result => OrbitalGateway::AVSResult.new(response[:avs_resp_code]),
+            :cvv_result => OrbitalGateway::CVVResult.new(response[:cvv2_resp_code])
           }
         )
       end
@@ -897,54 +897,54 @@ module ActiveMerchant #:nodoc:
       #
       class AVSResult < ActiveMerchant::Billing::AVSResult
         CODES = {
-            '1'  => 'No address supplied',
-            '2'  => 'Bill-to address did not pass Auth Host edit checks',
-            '3'  => 'AVS not performed',
-            '4'  => 'Issuer does not participate in AVS',
-            '5'  => 'Edit-error - AVS data is invalid',
-            '6'  => 'System unavailable or time-out',
-            '7'  => 'Address information unavailable',
-            '8'  => 'Transaction Ineligible for AVS',
-            '9'  => 'Zip Match/Zip 4 Match/Locale match',
-            'A'  => 'Zip Match/Zip 4 Match/Locale no match',
-            'B'  => 'Zip Match/Zip 4 no Match/Locale match',
-            'C'  => 'Zip Match/Zip 4 no Match/Locale no match',
-            'D'  => 'Zip No Match/Zip 4 Match/Locale match',
-            'E'  => 'Zip No Match/Zip 4 Match/Locale no match',
-            'F'  => 'Zip No Match/Zip 4 No Match/Locale match',
-            'G'  => 'No match at all',
-            'H'  => 'Zip Match/Locale match',
-            'J'  => 'Issuer does not participate in Global AVS',
-            'JA' => 'International street address and postal match',
-            'JB' => 'International street address match. Postal code not verified',
-            'JC' => 'International street address and postal code not verified',
-            'JD' => 'International postal code match. Street address not verified',
-            'M1' => 'Cardholder name matches',
-            'M2' => 'Cardholder name, billing address, and postal code matches',
-            'M3' => 'Cardholder name and billing code matches',
-            'M4' => 'Cardholder name and billing address match',
-            'M5' => 'Cardholder name incorrect, billing address and postal code match',
-            'M6' => 'Cardholder name incorrect, billing postal code matches',
-            'M7' => 'Cardholder name incorrect, billing address matches',
-            'M8' => 'Cardholder name, billing address and postal code are all incorrect',
-            'N3' => 'Address matches, ZIP not verified',
-            'N4' => 'Address and ZIP code not verified due to incompatible formats',
-            'N5' => 'Address and ZIP code match (International only)',
-            'N6' => 'Address not verified (International only)',
-            'N7' => 'ZIP matches, address not verified',
-            'N8' => 'Address and ZIP code match (International only)',
-            'N9' => 'Address and ZIP code match (UK only)',
-            'R'  => 'Issuer does not participate in AVS',
-            'UK' => 'Unknown',
-            'X'  => 'Zip Match/Zip 4 Match/Address Match',
-            'Z'  => 'Zip Match/Locale no match',
+          '1'  => 'No address supplied',
+          '2'  => 'Bill-to address did not pass Auth Host edit checks',
+          '3'  => 'AVS not performed',
+          '4'  => 'Issuer does not participate in AVS',
+          '5'  => 'Edit-error - AVS data is invalid',
+          '6'  => 'System unavailable or time-out',
+          '7'  => 'Address information unavailable',
+          '8'  => 'Transaction Ineligible for AVS',
+          '9'  => 'Zip Match/Zip 4 Match/Locale match',
+          'A'  => 'Zip Match/Zip 4 Match/Locale no match',
+          'B'  => 'Zip Match/Zip 4 no Match/Locale match',
+          'C'  => 'Zip Match/Zip 4 no Match/Locale no match',
+          'D'  => 'Zip No Match/Zip 4 Match/Locale match',
+          'E'  => 'Zip No Match/Zip 4 Match/Locale no match',
+          'F'  => 'Zip No Match/Zip 4 No Match/Locale match',
+          'G'  => 'No match at all',
+          'H'  => 'Zip Match/Locale match',
+          'J'  => 'Issuer does not participate in Global AVS',
+          'JA' => 'International street address and postal match',
+          'JB' => 'International street address match. Postal code not verified',
+          'JC' => 'International street address and postal code not verified',
+          'JD' => 'International postal code match. Street address not verified',
+          'M1' => 'Cardholder name matches',
+          'M2' => 'Cardholder name, billing address, and postal code matches',
+          'M3' => 'Cardholder name and billing code matches',
+          'M4' => 'Cardholder name and billing address match',
+          'M5' => 'Cardholder name incorrect, billing address and postal code match',
+          'M6' => 'Cardholder name incorrect, billing postal code matches',
+          'M7' => 'Cardholder name incorrect, billing address matches',
+          'M8' => 'Cardholder name, billing address and postal code are all incorrect',
+          'N3' => 'Address matches, ZIP not verified',
+          'N4' => 'Address and ZIP code not verified due to incompatible formats',
+          'N5' => 'Address and ZIP code match (International only)',
+          'N6' => 'Address not verified (International only)',
+          'N7' => 'ZIP matches, address not verified',
+          'N8' => 'Address and ZIP code match (International only)',
+          'N9' => 'Address and ZIP code match (UK only)',
+          'R'  => 'Issuer does not participate in AVS',
+          'UK' => 'Unknown',
+          'X'  => 'Zip Match/Zip 4 Match/Address Match',
+          'Z'  => 'Zip Match/Locale no match',
         }
 
         # Map vendor's AVS result code to a postal match code
         ORBITAL_POSTAL_MATCH_CODE = {
-            'Y' => %w(9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z),
-            'N' => %w(D E F G M8),
-            'X' => %w(4 J R),
+          'Y' => %w(9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z),
+          'N' => %w(D E F G M8),
+          'X' => %w(4 J R),
             nil => %w(1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UK)
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }
@@ -953,9 +953,9 @@ module ActiveMerchant #:nodoc:
 
         # Map vendor's AVS result code to a street match code
         ORBITAL_STREET_MATCH_CODE = {
-            'Y' => %w(9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X),
-            'N' => %w(A C E G M8 Z),
-            'X' => %w(4 J R),
+          'Y' => %w(9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X),
+          'N' => %w(A C E G M8 Z),
+          'X' => %w(4 J R),
             nil => %w(1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UK)
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }

data/lib/active_merchant/billing/gateways/pac_net_raven.rb

@@ -126,9 +126,9 @@ module ActiveMerchant #:nodoc:
           :authorization => response['TrackingNumber'],
           :fraud_review => fraud_review?(response),
           :avs_result => {
-                          :postal_match => AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
-                          :street_match => AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
-                         },
+            :postal_match => AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
+            :street_match => AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
+          },
           :cvv_result => CVV2_CODES[response['CVV2ResponseCode']]
         )
       end

data/lib/active_merchant/billing/gateways/paymentez.rb

@@ -72,7 +72,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, _options = {})
         post = {
-            transaction: { id: authorization }
+          transaction: { id: authorization }
         }
         post[:order] = {amount: amount(money).to_f} if money
 

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -586,11 +586,11 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:OrderTotal', localized_amount(money, currency_code), 'currencyID' => currency_code
 
           # All of the values must be included together and add up to the order total
-          if [:subtotal, :shipping, :handling, :tax].all?{ |o| options.has_key?(o) }
-            xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
-            xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping], currency_code),'currencyID' => currency_code
-            xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling], currency_code),'currencyID' => currency_code
-            xml.tag! 'n2:TaxTotal', localized_amount(options[:tax], currency_code), 'currencyID' => currency_code
+          if [:subtotal, :shipping, :handling, :tax].all?{ |o| options[o].present?}
+            xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal].to_i, currency_code), 'currencyID' => currency_code
+            xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping].to_i, currency_code),'currencyID' => currency_code
+            xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling].to_i, currency_code),'currencyID' => currency_code
+            xml.tag! 'n2:TaxTotal', localized_amount(options[:tax].to_i, currency_code), 'currencyID' => currency_code
           end
 
           xml.tag! 'n2:InsuranceTotal', localized_amount(options[:insurance_total], currency_code),'currencyID' => currency_code unless options[:insurance_total].blank?

data/lib/active_merchant/billing/gateways/redsys.rb

@@ -270,8 +270,10 @@ module ActiveMerchant #:nodoc:
           gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
           gsub(%r((%3CDS_MERCHANT_PAN%3E)\d+(%3C%2FDS_MERCHANT_PAN%3E))i, '\1[FILTERED]\2').
           gsub(%r((%3CDS_MERCHANT_CVV2%3E)\d+(%3C%2FDS_MERCHANT_CVV2%3E))i, '\1[FILTERED]\2').
+          gsub(%r((<DS_MERCHANT_PAN>)\d+(</DS_MERCHANT_PAN>))i, '\1[FILTERED]\2').
           gsub(%r((<DS_MERCHANT_PAN>)\d+(</DS_MERCHANT_PAN>))i, '\1[FILTERED]\2').
           gsub(%r((<DS_MERCHANT_CVV2>)\d+(</DS_MERCHANT_CVV2>))i, '\1[FILTERED]\2').
+          gsub(%r((&lt;DS_MERCHANT_CVV2&gt;)\d+(&lt;/DS_MERCHANT_CVV2&gt;))i, '\1[FILTERED]\2').
           gsub(%r((DS_MERCHANT_CVV2)%2F%3E%0A%3C%2F)i, '\1[BLANK]').
           gsub(%r((DS_MERCHANT_CVV2)%2F%3E%3C)i, '\1[BLANK]').
           gsub(%r((DS_MERCHANT_CVV2%3E)(%3C%2FDS_MERCHANT_CVV2))i, '\1[BLANK]\2').

data/lib/active_merchant/billing/gateways/secure_net.rb

@@ -12,9 +12,9 @@ module ActiveMerchant #:nodoc:
       }
 
       XML_ATTRIBUTES = {
-                        'xmlns' => 'http://gateway.securenet.com/API/Contracts',
-                        'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
-                       }
+        'xmlns' => 'http://gateway.securenet.com/API/Contracts',
+        'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
+      }
       NIL_ATTRIBUTE = { 'i:nil' => 'true' }
 
       self.supported_countries = ['US']

data/lib/active_merchant/billing/gateways/so_easy_pay.rb

@@ -172,12 +172,12 @@ module ActiveMerchant #:nodoc:
         retval = Builder::XmlMarkup.new(:indent => 2)
         retval.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
         retval.tag!('soap:Envelope', {
-            'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-            'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-            'xmlns:soapenc' => 'http://schemas.xmlsoap.org/soap/encoding/',
-            'xmlns:tns' => 'urn:Interface',
-            'xmlns:types' => 'urn:Interface/encodedTypes',
-            'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
+          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:soapenc' => 'http://schemas.xmlsoap.org/soap/encoding/',
+          'xmlns:tns' => 'urn:Interface',
+          'xmlns:types' => 'urn:Interface/encodedTypes',
+          'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
         }) do
           retval.tag!('soap:Body', {'soap:encodingStyle'=>'http://schemas.xmlsoap.org/soap/encoding/'}) do
             retval.tag!("tns:#{request}") do

data/lib/active_merchant/billing/gateways/stripe.rb

@@ -362,6 +362,7 @@ module ActiveMerchant #:nodoc:
           add_customer_data(post, options)
           post[:description] = options[:description]
           post[:statement_descriptor] = options[:statement_description]
+          post[:statement_descriptor_suffix] = options[:statement_descriptor_suffix] if options[:statement_descriptor_suffix]
           post[:receipt_email] = options[:receipt_email] if options[:receipt_email]
           add_customer(post, payment, options)
           add_flags(post, options)
@@ -372,6 +373,7 @@ module ActiveMerchant #:nodoc:
         add_exchange_rate(post, options)
         add_destination(post, options)
         add_level_three(post, options)
+        add_connected_account(post, options)
         post
       end
 
@@ -512,10 +514,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer(post, payment, options)
-        if options[:customer] && !payment.respond_to?(:number)
-          ActiveMerchant.deprecated 'Passing the customer in the options is deprecated. Just use the response.authorization instead.'
-          post[:customer] = options[:customer]
-        end
+        post[:customer] = options[:customer] if options[:customer] && !payment.respond_to?(:number)
       end
 
       def add_flags(post, options)
@@ -555,6 +554,16 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_connected_account(post, options = {})
+        return unless options[:transfer_destination]
+
+        post[:transfer_data] = { destination: options[:transfer_destination] }
+        post[:transfer_data][:amount] = options[:transfer_amount] if options[:transfer_amount]
+        post[:on_behalf_of] = options[:on_behalf_of] if options[:on_behalf_of]
+        post[:transfer_group] = options[:transfer_group] if options[:transfer_group]
+        post[:application_fee_amount] = options[:application_fee_amount] if options[:application_fee_amount]
+      end
+
       def parse(body)
         JSON.parse(body)
       end