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

change version to v.0.0.24

Browse Source
This commit is contained in:
Roland Schneider 2016-01-17 16:44:56 +01:00
parent 55c36d1fca
commit d1638a19de
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/views/product/view.php
View File

@ -16,6 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
<p> <p>
<?= Html::a(Yii::t('common/product', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?> <?= Html::a(Yii::t('common/product', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('common/product', 'Új Termék'), ['create' ], ['class' => 'btn btn-primary']) ?>
</p> </p>
<?= DetailView::widget([ <?= DetailView::widget([

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.0.24
- add transfer payment_method
-0.0.23 -0.0.23
- fix small bugs - fix small bugs
-0.0.22 -0.0.22

2
common/config/params.php
View File

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

3
common/models/Transfer.php
View File

@ -328,7 +328,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
* */ * */
public static function createMoneyMovementOutTransfer($account , $moneyMovement ){ public static function createMoneyMovementOutTransfer($account , $moneyMovement ){
$transfer = new Transfer(); $transfer = new Transfer();
$transfer->payment_method = Transfer::PAYMENT_METHOD_CASH;
$transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT; $transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
$transfer->status = Transfer::STATUS_PAID; $transfer->status = Transfer::STATUS_PAID;
if ( $moneyMovement->type == MoneyMovement::TYPE_OUT){ if ( $moneyMovement->type == MoneyMovement::TYPE_OUT){
@ -344,6 +344,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$transfer->id_account = $account->id_account; $transfer->id_account = $account->id_account;
$transfer->paid_at = date('Y-m-d H:i:s' ) ; $transfer->paid_at = date('Y-m-d H:i:s' ) ;
$transfer->paid_by = \Yii::$app->user->id;
return $transfer; return $transfer;
} }