add reception account state view and pdf export

common/components/DailyListing.php

@@ -15,7 +15,8 @@ use common\components\RoleDefinition;
 class DailyListing 
 {
 	
-	public $mode = "reception";//reception or admin
+	public $mode = "reception";//reception or admin or accountstate
+	
 	/**
 	 * string start date , inclusive
 	 * */
@@ -108,6 +109,25 @@ class DailyListing
 	public $type;
 	
 
+	public function readTotalEasy(){
+		$this->readTicketMoney();
+		$this->readProductsMoney();
+		$this->readMoneyMovementMoney();
+		$this->calcTotal();
+	}
+	
+	public function readTotalDetailed(){
+		$this->readTickets();
+        $this->readProducts();
+        $this->readMoneyMovements();
+	}
+	public function readTotalMedium(){
+		$this->readProductsByCategory();
+        $this->readProductsByCategoryDetailed();
+        $this->readTicketStas();
+        $this->readMoneyMovementsStats();
+	}
+	
     public function loadFilters($transfer){
     	 $this->start = $transfer->start;
 		 $this->end = $transfer->end;
@@ -119,9 +139,22 @@ class DailyListing
 		 $this->timestampEnd = $transfer->timestampEnd;
     }
     
+    public function loadAccountState($accountState){
+    	$this->mode = 'accountstate';
+    	$this->start = $accountState->start_date;
+    	$this->end = $accountState->created_at;
+    	$this->timestampStart = $accountState->start_date;
+    	$this->timestampEnd =$accountState->created_at;
+    	$this->id_account =  $accountState->id_account;
+    	$this->id_user = $accountState->id_user;
+    }
+    
 	public function isModeAdmin(){
 		return $this->mode == 'admin';
 	}
+	public function isModeAccountState(){
+		return $this->mode == 'accountstate';
+	}
     
     
     public function calcTotal(){
@@ -139,11 +172,15 @@ class DailyListing
     
     
     public function addAccountConstraint($query){
-    	if (!$this->isModeAdmin() || !RoleDefinition::isAdmin() ){
+    	
+    	if ( $this->isModeAccountState() ){
+    		$query->andWhere(['account.type' => Account::TYPE_ALL ]);
+    		
+    	}else if (!$this->isModeAdmin() || !RoleDefinition::isAdmin() ){
 	    	$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
 	    	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
 	    	
-	    	if ( RoleDefinition::isReception() || !$this->isModeAdmin()){
+	    	if (   RoleDefinition::isReception() || !$this->isModeAdmin()){
 	    		$query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
 	    	}
 	    	

common/components/accountstate/AccountStateWidget.php

@@ -0,0 +1,84 @@
+<?php
+namespace common\components\accountstate;
+use yii\base\Widget;
+use common\models\AccountState;
+use yii\data\ArrayDataProvider;
+use yii\grid\GridView;
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/**
+ * This is the model class for widget display bank notes.
+ *
+ * @property common\models\AccountState $model
+ * */
+class AccountStateWidget extends Widget{
+	
+	 public $model;
+	
+	
+	public function init(){
+		parent::init();
+	}
+	
+	public function run(){
+		
+		if ($this->model->isTypeOpen() ){
+			$attributes = [
+					[
+							'attribute' =>'account.name',
+							'label' => 'Kassza'
+					],
+					[
+							'attribute' =>'typeName',
+							'label' => 'Típus'
+					],
+						[
+						'attribute' =>'money',
+						'value' => \Yii::$app->formatter->asInteger($this->model->money) ." Ft",
+					],
+					'user.username',
+					[
+							'attribute' =>	'created_at',
+							'label' => 'Nyitás ideje'
+					],
+			];
+		}else{
+	
+			$attributes = [
+					[
+					'attribute' =>'account.name',
+					'label' => 'Kassza'
+					],
+					[
+					'attribute' =>'typeName',
+					'label' => 'Típus'
+					],
+					[
+						'attribute' =>'money',
+						'value' => \Yii::$app->formatter->asInteger($this->model->money) ." Ft",
+					],
+					'user.username',
+					[
+						'attribute' =>	'start_date',
+						'label' => 'Előző nyitás ideje'	
+					],
+					[
+						'attribute' =>	'created_at',
+						'label' => 'Zárás ideje'	
+					],
+			];
+		}
+		
+		
+
+
+    echo  DetailView::widget([
+        'model' => $this->model,
+        'attributes' =>$attributes,
+    ])  ;
+	}
+	
+	 
+	
+}

common/components/accountstate/BankNotesWidget.php

@@ -0,0 +1,96 @@
+<?php
+namespace common\components\accountstate;
+use yii\base\Widget;
+use common\models\AccountState;
+use yii\data\ArrayDataProvider;
+use yii\grid\GridView;
+use yii\helpers\Html;
+
+/**
+ * This is the model class for widget display bank notes.
+ *
+ * @property common\models\AccountState $model
+ * */
+class BankNotesWidget extends Widget{
+	
+	 public $model;
+	
+	
+	public function init(){
+		parent::init();
+	}
+	
+	public function run(){
+		echo $this->generateNotes();
+	}
+	
+	protected function generateNotes(){
+		$s = "";
+		$s .= Html::beginTag("div", ['class' => 'row', 'style' => 'margin-top: 6px;']);
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_5_ft','banknote_10_ft','banknote_20_ft','banknote_50_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_100_ft','banknote_200_ft','banknote_500_ft','banknote_1000_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_2000_ft','banknote_5000_ft','banknote_10000_ft','banknote_20000_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::endTag("div");
+		return $s;
+	}
+	
+	protected function generateBanknoteGrid($attributes){
+	
+		return $this->generateBanknoteColumn( $this->mkColumnData($attributes));
+	}
+	
+	protected function mkColumnData( $attributes){
+	
+		$values = AccountState::banknoteValues();
+		$items = [];
+		foreach ($attributes as $note){
+			$value = $values[$note];
+			$count = $this->model->$note;
+			if ( !isset($count)  || empty($count)){
+				$count = 0;
+			}
+			$value = \Yii::$app->formatter->asInteger($value);
+			$item = [
+					'note' => $value . " Ft",
+					'count' =>   $count
+			];
+			$items[] = $item;
+		}
+	
+		return $items;
+	}
+	
+	protected function generateBanknoteColumn($data){
+		$dp = new ArrayDataProvider(
+				[
+						'allModels' => $data,
+						'sort' => false,
+						'pagination' => false
+				]
+				);
+		$s = GridView::widget([
+				'dataProvider' => $dp,
+				'layout' => '{items}',
+				'options' => ['class' => 'grid-view notes-view'],
+				'columns' =>[
+						[
+								'contentOptions' => ['class' => 'note-name'],
+								'value' => 'note',
+								'label' => 'Címlet'
+						],
+						[
+								'value' => 'count',
+								'label' => 'Db'
+						],
+				]
+		]);
+		return $s;
+	}
+	
+}

common/components/total/TotalBaseWidget.php

@@ -0,0 +1,21 @@
+<?php
+namespace common\components\total;
+use yii\base\Widget;
+
+class TotalBaseWidget extends Widget{
+	
+	public $dailyListing;
+	
+	public $viewPath = '@common/views/total';
+	public $viewFile = 'totaleasy.php';
+	public $view;
+	
+	public function init(){
+		$this->view = $this->viewPath . "/" . $this->viewFile;
+	}
+	
+	public function run(){
+		echo $this->render($this->view,[ 'model' => $this->dailyListing ]);
+	}
+	
+}

common/components/total/TotalDetailedMoneyMovementWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalDetailedMoneyMovementWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_detailed_money_movement.php';
+	
+	
+}

common/components/total/TotalDetailedProductsWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalDetailedProductsWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_detailed_product.php';
+	
+	
+}

common/components/total/TotalDetailedTicketsWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalDetailedTicketsWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_detailed_ticket.php';
+	
+	
+}

common/components/total/TotalDifferenceWidget.php

@@ -0,0 +1,68 @@
+<?php
+namespace common\components\total;
+
+use yii\base\Widget;
+use yii\widgets\DetailView;
+
+/**
+ * Display account state difference information widget
+ * 
+ * 
+ * @property common\models\AccountState $model
+ * 
+ * */
+class TotalDifferenceWidget extends Widget{
+	
+	
+	public $model;
+	
+	
+	public function run(){
+		return $this->generateDifference();
+	}
+	
+	protected function generateDifference(){
+		$s = "";
+		if ( $this->model->hasDifferenceToPrevState()){
+		
+			$ft = " Ft";
+			$s .= DetailView::widget([
+					'model' => $this->model,
+					'template' =>"<tr><th>{label}</th><td style='text-align: right;'>{value} </td></tr>",
+					'attributes' => [
+							[
+									'label' =>  "Előző nyitás ideje",
+									'value' =>  $this->model->prevObject ?  \Yii::$app->formatter->asDatetime( $this->model->prevObject->created_at) : "-",
+							],
+							[
+									'label' =>  "Előzőleg nyitott",
+									'value' =>  $this->model->prevObject ?   $this->model->user->username : "-",
+							],
+							[
+									'label' =>  "Előző nyitás összege",
+									'value' =>  $this->model->prev_money.$ft
+							],
+							[
+									'label' =>  "Bevételek összesen előző nyitás óta",
+									'value' =>  $this->model->collection_money  .$ft
+							],
+							[
+									'label' =>  "Zárás összege",
+									'value' =>  $this->model->money.$ft
+							],
+							[
+									'label' =>  "Várt összeg",
+									'value' =>  $this->model->expected.$ft
+							],
+							[
+									'label' =>  "Különbözet",
+									'value' =>  $this->model->signedDiff.$ft
+							],
+					]
+			]);
+		}
+		return $s;
+	}
+	
+	
+}

common/components/total/TotalEasyWidget.php

@@ -0,0 +1,22 @@
+<?php
+namespace common\components\total;
+use yii\base\Widget;
+
+class TotalEasyWidget extends Widget{
+	
+	public $dailyListing;
+	
+	public $viewPath = '@common/views/total';
+	public $viewFile = 'totaleasy.php';
+	public $view;
+	
+	public function init(){
+		$this->view = $this->viewPath . "/" . $this->viewFile;
+	}
+	
+	public function run(){
+		echo $this->render($this->view,[ 'model' => $this->dailyListing ]);
+	}
+	
+	
+}

common/components/total/TotalMediumMoneyMovementsWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalMediumMoneyMovementsWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_medium_money_movement.php';
+	
+	
+}

common/components/total/TotalMediumProductsWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalMediumProductsWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_medium_product.php';
+	
+	
+}

common/components/total/TotalMediumTicketsWidget.php

@@ -0,0 +1,9 @@
+<?php
+namespace common\components\total;
+
+class TotalMediumTicketsWidget extends TotalBaseWidget{
+	
+	public $viewFile = 'total_medium_ticket.php';
+	
+	
+}

common/models/AccountState.php

@@ -36,6 +36,8 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
 	const TYPE_OPEN = 10;
 	const TYPE_CLOSE = 20;
 	
+	public $start_date;
+	
     /**
      * @inheritdoc
      */
@@ -94,6 +96,13 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
     	
     }
     
