Browse Source

Crédit pain : créditer un utilisateur

Ajout du crédit de l'utilisateur dans la liste des utilisateurs + un bouton
menant au formulaire de crédit.
Création du formulaire de crédit avec l'affichage de l'historique des opérations
concernant l'utilisateur.
prodstable
keun 7 years ago
parent
commit
280cfc22c7
7 changed files with 198 additions and 2 deletions
  1. +37
    -0
      backend/controllers/UserController.php
  2. +69
    -0
      backend/views/user/credit.php
  3. +44
    -0
      backend/views/user/index.php
  4. BIN
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  5. +10
    -0
      backend/web/css/screen.css
  6. +12
    -0
      backend/web/sass/screen.scss
  7. +26
    -2
      common/models/CreditHistorique.php

+ 37
- 0
backend/controllers/UserController.php View File

@@ -15,6 +15,7 @@ use common\helpers\Password ;
use common\models\UserEtablissement ;
use common\models\Etablissement ;
use yii\base\UserException ;
use common\models\CreditHistorique;

/**
* UserController implements the CRUD actions for User model.
@@ -216,6 +217,42 @@ PS : Si vous ne souhaitez plus recevoir ces emails, rendez-vous dans votre compt
}
public function actionCredit($id)
{
$user = User::find()->with('userEtablissement')->where(['id' => $id])->one() ;
$user_appartient_etablissement = UserEtablissement::findOne(['id_user' =>$id, 'id_etablissement' => Yii::$app->user->identity->id_etablissement]) ;
if(($user_appartient_etablissement) || Yii::$app->user->identity->status == USER::STATUS_ADMIN)
{
$credit_historique = new CreditHistorique;
if ($credit_historique->load(Yii::$app->request->post()) && $credit_historique->validate())
{
$credit_historique->id_user = $user->id ;
$credit_historique->id_etablissement = Yii::$app->user->identity->id_etablissement ;
$credit_historique->type = CreditHistorique::TYPE_CREDIT ;
$credit_historique->save() ;
$this->redirect(['user/index']) ;
}
$historique = CreditHistorique::find()
->where([
'id_user' => $user->id,
'id_etablissement' => Yii::$app->user->identity->id_etablissement,
])
->orderBy('date DESC')
->all() ;
return $this->render('credit', [
'user' => $user,
'credit_historique' => $credit_historique,
'historique' => $historique
]) ;
}
else {
throw new UserException("Vous ne pouvez pas créditer un utilisateur qui n'est pas associé à votre boulangerie.");
}
}
/**
* Finds the User model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.

+ 69
- 0
backend/views/user/credit.php View File

@@ -0,0 +1,69 @@
<?php

use yii\helpers\Html;
use yii\widgets\ActiveForm;
use common\models\CreditHistorique;

$this->title = 'Créditer <small>'.Html::encode($user->nom.' '.$user->prenom).'</small>';
$this->params['breadcrumbs'][] = ['label' => 'Utilisateurs', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => Html::encode($user->nom.' '.$user->prenom)];
$this->params['breadcrumbs'][] = 'Créditer';

?>

<div class="user-credit">

<div class="col-md-6">
<h1><?= $this->title ?></h1>
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($credit_historique, 'montant')->textInput() ?>
<?= $form->field($credit_historique, 'moyen_paiement')->dropDownList([
CreditHistorique::MOYEN_ESPECES => 'Espèces',
CreditHistorique::MOYEN_CB => 'Carte bancaire',
CreditHistorique::MOYEN_CHEQUE => 'Chèque',
]) ?>
<div class="form-group">
<?= Html::submitButton( 'Créditer', ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
<div class="col-md-6">
<h2>Historique</h2>
<table class="table table-bordered">
<thead>
<tr>
<th>Date</th>
<th>Type</th>
<th>Montant</th>
<th>Paiement</th>
</tr>
</thead>
<tbody>
<?php if(count($historique)): ?>
<?php foreach($historique as $ch): ?>
<tr>
<td><?= date('d/m/Y à H:i:s',strtotime($ch->date)) ?></td>
<td>
<?php if($ch->type == CreditHistorique::TYPE_CREDIT_INITIAL): ?>Crédit initial<?php endif; ?>
<?php if($ch->type == CreditHistorique::TYPE_CREDIT): ?>Crédit<?php endif; ?>
<?php if($ch->type == CreditHistorique::TYPE_PAIEMENT_COMMANDE): ?>Paiement commande<?php endif; ?>
</td>
<td>
<?= $ch->montant ; ?> €
</td>
<td>
<?php if($ch->moyen_paiement == CreditHistorique::MOYEN_ESPECES): ?>Espèces<?php endif; ?>
<?php if($ch->moyen_paiement == CreditHistorique::MOYEN_CB): ?>Carte bancaire<?php endif; ?>
<?php if($ch->moyen_paiement == CreditHistorique::MOYEN_CHEQUE): ?>Chèque<?php endif; ?>
</td>
</tr>
<?php endforeach; ?>
<?php else: ?>
<tr><td colspan="4">Aucun résultat</td></tr>
<?php endif; ?>
</tbody>
</table>
</div>
</div>

+ 44
- 0
backend/views/user/index.php View File

@@ -25,6 +25,50 @@ $this->params['breadcrumbs'][] = $this->title;
'prenom',
'telephone',
'email',
[
'attribute' => 'credit',
'format' => 'raw',
'value' => function($model) {
$html = $model['credit'].' € ' ;
$html = '<div class="input-group">
<input type="text" class="form-control input-credit" readonly="readonly" value="'.$model['credit'].' €" placeholder="">
<span class="input-group-btn">
'.Html::a(
'<span class="glyphicon glyphicon-euro"></span> Crédit',
Yii::$app->urlManager->createUrl(['user/credit','id' => $model['id']]),
[
'title' => 'Crédit',
'class' => 'btn btn-default'
]
).'
</span>
</div>' ;
/*$html = '<div class="btn-group" role="group" aria-label="">
<input type="text" readonly="readonly" class="btn btn-default">'.$model['credit'].' € </button>
'.Html::a(
'<span class="glyphicon glyphicon-euro"></span> Créditer',
Yii::$app->urlManager->createUrl(['user/credit','id' => $model['id']]),
[
'title' => 'Créditer',
'class' => 'btn btn-default'
]
).'
</div>' ;*/
/*$html .= Html::a(
'<span class="glyphicon glyphicon-euro"></span> Créditer',
Yii::$app->urlManager->createUrl(['user/credit','id' => $model['id']]),
[
'title' => 'Créditer',
'class' => 'btn btn-default btn-xs'
]
) ;*/
return $html ;
}
],
[
'class' => 'yii\grid\ActionColumn',
'template' => '{update}',

BIN
backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc View File


+ 10
- 0
backend/web/css/screen.css View File

@@ -935,3 +935,13 @@ a:hover, a:focus, a:active {
font-weight: normal;
display: block;
}

/* utilisateurs */
/* line 946, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 949, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}

+ 12
- 0
backend/web/sass/screen.scss View File

@@ -939,3 +939,15 @@ a {
}
}
}

/* utilisateurs */

.user-index {
.input-group {
width: 180px ;
.input-credit {
text-align: center ;
}
}
}

+ 26
- 2
common/models/CreditHistorique.php View File

@@ -4,6 +4,7 @@ namespace common\models;

use Yii;
use yii\db\ActiveRecord ;
use common\models\User ;

/**
* This is the model class for table "credit_historique".
@@ -19,7 +20,7 @@ use yii\db\ActiveRecord ;
*/
class CreditHistorique extends ActiveRecord
{
const TYPE_CREDIT_INITIAL = 'credit' ;
const TYPE_CREDIT_INITIAL = 'credit-initial' ;
const TYPE_CREDIT = 'credit' ;
const TYPE_PAIEMENT_COMMANDE = 'paiement-commande' ;
@@ -41,7 +42,7 @@ class CreditHistorique extends ActiveRecord
public function rules()
{
return [
[['id_user', 'type'], 'required'],
[['montant', 'moyen_paiement'], 'required'],
[['id_user', 'id_commande', 'id_etablissement'], 'integer'],
[['date'], 'safe'],
[['montant'], 'number'],
@@ -65,4 +66,27 @@ class CreditHistorique extends ActiveRecord
'moyen_paiement' => 'Moyen de paiement',
];
}
public function save($runValidation = true, $attributeNames = NULL) {
parent::save($runValidation, $attributeNames) ;
$user_etablissement = UserEtablissement::findOne([
'id_user' => $this->id_user,
'id_etablissement' => $this->id_etablissement
]) ;
if($user_etablissement)
{
if($this->type == self::TYPE_CREDIT ||
$this->type == self::TYPE_CREDIT_INITIAL)
{
$user_etablissement->credit += $this->montant ;
$user_etablissement->save() ;
}
elseif($this->type == self::TYPE_PAIEMENT_COMMANDE)
{
$user_etablissement->credit -= $this->montant ;
$user_etablissement->save() ;
}
}
}
}

Loading…
Cancel
Save