From 3e703aac69131c5854c0c5a999d15602ac2ed106 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 29 Nov 2016 20:25:36 +0200 Subject: [PATCH] -Order form fixes --- controllers/OrderController.php | 10 ++++++++++ models/OrderPayment.php | 5 +++++ views/order-payment/_form.php | 2 ++ views/order-payment/index.php | 1 + views/order/_form.php | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- views/order/index.php | 1 + 6 files changed, 103 insertions(+), 68 deletions(-) diff --git a/controllers/OrderController.php b/controllers/OrderController.php index 4d9458f..2413aa1 100755 --- a/controllers/OrderController.php +++ b/controllers/OrderController.php @@ -128,6 +128,16 @@ public function actionDelete($id) { + if (\Yii::$app->user->identity->isAdmin()) { + $this->findModel($id) + ->delete(); + } + + return $this->redirect([ 'index' ]); + } + + public function actionDeleteProduct($id) + { $model = OrderProduct::findOne($id); $orderId = $model->order_id; if ($model->delete()) { diff --git a/models/OrderPayment.php b/models/OrderPayment.php index 23d3b5b..08c69cc 100644 --- a/models/OrderPayment.php +++ b/models/OrderPayment.php @@ -66,6 +66,10 @@ { return [ [ + [ 'short' ], + 'string', + ], + [ [ 'status' ], 'integer', ], @@ -85,6 +89,7 @@ return [ 'id' => \Yii::t('app', 'ID'), 'status' => \Yii::t('app', 'Статус'), + 'short' => \Yii::t('app', 'Название'), ]; } diff --git a/views/order-payment/_form.php b/views/order-payment/_form.php index 7550722..7bdea8c 100644 --- a/views/order-payment/_form.php +++ b/views/order-payment/_form.php @@ -30,6 +30,8 @@ use yii\widgets\ActiveForm; ], ] )) ?> + field($model, 'short')->textInput(); ?> + $modelLangs, 'formView' => '@artweb/artbox/ecommerce/views/order-payment/_form_language', diff --git a/views/order-payment/index.php b/views/order-payment/index.php index 588b22d..23b3c98 100644 --- a/views/order-payment/index.php +++ b/views/order-payment/index.php @@ -25,6 +25,7 @@ $this->params['breadcrumbs'][] = $this->title; ['class' => 'yii\grid\SerialColumn'], 'status', + 'short', [ 'attribute' => 'title', 'value' => 'lang.title', diff --git a/views/order/_form.php b/views/order/_form.php index 5a1970b..d979de6 100755 --- a/views/order/_form.php +++ b/views/order/_form.php @@ -163,7 +163,7 @@ JS; ), [ 'prompt' => \Yii::t('app', 'Выберите доставку ...') ] ) ?> - + user->identity->isAdmin()) { @@ -177,63 +177,63 @@ JS; 'username' ), [ 'prompt' => \Yii::t('app', 'Менеджер') ] - ) ; - } + ); + } ?> - -

- 'sms-template-selector', - 'name' => 'select-sms-template', - 'data' => ArrayHelper::map( - SmsTemplate::find() - ->asArray() - ->all(), - 'text', - 'title' - ), - 'options' => [ 'placeholder' => \Yii::t('app', 'Выберите шаблон') ], - 'pluginOptions' => [ - 'allowClear' => true, - ], - ] - ); - - ?> -
- 3, - 'id' => 'sms-text-area', - 'class' => 'form-control', - ] - ); - ?> -
- isNewRecord) { - echo Html::button( - \Yii::t('app', 'Отправить'), - [ - 'class' => 'btn btn-warning disabled', - ] - ); - } else { - echo Html::button( - \Yii::t('app', 'Отправить'), - [ - 'class' => 'btn btn-warning', - 'id' => 'send-sms-action', - ] - ); - } - ?> +

