-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
WIP Adds bulk transfer ability during bulk checkout of Assets #18060
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.
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
Draft
Godmartinz
wants to merge
8
commits into
grokability:develop
Choose a base branch
from
Godmartinz:bulk_transfer_option
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
80bf4c9
adds bulk transfer option boolean and context to listener and controller
Godmartinz 810f8c1
add condition to showCheckout
Godmartinz 3fc6306
add transfer method to assets, adds loglistener, cleans up logic
Godmartinz ef5043e
action log registers transfer
Godmartinz 9b69cda
add transferrableListener
Godmartinz 5e3e904
add bits to tranfer mail, adds markdown
Godmartinz 1790363
renamed files, add namespace, register listener
Godmartinz 74550e6
clean up variables names and types
Godmartinz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?php | ||
|
|
||
|
|
||
| namespace App\Events; | ||
|
|
||
| use App\Models\Asset; | ||
| use App\Models\User; | ||
| use Illuminate\Database\Eloquent\Model; | ||
| use Illuminate\Foundation\Events\Dispatchable; | ||
| use Illuminate\Queue\SerializesModels; | ||
| use Illuminate\Support\Collection; | ||
|
|
||
| class AssetsTransferredInBulk | ||
| { | ||
| use Dispatchable, SerializesModels; | ||
|
|
||
| public function __construct( | ||
| public Collection $transferable, | ||
| public Model $transferredTo, | ||
| public Model $transferredFrom, | ||
| public User $admin, | ||
| public string $transferred_at, | ||
| public string $expected_checkin, | ||
| public string $note, | ||
|
|
||
| public array $originalValues, | ||
| ) | ||
| { | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| use App\Events\AccessoryCheckedOut; | ||
| use App\Events\AssetCheckedIn; | ||
| use App\Events\AssetCheckedOut; | ||
| use App\Events\AssetsTransferredInBulk; | ||
| use App\Events\CheckoutableCheckedIn; | ||
| use App\Events\CheckoutableCheckedOut; | ||
| use App\Events\CheckoutAccepted; | ||
|
|
@@ -75,6 +76,15 @@ public function onCheckoutAccepted(CheckoutAccepted $event) | |
| $logaction->save(); | ||
| } | ||
|
|
||
| /** | ||
| * @throws \Exception | ||
| */ | ||
| public function onAssetsTransferredInBulk(AssetsTransferredInBulk $event): void | ||
| { | ||
| Log::debug('event passed to the listener:'); | ||
| $event->transferable->logCheckout($event->note, $event->transferredTo, $event->transferable->last_checkout, $event->originalValues, true); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hit an exception here: Property [last_checkout] does not exist on this collection instance. |
||
|
|
||
| } | ||
| public function onCheckoutDeclined(CheckoutDeclined $event) | ||
| { | ||
| $logaction = new Actionlog(); | ||
|
|
@@ -140,6 +150,7 @@ public function subscribe($events) | |
| $list = [ | ||
| 'CheckoutableCheckedIn', | ||
| 'CheckoutableCheckedOut', | ||
| 'AssetsTransferredInBulk', | ||
| 'CheckoutAccepted', | ||
| 'CheckoutDeclined', | ||
| 'UserMerged', | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be
bulk_transferright?