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

fixed counter

Browse Source
This commit is contained in:
denisdulici 2018-04-27 16:48:59 +03:00
parent 3babf94aac
commit 4b56001806
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Traits/Recurring.php
View File

@ -39,13 +39,15 @@ trait Recurring
$interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
$started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at')); $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at'));
if ($this->has('recurring')->count()) { $recurring = $this->recurring();
if ($recurring->count()) {
$function = 'update'; $function = 'update';
} else { } else {
$function = 'create'; $function = 'create';
} }
$this->recurring()->$function([ $recurring->$function([
'company_id' => session('company_id'), 'company_id' => session('company_id'),
'frequency' => $frequency, 'frequency' => $frequency,
'interval' => $interval, 'interval' => $interval,

5
public/css/app.css vendored
View File

@ -585,3 +585,8 @@ input[type="number"] {
.form-small #currency { .form-small #currency {
width: 10%; width: 10%;
} }
.input-group-recurring {
padding-left: 0;
padding-right: 0;
}

4
resources/views/partials/form/recurring.blade.php
View File

@ -1,5 +1,5 @@
@php @php
if (($page == 'create') || ($model->has('recurring')->count() > 0)) { if (($page == 'create') || !$model->recurring()->count()) {
$frequency = 'no'; $frequency = 'no';
$interval = 1; $interval = 1;
$custom_frequency = 'monthly'; $custom_frequency = 'monthly';
@ -13,7 +13,7 @@
} }
@endphp @endphp
<div class="col-md-6 input-group-recurring" style="padding-left: 0; padding-right: 0;"> <div class="col-md-6 input-group-recurring">
<div class="form-group col-md-12 {{ $errors->has('recurring_frequency') ? 'has-error' : ''}}"> <div class="form-group col-md-12 {{ $errors->has('recurring_frequency') ? 'has-error' : ''}}">
{!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!} {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
<div class="input-group"> <div class="input-group">