Skip to content

Commit

Permalink
fixed #47
Browse files Browse the repository at this point in the history
  • Loading branch information
@denisdulici
denisdulici committed Oct 31, 2017
1 parent 0c1e026 commit 6d246f0
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 21 deletions.
5 changes: 5 additions & 0 deletions app/Http/Controllers/Api/Incomes/Invoices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ public function store(Request $request)

InvoiceHistory::create($request->input());

// Update next invoice number
$next = setting('general.invoice_number_next', 1) + 1;
setting(['general.invoice_number_next' => $next]);
setting()->save();

// Fire the event to make it extendible
event(new InvoiceCreated($invoice));

Expand Down
13 changes: 12 additions & 1 deletion app/Http/Controllers/Incomes/Invoices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,13 @@ public function create()

$taxes = Tax::enabled()->pluck('name', 'id');

return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes'));
// Generate next invoice number
$prefix = setting('general.invoice_number_prefix', 'INV-');
$next = setting('general.invoice_number_next', '1');
$digit = setting('general.invoice_number_digit', '5');
$number = $prefix . str_pad($next, $digit, '0', STR_PAD_LEFT);

return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'number'));
}

/**
Expand Down Expand Up @@ -345,6 +351,11 @@ public function store(Request $request)

InvoiceHistory::create($request->all());

// Update next invoice number
$next = setting('general.invoice_number_next', 1) + 1;
setting(['general.invoice_number_next' => $next]);
setting()->save();

// Fire the event to make it extendible
event(new InvoiceCreated($invoice));

Expand Down
36 changes: 36 additions & 0 deletions app/Listeners/Updates/Version108.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

namespace App\Listeners\Updates;

use App\Events\UpdateFinished;

class Version108 extends Listener
{
const ALIAS = 'core';

const VERSION = '1.0.8';

/**
* Handle the event.
*
* @param $event
* @return void
*/
public function handle(UpdateFinished $event)
{
// Check if should listen
if (!$this->check($event)) {
return;
}

setting(['general.invoice_number_prefix' => setting('general.invoice_prefix', 'INV-')]);
setting(['general.invoice_number_digit' => setting('general.invoice_digit', '5')]);
setting(['general.invoice_number_next' => setting('general.invoice_start', '1')]);

setting()->forget('general.invoice_prefix');
setting()->forget('general.invoice_digit');
setting()->forget('general.invoice_start');

setting()->save();
}
}
1 change: 1 addition & 0 deletions app/Providers/EventServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class EventServiceProvider extends ServiceProvider
'App\Events\UpdateFinished' => [
'App\Listeners\Updates\Version106',
'App\Listeners\Updates\Version107',
'App\Listeners\Updates\Version108',
],
'Illuminate\Auth\Events\Login' => [
'App\Listeners\Auth\Login',
Expand Down
6 changes: 3 additions & 3 deletions database/seeds/Settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ private function create()
'general.date_format' => 'd M Y',
'general.date_separator' => 'space',
'general.timezone' => 'Europe/London',
'general.invoice_prefix' => 'INV-',
'general.invoice_digit' => '5',
'general.invoice_start' => '1',
'general.invoice_number_prefix' => 'INV-',
'general.invoice_number_digit' => '5',
'general.invoice_number_next' => '1',
'general.default_payment_method' => 'offlinepayment.cash.1',
'general.email_protocol' => 'mail',
'general.email_sendmail_path' => '/usr/sbin/sendmail -bs',
Expand Down
8 changes: 4 additions & 4 deletions resources/lang/en-GB/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
],
'invoice' => [
'tab' => 'Invoice',
'prefix' => 'Invoice Prefix',
'digit' => 'Invoice Number Digit',
'start' => 'Invoice Start Number',
'logo' => 'Invoice Logo',
'prefix' => 'Prefix',
'digit' => 'Number Digit',
'next' => 'Next Number',
'logo' => 'Logo',
],
'default' => [
'tab' => 'Defaults',
Expand Down
4 changes: 2 additions & 2 deletions resources/views/expenses/bills/bill.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/expenses/bills/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/incomes/invoices/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

{{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '']) }}

{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o') }}
{{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o', ['required' => 'required'], $number) }}

{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }}

<div class="form-group col-md-12">
{!! Form::label('items', 'Items', ['class' => 'control-label']) !!}
Expand Down
4 changes: 2 additions & 2 deletions resources/views/incomes/invoices/invoice.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/incomes/invoices/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div class="row invoice-header">
<div class="col-xs-7">
@if (setting('general.invoice_logo'))
<img src="{{ asset(setting('general.invoice_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.invoice_logo')) }}" class="invoice-logo" />
@else
<img src="{{ asset(setting('general.company_logo')) }}" class="invoice-logo" />
<img src="{{ Storage::url(setting('general.company_logo')) }}" class="invoice-logo" />
@endif
</div>
<div class="col-xs-5 invoice-company">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/settings/settings/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
</div>

<div class="tab-pane tab-margin" id="invoice">
{{ Form::textGroup('invoice_prefix', trans('settings.invoice.prefix'), 'font', []) }}
{{ Form::textGroup('invoice_number_prefix', trans('settings.invoice.prefix'), 'font', []) }}

{{ Form::textGroup('invoice_digit', trans('settings.invoice.digit'), 'text-width', []) }}
{{ Form::textGroup('invoice_number_digit', trans('settings.invoice.digit'), 'text-width', []) }}

{{ Form::textGroup('invoice_start', trans('settings.invoice.start'), 'chevron-right', []) }}
{{ Form::textGroup('invoice_number_next', trans('settings.invoice.next'), 'chevron-right', []) }}

{{ Form::fileGroup('invoice_logo', trans('settings.invoice.logo')) }}
</div>
Expand Down

0 comments on commit 6d246f0

Please sign in to comment.