From 5f7c432dc58b37e68fd2a391c550fdbf638f7b8d Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 27 Jul 2018 11:52:12 +0530 Subject: [PATCH] Channel and families completed --- composer.json | 6 +- config/app.php | 3 +- packages/Webkul/Admin/src/Http/routes.php | 9 + .../src/Providers/EventServiceProvider.php | 4 +- .../Admin/src/Resources/lang/en/app.php | 11 +- .../views/catalog/attributes/create.blade.php | 16 +- .../views/catalog/attributes/edit.blade.php | 50 ++- .../views/catalog/categories/create.blade.php | 4 +- .../views/catalog/categories/edit.blade.php | 14 +- .../views/catalog/families/create.blade.php | 277 +++++++------ .../views/catalog/families/edit.blade.php | 292 +++++++------ .../views/catalog/products/index.blade.php | 21 + .../views/settings/channels/edit.blade.php | 114 +++++ ...8_07_05_130148_create_attributes_table.php | 2 +- ...35150_create_attribute_families_table.php} | 5 +- ...5_135152_create_attribute_groups_table.php | 4 +- ..._140832_create_attribute_options_table.php | 2 +- .../Attribute/src/Database/Seeders/.gitkeep | 0 .../Seeders/AttributeFamilyTableSeeder.php | 140 +++++++ .../Database/Seeders/AttributeTableSeeder.php | 391 ++++++++++++++++++ .../src/Database/Seeders/DatabaseSeeder.php | 19 + .../Controllers/AttributeFamilyController.php | 4 +- .../Webkul/Attribute/src/Models/Attribute.php | 2 +- .../Attribute/src/Models/AttributeFamily.php | 2 +- .../Attribute/src/Models/AttributeGroup.php | 6 +- .../Providers/AttributeServiceProvider.php | 1 - .../AttributeFamilyRepository.php | 58 ++- .../src/Repositories/AttributeRepository.php | 8 +- ...836_create_category_translations_table.php | 6 +- .../Http/Controllers/CategoryController.php | 5 +- .../Webkul/Category/src/Models/Category.php | 6 +- .../src/Repositories/CategoryRepository.php | 26 +- packages/Webkul/Channel/src/Channel.php | 15 +- ...018_07_20_064849_create_channels_table.php | 8 + ...20_124255_create_channel_locales_table.php | 35 -- .../Http/Controllers/ChannelController.php | 2 +- .../Webkul/Channel/src/Models/Channel.php | 5 +- .../Channel/src/Models/ChannelLocale.php | 17 - .../src/Repositories/ChannelRepository.php | 48 ++- .../Core/src/Eloquent/TranslatableModel.php | 38 +- packages/Webkul/Product/.gitignore | 1 + packages/Webkul/Product/composer.json | 27 ++ .../src/Http/Controllers/Controller.php | 13 + .../Http/Controllers/ProductController.php | 125 ++++++ .../Webkul/Product/src/Models/Product.php | 10 + .../src/Providers/ProductServiceProvider.php | 29 ++ .../src/Repositories/ProductRepository.php} | 8 +- packages/Webkul/User/webpack.mix.js | 15 - 48 files changed, 1428 insertions(+), 476 deletions(-) create mode 100644 packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php create mode 100644 packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php rename packages/Webkul/Attribute/src/Database/Migrations/{2018_07_05_135200_create_attribute_families_table.php => 2018_07_05_135150_create_attribute_families_table.php} (78%) create mode 100644 packages/Webkul/Attribute/src/Database/Seeders/.gitkeep create mode 100644 packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php create mode 100644 packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php create mode 100644 packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php delete mode 100644 packages/Webkul/Channel/src/Database/Migrations/2018_07_20_124255_create_channel_locales_table.php delete mode 100644 packages/Webkul/Channel/src/Models/ChannelLocale.php create mode 100644 packages/Webkul/Product/.gitignore create mode 100644 packages/Webkul/Product/composer.json create mode 100644 packages/Webkul/Product/src/Http/Controllers/Controller.php create mode 100644 packages/Webkul/Product/src/Http/Controllers/ProductController.php create mode 100644 packages/Webkul/Product/src/Models/Product.php create mode 100644 packages/Webkul/Product/src/Providers/ProductServiceProvider.php rename packages/Webkul/{Channel/src/Repositories/ChannelLocaleRepository.php => Product/src/Repositories/ProductRepository.php} (62%) delete mode 100644 packages/Webkul/User/webpack.mix.js diff --git a/composer.json b/composer.json index c61e9f9e8..152322550 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "webkul/laravel-core": "self.version", "webkul/laravel-category": "self.version", "webkul/laravel-attribute": "self.version", - "webkul/laravel-channel": "self.version" + "webkul/laravel-channel": "self.version", + "webkul/laravel-product": "self.version" }, "autoload": { "classmap": [ @@ -45,7 +46,8 @@ "Webkul\\Attribute\\": "packages/Webkul/Attribute/src", "Webkul\\Core\\": "packages/Webkul/Core/src", "Webkul\\Channel\\": "packages/Webkul/Channel/src", - "Webkul\\Inventory\\": "packages/Webkul/Inventory/src" + "Webkul\\Inventory\\": "packages/Webkul/Inventory/src", + "Webkul\\Product\\": "packages/Webkul/Product/src" } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index ae6cda857..c9311a9a3 100644 --- a/config/app.php +++ b/config/app.php @@ -171,7 +171,8 @@ return [ Webkul\Attribute\Providers\AttributeServiceProvider::class, Webkul\Core\Providers\CoreServiceProvider::class, Webkul\Channel\Providers\ChannelServiceProvider::class, - Webkul\Inventory\Providers\InventoryServiceProvider::class + Webkul\Inventory\Providers\InventoryServiceProvider::class, + Webkul\Product\Providers\ProductServiceProvider::class ], /* diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index ea7de5107..18f72ed58 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -45,6 +45,15 @@ Route::group(['middleware' => ['web']], function () { // Catalog Routes Route::prefix('catalog')->group(function () { + // Catalog Product Routes + Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [ + 'view' => 'admin::catalog.products.index' + ])->name('admin.catalog.products.index'); + + Route::get('/products/create', 'Webkul\Product\Http\Controllers\ProductController@create')->defaults('_config', [ + 'view' => 'admin::catalog.products.create' + ])->name('admin.catalog.products.create'); + // Catalog Category Routes Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [ 'view' => 'admin::catalog.categories.index' diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index b246d8bcb..414c24d50 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -39,7 +39,9 @@ class EventServiceProvider extends ServiceProvider Event::listen('admin.menu.build', function($menu) { $menu->add('dashboard', 'Dashboard', 'admin.dashboard.index', 1, 'dashboard-icon'); - $menu->add('catalog', 'Catalog', 'admin.catalog.categories.index', 3, 'catalog-icon'); + $menu->add('catalog', 'Catalog', 'admin.catalog.products.index', 3, 'catalog-icon'); + + $menu->add('catalog.products', 'Products', 'admin.catalog.products.index', 1); $menu->add('catalog.categories', 'Categories', 'admin.catalog.categories.index', 2); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 673a7e01a..dde011089 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -63,6 +63,13 @@ return [ ] ], 'catalog' => [ + 'products' => [ + 'products' => 'products', + 'add-product-btn-title' => 'Add Product', + 'add-title' => 'Add Product', + 'edit-title' => 'Edit Product', + 'save-btn-title' => 'Save Product', + ], 'attributes' => [ 'add-title' => 'Add Attribute', 'edit-title' => 'Edit Attribute', @@ -72,6 +79,8 @@ return [ 'type' => 'Attribute Type', 'text' => 'Text', 'textarea' => 'Textarea', + 'price' => 'Price', + 'boolean' => 'Boolean', 'select' => 'Select', 'multiselect' => 'Multiselect', 'checkbox' => 'Checkbox', @@ -114,7 +123,7 @@ return [ 'position' => 'Position', 'attribute-code' => 'Code', 'type' => 'Type', - 'add-attribute-title' => 'Add Attribute', + 'add-attribute-title' => 'Add Attributes', 'search' => 'Search', 'group-exist-error' => 'Group with same name already exists.' ], diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index a633178ee..d00bee59f 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -7,7 +7,7 @@ @section('content')
-
+
@@ -38,6 +38,8 @@ - +
@@ -126,32 +128,32 @@
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php index 6516a4474..a5da9929a 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php @@ -7,7 +7,7 @@ @section('content')
- +
@@ -30,22 +30,27 @@
- - + + @{{ errors.first('code') }}
type ?> - - + + @@ -62,6 +67,7 @@ {{ __('admin::app.catalog.attributes.date') }} +
@@ -103,16 +109,20 @@
@@ -157,48 +167,48 @@
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 23e26b8d9..e17a616f2 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -7,7 +7,7 @@ @section('content')
- +
@@ -69,6 +69,7 @@
+ @if($categories->count())
@@ -76,6 +77,7 @@
+ @endif
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php index c2702c1a8..5dae79a94 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php @@ -6,9 +6,9 @@ @section('content')
- get('channel_locale') ?: channel()->getDefaultChannelLocale()->id; ?> + get('channel_locale') ?: channel()->getDefaultChannelLocaleCode(); ?> - +
@@ -16,13 +16,13 @@
- + + +
@@ -131,13 +132,13 @@ @@ -174,163 +175,169 @@ @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php index 2c8ae840f..6cbfeceb0 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php @@ -6,7 +6,7 @@ @section('content')
- +
@@ -30,8 +30,8 @@
- - + + @{{ errors.first('code') }}
@@ -111,12 +111,12 @@

@{{ group.name ? group.name : group.groupName }}

- +
- - + +
- + @{{ attribute.code }} @{{ attribute.admin_name }} @{{ attribute.type }} - +
@@ -132,13 +132,13 @@ @@ -175,187 +175,171 @@ @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php new file mode 100644 index 000000000..5d968cba8 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php @@ -0,0 +1,21 @@ +@extends('admin::layouts.content') + +@section('content') +
+
+
+ {{ __('admin::app.catalog.products.products') }} +
+ +
+ + {{ __('admin::app.catalog.products.add-product-btn-title') }} + +
+
+ +
+ +
+
+@stop \ No newline at end of file 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 new file mode 100644 index 000000000..7f61fceb9 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -0,0 +1,114 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.settings.channels.edit-title') }} +@stop + +@section('content') +
+ + +
+
+

{{ __('admin::app.settings.channels.edit-title') }}

+
+ +
+ +
+
+ +
+
+ @csrf() + + + +
+ +
+ + + @{{ errors.first('code') }} +
+ +
+ + + @{{ errors.first('name') }} +
+ +
+ + + @{{ errors.first('description') }} +
+ +
+ + + +
+ +
+ + locales->pluck('id')->toArray() ?> + + @{{ errors.first('locales[]') }} +
+ +
+ + default_locale ?> + + @{{ errors.first('default_locale') }} +
+ +
+ + currencies->pluck('id')->toArray() ?> + + @{{ errors.first('currencies[]') }} +
+ +
+ + base_currency ?> + + @{{ errors.first('base_currency') }} +
+ +
+ + +
+
+ +
+@stop \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php index aecca7794..e3db08efa 100644 --- a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php +++ b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_130148_create_attributes_table.php @@ -20,7 +20,7 @@ class CreateAttributesTable extends Migration $table->string('type'); $table->string('validation')->nullable(); $table->integer('position')->nullable(); - $table->boolean('is_required')->default(1); + $table->boolean('is_required')->default(0); $table->boolean('is_unique')->default(0); $table->boolean('value_per_locale')->default(0); $table->boolean('value_per_channel')->default(0); diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135200_create_attribute_families_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135150_create_attribute_families_table.php similarity index 78% rename from packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135200_create_attribute_families_table.php rename to packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135150_create_attribute_families_table.php index 418ac54be..d3ea2cba7 100644 --- a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135200_create_attribute_families_table.php +++ b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135150_create_attribute_families_table.php @@ -18,10 +18,7 @@ class CreateAttributeFamiliesTable extends Migration $table->string('code'); $table->string('name'); $table->boolean('status')->default(0); - }); - - Schema::table('attribute_groups', function($table) { - $table->foreign('attribute_family_id')->references('id')->on('attribute_families')->onDelete('cascade'); + $table->boolean('is_user_defined')->default(1); }); } diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php index 7e5e6362a..bfaca20b4 100644 --- a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php +++ b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_135152_create_attribute_groups_table.php @@ -16,15 +16,17 @@ class CreateAttributeGroupsTable extends Migration Schema::create('attribute_groups', function (Blueprint $table) { $table->increments('id'); $table->string('name'); - $table->timestamps(); $table->integer('position'); + $table->boolean('is_user_defined')->default(1); $table->integer('attribute_family_id')->unsigned(); $table->unique(['attribute_family_id', 'name']); + $table->foreign('attribute_family_id')->references('id')->on('attribute_families')->onDelete('cascade'); }); Schema::create('attribute_group_mappings', function (Blueprint $table) { $table->integer('attribute_id')->unsigned(); $table->integer('attribute_group_id')->unsigned(); + $table->integer('position')->nullable(); $table->primary(['attribute_id', 'attribute_group_id']); $table->foreign('attribute_id')->references('id')->on('attributes')->onDelete('cascade'); $table->foreign('attribute_group_id')->references('id')->on('attribute_groups')->onDelete('cascade'); diff --git a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php index 7032fd842..66883cd91 100644 --- a/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php +++ b/packages/Webkul/Attribute/src/Database/Migrations/2018_07_05_140832_create_attribute_options_table.php @@ -15,7 +15,7 @@ class CreateAttributeOptionsTable extends Migration { Schema::create('attribute_options', function (Blueprint $table) { $table->increments('id'); - $table->integer('sort_order'); + $table->integer('sort_order')->nullable(); $table->integer('attribute_id')->unsigned(); $table->foreign('attribute_id')->references('id')->on('attributes')->onDelete('cascade'); }); diff --git a/packages/Webkul/Attribute/src/Database/Seeders/.gitkeep b/packages/Webkul/Attribute/src/Database/Seeders/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php new file mode 100644 index 000000000..5524ebae9 --- /dev/null +++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeFamilyTableSeeder.php @@ -0,0 +1,140 @@ + "default", + "name" => "Default", + "is_user_defined" => 0, + 'attribute_groups' => [ + [ + "name" => "General", + "is_user_defined" => 0, + "position" => 1, + "attributes" => [ + [ + 'code' => 'name', + 'position' => 1 + ], [ + 'code' => 'url_key', + 'position' => 2 + ], [ + 'code' => 'new_from', + 'position' => 3 + ], [ + 'code' => 'new_to', + 'position' => 4 + ], [ + 'code' => 'status', + 'position' => 5 + ] + ] + ], [ + "name" => "Description", + "is_user_defined" => 0, + "position" => 2, + "attributes" => [ + [ + 'code' => 'short_description', + 'position' => 1 + ], [ + 'code' => 'description', + 'position' => 2 + ] + ] + ], [ + "name" => "Meta Description", + "is_user_defined" => 0, + "position" => 3, + "attributes" => [ + [ + 'code' => 'meta_title', + 'position' => 1 + ], [ + 'code' => 'meta_keywords', + 'position' => 2 + ], [ + 'code' => 'meta_description', + 'position' => 3 + ] + ] + ], [ + "name" => "Price", + "is_user_defined" => 0, + "position" => 4, + "attributes" => [ + [ + 'code' => 'price', + 'position' => 1 + ], [ + 'code' => 'cost', + 'position' => 2 + ], [ + 'code' => 'special_price', + 'position' => 3 + ], [ + 'code' => 'special_price_from', + 'position' => 4 + ], [ + 'code' => 'special_price_to', + 'position' => 5 + ] + ] + ], [ + "name" => "Shipping", + "is_user_defined" => 0, + "position" => 5, + "attributes" => [ + [ + 'code' => 'width', + 'position' => 1 + ], [ + 'code' => 'height', + 'position' => 2 + ], [ + 'code' => 'depth', + 'position' => 3 + ], [ + 'code' => 'weight', + 'position' => 4 + ] + ] + ] + ] + ] + ]; + + /** + * AttributeFamilyRepository object + * + * @var array + */ + protected $attributeFamily; + + /** + * Create a new controller instance. + * + * @param Webkul\Attribute\Repositories\AttributeFamilyRepository $attributeFamily + * @return void + */ + public function __construct(AttributeFamilyRepository $attributeFamily) + { + $this->attributeFamily = $attributeFamily; + } + + public function run() + { + foreach($this->rawData as $row) { + $this->attributeFamily->create($row); + } + } +} \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php new file mode 100644 index 000000000..9937f945a --- /dev/null +++ b/packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php @@ -0,0 +1,391 @@ + 'name', + 'admin_name' => 'Name', + 'en' => [ + 'name' => 'Name' + ], + 'type' => 'text', + 'position' => 1, + 'is_required' => 1, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 1, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'url_key', + 'admin_name' => 'URL Key', + 'en' => [ + 'name' => 'URL Key' + ], + 'type' => 'text', + 'position' => 2, + 'is_unique' => 1, + 'is_required' => 1, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'new_from', + 'admin_name' => 'New From', + 'en' => [ + 'name' => 'New From' + ], + 'type' => 'datetime', + 'position' => 3, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'new_to', + 'admin_name' => 'New To', + 'en' => [ + 'name' => 'New To' + ], + 'type' => 'datetime', + 'position' => 4, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'status', + 'admin_name' => 'Status', + 'en' => [ + 'name' => 'Status' + ], + 'type' => 'boolean', + 'position' => 5, + 'is_required' => 1, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'short_description', + 'admin_name' => 'Short Description', + 'en' => [ + 'name' => 'Short Description' + ], + 'type' => 'textarea', + 'position' => 6, + 'is_required' => 1, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'description', + 'admin_name' => 'Description', + 'en' => [ + 'name' => 'Description' + ], + 'type' => 'textarea', + 'position' => 7, + 'is_required' => 1, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'price', + 'admin_name' => 'Price', + 'en' => [ + 'name' => 'Price' + ], + 'type' => 'price', + 'position' => 8, + 'is_required' => 1, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 1, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'cost', + 'admin_name' => 'Cost', + 'en' => [ + 'name' => 'Cost' + ], + 'type' => 'price', + 'position' => 9, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 1 + ], [ + 'code' => 'special_price', + 'admin_name' => 'Special Price', + 'en' => [ + 'name' => 'Special Price' + ], + 'type' => 'price', + 'position' => 10, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'special_price_from', + 'admin_name' => 'Special Price From', + 'en' => [ + 'name' => 'Special Price From' + ], + 'type' => 'datetime', + 'position' => 11, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'special_price_to', + 'admin_name' => 'Special Price To', + 'en' => [ + 'name' => 'Special Price To' + ], + 'type' => 'datetime', + 'position' => 12, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'meta_title', + 'admin_name' => 'Meta Title', + 'en' => [ + 'name' => 'Meta Description' + ], + 'type' => 'textarea', + 'position' => 13, + 'is_required' => 0, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'meta_keywords', + 'admin_name' => 'Meta Keywords', + 'en' => [ + 'name' => 'Meta Keywords' + ], + 'type' => 'textarea', + 'position' => 14, + 'is_required' => 0, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'meta_description', + 'admin_name' => 'Meta Description', + 'en' => [ + 'name' => 'Meta Description' + ], + 'type' => 'textarea', + 'position' => 15, + 'is_required' => 0, + 'value_per_locale' => 1, + 'value_per_channel' => 1, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 1 + ], [ + 'code' => 'width', + 'admin_name' => 'Width', + 'en' => [ + 'name' => 'Width' + ], + 'type' => 'text', + 'validation' => 'number', + 'position' => 16, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 1 + ], [ + 'code' => 'height', + 'admin_name' => 'Height', + 'en' => [ + 'name' => 'Height' + ], + 'type' => 'text', + 'validation' => 'number', + 'position' => 17, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 1 + ], [ + 'code' => 'depth', + 'admin_name' => 'Depth', + 'en' => [ + 'name' => 'Depth' + ], + 'type' => 'text', + 'validation' => 'number', + 'position' => 18, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 1 + ], [ + 'code' => 'weight', + 'admin_name' => 'Weight', + 'en' => [ + 'name' => 'Weight' + ], + 'type' => 'text', + 'validation' => 'number', + 'position' => 19, + 'is_required' => 1, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 0, + 'is_configurable' => 0, + 'is_user_defined' => 0 + ], [ + 'code' => 'color', + 'admin_name' => 'Color', + 'en' => [ + 'name' => 'Color' + ], + 'type' => 'select', + 'position' => 20, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 1, + 'is_configurable' => 1, + 'is_user_defined' => 1, + 'options' => [ + [ + 'en' => [ + 'label' => 'Red' + ], + 'sort_order' => 1 + ], [ + 'en' => [ + 'label' => 'Green' + ], + 'sort_order' => 2 + ], [ + 'en' => [ + 'label' => 'Yellow' + ], + 'sort_order' => 3 + ], [ + 'en' => [ + 'label' => 'Black' + ], + 'sort_order' => 4 + ], [ + 'en' => [ + 'label' => 'White' + ], + 'sort_order' => 5 + ] + ] + ], [ + 'code' => 'size', + 'admin_name' => 'Size', + 'en' => [ + 'name' => 'Size' + ], + 'type' => 'select', + 'position' => 21, + 'is_required' => 0, + 'value_per_locale' => 0, + 'value_per_channel' => 0, + 'is_filterable' => 1, + 'is_configurable' => 1, + 'is_user_defined' => 1, + 'options' => [ + [ + 'en' => [ + 'label' => 'S' + ], + 'sort_order' => 1 + ], [ + 'en' => [ + 'label' => 'M' + ], + 'sort_order' => 2 + ], [ + 'en' => [ + 'label' => 'L' + ], + 'sort_order' => 3 + ], [ + 'en' => [ + 'label' => 'XL' + ], + 'sort_order' => 4 + ] + ] + ] + ]; + + /** + * AttributeRepository object + * + * @var array + */ + protected $attribute; + + /** + * Create a new controller instance. + * + * @param Webkul\Attribute\Repositories\AttributeRepository $attribute + * @return void + */ + public function __construct(AttributeRepository $attribute) + { + $this->attribute = $attribute; + } + + public function run() + { + foreach($this->rawData as $row) { + $this->attribute->create($row); + } + } +} \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php new file mode 100644 index 000000000..6e3cff806 --- /dev/null +++ b/packages/Webkul/Attribute/src/Database/Seeders/DatabaseSeeder.php @@ -0,0 +1,19 @@ +call(AttributeTableSeeder::class); + $this->call(AttributeFamilyTableSeeder::class); + } +} diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index 1d1f6f335..f9e0e87a6 100644 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -61,9 +61,11 @@ class AttributeFamilyController extends Controller */ public function create(Attribute $attribute) { + $attributeFamily = $this->attributeFamily->findBy('code', 'default', ['*'], ['attribute_groups.attributes']); + $attributes = $attribute->all(['id', 'code', 'admin_name', 'type']); - return view($this->_config['view'], compact('attributes')); + return view($this->_config['view'], compact('attributes', 'attributeFamily')); } /** diff --git a/packages/Webkul/Attribute/src/Models/Attribute.php b/packages/Webkul/Attribute/src/Models/Attribute.php index 15ceb48fa..ead8d6c58 100644 --- a/packages/Webkul/Attribute/src/Models/Attribute.php +++ b/packages/Webkul/Attribute/src/Models/Attribute.php @@ -9,7 +9,7 @@ class Attribute extends TranslatableModel { public $translatedAttributes = ['name']; - protected $fillable = ['code', 'admin_name', 'type', 'is_required', 'is_unique', 'value_per_locale', 'value_per_channel', 'is_filterable', 'is_configurable']; + protected $fillable = ['code', 'admin_name', 'type', 'position', 'is_required', 'is_unique', 'value_per_locale', 'value_per_channel', 'is_filterable', 'is_configurable']; /** * Get the options. diff --git a/packages/Webkul/Attribute/src/Models/AttributeFamily.php b/packages/Webkul/Attribute/src/Models/AttributeFamily.php index 4ed03aee8..7fea194eb 100644 --- a/packages/Webkul/Attribute/src/Models/AttributeFamily.php +++ b/packages/Webkul/Attribute/src/Models/AttributeFamily.php @@ -25,6 +25,6 @@ class AttributeFamily extends Model */ public function attribute_groups() { - return $this->hasMany(AttributeGroup::class); + return $this->hasMany(AttributeGroup::class)->orderBy('position'); } } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Models/AttributeGroup.php b/packages/Webkul/Attribute/src/Models/AttributeGroup.php index ab3ac085e..089ad9956 100644 --- a/packages/Webkul/Attribute/src/Models/AttributeGroup.php +++ b/packages/Webkul/Attribute/src/Models/AttributeGroup.php @@ -9,13 +9,15 @@ class AttributeGroup extends Model { public $timestamps = false; - protected $fillable = ['name', 'position']; + protected $fillable = ['name', 'position', 'is_user_defined']; /** * Get the attributes that owns the attribute group. */ public function attributes() { - return $this->belongsToMany(Attribute::class, 'attribute_group_mappings'); + return $this->belongsToMany(Attribute::class, 'attribute_group_mappings') + ->withPivot('position') + ->orderBy('pivot_position', 'asc'); } } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php index 51a8ea23e..b7f1ee95b 100644 --- a/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php +++ b/packages/Webkul/Attribute/src/Providers/AttributeServiceProvider.php @@ -3,7 +3,6 @@ namespace Webkul\Attribute\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Foundation\AliasLoader; use Illuminate\Routing\Router; class AttributeServiceProvider extends ServiceProvider diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php index 0e65a8027..337845ae5 100644 --- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php @@ -3,6 +3,7 @@ namespace Webkul\Attribute\Repositories; use Webkul\Core\Eloquent\Repository; +use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Attribute\Repositories\AttributeGroupRepository; use Illuminate\Container\Container as App; @@ -14,6 +15,13 @@ use Illuminate\Container\Container as App; */ class AttributeFamilyRepository extends Repository { + /** + * AttributeRepository object + * + * @var array + */ + protected $attribute; + /** * AttributeGroupRepository object * @@ -24,11 +32,14 @@ class AttributeFamilyRepository extends Repository /** * Create a new controller instance. * - * @param Webkul\Attribute\Repositories\AttributeGroupRepository $attributeGroup + * @param Webkul\Attribute\Repositories\AttributeRepository $attribute + * @param Webkul\Attribute\Repositories\AttributeGroupRepository $attributeGroup * @return void */ - public function __construct(AttributeGroupRepository $attributeGroup, App $app) + public function __construct(AttributeRepository $attribute, AttributeGroupRepository $attributeGroup, App $app) { + $this->attribute = $attribute; + $this->attributeGroup = $attributeGroup; parent::__construct($app); @@ -50,16 +61,21 @@ class AttributeFamilyRepository extends Repository */ public function create(array $data) { + $attributeGroups = isset($data['attribute_groups']) ? $data['attribute_groups'] : []; + unset($data['attribute_groups']); $family = $this->model->create($data); - if(isset($data['attribute_groups'])) { - foreach ($data['attribute_groups'] as $group) { - $attributeGroup = $family->attribute_groups()->create($group); + foreach ($attributeGroups as $group) { + $attributes = isset($group['attributes']) ? $group['attributes'] : []; + unset($group['attributes']); + $attributeGroup = $family->attribute_groups()->create($group); - if(isset($group['attributes'])) { - foreach ($group['attributes'] as $attributeId) { - $attributeGroup->attributes()->attach($attributeId); - } + foreach ($attributes as $attribute) { + if(isset($attribute['id'])) { + $attributeGroup->attributes()->attach($attribute['id']); + } else { + $attributeModel = $this->attribute->findBy('code', $attribute['code']); + $attributeGroup->attributes()->save($attributeModel, ['position' => $attribute['position']]); } } } @@ -87,28 +103,32 @@ class AttributeFamilyRepository extends Repository $attributeGroup = $family->attribute_groups()->create($attributeGroupInputs); if(isset($attributeGroupInputs['attributes'])) { - foreach ($attributeGroupInputs['attributes'] as $attributeId) { - $attributeGroup->attributes()->attach($attributeId); + foreach ($attributeGroupInputs['attributes'] as $attribute) { + $attributeGroup->attributes()->attach($attribute['id']); } } } else { - if(($index = $previousAttributeGroupIds->search($attributeGroupId)) >= 0) { + if(is_numeric($index = $previousAttributeGroupIds->search($attributeGroupId))) { $previousAttributeGroupIds->forget($index); } $attributeGroup = $this->attributeGroup->findOrFail($attributeGroupId); $attributeGroup->update($attributeGroupInputs); + + $attributeIds = $attributeGroup->attributes()->get()->pluck('id'); - $attributeIds = $attributeGroup->attributes()->pluck('id'); - - foreach ($attributeGroupInputs['attributes'] as $attributeId) { - if(($index = $attributeIds->search($attributeId)) >= 0) { - $attributeIds->forget($index); + if(isset($attributeGroupInputs['attributes'])) { + foreach ($attributeGroupInputs['attributes'] as $attribute) { + if(is_numeric($index = $attributeIds->search($attribute['id']))) { + $attributeIds->forget($index); + } else { + $attributeGroup->attributes()->attach($attribute['id']); + } } } - foreach ($attributeIds as $attributeId) { - $attributeGroup->deattach($attributeId); + if($attributeIds->count()) { + $attributeGroup->detach($attributeIds); } } } diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index ed0250223..69abd8747 100644 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -50,10 +50,12 @@ class AttributeRepository extends Repository */ public function create(array $data) { + $options = isset($data['options']) ? $data['options'] : []; + unset($data['options']); $attribute = $this->model->create($data); - if(in_array($attribute->code, ['select', 'multiselect', 'checkbox']) && isset($data['options'])) { - foreach ($data['options'] as $key => $option) { + if(in_array($attribute->type, ['select', 'multiselect', 'checkbox']) && count($options)) { + foreach ($options as $option) { $attribute->options()->create($option); } } @@ -81,7 +83,7 @@ class AttributeRepository extends Repository if (str_contains($optionId, 'option_')) { $attribute->options()->create($optionInputs); } else { - if(($index = $previousOptionIds->search($optionId)) >= 0) { + if(is_numeric($index = $previousOptionIds->search($optionId))) { $previousOptionIds->forget($index); } diff --git a/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php b/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php index 87b5b418d..94a80774f 100644 --- a/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php +++ b/packages/Webkul/Category/src/Database/Migrations/2018_07_21_142836_create_category_translations_table.php @@ -22,11 +22,9 @@ class CreateCategoryTranslationsTable extends Migration $table->text('meta_description')->nullable(); $table->text('meta_keywords')->nullable(); $table->integer('category_id')->unsigned(); - $table->integer('locale_id')->unsigned(); - $table->unique(['category_id', 'locale_id']); - $table->unique(['category_id', 'slug', 'locale_id']); + $table->string('locale'); + $table->unique(['category_id', 'slug', 'locale']); $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade'); - $table->foreign('locale_id')->references('id')->on('channel_locales')->onDelete('cascade'); }); } diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 7b14af101..661c78df6 100644 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -6,7 +6,6 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Webkul\Category\Repositories\CategoryRepository as Category; - /** * Catalog category controller * @@ -59,7 +58,7 @@ class CategoryController extends Controller */ public function create() { - $categories = $this->category->getCategoryTree(); + $categories = $this->category->getCategoryTree(null, ['id']); return view($this->_config['view'], compact('categories')); } @@ -107,7 +106,7 @@ class CategoryController extends Controller */ public function update(Request $request, $id) { - $locale = request()->get('channel_locale') ?: channel()->getDefaultChannelLocale()->id; + $locale = request()->get('channel_locale') ?: channel()->getDefaultChannelLocaleCode(); $this->validate(request(), [ $locale . '.slug' => ['required', new \Webkul\Core\Contracts\Validations\Slug, function ($attribute, $value, $fail) use ($id) { if (!$this->category->isSlugUnique($id, $value)) { diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php index 52b575ea5..e9a09012e 100644 --- a/packages/Webkul/Category/src/Models/Category.php +++ b/packages/Webkul/Category/src/Models/Category.php @@ -14,10 +14,10 @@ class Category extends TranslatableModel protected $fillable = ['position', 'status', 'parent_id']; /** - * @return string + * @return boolean */ - public function getLocaleKey() + protected function isChannelBased() { - return 'locale_id'; + return true; } } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php index 8f0fde91c..240c3e918 100644 --- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php +++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php @@ -4,7 +4,6 @@ namespace Webkul\Category\Repositories; use Webkul\Core\Eloquent\Repository; use Webkul\Category\Models\Category; -use Webkul\Channel\Repositories\ChannelLocaleRepository; use Illuminate\Container\Container as App; use Webkul\Category\Models\CategoryTranslation; @@ -16,24 +15,13 @@ use Webkul\Category\Models\CategoryTranslation; */ class CategoryRepository extends Repository { - - /** - * ChannelLocaleRepository object - * - * @var array - */ - protected $locale; - /** * Create a new controller instance. * - * @param Webkul\Core\Repositories\ChannelLocaleRepository $locale * @return void */ - public function __construct(ChannelLocaleRepository $locale, App $app) + public function __construct(App $app) { - $this->locale = $locale; - parent::__construct($app); } @@ -56,10 +44,14 @@ class CategoryRepository extends Repository if(isset($data['locale']) && $data['locale'] == 'all') { $model = app()->make($this->model()); - foreach($this->locale->all() as $locale) { - foreach ($model->translatedAttributes as $attribute) { - if(isset($data[$attribute])) { - $data[$locale->id][$attribute] = $data[$attribute]; + $channels = channel()->getChannelWithLocales(); + + foreach($channels as $channel) { + foreach($channel->locales as $locale) { + foreach ($model->translatedAttributes as $attribute) { + if(isset($data[$attribute])) { + $data[$channel->code . '.' . $locale->code][$attribute] = $data[$attribute]; + } } } } diff --git a/packages/Webkul/Channel/src/Channel.php b/packages/Webkul/Channel/src/Channel.php index 46279b92d..5d60ad63c 100644 --- a/packages/Webkul/Channel/src/Channel.php +++ b/packages/Webkul/Channel/src/Channel.php @@ -6,9 +6,22 @@ use Webkul\Channel\Models\Channel as ChannelModel; class Channel { + public function getDefaultChannelLocaleCode() { + $channel = ChannelModel::first(); + + if(!$channel || !$channel->locales()->count()) + return; + + return $channel->code . '-' . $channel->locales()->first()->code; + } + public function getDefaultChannelLocale() { $channel = ChannelModel::first(); - return $channel->channel_locales()->first(); + return $channel->locales()->first(); + } + + public function getChannelWithLocales() { + return ChannelModel::with('locales')->get(); } } \ No newline at end of file diff --git a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php b/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php index dd0b7d8ff..fbce101a6 100644 --- a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php +++ b/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_064849_create_channels_table.php @@ -25,6 +25,14 @@ class CreateChannelsTable extends Migration $table->timestamps(); }); + Schema::create('channel_locales', function (Blueprint $table) { + $table->integer('channel_id')->unsigned(); + $table->integer('locale_id')->unsigned(); + $table->primary(['channel_id', 'locale_id']); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade'); + }); + Schema::create('channel_currencies', function (Blueprint $table) { $table->integer('channel_id')->unsigned(); $table->integer('currency_id')->unsigned(); diff --git a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_124255_create_channel_locales_table.php b/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_124255_create_channel_locales_table.php deleted file mode 100644 index 83488818a..000000000 --- a/packages/Webkul/Channel/src/Database/Migrations/2018_07_20_124255_create_channel_locales_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->integer('channel_id')->unsigned(); - $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); - $table->integer('locale_id')->unsigned(); - $table->foreign('locale_id')->references('id')->on('locales')->onDelete('cascade'); - $table->unique(['channel_id', 'locale_id']); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('channel_locales'); - } -} diff --git a/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php b/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php index e44ec06fe..2be29ffd1 100644 --- a/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Channel/src/Http/Controllers/ChannelController.php @@ -94,7 +94,7 @@ class ChannelController extends Controller */ public function edit($id) { - $channel = $this->channel->findOrFail($id); + $channel = $this->channel->findOrFail($id, ['*'], ['locales', 'currencies']); return view($this->_config['view'], compact('channel')); } diff --git a/packages/Webkul/Channel/src/Models/Channel.php b/packages/Webkul/Channel/src/Models/Channel.php index b0d7b73a8..efe225855 100644 --- a/packages/Webkul/Channel/src/Models/Channel.php +++ b/packages/Webkul/Channel/src/Models/Channel.php @@ -3,7 +3,6 @@ namespace Webkul\Channel\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Channel\Models\ChannelLocale; use Webkul\Core\Models\Locale; use Webkul\Core\Models\Currency; @@ -14,9 +13,9 @@ class Channel extends Model /** * Get the channel locales. */ - public function channel_locales() + public function locales() { - return $this->hasMany(ChannelLocale::class); + return $this->belongsToMany(Locale::class, 'channel_locales'); } /** diff --git a/packages/Webkul/Channel/src/Models/ChannelLocale.php b/packages/Webkul/Channel/src/Models/ChannelLocale.php deleted file mode 100644 index 95cf8d07d..000000000 --- a/packages/Webkul/Channel/src/Models/ChannelLocale.php +++ /dev/null @@ -1,17 +0,0 @@ -belongsTo(Locale::class); - } -} \ No newline at end of file diff --git a/packages/Webkul/Channel/src/Repositories/ChannelRepository.php b/packages/Webkul/Channel/src/Repositories/ChannelRepository.php index 718a577fa..897109110 100644 --- a/packages/Webkul/Channel/src/Repositories/ChannelRepository.php +++ b/packages/Webkul/Channel/src/Repositories/ChannelRepository.php @@ -30,12 +30,54 @@ class ChannelRepository extends Repository { $channel = $this->model->create($data); - foreach ($data['locales'] as $group) { - + foreach ($data['locales'] as $locale) { + $channel->locales()->attach($locale); } - foreach ($data['currencies'] as $group) { + foreach ($data['currencies'] as $currency) { + $channel->currencies()->attach($currency); + } + return $channel; + } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + public function update(array $data, $id, $attribute = "id") + { + $channel = $this->findOrFail($id); + + $channel->update($data); + + $previousLocaleIds = $channel->locales()->pluck('id'); + + foreach ($data['locales'] as $locale) { + if(is_numeric($index = $previousLocaleIds->search($locale))) { + $previousLocaleIds->forget($index); + } else { + $channel->locales()->attach($locale); + } + } + + if($previousLocaleIds->count()) { + $channel->locales()->detach($previousLocaleIds); + } + + $previousCurrencyIds = $channel->currencies()->pluck('id'); + foreach ($data['currencies'] as $currency) { + if(is_numeric($index = $previousCurrencyIds->search($currency))) { + $previousCurrencyIds->forget($index); + } else { + $channel->currencies()->attach($currency); + } + } + + if($previousCurrencyIds->count()) { + $channel->currencies()->detach($previousCurrencyIds); } return $channel; diff --git a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php index 61a4378fb..76536e397 100644 --- a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php +++ b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php @@ -5,7 +5,6 @@ namespace Webkul\Core\Eloquent; use Illuminate\Database\Eloquent\Model; use Dimsav\Translatable\Translatable; use Webkul\Core\Models\Locale; -use Webkul\Channel\Models\ChannelLocale; class TranslatableModel extends Model { @@ -18,12 +17,12 @@ class TranslatableModel extends Model */ protected function isKeyALocale($key) { - if(is_numeric($key)) { - if(ChannelLocale::find($key)) - return true; - } else { - if(Locale::where('code', '=', $key)->first()) + $chunks = explode('-', $key); + if(count($chunks) > 1) { + if(Locale::where('code', '=', end($chunks))->first()) return true; + } elseif(Locale::where('code', '=', $key)->first()) { + return true; } return false; @@ -34,6 +33,31 @@ class TranslatableModel extends Model */ protected function locale() { - return channel()->getDefaultChannelLocale()->id; + if($this->isChannelBased()) { + return channel()->getDefaultChannelLocaleCode(); + } else { + if ($this->defaultLocale) { + return $this->defaultLocale; + } + + return config('translatable.locale') + ?: app()->make('translator')->getLocale(); + } + } + + /** + * @return boolean + */ + protected function isChannelBased() + { + return false; + } + + /** + * @return string + */ + protected function getLocaleSeparator() + { + return config('translatable.locale_separator', '%'); } } \ No newline at end of file diff --git a/packages/Webkul/Product/.gitignore b/packages/Webkul/Product/.gitignore new file mode 100644 index 000000000..30bc16279 --- /dev/null +++ b/packages/Webkul/Product/.gitignore @@ -0,0 +1 @@ +/node_modules \ No newline at end of file diff --git a/packages/Webkul/Product/composer.json b/packages/Webkul/Product/composer.json new file mode 100644 index 000000000..079a713fe --- /dev/null +++ b/packages/Webkul/Product/composer.json @@ -0,0 +1,27 @@ +{ + "name": "webkul/laravel-product", + "license": "MIT", + "authors": [ + { + "name": "Jitendra Singh", + "email": "jitendra@webkul.com" + } + ], + "require": {}, + "autoload": { + "psr-4": { + "Webkul\\Product\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Webkul\\Product\\Providers\\ProductServiceProvider" + ], + "aliases": { + "Bouncer": "Webkul\\Product\\Facades\\Bouncer" + } + } + }, + "minimum-stability": "dev" +} diff --git a/packages/Webkul/Product/src/Http/Controllers/Controller.php b/packages/Webkul/Product/src/Http/Controllers/Controller.php new file mode 100644 index 000000000..59b522ad3 --- /dev/null +++ b/packages/Webkul/Product/src/Http/Controllers/Controller.php @@ -0,0 +1,13 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class ProductController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * ProductRepository object + * + * @var array + */ + protected $product; + + /** + * Create a new controller instance. + * + * @param Webkul\Product\Repositories\ProductRepository $product + * @return void + */ + public function __construct(Product $product) + { + $this->product = $product; + + $this->_config = request('_config'); + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view($this->_config['view']); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + return view($this->_config['view']); + } + + /** + * Store a newly created resource in storage. + * + * @return \Illuminate\Http\Response + */ + public function store() + { + $this->validate(request(), [ + 'name' => 'required' + ]); + + $this->product->create(request()->all()); + + session()->flash('success', 'Product created successfully.'); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + $product = $this->product->findOrFail($id); + + return view($this->_config['view'], compact('product')); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + $this->validate(request(), [ + 'name' => 'required', + ]); + + $this->product->update(request()->all(), $id); + + session()->flash('success', 'Product updated successfully.'); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php new file mode 100644 index 000000000..4a0fd94a2 --- /dev/null +++ b/packages/Webkul/Product/src/Models/Product.php @@ -0,0 +1,10 @@ +loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + } + + /** + * Register services. + * + * @return void + */ + public function register() + { + + } +} \ No newline at end of file diff --git a/packages/Webkul/Channel/src/Repositories/ChannelLocaleRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php similarity index 62% rename from packages/Webkul/Channel/src/Repositories/ChannelLocaleRepository.php rename to packages/Webkul/Product/src/Repositories/ProductRepository.php index c8c9d54a1..2da8dd92f 100644 --- a/packages/Webkul/Channel/src/Repositories/ChannelLocaleRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -1,16 +1,16 @@ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ -class ChannelLocaleRepository extends Repository +class ProductRepository extends Repository { /** * Specify Model class name @@ -19,6 +19,6 @@ class ChannelLocaleRepository extends Repository */ function model() { - return 'Webkul\Channel\Models\ChannelLocale'; + return 'Webkul\Product\Models\Product'; } } \ No newline at end of file diff --git a/packages/Webkul/User/webpack.mix.js b/packages/Webkul/User/webpack.mix.js deleted file mode 100644 index a13f1e170..000000000 --- a/packages/Webkul/User/webpack.mix.js +++ /dev/null @@ -1,15 +0,0 @@ -const { mix } = require('laravel-mix'); -require('laravel-mix-merge-manifest'); - - -// var publicPath = 'publishable/assets'; -var publicPath = '../../../public/vendor/webkul/core/assets'; - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - -mix.copyDirectory( __dirname + '/src/Resources/assets/lang', publicPath + '/lang') - -if (mix.inProduction()) { - mix.version(); -} \ No newline at end of file
- + @{{ attribute.code }} @{{ attribute.admin_name }} @{{ attribute.type }} - +