merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #878 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-04-25 17:53:09 +05:30 committed by GitHub
parent 35a3116178 5e6131102b
commit c4efa7b093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=06de778dcb866c46c8e9",
"/js/admin.js": "/js/admin.js?id=d71088ad6eb332aa8de1",
"/css/admin.css": "/css/admin.css?id=a226571863dbe544b173"
}

4
packages/Webkul/Admin/src/Resources/assets/js/app.js vendored
View File

@ -28,8 +28,8 @@ window.onload = function () {
if(pageContentHeight <= innerSectionHeight - 60) {
$('.navbar-left').css("position","absolute");
$('.content').css({"position": "fixed", "width": "65%"});
$('.content-wrapper').css({"position": "sticky", "top": "60px"});
// $('.content').css({"position": "fixed", "width": "65%"});
// $('.content-wrapper').css({"position": "sticky", "top": "60px"});
}
else {
$('.accordian-header').on('click',function(event) {

2
packages/Webkul/Ui/src/Resources/lang/en/app.php
View File

@ -7,7 +7,7 @@ return [
'massaction' => [
'mass-delete-confirm' => 'Do you really want to delete these selected :resource?',
'mass-update-status' => 'Do you really want to update status of these selected :resource?',
'delete' => 'Do you really want to delete this :resource?',
'delete' => 'Do you really want to perform this action?',
'edit' => 'Do you really want to edit this :resource?',
],

24
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -703,17 +703,21 @@
doAction(e) {
var element = e.currentTarget;
axios.post(element.getAttribute('data-action'), {
_token : element.getAttribute('data-token'),
_method : element.getAttribute('data-method')
}).then(function(response) {
this.result = response;
location.reload();
}).catch(function (error) {
location.reload();
});
if (confirm('{{__('ui::app.datagrid.massaction.delete') }}')) {
axios.post(element.getAttribute('data-action'), {
_token : element.getAttribute('data-token'),
_method : element.getAttribute('data-method')
}).then(function(response) {
this.result = response;
location.reload();
}).catch(function (error) {
location.reload();
});
e.preventDefault();
e.preventDefault();
} else {
e.preventDefault();
}
},
removeMassActions() {