From 0b9003b6f7e623285210a09ec360d139aa7ae2b6 Mon Sep 17 00:00:00 2001 From: Cookizza <1787216+Cookizza@users.noreply.github.com> Date: Mon, 26 Nov 2018 15:58:57 +0000 Subject: [PATCH 01/10] Vue is not a node.js framework Just a tiny update to the Readme - Vuejs is not a node.js framework as was stated. It doesn't reply on node at all, I opted to use the description the Vue developers use on their homepage / github of `Progressive JavaScript Framework` in my edit :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c5d6dfc7..435b4608f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ [Bagisto](https://www.bagisto.com) is a hand tailored E-Commerce framework designed on some of the hottest opensource technologies such as [Laravel](https://laravel.com) a [PHP](https://secure.php.net/) framework, [Vue.js](https://vuejs.org) -a [Node.js](https://nodejs.org) framework. +a progressive Javascript framework. **Bagisto is viable attempt to cut down your time, cost and workforce for building online stores or migrating from physical stores to the ever demanding online world. Your business whether small or huge it suits all and very simple to set it up.** From fb0079bf429f1e5cbd141519f0b171b9dd5935c4 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 27 Nov 2018 10:16:35 +0530 Subject: [PATCH 02/10] Fixed validation error messages --- config/themes.php | 2 +- .../Controllers/ConfigurationController.php | 55 +++++++++++++++ packages/Webkul/Admin/src/Http/routes.php | 21 +++++- packages/Webkul/Admin/src/Listeners/Order.php | 18 ++++- .../Admin/src/Mail/NewInvoiceNotification.php | 4 +- .../Admin/src/Mail/NewOrderNotification.php | 7 +- .../src/Mail/NewShipmentNotification.php | 4 +- .../src/Providers/EventServiceProvider.php | 12 ++++ .../Admin/src/Resources/lang/en/app.php | 11 ++- .../Resources/views/account/edit.blade.php | 8 +-- .../views/catalog/attributes/create.blade.php | 10 +-- .../views/catalog/attributes/edit.blade.php | 10 +-- .../views/catalog/categories/create.blade.php | 11 +-- .../views/catalog/categories/edit.blade.php | 14 ++-- .../views/catalog/families/create.blade.php | 10 +-- .../views/catalog/families/edit.blade.php | 10 +-- .../products/accordians/inventories.blade.php | 2 +- .../products/accordians/variations.blade.php | 12 ++-- .../views/catalog/products/create.blade.php | 6 +- .../products/field-types/boolean.blade.php | 2 +- .../products/field-types/date.blade.php | 2 +- .../products/field-types/datetime.blade.php | 2 +- .../field-types/multiselect.blade.php | 2 +- .../products/field-types/price.blade.php | 2 +- .../products/field-types/select.blade.php | 2 +- .../products/field-types/text.blade.php | 2 +- .../products/field-types/textarea.blade.php | 2 +- .../configuration/sales/general.blade.php | 33 +++++++++ .../views/customers/country-state.blade.php | 6 +- .../views/customers/create.blade.php | 16 ++--- .../Resources/views/customers/edit.blade.php | 16 ++--- .../views/customers/group/create.blade.php | 2 +- .../views/customers/group/edit.blade.php | 2 +- .../views/sales/invoices/create.blade.php | 2 +- .../views/sales/shipments/create.blade.php | 6 +- .../views/settings/channels/create.blade.php | 21 +++--- .../views/settings/channels/edit.blade.php | 21 +++--- .../settings/currencies/create.blade.php | 4 +- .../views/settings/currencies/edit.blade.php | 4 +- .../settings/exchange_rates/create.blade.php | 4 +- .../settings/exchange_rates/edit.blade.php | 4 +- .../inventory_sources/create.blade.php | 16 ++--- .../settings/inventory_sources/edit.blade.php | 16 ++--- .../views/settings/locales/create.blade.php | 4 +- .../views/settings/locales/edit.blade.php | 4 +- .../views/settings/sliders/create.blade.php | 4 +- .../views/settings/sliders/edit.blade.php | 8 +-- .../views/tax/tax-categories/create.blade.php | 70 +++++++++---------- .../views/tax/tax-categories/edit.blade.php | 10 +-- .../views/tax/tax-rates/create.blade.php | 10 +-- .../views/tax/tax-rates/edit.blade.php | 10 +-- .../users/forget-password/create.blade.php | 2 +- .../users/reset-password/create.blade.php | 6 +- .../views/users/roles/create.blade.php | 2 +- .../views/users/roles/edit.blade.php | 2 +- .../views/users/sessions/create.blade.php | 4 +- .../views/users/users/create.blade.php | 10 +-- .../views/users/users/edit.blade.php | 10 +-- packages/Webkul/Checkout/src/Cart.php | 2 +- .../Webkul/Core/src/Models/CoreConfig.php | 9 +++ .../src/Repositories/CoreConfigRepository.php | 24 +++++++ .../src/Repositories/ProductRepository.php | 2 +- .../src/Repositories/InvoiceRepository.php | 1 + .../Http/ViewComposers/CategoryComposer.php | 3 +- .../Webkul/Shop/src/Resources/lang/en/app.php | 4 ++ .../views/layouts/footer/footer.blade.php | 23 +++--- .../view/configurable-options.blade.php | 2 +- 67 files changed, 406 insertions(+), 236 deletions(-) create mode 100644 packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php create mode 100644 packages/Webkul/Admin/src/Resources/views/configuration/sales/general.blade.php create mode 100644 packages/Webkul/Core/src/Models/CoreConfig.php create mode 100644 packages/Webkul/Core/src/Repositories/CoreConfigRepository.php diff --git a/config/themes.php b/config/themes.php index d3241b760..f7db9b62b 100644 --- a/config/themes.php +++ b/config/themes.php @@ -7,7 +7,7 @@ return [ 'default' => [ 'views_path' => 'resources/themes/default/views', 'assets_path' => 'public/themes/default/assets', - 'name' => 'Dafault' + 'name' => 'Default' ], // 'bliss' => [ diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php new file mode 100644 index 000000000..30542e2b2 --- /dev/null +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -0,0 +1,55 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class ConfigurationController extends Controller +{ + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + protected $_config; + + /** + * CoreConfigRepository object + * + * @var array + */ + protected $coreConfig; + + /** + * Create a new controller instance. + * + * @param Webkul\Core\Repositories\CoreConfigRepository $coreConfig + * @return void + */ + public function __construct(CoreConfig $coreConfig) + { + $this->middleware('admin'); + + $this->_config = request('_config'); + + $this->coreConfig = $coreConfig; + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view($this->_config['view']); + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index f394303c5..e05da2cf2 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -11,6 +11,7 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.dashboard.index' ])->name('admin.session.store'); + // Forget Password Routes Route::get('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@create')->defaults('_config', [ 'view' => 'admin::users.forget-password.create' @@ -18,6 +19,7 @@ Route::group(['middleware' => ['web']], function () { Route::post('/forget-password', 'Webkul\User\Http\Controllers\ForgetPasswordController@store')->name('admin.forget-password.store'); + // Reset Password Routes Route::get('/reset-password/{token}', 'Webkul\User\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ 'view' => 'admin::users.reset-password.create' @@ -27,17 +29,20 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.dashboard.index' ])->name('admin.reset-password.store'); + // Admin Routes Route::group(['middleware' => ['admin']], function () { Route::get('/logout', 'Webkul\User\Http\Controllers\SessionController@destroy')->defaults('_config', [ 'redirect' => 'admin.session.create' ])->name('admin.session.destroy'); + // Dashboard Route Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->defaults('_config', [ 'view' => 'admin::dashboard.index' ])->name('admin.dashboard.index'); + //Customers Management Routes Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ 'view' => 'admin::customers.index' @@ -65,6 +70,13 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::customers.review.index' ])->name('admin.customer.review.index'); + + //Customers Management Routes + Route::get('configuration/sales/general', 'Webkul\Admin\Http\Controllers\ConfigurationController@index')->defaults('_config', [ + 'view' => 'admin::configuration.sales.general' + ])->name('admin.configuration.sales.general'); + + // Reviews Routes Route::get('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@edit')->defaults('_config',[ 'view' => 'admin::customers.review.edit' @@ -78,8 +90,8 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.customer.review.index' ])->name('admin.customer.review.delete'); - // Customer Groups Routes + // Customer Groups Routes Route::get('groups', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@index')->defaults('_config',[ 'view' => 'admin::customers.group.index' ])->name('admin.groups.index'); @@ -102,6 +114,7 @@ Route::group(['middleware' => ['web']], function () { Route::get('groups/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@destroy')->name('admin.groups.delete'); + // Sales Routes Route::prefix('sales')->group(function () { // Sales Order Routes @@ -158,11 +171,13 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.sales.shipments.view'); }); + // Catalog Routes Route::prefix('catalog')->group(function () { Route::get('/sync', 'Webkul\Product\Http\Controllers\ProductController@sync'); + // Catalog Product Routes Route::get('/products', 'Webkul\Product\Http\Controllers\ProductController@index')->defaults('_config', [ 'view' => 'admin::catalog.products.index' @@ -269,6 +284,7 @@ Route::group(['middleware' => ['web']], function () { Route::any('datagrid/massaction/edit','Webkul\Admin\Http\Controllers\DataGridController@massUpdate')->name('admin.datagrid.edit'); + // User Routes Route::get('/users', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [ 'view' => 'admin::users.users.index' @@ -491,6 +507,7 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::tax.tax-categories.index' ])->name('admin.tax-categories.index'); + // tax category routes Route::get('/tax-categories/create', 'Webkul\Tax\Http\Controllers\TaxCategoryController@show')->defaults('_config', [ 'view' => 'admin::tax.tax-categories.create' @@ -509,9 +526,9 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.tax-categories.update'); Route::get('/tax-categories/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@destroy')->name('admin.tax-categories.delete'); - //tax category ends + //tax rate Route::get('tax-rates', 'Webkul\Tax\Http\Controllers\TaxRateController@index')->defaults('_config', [ 'view' => 'admin::tax.tax-rates.index' diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 3d3a8c1c7..8ade83005 100644 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -22,7 +22,11 @@ class Order { */ public function sendNewOrderMail($order) { - Mail::send(new NewOrderNotification($order)); + try { + Mail::send(new NewOrderNotification($order)); + } catch (\Exception $e) { + + } } /** @@ -32,7 +36,11 @@ class Order { */ public function sendNewInvoiceMail($invoice) { - Mail::send(new NewInvoiceNotification($invoice)); + try { + Mail::send(new NewInvoiceNotification($invoice)); + } catch (\Exception $e) { + + } } /** @@ -42,7 +50,11 @@ class Order { */ public function sendNewShipmentMail($shipment) { - Mail::send(new NewShipmentNotification($shipment)); + try { + Mail::send(new NewShipmentNotification($shipment)); + } catch (\Exception $e) { + + } } /** diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php index 4388a8f6b..4fbb84c71 100644 --- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php @@ -45,7 +45,7 @@ class NewInvoiceNotification extends Mailable $order = $this->invoice->order; return $this->to($order->customer_email, $order->customer_full_name) - ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id])) - ->view('shop::emails.sales.new-invoice'); + ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id])) + ->view('shop::emails.sales.new-invoice'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php index b3d0b7b6c..2eae401b2 100644 --- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php @@ -41,9 +41,8 @@ class NewOrderNotification extends Mailable */ public function build() { - if($this->order->customer_email) - return $this->to($this->order->customer_email, $this->order->customer_full_name) - ->subject(trans('shop::app.mail.order.subject')) - ->view('shop::emails.sales.new-order'); + return $this->to($this->order->customer_email, $this->order->customer_full_name) + ->subject(trans('shop::app.mail.order.subject')) + ->view('shop::emails.sales.new-order'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php index 005ba74a9..bbbe00988 100644 --- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php @@ -45,7 +45,7 @@ class NewShipmentNotification extends Mailable $order = $this->shipment->order; return $this->to($order->customer_email, $order->customer_full_name) - ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id])) - ->view('shop::emails.sales.new-shipment'); + ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id])) + ->view('shop::emails.sales.new-shipment'); } } diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index cc003f1d8..9491c5c64 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -108,6 +108,18 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.account.edit', 'sort' => 1, 'icon-class' => '', + ], [ + 'key' => 'configuration.sales', + 'name' => 'Sales', + 'route' => 'admin.configuration.sales.general', + 'sort' => 1, + 'icon-class' => '', + ], [ + 'key' => 'configuration.sales.general', + 'name' => 'General', + 'route' => 'admin.configuration.sales.general', + 'sort' => 1, + 'icon-class' => '', ], [ 'key' => 'settings', 'name' => 'Settings', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 6619618d3..1ac25a510 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -335,6 +335,13 @@ return [ 'zip_code' => 'Zip Code', 'is_zip' => 'Enable Zip Range', ], + + 'sales' => [ + 'general' => [ + 'title' => 'General', + 'save-btn-title' => 'Save' + ] + ] ], 'settings' => [ @@ -420,7 +427,7 @@ return [ 'design' => 'Design', 'theme' => 'Theme', 'home_page_content' => 'Home Page Content', - 'footer_content' => 'footer_content', + 'footer_content' => 'Footer Content', 'logo' => 'Logo', 'favicon' => 'Favicon' ], @@ -442,6 +449,7 @@ return [ 'delete-fail' => 'Slider Item Successfully Deleted' ], ], + 'customers' => [ 'groups' =>[ 'add-title' => 'Add Group', @@ -478,6 +486,7 @@ return [ 'comment' => 'Comment' ] ], + 'error' => [ 'go-to-home' => 'GO TO HOME', diff --git a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php index 6c75e3429..b206b60e7 100644 --- a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php @@ -32,13 +32,13 @@
- + @{{ errors.first('name') }}
- + @{{ errors.first('email') }}
@@ -48,13 +48,13 @@
- + @{{ errors.first('password') }}
- + @{{ errors.first('password_confirmation') }}
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 6c9b5c3fc..dcb5a8dad 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 @@ -28,7 +28,7 @@
- + @{{ errors.first('code') }}
@@ -53,7 +53,7 @@
- + @{{ errors.first('admin_name') }}
@@ -196,7 +196,7 @@
- + @{{ errors.first(adminName(row)) }}
@@ -204,7 +204,7 @@ @foreach(Webkul\Core\Models\Locale::all() as $locale)
- + @{{ errors.first(localeInputName(row, '{!! $locale->code !!}')) }}
@@ -212,7 +212,7 @@
- + @{{ errors.first(sortOrderName(row)) }}
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 b2d5ddcf6..3870362eb 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 @@ -29,7 +29,7 @@
- + @{{ errors.first('code') }}
@@ -73,7 +73,7 @@
- + @{{ errors.first('admin_name') }}
@@ -257,7 +257,7 @@
- + @{{ errors.first(adminName(row)) }}
@@ -265,7 +265,7 @@ @foreach(Webkul\Core\Models\Locale::all() as $locale)
- + @{{ errors.first(localeInputName(row, '{!! $locale->code !!}')) }}
@@ -273,7 +273,7 @@
- + @{{ errors.first(sortOrderName(row)) }}
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 420f5052b..6d98c10d3 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 @@ -31,13 +31,13 @@
- + @{{ errors.first('name') }}
- @@ -50,7 +50,7 @@
- + @{{ errors.first('position') }}
@@ -62,7 +62,8 @@
- + @{{ errors.first('description') }}
@@ -95,7 +96,7 @@
- + @{{ errors.first('slug') }}
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 ef47c455f..3c77af430 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 @@ -44,13 +44,13 @@
- + @{{ errors.first('{!!$locale!!}[name]') }}
- @@ -62,8 +62,8 @@
- - + + @{{ errors.first('position') }}
@@ -75,7 +75,9 @@
- + @{{ errors.first('{!!$locale!!}[description]') }}
@@ -109,7 +111,7 @@
- + @{{ errors.first('{!!$locale!!}[slug]') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php index c361bc8b0..fbb47776b 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php @@ -30,13 +30,13 @@
- + @{{ errors.first('code') }}
- + @{{ errors.first('name') }}
@@ -79,13 +79,13 @@
- + @{{ errors.first('add-group-form.groupName') }}
- - + + @{{ errors.first('add-group-form.position') }}
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 3b744ecce..c4fd4f3b2 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 @@ -30,14 +30,14 @@
- + @{{ errors.first('code') }}
- + @{{ errors.first('name') }}
@@ -80,13 +80,13 @@
- + @{{ errors.first('add-group-form.groupName') }}
- - + + @{{ errors.first('add-group-form.position') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php index 284ae0cb0..dc6085033 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php @@ -19,7 +19,7 @@
- + @{{ errors.first('inventories[{!! $inventorySource->id !!}]') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php index 6f3ac7689..489f27b57 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php @@ -49,7 +49,7 @@
- @{{ errors.first('add-variant-form.' + attribute.code) }} @@ -100,14 +100,14 @@
- + @{{ errors.first(variantInputName + '[sku]') }}
- + @{{ errors.first(variantInputName + '[name]') }}
@@ -131,7 +131,7 @@
  • - + @{{ errors.first(variantInputName + '[inventories][' + inventorySource.id + ']') }}
    • @@ -142,14 +142,14 @@
    - + @{{ errors.first(variantInputName + '[price]') }}
    - + @{{ errors.first(variantInputName + '[weight]') }}
    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 5e6966c2d..09432dfb3 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 @@ -46,7 +46,7 @@
    - @@ -59,7 +59,7 @@
    - @foreach($families as $family) @@ -74,7 +74,7 @@
    - + @{{ errors.first('sku') }}
    diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php index 632a798c5..20ba12869 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php @@ -1,4 +1,4 @@ - code) ?: $product[$attribute->code] ?> diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php index 2669bb207..eac36fb9c 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php @@ -1,3 +1,3 @@ - is_required ? "v-validate='required'" : '' }} value="{{ old($attribute->code) ?: $product[$attribute->code] }}" {{ $disabled ? 'disabled' : '' }}/> + is_required ? "v-validate='required'" : '' }} value="{{ old($attribute->code) ?: $product[$attribute->code] }}" data-vv-as=""{{ $attribute->admin_name }}"" {{ $disabled ? 'disabled' : '' }}/> \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php index cc4663cbf..f655a54ca 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php @@ -1,3 +1,3 @@ - is_required ? "v-validate='required'" : '' }} value="{{ old($attribute->code) ?: $product[$attribute->code]}}" {{ $disabled ? 'disabled' : '' }}> + is_required ? "v-validate='required'" : '' }} value="{{ old($attribute->code) ?: $product[$attribute->code]}}" data-vv-as=""{{ $attribute->admin_name }}"" {{ $disabled ? 'disabled' : '' }}> \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php index d81e1670f..0c1be00d4 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php @@ -1,4 +1,4 @@ - @foreach($attribute->options as $option) @foreach (core()->countries() as $country) @@ -29,9 +29,9 @@ {{ __('admin::app.customers.customers.state') }} - + - diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php index a7089e869..e0eab85f4 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -31,25 +31,25 @@
    - + @{{ errors.first('first_name') }}
    - + @{{ errors.first('last_name') }}
    - + @{{ errors.first('email') }}
    - @@ -61,12 +61,6 @@
    -
    - - - @{{ errors.first('phone') }} -
    -
    + + @{{ errors.first('first_name') }}
    - + @{{ errors.first('last_name') }}
    - + @{{ errors.first('email') }}
    - @@ -64,12 +64,6 @@
    -
    - - - @{{ errors.first('phone') }} -
    -
    @@ -97,7 +91,7 @@ channel_id ?> @endif - @foreach($channelName as $channel)
    diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php index d13bbd115..000b133cf 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php @@ -33,7 +33,7 @@ - + @{{ errors.first('name') }}
    diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php index c556936cd..3bfdf2574 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php @@ -229,7 +229,7 @@ {{ $item->qty_ordered }}
    - + @verbatim diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php index 7b1772f23..8c74de7fb 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php @@ -197,7 +197,7 @@
    - + @{{ errors.first('shipment[carrier_title]') }} @@ -205,7 +205,7 @@
    - + @{{ errors.first('shipment[track_number]') }} @@ -245,7 +245,7 @@ {{ $item->qty_ordered }}
    - + @verbatim diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php index 174d8d621..41d1db425 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php @@ -29,20 +29,19 @@
    - + @{{ errors.first('code') }}
    - + @{{ errors.first('name') }}
    -
    - +
    + - @{{ errors.first('description') }}
    @@ -58,7 +57,7 @@
    - @foreach(core()->getAllLocales() as $locale)