+    public function isTypeOpen(){
+    	return $this->type == AccountState::TYPE_OPEN;
+    }
+    public function isTypeClose(){
+    	return $this->type == AccountState::TYPE_CLOSE;
+    }
+    
     public static function banknoteValues()
     {
         return [

common/models/Transfer.php

@@ -712,6 +712,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
    	$query = (new \yii\db\Query());
    	$query->select(['coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end  ),0) AS transfer_money']);
    	$query->from('transfer');
+   	$query->innerJoin("account","account.id_account = transfer.id_account");
    	$query->andWhere(['transfer.id_user' => $idUser ]);
    	
    	$created_condition = ['and',[ '>=', 'transfer.created_at', $start ] ,[ '<', 'transfer.created_at', $end ]  ];
@@ -719,6 +720,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
    	
    	$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
    	$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
+   	$query->andWhere(['account.type' => Account::TYPE_ALL]);
    	
    	return $query->scalar();
    }

common/views/account-state/account_state_pdf.php

@@ -0,0 +1,102 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+use common\components\total\TotalEasyWidget;
+use common\components\total\TotalDetailedProductsWidget;
+use common\components\total\TotalDetailedTicketsWidget;
+use common\components\total\TotalDetailedMoneyMovementWidget;
+use common\components\accountstate\BankNotesWidget;
+use common\components\total\TotalMediumTicketsWidget;
+use common\components\total\TotalMediumProductsWidget;
+use common\components\total\TotalMediumMoneyMovementsWidget;
+use common\components\total\TotalDifferenceWidget;
+use common\models\AccountState;
+use common\components\accountstate\AccountStateWidget;
+use yii\base\Widget;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+if ( $model ->type == AccountState::TYPE_OPEN ){
+	$this->title = "Kassza nyitás";
+}else{
+	$this->title = "Kassza zárás";
+}
+
+
+
+?>
+<link rel='stylesheet' 	href='<?php echo \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')?>'>
+
+<style>
+	td,th{
+		padding: 3px;
+	}
+	td.note-name{
+	width: 50%;
+	}
+	
+	td.money{
+		text-align: right;
+	}
+</style>
+<div class="account-state-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    
+    <?php 
+    	if ( $model->hasDifferenceToPrevState() ){
+    		if ( $model->hasMinus()){
+    			?>
+    			<div class="alert alert-danger" role="alert">Negatív különbözet</div>
+    			<?php 
+    		}else{
+    			?>
+    			<div class="alert alert-success" role="alert">Pozitív különbözet</div>
+    			<?php 
+    		}
+    	}
+    ?>
+    
+
+	<?php 
+		echo AccountStateWidget::widget(['model' => $model]); 
+	?>
+    
+    <?php if ( $model->hasDifferenceToPrevState() ){
+    	?>
+    	<h2>Különbözet</h2>
+    	<?php 
+    	echo TotalDifferenceWidget::widget(['model' => $model]	);
+    	
+    }
+    	
+?>
+ <?php if ( $model ->type == AccountState::TYPE_CLOSE ){?>
+				 <pagebreak />
+			    <?php echo TotalEasyWidget::widget(['dailyListing' => $details]);?>
+			     <pagebreak />
+			    <h2>Közepes összesítés</h2>
+			    <h3>Bérletek típus szerint</h3>
+			    <?php echo TotalMediumTicketsWidget::widget(['dailyListing' => $details]);?>
+			    <h3>Termékek név szerint</h3>
+			    <?php echo TotalMediumProductsWidget::widget(['dailyListing' => $details]);?>
+			    <h3>Pénzmozgások típus szerint</h3>
+			    <?php echo TotalMediumMoneyMovementsWidget::widget(['dailyListing' => $details]);?>
+			     <pagebreak />
+			    <h2>Részletek</h2>
+			    <?php echo TotalDetailedTicketsWidget::widget(['dailyListing' => $details]);?>
+			    <?php echo TotalDetailedProductsWidget::widget(['dailyListing' => $details]);?>
+			    <?php echo TotalDetailedMoneyMovementWidget::widget(['dailyListing' => $details]);?>
+			     <pagebreak />
+			    <h2>Címletek</h2>
+			    <?php echo BankNotesWidget::widget(['model' => $model]);?>
+
+</div>
+<?php }else{?>
+ 	<pagebreak />
+	<h2>Címletek</h2>
+	<?php echo BankNotesWidget::widget(['model' => $model]);?>
+<?php }?>
+
+</div>

