Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-03 20:26:45 +02:00
parent cfa06662f8
commit 6f87769077
6 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/AccountController.php
View File

@ -498,12 +498,14 @@ class AccountController extends \BaseController {
{
$account = Account::findOrFail(Auth::user()->account_id);
$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->address2 = trim(Input::get('address2'));
$account->city = trim(Input::get('city'));
$account->state = trim(Input::get('state'));
$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->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null;
$account->timezone_id = Input::get('timezone_id') ? Input::get('timezone_id') : null;

36
app/database/migrations/2014_03_03_155556_add_phone_to_account.php Normal file
View File

@ -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');
});
}
}

2
app/views/accounts/details.blade.php
View File

@ -27,6 +27,8 @@
{{ Former::legend('Details') }}
{{ 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') }}
@if (file_exists($account->getLogoPath()))

4
app/views/invoices/edit.blade.php
View File

@ -1397,7 +1397,7 @@
}
$('.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('');
ko.applyBindings(model);
onItemChange();
</script>

4
public/css/style.css
View File

@ -53,7 +53,7 @@ margin-bottom: 0;
padding-top: 10px;
}
textarea.form-control {
height: auto !important;
/*height: auto !important;*/
}
/*tables*/
table.dataTable { border-radius: 3px; border-collapse: collapse;
@ -73,7 +73,7 @@ th:last-child {
tr {border: none;}
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 {
vertical-align: middle;
vertical-align: top;
border-top: none;
border-bottom: 1px solid #dfe0e1;
}

7
public/js/script.js
View File

@ -569,8 +569,7 @@ function GetReportTemplate1 (invoice,checkMath)
var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
var dueDate = invoice.due_date ? invoice.due_date : '';
var paid_to_date=client.paid_to_date;
var paid_to_date = invoice.amount - invoice.balance;
@ -1140,7 +1139,7 @@ function GetReportTemplate2 (invoice,checkMath)
var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
var dueDate = invoice.due_date ? invoice.due_date : '';
var paid_to_date=client.paid_to_date;
var paid_to_date = invoice.amount - invoice.balance;
var headerRight = 150;
var accountTop = 30;
@ -1968,7 +1967,7 @@ function GetReportTemplate3 (invoice,checkMath)
var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
var dueDate = invoice.due_date ? invoice.due_date : '';
var paid_to_date=client.paid_to_date;
var paid_to_date = invoice.amount - invoice.balance;
var headerRight = 150;
var accountTop = 30;