Resolve conflict

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);

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',

packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php

@@ -178,7 +178,7 @@
                             ?>
 
                             <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
-                                {{ $option['title'] }}
+                                {{ trans($option['title']) }}
                             </option>
                         @endforeach
                     @endif

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.

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();
+        });
     }
 }

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');
     }
 }

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');
     }
 }

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;
             }
         }