diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index db4064bb8..96e1e3b4b 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -61,6 +61,10 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::catalog.products.edit' ])->name('admin.catalog.products.edit'); + Route::put('/products/edit/{id}', 'Webkul\Product\Http\Controllers\ProductController@update')->defaults('_config', [ + 'redirect' => 'admin.catalog.products.index' + ])->name('admin.catalog.products.update'); + // Catalog Category Routes Route::get('/categories', 'Webkul\Category\Http\Controllers\CategoryController@index')->defaults('_config', [ diff --git a/packages/Webkul/Admin/src/ProductFormAccordian.php b/packages/Webkul/Admin/src/ProductFormAccordian.php new file mode 100644 index 000000000..16169dea8 --- /dev/null +++ b/packages/Webkul/Admin/src/ProductFormAccordian.php @@ -0,0 +1,58 @@ +items = $accordian->sortItems($accordian->items); + + return $accordian; + } + + /** + * Add a accordian item to the item stack + * + * @param string $key Dot seperated heirarchy + * @param string $name Text for the anchor + * @param string $view Blade file for accordian + * @param integer $sort Sorting index for the items + */ + public function add($key, $name, $view, $sort = 0) + { + array_push($this->items, [ + 'key' => $key, + 'name' => $name, + 'view' => $view, + 'sort' => $sort + ]); + } + + /** + * Method to sort through the acl items and put them in order + * + * @return void + */ + public function sortItems($items) { + usort($items, function($a, $b) { + if ($a['sort'] == $b['sort']) { + return 0; + } + + return ($a['sort'] < $b['sort']) ? -1 : 1; + }); + + return $items; + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 15d2dd29e..66e18b19c 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -40,6 +40,12 @@ class AdminServiceProvider extends ServiceProvider */ protected function composeView() { + view()->composer(['admin::catalog.products.create', 'admin::catalog.products.edit'], function ($view) { + $accordians = current(Event::fire('admin.catalog.products.accordian.create')); + + $view->with('form_accordians', $accordians); + }); + view()->composer(['admin::layouts.nav-left', 'admin::layouts.nav-aside', 'admin::layouts.tabs'], function ($view) { $menu = current(Event::fire('admin.menu.create')); diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 414c24d50..eb09fd1ca 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\View; use Webkul\Ui\Menu; +use Webkul\Admin\ProductFormAccordian; class EventServiceProvider extends ServiceProvider { @@ -21,6 +22,8 @@ class EventServiceProvider extends ServiceProvider $this->buildACL(); $this->registerACL(); + + $this->createProductFormAccordian(); } /** @@ -110,4 +113,22 @@ class EventServiceProvider extends ServiceProvider View::share('acl', app('acl')); } + + /** + * This method fires an event for accordian creation, any package can add their accordian item by listening to the admin.catalog.products.accordian.build event + * + * @return void + */ + public function createProductFormAccordian() + { + Event::listen('admin.catalog.products.accordian.create', function() { + return ProductFormAccordian::create(function($accordian) { + Event::fire('admin.catalog.products.accordian.build', $accordian); + }); + }); + + Event::listen('admin.catalog.products.accordian.build', function($accordian) { + $accordian->add('categories', 'Categories', 'admin::catalog.products.accordians.categories', 1); + }); + } } diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php new file mode 100644 index 000000000..b09e22aa5 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php @@ -0,0 +1,6 @@ + +
+ + +
+ \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/attribute-types/text.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/attribute-types/text.blade.php new file mode 100644 index 000000000..ffd5e9498 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/attribute-types/text.blade.php @@ -0,0 +1,4 @@ +
+ + +
\ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php index 70b06f8be..d1f94dbb1 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php @@ -35,6 +35,7 @@ @csrf() input('family') ?> + input('sku') ?>
@@ -57,7 +58,7 @@ @@ -67,13 +68,11 @@ @{{ errors.first('attribute_family_id') }}
- @if($familyId) -
- - - @{{ errors.first('sku') }} -
- @endif +
+ + + @{{ errors.first('sku') }} +
@@ -130,8 +129,14 @@ @section('javascript') @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 6ab4ebd32..d1d5b82b1 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -2,11 +2,11 @@ @section('content')
-
+
-

{{ __('admin::app.catalog.products.add-title') }}

+

{{ __('admin::app.catalog.products.edit-title') }}

