DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 00:07:42 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-10-17 14:45:05 -07:00
parent f4a3f896bd 1ec303931a
commit aa3f94973f
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/Listeners/CheckoutableListener.php
View file

@ -20,6 +20,8 @@ use App\Notifications\CheckoutConsumableNotification;
use App\Notifications\CheckoutLicenseNotification; use App\Notifications\CheckoutLicenseNotification;
use App\Notifications\CheckoutLicenseSeatNotification; use App\Notifications\CheckoutLicenseSeatNotification;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Exception;
use Log;
class CheckoutableListener class CheckoutableListener
{ {
@ -43,16 +45,20 @@ class CheckoutableListener
*/ */
$acceptance = $this->getCheckoutAcceptance($event); $acceptance = $this->getCheckoutAcceptance($event);
if (! $event->checkedOutTo->locale) { try {
Notification::locale(Setting::getSettings()->locale)->send( if (! $event->checkedOutTo->locale) {
$this->getNotifiables($event), Notification::locale(Setting::getSettings()->locale)->send(
$this->getCheckoutNotification($event, $acceptance) $this->getNotifiables($event),
); $this->getCheckoutNotification($event, $acceptance)
} else { );
Notification::send( } else {
$this->getNotifiables($event), Notification::send(
$this->getCheckoutNotification($event, $acceptance) $this->getNotifiables($event),
); $this->getCheckoutNotification($event, $acceptance)
);
}
} catch (Exception $e) {
Log::error("Exception caught during checkout notification: ".$e->getMessage());
} }
} }
@ -83,17 +89,21 @@ class CheckoutableListener
} }
} }
// Use default locale try {
if (! $event->checkedOutTo->locale) { // Use default locale
Notification::locale(Setting::getSettings()->locale)->send( if (! $event->checkedOutTo->locale) {
$this->getNotifiables($event), Notification::locale(Setting::getSettings()->locale)->send(
$this->getCheckinNotification($event) $this->getNotifiables($event),
); $this->getCheckinNotification($event)
} else { );
Notification::send( } else {
$this->getNotifiables($event), Notification::send(
$this->getCheckinNotification($event) $this->getNotifiables($event),
); $this->getCheckinNotification($event)
);
}
} catch (Exception $e) {
Log::error("Exception caught during checkin notification: ".$e->getMessage());
} }
} }

4
app/Models/Depreciable.php
View file

@ -69,14 +69,14 @@ class Depreciable extends SnipeModel
public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now' public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now'
{ {
if ($this->purchase_date) { if ($this->purchase_date) {
$months_passed = $this->purchase_date->diff(now())->m; $months_passed = ($this->purchase_date->diff(now())->m)+($this->purchase_date->diff(now())->y*12);
} else { } else {
return null; return null;
} }
if ($months_passed >= $this->get_depreciation()->months){ if ($months_passed >= $this->get_depreciation()->months){
//if there is a floor use it //if there is a floor use it
if($this->get_depreciation()->deprecation_min->isNotEmpty()) { if(!$this->get_depreciation()->depreciation_min == null) {
$current_value = $this->get_depreciation()->depreciation_min; $current_value = $this->get_depreciation()->depreciation_min;