diff --git a/packages/Webkul/API/Http/Controllers/Shop/CartController.php b/packages/Webkul/API/Http/Controllers/Shop/CartController.php index b85af9eb9..398c24a43 100644 --- a/packages/Webkul/API/Http/Controllers/Shop/CartController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/CartController.php @@ -104,7 +104,7 @@ class CartController extends Controller if (! $result) { $message = session()->get('warning') ?? session()->get('error'); - + return response()->json([ 'error' => session()->get('warning') ], 400); diff --git a/packages/Webkul/Admin/src/Config/menu.php b/packages/Webkul/Admin/src/Config/menu.php index d2eec3860..22fe5e904 100755 --- a/packages/Webkul/Admin/src/Config/menu.php +++ b/packages/Webkul/Admin/src/Config/menu.php @@ -193,15 +193,13 @@ return [ 'route' => 'admin.cart-rule.index', 'sort' => 1, 'icon-class' => '' - ], - // , [ - // 'key' => 'promotions.catalog-rule', - // 'name' => 'admin::app.promotion.catalog-rule', - // 'route' => 'admin.catalog-rule.index', - // 'sort' => 1, - // 'icon-class' => '', - // ], - [ + ], [ + 'key' => 'promotions.catalog-rule', + 'name' => 'admin::app.promotion.catalog-rule', + 'route' => 'admin.catalog-rule.index', + 'sort' => 1, + 'icon-class' => '', + ], [ 'key' => 'cms', 'name' => 'admin::app.layouts.cms', 'route' => 'admin.cms.index', diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php index 3621d0d74..0888522b7 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -178,7 +178,7 @@ ?> @endforeach @endif diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php index 963418413..06b5fa05f 100755 --- a/packages/Webkul/Core/src/Models/Channel.php +++ b/packages/Webkul/Core/src/Models/Channel.php @@ -10,7 +10,7 @@ use Webkul\Core\Contracts\Channel as ChannelContract; class Channel extends Model implements ChannelContract { - protected $fillable = ['code', 'name', 'description', 'theme', 'home_page_content', 'footer_content', 'hostname', 'default_locale_id', 'base_currency_id', 'root_category_id', 'home_seo']; + protected $fillable = ['code', 'name', 'description', 'theme', 'home_page_content', 'footer_content', 'hostname', 'default_locale_id', 'base_currency_id', 'root_category_id', 'home_seo', 'logo', 'favicon']; /** * Get the channel locales. diff --git a/packages/Webkul/Product/src/CacheFilters/Large.php b/packages/Webkul/Product/src/CacheFilters/Large.php index bb71ee7f9..25cf4a75e 100755 --- a/packages/Webkul/Product/src/CacheFilters/Large.php +++ b/packages/Webkul/Product/src/CacheFilters/Large.php @@ -9,6 +9,8 @@ class Large implements FilterInterface { public function applyFilter(Image $image) { - return $image->resize(480, 480); + return $image->resize(480, null, function ($constraint) { + $constraint->aspectRatio(); + }); } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/CacheFilters/Medium.php b/packages/Webkul/Product/src/CacheFilters/Medium.php index 39ec33170..897114a75 100755 --- a/packages/Webkul/Product/src/CacheFilters/Medium.php +++ b/packages/Webkul/Product/src/CacheFilters/Medium.php @@ -9,6 +9,12 @@ class Medium implements FilterInterface { public function applyFilter(Image $image) { - return $image->resize(280, 350); + $width = 280; + $height = 280; + $image->resize($width, $height, function ($constraint) { + $constraint->aspectRatio(); + }); + + return $image->resizeCanvas($width, $height, 'center', false, '#fff'); } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/CacheFilters/Small.php b/packages/Webkul/Product/src/CacheFilters/Small.php index a3698696c..baf70d0ce 100755 --- a/packages/Webkul/Product/src/CacheFilters/Small.php +++ b/packages/Webkul/Product/src/CacheFilters/Small.php @@ -9,6 +9,12 @@ class Small implements FilterInterface { public function applyFilter(Image $image) { - return $image->resize(120, 120); + $width = 120; + $height = 120; + $image->resize($width, $height, function ($constraint) { + $constraint->aspectRatio(); + }); + + return $image->resizeCanvas($width, $height, 'center', false, '#fff'); } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index ee142b234..c8583f0f5 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -688,8 +688,8 @@ section.slider-block { } li img { - height: 500px; - width:100%; + max-height: 500px; + max-width: 100%; } } @@ -1488,8 +1488,8 @@ section.slider-block { width: 100%; img { - height: 400px; - width:100%; + max-height: 400px; + max-width: 100%; } } } @@ -4316,17 +4316,15 @@ section.review { float: left; img { - width: 100%; + max-width: 100%; &:first-child { padding-bottom: 20px; - height: 50%; display: block; } &:last-child { padding-top: 20px; - height: 50%; display: block; } }