mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
64f9951941
@ -498,12 +498,14 @@ class AccountController extends \BaseController {
|
|||||||
{
|
{
|
||||||
$account = Account::findOrFail(Auth::user()->account_id);
|
$account = Account::findOrFail(Auth::user()->account_id);
|
||||||
$account->name = trim(Input::get('name'));
|
$account->name = trim(Input::get('name'));
|
||||||
|
$account->work_email = trim(Input::get('work_email'));
|
||||||
|
$account->work_phone = trim(Input::get('work_phone'));
|
||||||
$account->address1 = trim(Input::get('address1'));
|
$account->address1 = trim(Input::get('address1'));
|
||||||
$account->address2 = trim(Input::get('address2'));
|
$account->address2 = trim(Input::get('address2'));
|
||||||
$account->city = trim(Input::get('city'));
|
$account->city = trim(Input::get('city'));
|
||||||
$account->state = trim(Input::get('state'));
|
$account->state = trim(Input::get('state'));
|
||||||
$account->postal_code = trim(Input::get('postal_code'));
|
$account->postal_code = trim(Input::get('postal_code'));
|
||||||
$account->country_id = Input::get('country_id') ? Input::get('country_id') : null;
|
$account->country_id = Input::get('country_id') ? Input::get('country_id') : null;
|
||||||
$account->size_id = Input::get('size_id') ? Input::get('size_id') : null;
|
$account->size_id = Input::get('size_id') ? Input::get('size_id') : null;
|
||||||
$account->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null;
|
$account->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null;
|
||||||
$account->timezone_id = Input::get('timezone_id') ? Input::get('timezone_id') : null;
|
$account->timezone_id = Input::get('timezone_id') ? Input::get('timezone_id') : null;
|
||||||
|
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class AddPhoneToAccount extends Migration {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('accounts', function($table)
|
||||||
|
{
|
||||||
|
$table->string('work_phone');
|
||||||
|
$table->string('work_email');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('accounts', function($table)
|
||||||
|
{
|
||||||
|
$table->dropColumn('work_phone');
|
||||||
|
$table->dropColumn('work_email');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -27,6 +27,8 @@
|
|||||||
|
|
||||||
{{ Former::legend('Details') }}
|
{{ Former::legend('Details') }}
|
||||||
{{ Former::text('name') }}
|
{{ Former::text('name') }}
|
||||||
|
{{ Former::text('work_email')->label('Email') }}
|
||||||
|
{{ Former::text('work_phone')->label('Phone') }}
|
||||||
{{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommnded size: 120px width, 80px height') }}
|
{{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommnded size: 120px width, 80px height') }}
|
||||||
|
|
||||||
@if (file_exists($account->getLogoPath()))
|
@if (file_exists($account->getLogoPath()))
|
||||||
|
@ -1397,7 +1397,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$('.word-wrap').each(function(index, input) {
|
$('.word-wrap').each(function(index, input) {
|
||||||
$(input).height($(input).val().split('\n').length * 22);
|
$(input).height($(input).val().split('\n').length * 20);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1468,7 +1468,7 @@
|
|||||||
if (!model.invoice().discount()) model.invoice().discount('');
|
if (!model.invoice().discount()) model.invoice().discount('');
|
||||||
|
|
||||||
ko.applyBindings(model);
|
ko.applyBindings(model);
|
||||||
|
onItemChange();
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -53,7 +53,8 @@ margin-bottom: 0;
|
|||||||
padding-top: 10px;
|
padding-top: 10px;
|
||||||
}
|
}
|
||||||
textarea.form-control {
|
textarea.form-control {
|
||||||
height: auto !important;
|
/*height: auto !important;*/
|
||||||
|
min-height: 40px;
|
||||||
}
|
}
|
||||||
/*tables*/
|
/*tables*/
|
||||||
table.dataTable { border-radius: 3px; border-collapse: collapse;
|
table.dataTable { border-radius: 3px; border-collapse: collapse;
|
||||||
@ -73,7 +74,7 @@ th:last-child {
|
|||||||
tr {border: none;}
|
tr {border: none;}
|
||||||
th {border-left: 1px solid #d26b26; }
|
th {border-left: 1px solid #d26b26; }
|
||||||
.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
|
.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
|
||||||
vertical-align: middle;
|
vertical-align: top;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
border-bottom: 1px solid #dfe0e1;
|
border-bottom: 1px solid #dfe0e1;
|
||||||
}
|
}
|
||||||
|
1329
public/js/script.js
1329
public/js/script.js
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user