diff --git a/common/models/Share.php b/common/models/Share.php index 8a2eb57..f25dcaf 100755 --- a/common/models/Share.php +++ b/common/models/Share.php @@ -2,6 +2,7 @@ namespace common\models; +use common\modules\product\models\Product; use Yii; class Share extends \yii\db\ActiveRecord @@ -22,8 +23,8 @@ class Share extends \yii\db\ActiveRecord public function beforeSave($insert) { $this->user_id = Yii::$app->user->id; - $this->date_time = time(); - $this->date = new \yii\db\Expression('NOW()'); + $this->date_time = date('Y-m-d H:i:s'); + $this->date = date('Y-m-d'); return parent::beforeSave($insert); } @@ -33,7 +34,7 @@ class Share extends \yii\db\ActiveRecord public function getProduct() { - return $this->hasOne(Products::className(), ['id' => 'product_id']); + return $this->hasOne(Product::className(), ['product_id' => 'product_id']); } public function getShareList() diff --git a/frontend/controllers/IamController.php b/frontend/controllers/IamController.php index 8985228..552ff00 100755 --- a/frontend/controllers/IamController.php +++ b/frontend/controllers/IamController.php @@ -2,6 +2,7 @@ namespace frontend\controllers; +use common\models\ShareSearch; use Yii; use yii\web\Controller; use yii\filters\AccessControl; @@ -94,37 +95,43 @@ class IamController extends Controller } public function actionShare(){ - if(!empty($_GET['id'])){ + if(Yii::$app->request->get('id')) { if(!$model = Share::find()->where('user_id=:user_id and product_id=:product_id',[':user_id'=>Yii::$app->user->id,':product_id'=>$_GET['id']])->one()) $model = new Share; - $model->product_id = $_GET['id']; + $model->product_id = Yii::$app->request->get('id'); $model->save(); Yii::$app->getSession()->setFlash('success', 'Этот товар добавлен в закладку!'); return $this->redirect(Yii::$app->request->referrer); } - else{ + else { /* $dataProvider = new ActiveDataProvider([ 'query' => Share::find()->where(['user_id'=>Yii::$app->user->id])->orderBy('date_time DESC'), 'pagination' => [ 'pageSize' => 20, ], ]);*/ - if(!empty($_GET['deleteID'])){ - $model = Share::find()->where(['user_id'=>Yii::$app->user->id,'id'=>$_GET['deleteID']])->one(); + if(Yii::$app->request->get('deleteID')) { + $model = Share::find()->where(['user_id'=>Yii::$app->user->id,'id'=>Yii::$app->request->get('deleteID')])->one(); $model->delete(); return $this->redirect(Yii::$app->request->referrer); } - $query = Share::find()->where(['user_id'=>Yii::$app->user->id])->groupBy('date')->orderBy('date DESC'); + + $items = []; + foreach(Share::find()->where(['user_id' => Yii::$app->user->id])->all() as $item) { + $items[$item->date][] = $item; + } + + /* $query = Share::find()->where(['user_id'=>Yii::$app->user->id])->groupBy('date')->orderBy('date DESC'); $countQuery = clone $query; $pages = new Pagination(['totalCount' => $countQuery->count(), 'pageSize'=>20]); $pages->forcePageParam = false; $pages->pageSizeParam = false; $share = $query->offset($pages->offset) ->limit($pages->limit) - ->all(); - return $this->render('share',['share'=>$share,'pages'=>$pages]); + ->all();*/ + return $this->render('share', ['items' => $items]); } } diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 6bbde34..0883aa3 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -125,6 +125,21 @@ $this->registerJs (" В Корзину
+ +
+ +
+ diff --git a/frontend/views/iam/1person.php b/frontend/views/iam/1person.php index fab2a90..47262e4 100755 --- a/frontend/views/iam/1person.php +++ b/frontend/views/iam/1person.php @@ -23,12 +23,7 @@ $this->title = 'Профиль';
Мой кабинет
- + render('_tabs')?>
diff --git a/frontend/views/iam/_tabs.php b/frontend/views/iam/_tabs.php new file mode 100644 index 0000000..4f7c8be --- /dev/null +++ b/frontend/views/iam/_tabs.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/frontend/views/iam/edit_person.php b/frontend/views/iam/edit_person.php index ab417ee..3ccab5d 100755 --- a/frontend/views/iam/edit_person.php +++ b/frontend/views/iam/edit_person.php @@ -31,12 +31,7 @@ $('#user-phone').mask('(000) 000-0000');
Мой кабинет
- + render('_tabs')?>
diff --git a/frontend/views/iam/myorders.php b/frontend/views/iam/myorders.php index d88c0ef..2ed0c82 100755 --- a/frontend/views/iam/myorders.php +++ b/frontend/views/iam/myorders.php @@ -32,12 +32,7 @@ $this->registerJs("
Мой кабинет
- + render('_tabs')?>
diff --git a/frontend/views/iam/person.php b/frontend/views/iam/person.php index 5e8660c..d14ae55 100755 --- a/frontend/views/iam/person.php +++ b/frontend/views/iam/person.php @@ -22,12 +22,7 @@ $this->title = 'Профиль';
Мой кабинет
- + render('_tabs')?>
diff --git a/frontend/views/iam/share.php b/frontend/views/iam/share.php index dfd9a16..8d7a72c 100755 --- a/frontend/views/iam/share.php +++ b/frontend/views/iam/share.php @@ -31,35 +31,28 @@ $this->registerJs("
Мой кабинет
- + render('_tabs')?>
- -
- $item):?> + $_items): $i++;?>
- -
date?>
+ +
- shareList as $item_p):if(!empty($item_p->product)):?> + product)):?>
-
+ - - product->cost->cost)):?>
product->cost->cost?> грн.
+ + product->variants[0])):?>
product->variants[0]->price?> грн.

@@ -67,15 +60,8 @@ $this->registerJs("
-
-
- - - - - -
+
-- libgit2 0.21.4