Commit b7f0b4d58e84b2e2a63dd549c2869b8c6ee8e561
1 parent
55ae078b
24.03.16 finish 1
Showing
2 changed files
with
14 additions
and
11 deletions
Show diff stats
backend/controllers/CategoryController.php
| @@ -30,7 +30,7 @@ class CategoryController extends Controller | @@ -30,7 +30,7 @@ class CategoryController extends Controller | ||
| 30 | 'allow' => true, | 30 | 'allow' => true, |
| 31 | ], | 31 | ], |
| 32 | [ | 32 | [ |
| 33 | - 'actions' => ['logout', 'index'], | 33 | + 'actions' => ['logout', 'index','update'], |
| 34 | 'allow' => true, | 34 | 'allow' => true, |
| 35 | 'roles' => ['@'], | 35 | 'roles' => ['@'], |
| 36 | ], | 36 | ], |
frontend/views/orders/basket-step-01.php
| @@ -2,11 +2,11 @@ | @@ -2,11 +2,11 @@ | ||
| 2 | 2 | ||
| 3 | use yii\helpers\Html; | 3 | use yii\helpers\Html; |
| 4 | use yii\helpers\Url; | 4 | use yii\helpers\Url; |
| 5 | -use yii\widgets\ActiveForm; | 5 | +use yii\bootstrap\ActiveForm; |
| 6 | 6 | ||
| 7 | $this->title = 'Оформление заказа'; | 7 | $this->title = 'Оформление заказа'; |
| 8 | $this->params['breadcrumbs'][] = $this->title; | 8 | $this->params['breadcrumbs'][] = $this->title; |
| 9 | - | 9 | +$model->delivery = 2; |
| 10 | ?> | 10 | ?> |
| 11 | 11 | ||
| 12 | 12 | ||
| @@ -48,19 +48,21 @@ $this->params['breadcrumbs'][] = $this->title; | @@ -48,19 +48,21 @@ $this->params['breadcrumbs'][] = $this->title; | ||
| 48 | <h3>Доставка</h3> | 48 | <h3>Доставка</h3> |
| 49 | 49 | ||
| 50 | <div class="padding_cust"> | 50 | <div class="padding_cust"> |
| 51 | - <label><input type="radio" name="delivery" value="0" checked="true" /></label> | ||
| 52 | - <p>Курьерска доставка по Киеву и области</p> | 51 | + <?= $form->field($model, 'delivery',[ |
| 52 | + 'radioTemplate' => "{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n<p>Курьерска доставка по Киеву и области</p>", | ||
| 53 | + ])->radio() ?> | ||
| 53 | </div> | 54 | </div> |
| 54 | 55 | ||
| 55 | <div class="padding_cust"> | 56 | <div class="padding_cust"> |
| 56 | - <label><input type="radio" name="delivery" value="0" /></label> | ||
| 57 | - <p>В любой регион Украины</p> | 57 | + <?= $form->field($model, 'delivery',[ |
| 58 | + 'template' => '<label>{input}</label><p>В любой регион Украины</p>{error}{hint}', | ||
| 59 | + ])->radio(['value'=>2,'label'=>false]) ?> | ||
| 58 | </div> | 60 | </div> |
| 59 | 61 | ||
| 60 | <div class="padding_cust"> | 62 | <div class="padding_cust"> |
| 61 | - <label><input type="radio" name="delivery" value="0" /></label> | ||
| 62 | - <p>Самовывоз (бесплатно)</p> | ||
| 63 | - <span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span> | 63 | + <?= $form->field($model, 'delivery',[ |
| 64 | + 'template' => '<label>{input}</label><p>Самовывоз (бесплатно)</p><span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span>{error}{hint}', | ||
| 65 | + ])->radio(['value'=>3,'label'=>false]) ?> | ||
| 64 | </div> | 66 | </div> |
| 65 | </div> | 67 | </div> |
| 66 | 68 | ||
| @@ -76,7 +78,8 @@ $this->params['breadcrumbs'][] = $this->title; | @@ -76,7 +78,8 @@ $this->params['breadcrumbs'][] = $this->title; | ||
| 76 | 78 | ||
| 77 | <div class="padding_cust"> | 79 | <div class="padding_cust"> |
| 78 | <label><input type="radio" name="pay_way" value="0" /></label> | 80 | <label><input type="radio" name="pay_way" value="0" /></label> |
| 79 | - <p>Оплата по безналичному расчету. Код ЕГРПОУ <input type="text" name="code"></p> | 81 | + <p>Оплата по безналичному расчету. Код ЕГРПОУ </p> |
| 82 | + <input type="text" name="code"> | ||
| 80 | </div> | 83 | </div> |
| 81 | 84 | ||
| 82 | <div class="padding_cust"> | 85 | <div class="padding_cust"> |