Merge pull request #2272 from rahulshukla-webkul/development
Development
This commit is contained in:
Jitendra Singh
GitHub
commit
781d826099
|
|
@ -146,7 +146,7 @@ class AttributeDataGrid extends DataGrid
|
|||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'action' => route('admin.catalog.attributes.massdelete'),
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'index' => 'admin_name',
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ class CMSPageDataGrid extends DataGrid
|
|||
{
|
||||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'action' => route('admin.cms.mass-delete'),
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class CartRuleCouponsDataGrid extends DataGrid
|
|||
// $this->addMassAction([
|
||||
// 'type' => 'delete',
|
||||
// 'action' => route('admin.catalog.attributes.massdelete'),
|
||||
// 'label' => 'Delete',
|
||||
// 'label' => trans('admin::app.datagrid.delete'),
|
||||
// 'method' => 'DELETE'
|
||||
// ]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -161,14 +161,14 @@ class CustomerDataGrid extends DataGrid
|
|||
{
|
||||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'action' => route('admin.customer.mass-delete'),
|
||||
'method' => 'PUT',
|
||||
]);
|
||||
|
||||
$this->addMassAction([
|
||||
'type' => 'update',
|
||||
'label' => 'Update Status',
|
||||
'label' => trans('admin::app.datagrid.update-status'),
|
||||
'action' => route('admin.customer.mass-update'),
|
||||
'method' => 'PUT',
|
||||
'options' => [
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class CustomerGroupDataGrid extends DataGrid
|
|||
{
|
||||
$this->addColumn([
|
||||
'index' => 'id',
|
||||
'label' => 'ID',
|
||||
'label' => trans('admin::app.datagrid.id'),
|
||||
'type' => 'number',
|
||||
'searchable' => false,
|
||||
'sortable' => true,
|
||||
|
|
@ -37,7 +37,7 @@ class CustomerGroupDataGrid extends DataGrid
|
|||
|
||||
$this->addColumn([
|
||||
'index' => 'code',
|
||||
'label' => 'Code',
|
||||
'label' => trans('admin::app.datagrid.code'),
|
||||
'type' => 'string',
|
||||
'searchable' => false,
|
||||
'sortable' => true,
|
||||
|
|
@ -46,7 +46,7 @@ class CustomerGroupDataGrid extends DataGrid
|
|||
|
||||
$this->addColumn([
|
||||
'index' => 'name',
|
||||
'label' => 'Name',
|
||||
'label' => trans('admin::app.datagrid.name'),
|
||||
'type' => 'string',
|
||||
'searchable' => true,
|
||||
'sortable' => true,
|
||||
|
|
|
|||
|
|
@ -109,14 +109,14 @@ class CustomerReviewDataGrid extends DataGrid
|
|||
public function prepareMassActions() {
|
||||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'action' => route('admin.customer.review.massdelete'),
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
|
||||
$this->addMassAction([
|
||||
'type' => 'update',
|
||||
'label' => 'Update Status',
|
||||
'label' => trans('admin::app.datagrid.update-status'),
|
||||
'action' => route('admin.customer.review.massupdate'),
|
||||
'method' => 'PUT',
|
||||
'options' => [
|
||||
|
|
|
|||
|
|
@ -180,14 +180,14 @@ class ProductDataGrid extends DataGrid
|
|||
public function prepareMassActions() {
|
||||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'action' => route('admin.catalog.products.massdelete'),
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
|
||||
$this->addMassAction([
|
||||
'type' => 'update',
|
||||
'label' => 'Update Status',
|
||||
'label' => trans('admin::app.datagrid.update-status'),
|
||||
'action' => route('admin.catalog.products.massupdate'),
|
||||
'method' => 'PUT',
|
||||
'options' => [
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@ return [
|
|||
'refunded' => 'Refunded',
|
||||
'rtl' => 'RTL',
|
||||
'ltr' => 'LTR',
|
||||
'update-status' => 'Update Status'
|
||||
],
|
||||
|
||||
'account' => [
|
||||
|
|
|
|||
|
|
@ -216,6 +216,7 @@ return [
|
|||
'delete' => 'Delete',
|
||||
'rtl' => 'RTL',
|
||||
'ltr' => 'LTR',
|
||||
'update-status' => 'Update Status'
|
||||
],
|
||||
|
||||
'account' => [
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ return [
|
|||
'refunded' => 'Refunded',
|
||||
'rtl' => 'RTL',
|
||||
'ltr' => 'LTR',
|
||||
'update-status' => 'Update Status'
|
||||
],
|
||||
|
||||
'account' => [
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ return [
|
|||
'refunded' => 'Refunded',
|
||||
'rtl' => 'RTL',
|
||||
'ltr' => 'LTR',
|
||||
'update-status' => 'Update Status'
|
||||
],
|
||||
'account' => [
|
||||
'title' => 'Minha Conta',
|
||||
|
|
|
|||
|
|
@ -74,9 +74,11 @@
|
|||
<span class="control-error" v-if="errors.has('root_category_id')">@{{ errors.first('root_category_id') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group" :class="[errors.has('hostname') ? 'has-error' : '']">
|
||||
<label for="hostname">{{ __('admin::app.settings.channels.hostname') }}</label>
|
||||
<input class="control" id="hostname" name="hostname" value="{{ old('hostname') }}" placeholder="https://www.example.com"/>
|
||||
<input class="control" v-validate="''" id="hostname" name="hostname" value="{{ old('hostname') }}" placeholder="https://www.example.com"/>
|
||||
|
||||
<span class="control-error" v-if="errors.has('hostname')">@{{ errors.first('hostname') }}</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -78,9 +78,11 @@
|
|||
<span class="control-error" v-if="errors.has('root_category_id')">@{{ errors.first('root_category_id') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group" :class="[errors.has('hostname') ? 'has-error' : '']">
|
||||
<label for="hostname">{{ __('admin::app.settings.channels.hostname') }}</label>
|
||||
<input type="text" class="control" id="hostname" name="hostname" value="{{ $channel->hostname }}" placeholder="https://www.example.com"/>
|
||||
<input type="text" v-validate="''" class="control" id="hostname" name="hostname" value="{{ $channel->hostname }}" placeholder="https://www.example.com"/>
|
||||
|
||||
<span class="control-error" v-if="errors.has('hostname')">@{{ errors.first('hostname') }}</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -79,7 +79,8 @@ class ChannelController extends Controller
|
|||
'favicon.*' => 'mimes:jpeg,jpg,bmp,png',
|
||||
'seo_title' => 'required|string',
|
||||
'seo_description' => 'required|string',
|
||||
'seo_keywords' => 'required|string'
|
||||
'seo_keywords' => 'required|string',
|
||||
'hostname' => 'unique:channels,hostname',
|
||||
]);
|
||||
|
||||
$data = request()->all();
|
||||
|
|
@ -138,7 +139,8 @@ class ChannelController extends Controller
|
|||
'base_currency_id' => 'required',
|
||||
'root_category_id' => 'required',
|
||||
'logo.*' => 'mimes:jpeg,jpg,bmp,png',
|
||||
'favicon.*' => 'mimes:jpeg,jpg,bmp,png'
|
||||
'favicon.*' => 'mimes:jpeg,jpg,bmp,png',
|
||||
'hostname' => 'unique:channels,hostname,' . $id,
|
||||
]);
|
||||
|
||||
$data = request()->all();
|
||||
|
|
|
|||
|
|
@ -15,5 +15,7 @@ return [
|
|||
'filter-fields-missing' => 'بعض الحقل المطلوب هو لاغ ، رجاء تفقد عمود ، حالة و قيمة صحيح',
|
||||
'click_on_action' => 'هل تريد حقا أن تؤدي هذا العمل؟',
|
||||
'items-per-page' => 'Items Per Page',
|
||||
'value-here' => 'Value here',
|
||||
'numeric-value-here' => 'Numeric Value here'
|
||||
]
|
||||
];
|
||||
|
|
@ -37,5 +37,7 @@ return [
|
|||
'between' => 'Is between',
|
||||
'apply' => 'Apply',
|
||||
'items-per-page' => 'Items Per Page',
|
||||
'value-here' => 'Value here',
|
||||
'numeric-value-here' => 'Numeric Value here'
|
||||
]
|
||||
];
|
||||
|
|
@ -33,5 +33,7 @@ return [
|
|||
'between' => 'ما بین',
|
||||
'apply' => 'درخواست',
|
||||
'items-per-page' => 'Items Per Page',
|
||||
'value-here' => 'Value here',
|
||||
'numeric-value-here' => 'Numeric Value here'
|
||||
]
|
||||
];
|
||||
|
|
|
|||
|
|
@ -33,5 +33,7 @@ return [
|
|||
'between' => 'Está entre',
|
||||
'apply' => 'Aplicar',
|
||||
'items-per-page' => 'Items Per Page',
|
||||
'value-here' => 'Value here',
|
||||
'numeric-value-here' => 'Numeric Value here'
|
||||
]
|
||||
];
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
{{-- Response fields based on the type of columns to be filtered --}}
|
||||
<li v-if='stringCondition != null'>
|
||||
<div class="control-group">
|
||||
<input type="text" class="control response-string" placeholder="Value here" v-model="stringValue" />
|
||||
<input type="text" class="control response-string" placeholder="{{ __('ui::app.datagrid.value-here') }}" v-model="stringValue" />
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
<li v-if='numberCondition != null'>
|
||||
<div class="control-group">
|
||||
<input type="number" class="control response-number" placeholder="Numeric Value here" v-model="numberValue"/>
|
||||
<input type="number" class="control response-number" placeholder="{{ __('ui::app.datagrid.numeric-value-here') }}" v-model="numberValue"/>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class CategoryDataGrid extends DataGrid
|
|||
public function prepareQueryBuilder()
|
||||
{
|
||||
$defaultChannel = core()->getCurrentChannel();
|
||||
|
||||
|
||||
$queryBuilder = DB::table('velocity_category as v_cat')
|
||||
->select('v_cat.id as category_menu_id', 'v_cat.category_id', 'ct.name', 'v_cat.icon', 'v_cat.tooltip', 'v_cat.status')
|
||||
->leftJoin('categories as c', 'c.id', '=', 'v_cat.category_id')
|
||||
|
|
@ -109,7 +109,7 @@ class CategoryDataGrid extends DataGrid
|
|||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'action' => route('velocity.admin.category.mass-delete'),
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ class ContentDataGrid extends DataGrid
|
|||
$this->addMassAction([
|
||||
'type' => 'delete',
|
||||
'action' => route('velocity.admin.content.mass-delete'),
|
||||
'label' => 'Delete',
|
||||
'label' => trans('admin::app.datagrid.delete'),
|
||||
'method' => 'DELETE'
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue