add product sell discount js changes
This commit is contained in:
@@ -4,6 +4,7 @@ namespace common\models;
|
||||
|
||||
use Yii;
|
||||
use yii\behaviors\TimestampBehavior;
|
||||
use yii\helpers\ArrayHelper;
|
||||
|
||||
/**
|
||||
* This is the model class for table "discount".
|
||||
@@ -113,9 +114,24 @@ class Discount extends \yii\db\ActiveRecord
|
||||
* */
|
||||
public static function applyDiscount($money,$discount){
|
||||
$result = $money;
|
||||
$valueOfDiscount = $money * $discount->value * 100;
|
||||
$valueOfDiscount = $money * $discount->value / 100;
|
||||
$result = $money - $valueOfDiscount;
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
public static function modelsToArray($discounts,$default = []){
|
||||
|
||||
if ( $discounts == null ){
|
||||
return $default;
|
||||
}
|
||||
|
||||
return ArrayHelper::toArray($discounts, [
|
||||
'common\models\Discount' => [
|
||||
'id_discount',
|
||||
'value',
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user