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

add non cash money display to account state

Browse Source
This commit is contained in:
Roland Schneider 2016-10-05 07:56:50 +02:00
parent 7975d6ffc9
commit 8585286150
8 changed files with 454 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/components/accountstate/AccountStateWidget.php
View File

@ -1,16 +1,12 @@
<?php <?php
namespace common\components\accountstate; namespace common\components\accountstate;
use yii\base\Widget; use yii\base\Widget;
use common\models\AccountState;
use yii\data\ArrayDataProvider;
use yii\grid\GridView;
use yii\helpers\Html;
use yii\widgets\DetailView; use yii\widgets\DetailView;
/** /**
* This is the model class for widget display bank notes. * This is the model class for widget display bank notes.
* *
* @property common\models\AccountState $model * @property \common\models\AccountState $model
* */ * */
class AccountStateWidget extends Widget{ class AccountStateWidget extends Widget{
@ -59,6 +55,16 @@ class AccountStateWidget extends Widget{
'attribute' =>'money', 'attribute' =>'money',
'value' => \Yii::$app->formatter->asInteger($this->model->money) ." Ft", 'value' => \Yii::$app->formatter->asInteger($this->model->money) ." Ft",
], ],
[
'attribute' => 'non_cash_money',
'label' => 'Készpénz alapú forgalom',
'value' => \Yii::$app->formatter->asInteger($this->model->collection_money) ." Ft",
],
[
'attribute' => 'non_cash_money',
'label' => 'Nem készpénz alapú forgalom',
'value' => \Yii::$app->formatter->asInteger($this->model->non_cash_money) ." Ft",
],
'user.username', 'user.username',
[ [
'attribute' => 'start_date', 'attribute' => 'start_date',

38
common/models/AccountState.php
View File

@ -2,9 +2,9 @@
namespace common\models; namespace common\models;
use Yii; use /** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
Yii;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use yii\behaviors\TimestampBehavior;
/** /**
* This is the model class for table "account_state". * This is the model class for table "account_state".
@ -29,8 +29,9 @@ use yii\behaviors\TimestampBehavior;
* @property integer $collection_money * @property integer $collection_money
* @property string $created_at * @property string $created_at
* @property string $updated_at * @property string $updated_at
* @property int non_cash_money
*/ */
class AccountState extends \common\models\BaseFitnessActiveRecord class AccountState extends BaseFitnessActiveRecord
{ {
const TYPE_OPEN = 10; const TYPE_OPEN = 10;
@ -38,16 +39,6 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public $start_date; public $start_date;
/**
* @inheritdoc
*/
// public function behaviors()
// {
// return [[
// 'class' => TimestampBehavior::className(),
// 'value' => function(){ return date('Y-m-d H:i' ); }
// ] ];
// }
/** /**
* @inheritdoc * @inheritdoc
@ -138,6 +129,8 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function getAccountName(){ public function getAccountName(){
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
/** @var \common\models\Account $account */
$account = $this->account; $account = $this->account;
if (isset($account)){ if (isset($account)){
$result = $account->name; $result = $account->name;
@ -156,6 +149,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function getUserName(){ public function getUserName(){
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$user = $this->user; $user = $this->user;
if (isset($this->user)){ if (isset($this->user)){
$result = $user->username; $result = $user->username;
@ -193,9 +187,9 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
* Read last accountstates * Read last accountstates
* @param $type int the type of accountstate to load * @param $type int the type of accountstate to load
* @param $user $id of user to load the account * @param $user $id of user to load the account
* @return common\models\AccountState * @param \common\models\Account|null $account
* * @return AccountState
* */ */
public static function readLast($type, $user = null,$account = null){ public static function readLast($type, $user = null,$account = null){
$result = null; $result = null;
$query = AccountState::find(); $query = AccountState::find();
@ -224,20 +218,23 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
$start = null; $start = null;
$end = null; $end = null;
$prev = null; $prev = null;
/** @noinspection PhpUndefinedFieldInspection */
$this->prev_money = 0; $this->prev_money = 0;
if ( $this->type == AccountState::TYPE_CLOSE){ if ( $this->type == AccountState::TYPE_CLOSE){
$lastOpen = AccountState::readLast(AccountState::TYPE_OPEN,\Yii::$app->user->id, $this->id_account); $lastOpen = AccountState::readLast(AccountState::TYPE_OPEN,\Yii::$app->user->id, $this->id_account);
if ( $lastOpen != null ){ if ( $lastOpen != null ){
$start = $lastOpen->created_at; $start = $lastOpen->created_at;
/** @noinspection PhpUndefinedFieldInspection */
$this->prev_state = $lastOpen->id_account_state; $this->prev_state = $lastOpen->id_account_state;
/** @noinspection PhpUndefinedFieldInspection */
$this->prev_money = $lastOpen->money; $this->prev_money = $lastOpen->money;
} }
$end = date('Y-m-d H:i:s' ); $end = date('Y-m-d H:i:s' );
// $end = Yii::$app->formatter->asDatetime(strtotime("now"), "php:Y-m-d H:i:s"); // $end = Yii::$app->formatter->asDatetime(strtotime("now"), "php:Y-m-d H:i:s");
$this->collection_money = Transfer::readPaid($start, $end, Yii::$app->user->id); $this->collection_money = Transfer::readPaidCash($start, $end, Yii::$app->user->id);
$this->non_cash_money = Transfer::readPaidNonCash($start, $end, Yii::$app->user->id);
} }
} }
@ -248,6 +245,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function hasDifferenceToPrevState(){ public function hasDifferenceToPrevState(){
$result = false; $result = false;
if ( $this->type == self::TYPE_CLOSE){ if ( $this->type == self::TYPE_CLOSE){
/** @noinspection PhpUndefinedFieldInspection */
$result = ( $this->prev_money + $this->collection_money) != $this->money; $result = ( $this->prev_money + $this->collection_money) != $this->money;
} }
return $result; return $result;
@ -256,6 +254,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function hasPlus(){ public function hasPlus(){
$result = false; $result = false;
if ( $this->type == self::TYPE_CLOSE){ if ( $this->type == self::TYPE_CLOSE){
/** @noinspection PhpUndefinedFieldInspection */
$result = ( $this->prev_money + $this->collection_money) < $this->money; $result = ( $this->prev_money + $this->collection_money) < $this->money;
} }
return $result; return $result;
@ -264,17 +263,20 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function hasMinus(){ public function hasMinus(){
$result = false; $result = false;
if ( $this->type == self::TYPE_CLOSE){ if ( $this->type == self::TYPE_CLOSE){
/** @noinspection PhpUndefinedFieldInspection */
$result =( $this->prev_money + $this->collection_money) > $this->money; $result =( $this->prev_money + $this->collection_money) > $this->money;
} }
return $result; return $result;
} }
public function getSignedDiff(){ public function getSignedDiff(){
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->money - ( $this->prev_money + $this->collection_money); $result = $this->money - ( $this->prev_money + $this->collection_money);
return $result; return $result;
} }
public function getExpected(){ public function getExpected(){
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->prev_money + $this->collection_money ; $result = $this->prev_money + $this->collection_money ;
return $result; return $result;
} }

11
common/models/Currency.php
View File

@ -2,7 +2,8 @@
namespace common\models; namespace common\models;
use Yii; use /** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
Yii;
/** /**
* This is the model class for table "currency". * This is the model class for table "currency".
@ -14,7 +15,7 @@ use Yii;
* @property string $created_at * @property string $created_at
* @property string $updated_at * @property string $updated_at
*/ */
class Currency extends \common\models\BaseFitnessActiveRecord class Currency extends BaseFitnessActiveRecord
{ {
/** /**
* @inheritdoc * @inheritdoc
@ -54,8 +55,10 @@ class Currency extends \common\models\BaseFitnessActiveRecord
/** /**
* @param integer $money * @param integer $money
* @param common\models\Currency $currency * @param \common\models\Currency $currency
* */ *
* @return float
*/
public static function applyCurrency( $money,$currency ) { public static function applyCurrency( $money,$currency ) {
$result = $money / $currency; $result = $money / $currency;
return $result; return $result;

30
common/models/Discount.php
View File

@ -2,7 +2,8 @@
namespace common\models; namespace common\models;
use Yii; use /** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
@ -18,6 +19,7 @@ use yii\helpers\ArrayHelper;
* @property integer $ticket_enabled * @property integer $ticket_enabled
* @property string $created_at * @property string $created_at
* @property string $updated_at * @property string $updated_at
* @property mixed id_discount
*/ */
class Discount extends \yii\db\ActiveRecord class Discount extends \yii\db\ActiveRecord
{ {
@ -86,7 +88,7 @@ class Discount extends \yii\db\ActiveRecord
public function getStatusHuman(){ public function getStatusHuman(){
$result = null; $result = null;
$s = self::statuses($this->status); $s = self::statuses();
if ( array_key_exists($this->status, $s)){ if ( array_key_exists($this->status, $s)){
$result = $s[$this->status]; $result = $s[$this->status];
} }
@ -101,40 +103,58 @@ class Discount extends \yii\db\ActiveRecord
public function getTypeHuman(){ public function getTypeHuman(){
$result = null; $result = null;
$s = self::types($this->type); $s = self::types();
if ( array_key_exists($this->type, $s)){ if ( array_key_exists($this->type, $s)){
$result = $s[$this->type]; $result = $s[$this->type];
} }
return $result; return $result;
} }
/**
* @return string
*/
public function getProcutEnabledHuman(){ public function getProcutEnabledHuman(){
return $this->product_enabled == 1 ? 'Igen' : 'Nem'; return $this->product_enabled == 1 ? 'Igen' : 'Nem';
} }
/**
* @return string
*/
public function getTicketEnabledHuman(){ public function getTicketEnabledHuman(){
return $this->ticket_enabled == 1 ? 'Igen' : 'Nem'; return $this->ticket_enabled == 1 ? 'Igen' : 'Nem';
} }
/**
* @return array|\yii\db\ActiveRecord[]
*/
public static function read(){ public static function read(){
return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE ])->all(); return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE ])->all();
} }
/**
* @return array|\yii\db\ActiveRecord[]
*/
public static function readProductDiscounts(){ public static function readProductDiscounts(){
return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE , 'product_enabled' => 1 ])->all(); return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE , 'product_enabled' => 1 ])->all();
} }
/**
* @return array|\yii\db\ActiveRecord[]
*/
public static function readTicketDiscounts(){ public static function readTicketDiscounts(){
return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE , 'ticket_enabled' => 1 ])->all(); return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE , 'ticket_enabled' => 1 ])->all();
} }
/** /**
* @param integer $money * @param integer $money
* @param common\models\Discount $discount * @param \common\models\Discount $discount
* */ *
* @return int
*/
public static function applyDiscount($money,$discount){ public static function applyDiscount($money,$discount){
/** @noinspection PhpUnusedLocalVariableInspection */
$result = $money; $result = $money;
$valueOfDiscount = floor( $money * $discount->value / 100 ); $valueOfDiscount = floor( $money * $discount->value / 100 );
$result = $money - $valueOfDiscount; $result = $money - $valueOfDiscount;

28
common/models/Ticket.php
View File

@ -29,6 +29,7 @@ use common\components\Helper;
* @property string $comment * @property string $comment
* @property string $created_at * @property string $created_at
* @property string $updated_at * @property string $updated_at
* @property int id_contract
*/ */
class Ticket extends \common\models\BaseFitnessActiveRecord class Ticket extends \common\models\BaseFitnessActiveRecord
{ {
@ -133,6 +134,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
public function getCardNumber(){ public function getCardNumber(){
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$card = $this->card; $card = $this->card;
if ( isset($card)){ if ( isset($card)){
$result = $card->number; $result = $card->number;
@ -146,6 +148,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
public function getCustomerName(){ public function getCustomerName(){
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$customer = $this->customer; $customer = $this->customer;
if ( isset($customer)){ if ( isset($customer)){
$result = $customer->name; $result = $customer->name;
@ -171,22 +174,27 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
} }
public function getAccountName() { public function getAccountName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
/** @var \common\models\Account $account */
$account = $this->account; $account = $this->account;
if ( isset($account) ){ if ( isset($account) ){
$result = $this->account->name; $result = $account->name;
} }
return $result; return $result;
} }
public function getDiscountName() { public function getDiscountName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
/** @var \common\models\Discount $discount */
$discount = $this->discount; $discount = $this->discount;
if ( isset($discount) ){ if ( isset($discount) ){
$result = $this->discount->name; $result = $discount->name;
} }
return $result; return $result;
} }
public function getTicketTypeName() { public function getTicketTypeName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$ticketType = $this->ticketType; $ticketType = $this->ticketType;
if ( isset($ticketType) ){ if ( isset($ticketType) ){
$result = $ticketType->name; $result = $ticketType->name;
@ -195,6 +203,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
} }
public function getUserName() { public function getUserName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$user = $this->user; $user = $this->user;
if ( isset($user) ){ if ( isset($user) ){
$result = $user->username; $result = $user->username;
@ -204,8 +213,10 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
/** /**
* @param common\models\Card $card the card to which we are looking for * @param \common\models\Card $card the card to which we are looking for
* */ *
* @return array|\yii\db\ActiveRecord[]
*/
public static function readActive($card){ public static function readActive($card){
if ( $card == null ) if ( $card == null )
@ -224,9 +235,12 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
return $result; return $result;
} }
/** /**
* @param common\models\Card $card the card to which we are looking for * @param \common\models\Card $card the card to which we are looking for
* */ *
* @return array|\yii\db\ActiveRecord[]
*/
public static function readUnpaid($card){ public static function readUnpaid($card){
if ( $card == null ) if ( $card == null )
@ -326,7 +340,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
/** /**
* Apply request * Apply request
* *
* @var common\models\TicketInstallmentRequest $request megbízás * @var \common\models\TicketInstallmentRequest $request megbízás
* */ * */
public function applyTicketInstallmentRequest( $request ) { public function applyTicketInstallmentRequest( $request ) {
//ha csoportos beszedéses //ha csoportos beszedéses

220
common/models/Transfer.php
View File

@ -14,6 +14,7 @@ use yii\db\Query;
use yii\db\Expression; use yii\db\Expression;
use common\components\RoleDefinition; use common\components\RoleDefinition;
use common\components\Helper; use common\components\Helper;
use yii\web\NotAcceptableHttpException;
/** /**
* This is the model class for table "transfer". * This is the model class for table "transfer".
@ -37,6 +38,8 @@ use common\components\Helper;
* @property integer $direction * @property integer $direction
* @property string $paid_at * @property string $paid_at
* @property integer $id_customer * @property integer $id_customer
* @property int|string paid_by
* @property int payment_method
*/ */
class Transfer extends \common\models\BaseFitnessActiveRecord { class Transfer extends \common\models\BaseFitnessActiveRecord {
const TYPE_PRODUCT = 10; const TYPE_PRODUCT = 10;
@ -205,6 +208,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
public function getPaidByName() { public function getPaidByName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$user = $this->paidByUser; $user = $this->paidByUser;
if (isset ( $this->paidByUser )) { if (isset ( $this->paidByUser )) {
$result = $user->username; $result = $user->username;
@ -215,16 +219,20 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
public function getObjectName() { public function getObjectName() {
$result = ""; $result = "";
if ($this->type == Transfer::TYPE_TICKET) { if ($this->type == Transfer::TYPE_TICKET) {
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->ticketName; $result = $this->ticketName;
} else if ($this->type == Transfer::TYPE_PRODUCT) { } else if ($this->type == Transfer::TYPE_PRODUCT) {
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->productName; $result = $this->productName;
} else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) { } else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) {
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->moneyMovement->humanType; $result = $this->moneyMovement->humanType;
} }
return $result; return $result;
} }
public function getUserName() { public function getUserName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$user = $this->user; $user = $this->user;
if (isset ( $this->user )) { if (isset ( $this->user )) {
$result = $user->username; $result = $user->username;
@ -234,6 +242,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
public function getProductName() { public function getProductName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$product = $this->product; $product = $this->product;
if (isset ( $product )) { if (isset ( $product )) {
$result = $product->name; $result = $product->name;
@ -243,8 +252,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
public function getTicketName() { public function getTicketName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
/** @var \common\models\Ticket $ticket */
$ticket = $this->ticket; $ticket = $this->ticket;
if (isset ( $ticket )) { if (isset ( $ticket )) {
/** @noinspection PhpUndefinedFieldInspection */
$result = $this->ticket->ticketTypeName; $result = $this->ticket->ticketTypeName;
} }
@ -252,6 +264,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
public function getAccountName() { public function getAccountName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$account = $this->account; $account = $this->account;
if (isset ( $account )) { if (isset ( $account )) {
$result = $account->name; $result = $account->name;
@ -272,6 +285,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
public function getSaleName() { public function getSaleName() {
$result = ""; $result = "";
/** @noinspection PhpUndefinedFieldInspection */
$sale = $this->sale; $sale = $this->sale;
if (isset ( $sale )) { if (isset ( $sale )) {
$result = $sale->name; $result = $sale->name;
@ -305,8 +319,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$s .= $this->count; $s .= $this->count;
$s .= " " . Yii::t ( 'frontend/transfer', 'pieces' ) . " "; $s .= " " . Yii::t ( 'frontend/transfer', 'pieces' ) . " ";
/** @noinspection PhpUndefinedFieldInspection */
$s .= $this->product->name; $s .= $this->product->name;
$s .= " - "; $s .= " - ";
/** @noinspection PhpUndefinedFieldInspection */
$s .= $this->account->name; $s .= $this->account->name;
return $s; return $s;
@ -314,12 +330,15 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
/** /**
* *
* @param $account common\models\Account * @param $sale
* @param $discount common\models\Discount * @param $account \common\models\Account
* @param $currency common\models\Currency * @param $discount \common\models\Discount
* @param $product common\models\Product * @param $currency \common\models\Currency
* @param $customer common\models\Customer * @param $count
* * @param $product \common\models\Product
* @param int $status
* @param $customer \common\models\Customer
* @return Transfer
*/ */
public static function createProductTransfer($sale, $account, $discount, $currency, $count, $product, $status = Transfer::STATUS_PAID, $customer = null) { public static function createProductTransfer($sale, $account, $discount, $currency, $count, $product, $status = Transfer::STATUS_PAID, $customer = null) {
$transfer = new Transfer (); $transfer = new Transfer ();
@ -334,6 +353,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$transfer->count = $count; $transfer->count = $count;
$totalPrice = $totalPrice * $count; $totalPrice = $totalPrice * $count;
/** @var \common\models\Discount $discount */
if (isset ( $discount )) { if (isset ( $discount )) {
$transfer->id_discount = $discount->id_discount; $transfer->id_discount = $discount->id_discount;
$totalPrice = Discount::applyDiscount ( $totalPrice, $discount ); $totalPrice = Discount::applyDiscount ( $totalPrice, $discount );
@ -360,11 +380,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
/** /**
* *
* @param $account common\models\Account * @param $account \common\models\Account
* @param $discount common\models\Discount * @param $moneyMovement \common\models\MoneyMovement
* @param $currency common\models\Currency * @return Transfer
* @param $moneyMovement common\models\MoneyMovement * @internal param Discount $discount
* * @internal param Currency $currency
*/ */
public static function createMoneyMovementOutTransfer($account, $moneyMovement) { public static function createMoneyMovementOutTransfer($account, $moneyMovement) {
$transfer = new Transfer (); $transfer = new Transfer ();
@ -388,13 +408,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
return $transfer; return $transfer;
} }
/** /**
* *
* @param $account common\models\Account * @param $account \common\models\Account
* @param $discount common\models\Discount * @param $discount \common\models\Discount
* @param $currency common\models\Currency * @param $currency \common\models\Currency
* @param $ticket common\models\Ticket * @param $count int
* @param $ticket \common\models\Ticket
* *
* @param int $status
* @return Transfer
*/ */
public static function createTicketTransfer($account, $discount, $currency, $count, $ticket, $status = Transfer::STATUS_NOT_PAID) { public static function createTicketTransfer($account, $discount, $currency, $count, $ticket, $status = Transfer::STATUS_NOT_PAID) {
$transfer = new Transfer (); $transfer = new Transfer ();
@ -412,6 +436,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$totalPrice = $totalPrice * $count; $totalPrice = $totalPrice * $count;
if (isset ( $discount )) { if (isset ( $discount )) {
/** @var \common\models\Discount $discount */
$transfer->id_discount = $discount->id_discount; $transfer->id_discount = $discount->id_discount;
$totalPrice = Discount::applyDiscount ( $totalPrice, $discount ); $totalPrice = Discount::applyDiscount ( $totalPrice, $discount );
} }
@ -420,6 +445,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
if (isset ( $currency )) { if (isset ( $currency )) {
$transfer->rate = $currency->rate; $transfer->rate = $currency->rate;
/** @var \common\models\Currency $currency */
$transfer->money_currency = Currency::applyCurrency ( $totalPrice, $currency ); $transfer->money_currency = Currency::applyCurrency ( $totalPrice, $currency );
} }
@ -464,6 +490,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} else if ($transfer->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) { } else if ($transfer->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) {
return "Pénzmozgás"; return "Pénzmozgás";
} }
return "-";
} }
] ]
] ); ] );
@ -490,8 +517,6 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
return $result; return $result;
} }
public static function readUserSoldTransfers($user) { public static function readUserSoldTransfers($user) {
$transfers = [ ];
$query = Transfer::find (); $query = Transfer::find ();
$query->innerJoin ( "user_sold_item", "user_sold_item.id_transfer = transfer.id_transfer" ); $query->innerJoin ( "user_sold_item", "user_sold_item.id_transfer = transfer.id_transfer" );
@ -501,9 +526,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
'user_sold_item.id_user' => $user->id 'user_sold_item.id_user' => $user->id
] ); ] );
} }
$transfers = $query->all (); return $query->all ();
return $transfers;
} }
public static function readCustomerCart($customer) { public static function readCustomerCart($customer) {
$transfers = [ ]; $transfers = [ ];
@ -573,15 +597,19 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
public function beforeDelete() { public function beforeDelete() {
parent::beforeDelete (); parent::beforeDelete ();
if ($this->type == Transfer::TYPE_TICKET) { if ($this->type == Transfer::TYPE_TICKET) {
/** @noinspection PhpUndefinedFieldInspection */
$ticket = $this->ticket; $ticket = $this->ticket;
if ($ticket != null) { if ($ticket != null) {
$ticket->delete (); $ticket->delete ();
} }
} else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) { } else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) {
/** @noinspection PhpUndefinedFieldInspection */
$mm = $this->moneyMovement; $mm = $this->moneyMovement;
$mm->delete (); $mm->delete ();
} else if ($this->type == Transfer::TYPE_PRODUCT) { } else if ($this->type == Transfer::TYPE_PRODUCT) {
/** @noinspection PhpUndefinedFieldInspection */
$sale = $this->sale; $sale = $this->sale;
/** @noinspection PhpUndefinedFieldInspection */
$product = $this->product; $product = $this->product;
$product->stock = $product->stock + $this->count; $product->stock = $product->stock + $this->count;
@ -631,6 +659,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* </ul> * </ul>
* *
* *
* @param $start
* @param $end
* @param $idUser
* @param $types
* @param $idAccount
* @return Query
*/ */
public static function mkTotalQuery($mode, $start, $end, $idUser, $types, $idAccount) { public static function mkTotalQuery($mode, $start, $end, $idUser, $types, $idAccount) {
$query = new Query (); $query = new Query ();
@ -698,6 +732,13 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
return $query; return $query;
} }
/**
* @param \yii\db\Query $query
* @param string $field
* @param string $start
* @param string $end
*/
public static function notInInterval($query, $field, $start, $end) { public static function notInInterval($query, $field, $start, $end) {
$query->andFilterWhere ( [ $query->andFilterWhere ( [
'or', 'or',
@ -713,6 +754,13 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
] ]
] ); ] );
} }
/**
* @param \yii\db\Query $query
* @param string $field
* @param string $start
* @param string $end
*/
public static function notPaid($query, $field, $start, $end) { public static function notPaid($query, $field, $start, $end) {
$query->andFilterWhere ( [ $query->andFilterWhere ( [
'or', 'or',
@ -731,6 +779,13 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
] ]
] ); ] );
} }
/**
* @param \yii\db\Query $query
* @param string $field
* @param string $start
* @param string $end
*/
public static function inInterval($query, $field, $start, $end) { public static function inInterval($query, $field, $start, $end) {
$query->andFilterWhere ( [ $query->andFilterWhere ( [
'>=', '>=',
@ -751,6 +806,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* @param mixed $queryResult * @param mixed $queryResult
* an array, wchic contains items. each item has to key - value pairs: [ id_account => 0, money => 0 ] * an array, wchic contains items. each item has to key - value pairs: [ id_account => 0, money => 0 ]
* *
* @param $accounts
* @param $accountMap
* @param $idAccount
* @return array
*/ */
public static function mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount) { public static function mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount) {
$totals = [ ]; $totals = [ ];
@ -792,6 +851,13 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
/** /**
* create and execute a "total" query * create and execute a "total" query
* @param $mode
* @param $start
* @param $end
* @param $idUser
* @param $types
* @param $idAccount
* @return array
*/ */
public static function exTotalQuery($mode, $start, $end, $idUser, $types, $idAccount) { public static function exTotalQuery($mode, $start, $end, $idUser, $types, $idAccount) {
$query = self::mkTotalQuery ( $mode, $start, $end, $idUser, $types, $idAccount ); $query = self::mkTotalQuery ( $mode, $start, $end, $idUser, $types, $idAccount );
@ -802,8 +868,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
/** /**
* find all transfers which were paid in the period * find all transfers which were paid in the period
* @param $start
* @param $end
* @param $idUser
* @param $types
* @param $idAccount
* @param $accounts
* @param $accountMap
* @return array
*/ */
public static function mkPaidAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) { public static function mkPaidAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) {
/** @noinspection PhpUnusedLocalVariableInspection */
$result = [ ]; $result = [ ];
$queryResult = self::exTotalQuery ( 'paid_at', $start, $end, $idUser, $types, $idAccount ); $queryResult = self::exTotalQuery ( 'paid_at', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount ); $result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount );
@ -814,6 +889,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* find all transfers in the period ( doesn't matter if paid or not ) * find all transfers in the period ( doesn't matter if paid or not )
*/ */
public static function mkCreatedAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) { public static function mkCreatedAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) {
/** @noinspection PhpUnusedLocalVariableInspection */
$result = [ ]; $result = [ ];
$queryResult = self::exTotalQuery ( 'created_at', $start, $end, $idUser, $types, $idAccount ); $queryResult = self::exTotalQuery ( 'created_at', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount ); $result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount );
@ -824,6 +900,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* find transfers which were created but not paid in the period * find transfers which were created but not paid in the period
*/ */
public static function mkCreatedAtNotPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) { public static function mkCreatedAtNotPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) {
/** @noinspection PhpUnusedLocalVariableInspection */
$result = [ ]; $result = [ ];
$queryResult = self::exTotalQuery ( 'created_at_not_paid', $start, $end, $idUser, $types, $idAccount ); $queryResult = self::exTotalQuery ( 'created_at_not_paid', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount ); $result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount );
@ -834,6 +911,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* find transfers which were created and paid in the period * find transfers which were created and paid in the period
*/ */
public static function mkCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) { public static function mkCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) {
/** @noinspection PhpUnusedLocalVariableInspection */
$result = [ ]; $result = [ ];
$queryResult = self::exTotalQuery ( 'created_at_paid', $start, $end, $idUser, $types, $idAccount ); $queryResult = self::exTotalQuery ( 'created_at_paid', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount ); $result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount );
@ -842,8 +920,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
/** /**
* find transfers, where depth was paid * find transfers, where depth was paid
* @param $start
* @param $end
* @param $idUser
* @param $types
* @param $idAccount
* @param $accounts
* @param $accountMap
* @return array
*/ */
public static function mkPaidAtNotCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) { public static function mkPaidAtNotCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap) {
/** @noinspection PhpUnusedLocalVariableInspection */
$result = [ ]; $result = [ ];
$queryResult = self::exTotalQuery ( 'paid_at_not_created_at', $start, $end, $idUser, $types, $idAccount ); $queryResult = self::exTotalQuery ( 'paid_at_not_created_at', $start, $end, $idUser, $types, $idAccount );
$result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount ); $result = self::mkTotalsResultWithAllAvailableAccount ( $queryResult, $accounts, $accountMap, $idAccount );
@ -869,8 +956,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
* - tranzakció fizetési módja: készpénz * - tranzakció fizetési módja: készpénz
* - tranzakció státusza: fizetve * - tranzakció státusza: fizetve
* - * -
* @param $start
* @param $end
* @param $idUser
* @return bool|string
*/ */
public static function readPaid($start, $end, $idUser) { public static function readPaidCash($start, $end, $idUser) {
$query = (new \yii\db\Query ()); $query = (new \yii\db\Query ());
$query->select ( [ $query->select ( [
'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN . ' then transfer.money else -1 * transfer.money end ),0) AS transfer_money' 'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN . ' then transfer.money else -1 * transfer.money end ),0) AS transfer_money'
@ -883,29 +974,14 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$created_condition = [ $created_condition = [
'and', 'and',
[ [ '>=', 'transfer.created_at', $start ],
'>=', [ '<', 'transfer.created_at', $end ]
'transfer.created_at',
$start
],
[
'<',
'transfer.created_at',
$end
]
]; ];
$paid_condition = [ $paid_condition = [
'and', 'and',
[ [ '>=', 'transfer.paid_at', $start ],
'>=', [ '<', 'transfer.paid_at', $end ]
'transfer.paid_at',
$start
],
[
'<',
'transfer.paid_at',
$end
]
]; ];
$query->andFilterWhere ( [ $query->andFilterWhere ( [
@ -913,18 +989,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
$created_condition, $created_condition,
$paid_condition $paid_condition
] ); ] );
$query->andWhere ( [ $query->andWhere ( [
'transfer.status' => Transfer::STATUS_PAID 'transfer.status' => Transfer::STATUS_PAID,
] ); 'account.type' => Account::TYPE_ALL ,
$query->andWhere ( [
'account.type' => Account::TYPE_ALL
] );
$query->andWhere ( [
'transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH 'transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH
] ); ] );
return $query->scalar (); return $query->scalar ();
} }
public function storno() { public function storno() {
$this->status = Transfer::STATUS_STORNO; $this->status = Transfer::STATUS_STORNO;
$this->save ( false ); $this->save ( false );
@ -944,13 +1019,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
// storno contract // storno contract
} else if ($this->type == Transfer::TYPE_PRODUCT) { } else if ($this->type == Transfer::TYPE_PRODUCT) {
/** @noinspection PhpUndefinedFieldInspection */
$sale = $this->sale; $sale = $this->sale;
/** @noinspection PhpUndefinedFieldInspection */
/** @var \common\models\Product $product */
$product = $this->sale->product; $product = $this->sale->product;
$product->stock = $product->stock + $this->count; $product->stock = $product->stock + $this->count;
$product->save ( false ); $product->save ( false );
$sale->status = Sale::STATUS_DELETED; $sale->status = Sale::STATUS_DELETED;
$sale->save ( false ); $sale->save ( false );
} else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) { } else if ($this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT) {
/** @noinspection PhpUndefinedFieldInspection */
$mm = $this->moneyMovement; $mm = $this->moneyMovement;
$mm->status = MoneyMovement::STATUS_STORNO; $mm->status = MoneyMovement::STATUS_STORNO;
$mm->save ( false ); $mm->save ( false );
@ -963,6 +1042,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
'id_transfer' => $this->id_transfer 'id_transfer' => $this->id_transfer
] ); ] );
} }
/**
* @throws \yii\web\NotAcceptableHttpException
*/
public function unstorono() { public function unstorono() {
if ($this->type != Transfer::TYPE_TICKET) { if ($this->type != Transfer::TYPE_TICKET) {
throw new NotAcceptableHttpException ( "Csak bérletet lehet visszaállítani" ); throw new NotAcceptableHttpException ( "Csak bérletet lehet visszaállítani" );
@ -991,6 +1074,51 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
} }
/**
* @param $start $start date
* @param $end $end date
* @param $idUser $user
* @return bool|string
*/
public static function readPaidNonCash($start, $end, $idUser) {
$query = (new Query());
$query->select ( [
'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN . ' then transfer.money else -1 * transfer.money end ),0) AS transfer_money'
] );
$query->from ( 'transfer' );
$query->innerJoin ( "account", "account.id_account = transfer.id_account" );
$query->andWhere ( [
'transfer.paid_by' => $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,
'account.type' => Account::TYPE_ALL
] );
$query->andWhere(['<>' ,'transfer.payment_method', Transfer::PAYMENT_METHOD_CASH ]);
return $query->scalar ();
}
public function payout($id_account = null) { public function payout($id_account = null) {
if ($this->status != Transfer::STATUS_NOT_PAID) { if ($this->status != Transfer::STATUS_NOT_PAID) {

30
console/migrations/m161004_062500_alter__table__account_state_add_column_non_cash_money.php Normal file
View File

@ -0,0 +1,30 @@
<?php
use yii\db\Schema;
use yii\db\Migration;
class m161004_062500_alter__table__account_state_add_column_non_cash_money extends Migration
{
public function up()
{
$this->addColumn("account_state", "non_cash_money", "int default 0");
}
public function down()
{
echo "m161004_062500_alter__table__account_state_add_column_non_cash_money cannot be reverted.\n";
return false;
}
/*
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
}
public function safeDown()
{
}
*/
}

46
frontend/controllers/AccountStateController.php
View File

@ -4,7 +4,8 @@ namespace frontend\controllers;
use common\components\DateUtil; use common\components\DateUtil;
use frontend\models\AccountstateSearchToday; use frontend\models\AccountstateSearchToday;
use Yii; use /** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
Yii;
use common\models\AccountState; use common\models\AccountState;
use frontend\models\AccountstateSearch; use frontend\models\AccountstateSearch;
use yii\web\Controller; use yii\web\Controller;
@ -201,7 +202,7 @@ class AccountStateController extends Controller {
$total += $cassaOpen->money; $total += $cassaOpen->money;
$openDate = $cassaOpen->created_at; $openDate = $cassaOpen->created_at;
} }
$total += Transfer::readPaid($openDate, date('Y-m-d H:i:s'), \Yii::$app->user->id); $total += Transfer::readPaidCash($openDate, date('Y-m-d H:i:s'), \Yii::$app->user->id);
return $total; return $total;
} }
@ -227,41 +228,7 @@ class AccountStateController extends Controller {
throw new NotFoundHttpException ( 'The requested page does not exist.' ); throw new NotFoundHttpException ( 'The requested page does not exist.' );
} }
} }
/**
* Creates a new AccountState model.
* If creation is successful, the browser will be redirected to the 'view' page.
*
* @return mixed public function actionCreate()
* {
* $model = new AccountState();
*
* if ($model->load(Yii::$app->request->post()) && $model->save()) {
* return $this->redirect(['view', 'id' => $model->id_account_state]);
* } else {
* return $this->render('create', [
* 'model' => $model,
* ]);
* }
* }
*/
/**
* Updates an existing AccountState model.
* If update is successful, the browser will be redirected to the 'view' page.
*
* @param integer $id
* @return mixed public function actionUpdate($id)
* {
* $model = $this->findModel($id);
*
* if ($model->load(Yii::$app->request->post()) && $model->save()) {
* return $this->redirect(['view', 'id' => $model->id_account_state]);
* } else {
* return $this->render('update', [
* 'model' => $model,
* ]);
* }
* }
*/
/** /**
* Deletes an existing AccountState model. * Deletes an existing AccountState model.
* If deletion is successful, the browser will be redirected to the 'index' page. * If deletion is successful, the browser will be redirected to the 'index' page.
@ -321,6 +288,7 @@ class AccountStateController extends Controller {
$mpdf->useSubstitutions=false; $mpdf->useSubstitutions=false;
$mpdf->simpleTables = true; $mpdf->simpleTables = true;
$mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) ); $mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) );
/** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
$mpdf->setFooter('{PAGENO} / {nb}'); $mpdf->setFooter('{PAGENO} / {nb}');
$stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css $stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css
@ -331,10 +299,12 @@ class AccountStateController extends Controller {
'model' => $accountState, 'model' => $accountState,
'details' => $details 'details' => $details
])); ]));
/** @noinspection SpellCheckingInspection */
$type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras"; $type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras";
$dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username; $dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username;
$fn= $type .$dt.".pdf"; $fn= $type .$dt.".pdf";
$mpdf->Output($fn, 'D'); $mpdf->Output($fn, 'D');
exit(0);
} else { } else {
@ -378,6 +348,7 @@ class AccountStateController extends Controller {
$mpdf->useSubstitutions=false; $mpdf->useSubstitutions=false;
$mpdf->simpleTables = true; $mpdf->simpleTables = true;
$mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) ); $mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) );
/** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
$mpdf->setFooter('{PAGENO} / {nb}'); $mpdf->setFooter('{PAGENO} / {nb}');
$stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css $stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css
@ -391,6 +362,7 @@ class AccountStateController extends Controller {
'model' => $accountState, 'model' => $accountState,
'details' => $details 'details' => $details
])); ]));
/** @noinspection SpellCheckingInspection */
$type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras"; $type = $accountState->isTypeOpen() ? "kassza_nyitas" : "kassza_zaras";
$dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username; $dt= "_letrehozva_".date("Ymd_His"). "_" . $user->username;
$fn= $type .$dt.".pdf"; $fn= $type .$dt.".pdf";