diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getExpressCheckoutDetails.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getExpressCheckoutDetails.xml index 7afda71fbe09c33e9e61f95e7bef49a5df2f799b..d9a986130b7b745fe021a90b237515edd0bf5f48 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getExpressCheckoutDetails.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getExpressCheckoutDetails.xml @@ -60,7 +60,7 @@ security_parameter_dict[\'TOKEN\'] = token\n security_parameter_dict[\'METHOD\'] = \'GetExpressCheckoutDetails\'\n \n response_parameter_dict = context.ERP5Base_submitPaypalNVPRequest(parameter_dict=security_parameter_dict,\n - nvp_url=context.WebSite_getPaypalUrl(api=\'nvp\'))\n + nvp_url=context.WebSite_getPaypalUrl(api=\'nvp\', alternative_url=alternative_url))\n return response_parameter_dict\n </string> </value> </item> @@ -72,7 +72,7 @@ return response_parameter_dict\n </item> <item> <key> <string>_params</string> </key> - <value> <string>token</string> </value> + <value> <string>token, alternative_url=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -92,13 +92,14 @@ return response_parameter_dict\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>token</string> + <string>alternative_url</string> <string>_getattr_</string> <string>context</string> <string>security_parameter_dict</string> @@ -116,7 +117,9 @@ return response_parameter_dict\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getNewPaypalToken.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getNewPaypalToken.xml index cb62acae23cfe40680adc51b24cd9444dbfdd987..5bf6799b88470d1bfdb32eb546940de7fcbfffcf 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getNewPaypalToken.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getNewPaypalToken.xml @@ -54,7 +54,7 @@ <item> <key> <string>_body</string> </key> <value> <string>response_parameter_dict = context.ERP5Base_submitPaypalNVPRequest(parameter_dict=context.WebSite_getPaypalOrderParameterDict(),\n - nvp_url=context.WebSite_getPaypalUrl(api=\'nvp\'))\n + nvp_url=context.WebSite_getPaypalUrl(api=\'nvp\', alternative_url=alternative_url))\n \n if response_parameter_dict is None:\n return None\n @@ -72,7 +72,7 @@ return \'\'\n </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>alternative_url=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -92,12 +92,13 @@ return \'\'\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>alternative_url</string> <string>_getattr_</string> <string>context</string> <string>response_parameter_dict</string> @@ -114,7 +115,9 @@ return \'\'\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalUrl.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalUrl.xml index 8be1a3bee67fafd2b06667348c7b46147853e7e9..b3b803905f10f2491a8ca2c16cb85420051f933d 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalUrl.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalUrl.xml @@ -53,7 +53,10 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>test_environement = context.getLayoutProperty(\'ecommerce_test_environment_enabled\', None)\n + <value> <string>if alternative_url is not None:\n + return alternative_url\n +\n +test_environement = context.getLayoutProperty(\'ecommerce_test_environment_enabled\', None)\n \n if test_environement is not None and test_environement == 1:\n if api == \'nvp\':\n @@ -73,7 +76,7 @@ return \'https://www.paypal.com/cgi-bin/webscr\'\n </item> <item> <key> <string>_params</string> </key> - <value> <string>api=None</string> </value> + <value> <string>api=None, alternative_url=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -93,16 +96,17 @@ return \'https://www.paypal.com/cgi-bin/webscr\'\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>api</string> + <string>alternative_url</string> + <string>None</string> <string>_getattr_</string> <string>context</string> - <string>None</string> <string>test_environement</string> </tuple> </value> @@ -117,6 +121,7 @@ return \'https://www.paypal.com/cgi-bin/webscr\'\n <value> <tuple> <none/> + <none/> </tuple> </value> </item> diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision index c2807f7f3cebe94f4ce652ca42b80dcc5853fe2d..83248fb9df4a244c41a10fa536045d5a8e759aee 100644 --- a/bt5/erp5_commerce/bt/revision +++ b/bt5/erp5_commerce/bt/revision @@ -1 +1 @@ -140 \ No newline at end of file +142 \ No newline at end of file