From c6d004fc3760926fbf53ac2b978140731190974c Mon Sep 17 00:00:00 2001 From: AntonLV Date: Fri, 13 Sep 2024 15:40:11 +0300 Subject: [PATCH] Ticket #4804 - Credits: Send/Grant forms shouldn't show info from Withdrawal one. --- .../credits/classes/BxCreditsConfig.php | 1 - .../credits/classes/BxCreditsFormCredit.php | 19 +++++++++++++++---- modules/boonex/credits/install/langs/en.xml | 3 +-- .../boonex/credits/install/sql/install.sql | 2 +- .../russian/data/langs/bx_credits/ru.xml | 3 +-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/modules/boonex/credits/classes/BxCreditsConfig.php b/modules/boonex/credits/classes/BxCreditsConfig.php index b7dc23539c..c5a10bb5f9 100644 --- a/modules/boonex/credits/classes/BxCreditsConfig.php +++ b/modules/boonex/credits/classes/BxCreditsConfig.php @@ -85,7 +85,6 @@ function __construct($aModule) 'OBJECT_FORM_CREDIT_DISPLAY_GRANT' => 'bx_credits_credit_grant', 'OBJECT_FORM_CREDIT_DISPLAY_SEND' => 'bx_credits_credit_send', 'OBJECT_FORM_CREDIT_DISPLAY_WITHDRAW_REQUEST' => 'bx_credits_credit_withdraw_request', - 'OBJECT_FORM_CREDIT_DISPLAY_WITHDRAW_CONFIRM' => 'bx_credits_credit_withdraw_confirm', 'OBJECT_FORM_BUNDLE' => 'bx_credits_bundle', 'OBJECT_FORM_BUNDLE_DISPLAY_ADD' => 'bx_credits_bundle_add', 'OBJECT_FORM_BUNDLE_DISPLAY_EDIT' => 'bx_credits_bundle_edit', diff --git a/modules/boonex/credits/classes/BxCreditsFormCredit.php b/modules/boonex/credits/classes/BxCreditsFormCredit.php index 7727780dc5..0cfaddf42c 100644 --- a/modules/boonex/credits/classes/BxCreditsFormCredit.php +++ b/modules/boonex/credits/classes/BxCreditsFormCredit.php @@ -34,6 +34,21 @@ public function __construct($aInfo, $oTemplate = false) if(($iUserId = bx_get('user_id')) !== false) $this->_iUserId = (int)$iUserId; + if(isset($this->aInputs[$CNF['FIELD_C_AMOUNT']])) { + $sInfo = '_bx_credits_form_credit_input_amount_inf_'; + switch($this->aParams['display']) { + case $CNF['OBJECT_FORM_CREDIT_DISPLAY_WITHDRAW_REQUEST']: + $sInfo .= 'wr'; + break; + + default: + $sInfo = ''; + } + + if($sInfo) + $this->aInputs[$CNF['FIELD_C_AMOUNT']]['info'] = _t($sInfo); + } + if(isset($this->aInputs[$CNF['FIELD_C_MESSAGE']])) { $sInfo = '_bx_credits_form_credit_input_message_inf_'; switch($this->aParams['display']) { @@ -48,10 +63,6 @@ public function __construct($aInfo, $oTemplate = false) case $CNF['OBJECT_FORM_CREDIT_DISPLAY_WITHDRAW_REQUEST']: $sInfo .= 'wr'; break; - - case $CNF['OBJECT_FORM_CREDIT_DISPLAY_WITHDRAW_CONFIRM']: - $sInfo .= 'wc'; - break; } $this->aInputs[$CNF['FIELD_C_MESSAGE']]['info'] = _t($sInfo); diff --git a/modules/boonex/credits/install/langs/en.xml b/modules/boonex/credits/install/langs/en.xml index de93a133b9..5fdca1a86f 100644 --- a/modules/boonex/credits/install/langs/en.xml +++ b/modules/boonex/credits/install/langs/en.xml @@ -57,14 +57,13 @@ - + - diff --git a/modules/boonex/credits/install/sql/install.sql b/modules/boonex/credits/install/sql/install.sql index d806d167ec..b81e449fe0 100644 --- a/modules/boonex/credits/install/sql/install.sql +++ b/modules/boonex/credits/install/sql/install.sql @@ -104,7 +104,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch ('bx_credits_credit', 'bx_credits', 'cleared', '', '', 0, 'text', '_bx_credits_form_credit_input_sys_cleared', '_bx_credits_form_credit_input_cleared', '_bx_credits_form_credit_input_cleared_inf', 0, 0, 0, 'a:1:{s:8:"disabled";s:8:"disabled";}', '', '', '', '', '', 'Xss', '', 1, 0), ('bx_credits_credit', 'bx_credits', 'rate', '', '', 0, 'text', '_bx_credits_form_credit_input_sys_rate', '_bx_credits_form_credit_input_rate', '', 0, 0, 0, 'a:1:{s:8:"disabled";s:8:"disabled";}', '', '', '', '', '', 'Xss', '', 1, 0), ('bx_credits_credit', 'bx_credits', 'result', '', '', 0, 'text', '_bx_credits_form_credit_input_sys_result', '_bx_credits_form_credit_input_result', '', 0, 0, 0, 'a:1:{s:8:"disabled";s:8:"disabled";}', '', '', '', '', '', 'Xss', '', 1, 0), -('bx_credits_credit', 'bx_credits', 'amount', '', '', 0, 'text', '_bx_credits_form_credit_input_sys_amount', '_bx_credits_form_credit_input_amount', '_bx_credits_form_credit_input_amount_inf', 1, 0, 0, '', '', '', 'Avail', '', '_bx_credits_form_credit_input_amount_err', 'Xss', '', 1, 0), +('bx_credits_credit', 'bx_credits', 'amount', '', '', 0, 'text', '_bx_credits_form_credit_input_sys_amount', '_bx_credits_form_credit_input_amount', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_credits_form_credit_input_amount_err', 'Xss', '', 1, 0), ('bx_credits_credit', 'bx_credits', 'message', '', '', 0, 'textarea', '_bx_credits_form_credit_input_sys_message', '_bx_credits_form_credit_input_message', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0), ('bx_credits_credit', 'bx_credits', 'profile', '', '', 0, 'custom', '_bx_credits_form_credit_input_sys_profile', '_bx_credits_form_credit_input_profile', '', 1, 0, 0, '', '', '', '', '', '', 'Xss', '', 1, 0), ('bx_credits_credit', 'bx_credits', 'controls', '', 'do_submit,do_cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0), diff --git a/modules/boonex/russian/data/langs/bx_credits/ru.xml b/modules/boonex/russian/data/langs/bx_credits/ru.xml index cb5f1439e1..8961810306 100644 --- a/modules/boonex/russian/data/langs/bx_credits/ru.xml +++ b/modules/boonex/russian/data/langs/bx_credits/ru.xml @@ -57,14 +57,13 @@ - + -