Ticket #423

modules/boonex/stripe_connect/install/langs/ru.xml → modules/boonex/russian/data/langs/bx_stripe_connect/ru.xml

@@ -1,47 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources name="ru" flag="ru" title="Russian">
-	<string name="_bx_stripe_connect"><![CDATA[Stripe Connect]]></string>
-
-	<!-- OPTIONS -->
-	<string name="_bx_stripe_connect_option_mode"><![CDATA[Режим]]></string>
-    <string name="_bx_stripe_connect_option_mode_live"><![CDATA[рабочий]]></string>
-    <string name="_bx_stripe_connect_option_mode_test"><![CDATA[тестовый]]></string>
-    <string name="_bx_stripe_connect_option_api_id_live"><![CDATA[ID клиента (рабочий)]]></string>
-    <string name="_bx_stripe_connect_option_api_public_live"><![CDATA[Открытый ключ (рабочий)]]></string>
-    <string name="_bx_stripe_connect_option_api_secret_live"><![CDATA[Секретный ключ (рабочий)]]></string>
-    <string name="_bx_stripe_connect_option_api_id_test"><![CDATA[ID клиента (тестовый)]]></string>
-    <string name="_bx_stripe_connect_option_api_public_test"><![CDATA[Открытый ключ (тестовый)]]></string>
-    <string name="_bx_stripe_connect_option_api_secret_test"><![CDATA[Секретный ключ (тестовый)]]></string>
-    <string name="_bx_stripe_connect_option_api_scope"><![CDATA[Область действия]]></string>
-    <string name="_bx_stripe_connect_option_api_scope_read_only"><![CDATA[Только чтение]]></string>
-    <string name="_bx_stripe_connect_option_api_scope_read_write"><![CDATA[Чтение и запись]]></string>
-    <string name="_bx_stripe_connect_option_pmode_single"><![CDATA[Режим обработки единовременных выплат]]></string>
-    <string name="_bx_stripe_connect_option_fee_single"><![CDATA[Комиссия с единовременных выплат (в центах, процент)]]></string>
-    <string name="_bx_stripe_connect_option_pmode_recurring"><![CDATA[Режим обработки выплат по подписке]]></string>
-    <string name="_bx_stripe_connect_option_pmode_direct"><![CDATA[Прямой]]></string>
-    <string name="_bx_stripe_connect_option_pmode_platform"><![CDATA[Платформа]]></string>
-    <string name="_bx_stripe_connect_option_fee_recurring"><![CDATA[Комиссия с выплат по подписке (только процент)]]></string>
-
-	<!-- PAGES and BLOCKS -->
-	<string name="_bx_stripe_connect_page_title_sys_result"><![CDATA[Stripe Connect: Результаты]]></string>
-	<string name="_bx_stripe_connect_page_title_result"><![CDATA[Stripe Connect: Результаты]]></string>
-	<string name="_bx_stripe_connect_page_block_title_result"><![CDATA[Stripe Connect: Результаты]]></string>
-	<string name="_bx_stripe_connect_page_block_title_connect"><![CDATA[Stripe Connect]]></string>
-
-	<!-- MENUS -->
-	<string name="_bx_stripe_connect_menu_item_title_accounts"><![CDATA[Аккаунты]]></string>
-
-	<!-- GRIDS -->
-	<string name="_bx_stripe_connect_grid_column_title_author"><![CDATA[Автор]]></string>
-	<string name="_bx_stripe_connect_grid_column_title_user_id"><![CDATA[Stripe Клиент ID]]></string>
-	<string name="_bx_stripe_connect_grid_column_title_public_key"><![CDATA[Публичный ключ]]></string>
-	<string name="_bx_stripe_connect_grid_column_title_access_token"><![CDATA[Секретный ключ]]></string>
-	<string name="_bx_stripe_connect_grid_column_title_added"><![CDATA[Присоединен]]></string>
-	<string name="_bx_stripe_connect_action_title_delete"><![CDATA[Отсоединиться]]></string>
-	
-	<!-- OTHER -->
-	<string name="_bx_stripe_connect_btn_connect"><![CDATA[Присоединиться]]></string>
-	<string name="_bx_stripe_connect_msg_connected"><![CDATA[Вы были успешно присоединены.]]></string>
-	<string name="_bx_stripe_connect_wrn_disconnect"><![CDATA[Вы уверены, что хотите отсоединиться?]]></string>
-	<string name="_bx_stripe_connect_err_perform"><![CDATA[Не удается выполнить действие. Пожалуйста сообщите.]]></string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources name="ru" flag="ru" title="Russian">
+	<string name="_bx_stripe_connect"><![CDATA[Stripe Connect]]></string>
+
+	<!-- OPTIONS -->
+	<string name="_bx_stripe_connect_option_mode"><![CDATA[Режим]]></string>
+    <string name="_bx_stripe_connect_option_mode_live"><![CDATA[рабочий]]></string>
+    <string name="_bx_stripe_connect_option_mode_test"><![CDATA[тестовый]]></string>
+    <string name="_bx_stripe_connect_option_api_id_live"><![CDATA[ID клиента (рабочий)]]></string>
+    <string name="_bx_stripe_connect_option_api_public_live"><![CDATA[Открытый ключ (рабочий)]]></string>
+    <string name="_bx_stripe_connect_option_api_secret_live"><![CDATA[Секретный ключ (рабочий)]]></string>
+    <string name="_bx_stripe_connect_option_api_id_test"><![CDATA[ID клиента (тестовый)]]></string>
+    <string name="_bx_stripe_connect_option_api_public_test"><![CDATA[Открытый ключ (тестовый)]]></string>
+    <string name="_bx_stripe_connect_option_api_secret_test"><![CDATA[Секретный ключ (тестовый)]]></string>
+    <string name="_bx_stripe_connect_option_api_scope"><![CDATA[Область действия]]></string>
+    <string name="_bx_stripe_connect_option_api_scope_read_only"><![CDATA[Только чтение]]></string>
+    <string name="_bx_stripe_connect_option_api_scope_read_write"><![CDATA[Чтение и запись]]></string>
+    <string name="_bx_stripe_connect_option_pmode_single"><![CDATA[Режим обработки единовременных выплат]]></string>
+    <string name="_bx_stripe_connect_option_fee_single"><![CDATA[Комиссия с единовременных выплат (в центах, процент)]]></string>
+    <string name="_bx_stripe_connect_option_pmode_recurring"><![CDATA[Режим обработки выплат по подписке]]></string>
+    <string name="_bx_stripe_connect_option_pmode_direct"><![CDATA[Прямой]]></string>
+    <string name="_bx_stripe_connect_option_pmode_platform"><![CDATA[Платформа]]></string>
+    <string name="_bx_stripe_connect_option_fee_recurring"><![CDATA[Комиссия с выплат по подписке (только процент)]]></string>
+    <string name="_bx_stripe_connect_option_redirect_url"><![CDATA[URL перенаправления]]></string>
+
+	<!-- PAGES and BLOCKS -->
+	<string name="_bx_stripe_connect_page_title_sys_result"><![CDATA[Stripe Connect: Результаты]]></string>
+	<string name="_bx_stripe_connect_page_title_result"><![CDATA[Stripe Connect: Результаты]]></string>
+	<string name="_bx_stripe_connect_page_block_title_result"><![CDATA[Stripe Connect: Результаты]]></string>
+	<string name="_bx_stripe_connect_page_block_title_connect"><![CDATA[Stripe Connect]]></string>
+
+	<!-- MENUS -->
+	<string name="_bx_stripe_connect_menu_item_title_accounts"><![CDATA[Аккаунты]]></string>
+
+	<!-- GRIDS -->
+	<string name="_bx_stripe_connect_grid_column_title_author"><![CDATA[Автор]]></string>
+	<string name="_bx_stripe_connect_grid_column_title_user_id"><![CDATA[Stripe Клиент ID]]></string>
+	<string name="_bx_stripe_connect_grid_column_title_public_key"><![CDATA[Публичный ключ]]></string>
+	<string name="_bx_stripe_connect_grid_column_title_access_token"><![CDATA[Секретный ключ]]></string>
+	<string name="_bx_stripe_connect_grid_column_title_added"><![CDATA[Присоединен]]></string>
+	<string name="_bx_stripe_connect_action_title_delete"><![CDATA[Отсоединиться]]></string>
+	
+	<!-- OTHER -->
+	<string name="_bx_stripe_connect_btn_connect"><![CDATA[Присоединиться]]></string>
+	<string name="_bx_stripe_connect_msg_connected"><![CDATA[Вы были успешно присоединены.]]></string>
+	<string name="_bx_stripe_connect_wrn_disconnect"><![CDATA[Вы уверены, что хотите отсоединиться?]]></string>
+	<string name="_bx_stripe_connect_err_perform"><![CDATA[Не удается выполнить действие. Пожалуйста сообщите.]]></string>
+</resources>

