shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2023-06-01 16:42:24 +03:00
parent b7fda70b98 f6872ca8c9
commit 1093aefa03
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Listeners/Email/SendInvalidEmailNotification.php
View File

@@ -10,7 +10,11 @@ class SendInvalidEmailNotification
{
public function handle(Event $event): void
{
$users = company()->users;
$users = company()?->users;
if (empty($users)) {
return;
}
$this->notifyAdminsAboutInvalidContactEmail($event, $users);

2
app/Models/Common/Item.php
View File

@@ -107,7 +107,7 @@ class Item extends Model
return $query;
}
return $query->whereIn('type', $type);
return $query->whereIn($this->qualifyColumn('type'), $type);
}
/**

2
app/Traits/Import.php
View File

@@ -323,7 +323,7 @@ trait Import
return $contact->id;
}
public function getItemIdFromName($row, $type)
public function getItemIdFromName($row, $type = 'product')
{
$item_id = Item::type($type)->where('name', $row['item_name'])->pluck('id')->first();

4
config/version.php
View File

@@ -10,13 +10,13 @@ return [
'minor' => '0',
'patch' => '14',
'patch' => '15',
'build' => '',
'status' => 'Stable',
'date' => '25-April-2023',
'date' => '31-May-2023',
'time' => '17:00',

11
resources/assets/js/mixins/global.js vendored
View File

@@ -469,6 +469,9 @@ export default {
onChangePaginationLimit(event) {
let path = '';
let split_href = window.location.href.split('#');
let href = split_href[0];
if (window.location.search.length) {
if (window.location.search.includes('limit')) {
let queries = [];
@@ -496,10 +499,14 @@ export default {
});
} else {
path = window.location.href + '&limit=' + event.target.getAttribute("value");
path = href + '&limit=' + event.target.getAttribute("value");
}
} else {
path = window.location.href + '?limit=' + event.target.getAttribute("value");
path = href + '?limit=' + event.target.getAttribute("value");
}
if (split_href[1]) {
path += '#' + split_href[1];
}
window.location.href = path;