Ticket #3389

modules/boonex/credits/classes/BxCreditsConfig.php

@@ -44,14 +44,16 @@ class BxCreditsConfig extends BxBaseModGeneralConfig
             'FIELD_PRICE' => 'price',
             'FIELD_STATUS' => 'active',
 
+            'FIELD_C_MESSAGE' => 'message',
+
             // page URIs
             'URI_HOME' => 'credits-home',
             'URL_HOME' => 'page.php?i=credits-home',
             'URL_CHECKOUT' => 'page.php?i=credits-checkout',
-            'URL_MANAGE_COMMON' => 'page.php?i=credits-manage',
-            'URL_MANAGE_ADMINISTRATION' => 'page.php?i=credits-administration',
             'URL_ORDERS_COMMON' => 'page.php?i=credits-orders',
             'URL_ORDERS_ADMINISTRATION' => 'page.php?i=credits-orders-administration',
+            'URL_HISTORY_COMMON' => 'page.php?i=credits-history-common',
+            'URL_HISTORY_ADMINISTRATION' => 'page.php?i=credits-history-administration',
 
             // some params
             'PARAM_WITHDRAW' => 'bx_credits_enable_withdraw',

modules/boonex/credits/classes/BxCreditsFormWithdraw.php

@@ -26,7 +26,28 @@ class BxCreditsFormWithdraw extends BxTemplFormView
 
         parent::__construct($aInfo, $oTemplate);
 
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
         $this->_fRate = $this->_oModule->_oConfig->getConversionRateWithdraw();
+
+        if(isset($this->aInputs[$CNF['FIELD_C_MESSAGE']])) {
+            $sInfo = '_bx_credits_form_credit_input_message_inf_';
+            switch($this->aParams['display']) {
+                case $CNF['OBJECT_FORM_CREDIT_DISPLAY_GRANT']:
+                    $sInfo .= 'g';
+                    break;
+
+                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);
+        }
     }
 
     protected function genCustomRowRate(&$aInput)

modules/boonex/credits/classes/BxCreditsModule.php

@@ -821,13 +821,14 @@ class BxCreditsModule extends BxBaseModGeneralModule
             'amount' => $fAmount,
             'rate' => $fRate,
             'message' => $sMessage,
+            'confirm_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_HISTORY_ADMINISTRATION'])
         );
         $aTemplate = $oEmailTemplates->parseTemplate($CNF['ETEMPLATE_WITHDRAW_REQUESTED'], $aTemplateVars);
         if(!$aTemplate)
             return $aResult;
 
         $sEmail = $this->_oConfig->getWithdrawEmail();
-        if(!sendMail($sEmail, $aTemplate['Subject'], $aTemplate['Body'], 0, array(), BX_EMAIL_SYSTEM, 'html', false, array(), false))
+        if(!sendMail($sEmail, $aTemplate['Subject'], $aTemplate['Body'], 0, array(), BX_EMAIL_SYSTEM, 'html', false, array(), true))
             return $aResult;
 
         bx_alert($this->getName(), 'withdraw_requested', 0, $iProfileId, array(

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

@@ -51,6 +51,9 @@
     <string name="_bx_credits_form_credit_input_amount"><![CDATA[Amount]]></string>
     <string name="_bx_credits_form_credit_input_sys_message"><![CDATA[Message]]></string>
     <string name="_bx_credits_form_credit_input_message"><![CDATA[Message]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_g"><![CDATA[]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_wr"><![CDATA[Payment instructions and other notes]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_wc"><![CDATA[Payment confirmation and other notes]]></string>
     <string name="_bx_credits_form_credit_input_profile"><![CDATA[Profile]]></string>
     <string name="_bx_credits_form_credit_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_credits_form_credit_input_do_submit"><![CDATA[Submit]]></string>
@@ -184,8 +187,9 @@
     <string name="_bx_credits_et_txt_subject_withdraw_requested"><![CDATA[Withdraw request.]]></string>
     <string name="_bx_credits_et_txt_body_withdraw_requested"><![CDATA[{email_header}
 <p><a href="{profile_link}">{profile_name}</a> requested to withdraw <b>{amount}</b> credits from his/her balance.</p>
-<p>{message}</p>
 <p>Current withdraw conversion rate is <b>{rate}</b></p>
+<p>Withdrawal can be confirmed <a href="{confirm_url}">here</a>.</p>
+<p>Notes from <b>{profile_name}</b>:<br />{message}</p>
 {email_footer}]]></string>
     <string name="_bx_credits_et_txt_name_withdraw_sent"><![CDATA[Withdraw was sent.]]></string>
     <string name="_bx_credits_et_txt_subject_withdraw_sent"><![CDATA[Withdraw was sent.]]></string>

modules/boonex/credits/template/css/withdraw.css

@@ -1,4 +1,4 @@
 /*--- Profile Auto Complete ---*/
 .ui-autocomplete.ui-front {
-    z-index: 1001;
+    z-index: 10001;
 }

modules/boonex/payment/template/css/orders.css

@@ -6,7 +6,7 @@ iframe.hidden {
 
 /*--- 'Manual Order' and 'More' windows ---*/
 .ui-autocomplete.ui-front {
-	z-index: 1001;
+	z-index: 10001;
 }
 div.bx-payment-pa-items {
 	max-height: 300px;

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

@@ -51,6 +51,9 @@
     <string name="_bx_credits_form_credit_input_amount"><![CDATA[Количество]]></string>
     <string name="_bx_credits_form_credit_input_sys_message"><![CDATA[Сообщение]]></string>
     <string name="_bx_credits_form_credit_input_message"><![CDATA[Сообщение]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_g"><![CDATA[]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_wr"><![CDATA[Платежные инструкции и другие примечания]]></string>
+    <string name="_bx_credits_form_credit_input_message_inf_wc"><![CDATA[Подтверждение оплаты и другие примечания]]></string>
     <string name="_bx_credits_form_credit_input_profile"><![CDATA[Профиль]]></string>
     <string name="_bx_credits_form_credit_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_credits_form_credit_input_do_submit"><![CDATA[Выполнить]]></string>
@@ -184,8 +187,9 @@
     <string name="_bx_credits_et_txt_subject_withdraw_requested"><![CDATA[Запрос на снятие.]]></string>
     <string name="_bx_credits_et_txt_body_withdraw_requested"><![CDATA[{email_header}
 <p><a href="{profile_link}">{profile_name}</a> запросил снятие <b>{amount}</b> кредитов с его/её баланса.</p>
-<p>{message}</p>
 <p>Текущий коэффициент вывода: <b>{rate}</b></p>
+<p>Подтвердить вывод можно перейдя по <a href="{confirm_url}">ссылке</a>.</p>
+<p>Примечания от <b>{profile_name}</b>:<br />{message}</p>
 {email_footer}]]></string>
     <string name="_bx_credits_et_txt_name_withdraw_sent"><![CDATA[Снятие было выполнено.]]></string>
     <string name="_bx_credits_et_txt_subject_withdraw_sent"><![CDATA[Снятие было выполнено.]]></string>

template/css/privacy.css

@@ -1,6 +1,6 @@
 /*--- Users Select Popup ---*/
 .ui-autocomplete.ui-front {
-    z-index: 1001;
+    z-index: 10001;
 }
 
 .sys-privacy-us-list {