sepa_king 0.11.2 → 0.12.0

data/lib/sepa_king/message.rb

@@ -7,6 +7,7 @@ module SEPA
   PAIN_001_001_03 = 'pain.001.001.03'
   PAIN_001_002_03 = 'pain.001.002.03'
   PAIN_001_003_03 = 'pain.001.003.03'
+  PAIN_001_001_03_CH_02 = 'pain.001.001.03.ch.02'
 
   class Message
     include ActiveModel::Validations
@@ -41,7 +42,7 @@ module SEPA
       raise SEPA::Error.new(errors.full_messages.join("\n")) unless valid?
       raise SEPA::Error.new("Incompatible with schema #{schema_name}!") unless schema_compatible?(schema_name)
 
-      builder = Nokogiri::XML::Builder.new do |builder|
+      builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |builder|
         builder.Document(xml_schema(schema_name)) do
           builder.__send__(xml_main_tag) do
             build_group_header(builder)
@@ -62,7 +63,7 @@ module SEPA
       raise ArgumentError.new("Schema #{schema_name} is unknown!") unless self.known_schemas.include?(schema_name)
 
       case schema_name
-        when PAIN_001_002_03, PAIN_008_002_02, PAIN_001_001_03
+        when PAIN_001_002_03, PAIN_008_002_02, PAIN_001_001_03, PAIN_001_001_03_CH_02
           account.bic.present? && transactions.all? { |t| t.schema_compatible?(schema_name) }
         when PAIN_001_003_03, PAIN_008_003_02, PAIN_008_001_02
           transactions.all? { |t| t.schema_compatible?(schema_name) }
@@ -117,9 +118,17 @@ module SEPA
   private
     # @return {Hash<Symbol=>String>} xml schema information used in output xml
     def xml_schema(schema_name)
-      { :xmlns                => "urn:iso:std:iso:20022:tech:xsd:#{schema_name}",
+      return {
+        :xmlns                => "urn:iso:std:iso:20022:tech:xsd:#{schema_name}",
         :'xmlns:xsi'          => 'http://www.w3.org/2001/XMLSchema-instance',
-        :'xsi:schemaLocation' => "urn:iso:std:iso:20022:tech:xsd:#{schema_name} #{schema_name}.xsd" }
+        :'xsi:schemaLocation' => "urn:iso:std:iso:20022:tech:xsd:#{schema_name} #{schema_name}.xsd"
+      } unless schema_name == PAIN_001_001_03_CH_02
+
+      {
+        xmlns:                'http://www.six-interbank-clearing.com/de/pain.001.001.03.ch.02.xsd',
+        'xmlns:xsi':          'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:schemaLocation': 'http://www.six-interbank-clearing.com/de/pain.001.001.03.ch.02.xsd  pain.001.001.03.ch.02.xsd'
+      }
     end
 
     def build_group_header(builder)

data/lib/sepa_king/message/credit_transfer.rb

@@ -5,7 +5,7 @@ module SEPA
     self.account_class = DebtorAccount
     self.transaction_class = CreditTransferTransaction
     self.xml_main_tag = 'CstmrCdtTrfInitn'
-    self.known_schemas = [ PAIN_001_003_03, PAIN_001_002_03, PAIN_001_001_03 ]
+    self.known_schemas = [ PAIN_001_003_03, PAIN_001_002_03, PAIN_001_001_03, PAIN_001_001_03_CH_02 ]
 
   private
     # Find groups of transactions which share the same values of some attributes
@@ -59,7 +59,9 @@ module SEPA
               end
             end
           end
-          builder.ChrgBr('SLEV')
+          if group[:service_level]
+            builder.ChrgBr('SLEV')
+          end
 
           transactions.each do |transaction|
             build_transaction(builder, transaction)

data/lib/sepa_king/transaction/credit_transfer_transaction.rb

@@ -23,6 +23,8 @@ module SEPA
         self.bic.present? && self.service_level == 'SEPA' && self.currency == 'EUR'
       when PAIN_001_003_03
         self.currency == 'EUR'
+      when PAIN_001_001_03_CH_02
+        self.currency == 'CHF'
       end
     end
   end

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 end

data/spec/credit_transfer_spec.rb

@@ -417,5 +417,104 @@ describe SEPA::CreditTransfer do
         end
       end
     end
