Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/Api/ReportsController.php

@@ -32,13 +32,16 @@ public function index(Request $request)
         }
 
         if (($request->filled('item_type')) && ($request->filled('item_id'))) {
-            $actionlogs = $actionlogs->where('item_id', '=', $request->input('item_id'))
+            $actionlogs = $actionlogs->where(function($query) use ($request)
+            {
+                $query->where('item_id', '=', $request->input('item_id'))
                 ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')))
                 ->orWhere(function($query) use ($request)
                 {
                     $query->where('target_id', '=', $request->input('item_id'))
                     ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));
                 });
+            });
         }
 
         if ($request->filled('action_type')) {

app/Http/Controllers/ReportsController.php

@@ -700,12 +700,13 @@ public function postCustom(CustomAssetReportRequest $request)
             }
 
             if (($request->filled('checkin_date_start'))) {
-                    $assets->whereBetween('last_checkin', [
-                        Carbon::parse($request->input('checkin_date_start'))->startOfDay(),
-                        // use today's date if `checkin_date_end` is not provided
-                        Carbon::parse($request->input('checkin_date_end', now()))->endOfDay(),
-                    ]);
+                $checkin_start = \Carbon::parse($request->input('checkin_date_start'))->startOfDay();
+                        // use today's date is `checkin_date_end` is not provided
+                $checkin_end = \Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();
+
+                $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end ]);
             }
+            //last checkin is exporting, but currently is a date and not a datetime in the custom report ONLY.
 
             if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
                     $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);

app/Http/Transformers/AssetsTransformer.php

@@ -88,6 +88,7 @@ public function transformAsset(Asset $asset)
             'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
             'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '',
             'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
+            'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),
             'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),
             'checkin_counter' => (int) $asset->checkin_counter,

app/Presenters/AssetPresenter.php

@@ -253,6 +253,13 @@ public static function dataTableLayout()
                 'visible' => false,
                 'title' => trans('admin/hardware/table.checkout_date'),
                 'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'last_checkin',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('admin/hardware/table.last_checkin_date'),
+                'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'expected_checkin',
                 'searchable' => false,

resources/lang/aa-ER/admin/settings/general.php

@@ -261,7 +261,7 @@
     'two_factor_enrollment'        => 'crwdns1778:0crwdne1778:0',
     'two_factor_enabled_text'        => 'crwdns1779:0crwdne1779:0',
     'two_factor_reset'        => 'crwdns1780:0crwdne1780:0',
-    'two_factor_reset_help'        => 'crwdns1781:0crwdne1781:0',
+    'two_factor_reset_help'        => 'crwdns12150:0crwdne12150:0',
     'two_factor_reset_success'          => 'crwdns1782:0crwdne1782:0',
     'two_factor_reset_error'          => 'crwdns1783:0crwdne1783:0',
     'two_factor_enabled_warning'        => 'crwdns1784:0crwdne1784:0',

resources/lang/aa-ER/general.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '2FA_reset'             => 'crwdns12148:0crwdne12148:0',
     'accessories'			=> 'crwdns1200:0crwdne1200:0',
     'activated'			    => 'crwdns1540:0crwdne1540:0',
     'accepted_date'         => 'crwdns11295:0crwdne11295:0',
@@ -518,4 +519,13 @@
     ],
     'no_requestable' => 'crwdns12128:0crwdne12128:0',
 
+    'countable' => [
+        'accessories'  => 'crwdns12136:0crwdne12136:0',
+        'assets'  => 'crwdns12138:0crwdne12138:0',
+        'licenses'  => 'crwdns12140:0crwdne12140:0',
+        'license_seats'  => 'crwdns12142:0crwdne12142:0',
+        'consumables'  => 'crwdns12144:0crwdne12144:0',
+        'components'  => 'crwdns12146:0crwdne12146:0',
+    ]
+
 ];

resources/lang/aa-ER/localizations.php

@@ -50,6 +50,7 @@
         'sr-CS' => 'crwdns10642:0crwdne10642:0',
         'sk-SK'=> 'crwdns12002:0crwdne12002:0',
         'sl-SI'=> 'crwdns12004:0crwdne12004:0',
+        'so-SO'=> 'crwdns12134:0crwdne12134:0',
         'es-ES'=> 'crwdns10646:0crwdne10646:0',
         'es-CO'=> 'crwdns10648:0crwdne10648:0',
         'es-MX'=> 'crwdns10650:0crwdne10650:0',

resources/lang/aa-ER/validation.php

@@ -105,6 +105,8 @@
     'gte'                  => [
         'numeric'          => 'crwdns6796:0crwdne6796:0'
     ],
+    'checkboxes'           => 'crwdns12152:0crwdne12152:0',
+    'radio_buttons'        => 'crwdns12154:0crwdne12154:0',
 
 
     /*
@@ -151,4 +153,10 @@
 
     'attributes' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages
+    |--------------------------------------------------------------------------
+    */
+    'invalid_value_in_field' => 'crwdns12156:0crwdne12156:0',
 ];

