Merge branch 'master' of github.com:unaio/una

modules/base/payment/classes/BxBaseModPaymentConfig.php

@@ -23,15 +23,13 @@ class BxBaseModPaymentConfig extends BxBaseModGeneralConfig
     protected $_sAnimationEffect;
     protected $_iAnimationSpeed;
 
-    protected static $_aCurrencies = array(
-    	'AUD' => 'A$', 'CAD' => 'C$', 'EUR' => '€', 'GBP' => '£', 'USD' => '$', 'YEN' => '¥'
-    );
-
     function __construct($aModule)
     {
         parent::__construct($aModule);
 
         $this->CNF = array_merge($this->CNF, array(
+        	'OBJECT_FORM_PRELISTS_CURRENCIES' => '',
+
         	'KEY_SESSION_PENDING' => $this->_sName . '_pending_id',
         	'KEY_REQUEST_PENDING' => $this->_sName . '_pending_id',
         	
@@ -79,8 +77,9 @@ class BxBaseModPaymentConfig extends BxBaseModGeneralConfig
     	$sPrefix = $this->getPrefix('options');
         $this->_iSiteId = (int)$this->_oDb->getParam($sPrefix . 'site_admin');
 
+        $aCurrencies = BxDolForm::getDataItems($this->CNF['OBJECT_FORM_PRELISTS_CURRENCIES'], false, BX_DATA_VALUES_ADDITIONAL);
         $this->_sCurrencyCode = $this->_oDb->getParam($sPrefix . 'default_currency_code');
-        $this->_sCurrencySign = self::$_aCurrencies[$this->_sCurrencyCode];
+        $this->_sCurrencySign = $aCurrencies[$this->_sCurrencyCode];
     }
 
     public function getSiteId()

modules/boonex/acl/classes/BxAclGridView.php

@@ -36,6 +36,7 @@ class BxAclGridView extends BxAclGridLevels
     		list($sJsCode, $sJsMethod) = $aJs;
 
     		$a['attr'] = array(
+    		    'title' => bx_html_attribute(_t('_bx_acl_grid_action_buy_title')),
     			'onclick' => $sJsMethod
     		);
     	}
@@ -50,6 +51,7 @@ class BxAclGridView extends BxAclGridLevels
 			list($sJsCode, $sJsMethod) = $aJs;
 
     		$a['attr'] = array(
+    			'title' => bx_html_attribute(_t('_bx_acl_grid_action_subscribe_title')),
     			'onclick' => $sJsMethod
     		);
 		}

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

@@ -53,8 +53,10 @@
 	<string name="_bx_acl_grid_action_add"><![CDATA[Add]]></string>
 	<string name="_bx_acl_grid_action_edit"><![CDATA[Edit]]></string>
 	<string name="_bx_acl_grid_action_delete"><![CDATA[Delete]]></string>
-	<string name="_bx_acl_grid_action_buy"><![CDATA[One-time payment]]></string>
-	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Subscribe on recurring payments]]></string>
+	<string name="_bx_acl_grid_action_buy"><![CDATA[Buy]]></string>
+	<string name="_bx_acl_grid_action_buy_title"><![CDATA[One-time payment]]></string>
+	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Rent]]></string>
+	<string name="_bx_acl_grid_action_subscribe_title"><![CDATA[Subscribe on recurring payments]]></string>
 
 	<string name="_bx_acl_popup_title_price_add"><![CDATA[Add Pricing Plan]]></string>
 	<string name="_bx_acl_popup_title_price_edit"><![CDATA[Edit Pricing Plan]]></string>

modules/boonex/acl/install/sql/install.sql

@@ -83,11 +83,11 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_acl_administration', 'trial', '_bx_acl_grid_column_trial', '15%', 0, 16, '', 6),
 ('bx_acl_administration', 'actions', '', '20%', 0, '', '', 7),
 
