Yarik / vitex

Commit d1e83a292f712ed731c4263b7bbdd3907158dcc9

Authored by Yarik
1 parent d8993476

Purpose order fix

Showing 2 changed files with 30 additions and 21 deletions   Show diff stats
Inline Side-by-side
common/modules/rubrication/controllers/TaxOptionController.php
  Show/Hide comments   View file @d1e83a2
... ... @@ -70,8 +70,8 @@
70 70 $model->loadLangs(\Yii::$app->request);
71 71 if($model->save() && $model->transactionStatus) {
72 72 return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect([
73   - 'view',
74   - 'id' => $model->tax_option_id,
  73 + 'index',
  74 + 'group' => $group->tax_group_id,
75 75 ]) : $this->redirect(array_merge([ 'create' ], Yii::$app->request->queryParams));
76 76 }
77 77 }
... ... @@ -104,8 +104,8 @@
104 104 // ->rebuildMP($model->tax_group_id);
105 105 if($model->save() && $model->transactionStatus) {
106 106 return $this->redirect([
107   - 'view',
108   - 'id' => $model->tax_option_id,
  107 + 'index',
  108 + 'group' => $model->tax_group_id,
109 109 ]);
110 110 }
111 111 }
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @d1e83a2
... ... @@ -8,6 +8,7 @@
8 8 use common\models\Page;
9 9 use common\modules\language\models\Language;
10 10 use common\modules\rubrication\models\TaxGroup;
  11 + use yii\db\ActiveQuery;
11 12 use yii\helpers\Html;
12 13 use frontend\assets\AppAsset;
13 14 use yii\widgets\ActiveForm;
... ... @@ -41,12 +42,20 @@
41 42 * @var TaxGroup $purposes
42 43 */
43 44 $purposes = TaxGroup::find()
44   - ->where([
45   - 'tax_group.tax_group_id' => 5,
46   - 'level' => 0,
47   - ])
48   - ->joinWith('options.lang')
49   - ->one();
  45 + ->where([
  46 + 'tax_group.tax_group_id' => 5,
  47 + 'level' => 0,
  48 + ])
  49 + ->with([
  50 + 'options' => function($query) {
  51 + /**
  52 + * @var ActiveQuery $query
  53 + */
  54 + $query->orderBy([ 'sort' => SORT_ASC ])
  55 + ->with('lang');
  56 + },
  57 + ])
  58 + ->one();
50 59 $submenu_items = [];
51 60 foreach($purposes->options as $option) {
52 61 $submenu_items[] = [
... ... @@ -94,7 +103,7 @@
94 103 <div class="xs-sm-menu">
95 104 <div class="style close-menu-mob">
96 105 <?php
97   - echo \Yii::t('app', 'меню');
  106 + echo \Yii::t('app', 'меню');
98 107 ?>
99 108 </div>
100 109 <?php
... ... @@ -151,7 +160,7 @@
151 160 <p>+38 (044) <span>503-00-30</span></p>
152 161 <span>
153 162 <?php
154   - echo \Yii::t('app', 'отдел по работе с дизайнерами и архитекторами');
  163 + echo \Yii::t('app', 'отдел по работе с дизайнерами и архитекторами');
155 164 ?>
156 165 </span>
157 166 </td>
... ... @@ -203,7 +212,7 @@
203 212 <p>+38 (044) <span class="vis-phone">503-00-33</span></p>
204 213 <span>
205 214 <?php
206   - echo \Yii::t('app', 'контрактный отдел');
  215 + echo \Yii::t('app', 'контрактный отдел');
207 216 ?>
208 217 </span>
209 218 </li>
... ... @@ -211,7 +220,7 @@
211 220 <p>+38 (044) <span class="vis-phone">503-00-30</span></p>
212 221 <span>
213 222 <?php
214   - echo \Yii::t('app', 'диз_арх_2');
  223 + echo \Yii::t('app', 'диз_арх_2');
215 224 ?>
216 225 </span>
217 226 </li>
... ... @@ -223,7 +232,7 @@
223 232 <div class="search-title">
224 233 <p>
225 234 <?php
226   - echo \Yii::t('app', 'search');
  235 + echo \Yii::t('app', 'search');
227 236 ?>
228 237 </p>
229 238 </div>
... ... @@ -403,12 +412,12 @@
403 412 <div class="copyright">
404 413 <p>
405 414 <?php
406   - echo \Yii::t('app', 'copy1');
  415 + echo \Yii::t('app', 'copy1');
407 416 ?>
408 417 </p>
409 418 <p>
410 419 <?php
411   - echo \Yii::t('app', 'copy2');
  420 + echo \Yii::t('app', 'copy2');
412 421 ?>
413 422 </p>
414 423 </div>
... ... @@ -433,10 +442,10 @@
433 442 <div class="modal-form" id="modal_form" style="display: none">
434 443 <div class="form-wr">
435 444 <div id="close-form"></div>
436   - <div class="form-title uppercase"><?php echo \Yii::t('app', 'form1');?></div>
  445 + <div class="form-title uppercase"><?php echo \Yii::t('app', 'form1'); ?></div>
437 446 <form action="">
438 447 <div class="input-wr">
439   - <label class="control-label" for="form-1"><?php echo \Yii::t('app', 'username');?></label>
  448 + <label class="control-label" for="form-1"><?php echo \Yii::t('app', 'username'); ?></label>
440 449 <input type="text" id="form-1">
441 450 <div class="help-block"></div>
442 451 </div>
... ... @@ -451,13 +460,13 @@
451 460 <div class="help-block"></div>
452 461 </div>
453 462 <div class="input-wr">
454   - <label class="control-label" for="form-4"><?php echo \Yii::t('app', 'comment');?></label>
  463 + <label class="control-label" for="form-4"><?php echo \Yii::t('app', 'comment'); ?></label>
455 464 <textarea id="form-4"></textarea>
456 465 <div class="help-block"></div>
457 466 </div>
458 467 <div class="input-wr">
459 468 <div class="button-wr">
460   - <button type="submit"><?php echo \Yii::t('app', 'submit');?></button>
  469 + <button type="submit"><?php echo \Yii::t('app', 'submit'); ?></button>
461 470 </div>
462 471 </div>
463 472 </form>
... ...