Add delete contract
This commit is contained in:
parent
603508eb70
commit
2184abdf97
@ -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
|
||||||
|
] );
|
||||||
return $this->render('index-customer', [
|
$dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
|
||||||
'searchModel' => $searchModel,
|
|
||||||
'dataProvider' => $dataProvider,
|
return $this->render ( 'index-customer', [
|
||||||
]);
|
'searchModel' => $searchModel,
|
||||||
}
|
'dataProvider' => $dataProvider
|
||||||
|
] );
|
||||||
/**
|
}
|
||||||
* Displays a single Contract model.
|
|
||||||
* @param integer $id
|
/**
|
||||||
* @return mixed
|
* Displays a single Contract model.
|
||||||
*/
|
*
|
||||||
public function actionView($id)
|
* @param integer $id
|
||||||
{
|
* @return mixed
|
||||||
return $this->render('view', [
|
*/
|
||||||
'model' => $this->findModel($id),
|
public function actionView($id) {
|
||||||
]);
|
return $this->render ( 'view', [
|
||||||
}
|
'model' => $this->findModel ( $id )
|
||||||
|
] );
|
||||||
/**
|
}
|
||||||
* Creates a new Contract model.
|
|
||||||
* If creation is successful, the browser will be redirected to the 'view' page.
|
/**
|
||||||
* @return mixed
|
* Creates a new Contract model.
|
||||||
*/
|
* If creation is successful, the browser will be redirected to the 'view' page.
|
||||||
public function actionCreate()
|
*
|
||||||
{
|
* @return mixed
|
||||||
$model = new Contract();
|
*/
|
||||||
|
public function actionCreate() {
|
||||||
if ($model->load(Yii::$app->request->post()) && $model->save()) {
|
$model = new Contract ();
|
||||||
return $this->redirect(['view', 'id' => $model->id_contract]);
|
|
||||||
} else {
|
if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
|
||||||
return $this->render('create', [
|
return $this->redirect ( [
|
||||||
'model' => $model,
|
'view',
|
||||||
]);
|
'id' => $model->id_contract
|
||||||
}
|
] );
|
||||||
}
|
} else {
|
||||||
|
return $this->render ( 'create', [
|
||||||
/**
|
'model' => $model
|
||||||
* Updates an existing Contract model.
|
] );
|
||||||
* If update is successful, the browser will be redirected to the 'view' page.
|
}
|
||||||
* @param integer $id
|
}
|
||||||
* @return mixed
|
|
||||||
*/
|
/**
|
||||||
public function actionUpdate($id)
|
* Updates an existing Contract model.
|
||||||
{
|
* If update is successful, the browser will be redirected to the 'view' page.
|
||||||
$model = $this->findModel($id);
|
*
|
||||||
|
* @param integer $id
|
||||||
if ($model->load(Yii::$app->request->post()) && $model->save()) {
|
* @return mixed
|
||||||
return $this->redirect(['view', 'id' => $model->id_contract]);
|
*/
|
||||||
} else {
|
public function actionUpdate($id) {
|
||||||
return $this->render('update', [
|
$model = $this->findModel ( $id );
|
||||||
'model' => $model,
|
|
||||||
]);
|
if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
|
||||||
}
|
return $this->redirect ( [
|
||||||
}
|
'view',
|
||||||
|
'id' => $model->id_contract
|
||||||
/**
|
] );
|
||||||
* Deletes an existing Contract model.
|
} else {
|
||||||
* If deletion is successful, the browser will be redirected to the 'index' page.
|
return $this->render ( 'update', [
|
||||||
* @param integer $id
|
'model' => $model
|
||||||
* @return mixed
|
] );
|
||||||
*/
|
}
|
||||||
public function actionDelete($id)
|
}
|
||||||
{
|
|
||||||
$this->findModel($id)->delete();
|
/**
|
||||||
|
* Deletes an existing Contract model.
|
||||||
return $this->redirect(['index']);
|
* If deletion is successful, the browser will be redirected to the 'index' page.
|
||||||
}
|
*
|
||||||
|
* @param integer $id
|
||||||
|
* @return mixed
|
||||||
public function actionDetails( $id )
|
*/
|
||||||
{
|
public function actionDelete($id) {
|
||||||
$contract = Contract::findOne($id);
|
$model = $this->findModel ( $id );
|
||||||
//ticket_installment_request
|
|
||||||
|
if ( !RoleDefinition::isAdmin() ){
|
||||||
|
throw new Exception ( "A szerződés nem törölhető" );
|
||||||
if ( !isset($contract)){
|
}
|
||||||
throw new NotFoundHttpException('The requested page does not exist.');
|
|
||||||
}
|
if ($model->flag != Contract::$FLAG_ACTIVE) {
|
||||||
|
throw new Exception ( "A szerződés nem törölhető" );
|
||||||
$searchModel = new ContractRequestSearch(
|
}
|
||||||
['contract' => $contract]
|
|
||||||
);
|
$parts = TicketInstallmentRequest::find ()->andWhere ( [
|
||||||
|
'not in',
|
||||||
// $searchModel->contract = $contract;
|
'status',
|
||||||
|
[
|
||||||
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
|
TicketInstallmentRequest::$STATUS_CANCELED,
|
||||||
|
TicketInstallmentRequest::$STATUS_PENDING
|
||||||
return $this->render('details', [
|
]
|
||||||
'searchModel' => $searchModel,
|
] )->all ();
|
||||||
'dataProvider' => $dataProvider,
|
|
||||||
]);
|
if (count ( $parts ) > 0) {
|
||||||
}
|
throw new Exception ( "Már van feldolgozott részlet, nem lehet törölni" );
|
||||||
|
}
|
||||||
/**
|
|
||||||
* Finds the Contract model based on its primary key value.
|
$tx = \Yii::$app->db->beginTransaction ();
|
||||||
* If the model is not found, a 404 HTTP exception will be thrown.
|
|
||||||
* @param integer $id
|
try {
|
||||||
* @return Contract the loaded model
|
|
||||||
* @throws NotFoundHttpException if the model cannot be found
|
Contract::updateAll ( [
|
||||||
*/
|
'flag' => Contract::$FLAG_DELETED
|
||||||
protected function findModel($id)
|
], [
|
||||||
{
|
'id_contract' => $model->id_contract
|
||||||
if (($model = Contract::findOne($id)) !== null) {
|
] );
|
||||||
return $model;
|
|
||||||
} else {
|
TicketInstallmentRequest::updateAll ( [
|
||||||
throw new NotFoundHttpException('The requested page does not exist.');
|
'status' => TicketInstallmentRequest::$STATUS_CANCELED
|
||||||
}
|
], [
|
||||||
}
|
'id_contract' => $model->id_contract
|
||||||
|
] );
|
||||||
|
$ticket = Ticket::find ()->andWhere ( [
|
||||||
|
'id_contract' => $model->id_contract
|
||||||
|
] )->one ();
|
||||||
|
|
||||||
|
$transfer = Transfer::find ()->andWhere ( [
|
||||||
|
'type' => Transfer::TYPE_TICKET
|
||||||
|
] )->andWhere ( [
|
||||||
|
'id_object' => $ticket->id_ticket
|
||||||
|
] )->one ();
|
||||||
|
|
||||||
|
$transfer->storno ();
|
||||||
|
|
||||||
|
$tx->commit ();
|
||||||
|
// $tx->rollBack();
|
||||||
|
} catch ( \Exception $e ) {
|
||||||
|
$tx->rollBack ();
|
||||||
|
echo $e->getMessage ();
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirect ( [
|
||||||
|
'index'
|
||||||
|
] );
|
||||||
|
}
|
||||||
|
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.' );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user