+
+    context 'xml_schema_header' do
+      subject { credit_transfer.to_xml(format) }
+
+      let(:xml_header) do
+        '<?xml version="1.0" encoding="UTF-8"?>' +
+          "\n<Document xmlns=\"urn:iso:std:iso:20022:tech:xsd:#{format}\"" +
+          ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
+          " xsi:schemaLocation=\"urn:iso:std:iso:20022:tech:xsd:#{format} #{format}.xsd\">\n"
+      end
+
+      let(:transaction) do
+        {
+          name: 'Telekomiker AG',
+          iban: 'DE37112589611964645802',
+          bic: 'PBNKDEFF370',
+          amount: 102.50,
+          currency: 'CHF'
+        }
+      end
+
+      before do
+        credit_transfer.add_transaction transaction
+      end
+
+      context "when format is #{SEPA::PAIN_001_001_03}" do
+        let(:format) { SEPA::PAIN_001_001_03 }
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+
+      context "when format is #{SEPA::PAIN_001_002_03}" do
+        let(:format) { SEPA::PAIN_001_002_03 }
+        let(:transaction) do
+          {
+            name: 'Telekomiker AG',
+            bic: 'PBNKDEFF370',
+            iban: 'DE37112589611964645802',
+            amount: 102.50,
+            reference: 'XYZ-1234/123',
+            remittance_information: 'Rechnung vom 22.08.2013'
+          }
+        end
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+
+      context "when format is #{SEPA::PAIN_001_003_03}" do
+        let(:format) { SEPA::PAIN_001_003_03 }
+        let(:transaction) do
+          {
+            name: 'Telekomiker AG',
+            bic: 'PBNKDEFF370',
+            iban: 'DE37112589611964645802',
+            amount: 102.50,
+            reference: 'XYZ-1234/123',
+            remittance_information: 'Rechnung vom 22.08.2013'
+          }
+        end
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+
+      context "when format is #{SEPA::PAIN_001_001_03_CH_02}" do
+        let(:format) { SEPA::PAIN_001_001_03_CH_02 }
+        let(:credit_transfer) do
+          SEPA::CreditTransfer.new name: 'Schuldner GmbH',
+                                   iban: 'CH5481230000001998736',
+                                   bic:  'RAIFCH22'
+        end
+        let(:transaction) do
+          {
+            name: 'Telekomiker AG',
+            iban: 'DE62007620110623852957',
+            amount: 102.50,
+            currency: 'CHF',
+            reference: 'XYZ-1234/123',
+            remittance_information: 'Rechnung vom 22.08.2013'
+          }
+        end
+
+        let(:xml_header) do
+          '<?xml version="1.0" encoding="UTF-8"?>' +
+            "\n<Document xmlns=\"http://www.six-interbank-clearing.com/de/#{format}.xsd\"" +
+            ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
+            " xsi:schemaLocation=\"http://www.six-interbank-clearing.com/de/#{format}.xsd  #{format}.xsd\">\n"
+        end
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+    end
   end
 end

data/spec/credit_transfer_transaction_spec.rb

@@ -44,6 +44,12 @@ describe SEPA::CreditTransferTransaction do
         expect(SEPA::CreditTransferTransaction.new(:bic => nil)).to be_schema_compatible('pain.001.003.03')
       end
     end
+
+    context 'for pain.001.001.03.ch.02' do
+      it 'should succeed for valid attributes' do
+        expect(SEPA::CreditTransferTransaction.new(:bic => 'SPUEDE2UXXX', :currency => 'CHF')).to be_schema_compatible('pain.001.001.03.ch.02')
+      end
+    end
   end
 
   context 'Requested date' do

data/spec/direct_debit_spec.rb

@@ -572,5 +572,86 @@ describe SEPA::DirectDebit do
         end
       end
     end
