From ed79ac78b0664b14398340e81db0b306a5a6bc54 Mon Sep 17 00:00:00 2001 From: yarik Date: Mon, 6 Mar 2017 21:11:26 +0200 Subject: [PATCH] Https possible fixes --- common/widgets/views/order.php | 8 ++++---- common/widgets/views/registration.php | 4 ++-- console/config/main.php | 2 +- console/controllers/SiteMapController.php | 6 +++--- frontend/assets/AppAsset.php | 2 +- frontend/controllers/BasketController.php | 6 +++++- frontend/views/layouts/main.php | 2 +- frontend/web/robots.txt | 2 +- frontend/web/sitemap.xml | 2 +- 9 files changed, 19 insertions(+), 15 deletions(-) diff --git a/common/widgets/views/order.php b/common/widgets/views/order.php index e3bb7e7..916da03 100755 --- a/common/widgets/views/order.php +++ b/common/widgets/views/order.php @@ -59,7 +59,7 @@ Спасибо за покупку!
- @@ -78,7 +78,7 @@ - + @@ -107,7 +107,7 @@
-
+
@@ -119,7 +119,7 @@
- rukzachok.com.ua + rukzachok.com.ua
diff --git a/common/widgets/views/registration.php b/common/widgets/views/registration.php index d9e5095..0a94721 100755 --- a/common/widgets/views/registration.php +++ b/common/widgets/views/registration.php @@ -31,7 +31,7 @@

Спасибо за регистрацию . Приятных покупок в магазине Rukzachok.com.ua

-
+
@@ -42,7 +42,7 @@ +38 (068) 083 62 01
- rukzachok.com.ua + rukzachok.com.ua
diff --git a/console/config/main.php b/console/config/main.php index d547bde..69a5387 100755 --- a/console/config/main.php +++ b/console/config/main.php @@ -13,7 +13,7 @@ return [ 'controllerNamespace' => 'console\controllers', 'components' => [ 'urlManager' => [ - 'baseUrl' => 'http://www.rukzachok.com.ua', + 'baseUrl' => 'https://www.rukzachok.com.ua', 'enablePrettyUrl' => true, 'showScriptName' => false, diff --git a/console/controllers/SiteMapController.php b/console/controllers/SiteMapController.php index 0d75ab0..3afc4a6 100755 --- a/console/controllers/SiteMapController.php +++ b/console/controllers/SiteMapController.php @@ -29,15 +29,15 @@ use developeruz\db_rbac\behaviors\AccessBehavior; class SiteMapController extends Controller { - private $urlList = ['http://www.rukzachok.com.ua/']; + private $urlList = ['https://www.rukzachok.com.ua/']; private $urlBlockedList = []; private $count = 1; public function getAddStatic() { return [ - 'http://www.rukzachok.com.ua', - 'http://www.rukzachok.com.ua/catalog' + 'https://www.rukzachok.com.ua', + 'https://www.rukzachok.com.ua/catalog' ]; } diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index d1552ea..277d8df 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -20,7 +20,7 @@ class AppAsset extends AssetBundle public $css = [ 'css/style.css', //'css/comments.css', - 'http://fonts.googleapis.com/css?family=Roboto', + 'https://fonts.googleapis.com/css?family=Roboto', ]; public $js = [ ]; diff --git a/frontend/controllers/BasketController.php b/frontend/controllers/BasketController.php index 40f39cb..d5e4d30 100755 --- a/frontend/controllers/BasketController.php +++ b/frontend/controllers/BasketController.php @@ -80,7 +80,11 @@ class BasketController extends Controller * Удаляем товар с массива и сохраняем в заказ */ unset($row['id']); - $productV[$index]['img'] = \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list'); + if(!empty($product->image)) { + $productV[$index]['img'] = \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list'); + } else { + $productV[$index]['img'] = null; + } $modelOrdersProducts->load($data); $modelOrdersProducts->validate(); $modelOrdersProducts->save(); diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 7b4d338..132d7d3 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -365,7 +365,7 @@ $this->registerJs("