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

add frontend changes

Browse Source
This commit is contained in:
rocho
2015-10-30 09:28:58 +01:00
parent 4a04c9efa2
commit e34b150d74
41 changed files with 1083 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/components/CustomerAwareBehavior.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
namespace common\components;
use yii\base\Behavior;
use common\models\Customer;
class CustomerAwareBehavior extends Behavior{
public function getCustomerName(){
$result = "";
$customer = $this->owner->customer;
if (isset($customer)){
$result = $customer->name;
}
return $result;
}
public function getCustomer(){
return $this->owner->hasOne( Customer::className(), ["id_customer" =>"id_customer" ] ) ;
}
}

2
common/messages/hu/common/transfer.php
View File

@@ -27,7 +27,7 @@ return [
'Id Currency' => 'Valuta',
'Id Discount' => 'Kedvezmény',
'Id Object' => 'Termék',
'Id Transfer' => 'Pénzmozgás',
'Id Transfer' => 'Tranzakció',
'Id User' => 'Felhasználó',
'Item Price' => 'Termék ár',
'Money' => 'Összeg',

24
common/messages/hu/frontend/money-movement.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Account' => 'Kassza',
'User' => 'Felhasználó',
'End' => 'Időintervallum vége',
'Start' => 'Időintervallum kezdete',
];

2
common/messages/hu/frontend/product.php
View File

@@ -20,7 +20,7 @@ return [
'Customer cart' => 'Vendég kosár',
'Fizetve' => 'Fizetve',
'To cart' => 'Kosárba',
'User Cart' => 'Kosárba',
'User Cart' => 'Recepció kosár',
'Write up' => 'Felír',
'Account' => 'Kassza',
'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',

2
common/models/MoneyMovement.php
View File

@@ -95,6 +95,8 @@ class MoneyMovement extends \yii\db\ActiveRecord
'comment' => Yii::t('common/money-movement', 'Comment'),
'created_at' => Yii::t('common/money-movement', 'Created At'),
'updated_at' => Yii::t('common/money-movement', 'Updated At'),
'accountName' => Yii::t('frontend/money-movement', 'Account'),
'userName' => Yii::t('frontend/money-movement', 'User'),
];
}

5
common/models/ShoppingCart.php
View File

@@ -68,8 +68,9 @@ class ShoppingCart extends \yii\db\ActiveRecord
//delete cart
$sql = "UPDATE transfer AS t
INNER JOIN shopping_cart AS s ON t.id_transfer = s.id_transfer
SET t.status = " . Transfer::STATUS_PAID . " t.paid_at = " . date('Y-m-d H:i:s' )
. " WHERE t.status = " . Transfer::STATUS_NOT_PAID;
SET t.status = " . Transfer::STATUS_PAID . ", t.paid_at = '" . date('Y-m-d H:i:s' ) ."'"
. " WHERE t.status = " . Transfer::STATUS_NOT_PAID
. " and s.id_customer = " . $customer->id_customer ;
$q1 = Yii::$app->db->createCommand($sql);
$q1->execute();

50
common/models/Transfer.php
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;
}

19
common/models/UserSoldItem.php
View File

@@ -61,5 +61,24 @@ class UserSoldItem extends \yii\db\ActiveRecord
}
/**
* @param common\models\User $user
* */
public static function payout( $user ) {
//apply transfer object
//delete cart
$sql = "UPDATE transfer AS t
INNER JOIN user_sold_item AS s ON t.id_transfer = s.id_transfer
SET t.status = " . Transfer::STATUS_PAID . ", t.paid_at = '" . date('Y-m-d H:i:s' ) ."'"
. " WHERE t.status = " . Transfer::STATUS_NOT_PAID
. " and s.id_user =" . $user->id ;
$q1 = Yii::$app->db->createCommand($sql);
$q1->execute();
UserSoldItem::deleteAll(['id_user' => Yii::$app->user->id]);
}
}