+
+    context 'xml_schema_header' do
+      subject { sepa_direct_debit.to_xml(format) }
+
+      let(:sepa_direct_debit) do
+        SEPA::DirectDebit.new name: 'Gläubiger GmbH',
+                              iban: 'DE87200500001234567890',
+                              creditor_identifier: 'DE98ZZZ09999999999'
+      end
+
+      let(:xml_header) do
+        '<?xml version="1.0" encoding="UTF-8"?>' +
+          "\n<Document xmlns=\"urn:iso:std:iso:20022:tech:xsd:#{format}\"" +
+          ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
+          " xsi:schemaLocation=\"urn:iso:std:iso:20022:tech:xsd:#{format} #{format}.xsd\">\n"
+      end
+
+      let(:transaction) do
+        {
+          name: 'Zahlemann & Söhne GbR',
+          bic: 'SPUEDE2UXXX',
+          iban: 'DE21500500009876543210',
+          amount: 39.99,
+          reference: 'XYZ/2013-08-ABO/12345',
+          remittance_information: 'Unsere Rechnung vom 10.08.2013',
+          mandate_id: 'K-02-2011-12345',
+          mandate_date_of_signature: Date.new(2011, 1, 25)
+        }
+      end
+
+      before do
+        sepa_direct_debit.add_transaction transaction
+      end
+
+      context "when format is #{SEPA::PAIN_008_001_02}" do
+        let(:format) { SEPA::PAIN_008_001_02 }
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+
+      context "when format is #{SEPA::PAIN_008_002_02}" do
+        let(:format) { SEPA::PAIN_008_002_02 }
+        let(:sepa_direct_debit) do
+          SEPA::DirectDebit.new name: 'Gläubiger GmbH',
+                                bic: 'SPUEDE2UXXX',
+                                iban: 'DE87200500001234567890',
+                                creditor_identifier: 'DE98ZZZ09999999999'
+        end
+        let(:transaction) do
+          {
+            name: 'Zahlemann & Söhne GbR',
+            bic: 'SPUEDE2UXXX',
+            iban: 'DE21500500009876543210',
+            amount: 39.99,
+            reference: 'XYZ/2013-08-ABO/12345',
+            remittance_information: 'Unsere Rechnung vom 10.08.2013',
+            mandate_id: 'K-02-2011-12345',
+            debtor_address: SEPA::DebtorAddress.new(
+              country_code: 'CH',
+              address_line1: 'Mustergasse 123',
+              address_line2: '1234 Musterstadt'
+            ),
+            mandate_date_of_signature: Date.new(2011, 1, 25)
+          }
+        end
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+
+      context "when format is #{SEPA::PAIN_008_003_02}" do
+        let(:format) { SEPA::PAIN_008_003_02 }
+
+        it 'should return correct header' do
+          is_expected.to start_with(xml_header)
+        end
+      end
+    end
   end
 end

