diff --git a/.chipperci.yml b/.chipperci.yml index fa3b3fd920..663a06350a 100644 --- a/.chipperci.yml +++ b/.chipperci.yml @@ -41,19 +41,18 @@ pipeline: cmd: | # php artisan test --testsuite Feature - - name: Browser Tests - cmd: | - cp -v .env.dusk.example .env.dusk.ci - sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci - sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci - #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci - sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci - sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci - sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci - sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci - - php -S [::0]:8000 -t public 2>server.log & - sleep 2 - php artisan dusk:chrome-driver $CHROME_DRIVER - php artisan dusk --env=ci - +# - name: Browser Tests +# cmd: | +# cp -v .env.dusk.example .env.dusk.ci +# sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci +# sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci +# #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci +# sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci +# sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci +# sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci +# sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci +# +# php -S [::0]:8000 -t public 2>server.log & +# sleep 2 +# php artisan dusk:chrome-driver $CHROME_DRIVER +# php artisan dusk --env=ci diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2a93845507..76c12d3cf9 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -12,6 +12,7 @@ use App\Models\CheckoutRequest; use App\Models\Company; use App\Models\Location; use App\Models\Setting; +use App\Models\Statuslabel; use App\Models\User; use Auth; use Carbon\Carbon; @@ -324,6 +325,12 @@ class AssetsController extends Controller $asset->rtd_location_id = $request->input('rtd_location_id', null); $asset->byod = $request->input('byod', 0); + $status = Statuslabel::find($asset->status_id); + + if($status->archived){ + $asset->assigned_to = null; + } + if ($asset->assigned_to == '') { $asset->location_id = $request->input('rtd_location_id', null); } diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index 303fc08f18..6119c5824b 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -107,7 +107,7 @@ class CheckoutAssetNotification extends Notification } return (new SlackMessage) - ->content(':arrow_up: :computer: Asset Checked Out') + ->content(':arrow_up: :computer: '.trans('mail.Asset_Checkout_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index e31afa51b5..b92ad70dfa 100644 Binary files a/public/css/dist/skins/skin-red-dark.css and b/public/css/dist/skins/skin-red-dark.css differ diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index 9e320f0a58..afe056285f 100644 Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index aac67af304..3d6c3a781c 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -11,7 +11,7 @@ "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9f944e8021781af1ce45d27765d1c0c2", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=cf6c8c340420724b02d6e787ef9bded5", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=a2face0209dca9d5f2421354057e7360", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f0eb9e355b36b41c61c3af3b4d41143", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f4d95ad9d0944587549e35b6929b4b04", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=44f9320d0739f419c9246f7f39395b02", @@ -42,7 +42,7 @@ "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=fc7adb943668ac69fe4b646625a7571f", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=3cb840e047cd0c40484a08c7a8e7cdea", "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=b9a74ec0cd68f83e7480d5ae39919beb", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=a2face0209dca9d5f2421354057e7360", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=7f0eb9e355b36b41c61c3af3b4d41143", "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=cf6c8c340420724b02d6e787ef9bded5", "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9f944e8021781af1ce45d27765d1c0c2", "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=268041e902b019730c23ee3875838005", diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 8d75bbc792..3fded5f067 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -385,6 +385,10 @@ input[type=text], input[type=search] { .box-header.with-border { border-bottom: #000; } +#upload-table tbody > tr.warning > td,#upload-table h3,#upload-table p{ + background-color:#fcf8e3; + color:#000; +} a { color: var(--link); diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index 6bf36b4ebf..7dd8d6181c 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -75,6 +75,7 @@ return [ 'your_credentials' => 'Your Snipe-IT credentials', 'Accessory_Checkin_Notification' => 'Accessory checked in', 'Asset_Checkin_Notification' => 'Asset checked in', + 'Asset_Checkout_Notification' => 'Asset checked out', 'License_Checkin_Notification' => 'License checked in', 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',