diff --git a/common/models/OrdersProducts.php b/common/models/OrdersProducts.php index 5045d61..dbc7b3e 100755 --- a/common/models/OrdersProducts.php +++ b/common/models/OrdersProducts.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 diff --git a/frontend/controllers/IamController.php b/frontend/controllers/IamController.php index 3801f9b..8985228 100755 --- a/frontend/controllers/IamController.php +++ b/frontend/controllers/IamController.php @@ -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']); diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 2731cb3..3692d9b 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -123,7 +123,7 @@ $this->registerJs (" В Корзину
- +