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

Merge remote-tracking branch 'upstream/master' into issue-4114 

Merged  With Master
This commit is contained in:
devansh bawari 2020-11-11 18:41:28 +05:30
parent 31a1d573e7 709e29e656
commit 00cc98a697
14 changed files with 123 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
View File

@ -66,6 +66,7 @@ class ProductDataGrid extends DataGrid
'product_flat.channel',
'product_flat.product_id',
'products.sku as product_sku',
'product_flat.product_number',
'product_flat.name as product_name',
'products.type as product_type',
'product_flat.status',
@ -82,6 +83,7 @@ class ProductDataGrid extends DataGrid
$this->addFilter('product_id', 'product_flat.product_id');
$this->addFilter('product_name', 'product_flat.name');
$this->addFilter('product_sku', 'products.sku');
$this->addFilter('product_number', 'product_flat.product_number');
$this->addFilter('status', 'product_flat.status');
$this->addFilter('product_type', 'products.type');
$this->addFilter('attribute_family', 'attribute_families.name');
@ -109,6 +111,15 @@ class ProductDataGrid extends DataGrid
'filterable' => true,
]);
$this->addColumn([
'index' => 'product_number',
'label' => trans('admin::app.datagrid.product-number'),
'type' => 'string',
'searchable' => true,
'sortable' => true,
'filterable' => true,
]);
$this->addColumn([
'index' => 'product_name',
'label' => trans('admin::app.datagrid.name'),

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

@ -189,6 +189,7 @@ return [
'shipment-date' => 'تاريخ الشحن',
'shipment-to' => 'الشحن إلى',
'sku' => 'SKU',
'product-number' => 'رقم المنتج',
'price' => 'السعر',
'qty' => 'كمية',
'permission-type' => 'نوع الإذن',

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

@ -188,6 +188,7 @@ return [
'shipment-date' => 'Versand Datum',
'shipment-to' => 'Versand',
'sku' => 'SKU',
'product-number' => 'Produktnummer',
'price' => 'Preis',
'qty' => 'Menge',
'permission-type' => 'Berechtigungsart',

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

@ -189,6 +189,7 @@ return [
'shipment-date' => 'Shipment Date',
'shipment-to' => 'Shipping To',
'sku' => 'SKU',
'product-number' => 'Product Number',
'price' => 'Price',
'qty' => 'Quantity',
'permission-type' => 'Permission Type',

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

@ -186,6 +186,7 @@ return [
'shipment-date' => 'Fecha de envío',
'shipment-to' => 'Enviar hacia',
'sku' => 'SKU',
'product-number' => 'Número de producto',
'price' => 'Precio',
'qty' => 'Cantidad',
'permission-type' => 'Tipo de permiso',

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

@ -187,6 +187,7 @@ return [
'shipment-date' => 'تاریخ ارسال',
'shipment-to' => 'حمل و نقل به',
'sku' => 'واحد نگهداری موجودی',
'product-number' => 'شماره محصول',
'price' => 'قیمت',
'qty' => 'مقدار',
'permission-type' => 'نوع مجوز',

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

@ -188,6 +188,7 @@ return [
'shipment-date' => 'Data Spedizione',
'shipment-to' => 'Spedizione A',
'sku' => 'SKU',
'product-number' => 'Numero del prodotto',
'price' => 'Prezzo',
'qty' => 'Quantità',
'permission-type' => 'Tipo Permessi',

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

@ -188,6 +188,7 @@ return [
'shipment-date' => 'Verzenddatum',
'shipment-to' => 'Shipping To',
'sku' => 'SKU',
'product-number' => 'Productnummer',
'price' => 'Prijs',
'qty' => 'Aantal',
'permission-type' => 'Permission Type',

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

@ -186,6 +186,7 @@ return [
'shipment-date' => 'Data wysyłki',
'shipment-to' => 'Wysyłka do',
'sku' => 'SKU',
'product-number' => 'Numer produktu',
'price' => 'Cena',
'qty' => 'Ilość',
'permission-type' => 'Rodzaj zezwolenia',

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

@ -187,6 +187,7 @@ return [
'shipment-date' => 'Data de Envio',
'shipment-to' => 'Enviado para',
'sku' => 'SKU',
'product-number' => 'Número de produto',
'price' => 'Preço',
'qty' => 'Quantidade',
'permission-type' => 'Tipo de Permissão',

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

@ -185,6 +185,7 @@ return [
'shipment-date' => 'Kargo Tarihi',
'shipment-to' => 'Kargo Bilgileri',
'sku' => 'Barkod',
'product-number' => 'Ürün numarası',
'price' => 'Fiyat',
'qty' => 'Miktar',
'permission-type' => 'İzin Tipi',

38
packages/Webkul/Attribute/src/Database/Seeders/AttributeGroupTableSeeder.php
View File

@ -25,26 +25,26 @@ class AttributeGroupTableSeeder extends Seeder
'is_user_defined' => '0',
'attribute_family_id' => '1',
], [
'id' => '2',
'name' => 'Description',
'id' => '2',
'name' => 'Description',
'position' => '2',
'is_user_defined' => '0',
'attribute_family_id' => '1',
], [
'id' => '3',
'id' => '3',
'name' => 'Meta Description',
'position' => '3',
'is_user_defined' => '0',
'attribute_family_id' => '1',
], [
'id' => '4',
'name' => 'Price',
'id' => '4',
'name' => 'Price',
'position' => '4',
'is_user_defined' => '0',
'attribute_family_id' => '1',
], [
'id' => '5',
'name' => 'Shipping',
'id' => '5',
'name' => 'Shipping',
'position' => '5',
'is_user_defined' => '0',
'attribute_family_id' => '1'
@ -59,31 +59,31 @@ class AttributeGroupTableSeeder extends Seeder
], [
'attribute_id' => '2',
'attribute_group_id' => '1',
'position' => '2',
'position' => '3',
], [
'attribute_id' => '3',
'attribute_group_id' => '1',
'position' => '3',
'position' => '4',
], [
'attribute_id' => '4',
'attribute_group_id' => '1',
'position' => '4',
'position' => '5',
], [
'attribute_id' => '5',
'attribute_group_id' => '1',
'position' => '5',
'position' => '6',
], [
'attribute_id' => '6',
'attribute_group_id' => '1',
'position' => '6',
'position' => '7',
], [
'attribute_id' => '7',
'attribute_group_id' => '1',
'position' => '7',
'position' => '8',
], [
'attribute_id' => '8',
'attribute_group_id' => '1',
'position' => '8',
'position' => '10',
], [
'attribute_id' => '9',
'attribute_group_id' => '2',
@ -143,19 +143,23 @@ class AttributeGroupTableSeeder extends Seeder
], [
'attribute_id' => '23',
'attribute_group_id' => '1',
'position' => '10',
'position' => '11',
], [
'attribute_id' => '24',
'attribute_group_id' => '1',
'position' => '11',
'position' => '12',
], [
'attribute_id' => '25',
'attribute_group_id' => '1',
'position' => '12',
'position' => '13',
], [
'attribute_id' => '26',
'attribute_group_id' => '1',
'position' => '9',
], [
'attribute_id' => '27',
'attribute_group_id' => '1',
'position' => '2',
]
]);

74
packages/Webkul/Attribute/src/Database/Seeders/AttributeTableSeeder.php
View File

@ -12,7 +12,7 @@ class AttributeTableSeeder extends Seeder
public function run()
{
DB::table('attributes')->delete();
DB::table('attribute_translations')->delete();
$now = Carbon::now();
@ -43,7 +43,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Name',
'type' => 'text',
'validation' => NULL,
'position' => '2',
'position' => '3',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '1',
@ -62,7 +62,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'URL Key',
'type' => 'text',
'validation' => NULL,
'position' => '3',
'position' => '4',
'is_required' => '1',
'is_unique' => '1',
'value_per_locale' => '0',
@ -81,7 +81,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Tax Category',
'type' => 'select',
'validation' => NULL,
'position' => '4',
'position' => '5',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -100,7 +100,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'New',
'type' => 'boolean',
'validation' => NULL,
'position' => '5',
'position' => '6',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -119,7 +119,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Featured',
'type' => 'boolean',
'validation' => NULL,
'position' => '6',
'position' => '7',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -138,7 +138,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Visible Individually',
'type' => 'boolean',
'validation' => NULL,
'position' => '7',
'position' => '9',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '0',
@ -157,7 +157,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Status',
'type' => 'boolean',
'validation' => NULL,
'position' => '8',
'position' => '10',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '0',
@ -176,7 +176,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Short Description',
'type' => 'textarea',
'validation' => NULL,
'position' => '9',
'position' => '11',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '1',
@ -195,7 +195,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Description',
'type' => 'textarea',
'validation' => NULL,
'position' => '10',
'position' => '12',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '1',
@ -214,7 +214,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Price',
'type' => 'price',
'validation' => 'decimal',
'position' => '11',
'position' => '13',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '0',
@ -233,7 +233,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Cost',
'type' => 'price',
'validation' => 'decimal',
'position' => '12',
'position' => '14',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -252,7 +252,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Special Price',
'type' => 'price',
'validation' => 'decimal',
'position' => '13',
'position' => '15',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -271,7 +271,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Special Price From',
'type' => 'date',
'validation' => NULL,
'position' => '14',
'position' => '16',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -290,7 +290,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Special Price To',
'type' => 'date',
'validation' => NULL,
'position' => '15',
'position' => '17',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -309,7 +309,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Meta Title',
'type' => 'textarea',
'validation' => NULL,
'position' => '16',
'position' => '18',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '1',
@ -328,7 +328,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Meta Keywords',
'type' => 'textarea',
'validation' => NULL,
'position' => '17',
'position' => '20',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '1',
@ -347,7 +347,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Meta Description',
'type' => 'textarea',
'validation' => NULL,
'position' => '18',
'position' => '21',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '1',
@ -366,7 +366,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Width',
'type' => 'text',
'validation' => 'decimal',
'position' => '19',
'position' => '22',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -385,7 +385,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Height',
'type' => 'text',
'validation' => 'decimal',
'position' => '20',
'position' => '23',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -404,7 +404,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Depth',
'type' => 'text',
'validation' => 'decimal',
'position' => '21',
'position' => '24',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -423,7 +423,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Weight',
'type' => 'text',
'validation' => 'decimal',
'position' => '22',
'position' => '25',
'is_required' => '1',
'is_unique' => '0',
'value_per_locale' => '0',
@ -442,7 +442,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Color',
'type' => 'select',
'validation' => NULL,
'position' => '23',
'position' => '26',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -461,7 +461,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Size',
'type' => 'select',
'validation' => NULL,
'position' => '24',
'position' => '27',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -480,7 +480,7 @@ class AttributeTableSeeder extends Seeder
'admin_name' => 'Brand',
'type' => 'select',
'validation' => NULL,
'position' => '25',
'position' => '28',
'is_required' => '0',
'is_unique' => '0',
'value_per_locale' => '0',
@ -512,6 +512,25 @@ class AttributeTableSeeder extends Seeder
'created_at' => $now,
'updated_at' => $now,
'is_comparable' => '0',
], [
'id' => '27',
'code' => 'product_number',
'admin_name' => 'Product Number',
'type' => 'text',
'validation' => NULL,
'position' => '2',
'is_required' => '0',
'is_unique' => '1',
'value_per_locale' => '0',
'value_per_channel' => '0',
'is_filterable' => '0',
'is_configurable' => '0',
'is_user_defined' => '0',
'is_visible_on_front' => '0',
'use_in_flat' => '1',
'created_at' => $now,
'updated_at' => $now,
'is_comparable' => '0',
]
]);
@ -646,6 +665,11 @@ class AttributeTableSeeder extends Seeder
'locale' => 'en',
'name' => 'Allow Guest Checkout',
'attribute_id' => '26',
], [
'id' => '27',
'locale' => 'en',
'name' => 'Product Number',
'attribute_id' => '27',
]
]);
}

32
packages/Webkul/Product/src/Database/Migrations/2020_11_10_174816_add_product_number_column_in_product_flat_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddProductNumberColumnInProductFlatTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('product_flat', function (Blueprint $table) {
$table->string('product_number')->after('sku')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('product_flat', function (Blueprint $table) {
$table->dropColumn('product_number');
});
}
}