проапдейтил роли

Administrator
1 parent 16d5c948
Showing 8 changed files with 28 additions and 18 deletions Show diff stats
common/models/OrdersProducts.php
frontend/controllers/IamController.php
frontend/views/catalog/product.php
frontend/views/iam/1person.php
frontend/views/iam/edit_person.php
frontend/views/iam/myorders.php
frontend/views/iam/person.php
frontend/views/iam/share.php
@@ -2,6 +2,8 @@
 namespace common\models;
+use common\modules\product\models\ProductVariant;
+
 class OrdersProducts extends \yii\db\ActiveRecord
 {
     public static function tableName()
@@ -31,8 +33,8 @@ class OrdersProducts extends \yii\db\ActiveRecord
 		];
 	}
-    public function getMod()
+    public function getProductVariant()
     {
-        return $this->hasOne(Mod::className(), ['id' => 'mod_id']);
+        return $this->hasOne(ProductVariant::className(), ['product_variant_id' => 'mod_id']);
     }
 }  
 \ No newline at end of file
@@ -9,7 +9,7 @@ use yii\filters\VerbFilter;
 use yii\data\ActiveDataProvider;
 use yii\data\Pagination;
 use common\models\User;
-use common\models\Order;
+use common\models\Orders;
 use common\models\OrdersProducts;
 use common\models\Share;
 use common\models\Price;
@@ -72,7 +72,7 @@ class IamController extends Controller
     public function actionMyorders(){
-                $model = Order::find()->where(['user_id'=>Yii::$app->user->id])->orderBy('id DESC')->all();
+        $model = Orders::find()->where(['user_id'=>Yii::$app->user->id])->orderBy('id DESC')->all();
        return $this->render('myorders',['model'=>$model]);
@@ -80,7 +80,7 @@ class IamController extends Controller
     public function actionShow_order()
     {
-		$model = Order::findOne($_GET['id']);
+		$model = Orders::findOne($_GET['id']);
@@ -123,7 +123,7 @@ $this-&gt;registerJs (&quot;
             <a href="#" rel='product' class="link_buy fl">В Корзину</a>
             <div class="both"></div>
         </div>
-
+        <?php /*
         <div class="product_service">
             <ul>
                 <li class="item1"><a href="<?= Url::to (['iam/share', 'id' => $product->product_id]) ?>">Добавить в закладки</a>
@@ -133,7 +133,7 @@ $this-&gt;registerJs (&quot;
                 <li class="item3"><a href="<?= Url::to (['products/compare', 'id' => $product->product_id]) ?>">Добавить в
                         сравнение</a></li>
             </ul>
-        </div>
+        </div>*/?>
     </div>
     <div class="productRightBar">
@@ -26,7 +26,7 @@ $this-&gt;title = &#39;Профиль&#39;;
       <ul>
         <li>Личные данные</li>
         <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
-        <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
+        <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
         <li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li>
       </ul>
     </div>
@@ -34,7 +34,7 @@ $(&#39;#user-phone&#39;).mask(&#39;(000) 000-0000&#39;);
             <ul>
                 <li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
                 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
-                <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
+                <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
                 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
             </ul>
         </div>
@@ -35,7 +35,7 @@ $this-&gt;registerJs(&quot;
             <ul>
                 <li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
                 <li><a href="<?=Url::to(['iam/myorders'])?>" class="active">Мои заказы</a></li>
-                <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
+                <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
                 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
             </ul>
 		</div>
@@ -46,7 +46,7 @@ $this-&gt;registerJs(&quot;
         <div class="favorites">
             <div style="margin-top:-5px;">
-               <?foreach($model as $item):?>
+               <?php foreach($model as $item):?>
                 <div class="fav_point">
                     <div class="left"><a href="#" class="link">№ <?=$item->id?></a></div>
                     <div class="left"><?=$item->date_time?></div>
@@ -55,19 +55,27 @@ $this-&gt;registerJs(&quot;
                     <div class="both"></div>
                     <div class="orders_view">
-                   <?foreach($item->products as $item_p):if(!empty($item_p->cost)):?>
+                   <?php foreach($item->products as $item_p):
+                       ?>
+
+                       <?php if(!empty($item_p->price)):?>
                         <div class="order">
-                            <div class="pixbox"><?if(!empty($item_p->mod->imageAvator)):?><img width="120" src="<?=Yii::$app->request->baseUrl.'/upload/mod/big/'.$item_p->mod->imageAvator?>"><?endif;?></div>
+                            <div class="pixbox">
+                                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($item_p->productVariant->image->imageUrl, 'product_trumb2')?>
+
+                            </div>
                             <div class="order_title"><?=$item_p->product_name?></div>
                             <div class="order_count">Кол-во: <?=$item_p->count?></div>
-                            <div class="order_price"><span><?=$item_p->cost?></span> грн.</div>
+                            <div class="order_price"><span><?=$item_p->price?></span> грн.</div>
                             <p class="note"></p>
                         </div>
-                   <?endif;endforeach;?>
+                        <?php endif;?>
+
+                   <?php endforeach;?>
                         <div class="both"></div>
                     </div>
                 </div>
-                <?endforeach;?>
+                <?php endforeach;?>
             </div>
@@ -25,7 +25,7 @@ $this-&gt;title = &#39;Профиль&#39;;
             <ul>
                 <li><a href="<?=Url::to(['iam/index'])?>" class="active">Личные данные</a></li>
                 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
-                <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
+                <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
                 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
             </ul>
         </div>
@@ -34,7 +34,7 @@ $this-&gt;registerJs(&quot;
 			<ul>
 				<li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
 				<li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
-				<li><a href="<?=Url::to(['iam/share'])?>" class="active">Закладки</a></li>
+				<!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
 				<!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
 			</ul>
 		</div>