diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 255062054..5c4635eb1 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -1,6 +1,9 @@ 'general', 'name' => 'admin::app.admin.system.general', @@ -27,7 +30,7 @@ return [ 'value' => 'kgs', ], ], - 'channel_based' => true + 'channel_based' => true, ], ], ], [ @@ -70,7 +73,7 @@ return [ 'type' => 'textarea', 'channel_based' => true, 'locale_based' => false, - ] + ], ], ], [ 'key' => 'general.design', @@ -95,7 +98,12 @@ return [ 'validation' => 'mimes:bmp,jpeg,jpg,png,webp', ], ], - ], [ + ], + + /** + * Catalog. + */ + [ 'key' => 'catalog', 'name' => 'admin::app.admin.system.catalog', 'sort' => 2, @@ -120,16 +128,16 @@ return [ 'sort' => 2, 'fields' => [ [ - 'name' => 'no_of_new_product_homepage', - 'title' => 'admin::app.admin.system.allow-no-of-new-product-homepage', - 'type' => 'number', - 'validation' => 'min:0', + 'name' => 'no_of_new_product_homepage', + 'title' => 'admin::app.admin.system.allow-no-of-new-product-homepage', + 'type' => 'number', + 'validation' => 'min:0', ], [ - 'name' => 'no_of_featured_product_homepage', - 'title' => 'admin::app.admin.system.allow-no-of-featured-product-homepage', - 'type' => 'number', - 'validation' => 'min:0', + 'name' => 'no_of_featured_product_homepage', + 'title' => 'admin::app.admin.system.allow-no-of-featured-product-homepage', + 'type' => 'number', + 'validation' => 'min:0', ], [ 'name' => 'out_of_stock_items', @@ -192,7 +200,7 @@ return [ 'name' => 'buy_now_button_display', 'title' => 'admin::app.admin.system.buy-now-button-display', 'type' => 'boolean', - ] + ], ], ], [ 'key' => 'catalog.products.cache-small-image', @@ -208,7 +216,7 @@ return [ 'name' => 'height', 'title' => 'admin::app.admin.system.height', 'type' => 'text', - ] + ], ], ], [ 'key' => 'catalog.products.cache-medium-image', @@ -224,7 +232,7 @@ return [ 'name' => 'height', 'title' => 'admin::app.admin.system.height', 'type' => 'text', - ] + ], ], ], [ 'key' => 'catalog.products.cache-large-image', @@ -240,7 +248,7 @@ return [ 'name' => 'height', 'title' => 'admin::app.admin.system.height', 'type' => 'text', - ] + ], ], ], [ 'key' => 'catalog.products.review', @@ -266,7 +274,7 @@ return [ 'name' => 'file_attribute_upload_size', 'title' => 'admin::app.admin.system.file-upload-size', 'type' => 'text', - ] + ], ], ], [ 'key' => 'catalog.inventory', @@ -340,16 +348,65 @@ return [ 'name' => 'show_search_input_field', 'title' => 'admin::app.admin.system.show-search-input-field', 'type' => 'boolean', - ] - ] - ], [ + ], + ], + ], + + /** + * Customer. + */ + [ 'key' => 'customer', 'name' => 'admin::app.admin.system.customer', - 'sort' => 4, + 'sort' => 3, + ], [ + 'key' => 'customer.address', + 'name' => 'admin::app.admin.system.address', + 'sort' => 1, + ], [ + 'key' => 'customer.address.requirements', + 'name' => 'admin::app.admin.system.requirements', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'country', + 'title' => 'admin::app.admin.system.country', + 'type' => 'boolean', + 'channel_based' => true, + 'default' => '1', + ], + [ + 'name' => 'state', + 'title' => 'admin::app.admin.system.state', + 'type' => 'boolean', + 'channel_based' => true, + 'default' => '1', + ], + [ + 'name' => 'postcode', + 'title' => 'admin::app.admin.system.zip', + 'type' => 'boolean', + 'channel_based' => true, + 'default' => '1', + ], + ], + ], [ + 'key' => 'customer.address.information', + 'name' => 'Information', + 'sort' => 2, + 'fields' => [ + [ + 'name' => 'street_lines', + 'title' => 'admin::app.admin.system.street-lines', + 'type' => 'text', + 'validation' => 'between:1,4', + 'channel_based' => true, + ], + ], ], [ 'key' => 'customer.settings', 'name' => 'admin::app.admin.system.settings', - 'sort' => 1, + 'sort' => 3, ], [ 'key' => 'customer.settings.wishlist', 'name' => 'admin::app.admin.system.wishlist', @@ -361,23 +418,10 @@ return [ 'type' => 'boolean', ], ], - ], [ - 'key' => 'customer.settings.address', - 'name' => 'admin::app.admin.system.address', - 'sort' => 2, - 'fields' => [ - [ - 'name' => 'street_lines', - 'title' => 'admin::app.admin.system.street-lines', - 'type' => 'text', - 'validation' => 'between:1,4', - 'channel_based' => true, - ], - ], ], [ 'key' => 'customer.settings.newsletter', 'name' => 'admin::app.admin.system.newsletter', - 'sort' => 3, + 'sort' => 2, 'fields' => [ [ 'name' => 'subscription', @@ -388,7 +432,7 @@ return [ ], [ 'key' => 'customer.settings.email', 'name' => 'admin::app.admin.system.email', - 'sort' => 4, + 'sort' => 3, 'fields' => [ [ 'name' => 'verification', @@ -396,10 +440,15 @@ return [ 'type' => 'boolean', ], ], - ], [ + ], + + /** + * Emails. + */ + [ 'key' => 'emails', 'name' => 'admin::app.admin.emails.email', - 'sort' => 5, + 'sort' => 4, ], [ 'key' => 'emails.configure', 'name' => 'admin::app.admin.system.email-settings', @@ -417,7 +466,7 @@ return [ 'validation' => 'required|max:50', 'channel_based' => true, 'default_value' => config('mail.from.name'), - ], [ + ], [ 'name' => 'shop_email_from', 'title' => 'admin::app.admin.system.shop-email-from', 'type' => 'text', @@ -425,7 +474,7 @@ return [ 'validation' => 'required|email', 'channel_based' => true, 'default_value' => config('mail.from.address'), - ], [ + ], [ 'name' => 'admin_name', 'title' => 'admin::app.admin.system.admin-name', 'type' => 'text', @@ -433,7 +482,7 @@ return [ 'validation' => 'required|max:50', 'channel_based' => true, 'default_value' => config('mail.admin.name'), - ], [ + ], [ 'name' => 'admin_email', 'title' => 'admin::app.admin.system.admin-email', 'type' => 'text', diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 12e7d0c54..ef3d88655 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -37,8 +37,18 @@ class CustomerDataGrid extends DataGrid { $queryBuilder = DB::table('customers') ->leftJoin('customer_groups', 'customers.customer_group_id', '=', 'customer_groups.id') - ->addSelect('customers.id as customer_id', 'customers.email', 'customer_groups.name as group', 'customers.phone', 'customers.gender', 'status') - ->addSelect(DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name) as full_name')); + ->addSelect( + 'customers.id as customer_id', + 'customers.email', + 'customers.phone', + 'customers.gender', + 'customers.status', + 'customers.is_suspended', + 'customer_groups.name as group', + ) + ->addSelect( + DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name) as full_name') + ); $this->addFilter('customer_id', 'customers.id'); $this->addFilter('full_name', DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name)')); @@ -101,7 +111,7 @@ class CustomerDataGrid extends DataGrid 'sortable' => true, 'filterable' => false, 'closure' => function ($row) { - if (!$row->phone) { + if (! $row->phone) { return '-'; } else { return $row->phone; @@ -117,7 +127,7 @@ class CustomerDataGrid extends DataGrid 'sortable' => true, 'filterable' => false, 'closure' => function ($row) { - if (!$row->gender) { + if (! $row->gender) { return '-'; } else { return $row->gender; @@ -133,11 +143,19 @@ class CustomerDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($row) { + $html = ''; + if ($row->status == 1) { - return '' . trans('admin::app.customers.customers.active') . ''; + $html .= '' . trans('admin::app.customers.customers.active') . ''; } else { - return '' . trans('admin::app.customers.customers.inactive') . ''; + $html .= '' . trans('admin::app.customers.customers.inactive') . ''; } + + if ($row->is_suspended == 1) { + $html .= '' . trans('admin::app.customers.customers.suspended') . ''; + } + + return $html; }, ]); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 50656f926..cf6463569 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -175,6 +175,8 @@ class CustomerController extends Controller $data['status'] = ! isset($data['status']) ? 0 : 1; + $data['is_suspended'] = ! isset($data['is_suspended']) ? 0 : 1; + $this->customerRepository->update($data, $id); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer'])); diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 4c2fd8726..d040801bb 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -1027,6 +1027,9 @@ return [ 'status' => 'الحالة', 'active' => 'نشيط', 'inactive' => 'غير نشط', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1422,10 +1425,12 @@ return [ 'flate-rate-shipping' => 'تعريفة موحدة للشحن بغض النظر عن الكمية', 'shipping' => 'الشحن', 'origin' => 'الأصل', + 'requirements' => 'Requirements', 'country' => 'بلد', 'state' => 'حالة', 'zip' => 'الرمز البريدي', 'city' => 'مدينة', + 'information' => 'Information', 'street-address' => 'عنوان الشارع', 'title' => 'عنوان', 'description' => 'وصف', diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index b37ac6f05..e02587602 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -1027,6 +1027,9 @@ return [ 'status' => 'Status', 'active' => 'Aktiv', 'inactive' => 'Inaktiv', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1430,10 +1433,12 @@ return [ 'flate-rate-shipping' => 'Pauschale Versandkosten', 'shipping' => 'Versand', 'origin' => 'Herkunft', + 'requirements' => 'Requirements', 'country' => 'Land', 'state' => 'Bundesland', 'zip' => 'Postleitzahl', 'city' => 'Stadt', + 'information' => 'Information', 'street-address' => 'Anschrift', 'title' => 'Titel', 'description' => 'Beschreibung', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index e4af0949f..9f91be5df 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1045,6 +1045,9 @@ return [ 'status' => 'Status', 'active' => 'Active', 'inactive' => 'Inactive', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1421,7 +1424,8 @@ return [ ], ], - 'system' => [ + + 'system' => [ 'catalog' => 'Catalog', 'homepage' => 'Homepage configuration', 'allow-out-of-stock-items' => 'Allow out of stock items', @@ -1449,10 +1453,12 @@ return [ 'flate-rate-shipping' => 'Flat Rate Shipping', 'shipping' => 'Shipping', 'origin' => 'Origin', + 'requirements' => 'Requirements', 'country' => 'Country', 'state' => 'State', 'zip' => 'Zip', 'city' => 'City', + 'information' => 'Information', 'street-address' => 'Street Address', 'title' => 'Title', 'description' => 'Description', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 7cf504364..6c55f2c0b 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -1036,6 +1036,9 @@ return [ 'status' => 'Estado', 'active' => 'Activo', 'inactive' => 'Inactivo', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1434,10 +1437,12 @@ return [ 'flate-rate-shipping' => 'Envío con tarifa plana', 'shipping' => 'Envío', 'origin' => 'Origen', + 'requirements' => 'Requirements', 'country' => 'País', 'state' => 'Departamento', 'zip' => 'Código Postal', 'city' => 'Ciudad', + 'information' => 'Information', 'street-address' => 'Dirección', 'title' => 'Título', 'description' => 'Descripción', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index d299ae91a..c4b7402b4 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -1022,6 +1022,9 @@ return [ 'status' => 'وضعیت', 'active' => 'فعال', 'inactive' => 'غیرفعال', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1419,10 +1422,12 @@ return [ 'flate-rate-shipping' => 'نرخ ثابت حمل و نقل', 'shipping' => 'حمل و نقل دریایی', 'origin' => 'مبدا', + 'requirements' => 'Requirements', 'country' => 'کشور', 'state' => 'استان', 'zip' => 'کد پستی', 'city' => 'شهر', + 'information' => 'Information', 'street-address' => 'آدرس خیابان', 'title' => 'عنوان', 'description' => 'توضیحات', diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php index edcaf1037..24ebca7a9 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php @@ -1042,6 +1042,9 @@ return [ 'status' => 'Statut', 'active' => 'actif', 'inactive' => 'Inactif', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1446,10 +1449,12 @@ return [ 'flate-rate-shipping' => 'Expédition forfaitaire', 'shipping' => 'Expédition', 'origin' => 'Origine', + 'requirements' => 'Requirements', 'country' => 'Pays', 'state' => 'État', 'zip' => 'Zipper', 'city' => 'Ville', + 'information' => 'Information', 'street-address' => 'Adresse de rue', 'title' => 'Titre', 'description' => 'La description', diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index cf705bce6..43f3f274d 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -1030,6 +1030,9 @@ return [ 'active' => 'Attivo', 'inactive' => 'Non attivo', 'in-active' => 'Non attivo', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1422,10 +1425,12 @@ return [ 'flate-rate-shipping' => 'Spedizione Prezzo Fisso', 'shipping' => 'Spedizione', 'origin' => 'Origine', + 'requirements' => 'Requirements', 'country' => 'Paese', 'state' => 'Provincia', 'zip' => 'CAP', 'city' => 'Città', + 'information' => 'Information', 'street-address' => 'Indirizzo', 'title' => 'Titolo', 'description' => 'Descrizione', diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index 2fc0efc6b..02444d342 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -1024,6 +1024,9 @@ return [ 'status' => 'Status', 'active' => 'Actief', 'inactive' => 'Niet geactiveerd', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1416,10 +1419,12 @@ return [ 'flate-rate-shipping' => 'Forfaitaire verzendkosten', 'shipping' => 'Verzending', 'origin' => 'Herkomst', + 'requirements' => 'Requirements', 'country' => 'Land', 'state' => 'Staat/Provincie', 'zip' => 'Zip', 'city' => 'Woonplaats', + 'information' => 'Information', 'street-address' => 'Adres', 'title' => 'Titel', 'description' => 'Omschrijving', diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index a144cd4e7..4113b8743 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -1027,6 +1027,9 @@ return [ 'status' => 'Status', 'active' => 'Aktywny', 'inactive' => 'Nieaktywny', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1419,10 +1422,12 @@ return [ 'flate-rate-shipping' => 'Stawka ryczałtowa', 'shipping' => 'Dostawa', 'origin' => 'Zamieszmanie', + 'requirements' => 'Requirements', 'country' => 'Kraj', 'state' => 'Stan/województwo', 'zip' => 'Kod', 'city' => 'Miasto', + 'information' => 'Information', 'street-address' => 'ulica', 'title' => 'Tytuł', 'description' => 'Opis', diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index dc937db3e..f618862ee 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -1026,6 +1026,9 @@ return [ 'status' => 'Status', 'active' => 'Ativo (a)', 'inactive' => 'Inativo (a)', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1418,10 +1421,12 @@ return [ 'flate-rate-shipping' => 'Envio de taxa fixa', 'shipping' => 'Remessa', 'origin' => 'Origem', + 'requirements' => 'Requirements', 'country' => 'País', 'state' => 'Estado', 'zip' => 'CEP', 'city' => 'Cidade', + 'information' => 'Information', 'street-address' => 'Endereço', 'title' => 'Titulo', 'description' => 'Descrição', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 2ade34860..1349a063a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -1015,6 +1015,9 @@ return [ 'status' => 'Durum', 'active' => 'Aktif', 'inactive' => 'Pasif', + 'is-suspended' => 'Is Suspended', + 'suspend' => 'Suspend', + 'suspended' => 'Suspended', ], 'reviews' => [ @@ -1406,10 +1409,12 @@ return [ 'flate-rate-shipping' => 'Sabit Fiyat Teslimat', 'shipping' => 'Teslimat', 'origin' => 'Menşei', + 'requirements' => 'Requirements', 'country' => 'Ülke', 'state' => 'Şehir', 'zip' => 'Posta Kodu', 'city' => 'İlçe', + 'information' => 'Information', 'street-address' => 'Sokak Adresi', 'title' => 'Başlık', 'description' => 'Açıklama', diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php index ddfc20fd0..b8df117b6 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php @@ -4,21 +4,14 @@