diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php index 5bea588..dac05e7 100644 --- a/backend/controllers/TransferController.php +++ b/backend/controllers/TransferController.php @@ -14,6 +14,7 @@ use backend\models\TransferListSearch; use backend\models\TransferSaleSearch; use common\models\ProductCategory; use common\models\Product; +use backend\models\TransferListUserGroupedSearch; /** * TransferController implements the CRUD actions for Transfer model. @@ -28,7 +29,7 @@ class TransferController extends \backend\controllers\BackendController 'rules' => [ // allow authenticated users [ - 'actions' => [ 'index','view','summary','list',"sale","sale-pdf" ], + 'actions' => [ 'index','view','summary','list',"sale","sale-pdf" ,'list-user-grouped'], 'allow' => true, 'roles' => ['admin','employee','reception'], ], @@ -75,7 +76,75 @@ class TransferController extends \backend\controllers\BackendController $searchModel->search(Yii::$app->request->queryParams); - return $this->render('list', [ + if ( $searchModel->output == 'pdf'){ + $user = User::findOne(\Yii::$app->user->id); + $mpdf=new \mPDF('utf-8', 'A4-L'); + $fn = ""; + $ov = '_total_content_pdf'; + $dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username; + $interval=""; + $account = ""; + $currentUser= ""; + if ( isset($searchModel->currentAccount) ){ + $account =( "_kassza_".$searchModel->currentAccount->name); + } + + if ( isset($searchModel->currentUser) ){ + $currentUser = ( "_felhasznalo_".$searchModel->currentUser->username); + } + if ( isset($searchModel->timestampStart) ){ + $interval .="_tol_". \Yii::$app->formatter->asDatetime($searchModel->timestampStart,'yyyyMMdd_HHmm'); + } + if ( isset($searchModel->timestampEnd) ){ + $interval .="_ig_". \Yii::$app->formatter->asDatetime($searchModel->timestampEnd,'yyyyMMdd_HHmm'); + } + if ( $searchModel->outputView == 'easy'){ + $ov = '_total_easy'; + $fn="napi_bevetelek_egyszeru"; + }else if ( $searchModel->outputView == 'medium'){ + $ov = '_total_medium'; + $fn="napi_bevetelek_kozepes"; + }else if ( $searchModel->outputView == 'detailed'){ + $ov = '_total_detailed'; + $fn="napi_bevetelek_reszletes"; + }else{ + $ov = '_total_content_pdf'; + $fn="napi_bevetelek.teljes"; + } + $fn = $fn. $interval . $dt .$account .$currentUser. ".pdf"; + + $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($ov, [ + 'searchModel' => $searchModel, + ])); + $mpdf->Output($fn, 'D'); + exit; + }else{ + return $this->render('list', [ + 'searchModel' => $searchModel, + ]); + } + + } + + + /** + * Lists all Transfer models. + * @return mixed + */ + public function actionListUserGrouped() + { + $searchModel = new TransferListUserGroupedSearch(); + $searchModel->accounts = Account::read(); + $searchModel->users = User::read(); + + $searchModel->search(Yii::$app->request->queryParams); + + + return $this->render('list_user_grouped', [ 'searchModel' => $searchModel, ]); @@ -88,6 +157,7 @@ class TransferController extends \backend\controllers\BackendController public function actionSale() { $searchModel = new TransferSaleSearch(); + $searchModel->mode = 'admin'; $searchModel->accounts = Account::read(); $searchModel->users = User::read(); $searchModel->productCategories = ProductCategory::read(); @@ -104,6 +174,7 @@ class TransferController extends \backend\controllers\BackendController public function actionSalePdf(){ $searchModel = new TransferSaleSearch(); + $searchModel->mode = 'admin'; $searchModel->accounts = Account::read(); $searchModel->users = User::read(); $searchModel->productCategories = ProductCategory::read(); diff --git a/backend/models/TransferListSearch.php b/backend/models/TransferListSearch.php index 088740b..bdee8e3 100644 --- a/backend/models/TransferListSearch.php +++ b/backend/models/TransferListSearch.php @@ -12,17 +12,23 @@ use common\models\Account; class TransferListSearch extends \common\models\TransferListSearch { + public function init(){ + parent::init(); + $this->mode = 'admin'; + } + + 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 ]); - $query->andWhere(['account.type' => Account::TYPE_ALL ]); +// 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 ]); +// $query->andWhere(['account.type' => Account::TYPE_ALL ]); - if ( RoleDefinition::isReception()){ - $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); - } +// if ( RoleDefinition::isReception()){ +// $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); +// } - } +// } } } diff --git a/backend/models/TransferListUserGroupedSearch.php b/backend/models/TransferListUserGroupedSearch.php new file mode 100644 index 0000000..868caaa --- /dev/null +++ b/backend/models/TransferListUserGroupedSearch.php @@ -0,0 +1,43 @@ +mode = 'admin'; + } + + + public function search($params) + { + + $this->load($params); + + if (!$this->validate()) { + } + + $listing = new DailyListing(); + $listing->mode = $this->mode; + $listing->loadFilters($this); + + $this->ticketMoneyByUser = $listing->readTicketMoneyByUser(); + + + + } + + +} diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 6360048..9eb7bf3 100644 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -16,7 +16,7 @@ use yii\helpers\Html;
- Web Recepció + Adminisztráció
diff --git a/backend/views/transfer/_list_pdf_head.php b/backend/views/transfer/_list_pdf_head.php new file mode 100644 index 0000000..114fa31 --- /dev/null +++ b/backend/views/transfer/_list_pdf_head.php @@ -0,0 +1,61 @@ + + +output == 'pdf'){ + ?> + '> + +outputView ) || $type == 'full' ){?> +

+ + outputView == 'easy'){ + echo $this->render('_view_search_list',['searchModel'=>$searchModel]); + } + else if ( $searchModel->outputView == 'medium'){ + echo $this->render('_view_search_list',['searchModel'=>$searchModel]); + } + else if ( $searchModel->outputView == 'detailed'){ + echo $this->render('_view_search_list',['searchModel'=>$searchModel]); + }else if ( $type == 'full'){ + echo $this->render('_view_search_list',['searchModel'=>$searchModel]); + } + } + +?> \ No newline at end of file diff --git a/backend/views/transfer/_search_list_user_grouped.php b/backend/views/transfer/_search_list_user_grouped.php new file mode 100644 index 0000000..c5e6ddf --- /dev/null +++ b/backend/views/transfer/_search_list_user_grouped.php @@ -0,0 +1,63 @@ + + +'Mind']+ HtmlHelper::mkAccountOptions( $model->accounts ); + $userOptions = ['' => 'Mind'] + HtmlHelper::mkOptions($model->users,'id','username'); +?> + +
+ + ['list'], + 'method' => 'get', + ]); ?> + + +
+
+ field($model, 'start')->widget(DateTimePicker::classname(), [ + 'pluginOptions' => [ + 'autoclose'=>true, + 'format' => 'yyyy.mm.dd hh:ii' + ] + ]) ?> + +
+
+ field($model, 'end') ->widget(DateTimePicker::classname(), [ + 'pluginOptions' => [ + 'autoclose'=>true, + 'format' => 'yyyy.mm.dd hh:ii' + ] + ]) ?> +
+
+
+
+ field($model, 'id_account')->dropDownList($accountOptions) ?> +
+
+ field($model, 'id_user')->dropDownList($userOptions) ?> +
+
+ +
+ 'btn btn-primary']) ?> +
+ + + + +
diff --git a/backend/views/transfer/_total_content.php b/backend/views/transfer/_total_content.php new file mode 100644 index 0000000..796b967 --- /dev/null +++ b/backend/views/transfer/_total_content.php @@ -0,0 +1,9 @@ +
+ render('_total_easy', ['searchModel' => $searchModel]); ?> +
+
+ render('_total_medium', ['searchModel' => $searchModel]); ?> +
+
+ render('_total_detailed', ['searchModel' => $searchModel]); ?> +
diff --git a/backend/views/transfer/_total_content_pdf.php b/backend/views/transfer/_total_content_pdf.php new file mode 100644 index 0000000..3ae76a8 --- /dev/null +++ b/backend/views/transfer/_total_content_pdf.php @@ -0,0 +1,8 @@ +render('_list_pdf_head',[ 'searchModel' =>$searchModel, 'label' => 'Napi bevételek','type' =>'full']); +?> + render('_total_easy', ['searchModel' => $searchModel]); ?> + + render('_total_medium', ['searchModel' => $searchModel]); ?> + + render('_total_detailed', ['searchModel' => $searchModel]); ?> diff --git a/backend/views/transfer/_total_detailed.php b/backend/views/transfer/_total_detailed.php new file mode 100644 index 0000000..37dc47c --- /dev/null +++ b/backend/views/transfer/_total_detailed.php @@ -0,0 +1,175 @@ + +render('_list_pdf_head',[ 'searchModel' =>$searchModel, 'label' => 'Napi bevételek - Rézsletes','type' =>'detailed']); +?> +

