From d1e83a292f712ed731c4263b7bbdd3907158dcc9 Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Wed, 26 Oct 2016 18:10:10 +0300
Subject: [PATCH] Purpose order fix

---
 common/modules/rubrication/controllers/TaxOptionController.php |  8 ++++----
 frontend/views/layouts/main.php                                | 43 ++++++++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/common/modules/rubrication/controllers/TaxOptionController.php b/common/modules/rubrication/controllers/TaxOptionController.php
index 51c2521..ae590e2 100755
--- a/common/modules/rubrication/controllers/TaxOptionController.php
+++ b/common/modules/rubrication/controllers/TaxOptionController.php
@@ -70,8 +70,8 @@
                 $model->loadLangs(\Yii::$app->request);
                 if($model->save() && $model->transactionStatus) {
                     return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect([
-                        'view',
-                        'id' => $model->tax_option_id,
+                        'index',
+                        'group' => $group->tax_group_id,
                     ]) : $this->redirect(array_merge([ 'create' ], Yii::$app->request->queryParams));
                 }
             }
@@ -104,8 +104,8 @@
                 //                         ->rebuildMP($model->tax_group_id);
                 if($model->save() && $model->transactionStatus) {
                     return $this->redirect([
-                        'view',
-                        'id' => $model->tax_option_id,
+                        'index',
+                        'group' => $model->tax_group_id,
                     ]);
                 }
             }
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index b28eb87..00efa2a 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -8,6 +8,7 @@
     use common\models\Page;
     use common\modules\language\models\Language;
     use common\modules\rubrication\models\TaxGroup;
+    use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use frontend\assets\AppAsset;
     use yii\widgets\ActiveForm;
@@ -41,12 +42,20 @@
      * @var TaxGroup $purposes
      */
     $purposes = TaxGroup::find()
-                                      ->where([
-                                          'tax_group.tax_group_id' => 5,
-                                          'level'                  => 0,
-                                      ])
-                                      ->joinWith('options.lang')
-                                      ->one();
+                        ->where([
+                            'tax_group.tax_group_id' => 5,
+                            'level'                  => 0,
+                        ])
+                        ->with([
+                            'options' => function($query) {
+                                /**
+                                 * @var ActiveQuery $query
+                                 */
+                                $query->orderBy([ 'sort' => SORT_ASC ])
+                                      ->with('lang');
+                            },
+                        ])
+                        ->one();
     $submenu_items = [];
     foreach($purposes->options as $option) {
         $submenu_items[] = [
@@ -94,7 +103,7 @@
 <div class="xs-sm-menu">
     <div class="style close-menu-mob">
         <?php
-        echo \Yii::t('app', 'меню');
+            echo \Yii::t('app', 'меню');
         ?>
     </div>
     <?php
@@ -151,7 +160,7 @@
                             <p>+38 (044) <span>503-00-30</span></p>
                             <span>
                                 <?php
-                                echo \Yii::t('app', 'отдел по работе с дизайнерами и архитекторами');
+                                    echo \Yii::t('app', 'отдел по работе с дизайнерами и архитекторами');
                                 ?>
                             </span>
                         </td>
@@ -203,7 +212,7 @@
                             <p>+38 (044) <span class="vis-phone">503-00-33</span></p>
                             <span>
                                 <?php
-                                echo \Yii::t('app', 'контрактный отдел');
+                                    echo \Yii::t('app', 'контрактный отдел');
                                 ?>
                             </span>
                         </li>
@@ -211,7 +220,7 @@
                             <p>+38 (044) <span class="vis-phone">503-00-30</span></p>
                             <span>
                                 <?php
-                                echo \Yii::t('app', 'диз_арх_2');
+                                    echo \Yii::t('app', 'диз_арх_2');
                                 ?>
                             </span>
                         </li>
@@ -223,7 +232,7 @@
                     <div class="search-title">
                         <p>
                             <?php
-                            echo \Yii::t('app', 'search');
+                                echo \Yii::t('app', 'search');
                             ?>
                         </p>
                     </div>
@@ -403,12 +412,12 @@
                             <div class="copyright">
                                 <p>
                                     <?php
-                                    echo \Yii::t('app', 'copy1');
+                                        echo \Yii::t('app', 'copy1');
                                     ?>
                                 </p>
                                 <p>
                                     <?php
-                                    echo \Yii::t('app', 'copy2');
+                                        echo \Yii::t('app', 'copy2');
                                     ?>
                                 </p>
                             </div>
@@ -433,10 +442,10 @@
 <div class="modal-form" id="modal_form" style="display: none">
     <div class="form-wr">
         <div id="close-form"></div>
-        <div class="form-title uppercase"><?php echo \Yii::t('app', 'form1');?></div>
+        <div class="form-title uppercase"><?php echo \Yii::t('app', 'form1'); ?></div>
         <form action="">
             <div class="input-wr">
-                <label class="control-label" for="form-1"><?php echo \Yii::t('app', 'username');?></label>
+                <label class="control-label" for="form-1"><?php echo \Yii::t('app', 'username'); ?></label>
                 <input type="text" id="form-1">
                 <div class="help-block"></div>
             </div>
@@ -451,13 +460,13 @@
                 <div class="help-block"></div>
             </div>
             <div class="input-wr">
-                <label class="control-label" for="form-4"><?php echo \Yii::t('app', 'comment');?></label>
+                <label class="control-label" for="form-4"><?php echo \Yii::t('app', 'comment'); ?></label>
                 <textarea id="form-4"></textarea>
                 <div class="help-block"></div>
             </div>
             <div class="input-wr">
                 <div class="button-wr">
-                    <button type="submit"><?php echo \Yii::t('app', 'submit');?></button>
+                    <button type="submit"><?php echo \Yii::t('app', 'submit'); ?></button>
                 </div>
             </div>
         </form>
--
libgit2 0.21.4