common/views/total/total_detailed_money_movement.php

@@ -0,0 +1,41 @@
+<h3>Pénzmozgások</h3>
+				<table class="table table-bordered table-striped table-summary">
+					<thead>
+						<tr>
+							<th>Dátum</th>
+							<th>Kassza</th>
+							<th>Felhasználó</th>
+							<th>Név</th>
+							<th>Típus</th>
+							<th>Összeg</th>
+						</tr>
+					</thead>
+					<tbody>
+				    	<?php foreach ($model->moneyMovements as $p ){?>
+				    	<tr>
+			    						<td><?php echo $p['money_movement_created_at']?> </td>
+			    						<td><?php echo $p['account_name']?> </td>
+			    						<td><?php echo $p['user_name']?> </td>
+			    						<td><?php echo $p['money_movement_name'] ?></td>
+			    						<td><?php echo $p['money_movement_type_name'] ?></td>
+										<td class='money'><?php echo \Yii::$app->formatter->asInteger( $p['signed_money'])?> Ft</td>
+				    		
+					    </tr>
+				    	<?php } ?>
+				</tbody>
+				</table>
+						<?php if ( count($model->moneyMovements ) == 0 ) {
+						?>
+						Nincs találat
+							<?php 
+						}else{?>
+						
+						<div class="row">
+			    			<div class="col-md-12 text-right" style="text-decoration: underline;">
+			    				Összesen: <?php	echo \Yii::$app->formatter->asInteger( $model->moneyMovementMoneis);	?> Ft
+			    				
+			    			</div>
+			    		</div>
+						<?php 
+						}
+						?>

common/views/total/total_detailed_product.php

@@ -0,0 +1,51 @@
+	<?php 
+					//////////////////////////
+					// Termék eladás
+					////////////////////////
+				?>
+				<h3>Termék eladások</h3>
+				<table class="table table-bordered table-striped table-summary">
+					<thead>
+						<tr>
+							<th>Kiadva</th>
+							<th>Fizetve</th>
+							<th>Kassza</th>
+							<th>Felhasználó</th>
+							<th>Kategória</th>
+							<th>Termék</th>
+							<th>Egység ár</th>
+							<th>Mennyiség</th>
+							<th>Összeg</th>
+						</tr>
+					</thead>
+					<tbody>
+				    	<?php foreach ($model->products as $p ){?>
+				    	<tr>
+			    						<td><?php echo $p['product_created_at']?> </td>
+			    						<td><?php echo $p['product_paid_at']?> </td>
+			    						<td><?php echo $p['account_name']?> </td>
+			    						<td><?php echo $p['user_name']?> </td>
+			    						<td><?php echo $p['product_category_name'] ?></td>
+			    						<td><?php echo $p['product_name'] ?></td>
+										<td class='money'><?php echo $p['product_item_price']?> Ft</td>
+										<td class='count'><?php echo $p['product_count']?> Db</td>
+										<td class='money'><?php echo \Yii::$app->formatter->asInteger( $p['product_money'])?> FT</td>
+				    		
+					    </tr>
+				    	<?php } ?>
+				</tbody>
+				</table>
+						<?php if ( count($model->products ) == 0 ) {
+						?>
+						Nincs találat
+						<?php 
+						}else{?>
+						
+						<div class="row">
+			    			<div class="col-md-12 text-right" style="text-decoration: underline;">
+			    				Összesen: <?php	echo \Yii::$app->formatter->asInteger( $model->productMoney);	?> Ft
+			    			</div>
+			    		</div>
+						<?php 
+						}
+						?>