modules/boonex/stripe_connect/classes/BxStripeConnectConfig.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/classes/BxStripeConnectDb.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/classes/BxStripeConnectGridAccounts.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/classes/BxStripeConnectModule.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/classes/BxStripeConnectPage.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/classes/BxStripeConnectStudioPage.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules
@@ -9,6 +9,8 @@
  * @{
  */
 
+require_once('BxStripeConnectStudioSettings.php');
+
 define('BX_DOL_STUDIO_MOD_TYPE_ACCOUNTS', 'accounts');
 
 class BxStripeConnectStudioPage extends BxTemplStudioModule
@@ -26,6 +28,15 @@ class BxStripeConnectStudioPage extends BxTemplStudioModule
         $this->aMenuItems[] = array('name' => BX_DOL_STUDIO_MOD_TYPE_ACCOUNTS, 'icon' => 'users', 'title' => '_bx_stripe_connect_menu_item_title_accounts');
     }
 
+    protected function getSettings()
+    {
+        $oPage = new BxStripeConnectStudioSettings($this->sModule);
+
+        return BxDolStudioTemplate::getInstance()->parseHtmlByName('module.html', array(
+            'content' => $oPage->getPageCode(),
+        ));
+    }
+
 	protected function getAccounts()
     {
         $oGrid = BxDolGrid::getObjectInstance($this->_oModule->_oConfig->CNF['OBJECT_GRID_ACCOUNTS'], BxDolStudioTemplate::getInstance());

modules/boonex/stripe_connect/classes/BxStripeConnectStudioSettings.php

@@ -0,0 +1,32 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    StripeConnect Stripe Connect
+ * @ingroup     TridentModules
+ *
+ * @{
+ */
+
+class BxStripeConnectStudioSettings extends BxTemplStudioSettings
+{
+    protected $_sModule;
+	protected $_oModule;
+
+    function __construct($sType = '', $sCategory = '')
+    {
+        parent::__construct($sType, $sCategory);
+        
+        $this->_sModule = 'bx_stripe_connect';
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
+    }
+
+    public function getCustomValueRedirectUrl($aItem, $mixedValue)
+    {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        return BX_DOL_URL_ROOT . $this->_oModule->_oConfig->getBaseUri() . $CNF['URI_REDIRECT'];
+    }
+}
+/** @} */

modules/boonex/stripe_connect/classes/BxStripeConnectTemplate.php

@@ -1,7 +1,7 @@
 <?php defined('BX_DOL') or die('hack attempt');
 /**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
  *
  * @defgroup    StripeConnect Stripe Connect
  * @ingroup     TridentModules

modules/boonex/stripe_connect/install/langs/en.xml

@@ -21,7 +21,7 @@
     <string name="_bx_stripe_connect_option_pmode_direct"><![CDATA[Direct]]></string>
     <string name="_bx_stripe_connect_option_pmode_platform"><![CDATA[Platform]]></string>
     <string name="_bx_stripe_connect_option_fee_recurring"><![CDATA[Subscription fee (percent only)]]></string>
-    
+    <string name="_bx_stripe_connect_option_redirect_url"><![CDATA[Redirect URL]]></string>  
 
 	<!-- PAGES and BLOCKS -->
 	<string name="_bx_stripe_connect_page_title_sys_result"><![CDATA[Stripe Connect Results]]></string>

modules/boonex/stripe_connect/install/sql/enable.sql

@@ -23,7 +23,8 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 ('bx_stripe_connect_pmode_single', 'direct', @iCategId, '_bx_stripe_connect_option_pmode_single', 'select', '', '', 90, 'a:2:{s:6:"module";s:17:"bx_stripe_connect";s:6:"method";s:24:"get_options_pmode_single";}'),
 ('bx_stripe_connect_fee_single', '', @iCategId, '_bx_stripe_connect_option_fee_single', 'digit', '', '', 100, ''),
 ('bx_stripe_connect_pmode_recurring', 'direct', @iCategId, '_bx_stripe_connect_option_pmode_recurring', 'select', '', '', 110, 'a:2:{s:6:"module";s:17:"bx_stripe_connect";s:6:"method";s:27:"get_options_pmode_recurring";}'),
-('bx_stripe_connect_fee_recurring', '', @iCategId, '_bx_stripe_connect_option_fee_recurring', 'digit', '', '', 120, '');
+('bx_stripe_connect_fee_recurring', '', @iCategId, '_bx_stripe_connect_option_fee_recurring', 'digit', '', '', 120, ''),
+('bx_stripe_connect_redirect_url', '', @iCategId, '_bx_stripe_connect_option_redirect_url', 'value', '', '', 130, '');
 
 
 -- PAGE: result

studio/template/scripts/BxBaseStudioSettings.php

@@ -497,7 +497,7 @@ class BxBaseStudioSettings extends BxDolStudioSettings
 
     	$sMethod = 'getCustomValue' . bx_gen_method_name(trim(str_replace($this->sType, '', $aItem['name']), '_'));
     	if(method_exists($this, $sMethod))
-    	    $mixedValue = $this->$sMethod($aItem);
+    	    $mixedValue = $this->$sMethod($aItem, $mixedValue);
 
     	$aAttributes = array();
     	if($this->isReadOnly())