rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix account_state ( collection_money ), display product/ticket on reception only for selected account, add daily transfers (reception/admin)

Browse Source
This commit is contained in:
Schneider Roland 2015-12-31 13:52:22 +01:00
parent 72fc139674
commit f59eadd8cc
26 changed files with 1153 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/components/AdminMenuStructure.php
View File

@ -36,8 +36,8 @@ class AdminMenuStructure{
$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 + time()));
$todayDatetime = \Yii::$app->formatter->asDatetime( strtotime('today UTC') );
$tomorrowDatetime = \Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
$todayDatetime = \Yii::$app->formatter->asDatetime( strtotime('today') );
$tomorrowDatetime = \Yii::$app->formatter->asDatetime( strtotime('tomorrow') );
/////////////////////////////
@ -89,7 +89,8 @@ class AdminMenuStructure{
/////////////////////////////
$items = [];
$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
$items[] = ['label' => 'Bevétel', 'url' => ['/transfer/summary' , 'TransferSummarySearch[start]' =>$today,'TransferSummarySearch[end]' => $tomorrow ] ];
// $items[] = ['label' => 'Bevétel', 'url' => ['/transfer/summary' , 'TransferSummarySearch[start]' =>$today,'TransferSummarySearch[end]' => $tomorrow ] ];
$items[] = ['label' => 'Napi bevételek', 'url' => ['/transfer/list', 'TransferListSearch[start]' =>$todayDatetime,'TransferListSearch[end]' => $tomorrowDatetime ] ];
$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
$this->menuItems[] = ['label' => 'Pénzügy', 'url' => $this->emptyUrl,

20
backend/controllers/TransferController.php
View File

@ -10,6 +10,7 @@ use yii\filters\VerbFilter;
use common\models\Account;
use common\models\User;
use backend\models\TransferSummarySearch;
use backend\models\TransferListSearch;
/**
* TransferController implements the CRUD actions for Transfer model.
@ -24,7 +25,7 @@ class TransferController extends \backend\controllers\BackendController
'rules' => [
// allow authenticated users
[
'actions' => [ 'index','view','summary' ],
'actions' => [ 'index','view','summary','list' ],
'allow' => true,
'roles' => ['admin','employee','reception'],
],
@ -58,7 +59,24 @@ class TransferController extends \backend\controllers\BackendController
]);
}
/**
* Lists all Transfer models.
* @return mixed
*/
public function actionList()
{
$searchModel = new TransferListSearch();
$searchModel->accounts = Account::read();
$searchModel->users = User::read();
$searchModel->search(Yii::$app->request->queryParams);
return $this->render('list', [
'searchModel' => $searchModel,
]);
}
/**
* Lists all Transfer models.

21
backend/models/TransferListSearch.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace backend\models;
use Yii;
use common\models\Transfer;
use common\components\RoleDefinition;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListSearch extends \common\models\TransferListSearch
{
protected function addAccountConstraint($query){
if ( !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 ]);
}
}
}

5
backend/views/layouts/content.php
View File

@ -22,5 +22,10 @@ use dmstr\widgets\Alert;
<footer class="main-footer">
&copy; <?= Yii::$app->name ?> <?= Yii::$app->params['version'] ?> Fitness - WebAdmin <?= date('Y') ?>
<div>
Az oldalon szereplő adatok csak tájékoztató jellegűek.
Az adatok helyességéért és igazságtartalmáért felelősséget nem vállalunk.
</div>
</footer>

63
backend/views/transfer/_search_list.php Normal file
View File

@ -0,0 +1,63 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use kartik\widgets\DatePicker;
use frontend\components\HtmlHelper;
use common\models\Transfer;
use kartik\widgets\DateTimePicker;
/* @var $this yii\web\View */
/* @var $model common\models\TransferSearch */
/* @var $form yii\widgets\ActiveForm */
?>
<?php
$accountOptions = ['' =>'Mind']+ HtmlHelper::mkAccountOptions( $model->accounts );
$userOptions = ['' => 'Mind'] + HtmlHelper::mkOptions($model->users,'id','username');
?>
<div class="transfer-search">
<?php $form = ActiveForm::begin([
'action' => ['list'],
'method' => 'get',
]); ?>
<div class="row">
<div class="col-md-4">
<?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
</div>
<div class="col-md-4">
<?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
'pluginOptions' => [
'autoclose'=>true,
'format' => 'yyyy.mm.dd hh:ii'
]
]) ?>
</div>
</div>
<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>
<div class="form-group">
<?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

399
backend/views/transfer/list.php Normal file
View File

