Fixed issues

Author: jitendra-webkul

packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php

@@ -142,7 +142,16 @@
             </div>
 
             <div class="dropdown-list bottom-right">
-                <span class="app-version">{{ __('admin::app.layouts.app-version', ['version' => 'v' . config('app.version')]) }}</span>
+                <span class="app-version">
+                    <img
+                        src="{{ url('cache/logo.png') }}"
+                        width="24"
+                        style="margin-bottom: -5px;"
+                    />
+
+                    <!-- Version -->
+                    {{ __('admin::app.layouts.app-version', ['version' => 'v' . config('app.version')]) }}
+                </span>
 
                 <div class="dropdown-container">
                     <ul>

packages/Webkul/Installer/src/Database/Seeders/Attribute/AttributeSeeder.php

@@ -20,7 +20,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('attributes')->insert([
             [

packages/Webkul/Installer/src/Database/Seeders/EmailTemplate/EmailTemplateSeeder.php

@@ -20,7 +20,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('email_templates')->insert([
             [

packages/Webkul/Installer/src/Database/Seeders/Lead/PipelineSeeder.php

@@ -22,7 +22,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('lead_pipelines')->insert([
             [

packages/Webkul/Installer/src/Database/Seeders/Lead/SourceSeeder.php

@@ -20,7 +20,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('lead_sources')->insert([
             [

packages/Webkul/Installer/src/Database/Seeders/Lead/TypeSeeder.php

@@ -20,7 +20,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('lead_types')->insert([
             [

packages/Webkul/Installer/src/Database/Seeders/User/RoleSeeder.php

@@ -19,7 +19,7 @@ public function run($parameters = [])
 
         DB::table('roles')->delete();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('roles')->insert([
             'id'              => 1,

packages/Webkul/Installer/src/Database/Seeders/Workflow/WorkflowSeeder.php

@@ -20,7 +20,7 @@ public function run($parameters = [])
 
         $now = Carbon::now();
 
-        $defaultLocale = $parameters['default_locale'] ?? config('app.locale');
+        $defaultLocale = $parameters['locale'] ?? config('app.locale');
 
         DB::table('workflows')->insert([
             [

packages/Webkul/Installer/src/Http/Controllers/ImageCacheController.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Webkul\Installer\Http\Controllers;
+
+use Illuminate\Http\Response as IlluminateResponse;
+use Illuminate\Support\Facades\Cache;
+
+class ImageCacheController
+{
+    /**
+     * Cache template
+     *
+     * @var string
+     */
+    protected $template;
+
+    /**
+     * Logo
+     *
+     * @var string
+     */
+    const KRAYIN_LOGO = 'https://updates.krayincrm.com/krayin.png';
+
+    /**
+     * Get HTTP response of template applied image file
+     *
+     * @param  string  $filename
+     * @return Illuminate\Http\Response
+     */
+    public function getImage($filename)
+    {
+        try {
+            $content = Cache::remember('krayin-logo', 10080, function () {
+                return $this->getImageFromUrl(self::KRAYIN_LOGO);
+            });
+        } catch (\Exception $e) {
+            $content = '';
+        }
+
+        return $this->buildResponse($content);
+    }
+
+    /**
+     * Init from given URL
+     *
+     * @param  string  $url
+     * @return \Intervention\Image\Image
+     */
+    public function getImageFromUrl($url)
+    {
+        $domain = config('app.url');
+
+        $options = [
+            'http' => [
+                'method'           => 'GET',
+                'protocol_version' => 1.1, // force use HTTP 1.1 for service mesh environment with envoy
+                'header'           => "Accept-language: en\r\n".
+                "Domain: $domain\r\n".
+                "User-Agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\r\n",
+            ],
+        ];
+
+        $context = stream_context_create($options);
+
+        if ($data = @file_get_contents($url, false, $context)) {
+            return $data;
+        }
+
+        throw new \Exception(
+            'Unable to init from given url ('.$url.').'
+        );
+    }
+
+    /**
+     * Builds HTTP response from given image data
+     *
+     * @param  string  $content
+     * @return Illuminate\Http\Response
+     */
+    protected function buildResponse($content)
+    {
+        /**
+         * Define mime type
+         */
+        $mime = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $content);
+
+        /**
+         * Respond with 304 not modified if browser has the image cached
+         */
+        $eTag = md5($content);
+
+        $notModified = isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $eTag;
+
+        $content = $notModified ? null : $content;
+
+        $statusCode = $notModified ? 304 : 200;
+
+        /**
+         * Return http response
+         */
+        return new IlluminateResponse($content, $statusCode, [
+            'Content-Type'   => $mime,
+            'Cache-Control'  => 'max-age=10080, public',
+            'Content-Length' => strlen($content),
+            'Etag'           => $eTag,
+        ]);
+    }
+}

packages/Webkul/Installer/src/Providers/InstallerServiceProvider.php

@@ -25,6 +25,15 @@ public function boot()
         $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'installer');
 
         Event::listen('bagisto.installed', 'Webkul\Installer\Listeners\Installer@installed');
+
+
+        /**
+         * Route to access template applied image file
+         */
+        $this->app['router']->get('cache/{filename}', [
+            'uses' => 'Webkul\Installer\Http\Controllers\ImageCacheController@getImage',
+            'as'   => 'image_cache',
+        ])->where(['filename' => '[ \w\\.\\/\\-\\@\(\)\=]+']);
     }
 
     /**