@@ -93,24 +74,24 @@
@push('scripts')
+@endpush
- Vue.component('downloadable-input', {
- template: '#downloadable-input-template',
- data: function() {
- return {
- key: "",
- // seller: "",
- dataFlowProfiles: [],
- isLinkSample: false,
- isSample: false,
- linkFiles: false,
- linkSampleFiles: false,
- sampleFile: false,
- }
- },
+@push('scripts')
+
+
+
@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Bulkupload/src/Resources/views/admin/layouts/style.blade.php b/packages/Webkul/Bulkupload/src/Resources/views/admin/layouts/style.blade.php
new file mode 100644
index 0000000..0562024
--- /dev/null
+++ b/packages/Webkul/Bulkupload/src/Resources/views/admin/layouts/style.blade.php
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/Webkul/Bulkupload/src/Routes/admin-routes.php b/packages/Webkul/Bulkupload/src/Routes/admin-routes.php
new file mode 100644
index 0000000..ba14df5
--- /dev/null
+++ b/packages/Webkul/Bulkupload/src/Routes/admin-routes.php
@@ -0,0 +1,64 @@
+ ['web']], function () {
+
+ Route::prefix(config('app.admin_url'))->group(function () {
+
+ Route::group(['middleware' => ['admin']], function () {
+ Route::prefix('bulkupload')->group(function () {
+
+ Route::get('/upload-files', [BulkUploadController::class, 'index'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.upload-files.index'
+ ])->name('admin.bulk-upload.index');
+
+ Route::get('/run-profile', [BulkUploadController::class, 'index'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.run-profile.index'
+ ])->name('admin.run-profile.index');
+
+ Route::post('/read-csv', [HelperController::class, 'readCSVData'])->name('bulk-upload-admin.read-csv');
+
+ Route::post('/getprofiles', [HelperController::class, 'getAllDataFlowProfiles'])
+ ->name('bulk-upload-admin.get-all-profile');
+
+ // Download Sample Files
+ Route::post('/download',[HelperController::class, 'downloadFile'])->defaults('_config',[
+ 'view' => 'bulkupload::admin.bulk-upload.upload-files.index'
+ ])->name('download-sample-files');
+
+ // import new products
+ Route::post('/importnew', [HelperController::class, 'importNewProductsStore'])->defaults('_config',['view' => 'bulkupload::admin.bulk-upload.upload-files.index' ])->name('import-new-products-form-submit');
+
+ Route::prefix('dataflowprofile')->group(function () {
+ Route::post('/runprofile', [HelperController::class, 'runProfile'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.run-profile.progressbar'
+ ])->name('bulk-upload-admin.run-profile');
+
+ Route::get('/', [BulkUploadController::class, 'index'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
+ ])->name('admin.dataflow-profile.index');
+
+ Route::post('/addprofile', [BulkUploadController::class, 'store'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
+ ])->name('bulkupload.bulk-upload.dataflow.add-profile');
+
+ Route::post('/delete/{id}',[BulkUploadController::class, 'destroy'])->name('bulkupload.admin.profile.delete');
+
+ Route::get('/edit/{id}', [BulkUploadController::class, 'edit'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.edit'
+ ])->name('bulkupload.admin.profile.edit');
+
+ Route::post('/update/{id}', [BulkUploadController::class, 'update'])->defaults('_config', [
+ 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
+ ])->name('admin.bulk-upload.dataflow.update-profile');
+
+ Route::post('/massdestroy', [BulkUploadController::class, 'massDestroy'])->defaults('_config', [
+ 'redirect' => 'admin.dataflow-profile.index'
+ ])->name('bulkupload.admin.profile.massDelete');
+ });
+ });
+ });
+ });
+});
diff --git a/packages/Webkul/Bulkupload/src/Routes/web.php b/packages/Webkul/Bulkupload/src/Routes/web.php
new file mode 100644
index 0000000..6bb77e9
--- /dev/null
+++ b/packages/Webkul/Bulkupload/src/Routes/web.php
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/packages/Webkul/Bulkupload/webpack.mix.js b/packages/Webkul/Bulkupload/webpack.mix.js
new file mode 100644
index 0000000..90dec7a
--- /dev/null
+++ b/packages/Webkul/Bulkupload/webpack.mix.js
@@ -0,0 +1,31 @@
+const mix = require("laravel-mix");
+
+if (mix == 'undefined') {
+ const { mix } = require("laravel-mix");
+}
+
+require("laravel-mix-merge-manifest");
+
+if (mix.inProduction()) {
+ var publicPath = "publishable/assets";
+} else {
+ var publicPath = "../../../public/vendor/webkul/admin/assets";
+}
+
+mix.setPublicPath(publicPath).mergeManifest();
+mix.disableNotifications();
+
+mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/bulk-admin.js")
+ .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/bulk-admin.css")
+ .copy(__dirname + '/src/Resources/assets/images', publicPath + '/images')
+ .options({
+ processCssUrls: false
+ });
+
+if (! mix.inProduction()) {
+ mix.sourceMaps();
+}
+
+if (mix.inProduction()) {
+ mix.version();
+}
\ No newline at end of file
diff --git a/src/Helpers/ImportProduct.php b/src/Helpers/ImportProduct.php
deleted file mode 100644
index 31b82f2..0000000
--- a/src/Helpers/ImportProduct.php
+++ /dev/null
@@ -1,163 +0,0 @@
-importProductRepository = $importProductRepository;
-
- $this->dataFlowProfileRepository = $dataFlowProfileRepository;
- }
-
- /**
- * store import products for profile execution
- *
- * @return \Illuminate\Http\Response
- */
- public function store()
- {
- request()->validate ([
- 'attribute_family' => 'required',
- 'file_path' => 'required',
- 'image_path' => 'mimetypes:application/zip|max:10000',
- 'data_flow_profile' => 'required',
- ]);
-
- $valid_extension = ['csv', 'xls', 'xlsx'];
- $valid_image_extension = ['zip', 'rar'];
-
- $imageDir = 'imported-products/admin/images';
- $fileDir = 'imported-products/admin/files';
- $linkFilesDir = 'imported-products/admin/link-files';
- $linkSampleFilesDir = 'imported-products/admin/link-sample-files';
- $sampleFileDir = 'imported-products/admin/sample-file';
-
- $attribute_family_id = request()->attribute_family;
- $data_flow_profile_id = request()->data_flow_profile;
-
- $image = request()->file('image_path');
- $file = request()->file('file_path');
- $linkFiles = request()->file('link_files');
- $linkSampleFiles = request()->file('link_sample_files');
- $sampleFile = request()->file('sample_file');
-
- if (! isset($image)) {
- $image = '';
- }
-
- if (request()->is_downloadable) {
- $product['is_downloadable'] = 1;
-
- if (! empty($linkFiles) && in_array($linkFiles->getClientOriginalExtension(), $valid_image_extension)) {
- $uploadedLinkFiles = $linkFiles->storeAs($linkFilesDir, uniqid().'.'.$linkFiles->getClientOriginalExtension());
-
- $product['upload_link_files'] = $uploadedLinkFiles;
- } else {
- session()->flash('error', trans('bulkupload::app.admin.bulk-upload.messages.file-format-error'));
-
- return redirect()->route('admin.bulk-upload.index');
- }
-
- if (request()->is_link_have_sample) {
- $product['is_links_have_samples'] = 1;
-
- if (in_array($linkSampleFiles->getClientOriginalExtension(), $valid_image_extension)) {
- $uploadedLinkSampleFiles = $linkSampleFiles->storeAs($linkSampleFilesDir, uniqid().'.'.$linkSampleFiles->getClientOriginalExtension());
-
- $product['upload_link_sample_files'] = $uploadedLinkSampleFiles;
- } else {
- session()->flash('error', trans('bulkupload::app.admin.bulk-upload.messages.file-format-error'));
-
- return redirect()->route('admin.bulk-upload.index');
- }
- }
-
- if (request()->is_sample) {
- $product['is_samples_available'] = 1;
-
- if (in_array($sampleFile->getClientOriginalExtension(), $valid_image_extension)) {
- $uploadedSampleFiles = $sampleFile->storeAs($sampleFileDir, uniqid().'.'.$sampleFile->getClientOriginalExtension());
-
- $product['upload_sample_files'] = $uploadedSampleFiles;
- } else {
- session()->flash('error', trans('bulkupload::app.admin.bulk-upload.messages.file-format-error'));
-
- return redirect()->route('admin.bulk-upload.index');
- }
- }
- }
-
- $product['data_flow_profile_id'] = $data_flow_profile_id;
- $product['attribute_family_id'] = $attribute_family_id;
-
- if ((! empty($image) && in_array($image->getClientOriginalExtension(), $valid_image_extension)) && (in_array($file->getClientOriginalExtension(), $valid_extension))) {
- $uploadedImage = $image->storeAs($imageDir, uniqid().'.'.$image->getClientOriginalExtension());
-
- $product['image_path'] = $uploadedImage;
-
- $uploadedFile = $file->storeAs($fileDir, uniqid().'.'.$file->getClientOriginalExtension());
-
- $product['file_path'] = $uploadedFile;
- } else if ( empty($image) && (in_array($file->getClientOriginalExtension(), $valid_extension))) {
- $product['image_path'] = '';
-
- $uploadedFile = $file->storeAs($fileDir, uniqid().'.'.$file->getClientOriginalExtension());
-
- $product['file_path'] = $uploadedFile;
- } else {
- session()->flash('error', trans('bulkupload::app.admin.bulk-upload.messages.file-format-error'));
-
- return redirect()->route('admin.bulk-upload.index');
- }
-
- $data = $this->importProductRepository->findOneByField('data_flow_profile_id', $data_flow_profile_id);
-
- if ($data) {
- $this->dataFlowProfileRepository->update(['run_status' => '0'], $data_flow_profile_id);
-
- $this->importProductRepository->Update($product, $data->id);
-
- session()->flash('success',trans('bulkupload::app.admin.bulk-upload.messages.update-profile'));
-
- return redirect()->route('admin.bulk-upload.index');
- } else {
- $importNewProductsStore = $this->importProductRepository->create($product);
-
- session()->flash('success',trans('bulkupload::app.admin.bulk-upload.messages.profile-saved'));
-
- return redirect()->route('admin.bulk-upload.index');
- }
- }
-}
\ No newline at end of file
diff --git a/src/Http/admin-routes.php b/src/Http/admin-routes.php
deleted file mode 100644
index 7f97b0a..0000000
--- a/src/Http/admin-routes.php
+++ /dev/null
@@ -1,65 +0,0 @@
- ['web']], function () {
-
- Route::prefix(config('app.admin_url'))->group(function () {
-
- Route::group(['middleware' => ['admin']], function () {
- Route::prefix('bulkupload')->group(function () {
-
- // Bulk Upload Products
- Route::get('/upload-files', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@index')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.upload-files.index'
- ])->name('admin.bulk-upload.index');
-
- Route::get('/run-profile', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@index')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.run-profile.index'
- ])->name('admin.run-profile.index');
-
- Route::post('/read-csv', 'Webkul\Bulkupload\Http\Controllers\Admin\HelperController@readCSVData')
- ->name('bulk-upload-admin.read-csv');
-
- Route::post('/getprofiles', 'Webkul\Bulkupload\Http\Controllers\Admin\HelperController@getAllDataFlowProfiles')
- ->name('bulk-upload-admin.get-all-profile');
-
- // Download Sample Files
- Route::post('/download','Webkul\Bulkupload\Http\Controllers\Admin\HelperController@downloadFile')->defaults('_config',[
- 'view' => 'bulkupload::admin.bulk-upload.upload-files.index'
- ])->name('download-sample-files');
-
- // import new products
- Route::post('/importnew', 'Webkul\Bulkupload\Http\Controllers\Admin\HelperController@importNewProductsStore')->defaults('_config',['view' => 'bulkupload::admin.bulk-upload.upload-files.index' ])->name('import-new-products-form-submit');
-
- Route::prefix('dataflowprofile')->group(function () {
- Route::get('/', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@index')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
- ])->name('admin.dataflow-profile.index');
-
- Route::post('/addprofile', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@store')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
- ])->name('bulkupload.bulk-upload.dataflow.add-profile');
-
- Route::post('/runprofile', 'Webkul\Bulkupload\Http\Controllers\Admin\HelperController@runProfile')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.run-profile.progressbar'
- ])->name('bulk-upload-admin.run-profile');
-
- // edit actions
- Route::post('/delete/{id}','Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@destroy')->name('bulkupload.admin.profile.delete');
-
- Route::get('/edit/{id}', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@edit')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.edit'
- ])->name('bulkupload.admin.profile.edit');
-
- Route::post('/update/{id}', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@update')->defaults('_config', [
- 'view' => 'bulkupload::admin.bulk-upload.data-flow-profile.index'
- ])->name('admin.bulk-upload.dataflow.update-profile');
-
- //mass destroy
- Route::post('/massdestroy', 'Webkul\Bulkupload\Http\Controllers\Admin\BulkUploadController@massDestroy')->defaults('_config', [
- 'redirect' => 'admin.dataflow-profile.index'
- ])->name('bulkupload.admin.profile.massDelete');
- });
- });
- });
- });
-});
diff --git a/src/Resources/views/admin/bulk-upload/data-flow-profile/edit.blade.php b/src/Resources/views/admin/bulk-upload/data-flow-profile/edit.blade.php
deleted file mode 100644
index 65ac3af..0000000
--- a/src/Resources/views/admin/bulk-upload/data-flow-profile/edit.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
-{{ __('bulkupload::app.admin.bulk-upload.bulk-upload-dataflow-profile') }}
-@endsection
-
-@section('content')
-
-
-
-
-
-
{{ __('bulkupload::app.admin.bulk-upload.data-flow-profile.edit-profile') }}
-
-
-
-
-
-
- {!! app('Webkul\Bulkupload\DataGrids\Admin\ProfileDataGrid')->render() !!}
-
-
-
-@endsection
diff --git a/src/Resources/views/admin/bulk-upload/data-flow-profile/index.blade.php b/src/Resources/views/admin/bulk-upload/data-flow-profile/index.blade.php
deleted file mode 100644
index d3d96fd..0000000
--- a/src/Resources/views/admin/bulk-upload/data-flow-profile/index.blade.php
+++ /dev/null
@@ -1,85 +0,0 @@
-@extends('admin::layouts.content')
-
-@section('page_title')
- {{ __('bulkupload::app.admin.bulk-upload.data-flow-profile.index') }}
-@stop
-
-@push('css')
-
-@endpush
-
-@section('content')
-
-
-
-
-
{{ __('bulkupload::app.admin.bulk-upload.data-flow-profile.add-profile') }}
-
-
-
-
-
-
-
-
- {!! app('Webkul\Bulkupload\DataGrids\Admin\ProfileDataGrid')->render() !!}
-
-
-@stop
-
diff --git a/storage/app/public/downloads/sample-files/bulkconfigurableproductupload.csv b/storage/app/public/downloads/sample-files/bulkconfigurableproductupload.csv
index 8305cbe..d8d21cb 100644
--- a/storage/app/public/downloads/sample-files/bulkconfigurableproductupload.csv
+++ b/storage/app/public/downloads/sample-files/bulkconfigurableproductupload.csv
@@ -1,7 +1,19 @@
-categories_slug,name,description,short_description,sku,special_price,special_price_from,special_price_to,weight,meta_title,meta_keywords,meta_description,url_key,tax_category_id,new,featured,visible_individually,status,cost,width,height,depth,type,attribute_family_name,super_attributes,super_attribute_option,super_attribute_price,inventory_sources,super_attribute_qty,super_attribute_weight,images,guest_checkout,barcode
-root,Temp1,
temp1
,
fvsdfgs
,demounique236,80,2019-05-02,2019-05-20,12,Test Title,Test Keyword,Test Description,temp23,,1,1,1,1,10,34,34,234,configurable,Default,,,,default,,,banner.jpeg,1,1
-,temp33,
temp22
,
temfp2
,demounique1532,,,,13,,,,,,,,,1,,,,,variant,Default,"color,size","Red,S",150,default,12,10,,,1
-,sda,
temp212
,
sdag
,demounique211,,,,45,,,,,,,,,1,,,,,variant,Default,"color,size","Yellow,S",23,default,13,10,,,1
-,temp35,
temp212
,
teemp2
,demounique311,,,,15,,,,,,,,,1,,,,,variant,Default,"color,size","Green,M",400,default,14,10,,,1
-,update,
temp212
,
teemp2
,demounique411,,,,16,,,,,,,,,1,,,,,variant,Default,"color,size","White,M",77,default,15,10,,,1
-,temp37,
fdgfdsg
,
teemp2
,demounique511,,,,17,,,,,,,,,1,,,,,variant,Default,"color,size","Black,M",400,default,16,10,,,1
+categories_slug,name,description,short_description,sku,special_price,special_price_from,special_price_to,weight,meta_title,meta_keywords,meta_description,url_key,tax_category_id,new,featured,visible_individually,status,cost,width,height,depth,type,attribute_family_name,super_attributes,super_attribute_option,super_attribute_price,inventory_sources,super_attribute_qty,super_attribute_weight,images,guest_checkout,barcode,product_number
+root,iPhone,This is iphone – 1,This is iphone – 2,iphone,80,2019-05-02,2019-05-20,12,Test Title,Test Keyword,Test Description,iphone,,1,1,1,1,10,34,34,234,configurable,Default,,,,default,,,banner.jpeg,1,1,1
+,iphone XR,This is iphone – 2,This is iphone – 3,Iphone-xr,,,,13,,,,,,,,,1,,,,,simple,Default,"color,size","Red,S",150,default,12,10,,,1,2
+,Iphone 11,This is iphone – 3,This is iphone – 4,Iphone-11,,,,45,,,,,,,,,1,,,,,simple,Default,"color,size","Yellow,S",23,default,13,10,,,1,3
+,Iphone 12,This is iphone – 4,This is iphone – 5,Iphone-12,,,,15,,,,,,,,,1,,,,,simple,Default,"color,size","Green,M",400,default,14,10,,,1,4
+,Iphone 13,This is iphone – 5,This is iphone – 6,Iphone-13,,,,16,,,,,,,,,1,,,,,simple,Default,"color,size","White,M",77,default,15,10,,,1,5
+,Iphone 14,This is iphone – 6,This is iphone – 7,Iphone-14,,,,17,,,,,,,,,1,,,,,simple,Default,"color,size","Black,M",400,default,16,10,,,1,6
+root,Realme,This is realme – 1,This is realme – 2,Reamle,80,2019-05-02,2019-05-20,12,Realme Test Title,Realme Test Keyword,Realme Test Description,realme,,1,1,1,1,850,34,34,234,configurable,Default,,,,default,,,banner.jpeg,1,1,7
+,Realme 8,This is realme – 2,This is realme – 3,Reamle-8,,,,13,,,,,,,,,1,,,,,simple,Default,"color,size","Red,S",150,default,12,10,,,1,8
+,Realme 9,This is realme – 3,This is realme – 4,Reamle-9,,,,45,,,,,,,,,1,,,,,simple,Default,"color,size","Yellow,S",23,default,13,10,,,1,9
+,Realme 10,This is realme – 4,This is realme – 5,Reamle-10,,,,15,,,,,,,,,1,,,,,simple,Default,"color,size","Green,M",400,default,14,10,,,1,10
+,Realme 11,This is realme – 5,This is realme – 6,Reamle-11,,,,16,,,,,,,,,1,,,,,simple,Default,"color,size","White,M",77,default,15,10,,,1,11
+,Realme 12,This is realme – 6,This is realme – 7,Reamle-12,,,,17,,,,,,,,,1,,,,,simple,Default,"color,size","Black,M",400,default,16,10,,,1,12
+root,Poco,This is poco – 1,This is poco – 2,Poco-1,80,2019-05-02,2019-05-20,12,Poco Test Title,Poco Test Keyword,Poco Test Description,poco,,1,1,1,1,850,34,34,234,configurable,Default,,,,default,,,banner.jpeg,1,1,13
+,Poco x2,This is poco – 2,This is poco – 3,Poco-2,,,,13,,,,,,,,,1,,,,,simple,Default,"color,size","Red,S",150,default,12,10,,,1,14
+,Poco x3,This is poco – 3,This is poco – 4,Poco-3,,,,45,,,,,,,,,1,,,,,simple,Default,"color,size","Yellow,S",23,default,13,10,,,1,15
+,Poco c3,This is poco – 4,This is poco – 5,Poco-4,,,,15,,,,,,,,,1,,,,,simple,Default,"color,size","Green,M",400,default,14,10,,,1,16
+,Poco c4,This is poco – 5,This is poco – 6,Poco-5,,,,16,,,,,,,,,1,,,,,simple,Default,"color,size","White,M",77,default,15,10,,,1,17
+,Poco c5,This is poco – 6,This is poco – 7,Poco-6,,,,17,,,,,,,,,1,,,,,simple,Default,"color,size","Black,M",400,default,16,10,,,1,18
diff --git a/webpack.mix.js b/webpack.mix.js
deleted file mode 100644
index 3dcb352..0000000
--- a/webpack.mix.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { mix } = require("laravel-mix");
-require("laravel-mix-merge-manifest");
-
-if (mix.inProduction()) {
- var publicPath = "publishable/assets";
-} else {
- var publicPath = "../../../public/vendor/webkul/admin/assets";
-}
-
-mix.setPublicPath(publicPath).mergeManifest();
-mix.disableNotifications();
-
-mix
- .copyDirectory(
- __dirname + "/src/Resources/assets/images",
- publicPath + "/images"
- )
- .sass(
- __dirname + "/src/Resources/assets/sass/admin.scss",
- "css/bulk-admin.css"
- )
- .options({
- processCssUrls: false,
- });
-
-if (mix.inProduction()) {
- mix.version();
-}