resources/lang/af-ZA/admin/settings/general.php

@@ -261,7 +261,7 @@
     'two_factor_enrollment'        => 'Twee-faktorinskrywing',
     'two_factor_enabled_text'        => 'Aktiveer twee faktore',
     'two_factor_reset'        => 'Herstel twee-faktor geheim',
-    'two_factor_reset_help'        => 'Dit sal die gebruiker dwing om hul toestel weer met Google Authenticator in te skryf. Dit kan handig wees as hul toestel wat tans ingeskryf is, verlore of gesteel is.',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
     'two_factor_reset_success'          => 'Twee faktor toestel suksesvol herstel',
     'two_factor_reset_error'          => 'Twee faktor toestel herstel het misluk',
     'two_factor_enabled_warning'        => 'As jy twee faktore aktiveer as dit nie tans geaktiveer is nie, sal dit jou dadelik dwing om te verifieer met \'n Google Auth-ingeskrewe toestel. Jy sal die vermoë hê om jou toestel in te skryf as een nie tans ingeskryf is nie.',

resources/lang/af-ZA/general.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '2FA_reset'             => '2FA reset',
     'accessories'			=> 'bykomstighede',
     'activated'			    => 'geaktiveer',
     'accepted_date'         => 'Date Accepted',
@@ -519,4 +520,13 @@
     ],
     'no_requestable' => 'There are no requestable assets or asset models.',
 
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ]
+
 ];

resources/lang/af-ZA/localizations.php

@@ -50,6 +50,7 @@
         'sr-CS' => 'Serbian (Latin)',
         'sk-SK'=> 'Slovak',
         'sl-SI'=> 'Slovenian',
+        'so-SO'=> 'Somali',
         'es-ES'=> 'Spanish',
         'es-CO'=> 'Spanish, Colombia',
         'es-MX'=> 'Spanish, Mexico',

resources/lang/af-ZA/validation.php

@@ -105,6 +105,8 @@
     'gte'                  => [
         'numeric'          => 'Value cannot be negative'
     ],
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
 
 
     /*
@@ -151,4 +153,10 @@
 
     'attributes' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages
+    |--------------------------------------------------------------------------
+    */
+    'invalid_value_in_field' => 'Invalid value included in this field',
 ];

resources/lang/am-ET/admin/settings/general.php

@@ -261,7 +261,7 @@
     'two_factor_enrollment'        => 'Two-Factor Enrollment',
     'two_factor_enabled_text'        => 'Enable Two Factor',
     'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
     'two_factor_reset_success'          => 'Two factor device successfully reset',
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',

resources/lang/am-ET/general.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '2FA_reset'             => '2FA reset',
     'accessories'			=> 'መለዋወጫዎች',
     'activated'			    => 'Activated',
     'accepted_date'         => 'የተቀበለበት ቀን',
@@ -519,4 +520,13 @@
     ],
     'no_requestable' => 'There are no requestable assets or asset models.',
 
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ]
+
 ];

resources/lang/am-ET/localizations.php

@@ -50,6 +50,7 @@
         'sr-CS' => 'Serbian (Latin)',
         'sk-SK'=> 'Slovak',
         'sl-SI'=> 'Slovenian',
+        'so-SO'=> 'Somali',
         'es-ES'=> 'Spanish',
         'es-CO'=> 'Spanish, Colombia',
         'es-MX'=> 'Spanish, Mexico',

resources/lang/am-ET/validation.php

@@ -105,6 +105,8 @@
     'gte'                  => [
         'numeric'          => 'Value cannot be negative'
     ],
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
 
 
     /*
@@ -151,4 +153,10 @@
 
     'attributes' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages
+    |--------------------------------------------------------------------------
+    */
+    'invalid_value_in_field' => 'Invalid value included in this field',
 ];

resources/lang/ar-SA/admin/settings/general.php

@@ -261,7 +261,7 @@
     'two_factor_enrollment'        => 'اثنان عامل التسجيل',
     'two_factor_enabled_text'        => 'تمكين عاملين',
     'two_factor_reset'        => 'إعادة تعيين سر عاملين',
-    'two_factor_reset_help'        => 'سيؤدي هذا إلى إجبار المستخدم على تسجيل أجهزته باستخدام أداة مصادقة غوغل مرة أخرى. ويمكن أن يكون ذلك مفيدا إذا فقدت أو سرقت الجهاز المسجل حاليا.',
+    'two_factor_reset_help'        => 'سيؤدي هذا إلى إجبار المستخدم على تسجيل جهازه مع تطبيق المصادقة الخاص به مرة أخرى. ويمكن أن يكون هذا مفيداً إذا فقدت أو سرقت جهازهم المسجل حالياً. ',
     'two_factor_reset_success'          => 'جهاز عاملين إعادة تعيين بنجاح',
     'two_factor_reset_error'          => 'أخفق إعادة تعيين عامل عامل اثنين',
     'two_factor_enabled_warning'        => 'سيؤدي تمكين عاملين إذا لم يتم تمكينه حاليا إلى إجبارك فورا على المصادقة باستخدام جهاز مسجل في غوغل أوث. سيكون لديك القدرة على تسجيل جهازك إذا كان أحد غير مسجل حاليا.',

