From 599520dff605714dccf60a82a31893dde8ffa8a0 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Oct 2014 22:46:20 -0400 Subject: [PATCH 1/2] Squashed commit of the following: commit 309772e67d62989f1f60141a4a10d724a44c6baa Author: snipe Date: Thu Oct 23 22:43:06 2014 -0400 Fixed operator for setting bool display commit 139a0a2e2aeb02eca9f2135a46f015415a035a72 Merge: 88459b7 14a9500 Author: snipe Date: Thu Oct 23 22:39:55 2014 -0400 Merge branch 'develop' of github.com:snipe/snipe-it into develop commit 88459b755fd42c1b5c9d71fcff3fb7dd1b33b395 Merge: 05fb2a4 e17de3d Author: snipe Date: Thu Oct 23 22:39:22 2014 -0400 Merge branch 'madd15-patch-2' into develop commit e17de3d34fc2bbea6fcb93fc20443e1a83d5434c Merge: 062d16b a6cd7c0 Author: snipe Date: Thu Oct 23 22:38:11 2014 -0400 Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 commit a6cd7c0babd1cd7f4395ffaf1b7d0c744b32b4a6 Author: madd15 Date: Fri Oct 24 13:07:57 2014 +1030 Changed to only one date for checkout date commit 062d16b2c02987163e2cea8ceaba510079c0c627 Merge: 05fb2a4 7f44d6d Author: snipe Date: Thu Oct 23 22:22:55 2014 -0400 Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 commit 7f44d6dd472e561389254923bb468c749a049ced Author: madd15 Date: Fri Oct 24 12:48:04 2014 +1030 Add display_checkout_date to settings table commit 9125def119b3bd226b24b4b4c46309632426b6e1 Author: madd15 Date: Fri Oct 24 12:41:25 2014 +1030 Add checkout_date commit 024972e23959ce88463c9ea84bd0350715aa0410 Author: madd15 Date: Fri Oct 24 12:35:42 2014 +1030 Add Checkout Date column commit b0e1ef6024b1962f3876aa04ae867517987cabb2 Author: madd15 Date: Fri Oct 24 12:32:44 2014 +1030 Add Display Checkout Date commit d74bddb51fe434d25c63353d77e7edeaf2a30e46 Author: madd15 Date: Fri Oct 24 12:32:06 2014 +1030 Add display_checkout_date commit 189523a94341eb7e3684ea0fd5021c69a4921a0a Author: madd15 Date: Fri Oct 24 12:30:51 2014 +1030 Add Display Checkout Date Setting commit 98b96d372dcbdd8bd5a6a321ba334db2c4dbe79d Author: madd15 Date: Fri Oct 24 12:29:58 2014 +1030 Add Display Checkout Date Setting commit 14a9500c6f9f21978581633ea4db2668591af1b3 Merge: 7bea50f 0e9e659 Author: snipe Date: Thu Oct 23 20:12:45 2014 -0400 Merge pull request #293 from madd15/patch-5 Update Country, Change to Form::, Change state to max 32 commit 0e9e659dc403e804e220763f23003c7979f60753 Author: madd15 Date: Fri Oct 24 10:40:14 2014 +1030 Alter State to varchar(32) in Suppliers Table commit 7bea50feca0b82bb3dc45f272d4777d1a45493dc Merge: 05fb2a4 fafd03f Author: snipe Date: Thu Oct 23 20:08:31 2014 -0400 Merge pull request #294 from madd15/patch-4 Added DB Prefix to Migrations commit 8f582f29e2289adf7b12b67820eeb3b8c371b125 Author: madd15 Date: Fri Oct 24 10:17:19 2014 +1030 Change state to max 32 commit cbf23fc4556f5b732dc6e970a17e96a5c3fa0a08 Author: madd15 Date: Fri Oct 24 10:16:08 2014 +1030 Update Country, Change to Form:: commit fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043 Author: madd15 Date: Thu Oct 23 11:47:46 2014 +1030 Added DB Prefix to Migrations Added DB::getTablePrefix(); to migrations to fix #284 not sure if there is another way to achieve this commit 05fb2a434cec4ef7d7dd8140e335ced5076bf750 Merge: 255b618 e43a945 Author: snipe Date: Sun Oct 19 18:47:12 2014 -0400 Merge pull request #283 from madd15/patch-3 Update table.action to table.actions commit e43a94586bef86722181e996225d97f2253ffddd Author: madd15 Date: Mon Oct 20 08:46:27 2014 +1030 Update table.action to table.action commit 0d124281403aef8be7da2e680f867e2035ac9aba Author: madd15 Date: Fri Oct 17 15:39:58 2014 +1030 Reordered, Changed title and added per_page Reordered, Changed title and added per_page commit 692c86159448df83b37ae761008a4013c8a7c7eb Author: madd15 Date: Fri Oct 17 15:36:31 2014 +1030 Updated static text to Lang vars Updated static text to Lang vars commit c68d76870eb3dc29bb6d4c5043873ff00d3c0782 Author: madd15 Date: Fri Oct 17 15:35:56 2014 +1030 Change all form to use Form:: & update Lang Updated to Form:: Update static text to Lang Vars --- app/controllers/admin/SettingsController.php | 1 + ...3_11_18_164423_set_nullvalues_for_user.php | 7 +- ..._061409_edit_added_on_asset_logs_table.php | 2 +- ...2250_edit_location_id_asset_logs_table.php | 5 +- ...104343_alter_warranty_column_on_assets.php | 2 +- ..._094618_add_nullable_to_licenses_table.php | 10 +- ..._alter_default_license_depreciation_id.php | 2 +- ...7_231658_alter_default_values_licenses.php | 2 +- ..._make_asset_log_checkedout_to_nullable.php | 2 +- ...ake_asset_log_purchasedate_to_nullable.php | 2 +- ..._161625_make_asset_id_in_logs_nullable.php | 2 +- .../2014_08_12_053504_alpha_0_4_2_release.php | 29 +- ...08_17_083523_make_location_id_nullable.php | 2 +- ...0_24_000417_alter_supplier_state_to_32.php | 28 ++ ...10_24_015641_add_display_checkout_date.php | 33 +++ app/lang/en/admin/hardware/table.php | 1 + app/lang/en/admin/settings/general.php | 7 +- app/models/Supplier.php | 2 +- app/views/backend/hardware/index.blade.php | 11 +- app/views/backend/hardware/view.blade.php | 2 +- app/views/backend/settings/edit.blade.php | 38 +-- app/views/backend/settings/index.blade.php | 31 +- app/views/backend/suppliers/edit.blade.php | 269 ++++++++---------- 23 files changed, 277 insertions(+), 213 deletions(-) create mode 100644 app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php create mode 100644 app/database/migrations/2014_10_24_015641_add_display_checkout_date.php diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php index 0b235de523..de0fcdacaa 100755 --- a/app/controllers/admin/SettingsController.php +++ b/app/controllers/admin/SettingsController.php @@ -82,6 +82,7 @@ class SettingsController extends AdminController $setting->id = '1'; $setting->site_name = e(Input::get('site_name')); $setting->display_asset_name = e(Input::get('display_asset_name', '0')); + $setting->display_checkout_date = e(Input::get('display_checkout_date', '0')); $setting->per_page = e(Input::get('per_page')); $setting->qr_code = e(Input::get('qr_code', '0')); $setting->qr_text = e(Input::get('qr_text')); diff --git a/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php b/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php index a3a86569a1..2787160b45 100755 --- a/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php +++ b/app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php @@ -9,12 +9,13 @@ class SetNullvaluesForUser extends Migration * * @return void */ + public function up() { // - - DB::statement('ALTER TABLE users MODIFY phone varchar(20) null'); - DB::statement('ALTER TABLE users MODIFY jobtitle varchar(50) null'); + $prefix = DB::getTablePrefix(); + DB::statement('ALTER TABLE '.$prefix.'users MODIFY phone varchar(20) null'); + DB::statement('ALTER TABLE '.$prefix.'users MODIFY jobtitle varchar(50) null'); } diff --git a/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php b/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php index c88d9faf53..293ed3beb2 100755 --- a/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php +++ b/app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php @@ -11,7 +11,7 @@ class EditAddedOnAssetLogsTable extends Migration */ public function up() { - DB::statement('ALTER TABLE asset_logs MODIFY added_on timestamp null'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY added_on timestamp null'); } diff --git a/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php b/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php index 84fa9fdf09..83dd1691c5 100755 --- a/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php +++ b/app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php @@ -11,8 +11,9 @@ class EditLocationIdAssetLogsTable extends Migration */ public function up() { - DB::statement('ALTER TABLE asset_logs MODIFY location_id int(11) null'); - DB::statement('ALTER TABLE asset_logs MODIFY added_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP'); + $prefix=DB::getTablePrefix(); + DB::statement('ALTER TABLE '.$prefix.'asset_logs MODIFY location_id int(11) null'); + DB::statement('ALTER TABLE '.$prefix.'asset_logs MODIFY added_on timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP'); } diff --git a/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php b/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php index d1ebd1a76d..7bd28fb71d 100755 --- a/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php +++ b/app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php @@ -11,7 +11,7 @@ class AlterWarrantyColumnOnAssets extends Migration */ public function up() { - DB::statement('ALTER TABLE assets CHANGE warrantee_months warranty_months int (3)'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'assets CHANGE warrantee_months warranty_months int (3)'); } /** diff --git a/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php b/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php index ddbd4f8b38..97aa5ad6b6 100755 --- a/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php +++ b/app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php @@ -11,11 +11,11 @@ class AddNullableToLicensesTable extends Migration */ public function up() { - // - DB::statement('ALTER TABLE licenses MODIFY order_number varchar(50) null'); - DB::statement('ALTER TABLE licenses MODIFY notes varchar(255) null'); - DB::statement('ALTER TABLE licenses MODIFY license_name varchar(100) null'); - DB::statement('ALTER TABLE licenses MODIFY license_email varchar(120) null'); + $prefix = DB::getTablePrefix(); + DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY order_number varchar(50) null'); + DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY notes varchar(255) null'); + DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY license_name varchar(100) null'); + DB::statement('ALTER TABLE ' . $prefix . 'licenses MODIFY license_email varchar(120) null'); } /** diff --git a/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php b/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php index 1ad04098ef..c88fb67960 100755 --- a/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php +++ b/app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php @@ -13,7 +13,7 @@ class AlterDefaultLicenseDepreciationId extends Migration public function up() { // - DB::statement('ALTER TABLE licenses MODIFY column depreciation_id tinyint(1) NOT NULL DEFAULT "0"'); + DB::statement('ALTER TABLE '.DB::getTablePrefix().'licenses MODIFY column depreciation_id tinyint(1) NOT NULL DEFAULT "0"'); } diff --git a/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php b/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php index c162224df4..8e1d01c04e 100755 --- a/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php +++ b/app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php @@ -13,7 +13,7 @@ class AlterDefaultValuesLicenses extends Migration public function up() { // - DB::statement('ALTER TABLE license_seats MODIFY column notes text NULL'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'license_seats MODIFY column notes text NULL'); } /** diff --git a/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php b/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php index e5a5501443..4b4c739aa3 100755 --- a/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php +++ b/app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php @@ -13,7 +13,7 @@ class MakeAssetLogCheckedoutToNullable extends Migration public function up() { // - DB::statement('ALTER TABLE asset_logs MODIFY column checkedout_to int(11) NULL'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column checkedout_to int(11) NULL'); } /** diff --git a/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php b/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php index f08bce7f26..74c42f2372 100755 --- a/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php +++ b/app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php @@ -13,7 +13,7 @@ class MakeAssetLogPurchasedateToNullable extends Migration public function up() { // - DB::statement('ALTER TABLE licenses MODIFY column purchase_date date NULL'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'licenses MODIFY column purchase_date date NULL'); } /** diff --git a/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php b/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php index 668c4432c7..407de5d68f 100755 --- a/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php +++ b/app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php @@ -13,7 +13,7 @@ class MakeAssetIdInLogsNullable extends Migration { public function up() { // - DB::statement('ALTER TABLE asset_logs MODIFY column asset_id int NULL'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_id int NULL'); } /** diff --git a/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php b/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php index c7932779d4..8ddd9bf1d2 100755 --- a/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php +++ b/app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php @@ -12,21 +12,22 @@ class Alpha042Release extends Migration { */ public function up() { + $prefix = DB::getTablePrefix(); Schema::table('assets', function(Blueprint $table) { // }); - DB::statement('UPDATE assets SET status_id="0" where status_id is null'); - DB::statement('UPDATE assets SET purchase_cost=0 where purchase_cost is null'); - DB::statement('UPDATE models SET eol=0 where eol is null'); - DB::statement('UPDATE users SET location_id=0 where location_id is null'); - DB::statement('UPDATE assets SET asset_tag=" " WHERE asset_tag is null'); - DB::statement('UPDATE locations SET state=" " where state is null'); - DB::statement('UPDATE models SET manufacturer_id="0" where manufacturer_id is null'); - DB::statement('UPDATE models SET category_id="0" where category_id is null'); + DB::statement('UPDATE '.$prefix.'assets SET status_id="0" where status_id is null'); + DB::statement('UPDATE '.$prefix.'assets SET purchase_cost=0 where purchase_cost is null'); + DB::statement('UPDATE '.$prefix.'models SET eol=0 where eol is null'); + DB::statement('UPDATE '.$prefix.'users SET location_id=0 where location_id is null'); + DB::statement('UPDATE '.$prefix.'assets SET asset_tag=" " WHERE asset_tag is null'); + DB::statement('UPDATE '.$prefix.'locations SET state=" " where state is null'); + DB::statement('UPDATE '.$prefix.'models SET manufacturer_id="0" where manufacturer_id is null'); + DB::statement('UPDATE '.$prefix.'models SET category_id="0" where category_id is null'); - DB::statement('ALTER TABLE assets ' + DB::statement('ALTER TABLE '.$prefix.'assets ' . 'MODIFY COLUMN name VARCHAR(255) NULL , ' . 'MODIFY COLUMN asset_tag VARCHAR(255) NOT NULL , ' . 'MODIFY COLUMN purchase_cost DECIMAL(13,4) NOT NULL DEFAULT "0" , ' @@ -36,26 +37,26 @@ class Alpha042Release extends Migration { . 'MODIFY COLUMN archived TINYINT(1) NOT NULL DEFAULT "0" , ' . 'MODIFY COLUMN depreciate TINYINT(1) NOT NULL DEFAULT "0"'); - DB::statement('ALTER TABLE licenses ' + DB::statement('ALTER TABLE '.$prefix.'licenses ' . 'MODIFY COLUMN purchase_cost DECIMAL(13,4) NULL , ' . 'MODIFY COLUMN depreciate TINYINT(1) NULL DEFAULT "0"'); - DB::statement('ALTER TABLE license_seats ' + DB::statement('ALTER TABLE '.$prefix.'license_seats ' . 'MODIFY COLUMN assigned_to INT(11) NULL '); - DB::statement('ALTER TABLE locations ' + DB::statement('ALTER TABLE '.$prefix.'locations ' . 'MODIFY COLUMN state VARCHAR(255) NOT NULL ,' . 'MODIFY COLUMN address2 VARCHAR(255) NULL ,' . 'MODIFY COLUMN zip VARCHAR(10) NULL '); - DB::statement('ALTER TABLE models ' + DB::statement('ALTER TABLE '.$prefix.'models ' . 'MODIFY COLUMN modelno VARCHAR(255) NULL , ' . 'MODIFY COLUMN manufacturer_id INT(11) NOT NULL , ' . 'MODIFY COLUMN category_id INT(11) NOT NULL , ' . 'MODIFY COLUMN depreciation_id INT(11) NOT NULL DEFAULT "0" , ' . 'MODIFY COLUMN eol INT(11) NULL DEFAULT "0"'); - DB::statement('ALTER TABLE users ' + DB::statement('ALTER TABLE '.$prefix.'users ' . 'MODIFY COLUMN first_name VARCHAR(255) NOT NULL , ' . 'MODIFY COLUMN last_name VARCHAR(255) NOT NULL , ' . 'MODIFY COLUMN location_id INT(11) NOT NULL'); diff --git a/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php b/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php index 52c7e28c96..2f41ba09c0 100644 --- a/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php +++ b/app/database/migrations/2014_08_17_083523_make_location_id_nullable.php @@ -13,7 +13,7 @@ class MakeLocationIdNullable extends Migration { public function up() { // - DB::statement('ALTER TABLE users MODIFY column location_id int NULL'); + DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column location_id int NULL'); } /** diff --git a/app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php b/app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php new file mode 100644 index 0000000000..ffff9c545c --- /dev/null +++ b/app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php @@ -0,0 +1,28 @@ +integer('display_checkout_date')->nullable()->default(NULL); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function ($table) { + $table->dropColumn('display_checkout_date'); + }); + } + +} diff --git a/app/lang/en/admin/hardware/table.php b/app/lang/en/admin/hardware/table.php index 33b042f056..2a5a60e1f0 100755 --- a/app/lang/en/admin/hardware/table.php +++ b/app/lang/en/admin/hardware/table.php @@ -6,6 +6,7 @@ return array( 'asset_model' => 'Model', 'book_value' => 'Value', 'change' => 'In/Out', + 'checkout_date' => 'Checkout Date', 'checkoutto' => 'Checked Out', 'diff' => 'Diff', 'dl_csv' => 'Download CSV', diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php index b0d5ed74bd..0bbf434d51 100755 --- a/app/lang/en/admin/settings/general.php +++ b/app/lang/en/admin/settings/general.php @@ -1,15 +1,18 @@ 'Display Asset Name', + 'display_checkout_date' => 'Display Checkout Date', 'display_qr' => 'Display QR Codes', 'info' => 'These settings let you customize certain aspects of your installation.', + 'per_page' => 'Results Per Page', 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', 'qr_help' => 'Enable QR Codes first to set this', 'qr_text' => 'QR Code Text', 'setting' => 'Setting', - 'title' => 'Settings', + 'settings' => 'Settings', + 'site_name' => 'Site Name', 'update' => 'Update Settings', 'value' => 'Value', - 'display_asset_name' => 'Display Asset Name', ); diff --git a/app/models/Supplier.php b/app/models/Supplier.php index 58dea323ee..a832ce2991 100755 --- a/app/models/Supplier.php +++ b/app/models/Supplier.php @@ -8,7 +8,7 @@ class Supplier extends Elegant 'address' => 'alpha_space|min:3|max:50', 'address2' => 'alpha_space|min:2|max:50', 'city' => 'alpha_space|min:3|max:255', - 'state' => 'alpha_space|min:0|max:2', + 'state' => 'alpha_space|min:0|max:32', 'country' => 'alpha_space|min:0|max:2', 'fax' => 'alpha_space|min:7|max:20', 'phone' => 'alpha_space|min:7|max:20', diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index ed5c5a5e7e..4e66a9094d 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -61,6 +61,9 @@ $debugbar["messages"]->addMessage("hello world!"); @lang('general.status') @lang('admin/hardware/table.location') + @if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date) + @lang('admin/hardware/table.checkout_date') + @endif @lang('admin/hardware/table.eol') @lang('admin/hardware/table.change') @lang('table.actions') @@ -113,7 +116,13 @@ $debugbar["messages"]->addMessage("hello world!"); @endif - + @if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date) + + @if (count($asset->assetlog) > 0) + {{{ $asset->assetlog->first()->added_on }}} + @endif + + @endif @if ($asset->model->eol) {{{ $asset->eol_date() }}} diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 43e996b00a..20f1e008cc 100755 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -171,7 +171,7 @@ @lang('general.date') @lang('general.admin') - @lang('table.action') + @lang('table.actions') @lang('general.user') @lang('general.notes') diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index d8b53d43ac..00ca0dee24 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -37,46 +37,47 @@ $debugbar["messages"]->addMessage("hello world!");
- - + {{ Form::hidden('_token', csrf_token()) }} + @foreach ($settings as $setting)
- + {{ Form::label('site_name', Lang::get('admin/settings/general.site_name'), array('class' => 'control-label')) }}
- + {{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'col-md-9')) }} {{ $errors->first('site_name', ':message') }}
- + {{ Form::label('display_asset_name', Lang::get('admin/settings/general.display_asset_name'), array('class' => 'control-label')) }}
- - display_asset_name === 1 ? 'checked' : '' }}} /> - + {{ Form::checkbox('display_asset_name', '1', Input::old('display_asset_name', $setting->display_asset_name)) }} {{ $errors->first('display_asset_name', ':message') }}
- +
+ {{ Form::label('display_checkout_date', Lang::get('admin/settings/general.display_checkout_date'), array('class' => 'control-label')) }} +
+ {{ Form::checkbox('display_checkout_date', '1', Input::old('display_checkout_date', $setting->display_checkout_date)) }} + {{ $errors->first('display_checkout_date', ':message') }} +
+
- + {{ Form::label('per_page', Lang::get('admin/settings/general.per_page'), array('class' => 'control-label')) }}
- + {{ Form::text('per_page', Input::old('per_page', $setting->per_page))}} {{ $errors->first('per_page', ':message') }}
- + {{ Form::label('qr_code', Lang::get('admin/settings/general.display_qr'), array('class' => 'control-label')) }}
@if ($is_gd_installed) - {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code)) }} + {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code)) }} @else @@ -90,10 +91,10 @@ $debugbar["messages"]->addMessage("hello world!");
- + {{ Form::label('qr_text', Lang::get('admin/settings/general.qr_text'), array('class' => 'control-label')) }}
@if ($setting->qr_code === 1) - + {{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'col-md-9')) }} @else @lang('admin/settings/general.qr_help') @@ -127,5 +128,4 @@ $debugbar["messages"]->addMessage("hello world!");
- @stop diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index bde6b2067c..206dff74c2 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -Settings :: + @lang('admin/settings/general.settings') :: @parent @stop @@ -16,7 +16,7 @@ Settings ::
-