common/views/total/total_detailed_ticket.php

@@ -0,0 +1,46 @@
+<h3>Bérletek</h3>
+<table class="table table-bordered table-striped table-summary">
+					<thead>
+						<tr>
+							<th>Kiadva</th>
+							<th>Fizetve</th>
+							<th>Kassza</th>
+							<th>Felhasználó</th>
+							<th>Bérlet típus</th>
+							<th>Egység ár</th>
+							<th>Mennyiség</th>
+							<th>Összeg</th>
+						</tr>
+					</thead>
+					<tbody>
+				    	<?php foreach ($model->tickets as $t ){?>
+				    	<tr>
+	    						<td><?php echo $t['ticket_created_at']?> </td>
+	    						<td><?php echo $t['ticket_paid_at']?> </td>
+	    						<td><?php echo $t['account_name']?> </td>
+	    						<td><?php echo $t['user_name']?> </td>
+	    						<td><?php echo $t['ticket_type_name'] ?></td>
+								<td class='money'><?php echo $t['ticket_item_price']?> Ft</td>
+								<td class='count'><?php echo $t['ticket_count']?> Db</td>
+								<td class='money'><?php echo \Yii::$app->formatter->asInteger( $t['ticket_money'])?> FT</td>
+				    		
+					    </tr>
+				    	<?php } ?>
+				</tbody>
+				</table>
+				<?php if ( count($model->tickets ) == 0 ) {
+						?>
+						Nincs találat
+						<?php 
+						}else{?>
+						
+						<div class="row">
+			    			<div class="col-md-12 text-right" style="text-decoration: underline;">
+			    				Összesen: <?php	echo \Yii::$app->formatter->asInteger( $model->ticketMoney);	?> Ft
+			    				
+			    			</div>
+			    		</div>
+						<?php 
+						}
+						?>
+						<?php 

common/views/total/total_difference.php

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

common/views/total/total_medium_money_movement.php

@@ -0,0 +1,26 @@
+<table class="table table-bordered table-striped table-summary">
+	<thead>
+		<tr>
+			<th>Pénzmozgás típus</th>
+			<th>Mennyiség</th>
+			<th>Összeg</th>
+		</tr>
+	</thead>
+	<tbody>
+	    		<?php
+							foreach ( $model->moneyMovementsByType as $mmStat ) {
+								?>
+						<tr>
+			<td class="name"><?php echo $mmStat['name'] ?></td>
+			<td class="count"><?php echo $mmStat['money_movement_count']?> Db</td>
+			<td class="money"><?php echo \Yii::$app->formatter->asInteger(  $mmStat['money_movement_money'])?> FT</td>
+		</tr>
+	    		<?php } ?>
+					</tbody>
+</table>
+<div class="row">
+	<div class="col-md-12 text-right" style="text-decoration: underline;">
+		    				Összesen: <?php	echo \Yii::$app->formatter->asInteger( $model->moneyMovementMoneis);	?> Ft
+		    			</div>
+</div>
+

common/views/total/total_medium_product.php

@@ -0,0 +1,45 @@
+<?php
+foreach ( $model->productsByCategory ['categories'] as $categoryHolder ) {
+	
+	$products = $categoryHolder ['products'];
+	?>
+<h4><?php echo $categoryHolder['category']['name']?></h4>
+
+<table
+	class="table table-bordered table-striped table-summary table-category-product">
+	<thead>
+		<tr>
+			<th>Termék</th>
+			<th>Mennyiség</th>
+			<th>Összeg</th>
+		</tr>
+	</thead>
+	<tbody>
+						<?php foreach ( $products as $p){?>
+							
+							<tr>
+			<td class='name'><?php echo $p['product_name'] ?></td>
+			<td class='count'><?php echo $p['product_count'] ?> Db</td>
+			<td class='money'><?php echo \Yii::$app->formatter->asInteger( $p['product_money'])?> FT</td>
+		</tr>
+						
+						<?php }?>
+						<tr class="warning">
+			<td><?php echo "Összesen" ?></td>
+			<td><?php  ?></td>
+			<td class='money'><?php echo \Yii::$app->formatter->asInteger(  $categoryHolder['total'])?> FT</td>
+		</tr>
+	</tbody>
+</table>
+<?php
+}
+
+?>
+<div class="row">
+	<div class="col-md-12 text-right" style="text-decoration: underline;">
+		Összesen:
+	    <?php
+			echo \Yii::$app->formatter->asInteger( $model->productsByCategory ['total']);
+		?> Ft
+    </div>
+</div>

common/views/total/total_medium_ticket.php

@@ -0,0 +1,27 @@
+<table class="table table-bordered table-striped table-summary">
+	<thead>
+		<tr>
+			<th>Bérlet típus</th>
+			<th>Mennyiség</th>
+			<th>Összeg</th>
+		</tr>
+	</thead>
+	<tbody>
+    		<?php
+						foreach ( $model->ticketStats as $ticketStat ) {
+							?>
+						<tr>
+			<td class="name"><?php echo $ticketStat['ticket_type_name'] ?></td>
+			<td class="count"><?php echo $ticketStat['ticket_count']?> Db</td>
+			<td class="money"><?php echo \Yii::$app->formatter->asInteger( $ticketStat['ticket_money'])?> FT</td>
+		</tr>
+    		<?php } ?>
+					</tbody>
+</table>
+
+<div class="row">
+	<div class="col-md-12 text-right" style="text-decoration: underline;">
+	    				Összesen: <?php	echo \Yii::$app->formatter->asInteger(  $model->ticketMoney);	?> Ft
+	    				
+	    			</div>
+</div>

common/views/total/totaleasy.php