+ 'sms-template-selector', + 'name' => 'select-sms-template', + 'data' => ArrayHelper::map( + SmsTemplate::find() + ->asArray() + ->all(), + 'text', + 'title' + ), + 'options' => [ 'placeholder' => \Yii::t('app', 'Выберите шаблон') ], + 'pluginOptions' => [ + 'allowClear' => true, + ], + ] + ); + + ?> +
+ 3, + 'id' => 'sms-text-area', + 'class' => 'form-control', + ] + ); + ?> +
+ isNewRecord) { + echo Html::button( + \Yii::t('app', 'Отправить'), + [ + 'class' => 'btn btn-warning disabled', + ] + ); + } else { + echo Html::button( + \Yii::t('app', 'Отправить'), + [ + 'class' => 'btn btn-warning', + 'id' => 'send-sms-action', + ] + ); + } + ?> +
@@ -247,12 +247,11 @@ JS; ->dropDownList( ArrayHelper::map( OrderPayment::find() - ->joinWith('lang') ->where([ 'status' => OrderPayment::ACTIVE ]) ->asArray() ->all(), 'id', - 'lang.title' + 'short' ), [ 'prompt' => 'Способ оплаты ...' ] ); ?> @@ -309,7 +308,7 @@ JS; ] ), [ - 'class' => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg', + 'class' => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg', ] ) ?>
@@ -359,9 +358,9 @@ JS; 'class' => 'kartik\grid\EditableColumn', 'attribute' => 'booking', 'editableOptions' => [ - 'header' => \Yii::t('app', 'Бронь'), - 'inputType' => kartik\editable\Editable::INPUT_TEXT, - 'options' => [ + 'header' => \Yii::t('app', 'Бронь'), + 'inputType' => kartik\editable\Editable::INPUT_TEXT, + 'options' => [ 'pluginOptions' => [ 'min' => 0, 'max' => 20, @@ -377,9 +376,9 @@ JS; 'class' => 'kartik\grid\EditableColumn', 'attribute' => 'status', 'editableOptions' => [ - 'header' => \Yii::t('app', 'Статус'), - 'inputType' => kartik\editable\Editable::INPUT_TEXT, - 'options' => [ + 'header' => \Yii::t('app', 'Статус'), + 'inputType' => kartik\editable\Editable::INPUT_TEXT, + 'options' => [ 'pluginOptions' => [ 'min' => 0, 'max' => 20, @@ -395,9 +394,9 @@ JS; 'class' => 'kartik\grid\EditableColumn', 'attribute' => 'return', 'editableOptions' => [ - 'header' => \Yii::t('app', 'Возврат'), - 'inputType' => kartik\editable\Editable::INPUT_CHECKBOX, - 'options' => [], + 'header' => \Yii::t('app', 'Возврат'), + 'inputType' => kartik\editable\Editable::INPUT_CHECKBOX, + 'options' => [], ], 'format' => [ 'boolean', @@ -407,6 +406,23 @@ JS; [ 'class' => 'yii\grid\ActionColumn', 'template' => '{delete}', + 'buttons' => [ + 'delete' => function($url, $model) { + return Html::a( + Html::tag('span', '', [ 'class' => 'glyphicon glyphicon-trash' ]), + [ + 'delete-product', + 'id' => $model->id, + ], + [ + 'data' => [ + 'confirm' => 'Вы уверены, что хотите удалить этот элемент?', + 'method' => 'POST', + ], + ] + ); + }, + ], ], ], 'responsive' => true, diff --git a/views/order/index.php b/views/order/index.php index 7095c8c..443a2d3 100755 --- a/views/order/index.php +++ b/views/order/index.php @@ -262,6 +262,7 @@ JS; 'sms', [ 'class' => 'yii\grid\ActionColumn', + 'template' => \Yii::$app->user->identity->isAdmin() ? '{view} {update} {delete}' : '{view} {update}' ], ], ] -- libgit2 0.21.4