Settings

+

@lang('admin/settings/general.settings')

@@ -29,41 +29,50 @@ Settings :: - - + + @foreach ($settings as $setting) - + - @if ($setting->display_asset_name === 1) + @if ($setting->display_asset_name == 1) @else @endif - - + + + + @if ($setting->display_checkout_date == 1) + + @else + + @endif + + + - - @if ($setting->qr_code === 1) + + @if ($setting->qr_code == 1) @else @endif - + @endforeach diff --git a/app/views/backend/suppliers/edit.blade.php b/app/views/backend/suppliers/edit.blade.php index a644a23ac5..2c1a690c80 100755 --- a/app/views/backend/suppliers/edit.blade.php +++ b/app/views/backend/suppliers/edit.blade.php @@ -14,7 +14,7 @@ @section('content')
-
+
@lang('general.back')

@if ($supplier->id) @@ -27,161 +27,138 @@

SettingValue@lang('admin/settings/general.setting')@lang('admin/settings/general.value')
Site Name@lang('admin/settings/general.site_name') {{{ $setting->site_name }}}
@lang('admin/settings/general.display_asset_name')YesNo
Per Page@lang('admin/settings/general.display_checkout_date')YesNo
@lang('admin/settings/general.per_page') {{{ $setting->per_page }}}
Display QR Codes@lang('admin/settings/general.display_qr')YesNo
QR Code Text@lang('admin/settings/general.qr_text') {{{ $setting->qr_text }}}