Részletes összesítés

+ +

Bérletek

+ output) ){ + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf']); + echo Html::a("Teljes PDF letöltése", $pdfUrl,['class' => 'btn btn-primary btn-all' ]); + + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf', Html::getInputName($searchModel, 'outputView') => 'detailed']); + echo Html::a("Egyszerű összesítő Pdf", $pdfUrl,['class' => 'btn btn-primary' ]); + } + ?> + + + + + + + + + + + + + + + tickets as $t ){?> + + + + + + + + + + + + + +
KiadvaFizetveKasszaFelhasználóBérlet típusEgység árMennyiségÖsszeg
Ft Db FT
+ tickets ) == 0 ) { + ?> + Nincs találat + + +
+
+ Összesen: ticketMoney; ?> Ft + +
+
+ + + +

Termék eladások

+ + + + + + + + + + + + + + + + products as $p ){?> + + + + + + + + + + + + + + +
KiadvaFizetveKasszaFelhasználóKategóriaTermékEgység árMennyiségÖsszeg
Ft Db FT
+ products ) == 0 ) { + ?> + Nincs találat + + +
+
+ Összesen: productMoney; ?> Ft +
+
+ + + +

Pénzmozgások

+ + + + + + + + + + + + + moneyMovements as $p ){?> + + + + + + + + + + + +
DátumKasszaFelhasználóNévTípusÖsszeg
Ft
+ moneyMovements ) == 0 ) { + ?> + Nincs találat + + +
+
+ Összesen: moneyMovementMoneis; ?> Ft + +
+
+ + +
+
+ Végösszeg: total; ?> Ft + +
+
\ No newline at end of file diff --git a/backend/views/transfer/_total_easy.php b/backend/views/transfer/_total_easy.php new file mode 100644 index 0000000..2e9a7aa --- /dev/null +++ b/backend/views/transfer/_total_easy.php @@ -0,0 +1,69 @@ + + +render('_list_pdf_head',[ 'searchModel' =>$searchModel, 'label' => 'Napi bevételek - Egyszerű','type' =>'easy']); +?> + +

Egyszerű összesítés

+ output) ){ + + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf']); + echo Html::a("Teljes PDF letöltése", $pdfUrl,['class' => 'btn btn-primary btn-all' ]); + + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf', Html::getInputName($searchModel, 'outputView') => 'easy']); + echo Html::a("Egyszerű összesítő Pdf", $pdfUrl,['class' => 'btn btn-primary' ]); + } + + +?> +

