remove paramater that is not supported on IPaymentService and refactor code to...

remove paramater that is not supported on IPaymentService and refactor code to be possible pass a list of parameters to page template. With this will be possible create one form more ergonomic to post to paypal

bt5/erp5_paypal_secure_payment/DocumentTemplateItem/PaypalService.py

@@ -57,13 +57,22 @@ class PaypalService(XMLObject):
   def initialize(self, REQUEST=None, **kw):
     """See Payment Service Interface Documentation"""
 
-  def navigate(self, page_template, REQUEST=None, **kw):
+  def _getFieldList(self, paypal_dict):
+    field_list = []
+    for k,v in paypal_dict.iteritems():
+      field_list.append((k, v))
+    return field_list
+
+  def navigate(self, REQUEST=None, **kw):
     """See Payment Service Interface Documentation"""
     self.Base_checkConsistency()
+    page_template = kw.pop("page_template")
+    paypal_dict = kw.get("paypal_dict", {})
     temp_document = newTempDocument(self, 'id')
     temp_document.edit(
       link_url_string=self.getLinkUrlString(),
-      title='title',
+      title=self.getTitle(),
+      field_list=self._getFieldList(paypal_dict),
       # append the rest of transmitted parameters page template
       **kw
     )

bt5/erp5_paypal_secure_payment/TestTemplateItem/testERP5PaypalSecurePayment.py

@@ -79,17 +79,21 @@ class TestERP5PaypalSecurePayment(TestERP5PaypalSecurePaymentMixin):
       service_username="business@sample.com"
     )
     pt_id = str(random.random())
-    page_template_text = """
-    link=<tal:block tal:replace='here/link_url_string'/>
+    page_template_text = """<tal:block tal:repeat="value here/field_list">key=<tal:block tal:replace="python: value[0]"/> value=<tal:block tal:replace="python: value[1]"/>
+</tal:block>link=<tal:block tal:replace='here/link_url_string'/>
 business=<tal:block tal:replace='here/service_username'/>
     """
     self.portal.portal_skins.custom.manage_addProduct['PageTemplates']\
                 .manage_addPageTemplate(id=pt_id, text=page_template_text)
     # flush skin cache
     self.portal.changeSkin(None)
+    paypal_dict = {
+        "return" : "http://ipn/"
+    }
     try:
-      result = self.service.navigate(pt_id)
-      self.assertEquals(result, """link=http://paypal/
+      result = self.service.navigate(page_template=pt_id, paypal_dict=paypal_dict)
+      self.assertEquals(result, """key=return value=http://ipn/
+link=http://paypal/
 business=business@sample.com""")
     finally:
       self.portal.portal_skins.custom.manage_delObjects([pt_id])

bt5/erp5_paypal_secure_payment/bt/revision

-1
+2
\ No newline at end of file