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

HasCustomFields Trait - rebased #13536

Draft
wants to merge 110 commits into
base: snipeit_v7_laravel10
Choose a base branch
from
Draft

HasCustomFields Trait - rebased #13536

Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
6872f8d
adding total cost to user view
Godmartinz Apr 20, 2023
97df390
adds optional breakdowns for total cost
Godmartinz Apr 20, 2023
b8c424f
adds users total cost to user profile
Godmartinz Apr 24, 2023
56fb45f
WIP: Add last_checkin to assets table
marcusmoore Aug 18, 2023
8b2716d
Fix update statement
marcusmoore Aug 18, 2023
489d30c
Set last_checkin in ui and api controllers
marcusmoore Aug 21, 2023
6fc06f2
Add simple tests around asset check in
marcusmoore Aug 21, 2023
c332b98
Add last checkin options to report front end
marcusmoore Aug 21, 2023
4e2ef4f
Default to using the current date if last check in end date is not pr…
marcusmoore Aug 21, 2023
c7f2acf
removes encrypted info from change log, renames asset_eol_date in the…
Godmartinz Aug 22, 2023
9e438c3
eager loaded changedInfo queries, reworked encrypted data change log …
Godmartinz Aug 22, 2023
1019287
retarget key
Godmartinz Aug 22, 2023
92ddf8f
removed dead space
Godmartinz Aug 22, 2023
ce60db0
adds soft deletes to eager loading
Godmartinz Aug 23, 2023
27488c1
adds soft deletes to eager loading
Godmartinz Aug 23, 2023
ffe1b11
merged develop
Godmartinz Aug 23, 2023
0fc79ec
fixes conflicts
Godmartinz Aug 23, 2023
28cf533
Merge branch 'develop' into ignore_encrypt_and_other_changes
Godmartinz Aug 23, 2023
20457bd
Run tests for PHP 7.4, 8.0, and 8.1.1
marcusmoore Aug 23, 2023
8ebb9af
adds min_amt to asset model edit, index, and table
Godmartinz Aug 21, 2023
c26ef22
fixing my mess
Godmartinz Aug 24, 2023
38d5691
fix conflicts
Godmartinz Aug 21, 2023
011c09a
working on getting notifications
Godmartinz Aug 21, 2023
739fc15
Adds readable asset history in the action log transformer
Godmartinz Aug 17, 2023
34ba0c4
adds id to history info
Godmartinz Aug 21, 2023
a3b6e0f
adds some spacing
Godmartinz Aug 21, 2023
18cb514
revert unwanted changes
Godmartinz Aug 24, 2023
0b956b2
revert changes of composer.lock
Godmartinz Aug 24, 2023
2b7a899
removed unnecessary code
Godmartinz Aug 24, 2023
e566284
fixed lost changes
Godmartinz Aug 24, 2023
950536f
Added a condition to send correct model id when cloning one
inietov Aug 24, 2023
a12a68e
Add a variable so I dont ended rewriting the original model
inietov Aug 24, 2023
582cad2
Fixed #13521 - make modal “select files” button wider
snipe Aug 28, 2023
535ca0e
Merge pull request #13535 from snipe/fixes/13521_make_modal_upload_bu…
snipe Aug 28, 2023
8902145
This is a squashed branch of all of the various commits that make up …
uberbrady Jun 29, 2021
92e88a0
Merge branch 'develop' into ignore_encrypt_and_other_changes
Godmartinz Aug 28, 2023
7787ca3
Try to prevent the browser from pre-filling the LDAP password
snipe Aug 28, 2023
8298129
Use int not string if no DB_PORT specified
snipe Aug 28, 2023
6020927
Merge pull request #13538 from snipe/fixes/13516_use_int_not_string_f…
snipe Aug 28, 2023
81365ef
Merge pull request #13518 from marcusmoore/chore/tests-via-github-act…
snipe Aug 28, 2023
367484a
Merge pull request #13537 from snipe/fixes/13500_prevent_autocomplete…
snipe Aug 28, 2023
4e4ba38
Pass the model_id variable in the controller and get it only if we ar…
inietov Aug 28, 2023
74f45a4
reworks company queries for asset history
Godmartinz Aug 29, 2023
d86c63c
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
Godmartinz Aug 29, 2023
0ac5d4d
Merge pull request #8 from Godmartinz/fix-companyable
Godmartinz Aug 29, 2023
22d136d
Merge pull request #13528 from inietov/fixes/cloning_model_blanks_fie…
snipe Aug 29, 2023
aafa1ab
Add failing test
marcusmoore Aug 29, 2023
806ab2c
Ensure users are scoped by company in index method
marcusmoore Aug 29, 2023
b109ee2
Merge pull request #13544 from marcusmoore/bug/sc-23675
snipe Aug 30, 2023
fbc04cf
Bumped hash
snipe Aug 30, 2023
9ebcde4
Upgrade less from 4.1.2 to 4.2.0 #13534
snipe Aug 30, 2023
1bcc74f
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.4.2 #13527
snipe Aug 30, 2023
5cf8c36
Updated assets
snipe Aug 30, 2023
c0cbdb1
Fixed bug introduced in #13528
snipe Aug 30, 2023
2a93c38
Don’t cast as boolean, validate as boolean
snipe Aug 30, 2023
07c3fe1
Update assertions to account for type change
marcusmoore Aug 30, 2023
085a993
Early return if no asset is found
inietov Aug 30, 2023
a384d01
Merge branch 'snipeit_v7_laravel10' into has_custom_fields_trait_rebase
uberbrady Aug 30, 2023
fb455be
Added tests
snipe Aug 30, 2023
663faff
Un-cast byod, validate as boolean
snipe Aug 30, 2023
417b2c8
Update testing documentation
marcusmoore Aug 30, 2023
5828d29
Remove Dusk
marcusmoore Aug 30, 2023
999605f
Add failing test
marcusmoore Aug 31, 2023
a799659
Scaffold tests and add context
marcusmoore Aug 31, 2023
9a0f691
Merge pull request #13546 from snipe/fixes/make_boolean_user_fields_m…
snipe Aug 31, 2023
c515740
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_ch…
snipe Aug 31, 2023
83b178f
Added model name and number to dynamic url
snipe Aug 31, 2023
e192cbb
Merge pull request #13550 from marcusmoore/remove-dusk
snipe Aug 31, 2023
f08cef8
Merge pull request #13556 from snipe/feature/sc-23684
snipe Aug 31, 2023
da7d6f6
Merge branch 'develop' into update-testing-documentation
marcusmoore Aug 31, 2023
09f7b3d
Track changes on asset checkin/out
johnson-yi Sep 1, 2023
a62e2f0
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-r…
snipe Sep 5, 2023
b17af38
Merge pull request #12901 from Godmartinz/user_total_cost
snipe Sep 5, 2023
2acf2b8
Account for hard-deleted models, suppliers
snipe Sep 5, 2023
f85df6b
Use same method of accessing companies as others
snipe Sep 5, 2023
26452a8
Merge pull request #13565 from snipe/fixes/asset_history_500_on_hard_…
snipe Sep 5, 2023
e486fe2
Removed soft-delete query
snipe Sep 5, 2023
f53db8b
Fixed #13562 - allow inline view for uploaded files
snipe Sep 5, 2023
65a76c5
Added inline=true to image preview modal
snipe Sep 5, 2023
d6dd332
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checki…
snipe Sep 5, 2023
91b1cc7
Move the early return to the controller instead of the Label model
inietov Sep 5, 2023
a67888f
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property…
snipe Sep 5, 2023
5897f4d
Add rtd_location_id to tracked changes on checkin actionlog
johnson-yi Sep 6, 2023
e920199
Merge pull request #13567 from johnson-yi/fixes/add_default_location_…
snipe Sep 6, 2023
1509c51
Add guard clauses around some License and LicenseSeat models functions
inietov Sep 6, 2023
1c3c36f
Begin to implement patch test
marcusmoore Sep 6, 2023
ec5238f
Merge pull request #13548 from marcusmoore/update-testing-documentation
snipe Sep 7, 2023
67cad9c
Merge pull request #13571 from inietov/fixes/require_acceptance_on_null
snipe Sep 7, 2023
3184f79
Upgrade to new branch for our fork of laravel-scim-server
uberbrady Sep 7, 2023
b7c2b93
Merge pull request #13573 from snipe/upgrade_scim_server
snipe Sep 7, 2023
894c34f
Update to only use relative paths
snipe Sep 7, 2023
899c2eb
Implement test case
marcusmoore Sep 7, 2023
abd2ed3
Filter unaccepted assets that are not assigned to users
inietov Sep 7, 2023
56e6205
Formatting
marcusmoore Sep 7, 2023
7f892bf
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report…
snipe Sep 7, 2023
02c187b
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
snipe Sep 7, 2023
39ff575
Remove unused test cases
marcusmoore Sep 7, 2023
a7a70f6
Test permissions update
marcusmoore Sep 7, 2023
4caa501
Relax property type check
marcusmoore Sep 7, 2023
c6c1c64
Remove todo
marcusmoore Sep 7, 2023
0683666
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging
snipe Sep 7, 2023
093bf57
Update assertion and add failure messages
marcusmoore Sep 7, 2023
dc74fb1
Merge pull request #13577 from marcusmoore/fixes/improve-testcase
snipe Sep 8, 2023
0eb50ce
removes commented code
Godmartinz Sep 11, 2023
a26b961
Merge branch 'develop' into asset-model-notifs
Godmartinz Sep 11, 2023
a49d3fe
Merge pull request #13526 from Godmartinz/asset-model-notifs
snipe Sep 11, 2023
9cbd2d0
Add a boolean variable and condition to handle the call to checkedOut…
inietov Sep 11, 2023
f6a11ac
Merge pull request #13586 from inietov/fixes/call_to_member_function_…
snipe Sep 12, 2023
a3a786f
Merge branch 'develop' into has_custom_fields_trait_rebase
uberbrady Sep 14, 2023
71e745d
Clean up this migration so it runs forwards and backwards OK
uberbrady Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adds users total cost to user profile
  • Loading branch information
@Godmartinz
Godmartinz committed Apr 24, 2023
commit b8c424fca00400f38529119c7568f663ee15a518
15 changes: 7 additions & 8 deletions resources/views/users/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,15 +650,14 @@
<strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
</a>
</div>
<div id="optional_details" class="col-md-12" style="display:none">
<br>
<div class="col-md-9">
Asset: {{$user->getUserTotalCost()->asset_cost}}
License: {{$user->getUserTotalCost()->license_cost}}
Accessory: {{$user->getUserTotalCost()->accessory_cost}}
<div id="optional_details" class="col-md-12" style="display:none">
<div class="col-md-3" style="border-top:none;"></div>
<div class="col-md-9" style="border-top:none;">
{{trans('general.assets').': '. Helper::formatCurrencyOutput($user->getUserTotalCost()->asset_cost)}}<br>
{{trans('general.licenses').': '. Helper::formatCurrencyOutput($user->getUserTotalCost()->license_cost)}}<br>
{{trans('general.accessories').': '.Helper::formatCurrencyOutput($user->getUserTotalCost()->accessory_cost)}}<br>
</div>
</div>

</div>
</div>

</div> <!--/end striped container-->
Expand Down