-('bx_acl_view', 'level_name', '_bx_acl_grid_column_level_name', '35%', 1, 36, '', 1),
+('bx_acl_view', 'level_name', '_bx_acl_grid_column_level_name', '25%', 1, 32, '', 1),
 ('bx_acl_view', 'price', '_bx_acl_grid_column_price', '15%', 0, 16, '', 2),
 ('bx_acl_view', 'period', '_bx_acl_grid_column_period', '15%', 0, 16, '', 3),
 ('bx_acl_view', 'trial', '_bx_acl_grid_column_trial', '15%', 0, 16, '', 4),
-('bx_acl_view', 'actions', '', '20%', 0, '', '', 5);
+('bx_acl_view', 'actions', '', '30%', 0, '', '', 5);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_acl_administration', 'independent', 'add', '_bx_acl_grid_action_add', '', 0, 0, 1),
@@ -95,8 +95,8 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_acl_administration', 'single', 'delete', '_bx_acl_grid_action_delete', 'remove', 1, 1, 2),
 ('bx_acl_administration', 'bulk', 'delete', '_bx_acl_grid_action_delete', '', 0, 1, 1),
 
-('bx_acl_view', 'single', 'buy', '_bx_acl_grid_action_buy', 'cart-plus', 1, 0, 1),
-('bx_acl_view', 'single', 'subscribe', '_bx_acl_grid_action_subscribe', 'thumb-tack', 1, 0, 2);
+('bx_acl_view', 'single', 'buy', '_bx_acl_grid_action_buy', 'cart-plus', 0, 0, 1),
+('bx_acl_view', 'single', 'subscribe', '_bx_acl_grid_action_subscribe', 'money', 0, 0, 2);
 
 
 -- STUDIO PAGE & WIDGET

modules/boonex/payment/classes/BxPaymentConfig.php

@@ -34,7 +34,9 @@ class BxPaymentConfig extends BxBaseModPaymentConfig
         	'KEY_ARRAY_PRICE_SINGLE' => 'price_single',
         	'KEY_ARRAY_PRICE_RECURRING' => 'price_recurring',
         	'KEY_ARRAY_TRIAL_RECURRING' => 'trial_recurring',
-        
+
+            'OBJECT_FORM_PRELISTS_CURRENCIES' => 'bx_payment_currencies',
+
 	        // some language keys
         	'T' => array(
         		'MSG_ITEM_ADDED' => '_bx_payment_msg_item_added',

modules/boonex/payment/classes/BxPaymentModule.php

@@ -172,6 +172,22 @@ class BxPaymentModule extends BxBaseModPaymentModule
     	return !empty($aProviders) && !empty($aProviders[$sVendorProvider]) && is_array(($aProviders[$sVendorProvider])) ? $aProviders[$sVendorProvider] : false;
     }
 
