From b9986033cca5d2d6ce4eae9308a0402900998c29 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 18 Mar 2024 16:03:40 -0700 Subject: [PATCH] removed abbr. of variable, changed variable types in migration --- .../Account/AcceptanceController.php | 4 ++-- app/Listeners/LogListener.php | 2 +- app/Models/CheckoutAcceptance.php | 4 ++-- .../AcceptanceAssetDeclinedNotification.php | 4 ++-- ...ecline_msg_to_checkout_acceptance_table.php | 4 ++-- .../lang/en-US/admin/settings/general.php | 2 +- resources/lang/en-US/general.php | 2 +- .../views/account/accept/create.blade.php | 18 +++++++++--------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 8339df8fe..9a59858cc 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -311,7 +311,7 @@ class AcceptanceController extends Controller 'item_tag' => $item->asset_tag, 'item_model' => $display_model, 'item_serial' => $item->serial, - 'declined_msg' => $request->input('declined_msg'), + 'declined_message' => $request->input('declined_message'), 'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'), 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null, 'assigned_to' => $assigned_to, @@ -325,7 +325,7 @@ class AcceptanceController extends Controller Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output()); } - $acceptance->decline($sig_filename, $request->input('declined_msg')); + $acceptance->decline($sig_filename, $request->input('declined_message')); $acceptance->notify(new AcceptanceAssetDeclinedNotification($data)); event(new CheckoutDeclined($acceptance)); $return_msg = trans('admin/users/message.declined'); diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php index 2fcd0a9d3..3cb0929eb 100644 --- a/app/Listeners/LogListener.php +++ b/app/Listeners/LogListener.php @@ -78,7 +78,7 @@ class LogListener $logaction->item()->associate($event->acceptance->checkoutable); $logaction->target()->associate($event->acceptance->assignedTo); $logaction->accept_signature = $event->acceptance->signature_filename; - $logaction->note = $event->acceptance->declined_msg; + $logaction->note = $event->acceptance->declined_message; $logaction->action_type = 'declined'; // TODO: log the actual license seat that was checked out diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php index d0532bc70..0a9db7d74 100644 --- a/app/Models/CheckoutAcceptance.php +++ b/app/Models/CheckoutAcceptance.php @@ -99,10 +99,10 @@ class CheckoutAcceptance extends Model * * @param string $signature_filename */ - public function decline($signature_filename, $declined_msg = null) + public function decline($signature_filename, $declined_message = null) { $this->declined_at = now(); - $this->declined_msg = $declined_msg; + $this->declined_message = $declined_message; $this->signature_filename = $signature_filename; $this->save(); diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.php index 2dd285450..37f9f9763 100644 --- a/app/Notifications/AcceptanceAssetDeclinedNotification.php +++ b/app/Notifications/AcceptanceAssetDeclinedNotification.php @@ -25,7 +25,7 @@ class AcceptanceAssetDeclinedNotification extends Notification $this->item_model = $params['item_model']; $this->item_serial = $params['item_serial']; $this->declined_date = Helper::getFormattedDateObject($params['declined_date'], 'date', false); - $this->declined_msg = $params['declined_msg']; + $this->declined_message = $params['declined_message']; $this->assigned_to = $params['assigned_to']; $this->company_name = $params['company_name']; $this->settings = Setting::getSettings(); @@ -63,7 +63,7 @@ class AcceptanceAssetDeclinedNotification extends Notification 'item_tag' => $this->item_tag, 'item_model' => $this->item_model, 'item_serial' => $this->item_serial, - 'declined_msg' => $this->declined_msg, + 'declined_message' => $this->declined_message, 'declined_date' => $this->declined_date, 'assigned_to' => $this->assigned_to, 'company_name' => $this->company_name, diff --git a/database/migrations/2024_03_18_164714_add_decline_msg_to_checkout_acceptance_table.php b/database/migrations/2024_03_18_164714_add_decline_msg_to_checkout_acceptance_table.php index a1f49f33e..dd47d172b 100644 --- a/database/migrations/2024_03_18_164714_add_decline_msg_to_checkout_acceptance_table.php +++ b/database/migrations/2024_03_18_164714_add_decline_msg_to_checkout_acceptance_table.php @@ -14,7 +14,7 @@ class AddDeclineMsgToCheckoutAcceptanceTable extends Migration public function up() { Schema::table('checkout_acceptances', function (Blueprint $table) { - $table->string('declined_msg')->after('signature_filename')->nullable(); + $table->text('declined_message')->after('signature_filename')->nullable(); }); } @@ -26,7 +26,7 @@ class AddDeclineMsgToCheckoutAcceptanceTable extends Migration public function down() { Schema::table('checkout_acceptances', function (Blueprint $table) { - $table->dropColumn('declined_msg'); + $table->dropColumn('declined_message'); }); } } diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index ddf5dc4ea..2cab57ffb 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -49,7 +49,7 @@ return [ 'default_eula_text' => 'Default EULA', 'default_language' => 'Default Language', 'default_eula_help_text' => 'You can also associate custom EULAs to specific asset categories.', - 'decline_msg' => 'Add details to why you can\'t accept this (Optional)', + 'decline_message' => 'Add details to why you can\'t accept this (Optional)', 'display_asset_name' => 'Display Asset Name', 'display_checkout_date' => 'Display Checkout Date', 'display_eol' => 'Display EOL in table view', diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 5131452e8..5321ed0cf 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -293,7 +293,7 @@ return [ 'user' => 'User', 'accepted' => 'accepted', 'declined' => 'declined', - 'declined_note' => 'Declined Notes', + 'declined_note' => 'Declined Notes', 'unassigned' => 'Unassigned', 'unaccepted_asset_report' => 'Unaccepted Assets', 'users' => 'Users', diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php index 5501474bf..47190bb8e 100644 --- a/resources/views/account/accept/create.blade.php +++ b/resources/views/account/accept/create.blade.php @@ -67,10 +67,10 @@

- +
- +
@@ -104,20 +104,20 @@