Changeset 7880


Ignore:
Timestamp:
14 Mar 2012, 15:39:49 (13 years ago)
Author:
Henrik Bettermann
Message:

Interswitch expects amount * 100

Update locales.

Location:
main/waeup.custom/trunk/src/waeup/custom
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.custom/trunk/src/waeup/custom/interfaces.py

    r7822 r7880  
    2929    """
    3030
     31    # Base fees, do not remove.
     32
    3133    school_fee_base = schema.Int(
    3234        title = _(u'School Fee (ignored)'),
    3335        default = 0,
     36        required = False,
    3437        )
    3538
    3639    surcharge_1 = schema.Int(
    37         title = _(u'Surcharge BT'),
     40        title = _(u'Surcharge Portal Provider'),
    3841        default = 0,
     42        required = False,
    3943        )
    4044
    … …  
    4246        title = _(u'Surcharge Interswitch'),
    4347        default = 0,
     48        required = False,
    4449        )
    4550
    … …  
    4752        title = _(u'Surcharge 3'),
    4853        default = 0,
     54        required = False,
    4955        )
    5056
    51     clearance = schema.Int(
     57    clearance_fee = schema.Int(
    5258        title = _(u'Clearance Fee'),
    5359        default = 0,
     60        required = False,
    5461        )
    5562
    … …  
    5764        title = _(u'Booking Fee'),
    5865        default = 0,
     66        required = False,
    5967        )
     68
     69    acceptance_fee = schema.Int(
     70        title = _(u'Acceptance Fee'),
     71        default = 0,
     72        required = False,
     73        )
     74
     75    # Additional fees in waeup.custom
    6076
    6177    maint_fee = schema.Int(
    6278        title = _(u'Maintenance Fee'),
    6379        default = 0,
     80        required = False,
    6481        )
    6582
    … …  
    6784        title = _(u'Gown Fee'),
    6885        default = 0,
     86        required = False,
    6987        )
    7088
    … …  
    7290        title = _(u'Transfer Fee'),
    7391        default = 0,
     92        required = False,
    7493        )
    7594

  • main/waeup.custom/trunk/src/waeup/custom/locales/de/LC_MESSAGES/waeup.custom.po

    r7822 r7880  
    1515msgstr ""
    1616"Project-Id-Version: WAeUP.Kofa\n"
    17 "POT-Creation-Date: Thu Feb 23 18:36:34 2012\n"
    18 "PO-Revision-Date: 2012-03-09 08:17+0100\n"
     17"POT-Creation-Date: Wed Mar 14 16:32:16 2012\n"
     18"PO-Revision-Date: 2012-03-14 16:36+0100\n"
    1919"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    2020"Language-Team: WAeUP Germany <henrik@waeup.org>\n"
    … …  
    2828"X-Poedit-SourceCharset: utf-8\n"
    2929
     30#: waeup/custom/applicants/container.py:38
     31msgid "Postgraduates"
     32msgstr "Postgraduierte"
     33
     34#: waeup/custom/applicants/container.py:39
     35msgid "handles postgraduate applicants"
     36msgstr "für Antragsteller von Postgraduierten-Studiengängen"
     37
    3038#: waeup/custom/browser/theming.py:30
    3139msgid "Custom Theme 1"
    3240msgstr "Benutzerdefiniertes Thema 1"
    3341
    34 #: waeup/custom/interfaces.py:32
    35 msgid "School Fee (ignored)"
    36 msgstr ""
    37 
    38 #: waeup/custom/interfaces.py:37
    39 msgid "Surcharge BT"
    40 msgstr ""
    41 
    42 #: waeup/custom/interfaces.py:42
    43 msgid "Surcharge Interswitch"
    44 msgstr ""
    45 
    46 #: waeup/custom/interfaces.py:47
    47 msgid "Surcharge 3"
    48 msgstr ""
    49 
    50 #: waeup/custom/interfaces.py:52
    51 msgid "Clearance Fee"
    52 msgstr ""
    53 
    54 #: waeup/custom/interfaces.py:57
    55 msgid "Booking Fee"
    56 msgstr ""
    57 
    58 #: waeup/custom/interfaces.py:62
    59 msgid "Maintenance Fee"
    60 msgstr ""
    61 
    62 #: waeup/custom/interfaces.py:67
    63 msgid "Gown Fee"
    64 msgstr ""
    65 
    66 #: waeup/custom/interfaces.py:72
    67 msgid "Transfer Fee"
    68 msgstr ""
    69 
    70 #: waeup/custom/interfaces.py:86
     42#: waeup/custom/interfaces.py:105
    7143msgid "Academic Session"
    7244msgstr "Akademisches Jahr"
    7345
     46#: waeup/custom/interfaces.py:34
     47msgid "School Fee (ignored)"
     48msgstr "Schulgebühr (wird nicht verwendet)"
     49
     50#: waeup/custom/interfaces.py:40
     51msgid "Surcharge Portal Provider"
     52msgstr "Gebühr Portal-Provider"
     53
     54#: waeup/custom/interfaces.py:46
     55msgid "Surcharge Interswitch"
     56msgstr "Gebühr Interswitch"
     57
     58#: waeup/custom/interfaces.py:52
     59msgid "Surcharge 3"
     60msgstr "Gebühr 3"
     61
     62#: waeup/custom/interfaces.py:58
     63msgid "Clearance Fee"
     64msgstr "Einschreibungsgebühr"
     65
     66#: waeup/custom/interfaces.py:64
     67msgid "Booking Fee"
     68msgstr "Buchungsgebühr"
     69
     70#: waeup/custom/interfaces.py:70
     71msgid "Acceptance Fee"
     72msgstr "Zulassungsgebühr"
     73
     74#: waeup/custom/interfaces.py:78
     75msgid "Maintenance Fee"
     76msgstr "Miete"
     77
     78#: waeup/custom/interfaces.py:84
     79msgid "Gown Fee"
     80msgstr "Talar-Gebühr"
     81
     82#: waeup/custom/interfaces.py:90
     83msgid "Transfer Fee"
     84msgstr "Studienfachwechselgebühr"
     85
     86#: waeup/custom/students/browser.py:112
     87msgid "Payment ticket can't be re-send to CollegePAY."
     88msgstr "Bewertete Bezahl-Tickets können nicht erneut gesendet werden."
     89
     90#: waeup/custom/students/browser.py:74
     91msgid "CollegePAY"
     92msgstr "CollegePAY"
     93
     94#: waeup/custom/students/browser.py:80
     95msgid "Request CollegePAY callback"
     96msgstr "CollegePAY Rückruf"
     97
     98#: waeup/custom/students/browser.py:92
     99msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
     100msgstr "Daten an CollegePAY (Interswitch Payment Gateway) senden"
     101
     102#: waeup/custom/students/browser.py:93
     103msgid "Submit"
     104msgstr "Senden"
     105
     106#: waeup/custom/students/utils.py:70
     107msgid "Session configuration object is not available."
     108msgstr "Session-Konfiguration ist nicht verfügbar."
     109
     110#: waeup/custom/students/utils.py:91
     111msgid "Amount could not be determined."
     112msgstr "Betrag konnte nicht ermittelt werden."
     113

  • main/waeup.custom/trunk/src/waeup/custom/locales/fr/LC_MESSAGES/waeup.custom.po

    r7822 r7880  
    1515msgstr ""
    1616"Project-Id-Version: WAeUP.Kofa\n"
    17 "POT-Creation-Date: Thu Feb 23 18:36:34 2012\n"
     17"POT-Creation-Date: Wed Mar 14 16:32:16 2012\n"
    1818"PO-Revision-Date: 2012-03-09 08:17+0100\n"
    1919"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    2828"X-Poedit-SourceCharset: utf-8\n"
    2929
     30#: waeup/custom/applicants/container.py:38
     31msgid "Postgraduates"
     32msgstr ""
     33
     34#: waeup/custom/applicants/container.py:39
     35msgid "handles postgraduate applicants"
     36msgstr ""
     37
    3038#: waeup/custom/browser/theming.py:30
    3139msgid "Custom Theme 1"
    3240msgstr ""
    3341
    34 #: waeup/custom/interfaces.py:32
     42#: waeup/custom/interfaces.py:105
     43msgid "Academic Session"
     44msgstr ""
     45
     46#: waeup/custom/interfaces.py:34
    3547msgid "School Fee (ignored)"
    3648msgstr ""
    3749
    38 #: waeup/custom/interfaces.py:37
    39 msgid "Surcharge BT"
     50#: waeup/custom/interfaces.py:40
     51msgid "Surcharge Portal Provider"
    4052msgstr ""
    4153
    42 #: waeup/custom/interfaces.py:42
     54#: waeup/custom/interfaces.py:46
    4355msgid "Surcharge Interswitch"
    4456msgstr ""
    4557
    46 #: waeup/custom/interfaces.py:47
     58#: waeup/custom/interfaces.py:52
    4759msgid "Surcharge 3"
    4860msgstr ""
    4961
    50 #: waeup/custom/interfaces.py:52
     62#: waeup/custom/interfaces.py:58
    5163msgid "Clearance Fee"
    5264msgstr ""
    5365
    54 #: waeup/custom/interfaces.py:57
     66#: waeup/custom/interfaces.py:64
    5567msgid "Booking Fee"
    5668msgstr ""
    5769
    58 #: waeup/custom/interfaces.py:62
     70#: waeup/custom/interfaces.py:70
     71msgid "Acceptance Fee"
     72msgstr ""
     73
     74#: waeup/custom/interfaces.py:78
    5975msgid "Maintenance Fee"
    6076msgstr ""
    6177
    62 #: waeup/custom/interfaces.py:67
     78#: waeup/custom/interfaces.py:84
    6379msgid "Gown Fee"
    6480msgstr ""
    6581
    66 #: waeup/custom/interfaces.py:72
     82#: waeup/custom/interfaces.py:90
    6783msgid "Transfer Fee"
    6884msgstr ""
    6985
    70 #: waeup/custom/interfaces.py:86
    71 msgid "Academic Session"
     86#: waeup/custom/students/browser.py:112
     87msgid "Payment ticket can't be re-send to CollegePAY."
    7288msgstr ""
    7389
     90#: waeup/custom/students/browser.py:74
     91msgid "CollegePAY"
     92msgstr ""
     93
     94#: waeup/custom/students/browser.py:80
     95msgid "Request CollegePAY callback"
     96msgstr ""
     97
     98#: waeup/custom/students/browser.py:92
     99msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
     100msgstr ""
     101
     102#: waeup/custom/students/browser.py:93
     103msgid "Submit"
     104msgstr ""
     105
     106#: waeup/custom/students/utils.py:70
     107msgid "Session configuration object is not available."
     108msgstr ""
     109
     110#: waeup/custom/students/utils.py:91
     111msgid "Amount could not be determined."
     112msgstr ""

  • main/waeup.custom/trunk/src/waeup/custom/locales/ha/LC_MESSAGES/waeup.custom.po

    r7822 r7880  
    1515msgstr ""
    1616"Project-Id-Version: WAeUP.Kofa\n"
    17 "POT-Creation-Date: Thu Feb 23 18:36:34 2012\n"
     17"POT-Creation-Date: Wed Mar 14 16:32:16 2012\n"
    1818"PO-Revision-Date: 2012-03-09 08:16+0100\n"
    1919"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    2828"X-Poedit-SourceCharset: utf-8\n"
    2929
     30#: waeup/custom/applicants/container.py:38
     31msgid "Postgraduates"
     32msgstr ""
     33
     34#: waeup/custom/applicants/container.py:39
     35msgid "handles postgraduate applicants"
     36msgstr ""
     37
    3038#: waeup/custom/browser/theming.py:30
    3139msgid "Custom Theme 1"
    3240msgstr ""
    3341
    34 #: waeup/custom/interfaces.py:32
     42#: waeup/custom/interfaces.py:105
     43msgid "Academic Session"
     44msgstr ""
     45
     46#: waeup/custom/interfaces.py:34
    3547msgid "School Fee (ignored)"
    3648msgstr ""
    3749
    38 #: waeup/custom/interfaces.py:37
    39 msgid "Surcharge BT"
     50#: waeup/custom/interfaces.py:40
     51msgid "Surcharge Portal Provider"
    4052msgstr ""
    4153
    42 #: waeup/custom/interfaces.py:42
     54#: waeup/custom/interfaces.py:46
    4355msgid "Surcharge Interswitch"
    4456msgstr ""
    4557
    46 #: waeup/custom/interfaces.py:47
     58#: waeup/custom/interfaces.py:52
    4759msgid "Surcharge 3"
    4860msgstr ""
    4961
    50 #: waeup/custom/interfaces.py:52
     62#: waeup/custom/interfaces.py:58
    5163msgid "Clearance Fee"
    5264msgstr ""
    5365
    54 #: waeup/custom/interfaces.py:57
     66#: waeup/custom/interfaces.py:64
    5567msgid "Booking Fee"
    5668msgstr ""
    5769
    58 #: waeup/custom/interfaces.py:62
     70#: waeup/custom/interfaces.py:70
     71msgid "Acceptance Fee"
     72msgstr ""
     73
     74#: waeup/custom/interfaces.py:78
    5975msgid "Maintenance Fee"
    6076msgstr ""
    6177
    62 #: waeup/custom/interfaces.py:67
     78#: waeup/custom/interfaces.py:84
    6379msgid "Gown Fee"
    6480msgstr ""
    6581
    66 #: waeup/custom/interfaces.py:72
     82#: waeup/custom/interfaces.py:90
    6783msgid "Transfer Fee"
    6884msgstr ""
    6985
    70 #: waeup/custom/interfaces.py:86
    71 msgid "Academic Session"
     86#: waeup/custom/students/browser.py:112
     87msgid "Payment ticket can't be re-send to CollegePAY."
    7288msgstr ""
    7389
     90#: waeup/custom/students/browser.py:74
     91msgid "CollegePAY"
     92msgstr ""
     93
     94#: waeup/custom/students/browser.py:80
     95msgid "Request CollegePAY callback"
     96msgstr ""
     97
     98#: waeup/custom/students/browser.py:92
     99msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
     100msgstr ""
     101
     102#: waeup/custom/students/browser.py:93
     103msgid "Submit"
     104msgstr ""
     105
     106#: waeup/custom/students/utils.py:70
     107msgid "Session configuration object is not available."
     108msgstr ""
     109
     110#: waeup/custom/students/utils.py:91
     111msgid "Amount could not be determined."
     112msgstr ""

  • main/waeup.custom/trunk/src/waeup/custom/locales/waeup.custom.pot

    r7696 r7880  
    1515msgstr ""
    1616"Project-Id-Version: Development/Unknown\n"
    17 "POT-Creation-Date: Thu Feb 23 18:36:34 2012\n"
     17"POT-Creation-Date: Wed Mar 14 16:32:16 2012\n"
    1818"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1919"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    2424"Generated-By: zope/app/locales/extract.py\n"
    2525
     26#: waeup/custom/applicants/container.py:38
     27msgid "Postgraduates"
     28msgstr ""
     29
     30#: waeup/custom/applicants/container.py:39
     31msgid "handles postgraduate applicants"
     32msgstr ""
     33
    2634#: waeup/custom/browser/theming.py:30
    2735msgid "Custom Theme 1"
    2836msgstr ""
    2937
    30 #: waeup/custom/interfaces.py:32
     38#: waeup/custom/interfaces.py:105
     39msgid "Academic Session"
     40msgstr ""
     41
     42#: waeup/custom/interfaces.py:34
    3143msgid "School Fee (ignored)"
    3244msgstr ""
    3345
    34 #: waeup/custom/interfaces.py:37
    35 msgid "Surcharge BT"
     46#: waeup/custom/interfaces.py:40
     47msgid "Surcharge Portal Provider"
    3648msgstr ""
    3749
    38 #: waeup/custom/interfaces.py:42
     50#: waeup/custom/interfaces.py:46
    3951msgid "Surcharge Interswitch"
    4052msgstr ""
    4153
    42 #: waeup/custom/interfaces.py:47
     54#: waeup/custom/interfaces.py:52
    4355msgid "Surcharge 3"
    4456msgstr ""
    4557
    46 #: waeup/custom/interfaces.py:52
     58#: waeup/custom/interfaces.py:58
    4759msgid "Clearance Fee"
    4860msgstr ""
    4961
    50 #: waeup/custom/interfaces.py:57
     62#: waeup/custom/interfaces.py:64
    5163msgid "Booking Fee"
    5264msgstr ""
    5365
    54 #: waeup/custom/interfaces.py:62
     66#: waeup/custom/interfaces.py:70
     67msgid "Acceptance Fee"
     68msgstr ""
     69
     70#: waeup/custom/interfaces.py:78
    5571msgid "Maintenance Fee"
    5672msgstr ""
    5773
    58 #: waeup/custom/interfaces.py:67
     74#: waeup/custom/interfaces.py:84
    5975msgid "Gown Fee"
    6076msgstr ""
    6177
    62 #: waeup/custom/interfaces.py:72
     78#: waeup/custom/interfaces.py:90
    6379msgid "Transfer Fee"
    6480msgstr ""
    6581
    66 #: waeup/custom/interfaces.py:86
    67 msgid "Academic Session"
     82#: waeup/custom/students/browser.py:112
     83msgid "Payment ticket can't be re-send to CollegePAY."
    6884msgstr ""
    6985
     86#: waeup/custom/students/browser.py:74
     87msgid "CollegePAY"
     88msgstr ""
     89
     90#: waeup/custom/students/browser.py:80
     91msgid "Request CollegePAY callback"
     92msgstr ""
     93
     94#: waeup/custom/students/browser.py:92
     95msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
     96msgstr ""
     97
     98#: waeup/custom/students/browser.py:93
     99msgid "Submit"
     100msgstr ""
     101
     102#: waeup/custom/students/utils.py:70
     103msgid "Session configuration object is not available."
     104msgstr ""
     105
     106#: waeup/custom/students/utils.py:91
     107msgid "Amount could not be determined."
     108msgstr ""
     109

  • main/waeup.custom/trunk/src/waeup/custom/locales/yo/LC_MESSAGES/waeup.custom.po

    r7822 r7880  
    1515msgstr ""
    1616"Project-Id-Version: WAeUP.Kofa\n"
    17 "POT-Creation-Date: Thu Feb 23 18:36:34 2012\n"
     17"POT-Creation-Date: Wed Mar 14 16:32:16 2012\n"
    1818"PO-Revision-Date: 2012-03-09 08:17+0100\n"
    1919"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    2828"X-Poedit-SourceCharset: utf-8\n"
    2929
     30#: waeup/custom/applicants/container.py:38
     31msgid "Postgraduates"
     32msgstr ""
     33
     34#: waeup/custom/applicants/container.py:39
     35msgid "handles postgraduate applicants"
     36msgstr ""
     37
    3038#: waeup/custom/browser/theming.py:30
    3139msgid "Custom Theme 1"
    3240msgstr ""
    3341
    34 #: waeup/custom/interfaces.py:32
     42#: waeup/custom/interfaces.py:105
     43msgid "Academic Session"
     44msgstr ""
     45
     46#: waeup/custom/interfaces.py:34
    3547msgid "School Fee (ignored)"
    3648msgstr ""
    3749
    38 #: waeup/custom/interfaces.py:37
    39 msgid "Surcharge BT"
     50#: waeup/custom/interfaces.py:40
     51msgid "Surcharge Portal Provider"
    4052msgstr ""
    4153
    42 #: waeup/custom/interfaces.py:42
     54#: waeup/custom/interfaces.py:46
    4355msgid "Surcharge Interswitch"
    4456msgstr ""
    4557
    46 #: waeup/custom/interfaces.py:47
     58#: waeup/custom/interfaces.py:52
    4759msgid "Surcharge 3"
    4860msgstr ""
    4961
    50 #: waeup/custom/interfaces.py:52
     62#: waeup/custom/interfaces.py:58
    5163msgid "Clearance Fee"
    5264msgstr ""
    5365
    54 #: waeup/custom/interfaces.py:57
     66#: waeup/custom/interfaces.py:64
    5567msgid "Booking Fee"
    5668msgstr ""
    5769
    58 #: waeup/custom/interfaces.py:62
     70#: waeup/custom/interfaces.py:70
     71msgid "Acceptance Fee"
     72msgstr ""
     73
     74#: waeup/custom/interfaces.py:78
    5975msgid "Maintenance Fee"
    6076msgstr ""
    6177
    62 #: waeup/custom/interfaces.py:67
     78#: waeup/custom/interfaces.py:84
    6379msgid "Gown Fee"
    6480msgstr ""
    6581
    66 #: waeup/custom/interfaces.py:72
     82#: waeup/custom/interfaces.py:90
    6783msgid "Transfer Fee"
    6884msgstr ""
    6985
    70 #: waeup/custom/interfaces.py:86
    71 msgid "Academic Session"
     86#: waeup/custom/students/browser.py:112
     87msgid "Payment ticket can't be re-send to CollegePAY."
    7288msgstr ""
    7389
     90#: waeup/custom/students/browser.py:74
     91msgid "CollegePAY"
     92msgstr ""
     93
     94#: waeup/custom/students/browser.py:80
     95msgid "Request CollegePAY callback"
     96msgstr ""
     97
     98#: waeup/custom/students/browser.py:92
     99msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
     100msgstr ""
     101
     102#: waeup/custom/students/browser.py:93
     103msgid "Submit"
     104msgstr ""
     105
     106#: waeup/custom/students/utils.py:70
     107msgid "Session configuration object is not available."
     108msgstr ""
     109
     110#: waeup/custom/students/utils.py:91
     111msgid "Amount could not be determined."
     112msgstr ""

  • main/waeup.custom/trunk/src/waeup/custom/students/browser.py

    r7879 r7880  
    117117        self.amount = (self.context.amount_auth + self.context.surcharge_1 +
    118118            self.context.surcharge_2 + self.context.surcharge_3)
     119        self.amount_100 = 100 * self.amount
    119120        self.local_date_time = str(self.context.creation_date)
    120121        certificate = getattr(self.student['studycourse'],'certificate',None)
    … …  
    126127            xmldict['faculty'] = None
    127128        xmldict['detail_ref'] = self.context.p_id
    128         xmldict['provider_amt'] = self.context.surcharge_1
     129        xmldict['provider_amt'] = 100 * self.context.surcharge_1
    129130        xmldict['provider_acct'] = self.provider_acct
    130131        xmldict['provider_bank_id'] = self.provider_bank_id
    131132        xmldict['provider_item_name'] = self.provider_item_name
    132         xmldict['institution_amt'] = self.amount
     133        xmldict['institution_amt'] = 100 * self.context.amount_auth
    133134        xmldict['institution_acct'] = self.institution_acct
    134135        xmldict['institution_bank_id'] = self.institution_bank_id
    135136        xmldict['institution_item_name'] = self.context.p_category
    136137        xmldict['institution_name'] = self.institution_name
     138        # Interswitch amount is not part of the xml data
    137139        xmltext = """<payment_item_detail>
    138140<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">

  • main/waeup.custom/trunk/src/waeup/custom/students/browser_templates/goto_interswitch.pt

    r7879 r7880  
    6262  <input type="hidden" name="site_name" tal:attributes="value view/site_name" />
    6363  <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
    64   <input type="hidden" name="amount" tal:attributes="value view/amount" />
     64  <input type="hidden" name="amount" tal:attributes="value view/amount_100" />
    6565
    6666  <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
Note: See TracChangeset for help on using the changeset viewer.