Guillaume Bourgeois
1 year ago
2 changed files with 2 additions and 1 deletions
+ 1
- 0
backend/controllers/UserController.php
View File
| 'id_user' => $user->id, | 'id_user' => $user->id, | ||||
| 'id_producer' => $this->getProducerCurrent()->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') | ->orderBy('date DESC') | ||||
| ->all(); | ->all(); | ||||
+ 1
- 1
common/logic/Payment/Model/CreditHistorySearch.php
View File
| ->innerJoinWith($optionsSearch['join_with'], true) | ->innerJoinWith($optionsSearch['join_with'], true) | ||||
| ->where([ | ->where([ | ||||
| 'payment.id_producer' => GlobalParam::getCurrentProducerId(), | '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') | ->orderBy('id DESC') | ||||
| ; | ; | ||||
Loading…