diff --git a/backend/controllers/ArticlesController.php b/backend/controllers/ArticlesController.php index 270a8e9..d588eff 100755 --- a/backend/controllers/ArticlesController.php +++ b/backend/controllers/ArticlesController.php @@ -79,9 +79,7 @@ class ArticlesController extends Controller { $model = new Articles(); - if ($model->load(Yii::$app->request->post())) { - - $model->save(); + if ($model->load(Yii::$app->request->post()) && $model->save()) { return $this->redirect(['view', 'id' => $model->id]); } else { @@ -101,9 +99,7 @@ class ArticlesController extends Controller { $model = $this->findModel($id); - if ($model->load(Yii::$app->request->post())) { - $model->save(); - + if ($model->load(Yii::$app->request->post()) && $model->save() ) { return $this->redirect(['view', 'id' => $model->id]); } else { return $this->render('update', [ diff --git a/common/modules/product/models/Stock.php b/common/modules/product/models/Stock.php index db3e191..4fa53c3 100755 --- a/common/modules/product/models/Stock.php +++ b/common/modules/product/models/Stock.php @@ -14,6 +14,7 @@ use Yii; */ class Stock extends \yii\db\ActiveRecord { + /** * @inheritdoc */ @@ -33,6 +34,30 @@ class Stock extends \yii\db\ActiveRecord ]; } + + public function getSiteName(){ + switch(mb_strtolower($this->name)){ + case "харьков свет": + return 'МАГАЗИН ХАРЬКОВ'; + break; + case "осокорки": + return 'МАГАЗИН "ОСОКОРКИ"'; + break; + case "олимп": + return 'ТЦ "ОЛИМПИЙСКИЙ"'; + break; + case "магазин": + return "МАГАЗИН ГЛУБОЧЕЦКАЯ"; + break; + default: + return "На складе"; + break; + } + } + + + + /** * @inheritdoc */ diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 3881974..6488725 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -308,13 +308,14 @@ FlipclockAsset::register($this); variant->stock > 0){?> Купить - Нет в наличии + Нет в наличии
+
Оплатить @@ -324,14 +325,8 @@ FlipclockAsset::register($this);
-
- - где купить? - */ - ?> + где купить?
@@ -626,4 +621,31 @@ FlipclockAsset::register($this);
-
\ No newline at end of file + \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 4e2f521..cb9f288 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -480,28 +480,7 @@ use common\models\Event; - +