@@ -0,0 +1,46 @@
+<?php
+use common\components\RoleDefinition;
+use yii\helpers\Html;
+use yii\helpers\Url;
+?>
+
+<?php 
+	//echo $this->render('_list_pdf_head',[ 'searchModel' =>$model, 'label' => 'Napi bevételek - Egyszerű','type' =>'easy']);
+?>
+
+<h2>Egyszerű összesítés</h2>
+	<?php 
+
+// 	if ( !isset($model->output) ){
+		
+// 		$pdfUrl = Url::current([ Html::getInputName($model, 'output')  => 'pdf']);
+// 		echo Html::a("Teljes PDF letöltése", $pdfUrl,['class' => 'btn btn-primary btn-all' ]);
+		
+// 		$pdfUrl = Url::current([ Html::getInputName($model, 'output')  => 'pdf', Html::getInputName($model, 'outputView')  => 'easy']);
+// 		echo Html::a("Egyszerű összesítő Pdf", $pdfUrl,['class' => 'btn btn-primary' ]);
+// 	}
+
+
+?>
+				<h3>Bruttó</h3>
+				<table class="table table-bordered table-striped table-summary">
+					<tbody>
+						<tr>
+							<th>Bérletek</th>
+							<td class="money"><?php echo \Yii::$app->formatter->asInteger( $model->ticketMoney)?> FT</td>
+						</tr>
+						<tr>
+							<th>Termékek</th>
+							<td class="money"><?php echo \Yii::$app->formatter->asInteger( $model->productMoney)?> FT</td>
+						</tr>
+						<tr>
+							<th>Pénzmozgások</th>
+							<td class="money"><?php echo \Yii::$app->formatter->asInteger( $model->moneyMovementMoneis)?> FT</td>
+						</tr>
+						<tr>
+							<th>Végösszeg bruttó</th>
+							<td class="money"><span style='border-bottom: 1px solid black'><?php echo \Yii::$app->formatter->asInteger(  $model->total)?> FT</span></td>
+						</tr>
+					</tbody>
+				</table>
+				

frontend/components/AccountStateBanknoteCountWidget.php

@@ -9,7 +9,14 @@ use yii\grid\GridView;
 use yii\base\Object;
 use yii\data\ArrayDataProvider;
 use yii\helpers\Url;
+use common\components\total\TotalDifferenceWidget;
 
