Godfrey M
|
d01972bbe5
|
adds tests for amount and percent
|
2024-07-23 11:53:59 -07:00 |
|
Spencer Long
|
64be353156
|
Merge branch 'develop' into bug/sc-24884
|
2024-07-23 12:55:19 -05:00 |
|
snipe
|
6f3eedf5e6
|
Removed restoreDefaultAvatar method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 07:25:27 +01:00 |
|
snipe
|
c6c006f143
|
Added restore from demo method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 05:54:40 +01:00 |
|
snipe
|
c50ab1af67
|
Merge branch 'develop' into develop
|
2024-07-19 19:00:56 +01:00 |
|
snipe
|
19bd99d159
|
Updated count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 17:33:24 +01:00 |
|
snipe
|
9858cc5baf
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 04:43:30 +01:00 |
|
snipe
|
b5b60f22d5
|
Removed int
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 03:48:21 +01:00 |
|
snipe
|
f56006fb6b
|
More refactoring
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 01:46:53 +01:00 |
|
snipe
|
79a13e3618
|
Added numCheckedOut method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 00:26:58 +01:00 |
|
Godfrey M
|
baa7e7d561
|
clean up
|
2024-07-16 20:27:38 -07:00 |
|
Godfrey M
|
ffaacc04ef
|
cleaned up calculateDepreciation method
|
2024-07-16 20:24:18 -07:00 |
|
Godfrey M
|
48821f8391
|
updates transformer, api controller
|
2024-07-16 12:58:23 -07:00 |
|
Godfrey M
|
aaa2858337
|
battling with handling depreciation percentage and amount
|
2024-07-16 12:25:19 -07:00 |
|
snipe
|
f91ad6b2db
|
Use app()->getLocale() to determine imported user’s language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-13 15:15:44 +01:00 |
|
snipe
|
42dbc894e0
|
Better handle numRemaining for consumables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:21:45 +01:00 |
|
snipe
|
94bfe7d9c8
|
Require the user exists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:18:42 +01:00 |
|
snipe
|
759bb822ff
|
Make sure the user exists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 15:59:18 +01:00 |
|
spencerrlongg
|
8650923b01
|
new branch cuz test merge
|
2024-07-08 12:55:59 -05:00 |
|
snipe
|
34bde52f74
|
Fixed typos
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 03:21:34 +01:00 |
|
snipe
|
6761ff44cc
|
Removed parens
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 00:22:46 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
e34f3c7c2c
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 14:32:41 +01:00 |
|
snipe
|
2b2853a183
|
Added acceptance model
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 14:29:58 +01:00 |
|
spencerrlongg
|
6f29c0a7cf
|
Merge branch 'refs/heads/develop' into bug/sc-24884
# Conflicts:
# routes/api.php
|
2024-07-02 15:48:39 -05:00 |
|
Konstantin Köhring
|
6c55e2bd9d
|
Add a Brother compatible 62mm wide label.
Tested with QL-600. Set print mode to landscape.
|
2024-06-28 09:49:53 +02:00 |
|
Konstantin Köhring
|
2fd357c346
|
Add rotation attribute to Label class to allow rotation of the generated label PDF.
This is necessary when printing labels with width = label width.
|
2024-06-28 09:49:53 +02:00 |
|
snipe
|
52c4885335
|
Added method for checking if the user can edit their own profile
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:02:17 +01:00 |
|
snipe
|
c6a0212384
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-06-22 17:33:12 +01:00 |
|
snipe
|
3531256c3f
|
Fixed deprecations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-21 21:06:43 +01:00 |
|
snipe
|
c8835bf5db
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:40:37 +01:00 |
|
snipe
|
bd1f43f9ee
|
Added lastname.firstname as email format
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 13:36:48 +01:00 |
|
snipe
|
61ced0b221
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:41:11 +01:00 |
|
snipe
|
ae7675fee0
|
Added audit date validation back in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:37:15 +01:00 |
|
snipe
|
66ed26fbf9
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:13:47 +01:00 |
|
snipe
|
7099358985
|
Added accessor/mutator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:11:50 +01:00 |
|
snipe
|
9a706b3e3e
|
Removed datetime validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:05:31 +01:00 |
|
snipe
|
cb6ea2c6fb
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 09:59:43 +01:00 |
|
snipe
|
2f59bb74cd
|
Prefaced fields with “users” for clarity
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 09:52:41 +01:00 |
|
snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
snipe
|
cacb5d62dc
|
Merge pull request #14800 from snipe/fixes/importer_tweaks
Importer tweaks
|
2024-06-12 12:51:11 +01:00 |
|
snipe
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
snipe
|
1cdec61be6
|
Use more modern mutator/accessory syntax
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:56:54 +01:00 |
|
snipe
|
9d9ad86dd5
|
Added mutators and accessors for dates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
b2a86e312b
|
Added last_checkout and last_checkin as fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
6229d0c616
|
Merge pull request #14758 from U-H-T/features/add_logo_support_for_Brother_TZe24
add logo support for Brother TZe24mm labels
|
2024-06-03 17:02:18 +01:00 |
|
snipe
|
b156264684
|
Tidied up scoping to be better for testing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 23:10:53 +01:00 |
|
snipe
|
06e9625c64
|
Use hasUser() to avoid table collisions and infinite loop
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:58:07 +01:00 |
|
snipe
|
5800e8d8e9
|
Added companyable trait
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:57:34 +01:00 |
|
snipe
|
623aa58163
|
Removed unused statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:57:25 +01:00 |
|