hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 06:46:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #632 from openclassify/vedatakdogan

Browse Source 
fixed null error for currency converter
This commit is contained in:
Ozcan Durak 2020-08-12 18:10:52 +03:00 committed by GitHub
commit b2d4f08f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -95,10 +95,10 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function pendingAdvsByUser() public function pendingAdvsByUser()
{ {
return $this->userAdv() return $this->userAdv()
->where(function($query) { ->where(function ($query) {
$query->where('advs_advs.status', '<>', 'approved'); $query->where('advs_advs.status', '<>', 'approved');
$query->orWhere('advs_advs.finish_at', '<', date('Y-m-d H:i:s')); $query->orWhere('advs_advs.finish_at', '<', date('Y-m-d H:i:s'));
}); });
} }
@ -140,7 +140,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
} }
} }
} catch (RequestException $e) { } catch (RequestException $e) {
$this->messages->error($e->getMessage()); $this->messages->error((!is_null($e->getMessage())) ? $e->getMessage() : trans('streams::error.500.message'));
} }
} }
} }