ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 309772e67d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:43:06 2014 -0400

    Fixed operator for setting bool display

commit 139a0a2e2a
Merge: 88459b7 14a9500
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:39:55 2014 -0400

    Merge branch 'develop' of github.com:snipe/snipe-it into develop

commit 88459b755f
Merge: 05fb2a4 e17de3d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:39:22 2014 -0400

    Merge branch 'madd15-patch-2' into develop

commit e17de3d34f
Merge: 062d16b a6cd7c0
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:38:11 2014 -0400

    Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2

commit a6cd7c0bab
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 13:07:57 2014 +1030

    Changed to only one date for checkout date

commit 062d16b2c0
Merge: 05fb2a4 7f44d6d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:22:55 2014 -0400

    Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2

commit 7f44d6dd47
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:48:04 2014 +1030

    Add display_checkout_date to settings table

commit 9125def119
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:41:25 2014 +1030

    Add checkout_date

commit 024972e239
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:35:42 2014 +1030

    Add Checkout Date column

commit b0e1ef6024
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:32:44 2014 +1030

    Add Display Checkout Date

commit d74bddb51f
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:32:06 2014 +1030

    Add display_checkout_date

commit 189523a943
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:30:51 2014 +1030

    Add Display Checkout Date Setting

commit 98b96d372d
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:29:58 2014 +1030

    Add Display Checkout Date Setting

commit 14a9500c6f
Merge: 7bea50f 0e9e659
Author: snipe <snipe@snipe.net>
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 0e9e659dc4
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:40:14 2014 +1030

    Alter State to varchar(32) in Suppliers Table

commit 7bea50feca
Merge: 05fb2a4 fafd03f
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 20:08:31 2014 -0400

    Merge pull request #294 from madd15/patch-4

    Added DB Prefix to Migrations

commit 8f582f29e2
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:17:19 2014 +1030

    Change state to max 32

commit cbf23fc455
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:16:08 2014 +1030

    Update Country, Change to Form::

commit fafd03f00f
Author: madd15 <joshdeakin@adam.com.au>
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 05fb2a434c
Merge: 255b618 e43a945
Author: snipe <snipe@snipe.net>
Date:   Sun Oct 19 18:47:12 2014 -0400

    Merge pull request #283 from madd15/patch-3

    Update table.action to table.actions

commit e43a94586b
Author: madd15 <joshdeakin@adam.com.au>
Date:   Mon Oct 20 08:46:27 2014 +1030

    Update table.action to table.action

commit 0d12428140
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:39:58 2014 +1030

    Reordered, Changed title and added per_page

    Reordered, Changed title and added per_page

commit 692c861594
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:36:31 2014 +1030

    Updated static text to Lang vars

    Updated static text to Lang vars

commit c68d76870e
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:35:56 2014 +1030

    Change all form to use Form:: & update Lang

    Updated <input> to Form::
    Update static text to Lang Vars
