TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

issues fixes #320 #288 #309

This commit is contained in:
rahul shukla 2019-01-02 20:12:49 +05:30
parent 29ab4f1da9
commit 0bf6699746
14 changed files with 97 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
View File

@ -106,7 +106,12 @@ class CustomerDataGrid
'alias' => 'CustomerGroupName',
'type' => 'string',
'label' => 'Group Name',
]
], [
'column' => 'CONCAT(first_name, " ", last_name)',
'alias' => 'Name',
'type' => 'string',
'label' => 'Name',
],
],
//don't use aliasing in case of searchables

5
packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
View File

@ -133,6 +133,11 @@ class OrderDataGrid
'alias' => 'createdat',
'type' => 'datetime',
'label' => 'Order Date',
], [
'column' => 'CONCAT(or.customer_first_name, " ", or.customer_last_name)',
'alias' => 'oafirstname',
'type' => 'string',
'label' => 'Billed To',
],
],

15
packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
View File

@ -101,6 +101,21 @@ class OrderInvoicesDataGrid
'alias' => 'invid',
'type' => 'number',
'label' => 'ID',
], [
'column' => 'inv.order_id',
'alias' => 'invorderid',
'type' => 'number',
'label' => 'Order ID',
], [
'column' => 'inv.state',
'alias' => 'invstate',
'type' => 'string',
'label' => 'State',
], [
'column' => 'inv.grand_total',
'alias' => 'invgrandtotal',
'type' => 'number',
'label' => 'Amount',
], [
'column' => 'inv.created_at',
'alias' => 'invcreated_at',

6
packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
View File

@ -116,7 +116,7 @@ class CustomerController extends Controller
$this->customer->create($data);
session()->flash('success', 'Customer created successfully.');
session()->flash('success', trans('admin::app.customers.customers.created'));
return redirect()->route($this->_config['redirect']);
}
@ -159,7 +159,7 @@ class CustomerController extends Controller
$this->customer->update(request()->all(),$id);
session()->flash('success', 'Customer updated successfully.');
session()->flash('success', trans('admin::app.customers.customers.updated'));
return redirect()->route($this->_config['redirect']);
}
@ -174,7 +174,7 @@ class CustomerController extends Controller
{
$this->customer->delete($id);
session()->flash('success', 'Customer deleted successfully.');
session()->flash('success', trans('admin::app.customers.customers.deleted'));
return redirect()->back();
}

8
packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
View File

@ -81,7 +81,7 @@ class CustomerGroupController extends Controller
$this->customerGroup->create($data);
session()->flash('success', 'Customer Group created successfully.');
session()->flash('success', trans('admin::app.customers.customers.group-created'));
return redirect()->route($this->_config['redirect']);
}
@ -114,7 +114,7 @@ class CustomerGroupController extends Controller
$this->customerGroup->update(request()->all(),$id);
session()->flash('success', 'Customer Group updated successfully.');
session()->flash('success', trans('admin::app.customers.customers.group-updated'));
return redirect()->route($this->_config['redirect']);
}
@ -130,9 +130,9 @@ class CustomerGroupController extends Controller
$group = $this->customerGroup->findOneByField('id', $id);
if($group->is_user_defined == 0) {
session()->flash('warning', 'Cannot delete the default group');
session()->flash('warning', trans('admin::app.customers.customers.group-default'));
} else {
session()->flash('success', 'Customer Group deleted successfully');
session()->flash('success', trans('admin::app.customers.customers.group-deleted'));
$this->customerGroup->delete($id);
}

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

@ -574,7 +574,14 @@ return [
'select-state' => 'Select a region, state or province.',
'country' => 'Country',
'male' => 'Male',
'female' => 'Female'
'female' => 'Female',
'created' => 'Customer created successfully.',
'updated' => 'Customer updated successfully.',
'deleted' => 'Customer deleted successfully.',
'group-created' => 'Customer Group created successfully.',
'group-updated' => 'Customer Group updated successfully.',
'group-deleted' => 'Customer Group deleted successfully.',
'group-default' => 'Cannot delete the default group.',
],
'reviews' => [
'title' => 'Reviews',

2
packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
View File

@ -169,7 +169,7 @@ class AttributeFamilyController extends Controller
}
if (!$suppressFlash)
session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success'));
session()->flash('success', ('admin::app.datagrid.mass-ops.delete-success'));
else
session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'Attribute Family']));

