Administrator / new_rukzachok-1

Commit 7d9935e2e8ebc1ad6462a3f3f36bcde18065bd1b

Authored by Administrator
1 parent 16d5c948

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

Showing 8 changed files with 28 additions and 18 deletions   Show diff stats
Inline Side-by-side
common/models/OrdersProducts.php
  Show/Hide comments   View file @7d9935e
... ... @@ -2,6 +2,8 @@
2 2  
3 3 namespace common\models;
4 4  
  5 +use common\modules\product\models\ProductVariant;
  6 +
5 7 class OrdersProducts extends \yii\db\ActiveRecord
6 8 {
7 9 public static function tableName()
... ... @@ -31,8 +33,8 @@ class OrdersProducts extends \yii\db\ActiveRecord
31 33 ];
32 34 }
33 35  
34   - public function getMod()
  36 + public function getProductVariant()
35 37 {
36   - return $this->hasOne(Mod::className(), ['id' => 'mod_id']);
  38 + return $this->hasOne(ProductVariant::className(), ['product_variant_id' => 'mod_id']);
37 39 }
38 40 }
39 41 \ No newline at end of file
... ...
frontend/controllers/IamController.php
  Show/Hide comments   View file @7d9935e
... ... @@ -9,7 +9,7 @@ use yii\filters\VerbFilter;
9 9 use yii\data\ActiveDataProvider;
10 10 use yii\data\Pagination;
11 11 use common\models\User;
12   -use common\models\Order;
  12 +use common\models\Orders;
13 13 use common\models\OrdersProducts;
14 14 use common\models\Share;
15 15 use common\models\Price;
... ... @@ -72,7 +72,7 @@ class IamController extends Controller
72 72 public function actionMyorders(){
73 73  
74 74  
75   - $model = Order::find()->where(['user_id'=>Yii::$app->user->id])->orderBy('id DESC')->all();
  75 + $model = Orders::find()->where(['user_id'=>Yii::$app->user->id])->orderBy('id DESC')->all();
76 76  
77 77 return $this->render('myorders',['model'=>$model]);
78 78  
... ... @@ -80,7 +80,7 @@ class IamController extends Controller
80 80  
81 81 public function actionShow_order()
82 82 {
83   - $model = Order::findOne($_GET['id']);
  83 + $model = Orders::findOne($_GET['id']);
84 84  
85 85  
86 86  
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @7d9935e
... ... @@ -123,7 +123,7 @@ $this->registerJs ("
123 123 <a href="#" rel='product' class="link_buy fl">В Корзину</a>
124 124 <div class="both"></div>
125 125 </div>
126   -
  126 + <?php /*
127 127 <div class="product_service">
128 128 <ul>
129 129 <li class="item1"><a href="<?= Url::to (['iam/share', 'id' => $product->product_id]) ?>">Добавить в закладки</a>
... ... @@ -133,7 +133,7 @@ $this-&gt;registerJs (&quot;
133 133 <li class="item3"><a href="<?= Url::to (['products/compare', 'id' => $product->product_id]) ?>">Добавить в
134 134 сравнение</a></li>
135 135 </ul>
136   - </div>
  136 + </div>*/?>
137 137 </div>
138 138  
139 139 <div class="productRightBar">
... ...
frontend/views/iam/1person.php
  Show/Hide comments   View file @7d9935e
... ... @@ -26,7 +26,7 @@ $this-&gt;title = &#39;Профиль&#39;;
26 26 <ul>
27 27 <li>Личные данные</li>
28 28 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
29   - <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
  29 + <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
30 30 <li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li>
31 31 </ul>
32 32 </div>
... ...
frontend/views/iam/edit_person.php
  Show/Hide comments   View file @7d9935e
... ... @@ -34,7 +34,7 @@ $(&#39;#user-phone&#39;).mask(&#39;(000) 000-0000&#39;);
34 34 <ul>
35 35 <li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
36 36 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
37   - <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
  37 + <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
38 38 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
39 39 </ul>
40 40 </div>
... ...
frontend/views/iam/myorders.php
  Show/Hide comments   View file @7d9935e
... ... @@ -35,7 +35,7 @@ $this-&gt;registerJs(&quot;
35 35 <ul>
36 36 <li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
37 37 <li><a href="<?=Url::to(['iam/myorders'])?>" class="active">Мои заказы</a></li>
38   - <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
  38 + <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
39 39 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
40 40 </ul>
41 41 </div>
... ... @@ -46,7 +46,7 @@ $this-&gt;registerJs(&quot;
46 46  
47 47 <div class="favorites">
48 48 <div style="margin-top:-5px;">
49   - <?foreach($model as $item):?>
  49 + <?php foreach($model as $item):?>
50 50 <div class="fav_point">
51 51 <div class="left"><a href="#" class="link">№ <?=$item->id?></a></div>
52 52 <div class="left"><?=$item->date_time?></div>
... ... @@ -55,19 +55,27 @@ $this-&gt;registerJs(&quot;
55 55 <div class="both"></div>
56 56  
57 57 <div class="orders_view">
58   - <?foreach($item->products as $item_p):if(!empty($item_p->cost)):?>
  58 + <?php foreach($item->products as $item_p):
  59 + ?>
  60 +
  61 + <?php if(!empty($item_p->price)):?>
59 62 <div class="order">
60   - <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>
  63 + <div class="pixbox">
  64 + <?= \common\components\artboximage\ArtboxImageHelper::getImage($item_p->productVariant->image->imageUrl, 'product_trumb2')?>
  65 +
  66 + </div>
61 67 <div class="order_title"><?=$item_p->product_name?></div>
62 68 <div class="order_count">Кол-во: <?=$item_p->count?></div>
63   - <div class="order_price"><span><?=$item_p->cost?></span> грн.</div>
  69 + <div class="order_price"><span><?=$item_p->price?></span> грн.</div>
64 70 <p class="note"></p>
65 71 </div>
66   - <?endif;endforeach;?>
  72 + <?php endif;?>
  73 +
  74 + <?php endforeach;?>
67 75 <div class="both"></div>
68 76 </div>
69 77 </div>
70   - <?endforeach;?>
  78 + <?php endforeach;?>
71 79  
72 80 </div>
73 81  
... ...
frontend/views/iam/person.php
  Show/Hide comments   View file @7d9935e
... ... @@ -25,7 +25,7 @@ $this-&gt;title = &#39;Профиль&#39;;
25 25 <ul>
26 26 <li><a href="<?=Url::to(['iam/index'])?>" class="active">Личные данные</a></li>
27 27 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
28   - <li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>
  28 + <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
29 29 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
30 30 </ul>
31 31 </div>
... ...
frontend/views/iam/share.php
  Show/Hide comments   View file @7d9935e
... ... @@ -34,7 +34,7 @@ $this-&gt;registerJs(&quot;
34 34 <ul>
35 35 <li><a href="<?=Url::to(['iam/index'])?>">Личные данные</a></li>
36 36 <li><a href="<?=Url::to(['iam/myorders'])?>">Мои заказы</a></li>
37   - <li><a href="<?=Url::to(['iam/share'])?>" class="active">Закладки</a></li>
  37 + <!--<li><a href="<?=Url::to(['iam/share'])?>">Закладки</a></li>-->
38 38 <!--li><a href="<?=Url::to(['iam/price'])?>">Пожелания</a></li-->
39 39 </ul>
40 40 </div>
... ...