diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 000000000..179ac6036 --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,13 @@ +db-blade-compiler.php +debugbar.php +dompdf.php +excel.php +flare.php +ignition.php +image.php +imagecache.php +jwt.php +repository.php +scout.php +tinker.php +translatable.php \ No newline at end of file diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index d57ef5e7d..9bb287f5c 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -146,7 +146,7 @@ class AddressDataGrid extends DataGrid 'sortable' => true, 'searchable' => false, 'closure' => function ($row) { - if ($row->default_address == 1) { + if ($row->default_address) { return '' . trans('admin::app.customers.addresses.yes') . ''; } else { return trans('admin::app.customers.addresses.dash'); diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index bccf9960d..335bc82ff 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -89,7 +89,7 @@ class AttributeDataGrid extends DataGrid 'sortable' => true, 'searchable' => false, 'closure' => function ($value) { - if ($value->is_required == 1) { + if ($value->is_required) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); @@ -105,7 +105,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'filterable' => true, 'closure' => function ($value) { - if ($value->is_unique == 1) { + if ($value->is_unique) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); @@ -121,7 +121,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'filterable' => true, 'closure' => function ($value) { - if ($value->value_per_locale == 1) { + if ($value->value_per_locale) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); @@ -137,7 +137,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'filterable' => true, 'closure' => function ($value) { - if ($value->value_per_channel == 1) { + if ($value->value_per_channel) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); diff --git a/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php index aec8098d3..a86f72a9b 100755 --- a/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php @@ -77,7 +77,7 @@ class CampaignDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php index 88fb10f20..609b737b6 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php @@ -86,7 +86,7 @@ class CartRuleCouponsDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->end_other_rules == 1) { + if ($value->end_other_rules) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php index f2d01dd70..fe92cae38 100644 --- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php @@ -88,7 +88,7 @@ class CatalogRuleDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 0dc2867d0..51c65f3d1 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -128,7 +128,7 @@ class CategoryDataGrid extends DataGrid 'searchable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php index 99f20d548..7b3d153e0 100644 --- a/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php @@ -161,7 +161,7 @@ class CategoryProductDataGrid extends DataGrid 'searchable' => false, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 70db39260..e21d44e18 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -145,13 +145,13 @@ class CustomerDataGrid extends DataGrid 'closure' => function ($row) { $html = ''; - if ($row->status == 1) { + if ($row->status) { $html .= '' . trans('admin::app.customers.customers.active') . ''; } else { $html .= '' . trans('admin::app.customers.customers.inactive') . ''; } - if ($row->is_suspended == 1) { + if ($row->is_suspended) { $html .= '' . trans('admin::app.customers.customers.suspended') . ''; } diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 34446e92a..1d160f0ae 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -86,7 +86,7 @@ class InventorySourcesDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 538a768c1..f6ba22caa 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -59,7 +59,7 @@ class NewsLetterDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status === 1) { + if ($value->status) { return trans('admin::app.datagrid.true'); } else { return trans('admin::app.datagrid.false'); diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 0facb5f0e..fc23ad046 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -204,7 +204,7 @@ class ProductDataGrid extends DataGrid 'closure' => function ($value) { $html = ''; - if ($value->status == 1) { + if ($value->status) { $html .= '' . trans('admin::app.datagrid.active') . ''; } else { $html .= '' . trans('admin::app.datagrid.inactive') . ''; diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 0ce3688db..f42441929 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -81,7 +81,7 @@ class UserDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'closure' => function ($value) { - if ($value->status == 1) { + if ($value->status) { return trans('admin::app.datagrid.active'); } else { return trans('admin::app.datagrid.inactive'); diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index a22c8e69d..e427c6163 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -79,6 +79,7 @@ class ConfigurationController extends Controller { if (! request()->route('slug')) { $firstItem = current($this->configTree->items); + $secondItem = current($firstItem['children']); return $this->getSlugs($secondItem); @@ -109,6 +110,7 @@ class ConfigurationController extends Controller foreach ($data['sales']['carriers'] as $carrier) { if ($carrier['active']) { $atLeastOneCarrierEnabled = true; + break; } } @@ -116,6 +118,22 @@ class ConfigurationController extends Controller if (! $atLeastOneCarrierEnabled) { session()->flash('error', trans('admin::app.configuration.enable-atleast-one-shipping')); + return redirect()->back(); + } + } elseif (isset($data['sales']['paymentmethods'])) { + $atLeastOnePaymentMethodEnabled = false; + + foreach ($data['sales']['paymentmethods'] as $paymentMethod) { + if ($paymentMethod['active']) { + $atLeastOnePaymentMethodEnabled = true; + + break; + } + } + + if (! $atLeastOnePaymentMethodEnabled) { + session()->flash('error', trans('admin::app.configuration.enable-atleast-one-payment')); + return redirect()->back(); } } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php index d9534868b..74d1d1dc5 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php @@ -2,6 +2,7 @@ namespace Webkul\Admin\Http\Controllers\Customer; +use Illuminate\Support\Facades\Event; use Webkul\Customer\Rules\VatIdRule; use Webkul\Admin\DataGrids\AddressDataGrid; use Webkul\Admin\Http\Controllers\Controller; @@ -73,8 +74,6 @@ class AddressController extends Controller 'address1' => implode(PHP_EOL, array_filter(request()->input('address1'))), ]); - $data = collect(request()->input())->except('_token')->toArray(); - $this->validate(request(), [ 'company_name' => 'string', 'address1' => 'string|required', @@ -86,15 +85,15 @@ class AddressController extends Controller 'vat_id' => new VatIdRule(), ]); - if ($this->customerAddressRepository->create($data)) { - session()->flash('success', trans('admin::app.customers.addresses.success-create')); + Event::dispatch('customer.addresses.create.before'); - return redirect()->route('admin.customer.edit', ['id' => $data['customer_id']]); - } else { - session()->flash('success', trans('admin::app.customers.addresses.error-create')); + $customerAddress = $this->customerAddressRepository->create(request()->all()); - return redirect()->back(); - } + Event::dispatch('customer.addresses.create.after', $customerAddress); + + session()->flash('success', trans('admin::app.customers.addresses.success-create')); + + return redirect()->route('admin.customer.edit', ['id' => request('customer_id')]); } /** @@ -131,18 +130,15 @@ class AddressController extends Controller 'vat_id' => new VatIdRule(), ]); - $data = collect(request()->input())->except('_token')->toArray(); + Event::dispatch('customer.addresses.update.before', $id); - $address = $this->customerAddressRepository->find($id); + $customerAddress = $this->customerAddressRepository->update(request()->all(), $id); - if ($address) { - $this->customerAddressRepository->update($data, $id); + Event::dispatch('customer.addresses.update.after', $customerAddress); - session()->flash('success', trans('admin::app.customers.addresses.success-update')); + session()->flash('success', trans('admin::app.customers.addresses.success-update')); - return redirect()->route('admin.customer.addresses.index', ['id' => $address->customer_id]); - } - return redirect()->route($this->_config['redirect']); + return redirect()->route('admin.customer.addresses.index', ['id' => $customerAddress->customer_id]); } /** @@ -153,11 +149,15 @@ class AddressController extends Controller */ public function destroy($id) { + Event::dispatch('customer.addresses.delete.before', $id); + $this->customerAddressRepository->delete($id); + Event::dispatch('customer.addresses.delete.after', $id); + return response()->json([ 'redirect' => false, - 'message' => trans('admin::app.customers.addresses.success-delete') + 'message' => trans('admin::app.customers.addresses.success-delete') ]); } @@ -172,7 +172,11 @@ class AddressController extends Controller $addressIds = explode(',', request()->input('indexes')); foreach ($addressIds as $addressId) { + Event::dispatch('customer.addresses.delete.before', $addressId); + $this->customerAddressRepository->delete($addressId); + + Event::dispatch('customer.addresses.delete.after', $addressId); } session()->flash('success', trans('admin::app.customers.addresses.success-mass-delete')); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 29a564394..15f044441 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -2,14 +2,13 @@ namespace Webkul\Admin\Http\Controllers\Customer; -use Mail; +use Illuminate\Support\Facades\Event; +use Illuminate\Support\Facades\Mail; use Webkul\Admin\DataGrids\CustomerDataGrid; use Webkul\Admin\DataGrids\CustomerOrderDataGrid; use Webkul\Admin\DataGrids\CustomersInvoicesDataGrid; use Webkul\Admin\Http\Controllers\Controller; use Webkul\Admin\Mail\NewCustomerNotification; -use Webkul\Core\Repositories\ChannelRepository; -use Webkul\Customer\Repositories\CustomerAddressRepository; use Webkul\Customer\Repositories\CustomerGroupRepository; use Webkul\Customer\Repositories\CustomerRepository; @@ -26,15 +25,11 @@ class CustomerController extends Controller * Create a new controller instance. * * @param \Webkul\Customer\Repositories\CustomerRepository $customerRepository - * @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepository - * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository */ public function __construct( protected CustomerRepository $customerRepository, - protected CustomerAddressRepository $customerAddressRepository, - protected CustomerGroupRepository $customerGroupRepository, - protected ChannelRepository $channelRepository + protected CustomerGroupRepository $customerGroupRepository ) { $this->_config = request('_config'); @@ -61,11 +56,9 @@ class CustomerController extends Controller */ public function create() { - $customerGroup = $this->customerGroupRepository->findWhere([['code', '<>', 'guest']]); + $groups = $this->customerGroupRepository->findWhere([['code', '<>', 'guest']]); - $channelName = $this->channelRepository->all(); - - return view($this->_config['view'], compact('customerGroup', 'channelName')); + return view($this->_config['view'], compact('groups')); } /** @@ -83,18 +76,20 @@ class CustomerController extends Controller 'date_of_birth' => 'date|before:today', ]); - $data = request()->all(); - $password = rand(100000, 10000000); - $data['password'] = bcrypt($password); + Event::dispatch('customer.registration.before'); - $data['is_verified'] = 1; + $customer = $this->customerRepository->create(array_merge(request()->all() , [ + 'password' => bcrypt($password), + 'is_verified' => 1, + ])); - $customer = $this->customerRepository->create($data); + Event::dispatch('customer.registration.after', $customer); try { $configKey = 'emails.general.notifications.emails.general.notifications.customer'; + if (core()->getConfigData($configKey)) { Mail::queue(new NewCustomerNotification($customer, $password)); } @@ -116,11 +111,10 @@ class CustomerController extends Controller public function edit($id) { $customer = $this->customerRepository->findOrFail($id); - $address = $this->customerAddressRepository->find($id); - $customerGroup = $this->customerGroupRepository->findWhere([['code', '<>', 'guest']]); - $channelName = $this->channelRepository->all(); - return view($this->_config['view'], compact('customer', 'address', 'customerGroup', 'channelName')); + $groups = $this->customerGroupRepository->findWhere([['code', '<>', 'guest']]); + + return view($this->_config['view'], compact('customer', 'groups')); } /** @@ -139,13 +133,14 @@ class CustomerController extends Controller 'date_of_birth' => 'date|before:today', ]); - $data = request()->all(); + Event::dispatch('customer.update.before', $id); + + $customer = $this->customerRepository->update(array_merge(request()->all(), [ + 'status' => request()->has('status'), + 'is_suspended' => request()->has('is_suspended'), + ]), $id); - $data['status'] = ! isset($data['status']) ? 0 : 1; - - $data['is_suspended'] = ! isset($data['is_suspended']) ? 0 : 1; - - $this->customerRepository->update($data, $id); + Event::dispatch('customer.update.after', $customer); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer'])); @@ -199,15 +194,15 @@ class CustomerController extends Controller 'notes' => 'string|nullable', ]); - $customer = $this->customerRepository->find(request()->input('_customer')); + Event::dispatch('customer.update.before', request()->input('_customer')); - $noteTaken = $customer->update(['notes' => request()->input('notes')]); + $customer = $this->customerRepository->update([ + 'notes' => request()->input('notes'), + ], request()->input('_customer')); - if ($noteTaken) { - session()->flash('success', 'Note taken'); - } else { - session()->flash('error', 'Note cannot be taken'); - } + Event::dispatch('customer.update.after', $customer); + + session()->flash('success', 'Note taken'); return redirect()->route($this->_config['redirect']); } @@ -220,12 +215,17 @@ class CustomerController extends Controller public function massUpdate() { $customerIds = explode(',', request()->input('indexes')); + $updateOption = request()->input('update-options'); foreach ($customerIds as $customerId) { - $customer = $this->customerRepository->find($customerId); + Event::dispatch('customer.update.before', $customerId); - $customer->update(['status' => $updateOption]); + $customer = $this->customerRepository->update([ + 'status' => $updateOption, + ], $customerId); + + Event::dispatch('customer.update.after', $customer); } session()->flash('success', trans('admin::app.customers.customers.mass-update-success')); @@ -243,9 +243,12 @@ class CustomerController extends Controller $customerIds = explode(',', request()->input('indexes')); if (! $this->customerRepository->checkBulkCustomerIfTheyHaveOrderPendingOrProcessing($customerIds)) { - foreach ($customerIds as $customerId) { - $this->customerRepository->deleteWhere(['id' => $customerId]); + Event::dispatch('customer.delete.before', $customerId); + + $this->customerRepository->delete($customerId); + + Event::dispatch('customer.delete.after', $customerId); } session()->flash('success', trans('admin::app.customers.customers.mass-destroy-success')); @@ -254,6 +257,7 @@ class CustomerController extends Controller } session()->flash('error', trans('admin::app.response.order-pending', ['name' => 'Customers'])); + return redirect()->back(); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index d43ad4fee..a95dd0090 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -2,6 +2,7 @@ namespace Webkul\Admin\Http\Controllers\Customer; +use Illuminate\Support\Facades\Event; use Webkul\Admin\DataGrids\CustomerGroupDataGrid; use Webkul\Admin\Http\Controllers\Controller; use Webkul\Customer\Repositories\CustomerGroupRepository; @@ -62,11 +63,13 @@ class CustomerGroupController extends Controller 'name' => 'required', ]); - $data = request()->all(); + Event::dispatch('customer.customer_group.create.before'); - $data['is_user_defined'] = 1; + $customerGroup = $this->customerGroupRepository->create(array_merge(request()->all() , [ + 'is_user_defined' => 1, + ])); - $this->customerGroupRepository->create($data); + Event::dispatch('customer.customer_group.create.after', $customerGroup); session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer Group'])); @@ -99,7 +102,11 @@ class CustomerGroupController extends Controller 'name' => 'required', ]); - $this->customerGroupRepository->update(request()->all(), $id); + Event::dispatch('customer.customer_group.update.before', $id); + + $customerGroup = $this->customerGroupRepository->update(request()->all(), $id); + + Event::dispatch('customer.customer_group.update.after', $customerGroup); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group'])); @@ -116,21 +123,25 @@ class CustomerGroupController extends Controller { $customerGroup = $this->customerGroupRepository->findOrFail($id); - if ($customerGroup->is_user_defined == 0) { + if (! $customerGroup->is_user_defined) { return response()->json([ 'message' => trans('admin::app.customers.customers.group-default'), ], 400); } - if (count($customerGroup->customers) > 0) { + if ($customerGroup->customers->count()) { return response()->json([ 'message' => trans('admin::app.response.customer-associate', ['name' => 'Customer Group']), ], 400); } try { + Event::dispatch('customer.customer_group.delete.before', $id); + $this->customerGroupRepository->delete($id); + Event::dispatch('customer.customer_group.delete.after', $id); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Customer Group'])]); } catch (\Exception $e) {} diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php index a207ff302..beeb9298e 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php @@ -20,9 +20,7 @@ class ExportController extends Controller $gridName = explode('\\', $criteria['gridName']); - $path = '\Webkul\Admin\DataGrids' . '\\' . last($gridName); - - $gridInstance = app($path); + $gridInstance = app('\Webkul\Admin\DataGrids' . '\\' . last($gridName)); $records = $gridInstance->export(); @@ -34,9 +32,7 @@ class ExportController extends Controller if ($format == 'csv') { return Excel::download(new DataGridExport($records), last($gridName) . '.csv'); - } - - if ($format == 'xls') { + } elseif ($format == 'xls') { return Excel::download(new DataGridExport($records), last($gridName) . '.xlsx'); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index ff21aa646..172f3da6f 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -99,21 +99,21 @@ class InvoiceController extends Controller 'invoice.items.*' => 'required|numeric|min:0', ]); - $data = request()->all(); - - if (! $this->invoiceRepository->haveProductToInvoice($data)) { + if (! $this->invoiceRepository->haveProductToInvoice(request()->all())) { session()->flash('error', trans('admin::app.sales.invoices.product-error')); return redirect()->back(); } - if (! $this->invoiceRepository->isValidQuantity($data)) { + if (! $this->invoiceRepository->isValidQuantity(request()->all())) { session()->flash('error', trans('admin::app.sales.invoices.invalid-qty')); return redirect()->back(); } - $this->invoiceRepository->create(array_merge($data, ['order_id' => $orderId])); + $this->invoiceRepository->create(array_merge(request()->all(), [ + 'order_id' => $orderId, + ])); session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Invoice'])); @@ -148,15 +148,9 @@ class InvoiceController extends Controller $invoice = $this->invoiceRepository->findOrFail($id); - if ($invoice) { - $this->sendDuplicateInvoiceMail($invoice, $request->email); + $this->sendDuplicateInvoiceMail($invoice, $request->email); - session()->flash('success', __('admin::app.sales.invoices.invoice-sent')); - - return redirect()->back(); - } - - session()->flash('error', __('admin::app.response.something-went-wrong')); + session()->flash('success', trans('admin::app.sales.invoices.invoice-sent')); return redirect()->back(); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php index 7708bffe6..2132d9cca 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php @@ -86,15 +86,12 @@ class OrderController extends Controller */ public function comment($id) { - $data = array_merge(request()->all(), [ - 'order_id' => $id, - ]); + Event::dispatch('sales.order.comment.create.before'); - $data['customer_notified'] = isset($data['customer_notified']) ? 1 : 0; - - Event::dispatch('sales.order.comment.create.before', $data); - - $comment = $this->orderCommentRepository->create($data); + $comment = $this->orderCommentRepository->create(array_merge(request()->all(), [ + 'order_id' => $id, + 'customer_notified' => request()->has('customer_notified'), + ])); Event::dispatch('sales.order.comment.create.after', $comment); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php index feae119ba..8bdf6bba4 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php @@ -96,7 +96,9 @@ class ShipmentController extends Controller return redirect()->back(); } - $this->shipmentRepository->create(array_merge($data, ['order_id' => $orderId])); + $this->shipmentRepository->create(array_merge($data, [ + 'order_id' => $orderId, + ])); session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Shipment'])); @@ -141,7 +143,10 @@ class ShipmentController extends Controller ->where('inventory_source_id', $inventorySourceId) ->sum('qty'); - if ($child->qty_to_ship < $finalQty || $availableQty < $finalQty) { + if ( + $child->qty_to_ship < $finalQty + || $availableQty < $finalQty + ) { return false; } } @@ -150,7 +155,10 @@ class ShipmentController extends Controller ->where('inventory_source_id', $inventorySourceId) ->sum('qty'); - if ($orderItem->qty_to_ship < $qty || $availableQty < $qty) { + if ( + $orderItem->qty_to_ship < $qty + || $availableQty < $qty + ) { return false; } } diff --git a/packages/Webkul/Admin/src/Listeners/PasswordChange.php b/packages/Webkul/Admin/src/Listeners/PasswordChange.php index 88fedf523..6f0a0e919 100644 --- a/packages/Webkul/Admin/src/Listeners/PasswordChange.php +++ b/packages/Webkul/Admin/src/Listeners/PasswordChange.php @@ -5,6 +5,8 @@ namespace Webkul\Admin\Listeners; use Illuminate\Support\Facades\Mail; use Webkul\User\Notifications\AdminUpdatePassword; use Webkul\Customer\Notifications\CustomerUpdatePassword; +use Webkul\Customer\Models\Customer; +use Webkul\User\Models\Admin; class PasswordChange { @@ -17,11 +19,9 @@ class PasswordChange public function sendUpdatePasswordMail($adminOrCustomer) { try { - if ($adminOrCustomer instanceof \Webkul\Customer\Models\Customer) { + if ($adminOrCustomer instanceof Customer) { Mail::queue(new CustomerUpdatePassword($adminOrCustomer)); - } - - if ($adminOrCustomer instanceof \Webkul\User\Models\Admin) { + } elseif ($adminOrCustomer instanceof Admin) { Mail::queue(new AdminUpdatePassword($adminOrCustomer)); } } catch (\Exception $e) { diff --git a/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php b/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php index b7f671107..0022c9574 100644 --- a/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php +++ b/packages/Webkul/Admin/src/Mail/CancelOrderAdminNotification.php @@ -21,8 +21,8 @@ class CancelOrderAdminNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to(core()->getAdminEmailDetails()['email']) - ->subject(trans('shop::app.mail.order.cancel.subject')) - ->view('shop::emails.sales.order-cancel-admin'); + ->to(core()->getAdminEmailDetails()['email']) + ->subject(trans('shop::app.mail.order.cancel.subject')) + ->view('shop::emails.sales.order-cancel-admin'); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php index 2cb0810a0..f649be5a2 100644 --- a/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/CancelOrderNotification.php @@ -22,8 +22,8 @@ class CancelOrderNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($this->order->customer_email, $this->order->customer_full_name) - ->subject(trans('shop::app.mail.order.cancel.subject')) - ->view('shop::emails.sales.order-cancel'); + ->to($this->order->customer_email, $this->order->customer_full_name) + ->subject(trans('shop::app.mail.order.cancel.subject')) + ->view('shop::emails.sales.order-cancel'); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php index dda983a65..6d7569fe9 100755 --- a/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/DuplicateInvoiceNotification.php @@ -21,7 +21,8 @@ class DuplicateInvoiceNotification extends Mailable public $invoice, public $customerEmail ) - {} + { + } /** * Build the message. diff --git a/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php b/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php index ecf78ed9d..02a81fb9b 100644 --- a/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php +++ b/packages/Webkul/Admin/src/Mail/InvoiceOverdueReminder.php @@ -16,12 +16,15 @@ class InvoiceOverdueReminder extends Mailable * * @param \Webkul\Customer\Contracts\Customer $customer * @param \Webkul\Sales\Contracts\Invoice $invoice + * @return void */ public function __construct( public $customer, public $invoice ) - {} + { + + } /** * Build the message. @@ -31,8 +34,11 @@ class InvoiceOverdueReminder extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($this->customer->email) - ->subject(trans('shop::app.mail.invoice.reminder.subject')) - ->view('shop::emails.customer.invoice-reminder')->with(['customer' => $this->customer, 'invoice' => $this->invoice]); + ->to($this->customer->email) + ->subject(trans('shop::app.mail.invoice.reminder.subject')) + ->view('shop::emails.customer.invoice-reminder')->with([ + 'customer' => $this->customer, + 'invoice' => $this->invoice, + ]); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php index 48698f43d..a410568bd 100644 --- a/packages/Webkul/Admin/src/Mail/NewAdminNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewAdminNotification.php @@ -29,8 +29,8 @@ class NewAdminNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to(core()->getAdminEmailDetails()['email']) - ->subject(trans('shop::app.mail.order.subject')) - ->view('shop::emails.sales.new-admin-order'); + ->to(core()->getAdminEmailDetails()['email']) + ->subject(trans('shop::app.mail.order.subject')) + ->view('shop::emails.sales.new-admin-order'); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php index a18d67d4d..098503230 100644 --- a/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewCustomerNotification.php @@ -33,8 +33,11 @@ class NewCustomerNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($this->customer->email) - ->subject(trans('shop::app.mail.customer.new.subject')) - ->view('shop::emails.customer.new-customer')->with(['customer' => $this->customer, 'password' => $this->password]); + ->to($this->customer->email) + ->subject(trans('shop::app.mail.customer.new.subject')) + ->view('shop::emails.customer.new-customer')->with([ + 'customer' => $this->customer, + 'password' => $this->password, + ]); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php index 69ed8ec76..f5bad5910 100644 --- a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php @@ -33,8 +33,8 @@ class NewInventorySourceNotification extends Mailable $inventory = $this->shipment->inventory_source; return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($inventory->contact_email, $inventory->name) - ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id])) - ->view('shop::emails.sales.new-inventorysource-shipment'); + ->to($inventory->contact_email, $inventory->name) + ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id])) + ->view('shop::emails.sales.new-inventorysource-shipment'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php index 1b65ed80b..482d74bda 100755 --- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php @@ -31,8 +31,8 @@ class NewInvoiceNotification extends Mailable $order = $this->invoice->order; return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($order->customer_email, $order->customer_full_name) - ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id])) - ->view('shop::emails.sales.new-invoice'); + ->to($order->customer_email, $order->customer_full_name) + ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_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 a9d8a2f35..b4ed0717e 100755 --- a/packages/Webkul/Admin/src/Mail/NewOrderNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewOrderNotification.php @@ -29,8 +29,8 @@ class NewOrderNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($this->order->customer_email, $this->order->customer_full_name) - ->subject(trans('shop::app.mail.order.subject')) - ->view('shop::emails.sales.new-order'); + ->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/NewRefundNotification.php b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php index 9b9ecd59b..e54a214a5 100644 --- a/packages/Webkul/Admin/src/Mail/NewRefundNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewRefundNotification.php @@ -31,8 +31,8 @@ class NewRefundNotification extends Mailable $order = $this->refund->order; return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($order->customer_email, $order->customer_full_name) - ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id])) - ->view('shop::emails.sales.new-refund'); + ->to($order->customer_email, $order->customer_full_name) + ->subject(trans('shop::app.mail.refund.subject', ['order_id' => $order->increment_id])) + ->view('shop::emails.sales.new-refund'); } } diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php index a2fda88ea..2efff6bb0 100755 --- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php +++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php @@ -31,8 +31,8 @@ class NewShipmentNotification extends Mailable $order = $this->shipment->order; return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($order->customer_email, $order->customer_full_name) - ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id])) - ->view('shop::emails.sales.new-shipment'); + ->to($order->customer_email, $order->customer_full_name) + ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id])) + ->view('shop::emails.sales.new-shipment'); } } diff --git a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php index 8f1bb23fe..e7987813b 100644 --- a/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php +++ b/packages/Webkul/Admin/src/Mail/OrderCommentNotification.php @@ -29,8 +29,8 @@ class OrderCommentNotification extends Mailable public function build() { return $this->from(core()->getSenderEmailDetails()['email'], core()->getSenderEmailDetails()['name']) - ->to($this->comment->order->customer_email, $this->comment->order->customer_full_name) - ->subject(trans('shop::app.mail.order.comment.subject', ['order_id' => $this->comment->order->increment_id])) - ->view('shop::emails.sales.new-order-comment'); + ->to($this->comment->order->customer_email, $this->comment->order->customer_full_name) + ->subject(trans('shop::app.mail.order.comment.subject', ['order_id' => $this->comment->order->increment_id])) + ->view('shop::emails.sales.new-order-comment'); } } diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index cf9b31262..191a9b198 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -105,13 +105,15 @@ class AdminServiceProvider extends ServiceProvider && substr_count($item['key'], '.') == 1 ) { foreach ($allowedPermissions as $key => $value) { - if ($item['key'] == $value) { - $neededItem = $allowedPermissions[$key + 1]; + if ($item['key'] != $value) { + continue; + } - foreach (config('menu.admin') as $key1 => $findMatced) { - if ($findMatced['key'] == $neededItem) { - $item['route'] = $findMatced['route']; - } + $neededItem = $allowedPermissions[$key + 1]; + + foreach (config('menu.admin') as $key1 => $findMatced) { + if ($findMatced['key'] == $neededItem) { + $item['route'] = $findMatced['route']; } } } diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 1aeedf276..6cd443f6d 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -741,6 +741,7 @@ return [ 'no' => 'لا.', 'delete' => 'احذف', 'enable-atleast-one-shipping' => 'تفعيل طريقة شحن واحدة على الأقل.', + 'enable-atleast-one-payment' => 'تفعيل طريقة دفع واحدة على الأقل.', 'tax-categories' => [ 'title' => 'فئات الضرائب', diff --git a/packages/Webkul/Admin/src/Resources/lang/ben/app.php b/packages/Webkul/Admin/src/Resources/lang/ben/app.php index 77448dff2..e7e49895c 100755 --- a/packages/Webkul/Admin/src/Resources/lang/ben/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ben/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index 41d97363f..8464f51ec 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -733,6 +733,8 @@ return [ 'no' => 'Nein', 'delete' => 'Löschen', 'enable-atleast-one-shipping' => 'Aktivieren Sie mindestens eine Versandart.', + 'enable-atleast-one-payment' => 'Aktivieren Sie mindestens eine Zahlungsmethode.', + 'tax-categories' => [ 'title' => 'Steuerkategorien', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 717289e16..d0b424078 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 8fbbd231b..9c476bbd6 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -743,6 +743,7 @@ return [ 'no' => 'No', 'delete' => 'Borrar', 'enable-atleast-one-shipping' => 'Habilite al menos un método de envío.', + 'enable-atleast-one-payment' => 'Habilite al menos un método de pago.', 'tax-categories' => [ 'title' => 'Categorías de impuestos', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index 2552c5604..73a99b29e 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -726,6 +726,7 @@ return [ 'no' => 'خیر', 'delete' => 'حذف', 'enable-atleast-one-shipping' => 'حداقل یک روش حمل و نقل را فعال کنید.', + 'enable-atleast-one-payment' => 'حداقل یک روش پرداخت را فعال کنید.', 'tax-categories' => [ 'title' => 'دسته بندی های مالیات', diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php index eef6b4329..d9b73ca56 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php @@ -746,6 +746,7 @@ return [ 'no' => 'Non', 'delete' => 'Effacer', 'enable-atleast-one-shipping' => 'Activez au moins une méthode d\'expédition.', + 'enable-atleast-one-payment' => 'Activez au moins un mode de paiement.', 'tax-categories' => [ 'title' => 'Catégories de taxes', diff --git a/packages/Webkul/Admin/src/Resources/lang/he/app.php b/packages/Webkul/Admin/src/Resources/lang/he/app.php index 9a3e6c5c5..465b9f38e 100755 --- a/packages/Webkul/Admin/src/Resources/lang/he/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/he/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php index e0ab49092..6b1b06284 100644 --- a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php @@ -744,6 +744,7 @@ return [ 'no' => 'नहीं', 'delete' => 'हटाएं', 'enable-atleast-one-shipping' => 'कम से कम एक शिपिंग विधि सक्षम करें।', + 'enable-atleast-one-payment' => 'कम से कम एक भुगतान विधि सक्षम करें।', 'tax-categories' => [ 'title' => 'कर श्रेणियाँ', diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 99b44dcdb..11e97d155 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -731,6 +731,7 @@ return [ 'no' => 'No', 'delete' => 'Elimina', 'enable-atleast-one-shipping' => 'Abilita almeno un metodo di spedizione.', + 'enable-atleast-one-payment' => 'Abilita almeno un metodo di pagamento.', 'tax-categories' => [ 'title' => 'Categorie IVA', diff --git a/packages/Webkul/Admin/src/Resources/lang/ja/app.php b/packages/Webkul/Admin/src/Resources/lang/ja/app.php index 77448dff2..e7e49895c 100755 --- a/packages/Webkul/Admin/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ja/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index 083550640..d2f7bea34 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -725,6 +725,7 @@ return [ 'no' => 'Nee', 'delete' => 'Verwijder', 'enable-atleast-one-shipping' => 'Schakel ten minste één verzendmethode in.', + 'enable-atleast-one-payment' => 'Schakel ten minste één betaalmethode in.', 'tax-categories' => [ 'title' => 'BTW categorieën', diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index c4a3e59f7..61673a80e 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -726,6 +726,7 @@ return [ 'no' => 'Nie', 'delete' => 'Usuń', 'enable-atleast-one-shipping' => 'Włącz co najmniej jedną metodę wysyłki.', + 'enable-atleast-one-payment' => 'Włącz co najmniej jedną formę płatności.', 'tax-categories' => [ 'title' => 'Kategorie podatkowe', 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 f833f3d57..ecb856529 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -724,6 +724,7 @@ return [ 'no' => 'Não', 'delete' => 'Deletar', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Categorias de Imposto', diff --git a/packages/Webkul/Admin/src/Resources/lang/ru/app.php b/packages/Webkul/Admin/src/Resources/lang/ru/app.php index 1a0777462..5bc5d7715 100755 --- a/packages/Webkul/Admin/src/Resources/lang/ru/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ru/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Включите хотя бы один способ доставки.', + 'enable-atleast-one-payment' => 'Включите хотя бы один способ оплаты.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/sin/app.php b/packages/Webkul/Admin/src/Resources/lang/sin/app.php index 9a3e6c5c5..465b9f38e 100755 --- a/packages/Webkul/Admin/src/Resources/lang/sin/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/sin/app.php @@ -747,6 +747,7 @@ return [ 'no' => 'No', 'delete' => 'Delete', 'enable-atleast-one-shipping' => 'Enable atleast one shipping method.', + 'enable-atleast-one-payment' => 'Enable atleast one payment method.', 'tax-categories' => [ 'title' => 'Tax Categories', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index b0e61d9b4..b1c3a8bc2 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -731,6 +731,7 @@ return [ 'no' => 'Hayır', 'delete' => 'Sil', 'enable-atleast-one-shipping' => 'En az bir gönderim yöntemini etkinleştirin.', + 'enable-atleast-one-payment' => 'En az bir ödeme yöntemini etkinleştirin.', 'tax-categories' => [ 'title' => 'Vergi Kategorileri', diff --git a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php index e543b9eba..1453c404d 100644 --- a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php @@ -726,6 +726,7 @@ return [ 'no' => 'No', 'delete' => '删除', 'enable-atleast-one-shipping' => '啟用至少一種運輸方式', + 'enable-atleast-one-payment' => '啟用至少一種付款方式。', 'tax-categories' => [ 'title' => '税分类', 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 e5dca9f71..9e4139a5b 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php @@ -240,7 +240,7 @@