6
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

8
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,10 +1,4 @@
{
<<<<<<< HEAD
"/js/shop.js": "/js/shop.js?id=0e3e1ea03fe1f7358aaa",
"/css/shop.css": "/css/shop.css?id=d6b0cd4b3af8277a77b1"
"/css/shop.css": "/css/shop.css?id=4bdb6dfb99c5788a9dc4"
}
=======
"/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
"/css/shop.css": "/css/shop.css?id=7aa91d217344fc8f4f53"
}
>>>>>>> 4e89ce082ea6e0282b569e4928016771b99a8f56

2
packages/Webkul/Shop/src/Resources/views/products/index.blade.php
View File

@ -94,7 +94,7 @@
function sortFilter() {
var className = document.getElementById(this.id).className;
if(className === 'icon sort-icon') {
if (className === 'icon sort-icon') {
sort.classList.remove("sort-icon");
sort.classList.add("icon-menu-close-adj");

72
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -591,18 +591,27 @@ class DataGrid
if($count_keys==1)
$this->query->where(function ($query) use ($parsed) {
foreach ($this->searchable as $search) {
$query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
if (strpos($search['column'], 'CONCAT') !== false) {
$query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%');
} else {
$query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
}
}
});
} else {
$column_name = $this->findAlias($key);
if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
foreach ($value as $condition => $filter_value) {
$this->query->where(
$column_name,
$this->operators[$condition],
'%'.$filter_value.'%'
);
if (strpos($column_name, 'CONCAT') !== false) {
$this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
'%'.$filter_value.'%');
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
'%'.$filter_value.'%'
);
}
}
} else {
foreach ($value as $condition => $filter_value) {
@ -613,11 +622,16 @@ class DataGrid
$filter_value
);
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
$filter_value
);
if (strpos($column_name, 'CONCAT') !== false) {
$this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
$filter_value);
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
$filter_value
);
}
}
}
}
@ -646,7 +660,11 @@ class DataGrid
if($count_keys==1)
$this->query->where(function ($query) use ($parsed) {
foreach ($this->searchable as $search) {
$query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
if (strpos($search['column'], 'CONCAT') !== false) {
$query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%');
} else {
$query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
}
}
});
else
@ -659,11 +677,16 @@ class DataGrid
if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
foreach ($value as $condition => $filter_value) {
$this->query->where(
$column_name,
$this->operators[$condition],
'%'.$filter_value.'%'
);
if (strpos($column_name, 'CONCAT') !== false) {
$this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
'%'.$filter_value.'%');
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
'%'.$filter_value.'%'
);
}
}
} else {
foreach ($value as $condition => $filter_value) {
@ -674,11 +697,16 @@ class DataGrid
$filter_value
);
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
$filter_value
);
if (strpos($column_name, 'CONCAT') !== false) {
$this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
$filter_value);
} else {
$this->query->where(
$column_name,
$this->operators[$condition],
$filter_value
);
}
}
}
}

2
packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
View File

@ -46,14 +46,12 @@
$('.search-btn').click(function() {
search_value = $("#search-field").val();
alert(search_value);
formURL('search', 'all', search_value, params); //format for search
});
$(".search-field").on('keyup', function (e) {
if (e.keyCode == 13) {
search_value = $("#search-field").val();
alert(search_value);
formURL('search', 'all', search_value, params); //format for search
}
});

1
public/installer/Classes/vendor/bin/composer/.htaccess vendored Normal file
View File

@ -0,0 +1 @@
Deny from all

1
public/installer/Classes/vendor/bin/composer/cache/.htaccess vendored Normal file
View File

@ -0,0 +1 @@
Deny from all