Add delete contract

This commit is contained in:
Roland Schneider 2016-03-07 22:12:51 +01:00
parent 603508eb70
commit 2184abdf97
4 changed files with 305 additions and 153 deletions

View File

@ -12,166 +12,238 @@ use backend\models\ContractCustomerSearch;
use common\models\Customer; use common\models\Customer;
use yii\db\Query; use yii\db\Query;
use backend\models\ContractRequestSearch; use backend\models\ContractRequestSearch;
use common\models\TicketInstallmentRequest;
use common\models\Ticket;
use common\models\Transfer;
use yii\base\Exception;
use common\components\RoleDefinition;
/** /**
* ContractController implements the CRUD actions for Contract model. * ContractController implements the CRUD actions for Contract model.
* *
* TODO: FIX CONTROLLER * TODO: FIX CONTROLLER
*/ */
class ContractController extends Controller class ContractController extends Controller {
{ public function behaviors() {
public function behaviors() {
return [ return [
'access' => [ 'access' => [
'class' => \yii\filters\AccessControl::className(), 'class' => \yii\filters\AccessControl::className (),
'rules' => [ 'rules' => [
// allow authenticated users // allow authenticated users
[ [
'actions' => [ ], 'actions' => [ ],
'allow' => true, 'allow' => true,
'roles' => ['admin','employee','reception'], 'roles' => [
], 'admin',
// everything else is denied 'employee',
], 'reception'
], ]
]
]
// everything else is denied
]
]; ];
} }
/** /**
* Lists all Contract models. * Lists all Contract models.
* @return mixed *
*/ * @return mixed
public function actionIndex() */
{ public function actionIndex() {
$searchModel = new ContractSearch(); $searchModel = new ContractSearch ();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams); $dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
return $this->render('index', [ return $this->render ( 'index', [
'searchModel' => $searchModel, 'searchModel' => $searchModel,
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider
]); ] );
} }
/** /**
* Lists all Contract models. * Lists all Contract models.
* @return mixed *
*/ * @return mixed
public function actionIndexCustomer($id) */
{ public function actionIndexCustomer($id) {
$model = Customer::findOne($id); $model = Customer::findOne ( $id );
if ( !isset($model)){ if (! isset ( $model )) {
throw new NotFoundHttpException('The requested page does not exist.'); throw new NotFoundHttpException ( 'The requested page does not exist.' );
} }
$searchModel = new ContractCustomerSearch(['customer' => $model]); $searchModel = new ContractCustomerSearch ( [
$dataProvider = $searchModel->search(Yii::$app->request->queryParams); 'customer' => $model
] );
$dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
return $this->render('index-customer', [ return $this->render ( 'index-customer', [
'searchModel' => $searchModel, 'searchModel' => $searchModel,
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider
]); ] );
} }
/** /**
* Displays a single Contract model. * Displays a single Contract model.
* @param integer $id *
* @return mixed * @param integer $id
*/ * @return mixed
public function actionView($id) */
{ public function actionView($id) {
return $this->render('view', [ return $this->render ( 'view', [
'model' => $this->findModel($id), 'model' => $this->findModel ( $id )
]); ] );
} }
/** /**
* Creates a new Contract model. * Creates a new Contract model.
* If creation is successful, the browser will be redirected to the 'view' page. * If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed *
*/ * @return mixed
public function actionCreate() */
{ public function actionCreate() {
$model = new Contract(); $model = new Contract ();
if ($model->load(Yii::$app->request->post()) && $model->save()) { if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
return $this->redirect(['view', 'id' => $model->id_contract]); return $this->redirect ( [
} else { 'view',
return $this->render('create', [ 'id' => $model->id_contract
'model' => $model, ] );
]); } else {
} return $this->render ( 'create', [
} 'model' => $model
] );
}
}
/** /**
* Updates an existing Contract model. * Updates an existing Contract model.
* If update is successful, the browser will be redirected to the 'view' page. * If update is successful, the browser will be redirected to the 'view' page.
* @param integer $id *
* @return mixed * @param integer $id
*/ * @return mixed
public function actionUpdate($id) */
{ public function actionUpdate($id) {
$model = $this->findModel($id); $model = $this->findModel ( $id );
if ($model->load(Yii::$app->request->post()) && $model->save()) { if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
return $this->redirect(['view', 'id' => $model->id_contract]); return $this->redirect ( [
} else { 'view',
return $this->render('update', [ 'id' => $model->id_contract
'model' => $model, ] );
]); } else {
} return $this->render ( 'update', [
} 'model' => $model
] );
}
}
/** /**
* Deletes an existing Contract model. * Deletes an existing Contract model.
* If deletion is successful, the browser will be redirected to the 'index' page. * If deletion is successful, the browser will be redirected to the 'index' page.
* @param integer $id *
* @return mixed * @param integer $id
*/ * @return mixed
public function actionDelete($id) */
{ public function actionDelete($id) {
$this->findModel($id)->delete(); $model = $this->findModel ( $id );
return $this->redirect(['index']); if ( !RoleDefinition::isAdmin() ){
} throw new Exception ( "A szerződés nem törölhető" );
}
if ($model->flag != Contract::$FLAG_ACTIVE) {
throw new Exception ( "A szerződés nem törölhető" );
}
public function actionDetails( $id ) $parts = TicketInstallmentRequest::find ()->andWhere ( [
{ 'not in',
$contract = Contract::findOne($id); 'status',
//ticket_installment_request [
TicketInstallmentRequest::$STATUS_CANCELED,
TicketInstallmentRequest::$STATUS_PENDING
]
] )->all ();
if (count ( $parts ) > 0) {
throw new Exception ( "Már van feldolgozott részlet, nem lehet törölni" );
}
if ( !isset($contract)){ $tx = \Yii::$app->db->beginTransaction ();
throw new NotFoundHttpException('The requested page does not exist.');
}
$searchModel = new ContractRequestSearch( try {
['contract' => $contract]
);
// $searchModel->contract = $contract; Contract::updateAll ( [
'flag' => Contract::$FLAG_DELETED
], [
'id_contract' => $model->id_contract
] );
$dataProvider = $searchModel->search(Yii::$app->request->queryParams); TicketInstallmentRequest::updateAll ( [
'status' => TicketInstallmentRequest::$STATUS_CANCELED
], [
'id_contract' => $model->id_contract
] );
$ticket = Ticket::find ()->andWhere ( [
'id_contract' => $model->id_contract
] )->one ();
return $this->render('details', [ $transfer = Transfer::find ()->andWhere ( [
'searchModel' => $searchModel, 'type' => Transfer::TYPE_TICKET
'dataProvider' => $dataProvider, ] )->andWhere ( [
]); 'id_object' => $ticket->id_ticket
} ] )->one ();
/** $transfer->storno ();
* Finds the Contract model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown. $tx->commit ();
* @param integer $id // $tx->rollBack();
* @return Contract the loaded model } catch ( \Exception $e ) {
* @throws NotFoundHttpException if the model cannot be found $tx->rollBack ();
*/ echo $e->getMessage ();
protected function findModel($id) throw $e;
{ }
if (($model = Contract::findOne($id)) !== null) {
return $model; return $this->redirect ( [
} else { 'index'
throw new NotFoundHttpException('The requested page does not exist.'); ] );
} }
} public function actionDetails($id) {
$contract = Contract::findOne ( $id );
// ticket_installment_request
if (! isset ( $contract )) {
throw new NotFoundHttpException ( 'The requested page does not exist.' );
}
$searchModel = new ContractRequestSearch ( [
'contract' => $contract
] );
// $searchModel->contract = $contract;
$dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
return $this->render ( 'details', [
'model' => $contract,
'searchModel' => $searchModel,
'dataProvider' => $dataProvider
] );
}
/**
* Finds the Contract model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
*
* @param integer $id
* @return Contract the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id) {
if (($model = Contract::findOne ( $id )) !== null) {
return $model;
} else {
throw new NotFoundHttpException ( 'The requested page does not exist.' );
}
}
} }

View File

@ -1,9 +1,87 @@
<?php <?php
use yii\grid\GridView; use yii\grid\GridView;
use common\models\TicketInstallmentRequest; use common\models\TicketInstallmentRequest;
use yii\helpers\Html;
use common\models\Contract;
use yii\widgets\DetailView;
use common\components\RoleDefinition;
?> ?>
Részletek <h1>Szerződés részletei</h1>
<div class="row">
<div class="col-md-6">
<table class="table ">
<tr>
<th>
Vendég
</th>
<td>
<?php echo $model->customer->name ;?>
</td>
</tr>
<tr>
<th>
Kártyaszám
</th>
<td>
<?php echo $model->customer->card->number ;?>
</td>
</tr>
</table>
</div>
</div>
<div class="row">
<div class="col-md-6">
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id_contract',
[
'attribute' => 'id_user',
'value' => $model->userName
],
[
'attribute' => 'id_customer',
'value' => $model->customerName
],
[
'attribute' => 'flag',
'value' => $model->flagName
],
[
'attribute' => 'status',
'value' => $model->statusName
],
'part_paid',
'part_required',
'part_count',
'started_at:datetime',
'expired_at:datetime',
'created_at:datetime',
'updated_at:datetime',
],
]) ?>
</div>
</div>
<?php
if ( RoleDefinition::isAdmin() ){
if ( $model->flag == Contract::$FLAG_ACTIVE ){
echo Html::a(Yii::t('common/contract', 'Szerződés törlése'), ['delete', 'id' => $model->id_contract], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('common/contract', 'Biztosan szerenté törölni a bérletet?'),
'method' => 'post',
],
]);
}else{
echo "<p>Szerződés nem törölhető! </p>";
}
}
?>
<h2>Fizetési részletek</h2>
<?php <?php

View File

@ -1,3 +1,5 @@
-0.0.50
- Delete contract on admin
-0.0.49 -0.0.49
- contract - add started_at - contract - add started_at
- receptions/account-state/mixed - receptions/account-state/mixed

View File

@ -4,7 +4,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.49', 'version' => 'v0.0.50',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global