+    public function serviceGetOptionsDefaultCurrencyCode()
+    {
+        $CNF = &$this->_oConfig->CNF;
+
+        $aCurrencies = BxDolForm::getDataItems($CNF['OBJECT_FORM_PRELISTS_CURRENCIES']);
+
+        $aResult = array();
+        foreach($aCurrencies as $sKey => $sValue)
+            $aResult[] = array(
+                'key' => $sKey,
+                'value' => $sValue
+            );
+
+        return $aResult;
+    }
+
     public function serviceGetOptionsSiteAdmin()
     {
         $aResult = array(

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

@@ -160,6 +160,9 @@
 	<string name="_bx_payment_form_processed_input_cancel"><![CDATA[Cancel]]></string>
 	<string name="_bx_payment_form_processed_input_cancel_sys"><![CDATA[Cancel]]></string>
 
+    <!-- Predefined Values -->
+    <string name="_bx_payment_pre_lists_currencies"><![CDATA[Currencies]]></string>
+
 	<!-- ACL -->
 	<string name="_bx_payment_acl_action_purchase"><![CDATA[Purchase]]></string>
 	<string name="_bx_payment_acl_action_sell"><![CDATA[Sell]]></string>

modules/boonex/payment/install/sql/enable.sql

@@ -12,7 +12,7 @@ VALUES (@iTypeId, @sName, '_bx_payment', 1);
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_params`, `check_error`, `extra`, `order`) VALUES
-('bx_payment_default_currency_code', 'USD', @iCategoryId, '_bx_payment_option_default_currency_code', 'select', 'Avail', '', '_bx_payment_option_err_default_currency_code', 'AUD,CAD,EUR,GBP,USD,YEN', 0),
+('bx_payment_default_currency_code', 'USD', @iCategoryId, '_bx_payment_option_default_currency_code', 'select', 'Avail', '', '_bx_payment_option_err_default_currency_code', 'a:2:{s:6:"module";s:10:"bx_payment";s:6:"method";s:33:"get_options_default_currency_code";}', 0),
 ('bx_payment_site_admin', '', @iCategoryId, '_bx_payment_option_site_admin', 'select', '', '', '', 'a:2:{s:6:"module";s:10:"bx_payment";s:6:"method";s:22:"get_options_site_admin";}', 1);
 
 

modules/boonex/payment/install/sql/install.sql

@@ -386,6 +386,18 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_payment_form_strp_card_add', 'do_cancel', 2147483647, 1, 6);
 
 
+-- PRE-VALUES
+INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUES
+('bx_payment_currencies', '_bx_payment_pre_lists_currencies', 'bx_payment', '0');
+
+INSERT INTO `sys_form_pre_values`(`Key`, `Value`, `Order`, `LKey`, `LKey2`) VALUES
+('bx_payment_currencies', 'AUD', 1, 'AUD', 'A$'),
+('bx_payment_currencies', 'CAD', 2, 'CAD', 'C$'),
+('bx_payment_currencies', 'EUR', 3, 'EUR', '€'),
+('bx_payment_currencies', 'GBP', 4, 'GBP', '£'),
+('bx_payment_currencies', 'USD', 5, 'USD', '$'),
+('bx_payment_currencies', 'YEN', 6, 'YEN', '¥');
+
 -- STUDIO PAGE & WIDGET
 INSERT INTO `sys_std_pages`(`index`, `name`, `header`, `caption`, `icon`) VALUES
 (3, @sName, '_bx_payment', '_bx_payment', 'bx_payment@modules/boonex/payment/|std-icon.svg');

modules/boonex/payment/install/sql/uninstall.sql

@@ -19,12 +19,17 @@ DELETE FROM `sys_grid_actions` WHERE `object` LIKE 'bx_payment_grid%';
 
 
 -- FORMS
-DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN  (SELECT `display_name` FROM `sys_form_displays` WHERE `module`=@sName);
+DELETE FROM `sys_form_display_inputs` WHERE `display_name` IN (SELECT `display_name` FROM `sys_form_displays` WHERE `module`=@sName);
 DELETE FROM `sys_form_inputs` WHERE `module`=@sName;
 DELETE FROM `sys_form_displays` WHERE `module`=@sName;
 DELETE FROM `sys_objects_form` WHERE `module`=@sName;
 
 
+-- PRE-VALUES
+DELETE FROM `sys_form_pre_lists` WHERE `module` = 'bx_payment';
+DELETE FROM `sys_form_pre_values` WHERE `Key` IN ('bx_payment_currencies');
+
+
 -- STUDIO PAGE & WIDGET
 DELETE FROM `tp`, `tw`, `tpw`
 USING `sys_std_pages` AS `tp`, `sys_std_widgets` AS `tw`, `sys_std_pages_widgets` AS `tpw`

modules/boonex/russian/data/langs/bx_acl/ru.xml

@@ -48,13 +48,15 @@
 	<string name="_bx_acl_grid_column_name"><![CDATA[Имя]]></string>
 	<string name="_bx_acl_grid_column_period"><![CDATA[Период]]></string>
 	<string name="_bx_acl_grid_column_price"><![CDATA[Цена]]></string>
-	<string name="_bx_acl_grid_column_trial"><![CDATA[Пробный период]]></string>
+	<string name="_bx_acl_grid_column_trial"><![CDATA[Проба]]></string>
 
 	<string name="_bx_acl_grid_action_add"><![CDATA[Добавить]]></string>
 	<string name="_bx_acl_grid_action_edit"><![CDATA[Редактировать]]></string>
 	<string name="_bx_acl_grid_action_delete"><![CDATA[Удалить]]></string>
-	<string name="_bx_acl_grid_action_buy"><![CDATA[Единовременный платеж]]></string>
-	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Подписка на периодические платежи]]></string>
+	<string name="_bx_acl_grid_action_buy"><![CDATA[Купить]]></string>
+	<string name="_bx_acl_grid_action_buy_title"><![CDATA[Единовременный платеж]]></string>
+	<string name="_bx_acl_grid_action_subscribe"><![CDATA[Арендовать]]></string>
+	<string name="_bx_acl_grid_action_subscribe_title"><![CDATA[Подписка на периодические платежи]]></string>
 
 	<string name="_bx_acl_popup_title_price_add"><![CDATA[Добавить ценовой план]]></string>
 	<string name="_bx_acl_popup_title_price_edit"><![CDATA[Редактировать ценовой план]]></string>

modules/boonex/russian/data/langs/bx_market/ru.xml

@@ -188,8 +188,8 @@
     <string name="_bx_market_menu_item_title_edit_entry"><![CDATA[Редактировать продукт]]></string>
     <string name="_bx_market_menu_item_title_system_delete_entry"><![CDATA[Удалить продукт]]></string>
     <string name="_bx_market_menu_item_title_delete_entry"><![CDATA[Удалить продукт]]></string>
-	<string name="_bx_market_menu_item_title_system_add_to_cart"><![CDATA[Приобрести]]></string>
-    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[Приобрести за {0}{1}]]></string>
+	<string name="_bx_market_menu_item_title_system_add_to_cart"><![CDATA[Купить]]></string>
+    <string name="_bx_market_menu_item_title_add_to_cart"><![CDATA[Купить за {0}{1}]]></string>
     <string name="_bx_market_menu_item_title_system_subscribe"><![CDATA[Арендовать]]></string>
     <string name="_bx_market_menu_item_title_subscribe"><![CDATA[Арендовать за {0}{1}/{2}]]></string>
     <string name="_bx_market_menu_item_title_system_download"><![CDATA[Скачать]]></string>
@@ -331,7 +331,7 @@
     <string name="_bx_market_txt_author_added_product"><![CDATA[{0} {1}]]></string>
     <string name="_bx_market_txt_joined"><![CDATA[Зарегистрирован:]]></string>
     <string name="_bx_market_txt_last_active"><![CDATA[Последняя активность:]]></string>
-    <string name="_bx_market_txt_price_single"><![CDATA[Приобрести за {0}{1}]]></string>
+    <string name="_bx_market_txt_price_single"><![CDATA[Купить за {0}{1}]]></string>
     <string name="_bx_market_txt_price_recurring"><![CDATA[Арендовать за {0}{1}/{2}]]></string>
     <string name="_bx_market_txt_per_day"><![CDATA[день]]></string>
     <string name="_bx_market_txt_per_day_short"><![CDATA[день]]></string>

modules/boonex/russian/data/langs/bx_payment/ru.xml

@@ -160,6 +160,9 @@
 	<string name="_bx_payment_form_processed_input_cancel"><![CDATA[Отменить]]></string>
 	<string name="_bx_payment_form_processed_input_cancel_sys"><![CDATA[Отменить]]></string>
 
+    <!-- Predefined Values -->
+    <string name="_bx_payment_pre_lists_currencies"><![CDATA[Валюты]]></string>
+
 	<!-- ACL -->
 	<string name="_bx_payment_acl_action_purchase"><![CDATA[Покупать]]></string>
 	<string name="_bx_payment_acl_action_sell"><![CDATA[Продавать]]></string>

template/scripts/BxBaseGrid.php

@@ -553,7 +553,7 @@ class BxBaseGrid extends BxDolGrid
             elseif ($sIconUrl = $this->_oTemplate->getIconUrl($a['icon']))
                 $sImage = '<i style="background-image:url(' . $sIconUrl . ');"></i>';
         }
-        return '<button ' . $sAttr . '>' . $sIcon . $sImage . ($a['icon_only'] ? '' : $a['title']) . '</button>';
+        return '<button ' . $sAttr . '>' . $sIcon . $sImage . ($a['icon_only'] ? '' : '<u>' . $a['title'] . '</u>') . '</button>';
     }
 
     protected function _getActionDivider ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())