@@ -19,7 +19,31 @@
@csrf() + @foreach($product->attribute_family->attribute_groups as $attributeGroup) + @if(count($attributeGroup->attributes)) + +
+ @foreach($attributeGroup->attributes as $attribute) + + @if(view()->exists($typeView = 'admin::catalog.products.attribute-types.' . $attribute->type)) + + @include ($typeView) + + @endif + + @endforeach + +
+ + @endif + @endforeach + + @foreach($form_accordians->items as $accordian) + + @include ($accordian['view']) + + @endforeach
diff --git a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_value_table.php b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_value_table.php index 29c678286..b567db652 100644 --- a/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_value_table.php +++ b/packages/Webkul/Product/src/Database/Migrations/2018_07_27_070011_create_product_attribute_value_table.php @@ -25,9 +25,11 @@ class CreateProductAttributeValueTable extends Migration $table->json('json_value')->nullable(); $table->integer('product_id')->unsigned(); $table->integer('attribute_id')->unsigned(); + $table->integer('channel_id')->unsigned(); $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); $table->foreign('attribute_id')->references('id')->on('attributes')->onDelete('cascade'); - $table->unique(['locale', 'attribute_id', 'product_id']); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade'); + $table->unique(['channel_id', 'locale', 'attribute_id', 'product_id'], 'chanel_locale_attribute_value_index_unique'); }); } diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 46b5d8b25..914b1f043 100644 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -85,15 +85,20 @@ class ProductController extends Controller */ public function store() { - if(!request()->get('family') && request()->input('type') == 'configurable') { - return redirect(url()->current() . '?family=' . request()->input('attribute_family_id')); + if(!request()->get('family') && request()->input('type') == 'configurable' && request()->input('sku') != '') { + return redirect(url()->current() . '?family=' . request()->input('attribute_family_id') . '&sku=' . request()->input('sku')); + } + + if(request()->input('type') == 'configurable' && (!request()->has('super_attributes') || !count(request()->get('super_attributes')))) { + session()->flash('error', 'Please select atleast one configurable attribute.'); + + return back(); } $this->validate(request(), [ 'type' => 'required', 'attribute_family_id' => 'required', - 'sku' => ['required', 'unique:products,sku', new \Webkul\Core\Contracts\Validations\Slug], - 'super_attributes' => 'required|array|min:1' + 'sku' => ['required', 'unique:products,sku', new \Webkul\Core\Contracts\Validations\Slug] ]); $product = $this->product->create(request()->all()); @@ -113,6 +118,8 @@ class ProductController extends Controller { $product = $this->product->findOrFail($id); + dd($product); + return view($this->_config['view'], compact('product')); } diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index fba24defa..906305959 100644 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -6,11 +6,22 @@ use Illuminate\Database\Eloquent\Model; use Webkul\Attribute\Models\Attribute; use Webkul\Category\Models\Category; use Webkul\Inventory\Models\InventorySource; +use Webkul\Attribute\Models\AttributeFamily; class Product extends Model { protected $fillable = ['type', 'attribute_family_id', 'sku']; + protected $with = ['super_attributes']; + + /** + * Get the product attribute family that owns the product. + */ + public function attribute_family() + { + return $this->belongsTo(AttributeFamily::class); + } + /** * The categories that belong to the product. */ @@ -58,4 +69,12 @@ class Product extends Model { return $this->belongsToMany(self::class, 'product_cross_sells'); } + + public function __get($name) { + // if(array_key_exists($name, $this->data)) { + // return $this->data[$name]; + // } + + return null; + } } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Observers/ProductObserver.php b/packages/Webkul/Product/src/Observers/ProductObserver.php new file mode 100644 index 000000000..b788a0881 --- /dev/null +++ b/packages/Webkul/Product/src/Observers/ProductObserver.php @@ -0,0 +1,41 @@ +loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + + Product::observe(ProductObserver::class); } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 8d6996574..30f1eabb9 100644 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -30,8 +30,10 @@ class ProductRepository extends Repository { $product = $this->model->create($data); - foreach ($data['super_attributes'] as $attributeId => $attribute) { - $product->super_attributes()->attach($attributeId); + if(isset($data['super_attributes'])) { + foreach ($data['super_attributes'] as $attributeId => $attribute) { + $product->super_attributes()->attach($attributeId); + } } return $product;