add frontend changes

This commit is contained in:
2015-10-30 09:28:58 +01:00
parent 4a04c9efa2
commit e34b150d74
41 changed files with 1083 additions and 254 deletions

View File

@@ -8,6 +8,8 @@ use yii\helpers\ArrayHelper;
use yii\behaviors\TimestampBehavior;
use common\components\AccountAwareBehavior;
use common\components\UserAwareBehavior;
use common\components\DiscountAwareBehavior;
use common\components\CustomerAwareBehavior;
/**
* This is the model class for table "transfer".
@@ -29,6 +31,8 @@ use common\components\UserAwareBehavior;
* @property string $created_at
* @property string $updated_at
* @property integer $direction
* @property string $paid_at
* @property integer $id_customer
*/
class Transfer extends \common\models\BaseFitnessActiveRecord
{
@@ -54,12 +58,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
'class' => TimestampBehavior::className(),
'value' => function(){ return date('Y-m-d H:i:s' ); }
],
// [
// 'class' => AccountAwareBehavior::className(),
// ],
// [
// 'class' => UserAwareBehavior::className(),
// ],
[
'class' => DiscountAwareBehavior::className(),
],
[
'class' => CustomerAwareBehavior::className(),
],
], parent::behaviors());
}
@@ -103,9 +107,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
'money_currency' => Yii::t('common/transfer', 'Money Currency'),
'rate' => Yii::t('common/transfer', 'Rate'),
'id_user' => Yii::t('common/transfer', 'Id User'),
'id_customer' => Yii::t('common/transfer', 'Customer'),
'comment' => Yii::t('common/transfer', 'Comment'),
'created_at' => Yii::t('common/transfer', 'Created At'),
'updated_at' => Yii::t('common/transfer', 'Updated At'),
'paid_at' => Yii::t('common/transfer', 'Paid At'),
];
}
@@ -136,9 +142,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
return $this->hasOne( Currency::className(), ["id_currency" =>"id_currency" ] );
}
public function getDiscount(){
return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
}
// public function getDiscount(){
// return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
// }
public function getUserSoldItem(){
return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
@@ -256,8 +262,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
* @param $discount common\models\Discount
* @param $currency common\models\Currency
* @param $product common\models\Product
* @param $customer common\models\Customer
* */
public static function createProductTransfer($sale,$account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID){
public static function createProductTransfer($sale,$account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID,$customer = null){
$transfer = new Transfer();
$transfer->type = Transfer::TYPE_PRODUCT;
@@ -287,6 +294,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$transfer->id_account = $account->id_account;
if ( isset( $customer ) ){
$transfer->id_customer = $customer->id_customer;
}
return $transfer;
}
@@ -309,6 +320,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$transfer->id_account = $account->id_account;
$transfer->paid_at = date('Y-m-d H:i:s' ) ;
return $transfer;
}
/**
@@ -317,9 +330,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
* @param $currency common\models\Currency
* @param $ticket common\models\Ticket
* */
public static function createTicketTransfer($account, $discount, $currency, $count,$ticket ){
public static function createTicketTransfer($account, $discount, $currency, $count,$ticket ,$status = Transfer::STATUS_NOT_PAID){
$transfer = new Transfer();
$transfer->status = $status;
$transfer->type = Transfer::TYPE_TICKET;
$transfer->id_object = $ticket->id_ticket;
@@ -422,6 +436,20 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
self::TYPE_TICKET => Yii::t('common/transfer','Ticket'),
];
}
public static function statuses( ) {
return [
self::STATUS_NOT_PAID => Yii::t('common/transfer','Nincs fizetve'),
self::STATUS_PAID => Yii::t('common/transfer','Fizetve'),
];
}
public function getStatusName( ) {
$status = null;
$statuses = self::statuses();
if ( array_key_exists($this->status, $statuses)){
$status = $statuses[$this->status];
}
return $status;
}