@ -0,0 +1,399 @@
<?php
use yii\helpers\Html;
use yii\grid\GridView;
use yii\widgets\ListView;
use yii\base\Widget;
/* @var $this yii\web\View */
/* @var $searchModel common\models\TransferSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = Yii::t ( 'frontend/transfer', 'Daily transfers' );
$this->params ['breadcrumbs'] [] = $this->title;
?>
<style>
.dl-transfer {
margin-bottom: 0px;
}
.item-transfer {
border: 1px solid #b4b4b4;
margin-top: 12px;
padding-top: 6px;
padding-bottom: 6px;
}
td.count, td.money{
text-align: right;
}
td.name{
width: 600px;
}
.table-category-product td.name{
width: 600px;
}
.table-category-product td.count{
text-align: right;
}
.table-category-product td.money{
text-align: right;
}
</style>
<div class="transfer-index">
<h1><?= Html::encode($this->title) ?></h1>
<?php echo $this->render('_search_list', ['model' => $searchModel]); ?>
<div>
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#big"
aria-controls="big" 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>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="big">
<h2>Egyszerű összesítés</h2>
<table class="table table-bordered table-striped table-summary">
<tbody>
<tr>
<th>Bérletek</th>
<td class="money"><?php echo $searchModel->ticketMoney?> FT</td>
</tr>
<tr>
<th>Termékek</th>
<td class="money"><?php echo $searchModel->productMoney?> FT</td>
</tr>
<tr>
<th>Pénzmozgások</th>
<td class="money"><?php echo $searchModel->moneyMovementMoneis?> FT</td>
</tr>
<tr>
<th>Végösszeg</th>
<td class="money"><span style='border-bottom: 1px solid black'><?php echo $searchModel->total?> FT</span></td>
</tr>
</tbody>
</table>
</div>
<div role="tabpanel" class="tab-pane" id="medium">
<h2>Közepes összesítés</h2>
<h3>Bérletek típus szerint</h3>
<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 ( $searchModel->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 $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 $searchModel->ticketMoney; ?> Ft
</div>
</div>
<h3>Termékek kategória szerint</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
<tr>
<th>Termék kategória</th>
<th>Mennyiség</th>
<th>Összeg</th>
</tr>
</thead>
<tbody>
<?php
foreach ( $searchModel->productMoneies as $pm ) {
?>
<tr>
<td class="name"><?php echo $pm['category_name'] ?></td>
<td class="count"><?php echo $pm['category_count']?> Db</td>
<td class="money"><?php echo $pm['product_money']?> FT</td>
</tr>
<?php } ?>
</tbody>
</table>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline;">
Összesen: <?php echo $searchModel->productMoney; ?> Ft
</div>
</div>
<h3>Termékek kategória szerint részletes</h3>
<?php
foreach($searchModel->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 $p['product_money']?> FT</td>
</tr>
<?php }?>
<tr class="warning">
<td><?php echo "Összesen" ?></td>
<td><?php ?></td>
<td class='money'><?php echo $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 $searchModel->productsByCategory['total'];
?>
</div>
</div>
<h3>Pénzmozgások típus szerint</h3>
<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 ( $searchModel->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 $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 $searchModel->moneyMovementMoneis; ?> Ft
</div>
</div>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline; font-weight: bold;">
Végösszeg: <?php echo $searchModel->total; ?> Ft
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="detailed">
<h2>Részletes összesítés</h2>
<?php
//////////////////////////
// Bérletek
////////////////////////
?>
<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 ($searchModel->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 $t['ticket_money']?> FT</td>
</tr>
<?php } ?>
</tbody>
</table>
<?php if ( count($searchModel->tickets ) == 0 ) {
?>
Nincs találat
<?php
}else{?>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline;">
Összesen: <?php echo $searchModel->ticketMoney; ?> Ft
</div>
</div>
<?php
}
?>
<?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 ($searchModel->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 $p['product_money']?> FT</td>
</tr>
<?php } ?>
</tbody>
</table>
<?php if ( count($searchModel->products ) == 0 ) {
?>
Nincs találat
<?php
}else{?>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline;">
Összesen: <?php echo $searchModel->productMoney; ?> Ft
</div>
</div>
<?php
}
?>
<?php
//////////////////////////
// Pénzmozgások
////////////////////////
?>
<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 ($searchModel->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 $p['signed_money']?> Ft</td>
</tr>
<?php } ?>
</tbody>
</table>
<?php if ( count($searchModel->moneyMovements ) == 0 ) {
?>
Nincs találat
<?php
}else{?>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline;">
Összesen: <?php echo $searchModel->moneyMovementMoneis; ?> Ft
</div>
</div>
<?php
}
?>
<div class="row">
<div class="col-md-12 text-right" style="text-decoration: underline; font-weight: bold;">
Végösszeg: <?php echo $searchModel->total; ?> Ft
</div>
</div>
</div>
</div>
</div>
</div>

7
common/config/main.php
View File

@ -1,7 +1,10 @@
<?php
return [
'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
// 'language' => 'hu-HU',
'timezone' => 'Europe/Budapest',
'language' => 'hu',
'components' => [
'cache' => [
@ -21,8 +24,8 @@ return [
'datetimeFormat' => 'yyyy.MM.dd HH:mm',
'timeFormat' => 'HH:mm',
'locale' => 'hu-Hu',
'timeZone' => 'UTC',
'defaultTimeZone' => 'UTC' ,
'timeZone' => 'EUROPE/BUDAPEST',
'defaultTimeZone' => 'EUROPE/BUDAPEST',
'nullDisplay' => "-",
],
'authManager' => [

81
common/models/AccountState.php
View File

@ -26,6 +26,7 @@ use yii\helpers\ArrayHelper;
* @property integer $banknote_10000_ft
* @property integer $banknote_20000_ft
* @property integer $id_user
* @property integer $collection_money
* @property string $created_at
* @property string $updated_at
*/
@ -53,6 +54,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
[['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' ], 'integer'],
[['comment' ], 'string' ,'max' => 255],
[['prev_state' ], 'integer'],
[['id_account'] , 'validatePrevState'],
];
}
@ -87,6 +89,11 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
];
}
public function validatePrevState($attribute,$params){
}
public static function banknoteValues()
{
return [
@ -124,6 +131,10 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
return $this->hasOne( User::className(), ["id" =>"id_user" ] );
}
public function getPrevObject(){
return $this->hasOne( AccountState::className(), ["id_account_state" =>"prev_state" ] );
}
public function getUserName(){
$result = "";
$user = $this->user;
@ -164,40 +175,45 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
* @param $type int the type of accountstate to load
* @param $user $id of user to load the account
* */
public static function readLast($type, $user = null){
public static function readLast($type, $user = null,$account = null){
$result = null;
$query = AccountState::find();
//filter user
if ( isset($user)){
$query->innerJoinWith("account");
$query->innerJoinWith("account.userAccountAssignments");
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
}
//filter type
if ( isset($type)){
$query->andWhere(['account_state.type' => $type]);
}
//filter last
$query->join("INNER JOIN ",
"(select max(created_at) as cdate, id_account from account_state group by id_account) as sq1"
,"sq1.cdate = account_state.created_at and sq1.id_account = account_state.id_account");
if ( $account ){
$query->andWhere(["account_state.id_account" => $account ]);
}
$query->limit(1);
$query->orderBy(['created_at' => SORT_DESC]);
$result = $query->all();
$result = $query->one();
return $result;
}
function beforeSave($insert){
$result = parent::beforeSave($insert);
if ( $result ){
$start = null;
$end = null;
$prev = null;
$this->prev_money = 0;
if ( isset($this->prev_state) ){
$prev = AccountState::findOne($this->prev_state);
if ( $this->type == AccountState::TYPE_CLOSE){
$lastOpen = AccountState::readLast(AccountState::TYPE_OPEN,null, $this->id_account);
if ( $lastOpen != null ){
$start = $lastOpen->created_at;
$this->prev_state = $lastOpen->id_account_state;
$this->prev_money = $lastOpen->money;
}
$end = date("Y-m-d H:i:s");
$this->collection_money = Transfer::readPaid($start, $end, Yii::$app->user->id);
}
if ( $prev != null){
$this->prev_money = $prev->money;
}
}
return $result;
@ -205,12 +221,39 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function hasDifferenceToPrevState(){
$result = false;
if ( isset( $this->prev_state ) && $this->type == self::TYPE_OPEN){
$result = $this->prev_money != $this->money;
if ( $this->type == self::TYPE_CLOSE){
$result = ( $this->prev_money + $this->collection_money) != $this->money;
}
return $result;
}
public function hasPlus(){
$result = false;
if ( $this->type == self::TYPE_CLOSE){
$result = ( $this->prev_money + $this->collection_money) < $this->money;
}
return $result;
}
public function hasMinus(){
$result = false;
if ( $this->type == self::TYPE_CLOSE){
$result =( $this->prev_money + $this->collection_money) > $this->money;
}
return $result;
}
public function getSignedDiff(){
$result = $this->money - ( $this->prev_money + $this->collection_money);
return $result;
}
public function getExpected(){
$result = $this->prev_money + $this->collection_money ;
return $result;
}
public static function readLastForUser($type){
return static::readLast($type, Yii::$app->user->id);
}

29
common/models/Product.php
View File

@ -126,7 +126,33 @@ class Product extends \common\models\BaseFitnessActiveRecord {
return $warehouses;
}
public static function findProduct($query){
/**
* $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
* */
public static function readForDefaultAccount($forceIncludeObjectWithId = null){
$result = null;
$account = Account::readDefault();
if ( $forceIncludeObjectWithId == null){
$query = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC]);
if ( $account )
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
}else{
$query = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' => $forceIncludeObjectWithId ] ])->orderBy(['product.name' => SORT_ASC]);
if ( $account )
$query->andWhere(["product.id_account" => $account]);
$result = $query->all();
}
return $result;
}
public static function findProduct($query, $account = null){
$result = [];
$product = null;
@ -137,6 +163,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
['barcode' => $query ],
]
)->andWhere(['status' =>Product::STATUS_ACTIVE])
->andFilterWhere(['product.id_account' => $account])
->all();

6
common/models/TicketType.php
View File

@ -198,13 +198,13 @@ class TicketType extends \common\models\BaseFitnessActiveRecord {
/**
* $param int $forceIncludeAccount id account, that should be included in list, even if it is inactive
* */
public static function read($forceIncludeObjectWithId = null){
public static function read($forceIncludeObjectWithId = null, $account = null){
$ticketTypes = null;
if ( $forceIncludeObjectWithId == null){
$ticketTypes = TicketType::find()->andWhere(['status' => self::STATUS_ACTIVE])->all();
$ticketTypes = TicketType::find()->andWhere(['status' => self::STATUS_ACTIVE])->andFilterWhere(['ticket_type.id_account' => $account])->all();
}else{
$ticketTypes = TicketType::find()->andWhere( ['or', ['status' => self::STATUS_ACTIVE], ['id_ticket_type' => $forceIncludeObjectWithId ] ])->all();
$ticketTypes = TicketType::find()->andWhere( ['or', ['status' => self::STATUS_ACTIVE], ['id_ticket_type' => $forceIncludeObjectWithId ] ])->andFilterWhere(['ticket_type.id_account' => $account])->all();
}
return $ticketTypes;

19
common/models/Transfer.php
View File

@ -59,7 +59,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
return ArrayHelper::merge( [
[
'class' => TimestampBehavior::className(),
'value' => function(){ return date('Y-m-d H:i:s' ); }
'value' => function(){ return date('Y-m-d H:i:s' ); }
],
[
'class' => DiscountAwareBehavior::className(),
@ -168,7 +168,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
}else if ( $this->type == Transfer::TYPE_PRODUCT ){
$result = $this->productName;
}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
$result = "Pénz kivétel - " . $this->moneyMovement->name;
$result = $this->moneyMovement->humanType;
}
return $result;
}
@ -677,4 +677,19 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
return $result;
}
public static function readPaid($start,$end,$idUser){
$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->andWhere(['transfer.id_user' => $idUser ]);
$created_condition = ['and',[ '>=', 'transfer.created_at', $start ] ,[ '<', 'transfer.created_at', $end ] ];
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $start] ,[ '<', 'transfer.paid_at', $end ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
return $query->scalar();
}
}

390
common/models/TransferListSearch.php Normal file
View File

@ -0,0 +1,390 @@
<?php
namespace common\models;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\Transfer;
use yii\base\Object;
use yii\db\Query;
use yii\db\Expression;
use common\models\Account;
use yii\helpers\ArrayHelper;
use common\models\MoneyMovement;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListSearch extends Transfer
{
public $start;
public $end;
public $timestampStart;
public $timestampEnd;
// public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
// public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
public $totals;
public $accounts;
public $types;
public $users;
/**
* all money gained with ticket sell
* */
public $ticketMoney;
/**
* all money gained with product sell
* */
public $productMoney;
/**
* all money gained with product sell grouped by category
* */
public $productMoneies;
/**
* all money lost by money movement
* */
public $moneyMovementMoneis;
public $moneyMovementMoney;
/**
* total gained money
* */
public $total;
/**
* ticket sale statisitc
* */
public $ticketStats;
/**
* money movements by type
* */
public $moneyMovementsByType;
public $tickets;
/**
* all product transfer
* */
public $products;
public $moneyMovements;
public $productsByCategory;
/**
* @inheritdoc
*/
public function rules()
{
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' ] , 'integer'],
['types', 'each', 'rule' => ['integer']],
];
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
*/
public function search($params)
{
$query = Transfer::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
]);
$this->load($params);
if (!$this->validate()) {
}
$this->readTicketMoney();
$this->readProductsMoney();
$this->readMoneyMovementMoney();
$this->calcTotal();
$this->readProductsByCategory();
$this->readProductsByCategoryDetailed();
$this->readTicketStas();
$this->readMoneyMovementsStats();
$this->readTickets();
$this->readProducts();
$this->readMoneyMovements();
}
protected function calcTotal(){
$this->total = 0;
$this->total += $this->ticketMoney;
$this->total += $this->productMoney;
$this->total += $this->moneyMovementMoneis;
}
protected function addAccountConstraint($query){
$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
$query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
}
protected function addQueryFilters($query){
$this->addAccountConstraint($query);
$query->andFilterWhere([
'transfer.id_account' => $this->id_account,
'transfer.id_user' => $this->id_user,
'transfer.type' => $this->type,
'transfer.id_user' => $this->id_user,
]);
$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ] ];
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
}
protected function readTicketStas(){
$query = (new \yii\db\Query());
$query->select(['ticket_type.name as ticket_type_name' , 'coalesce(sum(abs(transfer.count)),0) AS ticket_count', 'coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->groupBy(['ticket_type.id_ticket_type','ticket_type.name']);
$this->addQueryFilters($query);
$this->ticketStats = $query->all();
}
protected function readTicketMoney(){
$query = (new \yii\db\Query());
$query->select([' coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$this->addQueryFilters($query);
$this->ticketMoney = $query->scalar();
}
protected function readProductsByCategory(){
$query = (new \yii\db\Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as category_count', 'product_category.name as category_name']);
$query->from('transfer');
$query->groupBy(['product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$this->addQueryFilters($query);
$this->productMoneies = $query->all();
}
protected function readProductsByCategoryDetailed(){
$formatted = [];
$formatted['categories'] = [];
$formatted['total'] = 0;
$prevCategory = null;
$curCategory = null;
$category = null;
$query = (new \yii\db\Query());
$query->select(['product_category.id_product_category as product_category_id','product_category.name as product_category_name', 'product.name as product_name' ,'coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as product_count']);
$query->from('transfer');
$query->groupBy(['product.id_product','product.name','product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->orderBy(['product_category.name' => SORT_ASC,'product.name' => SORT_ASC]);
$this->addQueryFilters($query);
$result = $query->all();
foreach ($result as $row){
$curCategory = $row['product_category_id'];
if ( $curCategory != $prevCategory ){
//store last category
if ( $category != null ){
$formatted['categories'][] = $category;
}
$prevCategory = $curCategory;
//create new category
$category = [];
$category['category'] = [];
$category['category']['name'] = $row['product_category_name'];
$category['category']['id'] = $row['product_category_id'];
$category['products'] = [];
$category['total'] = 0;
}
$category['products'][] = $row;
$category['total'] += $row['product_money'];
$formatted['total'] += $row['product_money'];
}
if ( $category != null ){
$formatted['categories'][]= $category;
}
$this->productsByCategory = $formatted;
}
protected function readProductsMoney(){
$query = (new \yii\db\Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$this->addQueryFilters($query);
$this->productMoney = $query->scalar();
}
protected function readMoneyMovementMoney(){
$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 money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$this->addQueryFilters($query);
$this->moneyMovementMoneis = $query->scalar();
}
protected function readMoneyMovementsStats(){
$query = (new \yii\db\Query());
$query->select([ 'money_movement.type as money_movement_type', ' coalesce(count(transfer.id_transfer),0) AS money_movement_count', 'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end ),0) AS money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->groupBy(['money_movement.type']);
$this->addQueryFilters($query);
$this->moneyMovementsByType = $query->all();
for ($i = 0; $i < count($this->moneyMovementsByType) ;$i++ ){
$this->moneyMovementsByType[$i]['name'] = MoneyMovement::typeName($this->moneyMovementsByType[$i]['money_movement_type']);
}
}
protected function readTickets(){
$query = (new \yii\db\Query());
$query->select(['user.username as user_name', 'account.name as account_name','ticket_type.name as ticket_type_name' , 'transfer.count AS ticket_count', 'transfer.money AS ticket_money','transfer.item_price AS ticket_item_price', 'transfer.created_at as ticket_created_at','transfer.paid_at as ticket_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->innerJoin("user", "transfer.id_user = user.id");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->tickets = $query->all();
for ($i = 0; $i < count($this->tickets) ;$i++ ){
$this->tickets[$i]['ticket_created_at'] = Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->tickets[$i]['ticket_paid_at'] = empty($this->tickets[$i]['ticket_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
}
protected function readProducts(){
$query = (new \yii\db\Query());
$query->select([ 'user.username as user_name','account.name as account_name' , 'product_category.name as product_category_name', 'product.name as product_name', 'transfer.money AS product_money', 'transfer.count AS product_count', 'transfer.money AS product_money','transfer.item_price AS product_item_price', 'transfer.created_at as product_created_at','transfer.paid_at as product_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->innerJoin("user", "transfer.id_user = user.id");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->products = $query->all();
for ($i = 0; $i < count($this->products) ;$i++ ){
$this->products[$i]['product_created_at'] = Yii::$app->formatter->asDatetime($this->products[$i]['product_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->products[$i]['product_paid_at'] = empty($this->products[$i]['product_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->products[$i]['product_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
}
protected function readMoneyMovements(){
$query = (new \yii\db\Query());
$query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->innerJoin("user", "transfer.id_user = user.id");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->moneyMovements = $query->all();
for ($i = 0; $i < count($this->moneyMovements) ;$i++ ){
$this->moneyMovements[$i]['money_movement_type_name'] = MoneyMovement::typeName($this->moneyMovements[$i]['money_movement_type']);
$this->moneyMovements[$i]['money_movement_created_at'] = Yii::$app->formatter->asDatetime($this->moneyMovements[$i]['money_movement_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->moneyMovements[$i]['signed_money'] = Transfer::toSignedMoney($this->moneyMovements[$i]['transfer_direction'],$this->moneyMovements[$i]['money_movement_money']);
}
}
}

7
common/views/common/_account_statistic.php
View File

@ -1,6 +1,12 @@
<?php
use common\components\AccountTotalWidget;
?>
<div class='row'>
<div class='col-md-4'>
<a class="btn btn-primary" style="margin-bottom: 6px" onclick="javascript: $('#account_stat_panels').toggle();">Statisztika mutatása/elrejtése</a>
</div>
</div>
<div id='account_stat_panels' style="display: none;">
<div class='row'>
<div class='col-md-4'>
<?php
@ -61,4 +67,5 @@ use common\components\AccountTotalWidget;
<div class='col-md-4'>
</div>
</div>
</div>

27
console/migrations/m151231_095117_alter__table__account_state__add__column__collection_money.php Normal file
View File

@ -0,0 +1,27 @@
<?php
use yii\db\Schema;
use yii\db\Migration;
class m151231_095117_alter__table__account_state__add__column__collection_money extends Migration
{
public function up()
{
$this->addColumn("account_state", "collection_money", "int");
}
public function down()
{
}
/*
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
}
public function safeDown()
{
}
*/
}

49
frontend/components/AccountStateBanknoteCountWidget.php
View File

@ -18,7 +18,11 @@ class AccountStateBanknoteCountWidget extends Widget{
$panelStyleClas = 'panel-default';
if ( $this->model->hasDifferenceToPrevState()){
$panelStyleClas = 'panel-danger';
if ( $this->model->hasPlus()){
$panelStyleClas = 'panel-success';
}else if ( $this->model->hasMinus() ){
$panelStyleClas = 'panel-danger';
}
}
$s = "";
@ -27,8 +31,51 @@ class AccountStateBanknoteCountWidget extends Widget{
$s .= "Kassza művelet - " . $this->model->typeName;
$s .= Html::endTag("div");
$s .= Html::beginTag("div",['class' => 'panel-body '] );
$s .= $this->generateInfoRow();
$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 .= $this->generateComment();
$s .= Html::endTag("div");
$s .= Html::endTag("div");

7
frontend/components/FrontendMenuStructure.php
View File

@ -7,6 +7,7 @@ use yii\helpers\Html;
use common\models\MoneyMovement;
use yii\db\Query;
use common\models\AccountState;
use backend\models\AccountSearch;
class FrontendMenuStructure{
@ -20,8 +21,8 @@ class FrontendMenuStructure{
public function __construct(){
$this->menuItems = [];
$this->start = Yii::$app->formatter->asDatetime( strtotime('today UTC') );
$this->tomorrow = Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
$this->start = \Yii::$app->formatter->asDatetime( strtotime('today') );
$this->tomorrow = Yii::$app->formatter->asDatetime( strtotime('tomorrow') );
$this->startDate = Yii::$app->formatter->asDate( strtotime('today UTC') );
$this->tomorrowDate = Yii::$app->formatter->asDate( strtotime('tomorrow UTC') );
@ -30,7 +31,7 @@ class FrontendMenuStructure{
if ( $this->isLogged() ){
$lastAccountState = AccountState::find()->andWhere(['id_user' => Yii::$app->user->id])->orderBy(['account_state.created_at' => SORT_DESC])->limit(1)->one();
$lastAccountState = AccountState::find()->andWhere(['id_user' => Yii::$app->user->id])->andWhere(['type' => AccountState::TYPE_OPEN ])->orderBy(['account_state.created_at' => SORT_DESC])->limit(1)->one();
if ( isset($lastAccountState) ){
$this->start = Yii::$app->formatter->asDatetime(strtotime( $lastAccountState->created_at . ' UTC' ));
}

3
frontend/controllers/AccountStateController.php
View File

@ -84,6 +84,8 @@ class AccountStateController extends Controller
*/
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;
@ -97,6 +99,7 @@ class AccountStateController extends Controller
return $this->render('close', [
'model' => $model,
'accounts' => $accounts,
'lastStates' => $lastStates,
]);
}
}

5
frontend/controllers/ProductController.php
View File

@ -82,7 +82,7 @@ class ProductController extends Controller
$model->customer = $this->customer;
$model->card = $this->card;
$products = Product::read();
$products = Product::readForDefaultAccount();
$products = Product::modelToMapIdName($products);
$model->products = $products;
@ -199,7 +199,7 @@ class ProductController extends Controller
public function actionLookup($query = null)
{
$result = [];
$product = Product::findProduct($query);
$product = Product::findProduct($query, Account::readDefault());
$product = Product::modelToArray($product);
$result['product'] = $product;
@ -207,7 +207,6 @@ class ProductController extends Controller
\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return $result;
}

2
frontend/controllers/TicketController.php
View File

@ -97,7 +97,7 @@ class TicketController extends FrontendController
$discounts = Discount::read();
$ticketTypes = TicketType::read();
$ticketTypes = TicketType::read(null, Account::readDefault());
$accounts = Account::readAccounts();

356
frontend/models/TransferListSearch.php
View File

@ -16,360 +16,8 @@ use common\models\MoneyMovement;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListSearch extends Transfer
class TransferListSearch extends \common\models\TransferListSearch
{
public $start;
public $end;
public $timestampStart;
public $timestampEnd;
// public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
// public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
// public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
public $totals;
public $accounts;
public $types;
/**
* all money gained with ticket sell
* */
public $ticketMoney;
/**
* all money gained with product sell
* */
public $productMoney;
/**
* all money gained with product sell grouped by category
* */
public $productMoneies;
/**
* all money lost by money movement
* */
public $moneyMovementMoneis;
public $moneyMovementMoney;
/**
* total gained money
* */
public $total;
/**
* ticket sale statisitc
* */
public $ticketStats;
/**
* money movements by type
* */
public $moneyMovementsByType;
public $tickets;
/**
* all product transfer
* */
public $products;
public $moneyMovements;
public $productsByCategory;
/**
* @inheritdoc
*/
public function rules()
{
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' ] , 'integer'],
['types', 'each', 'rule' => ['integer']],
];
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
*/
public function search($params)
{
$query = Transfer::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
]);
$this->load($params);
if (!$this->validate()) {
}
$this->readTicketMoney();
$this->readProductsMoney();
$this->readMoneyMovementMoney();
$this->calcTotal();
$this->readProductsByCategory();
$this->readProductsByCategoryDetailed();
$this->readTicketStas();
$this->readMoneyMovementsStats();
$this->readTickets();
$this->readProducts();
$this->readMoneyMovements();
}
protected function calcTotal(){
$this->total = 0;
$this->total += $this->ticketMoney;
$this->total += $this->productMoney;
$this->total += $this->moneyMovementMoneis;
}
protected function addQueryFilters($query){
$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
$query->andWhere(['transfer.id_user' => Yii::$app->user->id ]);
$query->andFilterWhere([
'transfer.id_account' => $this->id_account,
'transfer.type' => $this->type,
'transfer.id_user' => $this->id_user,
]);
$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ] ];
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
}
protected function readTicketStas(){
$query = (new \yii\db\Query());
$query->select(['ticket_type.name as ticket_type_name' , 'coalesce(sum(abs(transfer.count)),0) AS ticket_count', 'coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->groupBy(['ticket_type.id_ticket_type','ticket_type.name']);
$this->addQueryFilters($query);
$this->ticketStats = $query->all();
}
protected function readTicketMoney(){
$query = (new \yii\db\Query());
$query->select([' coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$this->addQueryFilters($query);
$this->ticketMoney = $query->scalar();
}
protected function readProductsByCategory(){
$query = (new \yii\db\Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as category_count', 'product_category.name as category_name']);
$query->from('transfer');
$query->groupBy(['product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$this->addQueryFilters($query);
$this->productMoneies = $query->all();
}
protected function readProductsByCategoryDetailed(){
$formatted = [];
$formatted['categories'] = [];
$formatted['total'] = 0;
$prevCategory = null;
$curCategory = null;
$category = null;
$query = (new \yii\db\Query());
$query->select(['product_category.id_product_category as product_category_id','product_category.name as product_category_name', 'product.name as product_name' ,'coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as product_count']);
$query->from('transfer');
$query->groupBy(['product.id_product','product.name','product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->orderBy(['product_category.name' => SORT_ASC,'product.name' => SORT_ASC]);
$this->addQueryFilters($query);
$result = $query->all();
foreach ($result as $row){
$curCategory = $row['product_category_id'];
if ( $curCategory != $prevCategory ){
//store last category
if ( $category != null ){
$formatted['categories'][] = $category;
}
$prevCategory = $curCategory;
//create new category
$category = [];
$category['category'] = [];
$category['category']['name'] = $row['product_category_name'];
$category['category']['id'] = $row['product_category_id'];
$category['products'] = [];
$category['total'] = 0;
}
$category['products'][] = $row;
$category['total'] += $row['product_money'];
$formatted['total'] += $row['product_money'];
}
if ( $category != null ){
$formatted['categories'][]= $category;
}
$this->productsByCategory = $formatted;
}
protected function readProductsMoney(){
$query = (new \yii\db\Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$this->addQueryFilters($query);
$this->productMoney = $query->scalar();
}
protected function readMoneyMovementMoney(){
$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 money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$this->addQueryFilters($query);
$this->moneyMovementMoneis = $query->scalar();
}
protected function readMoneyMovementsStats(){
$query = (new \yii\db\Query());
$query->select([ 'money_movement.type as money_movement_type', ' coalesce(count(transfer.id_transfer),0) AS money_movement_count', 'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end ),0) AS money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->groupBy(['money_movement.type']);
$this->addQueryFilters($query);
$this->moneyMovementsByType = $query->all();
for ($i = 0; $i < count($this->moneyMovementsByType) ;$i++ ){
$this->moneyMovementsByType[$i]['name'] = MoneyMovement::typeName($this->moneyMovementsByType[$i]['money_movement_type']);
}
}
protected function readTickets(){
$query = (new \yii\db\Query());
$query->select(['account.name as account_name','ticket_type.name as ticket_type_name' , 'transfer.count AS ticket_count', 'transfer.money AS ticket_money','transfer.item_price AS ticket_item_price', 'transfer.created_at as ticket_created_at','transfer.paid_at as ticket_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->tickets = $query->all();
for ($i = 0; $i < count($this->tickets) ;$i++ ){
$this->tickets[$i]['ticket_created_at'] = Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->tickets[$i]['ticket_paid_at'] = empty($this->tickets[$i]['ticket_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
}
protected function readProducts(){
$query = (new \yii\db\Query());
$query->select([ 'account.name as account_name' , 'product_category.name as product_category_name', 'product.name as product_name', 'transfer.money AS product_money', 'transfer.count AS product_count', 'transfer.money AS product_money','transfer.item_price AS product_item_price', 'transfer.created_at as product_created_at','transfer.paid_at as product_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->products = $query->all();
for ($i = 0; $i < count($this->products) ;$i++ ){
$this->products[$i]['product_created_at'] = Yii::$app->formatter->asDatetime($this->products[$i]['product_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->products[$i]['product_paid_at'] = empty($this->products[$i]['product_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->products[$i]['product_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
}
protected function readMoneyMovements(){
$query = (new \yii\db\Query());
$query->select([ 'account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->moneyMovements = $query->all();
for ($i = 0; $i < count($this->moneyMovements) ;$i++ ){
$this->moneyMovements[$i]['money_movement_type_name'] = MoneyMovement::typeName($this->moneyMovements[$i]['money_movement_type']);
$this->moneyMovements[$i]['money_movement_created_at'] = Yii::$app->formatter->asDatetime($this->moneyMovements[$i]['money_movement_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->moneyMovements[$i]['signed_money'] = Transfer::toSignedMoney($this->moneyMovements[$i]['transfer_direction'],$this->moneyMovements[$i]['money_movement_money']);
}
}
}

1
frontend/views/account-state/close.php
View File

@ -13,7 +13,6 @@ $this->params['breadcrumbs'][] = $this->title;
AccountStateAsset::register($this);
$options = [];
$this->registerJs ( 'new AccountState( '. json_encode($options).');' );
?>
<div class="account-state-create">

9
frontend/views/layouts/main.php
View File

@ -68,7 +68,14 @@ AppAsset::register($this);
<div class="container">
<p class="pull-left">&copy; <?= Yii::$app->name ?> <?= Yii::$app->params['version'] ?> Fitness - WebAdmin <?= date('Y') ?></p>
<p class="pull-right"><?= Yii::powered() ?></p>
</div>
<div class="container">
<div>
Az oldalon szereplő adatok csak tájékoztató jellegűek.<br>
Az adatok helyességéért és igazságtartalmáért felelősséget nem vállalunk.<br>
Az oldal nem használható hivatalos adatforrásként.<br>
</div>
</div>
</footer>

3
frontend/views/product/sale.php
View File

@ -6,6 +6,7 @@ use frontend\assets\ProductSellAsset;
use frontend\components\ReceptionWidget;
use yii\bootstrap\ActiveForm;
use yii\helpers\Url;
use yii\helpers\ArrayHelper;
/* @var $this yii\web\View */
/* @var $form yii\bootstrap\ActiveForm */
@ -82,7 +83,7 @@ $this->params['breadcrumbs'][] = Yii::t('frontend/product', 'Sale');
}
</style>
<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
<div class='row '>

1
frontend/views/ticket/create.php
View File

@ -30,6 +30,7 @@ $options['clear_cart_url'] = Url::toRoute(['product/clear-list']);
$options['types'] = TicketType::modelsToArray($ticketTypes);
$options['user_cart'] = $model->userCart;
$options['customer_cart'] = $model->customerCart;
$options['selected_type'] = count($ticketTypes) > 0 ? $ticketTypes[0]->id_ticket_type : 0;
$this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
?>

4
frontend/views/transfer/_view.php
View File

@ -1,6 +1,7 @@
<?php
use yii\helpers\Html;
use common\models\Transfer;
/* @var $this yii\web\View */
@ -35,6 +36,9 @@ $formatter = Yii::$app->formatter;
<dl class="dl-horizontal dl-transfer">
<dt><?php echo $model->getAttributeLabel( 'type') ?></dt>
<dd><?php echo Html::getAttributeValue($model, 'transferTypeName') ?></dd>
<dt>Megnevezés</dt>
<dd><?php echo Html::getAttributeValue($model, 'objectName') ?></dd>
<dt><?php echo $model->getAttributeLabel( 'id_user') ?></dt>
<dd><?php echo Html::getAttributeValue($model, 'userName') ?></dd>

36
frontend/views/transfer/list.php
View File

@ -232,6 +232,11 @@ td.name{
</div>
<div role="tabpanel" class="tab-pane" id="detailed">
<h2>Részletes összesítés</h2>
<?php
//////////////////////////
// Bérletek
////////////////////////
?>
<h3>Bérletek</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
@ -239,6 +244,7 @@ td.name{
<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>
@ -248,13 +254,14 @@ td.name{
<tbody>
<?php foreach ($searchModel->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['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 $t['ticket_money']?> FT</td>
<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 $t['ticket_money']?> FT</td>
</tr>
<?php } ?>
@ -275,6 +282,11 @@ td.name{
<?php
}
?>
<?php
//////////////////////////
// Termék eladás
////////////////////////
?>
<h3>Termék eladások</h3>
<table class="table table-bordered table-striped table-summary">
<thead>
@ -282,6 +294,7 @@ td.name{
<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>
@ -295,6 +308,7 @@ td.name{
<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>
@ -320,13 +334,18 @@ td.name{
<?php
}
?>
<?php
//////////////////////////
// Pénzmozgások
////////////////////////
?>
<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>
@ -337,6 +356,7 @@ td.name{
<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 $p['signed_money']?> Ft</td>