merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fixed

This commit is contained in:
jitendra 2018-10-17 16:00:31 +05:30
parent 892bf53cc9
commit faab00c3b8
13 changed files with 86 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

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

14
config/themes.php
View File

@ -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'
// ]
]
];

21
packages/Webkul/Admin/src/Http/routes.php
View File

@ -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

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -388,6 +388,7 @@ return [
'currencies' => 'Currencies',
'base-currency' => 'Base Currency',
'design' => 'Design',
'theme' => 'Theme',
'logo' => 'Logo',
'favicon' => 'Favicon'
],

10
packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
View File

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

18
packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
View File

@ -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>

4
packages/Webkul/Category/src/Http/Controllers/CategoryController.php
View File

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

8
packages/Webkul/Core/src/Models/Channel.php
View File

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

3
packages/Webkul/Core/src/Repositories/ChannelRepository.php
View File

@ -90,6 +90,9 @@ class ChannelRepository extends Repository
if($channel->{$type}) {
Storage::delete($channel->{$type});
}
$channel->{$type} = null;
$channel->save();
}
}
}

4
packages/Webkul/Product/src/Http/Controllers/ProductController.php
View File

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

14
packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
View File

@ -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
*

4
packages/Webkul/Theme/src/Http/helpers.php
View File

@ -1,11 +1,9 @@
<?php
use Webkul\Theme\Themes;
if (! function_exists('themes')) {
function themes()
{
return new Themes;
return app()->make('themes');
}
}

6
packages/Webkul/Theme/src/Providers/ThemeServiceProvider.php
View File

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