Ignore:
Timestamp:
26 Dec 2022, 09:49:13 (2 years ago)
Author:
Henrik Bettermann
Message:

Merge with uli-paypal branch r17241.

Location:
main/kofacustom.nigeria/trunk
Files:
9 edited
4 copied

Legend:

Unmodified
Added
Removed

  • main/kofacustom.nigeria/trunk

  • main/kofacustom.nigeria/trunk/etc/site.zcml.in

    r15800 r17242  
    11<configure xmlns="http://namespaces.zope.org/zope"
    22           xmlns:kofa="http://namespaces.waeup.org/kofa"
     3           xmlns:kofacustomng="http://namespaces.waeup.org/kofacustomng"
    34           i18n_domain="${kofa_params:devel_pkg}">
    45
    … …  
    2728  <kofa:datacenter
    2829      path="${buildout:directory}/var/datacenter" />
     30
     31  <!-- Where can the paypal config be found -->
     32  <kofacustomng:paypalconf
     33      path="${buildout:directory}/etc/paypal.conf" />
    2934
    3035    <configure i18n_domain="${kofa_params:devel_pkg}">

  • main/kofacustom.nigeria/trunk/setup.py

    r13260 r17242  
    88    'grok',
    99    'waeup.kofa >= 1.3.2',
     10    'requests < 2.28',  # py3-only afterwards
    1011    ],
    1112

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/configure.zcml

    r8891 r17242  
    66  -->
    77  <include package="waeup.kofa" />
     8  <include package="kofacustom.nigeria" file="meta.zcml" />
    89  <include package="kofacustom.nigeria" file="locales.zcml" />
    910  <grok:grok package="." />

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/ftesting.zcml

    r8852 r17242  
    22   xmlns="http://namespaces.zope.org/zope"
    33   xmlns:kofa="http://namespaces.waeup.org/kofa"
     4   xmlns:kofacustomng="http://namespaces.waeup.org/kofacustomng"
    45   i18n_domain="kofacustom.nigeria"
    56   package="kofacustom.nigeria"
    … …  
    1718  <kofa:datacenter
    1819      path="../../../parts/test/datacenter" />
     20
     21  <!-- Where can the paypal config be found -->
     22  <kofacustomng:paypalconf
     23      path="../../../etc/paypal-testing.conf" />
    1924
    2025

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interfaces.py

    r17215 r17242  
    7979    )
    8080
    81 # Define a validation method for JAMB reg numbers 
     81# Define a validation method for JAMB reg numbers
    8282class NotJAMBRegNumber(schema.ValidationError):
    8383    __doc__ = u"Invalid JAMB registration number"
    … …  
    156156        )
    157157
     158    paypal_enabled = schema.Bool(
     159        title = _(u'Paypal integration enabled'),
     160        default = False,
     161        )
     162
     163
    158164class ICustomSessionConfigurationAdd(ICustomSessionConfiguration):
    159165    """A session configuration object in add mode.

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/payments/interfaces.py

    r16232 r17242  
    8080            (_('Etranzact'), 'etranzact'),
    8181            (_('Remita'), 'remita'),
     82            (_('Paypal'), 'paypal'),
    8283            (_('Scratch Card'), 'sc'),
    8384            (_('Manifest'), 'manifest'),
    … …  
    8586            (_('unknown'), 'unknown'),
    8687            )
     88        )
     89
     90    r_payment_link = schema.TextLine(
     91        title = _(u'Response Payment Authorization Link'),
     92        default = None,
     93        required = False,
     94        readonly = False,
    8795        )
    8896

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

    r16483 r17242  
    126126            'p_id,p_item,p_level,p_option,p_session,p_split_data,p_state,payment_date,provider_amt,'
    127127            'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
    128             'r_pay_reference,thirdparty_amt,student_id,state,'
     128            'r_pay_reference,r_payment_link,thirdparty_amt,student_id,state,'
    129129            'current_session\r\n'
    130130            '666,12.12,2012-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
    131131            '100,,%s,,paid,2012-04-01 14:12:01#,,12.12,'
    132             '789,r-code,interswitch,,,,A111111,created,2012\r\n' % (curr_year-6),
     132            '789,r-code,interswitch,,,,,A111111,created,2012\r\n' % (curr_year-6),
    133133            result
    134134            )
    … …  
    191191            'p_category,p_combi,p_current,p_id,p_item,p_level,p_option,p_session,p_split_data,p_state,'
    192192            'payment_date,provider_amt,r_amount_approved,r_card_num,r_code,'
    193             'r_company,r_desc,r_pay_reference,thirdparty_amt,student_id,'
     193            'r_company,r_desc,r_pay_reference,r_payment_link,thirdparty_amt,student_id,'
    194194            'matric_number,reg_number,firstname,middlename,lastname,sex,state,'
    195195            'current_session,entry_session,entry_mode,faccode,depcode,certcode,lga\r\n'
    196196
    197197            '666,12.12,%s-04-01 13:12:01#,,,,schoolfee,[],1,my-id,p-item,'
    198             '100,,%s,,paid,%s-04-01 14:12:01#,,12.12,,r-code,,,,,A111111,'
     198            '100,,%s,,paid,%s-04-01 14:12:01#,,12.12,,r-code,,,,,,A111111,'
    199199            '234,123,Anna,M.,Tester,f,created,2012,2010,ug_ft,NA,NA,CERT1,\r\n'
    200200            % (curr_year-6, curr_year-6, curr_year-6)

  • main/kofacustom.nigeria/trunk/versions.cfg

    r13683 r17242  
    55
    66[versions]
     7# last py2-compatible version
     8certifi = 2021.10.08
     9chardet = 4.0.0
     10idna = 2.10
     11# last py2-compatible version
     12requests = 2.27.1
     13urllib3 = 1.26.13
Note: See TracChangeset for help on using the changeset viewer.