data/spec/examples/pain.001.001.03.ch.02.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+(C) Copyright 2010, SKSF, www.sksf.ch
+
+Anregungen und Fragen zu diesem Dokument können an das jeweilige Finanzinstitut gerichtet werden. 
+Allgemeine Anregungen können auch bei der SIX Interbank Clearing AG unter folgender Adresse angebracht werden: 
+pm@six-group.com
+-->
+<Document xmlns="http://www.six-interbank-clearing.com/de/pain.001.001.03.ch.02.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.six-interbank-clearing.com/de/pain.001.001.03.ch.02.xsd  pain.001.001.03.ch.02.xsd">
+	<CstmrCdtTrfInitn>
+		<GrpHdr>
+			<MsgId>MSG-01</MsgId>
+			<CreDtTm>2010-02-15T07:30:00</CreDtTm>
+			<NbOfTxs>3</NbOfTxs>
+			<CtrlSum>15850.00</CtrlSum>
+			<InitgPty>
+				<Nm>MUSTER AG</Nm>
+			</InitgPty>
+		</GrpHdr>
+		<PmtInf>
+			<PmtInfId>PMTINF-01</PmtInfId>
+			<PmtMtd>TRF</PmtMtd>
+			<BtchBookg>true</BtchBookg>
+			<ReqdExctnDt>2010-02-22</ReqdExctnDt>
+			<Dbtr>
+				<Nm>MUSTER AG</Nm>
+				<PstlAdr>
+					<Ctry>CH</Ctry>
+					<AdrLine>SELDWYLA</AdrLine>
+				</PstlAdr>
+			</Dbtr>
+			<DbtrAcct>
+				<Id>
+					<IBAN>CH5481230000001998736</IBAN>
+				</Id>
+			</DbtrAcct>
+			<DbtrAgt>
+				<FinInstnId>
+					<BIC>RAIFCH22</BIC>
+				</FinInstnId>
+			</DbtrAgt>
+			<CdtTrfTxInf>
+				<PmtId>
+					<InstrId>INSTRID-01-01</InstrId>
+					<EndToEndId>ENDTOENDID-001</EndToEndId>
+				</PmtId>
+				<PmtTpInf>
+					<LclInstrm>
+						<Prtry>CH01</Prtry>
+					</LclInstrm>
+				</PmtTpInf>
+				<Amt>
+					<InstdAmt Ccy="CHF">3949.75</InstdAmt>
+				</Amt>
+				<CdtrAcct>
+					<Id>
+						<Othr>
+							<Id>01-39139-1</Id>
+						</Othr>
+					</Id>
+				</CdtrAcct>
+				<RmtInf>
+					<Strd>
+						<CdtrRefInf>
+							<Ref>210000000003139471430009017</Ref>
+						</CdtrRefInf>
+					</Strd>
+				</RmtInf>
+			</CdtTrfTxInf>
+		</PmtInf>
+		<PmtInf>
+			<PmtInfId>PMTINF-02</PmtInfId>
+			<PmtMtd>TRF</PmtMtd>
+			<BtchBookg>true</BtchBookg>
+			<ReqdExctnDt>2010-02-18</ReqdExctnDt>
+			<Dbtr>
+				<Nm>MUSTER AG</Nm>
+				<PstlAdr>
+					<Ctry>CH</Ctry>
+					<AdrLine>SELDWYLA</AdrLine>
+				</PstlAdr>
+			</Dbtr>
+			<DbtrAcct>
+				<Id>
+					<IBAN>CH5481230000001998736</IBAN>
+				</Id>
+			</DbtrAcct>
+			<DbtrAgt>
+				<FinInstnId>
+					<BIC>RAIFCH22</BIC>
+				</FinInstnId>
+			</DbtrAgt>
+			<CdtTrfTxInf>
+				<PmtId>
+					<InstrId>INSTRID-02-01</InstrId>
+					<EndToEndId>ENDTOENDID-002</EndToEndId>
+				</PmtId>
+				<PmtTpInf>
+					<LclInstrm>
+						<Prtry>CH02</Prtry>
+					</LclInstrm>
+				</PmtTpInf>
+				<Amt>
+					<InstdAmt Ccy="CHF">8479.25</InstdAmt>
+				</Amt>
+				<Cdtr>
+					<Nm>Robert Scheider SA</Nm>
+					<PstlAdr>
+						<StrtNm>Rue de la gare</StrtNm>
+						<BldgNb>24</BldgNb>
+						<PstCd>2501</PstCd>
+						<TwnNm>Biel</TwnNm>
+						<Ctry>CH</Ctry>
+					</PstlAdr>
+				</Cdtr>
+				<CdtrAcct>
+					<Id>
+						<Othr>
+							<Id>25-9034-2</Id>
+						</Othr>
+					</Id>
+				</CdtrAcct>
+				<RmtInf>
+					<Ustrd>Rechnung Nr. 408</Ustrd>
+				</RmtInf>
+			</CdtTrfTxInf>
+			<CdtTrfTxInf>
+				<PmtId>
+					<InstrId>INSTRID-02-02</InstrId>
+					<EndToEndId>ENDTOENDID-003</EndToEndId>
+				</PmtId>
+				<PmtTpInf>
+					<SvcLvl>
+						<Cd>SEPA</Cd>
+					</SvcLvl>
+				</PmtTpInf>
+				<Amt>
+					<InstdAmt Ccy="EUR">3421.00</InstdAmt>
+				</Amt>
+				<CdtrAgt>
+					<FinInstnId>
+						<BIC>DEUTDEFF</BIC>
+					</FinInstnId>
+				</CdtrAgt>
+				<Cdtr>
+					<Nm>Peter Haller</Nm>
+					<PstlAdr>
+						<AdrLine>Rosenauweg 4</AdrLine>
+						<AdrLine>DE-80036 München</AdrLine>
+					</PstlAdr>
+				</Cdtr>
+				<CdtrAcct>
+					<Id>
+						<IBAN>DE62007620110623852957</IBAN>
+					</Id>
+				</CdtrAcct>
+				<RmtInf>
+					<Strd>
+						<CdtrRefInf>
+							<Tp>
+								<CdOrPrtry>
+									<Cd>SCOR</Cd>
+								</CdOrPrtry>
+							</Tp>
+							<Ref>RF712348231</Ref>
+						</CdtrRefInf>
+					</Strd>
+				</RmtInf>
+			</CdtTrfTxInf>
+		</PmtInf>
+	</CstmrCdtTrfInitn>
+</Document>