Bruttó

+ + + + + + + + + + + + + + + + + + + +
BérletekticketMoney?> FT
TermékekproductMoney?> FT
PénzmozgásokmoneyMovementMoneis?> FT
Végösszeg bruttótotal?> FT
+ + +

Nettó

+ + + + + + + + + + + + + + + + + + + +
BérletekticketMoney?> FT
TermékekproductMoneyNetto?> FT
PénzmozgásokmoneyMovementMoneis?> FT
Végösszeg nettótotalNetto?> FT
+ diff --git a/backend/views/transfer/_total_medium.php b/backend/views/transfer/_total_medium.php new file mode 100644 index 0000000..0bc2842 --- /dev/null +++ b/backend/views/transfer/_total_medium.php @@ -0,0 +1,158 @@ + +render('_list_pdf_head',[ 'searchModel' =>$searchModel, 'label' => 'Napi bevételek - Közepes', 'type' =>'medium']); +?> +

Közepes összesítés

+ +output) ){ + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf']); + echo Html::a("Teljes PDF letöltése", $pdfUrl,['class' => 'btn btn-primary btn-all' ]); + $pdfUrl = Url::current([ Html::getInputName($searchModel, 'output') => 'pdf', Html::getInputName($searchModel, 'outputView') => 'medium']); + echo Html::a("Közepes összesítő Pdf", $pdfUrl,['class' => 'btn btn-primary' ]); + } + + +?> + +

Bérletek típus szerint

+ + + + + + + + + + ticketStats as $ticketStat ) { + ?> + + + + + + + +
Bérlet típusMennyiségÖsszeg
Db FT
+ +
+
+ Összesen: ticketMoney; ?> Ft + +
+
+

Termékek kategória szerint

+ + + + + + + + + + productMoneies as $pm ) { + ?> + + + + + + + +
Termék kategóriaMennyiségÖsszeg
Db FT
+
+
+ Összesen: productMoney; ?> Ft + +
+
+ +

Termékek kategória szerint részletes

+ + productsByCategory['categories'] as $categoryHolder ){ + + $products = $categoryHolder['products']; + ?> +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TermékMennyiségÖsszeg
Db FT
FT
+ +
+
+ Összesen: + productsByCategory['total']; + ?> +
+
+ +

Pénzmozgások típus szerint

+ + + + + + + + + + moneyMovementsByType as $mmStat ) { + ?> + + + + + + + +
Pénzmozgás típusMennyiségÖsszeg
Db FT
+
+
+ Összesen: moneyMovementMoneis; ?> Ft +
+
+ +
+
+ Végösszeg: total; ?> Ft +
+
diff --git a/backend/views/transfer/_view_easy_total.php b/backend/views/transfer/_view_easy_total.php new file mode 100644 index 0000000..9512b01 --- /dev/null +++ b/backend/views/transfer/_view_easy_total.php @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + +
Bérletek FT +
Termékek FT
Pénzmozgások FT
Végösszeg bruttó FT
\ No newline at end of file diff --git a/backend/views/transfer/_view_search_list.php b/backend/views/transfer/_view_search_list.php new file mode 100644 index 0000000..e9c3d5d --- /dev/null +++ b/backend/views/transfer/_view_search_list.php @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + +
+ Időszak kezdete + + start?> + + Időszak vége + + end?> +
+ Kassza + + currentAccount)){ + echo $searchModel->currentAccount->name; + }else{ + echo "Mind"; + } + ?> + + Felhasználó + + currentUser)){ + echo $searchModel->currentUser->username; + }else{ + echo "Mind"; + } + ?> +
\ No newline at end of file diff --git a/backend/views/transfer/list.php b/backend/views/transfer/list.php index b688f85..d896246 100644 --- a/backend/views/transfer/list.php +++ b/backend/views/transfer/list.php @@ -3,9 +3,11 @@ use yii\helpers\Html; use yii\grid\GridView; use yii\widgets\ListView; use yii\base\Widget; +use common\components\RoleDefinition; +use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $searchModel common\models\TransferSearch */ +/* @var $searchModel common\models\TransferListSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ $this->title = Yii::t ( 'frontend/transfer', 'Daily transfers' ); @@ -42,6 +44,10 @@ td.name{ .table-category-product td.money{ text-align: right; } + +.btn-all{ + margin-right: 6px; +}
@@ -49,347 +55,43 @@ td.name{

title) ?>

render('_search_list', ['model' => $searchModel]); ?> + currentUser) ){ + ?> + + + + + + +
+ Felhasználó: + + currentUser->username?> +
+ + +
- +
-
-

Egyszerű összesítés

- - - - - - - - - - - - - - - - - - - -
BérletekticketMoney?> FT
TermékekproductMoney?> FT
PénzmozgásokmoneyMovementMoneis?> FT
Végösszegtotal?> FT
-
-
-

Közepes összesítés

- -

Bérletek típus szerint

- - - - - - - - - - ticketStats as $ticketStat ) { - ?> - - - - - - - -
Bérlet típusMennyiségÖsszeg
Db FT
- -
-
- Összesen: ticketMoney; ?> Ft - -
-
-

Termékek kategória szerint

- - - - - - - - - - productMoneies as $pm ) { - ?> - - - - - - - -
Termék kategóriaMennyiségÖsszeg
Db FT
-
-
- Összesen: productMoney; ?> Ft - -
-
- -

Termékek kategória szerint részletes

- - productsByCategory['categories'] as $categoryHolder ){ - - $products = $categoryHolder['products']; - ?> -

- - - - - - - - - - - - - - - - - - - - - - - - - -
TermékMennyiségÖsszeg
Db FT
FT
- -
-
- Összesen: - productsByCategory['total']; - ?> -
-
- -

Pénzmozgások típus szerint

- - - - - - - - - - moneyMovementsByType as $mmStat ) { - ?> - - - - - - - -
Pénzmozgás típusMennyiségÖsszeg
Db FT
-
-
- Összesen: moneyMovementMoneis; ?> Ft - -
-
- -
-
- Végösszeg: total; ?> Ft - -
-
-
-
-

Részletes összesítés

- -

Bérletek

- - - - - - - - - - - - - - - tickets as $t ){?> - - - - - - - - - - - - - -
KiadvaFizetveKasszaFelhasználóBérlet típusEgység árMennyiségÖsszeg
Ft Db FT
- tickets ) == 0 ) { - ?> - Nincs találat - - -
-
- Összesen: ticketMoney; ?> Ft - -
-
- - -

Termék eladások

- - - - - - - - - - - - - - - - products as $p ){?> - - - - - - - - - - - - - - -
KiadvaFizetveKasszaFelhasználóKategóriaTermékEgység árMennyiségÖsszeg
Ft Db FT
- products ) == 0 ) { - ?> - Nincs találat - - -
-
- Összesen: productMoney; ?> Ft - -
-
- - -

Pénzmozgások

- - - - - - - - - - - - - moneyMovements as $p ){?> - - - - - - - - - - - -
DátumKasszaFelhasználóNévTípusÖsszeg
Ft
- moneyMovements ) == 0 ) { - ?> - Nincs találat - - -
-
- Összesen: moneyMovementMoneis; ?> Ft - -
-
- - -
-
- Végösszeg: total; ?> Ft - -
-
-
+ render('_total_content', ['searchModel' => $searchModel]); ?>
-
diff --git a/backend/views/transfer/list_user_grouped.php b/backend/views/transfer/list_user_grouped.php new file mode 100644 index 0000000..a0d142a --- /dev/null +++ b/backend/views/transfer/list_user_grouped.php @@ -0,0 +1,66 @@ +title = Yii::t ( 'frontend/transfer', 'Daily transfers' ); +$this->params ['breadcrumbs'] [] = $this->title; +?> + + +
+ +

title) ?>

+ render('_search_list_user_grouped', ['model' => $searchModel]); ?> + + + ticketMoneyByUser as $user){ + echo "

".$user['username']."

"; + } + ?> + + + + + + +
diff --git a/changelog.txt b/changelog.txt index 66a5cb6..40d21cd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +-0.0.17 + - fix helper::fixascii function + - admin pdf download -0.0.16 - add paid_by to transfer - customer/user cart post instead of ajax diff --git a/common/components/DailyListing.php b/common/components/DailyListing.php new file mode 100644 index 0000000..c3013f6 --- /dev/null +++ b/common/components/DailyListing.php @@ -0,0 +1,532 @@ +start = $transfer->start; + $this->end = $transfer->end; + $this->id_account = $transfer->id_account; + $this->id_user = $transfer->id_user; + $this->types = $transfer->types; + $this->type = $transfer->type; + $this->timestampStart = $transfer->timestampStart; + $this->timestampEnd = $transfer->timestampEnd; + } + + public function isModeAdmin(){ + return $this->mode == 'admin'; + } + + + public function calcTotal(){ + $this->total = 0; + $this->total += $this->ticketMoney; + $this->total += $this->productMoney; + $this->total += $this->moneyMovementMoneis; + } + public function calcTotalNetto(){ + $this->totalNetto = 0; + $this->totalNetto += $this->ticketMoney; + $this->totalNetto += $this->productMoneyNetto; + $this->totalNetto += $this->moneyMovementMoneis; + } + + + public function addAccountConstraint($query){ + 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()){ + $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); + } + + + $query->andWhere(['account.type' => Account::TYPE_ALL ]); + } + + } + + /** + * add common transfer conditions. + * mode and role will be used to build to correct condition + * */ + public function addQueryFilters($query){ + $query->innerJoin("account", "transfer.id_account = account.id_account"); + + $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]); + + } + + + public 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(); + } + + + public 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(); + } + + public function readTicketStasByUser(){ + + $query = (new \yii\db\Query()); + $query->select([ 'user.id as user_id','user.username as user_username','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("user", "transfer.id_user = user.id"); + + $query->groupBy([ 'user.id as user_id','user.username as user_username','ticket_type.id_ticket_type','ticket_type.name']); + $this->addQueryFilters($query); + + $this->ticketStatsByUser = $query->all(); + } + + + public function readTicketMoneyByUser(){ + + $query = (new \yii\db\Query()); + $query->select(['user.id as user_id','user.username as user_username',' 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("user", "transfer.id_user = user.id"); + $query->orderBy(['user.username' => SORT_ASC]); + $this->addQueryFilters($query); + $this->ticketMoneyByUser = $query->all(); + $this->ticketMoneyByUser = $this->toArrayByUser($this->ticketMoneyByUser); + return $this->ticketMoneyByUser; + } + + public 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(); + + } + + + public 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; + + } + + public 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(); + + } + + public function readProductsMoneyByUser(){ + + + $query = (new \yii\db\Query()); + $query->select(['user.id as user_id','user.username as user_username','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("user", "transfer.id_user = user.id"); + $query->groupBy([ 'user.id as user_id','user.username as user_username','ticket_type.id_ticket_type','transfer.money']); + $this->addQueryFilters($query); + + $this->productMoneyByUser = $query->all(); + + } + public function readProductsMoneyNetto(){ + + + $query = (new \yii\db\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->innerJoin("sale", "sale.id_sale = transfer.id_object"); + $query->innerJoin("product", "sale.id_product = product.id_product"); + $this->addQueryFilters($query); + + $this->productMoneyNetto = $query->scalar(); + + } + public function readProductsMoneyNettoByUser(){ + + + $query = (new \yii\db\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->innerJoin("sale", "sale.id_sale = transfer.id_object"); + $query->innerJoin("product", "sale.id_product = product.id_product"); + $query->innerJoin("user", "transfer.id_user = user.id"); + $query->groupBy([ 'user.id as user_id','user.username as user_username','ticket_type.id_ticket_type','transfer.count' ,'product.sale_price','product.purchase_price']); + $this->addQueryFilters($query); + + $this->productMoneyNetto = $query->all(); + + } + + + public 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(); + } + public 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']); + } + } + public function readMoneyMovementMoneyByUser(){ + $query = (new \yii\db\Query()); + $query->select(['user.id as user_id','user.username as user_username',' 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("user", "transfer.id_user = user.id"); + $query->groupBy([ 'user.id as user_id','user.username as user_username' ]); + + $this->addQueryFilters($query); + + $this->moneyMovementMoneisByUser = $query->scalar(); + } + public function readMoneyMovementsStatsByUser(){ + $query = (new \yii\db\Query()); + $query->select([ 'user.id as user_id','user.username as user_username','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("user", "transfer.id_user = user.id"); + $query->groupBy([ 'user.id as user_id','user.username as user_username','money_movement.type']); + $this->addQueryFilters($query); + + $this->moneyMovementsByTypeByUser = $query->all(); + for ($i = 0; $i < count($this->moneyMovementsByTypeByUser) ;$i++ ){ + $this->moneyMovementsByTypeByUser[$i]['name'] = MoneyMovement::typeName($this->moneyMovementsByTypeByUser[$i]['money_movement_type']); + } + + $this->moneyMovementsByTypeByUser = $this->toArrayByUser($this->moneyMovementsByTypeByUser); + + } + + public function readTickets(){ + $query = (new \yii\db\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.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'); + } + + } + + public 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("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'); + } + + } + + public 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("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']); + } + } + + + protected function toArrayByUser($flat, $totalField = null){ + $result = []; + $id_user_prev = null; + $id_user = null; + $arr; + + foreach ( $flat as $item){ + $id_user = $item['user_id']; + + if ($id_user_prev == null || $id_user != $id_user_prev){ + if ($id_user_prev != null ){ + $result[] = $arr; + } + $arr =[]; + $arr['username'] = $item['user_username']; + $arr['items'] = []; + $arr['user_id'] = $id_user; + $arr['total'] = 0; + } + + $id_user_prev = $id_user; + + $arr['items'][] = $item; + if ( isset($totalField)){ + $arr['total'] += $item[$totalField]; + } + + } + + if ( isset($arr ) && count($arr) > 0 ){ + $result[] = $arr; + } + return $result; + } + +} diff --git a/common/components/Helper.php b/common/components/Helper.php index df1cde6..207265b 100644 --- a/common/components/Helper.php +++ b/common/components/Helper.php @@ -87,9 +87,15 @@ class Helper public static function fixAsciiChars($in){ $out = str_replace("ö", "0", $in); - $out = str_replace("Ö", "0", $in); + $out = str_replace("Ö", "0", $out); return $out; } + public static function isCompanyMovar(){ + return \Yii::$app->params['company'] == 'movar'; + } + public static function isProductVisibilityAccount(){ + return \Yii::$app->params['product_visiblity'] == 'account'; + } } \ No newline at end of file diff --git a/common/config/params.php b/common/config/params.php index 1c5e887..bb9dfb9 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -3,5 +3,8 @@ return [ 'adminEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com', 'user.passwordResetTokenExpire' => 3600, - 'version' => 'v0.0.16' + 'version' => 'v0.0.17', + 'company' => 'movar',//gyor + 'company_name' => "Freimann Kft.", + 'product_visiblity' => 'account',// on reception which products to display. account or global ]; diff --git a/common/models/Card.php b/common/models/Card.php index 136e643..fda6585 100644 --- a/common/models/Card.php +++ b/common/models/Card.php @@ -68,7 +68,8 @@ class Card extends \common\models\BaseFitnessActiveRecord public function validateAscii($attribute,$params){ if ( !$this->hasErrors($this->$attribute)){ - $this->attribute = Helper::fixAsciiChars($this->attributes); + $this->$attribute = Helper::fixAsciiChars($this->$attribute); + Yii::info(" $attribute converted to: " . $this->$attribute); } } diff --git a/common/models/Product.php b/common/models/Product.php index 8ad2b07..3113161 100644 --- a/common/models/Product.php +++ b/common/models/Product.php @@ -50,6 +50,10 @@ class Product extends \common\models\BaseFitnessActiveRecord { [['description'], 'string', 'max' => 255], [['product_number'], 'unique' ], [['barcode'], 'unique' ], + // a1 and a2 need to be unique together, only a1 will receive error message +// ['a1', 'unique', 'targetAttribute' => ['a1', 'a2']] + ['barcode', 'unique', 'targetAttribute' => ['id_account', 'barcode']], + ['product_number', 'unique', 'targetAttribute' => ['id_account', 'product_number']], ]; } @@ -143,13 +147,13 @@ class Product extends \common\models\BaseFitnessActiveRecord { if ( $forceIncludeObjectWithId == null){ $query = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC]); - if ( $account ) + if ( Helper::isProductVisibilityAccount() && $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 ) + if ( Helper::isProductVisibilityAccount() && $account ) $query->andWhere(["product.id_account" => $account]); $result = $query->all(); @@ -163,16 +167,20 @@ class Product extends \common\models\BaseFitnessActiveRecord { $result = []; $product = null; - $products = Product::find() + $query = Product::find() ->andWhere( ['or', ['product_number' => $query ], ['barcode' => $query ], ] - )->andWhere(['status' =>Product::STATUS_ACTIVE]) - ->andFilterWhere(['product.id_account' => $account]) - ->all(); + )->andWhere(['status' =>Product::STATUS_ACTIVE]); + + if ( Helper::isProductVisibilityAccount() && $account ){ + $query->andFilterWhere(['product.id_account' => $account]); + } + + $products = $query->all(); if ( count($products) == 1 ){ $product = $products[0]; diff --git a/common/models/Transfer.php b/common/models/Transfer.php index dbe8c65..b219313 100644 --- a/common/models/Transfer.php +++ b/common/models/Transfer.php @@ -722,4 +722,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord return $query->scalar(); } + + + + } diff --git a/common/models/TransferListSearch.php b/common/models/TransferListSearch.php index d4da060..e920419 100644 --- a/common/models/TransferListSearch.php +++ b/common/models/TransferListSearch.php @@ -13,12 +13,15 @@ use common\models\Account; use yii\helpers\ArrayHelper; use common\models\MoneyMovement; +use common\components\RoleDefinition; /** - * TransferSearch represents the model behind the search form about `common\models\Transfer`. + * TransferListSearch represents the model behind the search form about `common\models\Transfer`. */ class TransferListSearch extends Transfer { + public $mode = "reception";//reception or admin + public $start; public $end; @@ -51,6 +54,10 @@ class TransferListSearch extends Transfer * all money gained with product sell * */ public $productMoney; + /** + * all money gained with product sell + * */ + public $productMoneyNetto; /** * all money gained with product sell grouped by category * */ @@ -61,9 +68,13 @@ class TransferListSearch extends Transfer public $moneyMovementMoneis; public $moneyMovementMoney; /** - * total gained money + * total gained money brutto * */ public $total; + /** + * total gained money netto + * */ + public $totalNetto; /** * ticket sale statisitc @@ -84,6 +95,13 @@ class TransferListSearch extends Transfer public $productsByCategory; + public $currentUser; + public $currentAccount; + + public $output; + + public $outputView; + /** * @inheritdoc @@ -97,11 +115,16 @@ class TransferListSearch extends Transfer [ [ 'id_account','id_user' ] , 'integer'], ['types', 'each', 'rule' => ['integer']], + ['output', 'safe' ], + ['outputView', 'safe' ], ]; } - + public function isModeAdmin(){ + return $this->mode == 'admin'; + } + /** * Creates data provider instance with search query applied * @@ -126,7 +149,6 @@ class TransferListSearch extends Transfer } - $this->readTicketMoney(); $this->readProductsMoney(); $this->readMoneyMovementMoney(); @@ -142,6 +164,19 @@ class TransferListSearch extends Transfer $this->readProducts(); $this->readMoneyMovements(); + if ( $this->isModeAdmin() && RoleDefinition::isAdmin()){ + + if ( $this->id_user){ + $this->currentUser = User::findOne($this->id_user); + } + if ( $this->id_account){ + $this->currentAccount = Account::findOne($this->id_account); + } + + $this->readProductsMoneyNetto(); + $this->calcTotalNetto(); + } + } protected function calcTotal(){ @@ -150,18 +185,33 @@ class TransferListSearch extends Transfer $this->total += $this->productMoney; $this->total += $this->moneyMovementMoneis; } + protected function calcTotalNetto(){ + $this->totalNetto = 0; + $this->totalNetto += $this->ticketMoney; + $this->totalNetto += $this->productMoneyNetto; + $this->totalNetto += $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 ]); - - $query->andWhere(['account.type' => Account::TYPE_ALL ]); + 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()){ + $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); + } + + + $query->andWhere(['account.type' => Account::TYPE_ALL ]); + } } + /** + * add common transfer conditions. + * mode and role will be used to build to correct condition + * */ protected function addQueryFilters($query){ $query->innerJoin("account", "transfer.id_account = account.id_account"); @@ -179,7 +229,7 @@ class TransferListSearch extends Transfer $query->andFilterWhere(['or' , $created_condition , $paid_condition]); - + $query->andWhere(['transfer.status' => Transfer::STATUS_PAID]); } @@ -195,6 +245,7 @@ class TransferListSearch extends Transfer $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]); $this->addQueryFilters($query); @@ -298,6 +349,20 @@ class TransferListSearch extends Transfer $this->productMoney = $query->scalar(); } + protected function readProductsMoneyNetto(){ + + + $query = (new \yii\db\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->innerJoin("sale", "sale.id_sale = transfer.id_object"); + $query->innerJoin("product", "sale.id_product = product.id_product"); + $this->addQueryFilters($query); + + $this->productMoneyNetto = $query->scalar(); + + } protected function readMoneyMovementMoney(){ diff --git a/common/models/TransferSaleSearch.php b/common/models/TransferSaleSearch.php index bdec5fd..a478630 100644 --- a/common/models/TransferSaleSearch.php +++ b/common/models/TransferSaleSearch.php @@ -13,12 +13,15 @@ use common\models\Account; use yii\helpers\ArrayHelper; use common\models\MoneyMovement; +use common\components\RoleDefinition; /** * TransferSearch represents the model behind the search form about `common\models\Transfer`. */ class TransferSaleSearch extends Transfer { + public $mode = "reception";//reception or admin + public $start; public $end; @@ -84,6 +87,10 @@ class TransferSaleSearch extends Transfer return $result; } + public function isModeAdmin(){ + return $this->mode == 'admin'; + } + /** * Creates data provider instance with search query applied @@ -113,8 +120,6 @@ class TransferSaleSearch extends Transfer $this->readProductsMoney(); $this->calcTotal(); -// $this->readProductsByCategory(); -// $this->readProductsByCategoryDetailed(); $this->readProducts(); @@ -128,12 +133,18 @@ class TransferSaleSearch extends Transfer protected function addAccountConstraint($query){ + + 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 ]); - $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); + if ( RoleDefinition::isReception()){ + $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); + } $query->andWhere(['account.type' => Account::TYPE_ALL ]); + } } diff --git a/common/models/TransferTicketSearch.php b/common/models/TransferTicketSearch.php index cdbde94..0375dc2 100644 --- a/common/models/TransferTicketSearch.php +++ b/common/models/TransferTicketSearch.php @@ -13,6 +13,7 @@ use common\models\Account; use yii\helpers\ArrayHelper; use common\models\MoneyMovement; +use common\components\RoleDefinition; /** * TransferSearch represents the model behind the search form about `common\models\Transfer`. */ @@ -135,7 +136,9 @@ class TransferTicketSearch extends Transfer $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 ]); + if ( RoleDefinition::isReception()){ + $query->andWhere(['transfer.id_user' => Yii::$app->user->id ]); + } $query->andWhere(['account.type' => Account::TYPE_ALL ]); diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php index 579a630..16b5687 100644 --- a/frontend/components/FrontendMenuStructure.php +++ b/frontend/components/FrontendMenuStructure.php @@ -9,6 +9,7 @@ use yii\db\Query; use common\models\AccountState; use backend\models\AccountSearch; use common\models\Account; +use common\components\Helper; class FrontendMenuStructure{ @@ -68,17 +69,22 @@ class FrontendMenuStructure{ ['label' => Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index'] ], ['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'] ], + ['label' => Yii::t('frontend/money-movement','Money movements'), 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ], - ['label' => Yii::t('frontend/transfer','Daily transfers'), 'url' => [ '/transfer/list', 'TransferListSearch[id_account]' => Account::readDefault(), 'TransferListSearch[start]' => $this->start, 'TransferListSearch[end]' => $this->tomorrow ] ], - ['label' => Yii::t('frontend/transfer','Sales detailed'), 'url' => [ '/transfer/sale', 'TransferSaleSearch[id_user]' =>\Yii::$app->user->id, 'TransferSaleSearch[id_account]' => Account::readDefault(), 'TransferSaleSearch[start]' => $this->start, 'TransferSaleSearch[end]' => $this->tomorrow ] ], - ['label' => Yii::t('frontend/transfer','Ticket sale detailed'), 'url' => [ '/transfer/tickets','TransferTicketSearch[id_user]' =>\Yii::$app->user->id, 'TransferTicketSearch[id_account]' => Account::readDefault(), 'TransferTicketSearch[start]' => $this->start, 'TransferTicketSearch[end]' => $this->tomorrow ] ], + ]; + if ( Helper::isCompanyMovar() ){ + $items[] = ['label' => Yii::t('frontend/transfer','Daily transfers'), 'url' => [ '/transfer/list', 'TransferListSearch[id_account]' => Account::readDefault(), 'TransferListSearch[start]' => $this->start, 'TransferListSearch[end]' => $this->tomorrow ] ]; + $items[] = ['label' => Yii::t('frontend/transfer','Sales detailed'), 'url' => [ '/transfer/sale', 'TransferSaleSearch[id_user]' =>\Yii::$app->user->id, 'TransferSaleSearch[id_account]' => Account::readDefault(), 'TransferSaleSearch[start]' => $this->start, 'TransferSaleSearch[end]' => $this->tomorrow ] ]; + $items[] = ['label' => Yii::t('frontend/transfer','Ticket sale detailed'), 'url' => [ '/transfer/tickets','TransferTicketSearch[id_user]' =>\Yii::$app->user->id, 'TransferTicketSearch[id_account]' => Account::readDefault(), 'TransferTicketSearch[start]' => $this->start, 'TransferTicketSearch[end]' => $this->tomorrow ] ]; + } + if ( $isadmin || Yii::$app->user->can('reception.transfers') ){ $items[] = ['label' => Yii::t('frontend/transfer','Transfers'), 'url' => ['/transfer/index', 'TransferSearch[id_user]' =>\Yii::$app->user->id, 'TransferSearch[id_account]' => Account::readDefault(), 'TransferSearch[start]' => $this->start, 'TransferSearch[end]' => $this->tomorrow ] ]; + $items[] = ['label' => Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ]; } - $items[] = ['label' => Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ]; $this->menuItems[] = ['label' => Yii::t('frontend/account', 'Account'), 'items' => $items diff --git a/frontend/models/TransferListSearch.php b/frontend/models/TransferListSearch.php index 6d164f9..7ec5f80 100644 --- a/frontend/models/TransferListSearch.php +++ b/frontend/models/TransferListSearch.php @@ -18,6 +18,6 @@ use common\models\MoneyMovement; */ class TransferListSearch extends \common\models\TransferListSearch { - + } diff --git a/frontend/views/customer/reception.php b/frontend/views/customer/reception.php index 2f9a03b..1f4295c 100644 --- a/frontend/views/customer/reception.php +++ b/frontend/views/customer/reception.php @@ -1,9 +1,8 @@ - +

Recepció

$model, 'route' => ['customer/reception'] ] )?> diff --git a/frontend/web/js/accountstate.js b/frontend/web/js/accountstate.js index 9e5fffd..a526e15 100644 --- a/frontend/web/js/accountstate.js +++ b/frontend/web/js/accountstate.js @@ -30,6 +30,14 @@ function AccountState(o){ moneyInput = $(app.defaults.selector_money); notes.change(runNote); moneyInput.change(run); + moneyInput.focus(function(){ + $(this).select().one('mouseup', function (e) { + $(this).off('keyup'); + e.preventDefault(); + }).one('keyup', function () { + $(this).select().off('mouseup'); + }); + }); if ( app.defaults.open ){ ddAccount = $(app.defaults.selector_dd_account); ddAccount.change(run);