+/**
+ * Display account state widget
+ * 
+ * @property  common\models\AccountState $model the account state object
+ * @property int $index the current index in the list
+ * */
 class AccountStateBanknoteCountWidget extends Widget{
 	
 	 public $model;
@@ -37,53 +44,27 @@ class AccountStateBanknoteCountWidget extends Widget{
 		
 		
 		$s .= $this->generateInfoRow();
-		$s .= $this->generateNotes();
-		
+// 		$s .= $this->generateNotes();
+
 		if ( $this->model->hasDifferenceToPrevState()){
-				
-			$ft = " Ft";
-			$s .= DetailView::widget([
-					'model' => $this->model,
-					'template' =>"<tr><th>{label}</th><td style='text-align: right;'>{value} </td></tr>",
-					'attributes' => [
-							[
-									'label' =>  "Előző nyitás ideje",
-									'value' =>  $this->model->prevObject ?  \Yii::$app->formatter->asDatetime( $this->model->prevObject->created_at) : "-",
-							],
-							[
-									'label' =>  "Előzőleg nyitott",
-									'value' =>  $this->model->prevObject ?   $this->model->user->username : "-",
-							],
-							[
-									'label' =>  "Előző nyitás összege",
-									'value' =>  $this->model->prev_money.$ft
-							],
-							[
-									'label' =>  "Bevételek összesen utolsó nyitás óta",
-									'value' =>  $this->model->collection_money  .$ft
-							],
-							[
-									'label' =>  "Zárás összege",
-									'value' =>  $this->model->money.$ft
-							],
-							[
-									'label' =>  "Várt összeg",
-									'value' =>  $this->model->expected.$ft
-							],
-							[
-									'label' =>  "Különbözet",
-									'value' =>  $this->model->signedDiff.$ft
-							],
-					]
-			]);
+			$s .= "<h3>Különbözet</h3>";		
+			$s .= TotalDifferenceWidget::widget(['model' => $this->model]);
 		}
 		
+		
 		$s .= $this->generateComment();
 		
 		$s .= Html::beginTag("div", ['class' => 'row', 'style' => 'margin-top: 6px;']);
 		$s .= Html::beginTag("div", ['class' => 'col-md-12 text-right']);
 		
-		$s .= Html::a('<span class="glyphicon glyphicon-trash"></span>Törlés', Url::toRoute(['delete','id' =>$this->model->id_account_state]), [
+		$s .= Html::a( Html::tag("span","",['class' =>'glyphicon glyphicon-download-alt']) ."&nbsp;Pdf", Url::to([ 'view', 'id' =>$this->model->id_account_state, 'output' =>'pdf']) ,['class' => 'btn btn-primary btn-pdf','style' =>'margin-bottom: 12px; margin-right: 6px;']);
+		
+		$s .= Html::a('<span class="glyphicon glyphicon-eye-open"></span>&nbsp;Részletek', Url::toRoute(['view','id' =>$this->model->id_account_state]), [
+ 			'title' => 'Részletek',
+ 			'class' => 'btn btn-success',
+ 													'style' =>'margin-bottom: 12px; margin-right: 6px;'
+ 	]);
+		$s .= Html::a('<span class="glyphicon glyphicon-trash"></span>&nbsp;Törlés', Url::toRoute(['delete','id' =>$this->model->id_account_state]), [
  			'title' => \Yii::t('yii', 'Delete'),
  			'data-confirm' =>\Yii::t('yii', 'Are you sure to delete this item?'),
  			'data-method' => 'post',

frontend/components/FrontendMenuStructure.php

@@ -19,10 +19,12 @@ class FrontendMenuStructure{
 	
 	public $startDate;//start date
 	public $tomorrowDate;//tomorrow date 
+	public $yesterDay;//yesterday date
 	
 	public function __construct(){
 		$this->menuItems = [];
 		
+		$this->yesterDay = \Yii::$app->formatter->asDatetime( strtotime('yesterday UTC') );
 		$this->start =  \Yii::$app->formatter->asDatetime( strtotime('today UTC') );
 		$this->tomorrow =  Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
 		$this->startDate =  Yii::$app->formatter->asDate(  strtotime('today UTC') );
@@ -66,7 +68,7 @@ class FrontendMenuStructure{
 			
 			$items = [
 							['label' =>  Yii::t('frontend/account-state','Default account'), 'url' => ['/account/select'] ],
-							['label' =>  Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index'] ],
+							['label' =>  Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index' ,'AccountstateSearch[id_account]' => Account::readDefault(), 'AccountstateSearch[start]' => $this->yesterDay] ],
 							['label' =>  Yii::t('frontend/account-state','Open account state'), 'url' => ['/account-state/open'] ],
 							['label' =>  Yii::t('frontend/account-state','Close account state'), 'url' => ['/account-state/close'] ],
 							

frontend/controllers/AccountStateController.php

@@ -9,179 +9,231 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use common\models\Account;
+use common\components\DailyListing;
+use common\models\User;
 
 /**
  * AccountStateController implements the CRUD actions for AccountState model.
  */
-class AccountStateController extends Controller
-{
-    public function behaviors()
-    {
-        return [
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','open','close'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
-
-    /**
-     * Lists all AccountState models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new AccountstateSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
-
-
-    /**
-     * Creates a new AccountState model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionOpen()
-    {
-    	
-    	$lastStates =  AccountState::readLastForUser(AccountState::TYPE_CLOSE	);
-    	$lastStates = AccountState::modelsToArray($lastStates);
-    	
-        $model = new AccountState();
+class AccountStateController extends Controller {
+	public function behaviors() {
+		return [ 
+				'access' => [ 
+						'class' => \yii\filters\AccessControl::className (),
+						'only' => [ 
+								'index',
+								'open',
+								'close',
+								'view' 
+						],
+						'rules' => [
+								// allow authenticated users
+								[ 
+										'allow' => true,
+										'roles' => [ 
+												'@' 
+										] 
+								] 
+						] 
+				]
+				// everything else is denied
+				
+				 
+		];
+	}
+	
+	/**
+	 * Lists all AccountState models.
+	 *
+	 * @return mixed
+	 */
+	public function actionIndex() {
+		$searchModel = new AccountstateSearch ();
+		
+		$searchModel->accounts = Account::read ();
+		$searchModel->users = User::read ();
+		
+		$dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
+		
+		return $this->render ( 'index', [ 
+				'searchModel' => $searchModel,
+				'dataProvider' => $dataProvider 
+		] );
+	}
+	
+	/**
+	 * Creates a new AccountState model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 *
+	 * @return mixed
+	 */
+	public function actionOpen() {
+		$lastStates = AccountState::readLastForUser ( AccountState::TYPE_CLOSE );
+		$lastStates = AccountState::modelsToArray ( $lastStates );
+		
+		$model = new AccountState ();
 		$model->type = AccountState::TYPE_OPEN;
-		$model->id_user  = Yii::$app->user->id;
-		$model->id_account = Account::readDefault();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-//             return $this->redirect(['view', 'id' => $model->id_account_state]);
-            return $this->redirect(['index' ]);
-        } else {
-        	
-        	$accounts = Account::read();
-        	
-            return $this->render('open', [
-                'model' => $model,
-                'accounts' => $accounts,
-            	'lastStates' => $lastStates,
-            ]);
-        }
-    }
-    /**
-     * Creates a new AccountState model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionClose()
-    {
-    	$lastStates =  AccountState::readLastForUser(AccountState::TYPE_OPEN	);
-    	$lastStates = AccountState::modelsToArray($lastStates);
-        $model = new AccountState();
-        $model->type = AccountState::TYPE_CLOSE;
-        $model->id_user  = Yii::$app->user->id;
-        $model->id_account = Account::readDefault();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['index' ]);
-//             return $this->redirect(['view', 'id' => $model->id_account_state]);
-        } else {
-        	
-        	$accounts = Account::read();
-        	
-            return $this->render('close', [
-                'model' => $model,
-            	'accounts' => $accounts,
-            	'lastStates' => $lastStates,
-            ]);
-        }
-    }
-    
-    
-
-
-
-    /**
-     * Finds the AccountState model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return AccountState the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = AccountState::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-    /**
-     * Creates a new AccountState model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-    public function actionCreate()
-    {
-        $model = new AccountState();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account_state]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
-    }
-     */
-    /**
-     * Updates an existing AccountState model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account_state]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-     */
-    /**
-     * Deletes an existing AccountState model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-        \Yii::$app->session->setFlash( 'success','Kassza művelet törölve' );
-          return $this->redirect(Yii::$app->request->referrer);
-    }
-    /**
-     * Displays a single AccountState model.
-     * @param integer $id
-     * @return mixed
-    
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-     */
+		$model->id_user = Yii::$app->user->id;
+		$model->id_account = Account::readDefault ();
+		if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
+			// return $this->redirect(['view', 'id' => $model->id_account_state]);
+			return $this->redirect ( [ 
+					'index' 
+			] );
+		} else {
+			
+			$accounts = Account::read ();
+			
+			return $this->render ( 'open', [ 
+					'model' => $model,
+					'accounts' => $accounts,
+					'lastStates' => $lastStates 
+			] );
+		}
+	}
+	/**
+	 * Creates a new AccountState model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 *
+	 * @return mixed
+	 */
+	public function actionClose() {
+		$lastStates = AccountState::readLastForUser ( AccountState::TYPE_OPEN );
+		$lastStates = AccountState::modelsToArray ( $lastStates );
+		$model = new AccountState ();
+		$model->type = AccountState::TYPE_CLOSE;
+		$model->id_user = Yii::$app->user->id;
+		$model->id_account = Account::readDefault ();
+		if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
+			return $this->redirect ( [ 
+					'index' 
+			] );
+			// return $this->redirect(['view', 'id' => $model->id_account_state]);
+		} else {
+			
+			$accounts = Account::read ();
+			
+			return $this->render ( 'close', [ 
+					'model' => $model,
+					'accounts' => $accounts,
+					'lastStates' => $lastStates 
+			] );
+		}
+	}
+	
+	/**
+	 * Finds the AccountState model based on its primary key value.
+	 * If the model is not found, a 404 HTTP exception will be thrown.
+	 *
+	 * @param integer $id        	
+	 * @return AccountState the loaded model
+	 * @throws NotFoundHttpException if the model cannot be found
+	 */
+	protected function findModel($id) {
+		if (($model = AccountState::findOne ( $id )) !== null) {
+			return $model;
+		} else {
+			throw new NotFoundHttpException ( 'The requested page does not exist.' );
+		}
+	}
+	/**
+	 * Creates a new AccountState model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 *
+	 * @return mixed public function actionCreate()
+	 *         {
+	 *         $model = new AccountState();
+	 *        
+	 *         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+	 *         return $this->redirect(['view', 'id' => $model->id_account_state]);
+	 *         } else {
+	 *         return $this->render('create', [
+	 *         'model' => $model,
+	 *         ]);
+	 *         }
+	 *         }
+	 */
+	/**
+	 * Updates an existing AccountState model.
+	 * If update is successful, the browser will be redirected to the 'view' page.
+	 *
+	 * @param integer $id        	
+	 * @return mixed public function actionUpdate($id)
+	 *         {
+	 *         $model = $this->findModel($id);
+	 *        
+	 *         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+	 *         return $this->redirect(['view', 'id' => $model->id_account_state]);
+	 *         } else {
+	 *         return $this->render('update', [
+	 *         'model' => $model,
+	 *         ]);
+	 *         }
+	 *         }
+	 */
+	/**
+	 * Deletes an existing AccountState model.
+	 * If deletion is successful, the browser will be redirected to the 'index' page.
+	 *
+	 * @param integer $id        	
+	 * @return mixed
+	 */
+	public function actionDelete($id) {
+		$this->findModel ( $id )->delete ();
+		\Yii::$app->session->setFlash ( 'success', 'Kassza művelet törölve' );
+		return $this->redirect ( Yii::$app->request->referrer );
+	}
+	/*
+	 * Displays a single AccountState model.
+	 * @param integer $id
+	 * $var common\models\AccountState $accountState
+	 * @return mixed
+	 */
+	public function actionView($id) {
+		$accountState = $this->findModel ( $id );
+		$output = Yii::$app->getRequest ()->getQueryParam ( 'output' );
+		$details = null;
+		if ($accountState->isTypeClose ()) {
+			
+			$prev;
+			if ($accountState->type == AccountState::TYPE_CLOSE) {
+				if (isset ( $accountState->prev_state )) {
+					$prev = AccountState::findOne ( $accountState->prev_state );
+				}
+				if (isset ( $prev )) {
+					$accountState->start_date = $prev->created_at;
+				}
+			}
+			$details = new DailyListing ();
+			$details->loadAccountState ( $accountState );
+			
+			$details->readTotalEasy ();
+			$details->readTotalDetailed ();
+			$details->readTotalMedium ();
+		}
+		
+		if ($output == 'pdf') {
+			$user = User::findOne(\Yii::$app->user->id);
+			$mpdf=new \mPDF('utf-8', 'A4-L');
+			$mpdf->useSubstitutions=false;
+			$mpdf->simpleTables = true;
+			$mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: "  .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) );
+			$mpdf->setFooter('{PAGENO} / {nb}');
+			$mpdf->WriteHTML($this->renderPartial("@common/views/account-state/account_state_pdf", [
+					'model' => $accountState,
+					'details' => $details 
+			]));
+			$type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras";
+			$dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username; 
+			$fn= $type .$dt.".pdf";
+			$mpdf->Output($fn, 'D');
+			
+		} else {
+			
+			return $this->render ( 'view', [ 
+					'model' => $accountState,
+					'details' => $details 
+			] );
+		}
+	}
 }

frontend/models/AccountstateSearch.php

@@ -12,12 +12,25 @@ use common\models\AccountState;
  */
 class AccountstateSearch extends AccountState
 {
+	
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+		
+	public $accounts;
+	public $users;
     /**
      * @inheritdoc
      */
     public function rules()
     {
-        return [
+       return [
+            [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+            [[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+       		[ [ 'id_account','id_user' ,'type'  ] , 'integer'],
         ];
     }
 
@@ -54,9 +67,19 @@ class AccountstateSearch extends AccountState
             return $dataProvider;
         }
 
+        
         $query->innerJoinWith('account');
         $query->innerJoinWith('account.userAccountAssignments');
         $query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
+        $query->andFilterWhere([
+        		'account_state.id_user' => $this->id_user,
+        		'account_state.type' => $this->type,
+        		'account_state.id_account' => $this->id_account,
+        ]);
+        
+        $query->andFilterWhere([ '>=', 'account_state.created_at', $this->timestampStart ]   );
+        $query->andFilterWhere([ '<', 'account_state.created_at', $this->timestampEnd ]   );
+        
         $query->orderBy( 'created_at desc'  );
 
         $query->limit = 20;

frontend/views/account-state/_search.php

@@ -2,12 +2,19 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use kartik\widgets\DateTimePicker;
+use frontend\components\HtmlHelper;
+use common\models\AccountState;
 
 /* @var $this yii\web\View */
 /* @var $model frontend\models\AccountstateSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
-
+<?php 
+$accountOptions =   ['' =>'Mind']+ HtmlHelper::mkAccountOptions(  $model->accounts );
+$userOptions = ['' => 'Mind'] +  HtmlHelper::mkOptions($model->users,'id','username');
+$typeOptions =  ['' => 'Mind'] + AccountState::types();
+?>
 <div class="account-state-search">
 
     <?php $form = ActiveForm::begin([
@@ -15,47 +22,41 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_account_state') ?>
 
-    <?= $form->field($model, 'id_account') ?>
+    <div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions)  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'id_user')->dropDownList($userOptions) ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'type')->dropDownList($typeOptions)  ?>
+		</div>
+	</div>
+    
+    <div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])->label('Időszak kezdete')  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])->label("Időszak vége")  ?>
+		</div>
+	</div>
 
-    <?= $form->field($model, 'type') ?>
-
-    <?= $form->field($model, 'money') ?>
-
-    <?= $form->field($model, 'banknote_5_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_10_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_20_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_50_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_100_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_200_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_500_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_1000_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_2000_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_5000_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_10000_ft') ?>
-
-    <?php // echo $form->field($model, 'banknote_20000_ft') ?>
-
-    <?php // echo $form->field($model, 'id_user') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('frontend/account-state', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('frontend/account-state', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

frontend/views/account-state/index.php

@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="account-state-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
         <?= Html::a(Yii::t('frontend/account-state', 'Open Account State'), ['open'], ['class' => 'btn btn-success']) ?>

frontend/views/account-state/view.php

@@ -2,52 +2,117 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\total\TotalEasyWidget;
+use common\components\total\TotalDetailedProductsWidget;
+use common\components\total\TotalDetailedTicketsWidget;
+use common\components\total\TotalDetailedMoneyMovementWidget;
+use common\components\accountstate\BankNotesWidget;
+use common\components\total\TotalMediumTicketsWidget;
+use common\components\total\TotalMediumProductsWidget;
+use common\components\total\TotalMediumMoneyMovementsWidget;
+use common\components\total\TotalDifferenceWidget;
+use yii\base\Widget;
+use common\models\AccountState;
+use yii\helpers\Url;
+use common\components\accountstate\AccountStateWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\AccountState */
-
-$this->title = $model->id_account_state;
+if ( $model ->type == AccountState::TYPE_OPEN ){
+	$this->title = "Kassza nyitás";
+}else{
+	$this->title = "Kassza zárás";
+}
 $this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+
+<style>
+	.btn-pdf{
+		margin-bottom: 6px;
+	}
+	
+	td.money{
+		text-align: right;
+	}
+</style>
 <div class="account-state-view">
 
     <h1><?= Html::encode($this->title) ?></h1>
+    
+    <?php 
+    	if ( $model->hasDifferenceToPrevState() ){
+    		if ( $model->hasMinus()){
+    			?>
+    			<div class="alert alert-danger" role="alert">Negatív különbözet</div>
+    			<?php 
+    		}else{
+    			?>
+    			<div class="alert alert-success" role="alert">Pozitív különbözet</div>
+    			<?php 
+    		}
+    	}
+    ?>
+    <?php echo AccountStateWidget::widget(['model' =>$model]) ?>
+    
+    <?php 
+    	echo Html::a( Html::tag("span","",['class' =>'glyphicon glyphicon-download-alt'])."&nbsp;Pdf", Url::current(['output' =>'pdf']) ,['class' => 'btn btn-primary btn-pdf']);
+    ?>
+    
+    <?php if ( $model->hasDifferenceToPrevState() ){
+    	?>
+    	<h2>Különbözet</h2>
+    	<?php 
+    	echo TotalDifferenceWidget::widget(['model' => $model]	);
+    	
+    }
+    	
+?>
+ <?php if ( $model ->type == AccountState::TYPE_CLOSE ){?>
+    <div>
 
-    <p>
-        <?= Html::a(Yii::t('frontend/account-state', 'Update'), ['update', 'id' => $model->id_account_state], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('frontend/account-state', 'Delete'), ['delete', 'id' => $model->id_account_state], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('frontend/account-state', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
+		<!-- Nav tabs -->
+		<ul class="nav nav-tabs" role="tablist">
+			<li role="presentation" class="active"><a href="#easy"
+				aria-controls="easy" role="tab" data-toggle="tab">Egyszerű összesítő</a></li>
+			<li role="presentation"><a href="#medium" aria-controls="medium"
+				role="tab" data-toggle="tab">Közepes összesítő</a></li>
+			<li role="presentation"><a href="#detailed" aria-controls="detailed"
+				role="tab" data-toggle="tab">Részletes összesítő</a></li>
+			<li role="presentation" class=""><a href="#banknotes"
+				aria-controls="banknotes" role="tab" data-toggle="tab">Címletek</a></li>
+		</ul>
 
-    <?= DetailView::widget([
-        'model' => $model,
-        'attributes' => [
-            'id_account_state',
-            'id_account',
-            'type',
-            'money',
-            'banknote_5_ft',
-            'banknote_10_ft',
-            'banknote_20_ft',
-            'banknote_50_ft',
-            'banknote_100_ft',
-            'banknote_200_ft',
-            'banknote_500_ft',
-            'banknote_1000_ft',
-            'banknote_2000_ft',
-            'banknote_5000_ft',
-            'banknote_10000_ft',
-            'banknote_20000_ft',
-            'id_user',
-            'created_at',
-            'updated_at',
-        ],
-    ]) ?>
+		<!-- Tab panes -->
+		<div class="tab-content">
+			<div role="tabpanel" class="tab-pane active" id="easy">
+			    <?php echo TotalEasyWidget::widget(['dailyListing' => $details]);?>
+			</div>
+			<div role="tabpanel" class="tab-pane  " id="medium">
+			    <h2>Közepes összesítés</h2>
+			    <h3>Bérletek típus szerint</h3>
+			    <?php echo TotalMediumTicketsWidget::widget(['dailyListing' => $details]);?>
+			    <h3>Termékek név szerint</h3>
+			    <?php echo TotalMediumProductsWidget::widget(['dailyListing' => $details]);?>
+			    <h3>Pénzmozgások típus szerint</h3>
+			    <?php echo TotalMediumMoneyMovementsWidget::widget(['dailyListing' => $details]);?>
+			</div>
+			<div role="tabpanel" class="tab-pane  " id="detailed">
+			    <h2>Részletek</h2>
+			    <?php echo TotalDetailedTicketsWidget::widget(['dailyListing' => $details]);?>
+			    <?php echo TotalDetailedProductsWidget::widget(['dailyListing' => $details]);?>
+			    <?php echo TotalDetailedMoneyMovementWidget::widget(['dailyListing' => $details]);?>
+			</div>
+			<div role="tabpanel" class="tab-pane  " id="banknotes">
+			    <h2>Címletek</h2>
+			    <?php echo BankNotesWidget::widget(['model' => $model]);?>
+			</div>
+		</div>
 
 </div>
+<?php }else{?>
+	<h2>Címletek</h2>
+	<?php echo BankNotesWidget::widget(['model' => $model]);?>
+<?php }?>
+
+</div>