From faab00c3b82ed10dec58a079b56bfe52374b25d4 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Wed, 17 Oct 2018 16:00:31 +0530
Subject: [PATCH] Bug fixed

---
 config/app.php                                |  2 +-
 config/themes.php                             | 14 ++++++-------
 packages/Webkul/Admin/src/Http/routes.php     | 21 ++++++++++++++++---
 .../Admin/src/Resources/lang/en/app.php       |  1 +
 .../views/settings/channels/create.blade.php  | 10 +++++++++
 .../views/settings/channels/edit.blade.php    | 18 ++++++++++++++--
 .../Http/Controllers/CategoryController.php   |  4 ++++
 packages/Webkul/Core/src/Models/Channel.php   |  8 ++++++-
 .../src/Repositories/ChannelRepository.php    |  3 +++
 .../Http/Controllers/ProductController.php    |  4 ++++
 .../src/Providers/ShopServiceProvider.php     | 14 +++++++++++++
 packages/Webkul/Theme/src/Http/helpers.php    |  4 +---
 .../src/Providers/ThemeServiceProvider.php    |  6 ------
 13 files changed, 86 insertions(+), 23 deletions(-)

diff --git a/config/app.php b/config/app.php
index 32959e3f4..8f3b0c274 100644
--- a/config/app.php
+++ b/config/app.php
@@ -200,6 +200,7 @@ return [
         Konekt\Concord\ConcordServiceProvider::class,
 
         //Webkul packages
+        Webkul\Theme\Providers\ThemeServiceProvider::class,
         Webkul\User\Providers\UserServiceProvider::class,
         Webkul\Admin\Providers\AdminServiceProvider::class,
         Webkul\Ui\Providers\UiServiceProvider::class,
@@ -210,7 +211,6 @@ return [
         Webkul\Customer\Providers\CustomerServiceProvider::class,
         Webkul\Inventory\Providers\InventoryServiceProvider::class,
         Webkul\Product\Providers\ProductServiceProvider::class,
-        Webkul\Theme\Providers\ThemeServiceProvider::class,
         Webkul\Checkout\Providers\CheckoutServiceProvider::class,
         Webkul\Shipping\Providers\ShippingServiceProvider::class,
         Webkul\Payment\Providers\PaymentServiceProvider::class,
diff --git a/config/themes.php b/config/themes.php
index 7f01c7085..d3241b760 100644
--- a/config/themes.php
+++ b/config/themes.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'default' => 'bliss',
+    'default' => 'default',
 
     'themes' => [
         'default' => [
@@ -10,11 +10,11 @@ return [
             'name' => 'Dafault'
         ],
 
-        'bliss' => [
-            'views_path' => 'resources/themes/bliss/views',
-            'assets_path' => 'public/themes/bliss/assets',
-            'name' => 'Bliss',
-            'parent' => 'default'
-        ]
+        // 'bliss' => [
+        //     'views_path' => 'resources/themes/bliss/views',
+        //     'assets_path' => 'public/themes/bliss/assets',
+        //     'name' => 'Bliss',
+        //     'parent' => 'default'
+        // ]
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index fc4fc2d19..2a59f4d92 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -65,6 +65,8 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.customer.index'
             ])->name('admin.customer.update');
 
+            Route::get('customers/delete/{id}', 'Webkul\Core\Http\Controllers\CustomerController@destroy')->name('admin.customer.delete');
+
             Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[
                 'view' => 'admin::customers.review.index'
             ])->name('admin.customer.review.index');
@@ -153,6 +155,8 @@ Route::group(['middleware' => ['web']], function () {
                     'redirect' => 'admin.catalog.products.index'
                 ])->name('admin.catalog.products.update');
 
+                Route::get('/products/delete/{id}', 'Webkul\Product\Http\Controllers\ProductController@destroy')->name('admin.catalog.products.delete');
+
 
                 // Catalog Category Routes
                 Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [
@@ -175,6 +179,8 @@ Route::group(['middleware' => ['web']], function () {
                     'redirect' => 'admin.catalog.categories.index'
                 ])->name('admin.catalog.categories.update');
 
+                Route::get('/categories/delete/{id}', 'Webkul\Category\Http\Controllers\CategoryController@destroy')->name('admin.catalog.categories.delete');
+
 
                 // Catalog Attribute Routes
                 Route::get('/attributes', 'Webkul\Attribute\Http\Controllers\AttributeController@index')->defaults('_config', [
@@ -197,9 +203,7 @@ Route::group(['middleware' => ['web']], function () {
                     'redirect' => 'admin.catalog.attributes.index'
                 ])->name('admin.catalog.attributes.update');
 
-                Route::get('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->defaults('_config', [
-                    'view' => 'admin::catalog.attributes.delete'
-                ])->name('admin.catalog.attributes.delete');
+                Route::get('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->name('admin.catalog.attributes.delete');
 
 
                 // Catalog Family Routes
@@ -222,6 +226,8 @@ Route::group(['middleware' => ['web']], function () {
                 Route::put('/families/edit/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@update')->defaults('_config', [
                     'redirect' => 'admin.catalog.families.index'
                 ])->name('admin.catalog.families.update');
+
+                Route::get('/families/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeFamilyController@destroy')->name('admin.catalog.families.delete');
             });
 
 
@@ -291,6 +297,8 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.locales.index'
             ])->name('admin.locales.store');
 
+            Route::get('/locales/delete/{id}', 'Webkul\Core\Http\Controllers\LocaleController@destroy')->name('admin.locales.delete');
+
 
             // Currency Routes
             Route::get('/currencies', 'Webkul\Core\Http\Controllers\CurrencyController@index')->defaults('_config', [
@@ -305,6 +313,8 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.currencies.index'
             ])->name('admin.currencies.store');
 
+            Route::get('/currencies/delete/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@destroy')->name('admin.currencies.delete');
+
 
             // Exchange Rates Routes
             Route::get('/exchange_rates', 'Webkul\Core\Http\Controllers\ExchangeRateController@index')->defaults('_config', [
@@ -327,6 +337,8 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.exchange_rates.index'
             ])->name('admin.exchange_rates.update');
 
+            Route::get('/exchange_rates/delete/{id}', 'Webkul\Core\Http\Controllers\ExchangeRateController@destroy')->name('admin.exchange_rates.delete');
+
 
             // Inventory Source Routes
             Route::get('/inventory_sources', 'Webkul\Inventory\Http\Controllers\InventorySourceController@index')->defaults('_config', [
@@ -349,6 +361,8 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.inventory_sources.index'
             ])->name('admin.inventory_sources.update');
 
+            Route::get('/inventory_sources/delete/{id}', 'Webkul\Inventory\Http\Controllers\InventorySourceController@destroy')->name('admin.inventory_sources.delete');
+
 
             // Channel Routes
             Route::get('/channels', 'Webkul\Core\Http\Controllers\ChannelController@index')->defaults('_config', [
@@ -371,6 +385,7 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.channels.index'
             ])->name('admin.channels.update');
 
+            Route::get('/channels/delete/{id}', 'Webkul\Core\Http\Controllers\ChannelController@destroy')->name('admin.channels.delete');
 
 
             // Admin Profile route
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 695cbf2cd..1a191775a 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -388,6 +388,7 @@ return [
             'currencies' => 'Currencies',
             'base-currency' => 'Base Currency',
             'design' => 'Design',
+            'theme' => 'Theme',
             'logo' => 'Logo',
             'favicon' => 'Favicon'
         ],
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index 19ec79a77..e962920c9 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -104,6 +104,16 @@
 
                     <accordian :title="'{{ __('admin::app.settings.channels.design') }}'" :active="true">
                         <div slot="body">
+                            <div class="control-group">
+                                <label for="theme">{{ __('admin::app.settings.channels.theme') }}</label>
+                                <select class="control" id="theme" name="theme">
+                                    @foreach(themes()->all() as $theme)
+                                        <option value="{{ $theme->code }}" {{ old('theme') == $theme->code ? 'selected' : '' }}>
+                                            {{ $theme->name }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
 
                             <div class="control-group">
                                 <label>{{ __('admin::app.settings.channels.logo') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index 4e154c169..1603039be 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -30,7 +30,8 @@
 
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                                 <label for="code" class="required">{{ __('admin::app.settings.channels.code') }}</label>
-                                <input v-validate="'required'" class="control" id="code" name="code" value="{{ old('code') ?: $channel->code }}" v-code/>
+                                <input type="text" v-validate="'required'" class="control" id="code" name="code" value="{{ $channel->code }}" disabled="disabled"/>
+                                <input type="hidden" name="code" value="{{ $channel->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
 
@@ -109,6 +110,19 @@
 
                     <accordian :title="'{{ __('admin::app.settings.channels.design') }}'" :active="true">
                         <div slot="body">
+                            <div class="control-group">
+                                <label for="theme">{{ __('admin::app.settings.channels.theme') }}</label>
+
+                                <?php $selectedOption = old('theme') ?: $channel->theme ?>
+
+                                <select class="control" id="theme" name="theme">
+                                    @foreach(themes()->all() as $theme)
+                                        <option value="{{ $theme->code }}" {{ $selectedOption == $theme->code ? 'selected' : '' }}>
+                                            {{ $theme->name }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
 
                             <div class="control-group">
                                 <label>{{ __('admin::app.settings.channels.logo') }}
@@ -119,7 +133,7 @@
                             <div class="control-group">
                                 <label>{{ __('admin::app.settings.channels.favicon') }}
 
-                                <image-wrapper :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'" input-name="favicon" :multiple="false"></image-wrapper>
+                                <image-wrapper :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'" input-name="favicon" :multiple="false" :images='"{{ $channel->favicon_url }}"'></image-wrapper>
                             </div>
 
                         </div>
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 86b1bca1e..5d6e9d446 100644
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -134,5 +134,9 @@ class CategoryController extends Controller
     public function destroy($id)
     {
         $this->category->delete($id);
+
+        session()->flash('success', 'Category deleted successfully.');
+
+        return redirect()->back();
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php
index f8681df2e..07cddf191 100644
--- a/packages/Webkul/Core/src/Models/Channel.php
+++ b/packages/Webkul/Core/src/Models/Channel.php
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Storage;
 
 class Channel extends Model
 {
-    protected $fillable = ['code', 'name', 'description', 'default_locale_id', 'base_currency_id'];
+    protected $fillable = ['code', 'name', 'description', 'default_locale_id', 'base_currency_id', 'theme'];
 
     /**
      * Get the channel locales.
@@ -51,6 +51,9 @@ class Channel extends Model
      */
     public function logo_url()
     {
+        if(!$this->logo)
+            return;
+
         return Storage::url($this->logo);
     }
 
@@ -67,6 +70,9 @@ class Channel extends Model
      */
     public function favicon_url()
     {
+        if(!$this->favicon)
+            return;
+
         return Storage::url($this->favicon);
     }
 
diff --git a/packages/Webkul/Core/src/Repositories/ChannelRepository.php b/packages/Webkul/Core/src/Repositories/ChannelRepository.php
index e296d7016..92ea24717 100644
--- a/packages/Webkul/Core/src/Repositories/ChannelRepository.php
+++ b/packages/Webkul/Core/src/Repositories/ChannelRepository.php
@@ -90,6 +90,9 @@ class ChannelRepository extends Repository
             if($channel->{$type}) {
                 Storage::delete($channel->{$type});
             }
+
+            $channel->{$type} = null;
+            $channel->save();
         }
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index fd94b6d56..47e3fb0a1 100644
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -177,5 +177,9 @@ class ProductController extends Controller
     public function destroy($id)
     {
         $this->product->delete($id);
+
+        session()->flash('success', 'Product deleted successfully.');
+
+        return redirect()->back();
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index b687cc046..aef68962a 100644
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -35,6 +35,20 @@ class ShopServiceProvider extends ServiceProvider
         $this->createCustomerMenu();
     }
 
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $themes = $this->app->make('themes');
+
+        if (!$themes->current() && \Config::get('themes.default')) {
+            $themes->set(\Config::get('themes.default'));
+        }
+    }
+
     /**
      * Bind the the data to the views
      *
diff --git a/packages/Webkul/Theme/src/Http/helpers.php b/packages/Webkul/Theme/src/Http/helpers.php
index 69d121831..7cd0c1bf7 100644
--- a/packages/Webkul/Theme/src/Http/helpers.php
+++ b/packages/Webkul/Theme/src/Http/helpers.php
@@ -1,11 +1,9 @@
 <?php
 
-use Webkul\Theme\Themes;
-
 if (! function_exists('themes')) {
     function themes()
     {
-        return new Themes;
+        return app()->make('themes');
     }
 }
 
diff --git a/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php b/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php
index b1332e882..6ff2dffea 100644
--- a/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php
+++ b/packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php
@@ -37,11 +37,5 @@ class ThemeServiceProvider extends ServiceProvider
                 null
             );
         });
-
-        $themes = $this->app->make('themes');
-
-        if (!$themes->current() && \Config::get('themes.default')) {
-            $themes->set(\Config::get('themes.default'));
-        }
     }
 }