rename paypal to payway
authorDobrica Pavlinusic <dpavlin@deimos.ffzg.hr>
Tue, 8 Dec 2015 12:39:47 +0000 (13:39 +0100)
committerDobrica Pavlinusic <dpavlin@deimos.ffzg.hr>
Tue, 8 Dec 2015 12:39:47 +0000 (13:39 +0100)
MaKaC/plugins/EPayment/payWay/__init__.py
MaKaC/plugins/EPayment/payWay/epayment.py
MaKaC/plugins/EPayment/payWay/tpls/ConfModifEPaymentPayPal.tpl
MaKaC/plugins/EPayment/payWay/tpls/ConfModifEPaymentPayPalDataModif.tpl
MaKaC/plugins/EPayment/payWay/webinterface/pages/ePayments.py
MaKaC/plugins/EPayment/payWay/webinterface/rh/ePaymentModif.py
MaKaC/plugins/EPayment/payWay/webinterface/urlHandlers.py
MaKaC/plugins/EPayment/payWay/webinterface/wcomponents.py

index fe454d0..2893629 100644 (file)
@@ -19,9 +19,9 @@
 
 __metadata__ = {
     'type': "EPayment",
-    'name': "PayPal"
+    'name': "PayWay"
     }
 
-MODULE_ID = 'PayPal'
+MODULE_ID = 'PayWay'
 
 modules = {}
index 95c08cb..435c20e 100644 (file)
@@ -22,16 +22,16 @@ import MaKaC.webinterface.urlHandlers as urlHandlers
 from MaKaC.webinterface.common.tools import strip_ml_tags
 
 
-from MaKaC.plugins.EPayment.payPal.webinterface import urlHandlers as localUrlHandlers
-from MaKaC.plugins.EPayment.payPal import MODULE_ID
+from MaKaC.plugins.EPayment.payWay.webinterface import urlHandlers as localUrlHandlers
+from MaKaC.plugins.EPayment.payWay import MODULE_ID
 
-class PayPalMod(BaseEPayMod):
+class PayWayMod(BaseEPayMod):
 
     def __init__(self, data=None):
         BaseEPayMod.__init__(self)
-        self._title = "paypal"
+        self._title = "payway"
 
-        self._url="https://www.paypal.com/cgi-bin/webscr"
+        self._url="https://www.payway.com/cgi-bin/webscr"
         self._business= ""
 
         if data is not None:
@@ -41,7 +41,7 @@ class PayPalMod(BaseEPayMod):
         return MODULE_ID
 
     def clone(self, newSessions):
-        sesf = PayPalMod()
+        sesf = PayWayMod()
         sesf.setTitle(self.getTitle())
         sesf.setUrl(self.getUrl())
         sesf.setBusiness(self.getBusiness())
@@ -64,9 +64,9 @@ class PayPalMod(BaseEPayMod):
         self._business= business
 
     def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_GB", secure=False):
-        url_return=localUrlHandlers.UHPayConfirmPayPal.getURL(registrant)
-        url_cancel_return=localUrlHandlers.UHPayCancelPayPal.getURL(registrant)
-        url_notify=localUrlHandlers.UHPayParamsPayPal.getURL(registrant)
+        url_return=localUrlHandlers.UHPayConfirmPayWay.getURL(registrant)
+        url_cancel_return=localUrlHandlers.UHPayCancelPayWay.getURL(registrant)
+        url_notify=localUrlHandlers.UHPayParamsPayWay.getURL(registrant)
         s=""" <form action="%s" method="POST" id="%s">
                         <input type="hidden" name="cmd" value="_xclick">
                         <input type="hidden" name="business" value="%s">
@@ -84,11 +84,11 @@ class PayPalMod(BaseEPayMod):
         return s
 
     def getConfModifEPaymentURL(self, conf):
-        return localUrlHandlers.UHConfModifEPaymentPayPal.getURL(conf)
+        return localUrlHandlers.UHConfModifEPaymentPayWay.getURL(conf)
 
 
 
-class TransactionPayPal(BaseTransaction):
+class TransactionPayWay(BaseTransaction):
 
     def __init__(self,parms):
         BaseTransaction.__init__(self)
@@ -100,14 +100,14 @@ class TransactionPayPal(BaseTransaction):
             if self._id:
                 pass
         except AttributeError, e:
-            self._id="paypal"
+            self._id="payway"
         return self._id
 
     def getTransactionHTML(self):
         return"""<table>
                           <tr>
                             <td align="right"><b>Payment with:</b></td>
