diff --git a/controllers/OrderController.php b/controllers/OrderController.php index 6070352..3e509fa 100755 --- a/controllers/OrderController.php +++ b/controllers/OrderController.php @@ -4,6 +4,7 @@ use artweb\artbox\components\SmsSender; use artweb\artbox\ecommerce\models\OrderSearch; + use common\components\CreditHelper; use common\models\User; use phpDocumentor\Reflection\Types\Null_; use Yii; @@ -11,6 +12,7 @@ use yii\helpers\ArrayHelper; use yii\helpers\Json; use yii\helpers\VarDumper; + use yii\validators\NumberValidator; use yii\web\Controller; use yii\filters\VerbFilter; use yii\data\ActiveDataProvider; @@ -281,7 +283,7 @@ return $this->renderPartial( 'print', [ - 'order' => $order, + 'order' => $order, 'dataProvider' => $dataProvider, ] ); @@ -323,6 +325,18 @@ $model = $this->findModel($id); + if ($model->payment == 10) { + $model->validators->append( + new NumberValidator( + [ + 'attributes' => 'credit_sum', + 'max' => $model->total - CreditHelper::MIN_CREDIT_SUM, + 'min' => $model->total - CreditHelper::MAX_CREDIT_SUM, + ] + ) + ); + } + /** * @var User $user */ diff --git a/models/Order.php b/models/Order.php index 32accca..21a26ae 100755 --- a/models/Order.php +++ b/models/Order.php @@ -201,8 +201,7 @@ 'credit_sum', ], 'number', - 'min' => 300, - 'max' => 25000, + 'min' => 0, ], [ [ @@ -292,7 +291,7 @@ 'city' => Yii::t('app', 'Город'), 'numbercard' => Yii::t('app', '№ карточки'), 'credit_month' => Yii::t('app', 'Количество месяцев'), - 'credit_sum' => Yii::t('app', 'Сумма кредита'), + 'credit_sum' => Yii::t('app', 'Первоначальный взнос'), ]; } diff --git a/views/order/_form.php b/views/order/_form.php index f967eb7..3a1bfe0 100755 --- a/views/order/_form.php +++ b/views/order/_form.php @@ -338,17 +338,25 @@ JS; if ($model->payment == 10) { ?>
-
+
field($model, 'credit_sum') ->textInput( [ 'class' => 'form-control credit_input', + 'data-sum' => $model->total, ] ); ?>
-
+
+ total - $model->credit_sum, [ + 'class' => 'credit_value_full', + ]); + ?> +
+
field($model, 'credit_month') ->textInput( @@ -362,7 +370,7 @@ JS;

total); + echo CreditHelper::getCredit($model->total - $model->credit_sum, $model->credit_month); ?> грн/мес -- libgit2 0.21.4