 snipe
|
06f313febe
|
Merge pull request #17869 from marcusmoore/api-components-assigned-to-asset
Added api endpoint for retrieving components checked out to asset
|
2025-09-29 15:47:53 +01:00 |
|
|
snipe
|
b387136b8f
|
Merge pull request #17883 from akemidx/purchasepricereportfilter
FEATURE: Purchase Cost Report Filter
|
2025-09-29 15:37:39 +01:00 |
|
|
Marcus Moore
|
be848598e3
|
Keep removed asset out of scope of partial
|
2025-09-24 14:32:25 -07:00 |
|
|
Marcus Moore
|
c614c44d4c
|
Remove assigned assets from bulk checkout
|
2025-09-22 16:04:29 -07:00 |
|
|
Marcus Moore
|
fb9fb9c097
|
Merge branch 'develop' into fixes/17404-prevent-bulk-checkout-across-companies
# Conflicts:
# app/Http/Controllers/Assets/BulkAssetsController.php
# tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
|
2025-09-22 10:52:04 -07:00 |
|
|
snipe
|
90c242a441
|
Merge pull request #17897 from marcusmoore/fixes/17896-prevent-bulk-checkout-of-checked-out-assets
Fixed #17896 - Prevent assigned assets from being bulk checked out
|
2025-09-19 07:03:43 +01:00 |
|
|
Marcus Moore
|
7a3596c86d
|
Test against other types
|
2025-09-18 17:21:27 -07:00 |
|
|
Marcus Moore
|
ac8a9e38f0
|
Implement fix
|
2025-09-18 17:18:27 -07:00 |
|
|
Marcus Moore
|
a02a96d5c4
|
Extract translation string
|
2025-09-18 12:57:56 -07:00 |
|
|
Marcus Moore
|
47e9e4704d
|
Improve error message
|
2025-09-18 12:56:36 -07:00 |
|
|
Marcus Moore
|
b2ad9d404e
|
Fix re-population of assets
|
2025-09-18 12:38:11 -07:00 |
|
|
snipe
|
be4ace293e
|
Use trans_choice for user acceptance
|
2025-09-18 13:51:57 +01:00 |
|
|
snipe
|
764b363bbc
|
A few small tweaks to acceptance screen design
|
2025-09-18 13:38:37 +01:00 |
|
|
Marcus Moore
|
e639d7726b
|
Disallow bulk checkout across companies
|
2025-09-17 14:32:27 -07:00 |
|
|
snipe
|
8ea339f0ef
|
More small tweaks
|
2025-09-17 22:00:49 +01:00 |
|
|
snipe
|
89b36ba63f
|
Derp. Uncomment the acceptance.
|
2025-09-17 21:43:40 +01:00 |
|
|
snipe
|
1d3dfa1fa4
|
Pull the acceptance stuff into the model
|
2025-09-17 21:43:17 +01:00 |
|
|
snipe
|
ca567eec8a
|
Small adjustments for layout
|
2025-09-17 21:08:13 +01:00 |
|
|
snipe
|
ade03e4827
|
Merge pull request #17882 from Godmartinz/add-total-cost-columns
Adds total cost to Accessories, Consumables, Components
|
2025-09-17 13:56:08 +01:00 |
|
|
snipe
|
33a4c88c3a
|
Added table to deleted_at clauses to resolve ambiguity
|
2025-09-17 11:44:28 +01:00 |
|
|
akemidx
|
cf1bccfd65
|
prep for val
|
2025-09-16 15:24:44 -04:00 |
|
|
akemidx
|
99acf018f1
|
validation rule & query
|
2025-09-16 15:17:59 -04:00 |
|
|
snipe
|
1f79776b8f
|
Pull HTML tags out before converting markdown
|
2025-09-16 19:21:39 +01:00 |
|
|
Godfrey M
|
11e5f851f0
|
typo
|
2025-09-16 10:49:33 -07:00 |
|
|
Godfrey M
|
4ca1db8a1b
|
remove footer formatter from consumable purchase cost
|
2025-09-16 10:43:02 -07:00 |
|
|
Godfrey M
|
14b829aa30
|
add total cost to components and consumables
|
2025-09-16 10:37:32 -07:00 |
|
|
Godfrey M
|
384652b3df
|
add total cost to accessories
|
2025-09-16 10:10:49 -07:00 |
|
|
snipe
|
1346e33e99
|
Check that the person trying to download can see both the user and the target
|
2025-09-16 14:21:03 +01:00 |
|
|
snipe
|
ab9cc447aa
|
Use more specific filename
|
2025-09-16 14:20:20 +01:00 |
|
|
snipe
|
fe9e0444b4
|
Added EULA tab to user view
|
2025-09-16 13:20:50 +01:00 |
|
|
akemidx
|
6ce0fd20ce
|
works, needs error handling
|
2025-09-16 08:11:42 -04:00 |
|
|
snipe
|
a18957dbe9
|
Include output even if there is nothing to send
|
2025-09-16 12:33:06 +01:00 |
|
|
snipe
|
e977771fe4
|
One more query tweak
|
2025-09-16 11:50:50 +01:00 |
|
|
snipe
|
4339e4552e
|
Fixed nesting in orWhere
|
2025-09-16 11:50:50 +01:00 |
|
|
Marcus Moore
|
06f060161d
|
Apply offset and limit
|
2025-09-15 15:43:54 -07:00 |
|
|
Marcus Moore
|
7393c4170b
|
Apply first pass and scaffold additional test
|
2025-09-15 15:22:35 -07:00 |
|
|
Marcus Moore
|
73e185bf9d
|
Scaffold route and tests
|
2025-09-15 15:12:05 -07:00 |
|
|
snipe
|
0bad75b263
|
Fixed declined asset name
|
2025-09-15 20:56:57 +01:00 |
|
|
snipe
|
74b98083e2
|
Override the getEula() method at the SnipeModel level
|
2025-09-15 20:05:35 +01:00 |
|
|
snipe
|
927f557672
|
Fixed sorting on updated/created at
|
2025-09-15 18:13:46 +01:00 |
|
|
snipe
|
630ea05e17
|
A little more cleanup
|
2025-09-15 17:16:05 +01:00 |
|
|
snipe
|
7df5196083
|
A little cleanup
|
2025-09-15 16:09:49 +01:00 |
|
|
snipe
|
01f7b5d709
|
Added CJK and Arabic font support
|
2025-09-15 14:46:11 +01:00 |
|
|
snipe
|
ec47ee3573
|
Merge pull request #17850 from Godmartinz/change-purchase-cost-to-unit
Rewords Purchase cost to Unit Cost for Accessories, Components, Consumables
|
2025-09-15 14:20:04 +01:00 |
|
|
snipe
|
7062962cc8
|
Show warnings on the dates if expired or terminated
|
2025-09-15 13:43:08 +01:00 |
|
|
snipe
|
319cb1bd1e
|
Removed logging
|
2025-09-15 13:23:44 +01:00 |
|
|
snipe
|
58cda5ae6d
|
Added scopes
|
2025-09-15 13:22:25 +01:00 |
|
|
snipe
|
30b6dcd767
|
Added status to breadcrumbs
|
2025-09-15 13:13:50 +01:00 |
|
|
snipe
|
35739c2eef
|
Merge pull request #17835 from marcusmoore/feature/10052-assigned-assets-via-api
Fixed #10052 - Added api endpoint for retrieving assets checked out to asset
|
2025-09-15 08:38:35 +01:00 |
|
|
snipe
|
1914a71623
|
Merge pull request #17851 from marcusmoore/fixes/qty-in-component-email
Fixed potentially incorrect qty in component checkout email
|
2025-09-15 08:37:48 +01:00 |
|