-                            <td align="left">PayPal</td>
+                            <td align="left">PayWay</td>
                           </tr>
                           <tr>
                             <td align="right"><b>Payment Date:</b></td>
@@ -129,7 +129,7 @@ class TransactionPayPal(BaseTransaction):
                              self._Data["mc_currency"], self._Data["verify_sign"])
     def getTransactionTxt(self):
         return"""
-\tPayment with:PayPal\n
+\tPayment with:PayWay\n
 \tPayment Date:%s\n
 \tPayment ID:%s\n
 \tOrder Total:%s %s\n
@@ -140,7 +140,7 @@ class TransactionPayPal(BaseTransaction):
 
 
 def getPayMod():
-    return PayPalMod()
+    return PayWayMod()
 
 def getPayModClass():
-    return PayPalMod
+    return PayWayMod
index 1f04a01..f4ab65d 100644 (file)
@@ -9,7 +9,7 @@
         </form>
     </tr>
     <tr>
-        <td class="dataCaptionTD"><span class="dataCaptionFormat">URL of PayPal</span></td>
+        <td class="dataCaptionTD"><span class="dataCaptionFormat">URL of PayWay</span></td>
         <td bgcolor="white" width="100%" class="blacktext"><pre>${ url }</pre></td>
     </tr>
     <tr>
index 0777390..d0fa00a 100644 (file)
@@ -1,14 +1,14 @@
 <form action=${ postURL } method="POST">
     <table width="80%" align="center" border="0" style="border-left: 1px solid #777777">
         <tr>
-            <td class="groupTitle" colspan="2">Configuration of PayPal</td>
+            <td class="groupTitle" colspan="2">Configuration of PayWay</td>
         </tr>
         <tr>
             <td nowrap class="dataCaptionTD"><span class="titleCellFormat">Title</span></td>
             <td align="left"><input type="text" name="title" size="60" value="${ title }"></td>
         </tr>
         <tr>
-            <td class="dataCaptionTD"><span class="dataCaptionFormat">URL of PayPal</span></td>
+            <td class="dataCaptionTD"><span class="dataCaptionFormat">URL of PayWay</span></td>
             <td align="left"><input type="text" name="url" size="60" value="${ url }"></td>
         </tr>
         <tr>
index 91d96e8..379142d 100644 (file)
@@ -27,18 +27,18 @@ import MaKaC
 from MaKaC.i18n import _
 
 
-from MaKaC.plugins.EPayment.payPal import MODULE_ID
-from MaKaC.plugins.EPayment.payPal.webinterface.wcomponents import WTemplated
-from MaKaC.plugins.EPayment.payPal.webinterface import urlHandlers as localUrlHandlers
+from MaKaC.plugins.EPayment.payWay import MODULE_ID
+from MaKaC.plugins.EPayment.payWay.webinterface.wcomponents import WTemplated
+from MaKaC.plugins.EPayment.payWay.webinterface import urlHandlers as localUrlHandlers
 
 
 
-class WPConfModifEPaymentPayPalBase(registrationForm.WPConfModifRegFormBase):
+class WPConfModifEPaymentPayWayBase(registrationForm.WPConfModifRegFormBase):
 
     def _createTabCtrl( self ):
         self._tabCtrl = wcomponents.TabControl()
         self._tabMain = self._tabCtrl.newTab( "main", _("Main"), \
-                localUrlHandlers.UHConfModifEPaymentPayPal.getURL( self._conf ) )
+                localUrlHandlers.UHConfModifEPaymentPayWay.getURL( self._conf ) )
         wf = self._rh.getWebFactory()
         if wf:
             wf.customiseTabCtrl( self._tabCtrl )
@@ -59,50 +59,50 @@ class WPConfModifEPaymentPayPalBase(registrationForm.WPConfModifRegFormBase):
     def _getTabContent( self, params ):
         return "nothing"
 
-class WPConfModifEPaymentPayPal( WPConfModifEPaymentPayPalBase ):
+class WPConfModifEPaymentPayWay( WPConfModifEPaymentPayWayBase ):
 
     def _getTabContent( self, params ):
-        wc = WConfModifEPaymentPayPal(self._conf)
+        wc = WConfModifEPaymentPayWay(self._conf)
         p = {
-             'dataModificationURL': quoteattr(str(localUrlHandlers.UHConfModifEPaymentPayPalDataModif.getURL( self._conf )))
+             'dataModificationURL': quoteattr(str(localUrlHandlers.UHConfModifEPaymentPayWayDataModif.getURL( self._conf )))
             }
         return wc.getHTML(p)
 
-class WConfModifEPaymentPayPal( WTemplated ):
+class WConfModifEPaymentPayWay( WTemplated ):
 
     def __init__( self, conference ):
         self._conf = conference
 
     def getVars( self ):
         vars = WTemplated.getVars(self)
-        modPayPal = self._conf.getModPay().getPayModByTag(MODULE_ID)
-        vars["title"] = modPayPal.getTitle()
-        vars["url"] = modPayPal.getUrl()
-        vars["business"] =  modPayPal.getBusiness()
+        modPayWay = self._conf.getModPay().getPayModByTag(MODULE_ID)
+        vars["title"] = modPayWay.getTitle()
+        vars["url"] = modPayWay.getUrl()
+        vars["business"] =  modPayWay.getBusiness()
         return vars
 
-class WPConfModifEPaymentPayPalDataModif( WPConfModifEPaymentPayPalBase ):
+class WPConfModifEPaymentPayWayDataModif( WPConfModifEPaymentPayWayBase ):
 
     def _getTabContent( self, params ):
-        wc = WConfModifEPaymentPayPalDataModif(self._conf)
-        p = {'postURL': quoteattr(str(localUrlHandlers.UHConfModifEPaymentPayPalPerformDataModif.getURL( self._conf )))
+        wc = WConfModifEPaymentPayWayDataModif(self._conf)
+        p = {'postURL': quoteattr(str(localUrlHandlers.UHConfModifEPaymentPayWayPerformDataModif.getURL( self._conf )))
             }
         return wc.getHTML(p)
 
-class WConfModifEPaymentPayPalDataModif( WTemplated ):
+class WConfModifEPaymentPayWayDataModif( WTemplated ):
 
     def __init__( self, conference ):
         self._conf = conference
 
     def getVars( self ):
         vars = WTemplated.getVars(self)
-        modPayPal = self._conf.getModPay().getPayModByTag(MODULE_ID)
-        vars["title"] = modPayPal.getTitle()
-        vars["url"] = modPayPal.getUrl()
-        vars["business"] =  modPayPal.getBusiness()
+        modPayWay = self._conf.getModPay().getPayModByTag(MODULE_ID)
+        vars["title"] = modPayWay.getTitle()
+        vars["url"] = modPayWay.getUrl()
+        vars["business"] =  modPayWay.getBusiness()
         return vars
 
-class WPconfirmEPaymentPayPal( conferences.WPConferenceDefaultDisplayBase ):
+class WPconfirmEPaymentPayWay( conferences.WPConferenceDefaultDisplayBase ):
     #navigationEntry = navigation.NERegistrationFormDisplay
 
     def __init__(self, rh, conf, reg):
@@ -111,7 +111,7 @@ class WPconfirmEPaymentPayPal( conferences.WPConferenceDefaultDisplayBase ):
 
 
     def _getBody( self, params ):
-        wc = WconfirmEPaymentPayPal(self._conf, self._registrant)
+        wc = WconfirmEPaymentPayWay(self._conf, self._registrant)
         return wc.getHTML()
 
     def _defineSectionMenu( self ):
@@ -119,18 +119,18 @@ class WPconfirmEPaymentPayPal( conferences.WPConferenceDefaultDisplayBase ):
         self._sectionMenu.setCurrentItem(self._regFormOpt)
 
 
-class WconfirmEPaymentPayPal( WTemplated ):
+class WconfirmEPaymentPayWay( WTemplated ):
     def __init__( self,configuration, registrant):
         self._registrant = registrant
         self._conf = configuration
 
     def getVars( self ):
         vars = WTemplated.getVars(self)
-        vars["message"] = "Thank you for the payment!<br/> You have used PayPal"
+        vars["message"] = "Thank you for the payment!<br/> You have used PayWay"
         vars["trinfo"]="%s:%s"%(self._registrant.getFirstName(),self._registrant.getSurName())
         return vars
 
-class WPCancelEPaymentPayPal( conferences.WPConferenceDefaultDisplayBase ):
+class WPCancelEPaymentPayWay( conferences.WPConferenceDefaultDisplayBase ):
     #navigationEntry = navigation.NERegistrationFormDisplay
 
     def __init__(self, rh, conf, reg):
@@ -138,20 +138,20 @@ class WPCancelEPaymentPayPal( conferences.WPConferenceDefaultDisplayBase ):
         self._registrant=reg
 
     def _getBody( self, params ):
-        wc = WCancelEPaymentPayPal( self._conf,self._registrant )
+        wc = WCancelEPaymentPayWay( self._conf,self._registrant )
         return wc.getHTML()
 
     def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
 
-class WCancelEPaymentPayPal( WTemplated ):
+class WCancelEPaymentPayWay( WTemplated ):
     def __init__( self, conference,reg ):
         self._conf = conference
         self._registrant=reg
 
     def getVars( self ):
         vars = WTemplated.getVars(self)
-        vars["message"] = "You have cancelled your transaction.\nPlease check your email in order to complete your PayPal transaction."
+        vars["message"] = "You have cancelled your transaction.\nPlease check your email in order to complete your PayWay transaction."
         vars["messagedetailPayment"]="%s:%s"%(self._registrant.getFirstName(),self._registrant.getSurName())
         return vars
index 7c6e071..7b0291e 100644 (file)
@@ -23,28 +23,28 @@ from datetime import datetime
 from MaKaC.common.timezoneUtils import nowutc
 
 
-from MaKaC.plugins.EPayment.payPal.webinterface.pages import ePayments
-from MaKaC.plugins.EPayment.payPal.webinterface import urlHandlers as localUrlHandlers
-from MaKaC.plugins.EPayment.payPal import epayment as ePayment
-from MaKaC.plugins.EPayment.payPal import MODULE_ID
+from MaKaC.plugins.EPayment.payWay.webinterface.pages import ePayments
+from MaKaC.plugins.EPayment.payWay.webinterface import urlHandlers as localUrlHandlers
+from MaKaC.plugins.EPayment.payWay import epayment as ePayment
+from MaKaC.plugins.EPayment.payWay import MODULE_ID
 
 
-class RHEPaymentmodifPayPal( RHEPaymentModifBase ):
-    _requestTag = "modifPayPal"
+class RHEPaymentmodifPayWay( RHEPaymentModifBase ):
+    _requestTag = "modifPayWay"
 
     def _process( self ):
-        p = ePayments.WPConfModifEPaymentPayPal( self, self._conf )
+        p = ePayments.WPConfModifEPaymentPayWay( self, self._conf )
         return p.display()
 
-class RHEPaymentmodifPayPalDataModif( RHEPaymentModifBase ):
-    _requestTag = "modifPayPalData"
+class RHEPaymentmodifPayWayDataModif( RHEPaymentModifBase ):
+    _requestTag = "modifPayWayData"
 
     def _process( self ):
-        p = ePayments.WPConfModifEPaymentPayPalDataModif( self, self._conf )
+        p = ePayments.WPConfModifEPaymentPayWayDataModif( self, self._conf )
         return p.display()
 
-class RHEPaymentmodifPayPalPerformDataModif( RHEPaymentModifBase ):
-    _requestTag = "modifPayPalPerformDataModif"
+class RHEPaymentmodifPayWayPerformDataModif( RHEPaymentModifBase ):
+    _requestTag = "modifPayWayPerformDataModif"
 
     def _checkParams( self, params ):
         RHEPaymentModifBase._checkParams( self, params )
@@ -55,12 +55,12 @@ class RHEPaymentmodifPayPalPerformDataModif( RHEPaymentModifBase ):
         if not self._cancel:
             ses = self._conf.getModPay().getPayModByTag(MODULE_ID)
             ses.setValues(self._params)
-        self._redirect(localUrlHandlers.UHConfModifEPaymentPayPal.getURL(self._conf))
+        self._redirect(localUrlHandlers.UHConfModifEPaymentPayWay.getURL(self._conf))
 
 
 
 
-class RHEPaymentconfirmPayPal( RHRegistrationFormDisplayBase ):
+class RHEPaymentconfirmPayWay( RHRegistrationFormDisplayBase ):
     _requestTag = "confirm"
 
     def _checkParams( self, params ):
@@ -72,10 +72,10 @@ class RHEPaymentconfirmPayPal( RHRegistrationFormDisplayBase ):
 
     def _processIfActive( self ):
         if self._registrant is not None:
-            p = ePayments.WPconfirmEPaymentPayPal( self,self._conf,self._registrant)
+            p = ePayments.WPconfirmEPaymentPayWay( self,self._conf,self._registrant)
             return p.display()
 
-class RHEPaymentCancelPayPal( RHRegistrationFormDisplayBase ):
+class RHEPaymentCancelPayWay( RHRegistrationFormDisplayBase ):
     _requestTag = "cancel"
 
     def _checkParams( self, params ):
@@ -87,11 +87,11 @@ class RHEPaymentCancelPayPal( RHRegistrationFormDisplayBase ):
 
     def _processIfActive( self ):
         if self._registrant is not None:
-            p = ePayments.WPCancelEPaymentPayPal( self,self._conf ,self._registrant)
+            p = ePayments.WPCancelEPaymentPayWay( self,self._conf ,self._registrant)
             return p.display()
 
 
-class RHEPaymentValideParamPayPal( RHConferenceBaseDisplay ):
+class RHEPaymentValideParamPayWay( RHConferenceBaseDisplay ):
     _requestTag = "params"
 
     def _checkParams( self, params ):
@@ -122,7 +122,7 @@ class RHEPaymentValideParamPayPal( RHConferenceBaseDisplay ):
                 d["mc_currency"]=self._params.get("mc_currency")
                 d["mc_gross"]=self._params.get("mc_gross")
                 d["verify_sign"]=self._params.get("verify_sign")
-                tr=ePayment.TransactionPayPal(d)
+                tr=ePayment.TransactionPayWay(d)
                 self._registrant.setTransactionInfo(tr)
                 self._regForm.getNotification().sendEmailNewRegistrantConfirmPay(self._regForm,self._registrant )
 
index a3ecee3..b1a0617 100644 (file)
@@ -18,7 +18,7 @@
 ## along with Indico;if not, see <http://www.gnu.org/licenses/>.
 
 from MaKaC.webinterface.urlHandlers import URLHandler as MainURLHandler
-from MaKaC.plugins.EPayment import payPal
+from MaKaC.plugins.EPayment import payWay
 
 
 class EPURLHandler(MainURLHandler):
@@ -26,27 +26,27 @@ class EPURLHandler(MainURLHandler):
 
     @classmethod
     def getURL(cls, target=None):
-        return super(EPURLHandler, cls).getURL(target, EPaymentName=payPal.MODULE_ID, requestTag=cls._requestTag)
+        return super(EPURLHandler, cls).getURL(target, EPaymentName=payWay.MODULE_ID, requestTag=cls._requestTag)
 
 
 class UHConfModifEPayment(EPURLHandler):
     _endpoint = 'event_mgmt.confModifEpayment-modifModule'
 
 
-class UHConfModifEPaymentPayPal( UHConfModifEPayment ):
-    _requestTag = "modifPayPal"
-class UHConfModifEPaymentPayPalDataModif( UHConfModifEPayment ):
-    _requestTag = "modifPayPalData"
-class UHConfModifEPaymentPayPalPerformDataModif( UHConfModifEPayment ):
-    _requestTag = "modifPayPalPerformDataModif"
+class UHConfModifEPaymentPayWay( UHConfModifEPayment ):
+    _requestTag = "modifPayWay"
+class UHConfModifEPaymentPayWayDataModif( UHConfModifEPayment ):
+    _requestTag = "modifPayWayData"
+class UHConfModifEPaymentPayWayPerformDataModif( UHConfModifEPayment ):
+    _requestTag = "modifPayWayPerformDataModif"
 
 
 class UHPay(EPURLHandler):
     _endpoint = 'misc.payment'
 
-class UHPayConfirmPayPal( UHPay ):
+class UHPayConfirmPayWay( UHPay ):
     _requestTag = "confirm"
-class UHPayCancelPayPal( UHPay ):
+class UHPayCancelPayWay( UHPay ):
     _requestTag = "cancel"
-class UHPayParamsPayPal( UHPay ):
+class UHPayParamsPayWay( UHPay ):
     _requestTag = "params"
index e0d9cf6..a06195e 100644 (file)
@@ -22,7 +22,7 @@ import os
 import pkg_resources
 import MaKaC.common.Configuration as Configuration
 
-from MaKaC.plugins.EPayment import payPal
+from MaKaC.plugins.EPayment import payWay
 
 class WTemplated(wcomponents.WTemplated):
 
@@ -33,7 +33,7 @@ class WTemplated(wcomponents.WTemplated):
             in the configured TPL directory.
         """
         cfg = Configuration.Config.getInstance()
-        dir = pkg_resources.resource_filename(payPal.__name__, "tpls")
+        dir = pkg_resources.resource_filename(payWay.__name__, "tpls")
         file = cfg.getTPLFile( self.tplId )
         if file == "":
             file = "%s.tpl"%self.tplId