Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Checkout Type can somehow sometimes be empty #14134

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Checkout Type can somehow sometimes be empty #14134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
626cfbc
progress while i switch branches to test
spencerrlongg Jan 8, 2024
d49d2a8
note
spencerrlongg Jan 9, 2024
093a57f
validation rule
spencerrlongg Jan 16, 2024
8a723e4
maybe like this?
spencerrlongg Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Requests/StoreAssetRequest.php
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@ public function prepareForValidation(): void
$this->merge([
'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
'company_id' => Company::getIdForCurrentUser($this->company_id),
'assigned_to' => $assigned_to ?? null,
]);
}

Expand Down
3 changes: 2 additions & 1 deletion app/Models/Asset.php
View file
Open in desktop
Expand Up @@ -108,7 +108,8 @@ public function declinedCheckout(User $declinedBy, $signature)
'byod' => 'nullable|boolean',
'order_number' => 'nullable|string|max:191',
'notes' => 'nullable|string|max:65535',
'assigned_to' => 'nullable|integer',
'assigned_to' => 'required_with:assigned_type|integer',
'assigned_type' => 'required_with:assigned_to', //figure out this syntax -- i know that's not right, just placeholder
'requestable' => 'nullable|boolean',
];

Expand Down
27 changes: 14 additions & 13 deletions app/Observers/AssetObserver.php
View file
Open in desktop
Expand Up @@ -40,19 +40,20 @@ public function updating(Asset $asset)

// If the asset isn't being checked out or audited, log the update.
// (Those other actions already create log entries.)
if (($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
&& ($same_checkout_counter) && ($same_checkin_counter)
&& ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
&& ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (!$restoring_or_deleting))
{
$changed = [];

foreach ($asset->getRawOriginal() as $key => $value) {
if ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key]) {
$changed[$key]['old'] = $asset->getRawOriginal()[$key];
$changed[$key]['new'] = $asset->getAttributes()[$key];
if(array_key_exists('assigned_to', $attributesOriginal)) { // to get Api/AssetsController store method to work - this is because the checkout action happens after the create, and it's an update
if (($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
&& ($same_checkout_counter) && ($same_checkin_counter)
&& ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
&& ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (!$restoring_or_deleting)) {
$changed = [];

foreach ($asset->getRawOriginal() as $key => $value) {
if ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key]) {
$changed[$key]['old'] = $asset->getRawOriginal()[$key];
$changed[$key]['new'] = $asset->getAttributes()[$key];
}
}
}
}

if (empty($changed)){
return;
Expand Down Expand Up @@ -162,7 +163,7 @@ public function saving(Asset $asset)
// determine if calculated eol and then calculate it - this should only happen on a new asset
if (is_null($asset->asset_eol_date) && !is_null($asset->purchase_date) && ($asset->model->eol > 0)){
$asset->asset_eol_date = $asset->purchase_date->addMonths($asset->model->eol)->format('Y-m-d');
$asset->eol_explicit = false;
$asset->eol_explicit = false;
}

// determine if explicit and set eol_explicit to true
Expand Down