Commit fa38dfd2 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102657/0150' into 'meeting/LI69' 

TS 102 657 CR150 - Correction for the copyOfBill in Messaging and Multimedia Billing Records

See merge request !217
parents 5e964c31 b05705bc

102657/RDMessage.asn

+8 −2
Original line number Original line Diff line number Diff line
@@ -1771,6 +1771,8 @@ MsgBillingDetails ::= SEQUENCE 
        -- Only to be used in case the present document cannot fulfil the national requirements

        -- Only to be used in case the present document cannot fulfil the national requirements

    ...,

    ...,

    copyOfBill                  [7] SEQUENCE OF File OPTIONAL

    copyOfBill                  [7] SEQUENCE OF File OPTIONAL

        -- copyOfBill in MsgBillingDetails is obsolete from v2.6.1.

        -- Use copyOfBill in MsgBillingRecords instead

}

}
@@ -1804,8 +1806,9 @@ MsgBillingRecords ::= SEQUENCE 
    mgsTransactionStatus        [8] UTF8String OPTIONAL,

    mgsTransactionStatus        [8] UTF8String OPTIONAL,

        -- Status of the transaction (i.e. "declined", "succeeded" etc.)

        -- Status of the transaction (i.e. "declined", "succeeded" etc.)

        -- Details to be defined on a national bases

        -- Details to be defined on a national bases

    cryptocurrency              [9] DigitalTokenIdentifier OPTIONAL

    cryptocurrency              [9] DigitalTokenIdentifier OPTIONAL,

        -- Cryptocurrency of payment as per ISO 24165-2 [57]

        -- Cryptocurrency of payment as per ISO 24165-2 [57]

    copyOfBill                  [10] SEQUENCE OF File OPTIONAL

}

}





NationalMsgBillingRecords ::= SEQUENCE

NationalMsgBillingRecords ::= SEQUENCE
@@ -2157,6 +2160,8 @@ MultimediaBillingDetails ::= SEQUENCE 
    ...,

    ...,

    multimediaBillingAddress            [7] MultimediaBillingAddress OPTIONAL,

    multimediaBillingAddress            [7] MultimediaBillingAddress OPTIONAL,

    copyOfBill                          [8] SEQUENCE OF File OPTIONAL

    copyOfBill                          [8] SEQUENCE OF File OPTIONAL

        -- copyOfBill in MultimediaBillingDetails is obsolete from v2.6.1.

        -- Use copyOfBill in MultimediaBillingRecords instead

}

}
@@ -2198,8 +2203,9 @@ MultimediaBillingRecords ::= SEQUENCE 
    multimediaTransactionStatus         [8] UTF8String OPTIONAL,

    multimediaTransactionStatus         [8] UTF8String OPTIONAL,

        -- Status of the transaction (i.e. "declined", "succeeded", etc.)

        -- Status of the transaction (i.e. "declined", "succeeded", etc.)

        -- Details to be defined on a national bases

        -- Details to be defined on a national bases

    cryptocurrency                      [9] DigitalTokenIdentifier OPTIONAL

    cryptocurrency                      [9] DigitalTokenIdentifier OPTIONAL,

        -- Cryptocurrency of payment as per ISO 24165-2 [57]

        -- Cryptocurrency of payment as per ISO 24165-2 [57]

    copyOfBill                          [10] SEQUENCE OF File OPTIONAL

}

}





NationalMultimediaBillingRecords ::= SEQUENCE

NationalMultimediaBillingRecords ::= SEQUENCE

102657/RDMessage.xsd

+18 −0
Original line number Original line Diff line number Diff line
@@ -1882,6 +1882,13 @@ 
            <xsd:element name="msgTransactionID" type="xsd:string" minOccurs="0"/>

            <xsd:element name="msgTransactionID" type="xsd:string" minOccurs="0"/>

            <xsd:element name="msgTransactionStatus" type="xsd:string" minOccurs="0"/>

            <xsd:element name="msgTransactionStatus" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>

            <xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>

            <xsd:element name="copyOfBill" minOccurs="0">

                <xsd:complexType>

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

                        <xsd:element name="File" type="File"/>

                    </xsd:sequence>

                </xsd:complexType>

            </xsd:element>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:sequence>

        </xsd:sequence>

    </xsd:complexType>

    </xsd:complexType>
@@ -1914,6 +1921,8 @@ 
                </xsd:complexType>

                </xsd:complexType>

            </xsd:element>

            </xsd:element>

            <xsd:element name="nationalMsgBillingDetails" type="NationalMsgBillingDetails" minOccurs="0"/>

            <xsd:element name="nationalMsgBillingDetails" type="NationalMsgBillingDetails" minOccurs="0"/>

            <!-- copyOfBill in MsgBillingDetails is obsolete from v2.6.1. -->

            <!-- Use copyOfBill in MsgBillingRecords instead -->

            <xsd:element name="copyOfBill" minOccurs="0">

            <xsd:element name="copyOfBill" minOccurs="0">

                <xsd:complexType>

                <xsd:complexType>

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
@@ -3090,6 +3099,8 @@ 
            </xsd:element>

            </xsd:element>

            <xsd:element name="nationalMultimediaBillingDetails" type="NationalMultimediaBillingDetails" minOccurs="0"/>

            <xsd:element name="nationalMultimediaBillingDetails" type="NationalMultimediaBillingDetails" minOccurs="0"/>

            <xsd:element name="multimediaBillingAddress" type="MultimediaBillingAddress" minOccurs="0"/>

            <xsd:element name="multimediaBillingAddress" type="MultimediaBillingAddress" minOccurs="0"/>

            <!-- copyOfBill in MultimediaBillingDetails is obsolete from v2.6.1. -->

            <!-- Use copyOfBill in MultimediaBillingRecords instead -->

            <xsd:element name="copyOfBill" minOccurs="0">

            <xsd:element name="copyOfBill" minOccurs="0">

                <xsd:complexType>

                <xsd:complexType>

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
@@ -3140,6 +3151,13 @@ 
            <xsd:element name="multimediaTransactionID" type="xsd:string" minOccurs="0"/>

            <xsd:element name="multimediaTransactionID" type="xsd:string" minOccurs="0"/>

            <xsd:element name="multimediaTransactionStatus" type="xsd:string" minOccurs="0"/>

            <xsd:element name="multimediaTransactionStatus" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>

            <xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>

            <xsd:element name="copyOfBill" minOccurs="0">

                <xsd:complexType>

                    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

                        <xsd:element name="File" type="File"/>

                    </xsd:sequence>

                </xsd:complexType>

            </xsd:element>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:sequence>

        </xsd:sequence>

    </xsd:complexType>

    </xsd:complexType>