Merge tag 'hotfix_1250_3' into develop

hotfix_1250_3

backend/controllers/UserController.php

@@ -411,6 +411,7 @@ class UserController extends BackendController
                     'id_user' => $user->id,
                     'id_producer' => $this->getProducerCurrent()->id,
                 ])
+                ->andWhere("payment.type = 'initial-credit' OR payment.type = 'credit' OR payment.type = 'debit' OR (payment.type = 'payment' AND payment.mean_payment = 'credit') OR (payment.type = 'refund' AND payment.mean_payment = 'credit')")
                 ->orderBy('date DESC')
                 ->all();
 

common/logic/Payment/Model/CreditHistorySearch.php

@@ -66,8 +66,8 @@ class CreditHistorySearch extends Payment
             ->innerJoinWith($optionsSearch['join_with'], true)
             ->where([
                 'payment.id_producer' => GlobalParam::getCurrentProducerId(),
-                //'payment.mean_payment' => MeanPayment::CREDIT
             ])
+            ->andWhere("payment.type = 'initial-credit' OR payment.type = 'credit' OR payment.type = 'debit' OR (payment.type = 'payment' AND payment.mean_payment = 'credit') OR (payment.type = 'refund' AND payment.mean_payment = 'credit')")
             ->orderBy('id DESC')
             ;