Ignore:
Timestamp:
30 Jan 2014, 14:13:41 (11 years ago)
Author:
Henrik Bettermann
Message:

Merge with changes made in trunk till r10944.

Location:
main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

    • Property svn:mergeinfo set to (toggle deleted branches)
      /main/waeup.kofa/trunk/src/waeup/kofamergedeligible
      /main/waeup.kofa/branches/uli-autoinclude-less/src/waeup/kofa8871-8888
      /main/waeup.sirp/branches/uli-studentpw/src/waeup/kofa6703-6755
      /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/kofa7001-7062
      /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/kofa7761-7794
  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/payment.py

    r10392 r11012  
    111111        return 'N/A'
    112112
     113    @property
     114    def email(self):
     115        "Email of payer"
     116        return self.context.__parent__.email
     117
     118    @property
     119    def phone(self):
     120        "Phone number of payer"
     121        return self.context.__parent__.phone
     122
     123    @property
     124    def current_mode(self):
     125        "Current study mode of payer"
     126        return 'N/A'
     127
     128    @property
     129    def current_level(self):
     130        "Current level of payer"
     131        return 'N/A'
     132
    113133# Applicant online payments must be importable. So we might need a factory.
    114134class ApplicantOnlinePaymentFactory(grok.GlobalUtility):
Note: See TracChangeset for help on using the changeset viewer.