shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
denisdulici
2018-12-22 15:00:15 +03:00
parent ca0b21b583 26bba7cdbe
commit 4eb8ba2f50
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/css/app.css vendored
View File

@@ -918,7 +918,11 @@ input[type="number"] {
}
/* App Detail Page Sliders Finish */
.select2-results__option:hover{
.select2-results__option {
color: lightslategray;
}
.select2-results__option:hover {
color: white;
background: #6da252;
cursor: pointer;

2
resources/views/expenses/bills/create.blade.php
View File

@@ -223,7 +223,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});

2
resources/views/expenses/bills/edit.blade.php
View File

@@ -204,7 +204,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});

2
resources/views/expenses/bills/item.blade.php
View File

@@ -18,7 +18,7 @@
@stack('quantity_td_start')
<td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}>
@stack('quantity_input_start')
<input value="{{ empty($item) ? '1' : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
<input value="{{ empty($item) ? 1 : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
{!! $errors->first('item.' . $item_row . '.quantity', '<p class="help-block">:message</p>') !!}
@stack('quantity_input_end')
</td>

5
resources/views/incomes/invoices/create.blade.php
View File

@@ -223,7 +223,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new plus"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});
@@ -306,7 +306,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});
@@ -403,6 +403,7 @@
$(document).on('click', '#cancel-discount', function(){
$('#discount').val('');
totalItem();
$('a[rel=popover]').trigger('click');

4
resources/views/incomes/invoices/edit.blade.php
View File

@@ -204,7 +204,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});
@@ -314,7 +314,7 @@
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});

2
resources/views/incomes/invoices/item.blade.php
View File

@@ -18,7 +18,7 @@
@stack('quantity_td_start')
<td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}>
@stack('quantity_input_start')
<input value="{{ empty($item) ? '1' : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
<input value="{{ empty($item) ? 1 : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
{!! $errors->first('item.' . $item_row . '.quantity', '<p class="help-block">:message</p>') !!}
@stack('quantity_input_end')
</td>

2
tests/Feature/Common/ItemsTest.php
View File

@@ -86,7 +86,7 @@ class ItemsTest extends FeatureTestCase
'sale_price' => $this->faker->randomFloat(2, 10, 20),
'quantity' => $this->faker->randomNumber(2),
'category_id' => $this->company->categories()->type('item')->first()->id,
'tax_id' => $this->company->taxes()->enabled()->first()->id,
'tax_id' => '',
'enabled' => $this->faker->boolean ? 1 : 0
];
}