From a9782b7e00900a692ade7bd1410709a83797bc4b Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 14 Mar 2023 15:26:44 -0400 Subject: [PATCH 1/7] testing links --- resources/views/hardware/view.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index de19100017..a6327bfeae 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -600,6 +600,14 @@ + @elseif ((strtolower($asset->model->manufacturer->name) == "dell") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"dellinc"))) + + + + @elseif ((strtolower($asset->model->manufacturer->name) == "lenovo") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"lenovoinc"))) + + + @endif @endif From d50a5d1880287f32d44b11ffd9e6136211325419 Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 14 Mar 2023 16:04:03 -0400 Subject: [PATCH 2/7] dell and lenovo icons/links added --- resources/views/hardware/view.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index a6327bfeae..d82dc96645 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -601,12 +601,12 @@ @elseif ((strtolower($asset->model->manufacturer->name) == "dell") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"dellinc"))) - - + + Dell Warranty Status Lookup @elseif ((strtolower($asset->model->manufacturer->name) == "lenovo") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"lenovoinc"))) - - + + Lenovo Warranty Status Lookup @endif @endif From 68094b23b9325d2eac938c51a51b020bfa939d95 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 15 Mar 2023 15:02:33 -0400 Subject: [PATCH 3/7] moved dell and levono icons to local machine --- resources/views/hardware/view.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index d82dc96645..37c495ef85 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -602,11 +602,11 @@ @elseif ((strtolower($asset->model->manufacturer->name) == "dell") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"dellinc"))) - Dell Warranty Status Lookup + Dell Warranty Status Lookup @elseif ((strtolower($asset->model->manufacturer->name) == "lenovo") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"lenovoinc"))) - Lenovo Warranty Status Lookup + Lenovo Warranty Status Lookup @endif @endif From 0909d94c8f5e36aaeaaa98406c5e497ebe0b77ae Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 15 Mar 2023 15:07:07 -0400 Subject: [PATCH 4/7] actually added the icons haha --- public/img/demo/manufacturers/dellicon.png | Bin 0 -> 1679 bytes public/img/demo/manufacturers/lenovoicon.png | Bin 0 -> 766 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/demo/manufacturers/dellicon.png create mode 100644 public/img/demo/manufacturers/lenovoicon.png diff --git a/public/img/demo/manufacturers/dellicon.png b/public/img/demo/manufacturers/dellicon.png new file mode 100644 index 0000000000000000000000000000000000000000..899de3ccab84859b1bdd21563924ae01fc02ebbd GIT binary patch literal 1679 zcmV;A25|X_P)EX>4Tx04R}tkv&MmKpe$iQ$>+VK|6>zWT+0(f~bh2RIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVt}afBE>hzEl0u6Z503ls?%w0>9UwF+Of|bE09CV$ zR6HhTbE{&{EBpvz01=E!%+wR<#SA>h*FAiEy^HcJ?{j~SekE@*z$X&VG2O6;H;898 zEuHf|afp>9h4`E}V$cPNAGt2O{KmQHu)s4zMkX~+93mEr9V~Y+D;X;BG;vr_HOd#V zE-Re3IIEQ!Yu%H-Fp$?)(p;xGf;g6tKoTNk)KEqR7NWFjq?kz2e$2x^?D&)9lF3yD zBgX=&P$4;f@IUz7ty!3wbdv%xp!>zPKSqI`U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTMHin!ENB;x~<83z~v4w^rTCMpV2qvfWcd!Z_VwkwU5&WAVXa(-v9@P zz*v#8*FE0d+u7T{XIlOJ0K#c<$D>C4>;M1&24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j>G15-t$YM1@KK00fIkL_t(o!?jmIOd4qvehj8; zXavTr7ULGwhGx@*cG|Gn#BOB5CVOZT9XK}WcI2*MIeM_lfm@Na>CFIZ%=Tb1vNZM3 zLik+~%<6UJ9nP{52Z1PG@Fwr!1&Y<(vdmfxir>YmrnadEVs=q@@of|?LdqC+JWa$_W%IE_CcY`y^^pO9hllkKLr3F zHHwg_3lGB;!PJF^NsS@|05Gwd90UNsm}r_pryqIPF$z}<#E~tW;7l}4VF6C)2LR|) z%3`&iJ{S{>=PptmQRr04VgLXEPUy$jy(8i*{9yn9a(ZJy+(4+AO(qxy>^^F#9>d%tX`X z04Ma@=i{GsVYo*^OtR}|;T)?c3U}M&9{>Q@{XBu8MHCjXs=;uNL?x37000(dYt|P@ z(JGl#fZ-mA>cw(~-Om%*!if^4u~vw=uu4X%ubQ#|07C}#%X90_rPFNT1c%`s38_(p z8&%7y4j`ZsML-n;!#xsmdSjuKd?$CT3C0AYSVOY^eo_Tvf>C^z5SofcBH0B12<_xZ za4wy09~4meI0Br|R~$&3OQ)fo9CRvWu_1$c!ag4#2LSLzQnW9UqEWr0T$^5RhRTfq z7|JobcXYpODn9G^FAk&jdGN^{lGe8t?<%QLgw_W1_lY+7dOcwe?c_{oZ=hy2nR2C4 z4X))~TSZl?0jSienN0@k)hHHG$ZH)s?B92|-9L5P8zJX2d2MJXM*;x!Y7~nYrNfI2 z#TQ9gueueBIVc@Ii*>ii<0!8atI5HukYceUBN0MVGj>+%zoJU8zWwOEDhI4@KYCHM zjr{P9qu2)?v^TRhgL)jbUJsk3FPq%MCTTP++YIXQ(y98~*mRjrc-SOeY23rUm{=a) z8bE!)I>&pzP__o)THdu;=Xfuwd(Y!r1LBEGQf`zs{r-0l<%-lOLY_z6bS=-U(sHxT z@jg^?Dw$LWKDlEm4ZWn&&lYCOFMbEo`c_|`4*$dQ?brTl#7s0z1vsH!tPw<;oMkMx zsd9&?`ZgR1$HyjClY?TNP|2hMapU@5y*HZ|#kPz89QLw%NB2r?hYaeM4x{#YLyuE* zIo&G>`_xAIX;BF;03x=1*Y3J#!j{yN*R{kU;or)bKkVoArRu4YNrk&@@(8I>1nZfs Z{{zsBrvBFEj-UVl002ovPDHLkV1nt(5;6b) literal 0 HcmV?d00001 diff --git a/public/img/demo/manufacturers/lenovoicon.png b/public/img/demo/manufacturers/lenovoicon.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f7967bf8eb17fbcab07ae563a8f3da55166891 GIT binary patch literal 766 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>+VK|6>zWT+0(f~bh2RIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVt}afBE>hzEl0u6Z503ls?%w0>9UwF+Of|bE09CV$ zR6HhTbE{&{EBpvz01=E!%+wR<#SA>h*FAiEy^HcJ?{j~SekE@*z$X&VG2O6;H;898 zEuHf|afp>9h4`E}V$cPNAGt2O{KmQHu)s4zMkX~+93mEr9V~Y+D;X;BG;vr_HOd#V zE-Re3IIEQ!Yu%H-Fp$?)(p;xGf;g6tKoTNk)KEqR7NWFjq?kz2e$2x^?D&)9lF3yD zBgX=&P$4;f@IUz7ty!3wbdv%xp!>zPKSqI`U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTMHin!ENB;x~<83z~v4w^rTCMpV2qvfWcd!Z_VwkwU5&WAVXa(-v9@P zz*v#8*FE0d+u7T{XIlOJ0K#c<$D>C4>;M1&jZjQfMdKI~_{GKH33QsNd8_rJgY{QdQ? zvEma9@{*L{4Fd6qiRLgcPEX}6E#n**|NsBv9U7!yZ3X}U010qNS#tmY3ljhU3ljkVnw%H_000McNliru z=K~KCE->mUrGfwe0CP!1K~y-)W6&c280e~ift!Py3!efR4L&7)MVtzB7({v0c{HW) zC{Whb)s<{907*qoM6N<$f~TNUn*aa+ literal 0 HcmV?d00001 From bb7b655fd26a47a6833e497b5e2ab8d5783f2faf Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 21 Mar 2023 16:02:34 -0400 Subject: [PATCH 5/7] translating screen reader lines --- resources/lang/en/admin/hardware/general.php | 3 ++- resources/views/hardware/view.blade.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index 7aa0db7f34..3d1e43c2df 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -42,5 +42,6 @@ return [ 'error_messages' => 'Error messages:', 'success_messages' => 'Success messages:', 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'custom_export' => 'Custom Export', + 'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup', ]; diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 37c495ef85..e5fc43b613 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -598,15 +598,15 @@ @if ($asset->serial && $asset->model->manufacturer) @if ((strtolower($asset->model->manufacturer->name) == "apple") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"appleinc"))) - + @elseif ((strtolower($asset->model->manufacturer->name) == "dell") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"dellinc"))) - Dell Warranty Status Lookup + {{ trans('hardware/general.mfg_warranty_lookup') }} @elseif ((strtolower($asset->model->manufacturer->name) == "lenovo") || (str_starts_with(str_replace(' ','',strtolower($asset->model->manufacturer->name)),"lenovoinc"))) - Lenovo Warranty Status Lookup + {{ trans('hardware/general.mfg_warranty_lookup') }} @endif @endif From fe6295a5e43da2fbc7730128bd0baba0952d9ba0 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Mar 2023 14:43:00 -0700 Subject: [PATCH 6/7] Update slack_* properties to webhook_* --- app/Models/Setting.php | 8 ++++---- app/Models/User.php | 2 +- app/Notifications/AuditNotification.php | 2 +- app/Notifications/CheckinAccessoryNotification.php | 8 ++------ app/Notifications/CheckinAssetNotification.php | 7 +++---- app/Notifications/CheckinLicenseSeatNotification.php | 4 ++-- app/Notifications/CheckoutAccessoryNotification.php | 4 ++-- app/Notifications/CheckoutAssetNotification.php | 6 +++--- app/Notifications/CheckoutConsumableNotification.php | 4 ++-- app/Notifications/CheckoutLicenseSeatNotification.php | 4 ++-- app/Notifications/RequestAssetCancelation.php | 6 +++--- app/Notifications/RequestAssetNotification.php | 4 ++-- resources/views/accessories/checkout.blade.php | 6 +++--- resources/views/consumables/checkout.blade.php | 6 +++--- resources/views/hardware/checkout.blade.php | 6 +++--- resources/views/licenses/checkout.blade.php | 6 +++--- 16 files changed, 39 insertions(+), 44 deletions(-) diff --git a/app/Models/Setting.php b/app/Models/Setting.php index fd02992f75..ecac183356 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -83,9 +83,9 @@ class Setting extends Model 'email_domain', 'email_format', 'username_format', - 'slack_endpoint', - 'slack_channel', - 'slack_botname', + 'webhook_endpoint', + 'webhook_channel', + 'webhook_botname', ]; /** @@ -265,7 +265,7 @@ class Setting extends Model { // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. - return self::getSettings()->slack_endpoint; + return self::getSettings()->webhook_endpoint; } /** diff --git a/app/Models/User.php b/app/Models/User.php index 0e9d839a51..bf40982db3 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -272,7 +272,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo { // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. - $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint; + $this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint; return $this->endpoint; } diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php index 84f1753767..9f5ae96687 100644 --- a/app/Notifications/AuditNotification.php +++ b/app/Notifications/AuditNotification.php @@ -34,7 +34,7 @@ class AuditNotification extends Notification public function via() { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint) { + if (Setting::getSettings()->webhook_endpoint) { $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index f9abba59f9..a375f37ad3 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -39,11 +39,7 @@ class CheckinAccessoryNotification extends Notification \Log::debug('via called'); $notifyBy = []; - if (Setting::getSettings()->slack_endpoint) { - $notifyBy[] = 'slack'; - } - - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -95,7 +91,7 @@ class CheckinAccessoryNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index 9868ad1b4d..e8fdcf678b 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -43,9 +43,8 @@ class CheckinAssetNotification extends Notification public function via() { $notifyBy = []; - - if (Setting::getSettings()->slack_endpoint != '') { - \Log::debug('use slack'); + if (Setting::getSettings()->webhook_endpoint != '') { + \Log::debug('use webhook'); $notifyBy[] = 'slack'; } @@ -65,7 +64,7 @@ class CheckinAssetNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname != '') ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname != '') ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php index faeafecb1b..a68930a683 100644 --- a/app/Notifications/CheckinLicenseSeatNotification.php +++ b/app/Notifications/CheckinLicenseSeatNotification.php @@ -41,7 +41,7 @@ class CheckinLicenseSeatNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -62,7 +62,7 @@ class CheckinLicenseSeatNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; if ($admin) { $fields = [ diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php index 5882fdf275..982fd863c5 100644 --- a/app/Notifications/CheckoutAccessoryNotification.php +++ b/app/Notifications/CheckoutAccessoryNotification.php @@ -37,7 +37,7 @@ class CheckoutAccessoryNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -78,7 +78,7 @@ class CheckoutAccessoryNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index c56c1a3711..303fc08f18 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -53,8 +53,8 @@ class CheckoutAssetNotification extends Notification { $notifyBy = []; - if ((Setting::getSettings()) && (Setting::getSettings()->slack_endpoint != '')) { - \Log::debug('use slack'); + if ((Setting::getSettings()) && (Setting::getSettings()->webhook_endpoint != '')) { + \Log::debug('use webhook'); $notifyBy[] = 'slack'; } @@ -95,7 +95,7 @@ class CheckoutAssetNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php index bfebe2c7d5..84e52fea77 100644 --- a/app/Notifications/CheckoutConsumableNotification.php +++ b/app/Notifications/CheckoutConsumableNotification.php @@ -43,7 +43,7 @@ class CheckoutConsumableNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -84,7 +84,7 @@ class CheckoutConsumableNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php index 50d8313c09..d4741d9beb 100644 --- a/app/Notifications/CheckoutLicenseSeatNotification.php +++ b/app/Notifications/CheckoutLicenseSeatNotification.php @@ -43,7 +43,7 @@ class CheckoutLicenseSeatNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -84,7 +84,7 @@ class CheckoutLicenseSeatNotification extends Notification $admin = $this->admin; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', diff --git a/app/Notifications/RequestAssetCancelation.php b/app/Notifications/RequestAssetCancelation.php index ea76056af3..905900de09 100644 --- a/app/Notifications/RequestAssetCancelation.php +++ b/app/Notifications/RequestAssetCancelation.php @@ -57,8 +57,8 @@ class RequestAssetCancelation extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { - \Log::debug('use slack'); + if (Setting::getSettings()->webhook_endpoint != '') { + \Log::debug('use webhook'); $notifyBy[] = 'slack'; } @@ -73,7 +73,7 @@ class RequestAssetCancelation extends Notification $item = $this->item; $note = $this->note; $qty = $this->item_quantity; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'QTY' => $qty, diff --git a/app/Notifications/RequestAssetNotification.php b/app/Notifications/RequestAssetNotification.php index 22a8f3d464..028719f168 100644 --- a/app/Notifications/RequestAssetNotification.php +++ b/app/Notifications/RequestAssetNotification.php @@ -58,7 +58,7 @@ class RequestAssetNotification extends Notification { $notifyBy = []; - if (Setting::getSettings()->slack_endpoint != '') { + if (Setting::getSettings()->webhook_endpoint != '') { $notifyBy[] = 'slack'; } @@ -73,7 +73,7 @@ class RequestAssetNotification extends Notification $qty = $this->item_quantity; $item = $this->item; $note = $this->note; - $botname = ($this->settings->slack_botname) ? $this->settings->slack_botname : 'Snipe-Bot'; + $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot'; $fields = [ 'QTY' => $qty, diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index 000df2652a..3463d5eff3 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -54,7 +54,7 @@ @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to']) - @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->slack_endpoint!='')) + @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->webhook_endpoint!=''))
@@ -71,9 +71,9 @@
@endif - @if ($snipeSettings->slack_endpoint!='') + @if ($snipeSettings->webhook_endpoint!='') - A slack message will be sent + {{ trans('general.webhook_msg_note') }} @endif
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index 85cec320e2..bc17e893a1 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -41,7 +41,7 @@ @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true']) - @if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->slack_endpoint!='')) + @if ($consumable->requireAcceptance() || $consumable->getEula() || ($snipeSettings->webhook_endpoint!=''))
@@ -58,9 +58,9 @@
@endif - @if ($snipeSettings->slack_endpoint!='') + @if ($snipeSettings->webhook_endpoint!='') - {{ trans('general.slack_msg_note') }} + {{ trans('general.webhook_msg_note') }} @endif
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 98536c80f5..9f91dace17 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -114,7 +114,7 @@
- @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->slack_endpoint!='')) + @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
@@ -131,9 +131,9 @@
@endif - @if ($snipeSettings->slack_endpoint!='') + @if ($snipeSettings->webhook_endpoint!='') - {{ trans('general.slack_msg_note')}} + {{ trans('general.webhook_msg_note') }} @endif
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index 77e58e2fdb..4d41d8c03b 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -65,7 +65,7 @@
- @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->slack_endpoint!='')) + @if ($license->requireAcceptance() || $license->getEula() || ($snipeSettings->webhook_endpoint!=''))
@@ -88,9 +88,9 @@
@endif - @if ($snipeSettings->slack_endpoint!='') + @if ($snipeSettings->webhook_endpoint!='') - {{ trans('general.slack_msg_note') }} + {{ trans('general.webhook_msg_note') }} @endif
From 9d2c4a4dee646f42f5e92b8f0b89e9fa30410297 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 23 Mar 2023 10:38:35 -0700 Subject: [PATCH 7/7] Update webhook message --- resources/lang/en/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index ad96a2bb79..1ad9c376d8 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -253,7 +253,7 @@ return [ 'signature' => 'Signature', 'signed_off_by' => 'Signed Off By', 'skin' => 'Skin', - 'webhook_msg_note' => 'A :app message will be sent', + 'webhook_msg_note' => 'A notification will be sent via webhook', 'webhook_test_msg' => 'Oh hai! Looks like your :app integration with Snipe-IT is working!', 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', 'site_name' => 'Site Name',