resources/lang/ar-SA/general.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '2FA_reset'             => '2FA reset',
     'accessories'			=> 'ملحقات',
     'activated'			    => 'مفعل',
     'accepted_date'         => 'تم تخزين التاريخ',
@@ -519,4 +520,13 @@
     ],
     'no_requestable' => 'لا توجد أصول أو نماذج للأصول التي يمكن طلبها.',
 
+    'countable' => [
+        'accessories'  => ':count ملحقات :count ملحقات',
+        'assets'  => ':count أصول :count أصول',
+        'licenses'  => ':count ترخيص :count تراخيص',
+        'license_seats'  => ':count مقاعد الرخصة<unk> :count مقاعد الرخص',
+        'consumables'  => ':count مستهلكة<unk> :count مستهلك',
+        'components'  => ':count مكون<unk> :count مكونات',
+    ]
+
 ];

resources/lang/ar-SA/localizations.php

@@ -50,6 +50,7 @@
         'sr-CS' => 'Serbian (Latin)',
         'sk-SK'=> 'السلوفاكية',
         'sl-SI'=> 'السلوفينية',
+        'so-SO'=> 'Somali',
         'es-ES'=> 'الإسبانية',
         'es-CO'=> 'الإسبانية، كولومبيا',
         'es-MX'=> 'الإسبانية، المكسيك',

resources/lang/ar-SA/validation.php

@@ -105,6 +105,8 @@
     'gte'                  => [
         'numeric'          => 'لا يمكن أن تكون القيمة سالبة'
     ],
+    'checkboxes'           => ':attribute يحتوي على خيارات غير صالحة.',
+    'radio_buttons'        => ':attribute غير صالح.',
 
 
     /*
@@ -151,4 +153,10 @@
 
     'attributes' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages
+    |--------------------------------------------------------------------------
+    */
+    'invalid_value_in_field' => 'القيمة غير صالحة المدرجة في هذا الحقل',
 ];

resources/lang/bg-BG/admin/hardware/general.php

@@ -27,13 +27,12 @@
     'undeployable_tooltip'  	=> 'Този актив е забранен за изписване и не може да се изпише в момента.',
     'view'  					=> 'Преглед на актив',
     'csv_error' => 'Имате грешка във вашият CSV файл:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'import_text' => '<p>Качи CSV файл, който съдържа историята на активите. Активите и потребителите ТРЯБВА да ги има създадени в системата в противен слуай няма да се импортират. При импортиране на историята на активите, съвпадението се прави по техния инвентарен номер. Ще се опитаме да намерим потребителя на база неговото потребителско име и критерия който сте избрали по-долу. Ще се опита да намери съвпадение по формата на потребителско име избран в <code>Admin &gt; General Settings</code>.</p><p>Полетата включени в CSV файла, трябва да съвпадат с <strong>Инвентарен номер, Име, Дата на изписване, Дата на вписване</strong>. Всякакви допълнителни полета ще бъдат игнорирани. </p><p> Празна дата на вписване или дата в бъдещето ще изпише актива към асоцийрания потребител. Ако не се включи колона с дата на вписване, същата ще бъде създадена със текущата дата.</p>    ',
+    'csv_import_match_f-l' => 'Опитай да намериш съвпадение на потребителите по <strong>Име.Фамилия</strong> (<code>Иван.Иванов</code>)',
+    'csv_import_match_initial_last' => 'Опитай да намериш съвпадение на потребителите по <strong>Първа буква, Фамилия</strong> (<code>ииванов</code>)',
+    'csv_import_match_first' => 'Опитай да намериш съвпадение на потребителите по <strong>Име</strong> (<code>Иван</code>)',
+    'csv_import_match_email' => 'Опитай да намериш съвпадение на потребителите по <strong>email</strong>, като потребителско име',
+    'csv_import_match_username' => 'Опитай да намериш съвпадение на потребителите по <strong>потребителско име</strong>',
     'error_messages' => 'Съобщение за грешка:',
     'success_messages' => 'Успешно:',
     'alert_details' => 'Детайли.',

resources/lang/bg-BG/admin/hardware/message.php

@@ -18,7 +18,7 @@
         'success' 			=> 'Активът обновен успешно.',
         'nothing_updated'	=>  'Няма избрани полета, съответно нищо не беше обновено.',
         'no_assets_selected'  =>  'Няма избрани активи, така че нищо не бе обновено.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'assets_do_not_exist_or_are_invalid' => 'Избраните активи не могат да се обновят.',
     ],
 
     'restore' => [

resources/lang/bg-BG/admin/licenses/general.php

@@ -46,6 +46,6 @@
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Има само :remaining_count лиценз(а) останали от този лиценз с минимално количество от :min_amt. Може да желаете да поръчате допълнително.',
+    'below_threshold_short' => 'Този артикул е под минималното необходимо количество.',
 );