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

add product sell discount js changes

Browse Source
This commit is contained in:
rocho
2015-10-20 17:23:52 +02:00
parent 1a1477b26b
commit f2e30779f0
10 changed files with 165 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/models/Transfer.php
View File

@@ -148,8 +148,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$result = "";
if ( $this->type == Transfer::TYPE_TICKET ){
$result = $this->ticketName;
}else{
}else if ( $this->type == Transfer::TYPE_PRODUCT ){
$result = $this->productName;
}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
$result = "Pénz kivétel - " . $this->moneyMovement->name;
}
return $result;
}
@@ -201,10 +203,6 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
$result = Yii::t('common/transfer','Money movement');
}
// $result .= " xx";
// $result .= $this->type;
return $result;
}
@@ -281,7 +279,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
$transfer->status = Transfer::STATUS_PAID;
$transfer->direction = Transfer::DIRECTION_OUT;
$transfer->count = 0;
$transfer->count = null;
$transfer->id_object = $moneyMovement->id_money_movement;
$transfer->money = $moneyMovement->money;