This commit is contained in:
snipe
2014-10-23 22:46:20 -04:00
parent 255b618559
commit 599520dff6
23 changed files with 277 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/SettingsController.php
+1
View File
@@ -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'));
app/database/migrations/2013_11_18_164423_set_nullvalues_for_user.php
+4 -3
View File
@@ -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');
}
app/database/migrations/2013_11_19_061409_edit_added_on_asset_logs_table.php
+1 -1
View File
@@ -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');
}
app/database/migrations/2013_11_19_062250_edit_location_id_asset_logs_table.php
+3 -2
View File
@@ -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');
}
app/database/migrations/2013_11_25_104343_alter_warranty_column_on_assets.php
+1 -1
View File
@@ -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)');
}
/**
app/database/migrations/2013_12_06_094618_add_nullable_to_licenses_table.php
+5 -5
View File
@@ -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');
}
/**
app/database/migrations/2014_05_24_093839_alter_default_license_depreciation_id.php
+1 -1
View File
@@ -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"');
}
app/database/migrations/2014_05_27_231658_alter_default_values_licenses.php
+1 -1
View File
@@ -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');
}
/**
app/database/migrations/2014_06_20_004847_make_asset_log_checkedout_to_nullable.php
+1 -1
View File
@@ -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');
}
/**
app/database/migrations/2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php
+1 -1
View File
@@ -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');
}
/**
app/database/migrations/2014_07_17_161625_make_asset_id_in_logs_nullable.php
+1 -1
View File
@@ -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');
}
/**
app/database/migrations/2014_08_12_053504_alpha_0_4_2_release.php
+15 -14
View File
@@ -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');
app/database/migrations/2014_08_17_083523_make_location_id_nullable.php
+1 -1
View File
@@ -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');
}
/**
app/database/migrations/2014_10_24_000417_alter_supplier_state_to_32.php
+28
View File
@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AlterSupplierStateTo32 extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'suppliers MODIFY column state varchar(32) null');
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'suppliers MODIFY column state varchar(2) null');
}
}
app/database/migrations/2014_10_24_015641_add_display_checkout_date.php
+33
View File
@@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddDisplayCheckoutDate extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('settings', function ($table) {
$table->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');
});
}
}
app/lang/en/admin/hardware/table.php
+1
View File
@@ -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',
app/lang/en/admin/settings/general.php
+5 -2
View File
@@ -1,15 +1,18 @@
<?php
return array(
'display_asset_name' => '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 <a href="http://www.php.net/manual/en/image.installation.php">install instructions</a>.',
'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',
);
app/models/Supplier.php
+1 -1
View File
@@ -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',
app/views/backend/hardware/index.blade.php
+10 -1
View File
@@ -61,6 +61,9 @@ $debugbar["messages"]->addMessage("hello world!");
<th class="col-md-2" bSortable="true">@lang('general.status')</th>
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.location')</th>
@if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date)
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.checkout_date')</th>
@endif
<th class="col-md-2">@lang('admin/hardware/table.eol')</th>
<th class="col-md-1">@lang('admin/hardware/table.change')</th>
<th class="col-md-2 actions" bSortable="false">@lang('table.actions')</th>
@@ -113,7 +116,13 @@ $debugbar["messages"]->addMessage("hello world!");
@endif
</td>
@if (Input::get('Deployed') && Setting::getSettings()->display_checkout_date)
<td>
@if (count($asset->assetlog) > 0)
{{{ $asset->assetlog->first()->added_on }}}
@endif
</td>
@endif
<td>
@if ($asset->model->eol)
{{{ $asset->eol_date() }}}
app/views/backend/hardware/view.blade.php
+1 -1
View File
@@ -171,7 +171,7 @@
<tr>
<th class="col-md-3"><span class="line"></span>@lang('general.date')</th>
<th class="col-md-2"><span class="line"></span>@lang('general.admin')</th>
<th class="col-md-2"><span class="line"></span>@lang('table.action')</th>
<th class="col-md-2"><span class="line"></span>@lang('table.actions')</th>
<th class="col-md-2"><span class="line"></span>@lang('general.user')</th>
<th class="col-md-3"><span class="line"></span>@lang('general.notes')</th>
</tr>
app/views/backend/settings/edit.blade.php
+19 -19
View File
@@ -37,46 +37,47 @@ $debugbar["messages"]->addMessage("hello world!");
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
{{ Form::hidden('_token', csrf_token()) }}
@foreach ($settings as $setting)
<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
<label class="control-label" for="site_name">Site Name</label>
{{ Form::label('site_name', Lang::get('admin/settings/general.site_name'), array('class' => 'control-label')) }}
<div class="controls">
<input class="col-md-9" type="text" name="site_name" id="site_name" value="{{{ Input::old('site_name', $setting->site_name) }}}" />
{{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'col-md-9')) }}
{{ $errors->first('site_name', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('display_asset_name') ? 'error' : '' }}">
<label class="control-label" for="display_asset_name">
@lang('admin/settings/general.display_asset_name')
</label>
{{ Form::label('display_asset_name', Lang::get('admin/settings/general.display_asset_name'), array('class' => 'control-label')) }}
<div class="controls">
<input class="col-md-1" type="checkbox" name="display_asset_name" id="display_asset_name" value="1" {{{ $setting->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', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('display_checkout_date') ? 'error' : '' }}">
{{ Form::label('display_checkout_date', Lang::get('admin/settings/general.display_checkout_date'), array('class' => 'control-label')) }}
<div class="controls">
{{ Form::checkbox('display_checkout_date', '1', Input::old('display_checkout_date', $setting->display_checkout_date)) }}
{{ $errors->first('display_checkout_date', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
<label class="control-label" for="per_page">Results Per Page</label>
{{ Form::label('per_page', Lang::get('admin/settings/general.per_page'), array('class' => 'control-label')) }}
<div class="controls">
<input class="col-md-1" type="text" name="per_page" id="per_page" value="{{{ Input::old('per_page', $setting->per_page) }}}" />
{{ Form::text('per_page', Input::old('per_page', $setting->per_page))}}
{{ $errors->first('per_page', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('qr_code') ? 'error' : '' }}">
<label class="control-label" for="qr_code">
@lang('admin/settings/general.display_qr')</label>
{{ Form::label('qr_code', Lang::get('admin/settings/general.display_qr'), array('class' => 'control-label')) }}
<div class="controls">
@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
<span class="help-inline">
@@ -90,10 +91,10 @@ $debugbar["messages"]->addMessage("hello world!");
</div>
<div class="form-group {{ $errors->has('qr_text') ? 'error' : '' }}">
<label class="control-label" for="qr_text"> @lang('admin/settings/general.qr_text')</label>
{{ Form::label('qr_text', Lang::get('admin/settings/general.qr_text'), array('class' => 'control-label')) }}
<div class="controls">
@if ($setting->qr_code === 1)
<input class="col-md-9" type="text" name="qr_text" id="qr_text" value="{{{ Input::old('qr_text', $setting->qr_text) }}}" />
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'col-md-9')) }}
@else
<span class="help-inline">
@lang('admin/settings/general.qr_help')
@@ -127,5 +128,4 @@ $debugbar["messages"]->addMessage("hello world!");
</div>
@stop
app/views/backend/settings/index.blade.php
+20 -11
View File
@@ -2,7 +2,7 @@
{{-- Page title --}}
@section('title')
Settings ::
@lang('admin/settings/general.settings') ::
@parent
@stop
@@ -16,7 +16,7 @@ Settings ::
</div>
<h3 class="name">Settings</h3>
<h3 class="name">@lang('admin/settings/general.settings')</h3>
<div class="row-fluid profile">
@@ -29,41 +29,50 @@ Settings ::
<table class="table table-hover">
<thead>
<tr>
<th class="col-md-3">Setting</th>
<th class="col-md-3"><span class="line"></span>Value</th>
<th class="col-md-3">@lang('admin/settings/general.setting')</th>
<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
</tr>
</thead>
<tbody>
@foreach ($settings as $setting)
<tr>
<td>Site Name</td>
<td>@lang('admin/settings/general.site_name')</td>
<td>{{{ $setting->site_name }}} </td>
</tr>
<tr>
<td>@lang('admin/settings/general.display_asset_name')</td>
@if ($setting->display_asset_name === 1)
@if ($setting->display_asset_name == 1)
<td>Yes</td>
@else
<td>No</td>
@endif
</tr>
<tr>
<td>Per Page</td>
<td>@lang('admin/settings/general.display_checkout_date')</td>
@if ($setting->display_checkout_date == 1)
<td>Yes</td>
@else
<td>No</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.per_page')</td>
<td>{{{ $setting->per_page }}} </td>
</tr>
<tr>
<td>Display QR Codes</td>
@if ($setting->qr_code === 1)
<td>@lang('admin/settings/general.display_qr')</td>
@if ($setting->qr_code == 1)
<td>Yes</td>
@else
<td>No</td>
@endif
</tr>
<tr>
<td>QR Code Text</td>
<td>@lang('admin/settings/general.qr_text')</td>
<td>{{{ $setting->qr_text }}}</td>
</tr>
@endforeach
app/views/backend/suppliers/edit.blade.php
+123 -146
View File
@@ -14,7 +14,7 @@
@section('content')
<div class="row header">
<div class="col-md-12">
<div class="col-md-9">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>
@if ($supplier->id)
@@ -27,161 +27,138 @@
</div>
<div class="user-profile">
<div class="row profile">
<div class="col-md-9 bio">
<div class="row profile">
<div class="col-md-9">
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token -->
{{ Form::token() }}
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
{{ HTML::decode(Form::label('name', Lang::get('admin/suppliers/table.name').' <i class="icon-asterisk"></i>', array('class' => 'col-md-3 control-label'))) }}
<div class="col-md-6">
{{Form::text('name', Input::old('name', $supplier->name), array('class' => 'form-control')) }}
{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
{{ Form::label('address', Lang::get('admin/suppliers/table.address'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('address', Input::old('address', $supplier->address), array('class' => 'form-control')) }}
{{ $errors->first('address', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
{{ Form::label('address2', ' ', array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('address2', Input::old('address2', $supplier->address2), array('class' => 'form-control')) }}
{{ $errors->first('address2', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
{{ Form::label('city', Lang::get('admin/suppliers/table.city'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('city', Input::old('city', $supplier->city), array('class' => 'form-control')) }}
{{ $errors->first('city', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
{{ Form::label('state', Lang::get('admin/suppliers/table.state'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('state', Input::old('state', $supplier->state), array('class' => 'form-control')) }}
{{ $errors->first('state', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
{{ Form::label('country', Lang::get('admin/suppliers/table.country'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-5">
{{ Form::countries('country', Input::old('country', $supplier->country), 'select2') }}
{{ $errors->first('country', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
{{ Form::label('zip', Lang::get('admin/suppliers/table.zip'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('zip', Input::old('zip', $supplier->zip), array('class' => 'form-control')) }}
{{ $errors->first('zip', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
{{ Form::label('contact', Lang::get('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('contact', Input::old('contact', $supplier->contact), array('class' => 'form-control')) }}
{{ $errors->first('contact', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<form class="form-horizontal" method="post" action="" autocomplete="off">
<!-- CSRF Token -->
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="form-group {{ $errors->has('phone') ? ' has-error' : '' }}">
{{ Form::label('phone', Lang::get('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('phone', Input::old('phone', $supplier->phone), array('class' => 'form-control')) }}
{{ $errors->first('phone', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-3 control-label">@lang('admin/suppliers/table.name')
<i class='icon-asterisk'></i></label>
</label>
<div class="col-md-6">
<input class="form-control" type="text" name="name" id="name" value="{{{ Input::old('name', $supplier->name) }}}" />
{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
<div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
{{ Form::label('fax', Lang::get('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('fax', Input::old('fax', $supplier->fax), array('class' => 'form-control')) }}
{{ $errors->first('fax', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
{{ Form::label('email', Lang::get('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('email', Input::old('email', $supplier->email), array('class' => 'form-control')) }}
{{ $errors->first('email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
{{ Form::label('url', Lang::get('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('url', Input::old('url', $supplier->url), array('class' => 'form-control')) }}
{{ $errors->first('url', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
{{ Form::label('notes', Lang::get('admin/suppliers/table.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('notes', Input::old('notes', $supplier->notes), array('class' => 'form-control')) }}
{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Form actions -->
<div class="form-group">
{{ Form::label('', ' ', array('class' => 'col-md-3 control-label')) }}
<div class="col-md-7">
@if ($supplier->id)
<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
@else
<a class="btn btn-link" href="{{ route('suppliers') }}">@lang('general.cancel')</a>
@endif
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>
</div>
<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
<label for="address" class="col-md-3 control-label">@lang('admin/suppliers/table.address')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="address" id="address" value="{{{ Input::old('address', $supplier->address) }}}" />
{{ $errors->first('address', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
</form>
<div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
<label for="address2" class="col-md-3 control-label"></label>
<div class="col-md-6">
<input class="form-control" type="text" name="address2" id="address2" value="{{{ Input::old('address2', $supplier->address2) }}}" />
{{ $errors->first('address2', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
<label for="city" class="col-md-3 control-label">@lang('admin/suppliers/table.city')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="city" id="city" value="{{{ Input::old('city', $supplier->city) }}}" />
{{ $errors->first('city', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
<label for="state" class="col-md-3 control-label">@lang('admin/suppliers/table.state')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="state" id="state" value="{{{ Input::old('state', $supplier->state) }}}" />
{{ $errors->first('state', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
<label for="country" class="col-md-3 control-label">@lang('admin/suppliers/table.country')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="country" id="country" value="{{{ Input::old('country', $supplier->country) }}}" />
{{ $errors->first('country', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
<label for="zip" class="col-md-3 control-label">@lang('admin/suppliers/table.zip')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="zip" id="zip" value="{{{ Input::old('zip', $supplier->zip) }}}" />
{{ $errors->first('zip', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
<label for="contact" class="col-md-3 control-label">@lang('admin/suppliers/table.contact')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="contact" id="contact" value="{{{ Input::old('contact', $supplier->contact) }}}" />
{{ $errors->first('contact', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('phone') ? ' has-error' : '' }}">
<label for="phone" class="col-md-3 control-label">@lang('admin/suppliers/table.phone')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="phone" id="phone" value="{{{ Input::old('phone', $supplier->phone) }}}" />
{{ $errors->first('phone', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
<label for="fax" class="col-md-3 control-label">@lang('admin/suppliers/table.fax')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="fax" id="fax" value="{{{ Input::old('fax', $supplier->fax) }}}" />
{{ $errors->first('fax', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
<label for="email" class="col-md-3 control-label">@lang('admin/suppliers/table.email')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="email" id="email" value="{{{ Input::old('email', $supplier->email) }}}" />
{{ $errors->first('email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
<label for="url" class="col-md-3 control-label">@lang('admin/suppliers/table.url')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="url" id="url" value="{{{ Input::old('url', $supplier->url) }}}" />
{{ $errors->first('url', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
<label for="notes" class="col-md-3 control-label">@lang('admin/suppliers/table.notes')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="notes" id="notes" value="{{{ Input::old('notes', $supplier->notes) }}}" />
{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Form actions -->
<div class="form-group">
<label class="col-md-2 control-label"></label>
<div class="col-md-7">
@if ($supplier->id)
<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
@else
<a class="btn btn-link" href="{{ route('suppliers') }}">@lang('general.cancel')</a>
@endif
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>
</form>
<br><br><br><br>
</div>
<!-- side address column -->
<div class="col-md-3 col-xs-12 address pull-right">
<br /><br />
<h6>Have Some Haiku</h6>
<p>Serious error.<br>
All shortcuts have disappeared.<br>
Screen. Mind. Both are blank.</p>
</div>
</div>
@stop