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

Merge branch 'release/0.1.19'

Browse Source
This commit is contained in:
Roland Schneider 2019-09-23 07:08:18 +02:00
commit ee85fba11a
11 changed files with 216 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/controllers/TransferController.php
View File

@ -283,7 +283,7 @@ class TransferController extends \backend\controllers\BackendController
$searchModel->totalsTransfers();
$users = User::read();
if ( $searchModel->output == 'xls'){
if ( $searchModel->output === 'xls'){
set_time_limit(0);
return $this->downloadIndexXls($searchModel,$dataProvider);
}
@ -299,6 +299,10 @@ class TransferController extends \backend\controllers\BackendController
/**
* @param $searchModel \backend\models\TicketSearch
* @param $dataProvider \yii\data\ActiveDataProvider
* @throws \PHPExcel_Exception
* @throws \PHPExcel_Reader_Exception
* @throws \PHPExcel_Writer_Exception
* @throws \yii\base\InvalidConfigException
*/
private function downloadIndexXls($searchModel, $dataProvider){
@ -446,7 +450,7 @@ class TransferController extends \backend\controllers\BackendController
$searchModel->search(Yii::$app->request->queryParams);
if ( $searchModel->output == 'pdf'){
if ( $searchModel->output === 'pdf'){
$user = User::findOne(\Yii::$app->user->id);
$mpdf=new \mPDF('utf-8', 'A4-L');
$fn = "";
@ -468,13 +472,13 @@ class TransferController extends \backend\controllers\BackendController
if ( isset($searchModel->timestampEnd) ){
$interval .="_ig_". \Yii::$app->formatter->asDatetime($searchModel->timestampEnd,'yyyyMMdd_HHmm');
}
if ( $searchModel->outputView == 'easy'){
if ( $searchModel->outputView === 'easy'){
$ov = '_total_easy';
$fn="napi_bevetelek_egyszeru";
}else if ( $searchModel->outputView == 'medium'){
}else if ( $searchModel->outputView === 'medium'){
$ov = '_total_medium';
$fn="napi_bevetelek_kozepes";
}else if ( $searchModel->outputView == 'detailed'){
}else if ( $searchModel->outputView === 'detailed'){
$ov = '_total_detailed';
$fn="napi_bevetelek_reszletes";
}else{

2
backend/models/TicketSearchCustomer.php
View File

@ -254,7 +254,7 @@ class TicketSearchCustomer extends Ticket
}
public static function mkSearchCondition( $timestampStart, $timestampEnd, $id_user,$id_ticket_tpye,$id_account,$valid_in_interval ,$expire_in_interval,$created_in_interval ){
public static function mkSearchCondition( $timestampStart, $timestampEnd, $id_user,$id_ticket_type,$id_account,$valid_in_interval ,$expire_in_interval,$created_in_interval ){
$query = Ticket::find();
Helper::queryAccountConstraint($query, 'ticket.id_account');

86
backend/models/TransferSearch.php
View File

@ -7,7 +7,6 @@ use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\Transfer;
use yii\db\Expression;
use yii\base\Object;
use yii\db\Query;
use yii\helpers\ArrayHelper;
use common\models\Account;
@ -19,9 +18,7 @@ use common\components\RoleDefinition;
*/
class TransferSearch extends Transfer
{
public $searchObjectName;
public $searchTypeName;
public $searchUserName;
public $start;
public $end;
@ -42,6 +39,9 @@ class TransferSearch extends Transfer
public $output;
public $bought_in_interval = false;
public $payed_in_interval = false;
/**
* @inheritdoc
*/
@ -50,12 +50,12 @@ class TransferSearch extends Transfer
return [
[['id_account', 'id_user', 'type', 'status', 'payment_method','paid_by'], 'integer'],
[['customer_name','output','transfer_name', 'card_number' ], 'safe'],
// [[ 'searchObjectName' ], 'string'],
// [[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
// [[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
[['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'],
['types', 'each', 'rule' => ['integer']],
[['bought_in_interval','payed_in_interval'],'boolean'] ,
];
}
@ -73,12 +73,12 @@ class TransferSearch extends Transfer
* @return Expression the payment method expression
*/
private function buildPaymentMethodExpression(){
$s = "case";
$s = 'case';
$arr = Transfer::paymentMethods();
foreach ( $arr as $key =>$value ){
$s .= " when transfer.payment_method = $key then '$value' ";
}
$s .=" end as transfer_payment_method";
$s .= ' end as transfer_payment_method';
return new Expression($s);
}
@ -100,7 +100,7 @@ class TransferSearch extends Transfer
{
$query = new Query();
if ($mode == 'select') {
if ($mode === 'select') {
$query->select([
'transfer.id_transfer as transfer_id_transfer',
new Expression('case
@ -134,22 +134,22 @@ class TransferSearch extends Transfer
when transfer.type = ' . Transfer::TYPE_PRODUCT . ' then sale.comment
when transfer.type = ' . Transfer::TYPE_MONEY_MOVEMENT_OUT . ' then money_movement.comment end as all_comment'),
]);
}else if ( $mode == 'total'){
}else if ( $mode === 'total'){
$query->select([
new Expression('coalesce(sum(transfer.count),0) as total_count'),
new Expression('coalesce(sum(transfer.money),0) as total_money'),
]);
}
$query->from("transfer");
$query->from('transfer');
$query->innerJoin('account', 'account.id_account = transfer.id_account');
$query->innerJoin('user', " user.id = transfer.id_user");
$query->leftJoin('customer', " transfer.id_customer = customer.id_customer");
$query->leftJoin('card', " card.id_card = customer.id_customer_card");
$query->leftJoin('user as paid_by', " paid_by.id = transfer.paid_by");
$query->leftJoin('ticket', "ticket.id_ticket = transfer.id_object and transfer.type = " . Transfer::TYPE_TICKET);
$query->leftJoin('sale', "sale.id_sale = transfer.id_object and transfer.type = " . Transfer::TYPE_PRODUCT);
$query->leftJoin('money_movement', "money_movement.id_money_movement = transfer.id_object and transfer.type = " . Transfer::TYPE_MONEY_MOVEMENT_OUT);
$query->leftJoin('ticket_type', "ticket_type.id_ticket_type = ticket.id_ticket_type");
$query->innerJoin('user', ' user.id = transfer.id_user');
$query->leftJoin('customer', ' transfer.id_customer = customer.id_customer');
$query->leftJoin('card', ' card.id_card = customer.id_customer_card');
$query->leftJoin('user as paid_by', ' paid_by.id = transfer.paid_by');
$query->leftJoin('ticket', 'ticket.id_ticket = transfer.id_object and transfer.type = ' . Transfer::TYPE_TICKET);
$query->leftJoin('sale', 'sale.id_sale = transfer.id_object and transfer.type = ' . Transfer::TYPE_PRODUCT);
$query->leftJoin('money_movement', 'money_movement.id_money_movement = transfer.id_object and transfer.type = ' . Transfer::TYPE_MONEY_MOVEMENT_OUT);
$query->leftJoin('ticket_type', 'ticket_type.id_ticket_type = ticket.id_ticket_type');
$query->leftJoin('product', 'product.id_product = sale.id_product');
if (!$valid) {
@ -158,7 +158,7 @@ class TransferSearch extends Transfer
}
if (!RoleDefinition::isAdmin()) {
$query->innerJoin("user_account_assignment", 'transfer.id_account = user_account_assignment.id_account');
$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(['account.type' => Account::TYPE_ALL]);
@ -180,10 +180,29 @@ class TransferSearch extends Transfer
}
$query->andFilterWhere(['in', 'transfer.type', $this->types]);
$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]);
$all = ($this->bought_in_interval && $this->payed_in_interval)
|| ( !$this->bought_in_interval && !$this->payed_in_interval);
$orConditions = [];
if ( $all || $this->bought_in_interval){
$created_condition = ['and', ['>=', 'transfer.created_at', $this->timestampStart], ['<', 'transfer.created_at', $this->timestampEnd]];
$orConditions[] = $created_condition;
}
if ( $all || $this->payed_in_interval ){
$paid_condition = ['and', ['>=', 'transfer.paid_at', $this->timestampStart], ['<', 'transfer.paid_at', $this->timestampEnd]];
$orConditions[] = $paid_condition;
}
if ( count($orConditions) === 2){
$query->andFilterWhere(['or', $orConditions[0], $orConditions[1]]);
}else if ( count($orConditions) === 1 ){
$query->andFilterWhere($orConditions[0]);
}
if (isset($this->id_user)) {
$query->andFilterWhere([
@ -250,24 +269,17 @@ class TransferSearch extends Transfer
]
];
if ($this->output == 'pdf' || $this->output == 'xls') {
if ($this->output === 'pdf' || $this->output === 'xls') {
$dataProviderSetup['pagination'] = false;
};
$dataProvider = new ActiveDataProvider($dataProviderSetup);
return new ActiveDataProvider($dataProviderSetup);
return $dataProvider;
}
public function totalsTransfers()
{
$accountTotals = [];
$fullTotal = [
'label' => Yii::t('common/transfer', 'Total'),
'money' => 0
];
$accounts = Account::read();
$accountMap = ArrayHelper::map($accounts, 'id_account', 'name');
@ -276,7 +288,7 @@ class TransferSearch extends Transfer
/**mk totals need date time format*/
$start = $this->timestampStart;
if (isset($start) && !empty($start)) {
$start .= " 00:00";
$start .= ' 00:00';
}
@ -285,5 +297,17 @@ class TransferSearch extends Transfer
}
public function attributeLabels()
{
return
array_merge(
parent::attributeLabels() ,
[
'bought_in_interval' => 'Kiadva az időszakban',
'payed_in_interval' => 'Fizetve az időszakban',
]
);
}
}

1
backend/models/TransferSummarySearch.php
View File

@ -55,7 +55,6 @@ class TransferSummarySearch extends Transfer
{
return [
[[ 'id_account','id_user', 'type'], 'integer'],
// [[ 'searchObjectName' ], 'string'],
[[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
[[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
['types', 'each', 'rule' => ['integer']],

10
backend/views/transfer/_search.php
View File

@ -75,6 +75,16 @@ use kartik\widgets\DateTimePicker;
<div class='col-md-3'>
</div>
</div>
<div class="row">
<div class="col-md-3">
<?php echo $form->field($model, 'bought_in_interval')->checkbox( ) ?>
</div>
<div class="col-md-3">
<?php echo $form->field($model, 'payed_in_interval')->checkbox( ) ?>
</div>
</div>
<div class="form-group">
<?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
</div>

9
backend/views/transfer/_search_list.php
View File

@ -53,6 +53,15 @@ use kartik\widgets\DateTimePicker;
</div>
</div>
<div class="row">
<div class="col-md-3">
<?= $form->field($model, 'bought_in_interval')->checkbox( ) ?>
</div>
<div class="col-md-3">
<?= $form->field($model, 'payed_in_interval')->checkbox( ) ?>
</div>
</div>
<div class="form-group">
<?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
</div>

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.1.19
- add payed_at/ bought at filters for transfer index and list
-0.1.18
- rewrite new bank account for cutler four
-0.1.17

2
common/config/params.php
View File

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

14
common/models/Transfer.php
View File

@ -149,7 +149,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
'types' => Yii::t ( 'common/transfer', 'Types' ),
'start' => Yii::t ( 'common/transfer', 'Start' ),
'end' => Yii::t ( 'common/transfer', 'End' ),
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' )
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' ) ,
'bought_in_interval' => Yii::t ( 'common/transfer', 'Kiadva az időszaban' ),
'payed_in_interval' => Yii::t ( 'common/transfer', 'Fizetve az időszaban' )
];
}
public function getUser() {
@ -713,17 +715,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
Transfer::STATUS_STORNO
] );
if ($mode == 'created_at') {
if ($mode === 'created_at') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'paid_at') {
} else if ($mode === 'paid_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'created_at_not_paid') {
} else if ($mode === 'created_at_not_paid') {
self::notPaid ( $query, 'transfer.paid_at', $start, $end );
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'created_at_paid') {
} else if ($mode === 'created_at_paid') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'paid_at_not_created_at') {
} else if ($mode === 'paid_at_not_created_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
self::notInInterval ( $query, 'transfer.created_at', $start, $end );
}

198
common/models/TransferListSearch.php
View File

@ -3,25 +3,18 @@
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;
use common\components\RoleDefinition;
use common\components\Helper;
use yii\db\Query;
/**
* TransferListSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListSearch extends Transfer
{
public $mode = "reception";//reception or admin
public $mode = 'reception';//reception or admin
/**start date string*/
public $start;
@ -100,6 +93,9 @@ class TransferListSearch extends Transfer
public $output;
public $outputView;
public $bought_in_interval = false;
public $payed_in_interval = true;
/**
@ -117,29 +113,37 @@ class TransferListSearch extends Transfer
['types', 'each', 'rule' => ['integer']],
['output', 'safe' ],
['outputView', 'safe' ],
[['bought_in_interval','payed_in_interval'],'boolean'] ,
// ['start', 'validateStart']
];
}
public function validateStart($attribute,$param){
public function validateStart($attribute,$param = null){
if ( $this->isStartDateToEarly() ){
$this->addError($attribute,"Érvénytelen kezdő dátum");
$this->addError($attribute, 'Érvénytelen kezdő dátum');
}
}
protected function calcStartDaysSinceToday(){
$start = $this->timestampStart;
$now = time();
$now = new \DateTime();
$d = \DateTime::createFromFormat("Y-m-d H:i", $start)->getTimeStamp();
$days_between = ceil(abs($now - $d) / 86400);
return $days_between;
$dt = \DateTime::createFromFormat('Y-m-d H:i', $start);
return $now->diff($dt)->days;
// $d = $dt->getTimeStamp();
// $days_between = ceil(abs($now->getTimestamp() - $d) / 86400);
// echo $days_between . " vs " . $diff->days;
//
// return $days_between;
}
protected function isStartDateToEarly(){
@ -150,26 +154,28 @@ class TransferListSearch extends Transfer
public function isModeAdmin(){
return $this->mode == 'admin';
return $this->mode === 'admin';
}
public function isModeReception(){
return $this->mode == 'reception';
return $this->mode === 'reception';
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
* @return void
* @throws \yii\base\InvalidConfigException
*/
public function search($params)
{
$query = Transfer::find();
// ini_set("memory_limit","128");
// $query = Transfer::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
]);
// $dataProvider = new ActiveDataProvider([
// 'query' => $query,
// ]);
@ -177,6 +183,7 @@ class TransferListSearch extends Transfer
if (!$this->validate()) {
// TODO: FIX
}
@ -243,11 +250,15 @@ class TransferListSearch extends Transfer
$this->totalNetto += $this->productMoneyNetto;
$this->totalNetto += $this->moneyMovementMoneis;
}
/**
* @param Query $query
*/
protected function addAccountConstraint($query){
if (!$this->isModeAdmin() || !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
$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()){
@ -259,13 +270,14 @@ class TransferListSearch extends Transfer
}
}
/**
* add common transfer conditions.
* mode and role will be used to build to correct condition
* */
* @param Query $query
*/
protected function addQueryFilters($query){
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->innerJoin('account', 'transfer.id_account = account.id_account');
$this->addAccountConstraint($query);
@ -274,19 +286,35 @@ class TransferListSearch extends Transfer
'transfer.type' => $this->type,
'transfer.paid_by' => $this->id_user,
]);
$all = ($this->bought_in_interval && $this->payed_in_interval)
|| ( !$this->bought_in_interval && !$this->payed_in_interval);
$orConditions = [];
if ( $all || $this->bought_in_interval){
$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ] ];
$orConditions[] = $created_condition;
}
if ( $all || $this->payed_in_interval ){
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$orConditions[] = $paid_condition;
}
if ( count($orConditions) === 2){
$query->andFilterWhere(['or', $orConditions[0], $orConditions[1]]);
}else if ( count($orConditions) === 1 ){
$query->andFilterWhere($orConditions[0]);
}
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
if ( !$this->isModeAdmin()){
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
}
@ -300,7 +328,7 @@ class TransferListSearch extends Transfer
if ( $this->isStartDateToEarly() ){
$days = Helper::getReceptionVisibilityDays();
$time = date( "Y-m-d H:i:s", strtotime("today -$days day") );
$time = date( 'Y-m-d H:i:s', strtotime("today -$days day") );
$start_date_condition = ['or',[ '>=', 'transfer.created_at', $time ] ,[ '>=', 'transfer.paid_at', $time] ];
@ -315,12 +343,12 @@ class TransferListSearch extends Transfer
protected function readTicketStas(){
$query = (new \yii\db\Query());
$query = (new 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->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']);
$query->orderBy(['ticket_type.name' => SORT_ASC]);
@ -333,11 +361,11 @@ class TransferListSearch extends Transfer
protected function readTicketMoney(){
$query = (new \yii\db\Query());
$query = (new 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");
$query->innerJoin('ticket', 'ticket.id_ticket = transfer.id_object');
$this->addQueryFilters($query);
$this->ticketMoney = $query->scalar();
}
@ -345,14 +373,14 @@ class TransferListSearch extends Transfer
protected function readProductsByCategory(){
$query = (new \yii\db\Query());
$query = (new 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");
$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();
@ -370,14 +398,14 @@ class TransferListSearch extends Transfer
$category = null;
$query = (new \yii\db\Query());
$query = (new 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->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);
@ -417,11 +445,11 @@ class TransferListSearch extends Transfer
protected function readProductsMoney(){
$query = (new \yii\db\Query());
$query = (new 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");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$this->addQueryFilters($query);
$this->productMoney = $query->scalar();
@ -430,13 +458,13 @@ class TransferListSearch extends Transfer
protected function readProductsMoneyNetto(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['coalesce(sum(transfer.count * GREATEST(( product.sale_price - coalesce(product.purchase_price,0)),0)),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$query->innerJoin('product', 'sale.id_product = product.id_product');
$this->addQueryFilters($query);
$this->productMoneyNetto = $query->scalar();
@ -445,46 +473,47 @@ class TransferListSearch extends Transfer
protected function readMoneyMovementMoney(){
$query = (new \yii\db\Query());
$query = (new 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");
$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 = (new 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->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++ ){
$count = count($this->moneyMovementsByType);
for ($i = 0; $i < $count ;$i++ ){
$this->moneyMovementsByType[$i]['name'] = MoneyMovement::typeName($this->moneyMovementsByType[$i]['money_movement_type']);
}
}
protected function readTickets(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([ 'customer.name as customer_name', '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("customer","customer.id_customer = transfer.id_customer");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->innerJoin("user", "transfer.paid_by = user.id");
$query->innerJoin('ticket', 'ticket.id_ticket = transfer.id_object');
$query->innerJoin('customer', 'customer.id_customer = transfer.id_customer');
$query->innerJoin('ticket_type', 'ticket.id_ticket_type = ticket_type.id_ticket_type');
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->tickets = $query->all();
for ($i = 0; $i < count($this->tickets) ;$i++ ){
$count = count($this->tickets);
for ($i = 0; $i < $count ;$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');
}
@ -493,40 +522,45 @@ class TransferListSearch extends Transfer
protected function readProducts(){
$query = (new \yii\db\Query());
$query = (new 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('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("user", "transfer.paid_by = user.id");
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->products = $query->all();
for ($i = 0; $i < count($this->products) ;$i++ ){
$count = count($this->products);
for ($i = 0; $i < $count ;$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');
}
}
/**
* @throws \yii\base\InvalidConfigException
*/
protected function readMoneyMovements(){
$query = (new \yii\db\Query());
$query = new 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', 'money_movement.comment as money_movement_comment' ]);
$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("user", "transfer.paid_by = user.id");
$query->innerJoin('money_movement', 'money_movement.id_money_movement = transfer.id_object');
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->moneyMovements = $query->all();
for ($i = 0; $i < count($this->moneyMovements) ;$i++ ){
$count = count($this->moneyMovements);
for ($i = 0; $i < $count ;$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']);

6
docker/start.sh
View File

@ -1,14 +1,18 @@
#!/usr/bin/env bash
PROJECT_DIR=$(pwd)/..
PORT=86
HOST=localhost
docker run \
-v ${PROJECT_DIR}:/var/www/html/fitness_web \
--rm \
-d \
-p 86:80 \
-p ${PORT}:80 \
--name fitness-web \
--hostname test.fintess_web.hu \
--link mariadb1:mariadb1 \
-e XDEBUG_CONFIG="idekey=PHPSTORM" \
docker_fitness-ub-php-7:latest
echo "started http://"${HOST}:${PORT}