Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

model changes

Browse Source
This commit is contained in:
David Bomba 2019-08-27 11:21:25 +10:00
parent 86e786bd07
commit a9bf593708
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Invoice/ApplyPaymentToInvoice.php
View File

@ -13,6 +13,7 @@ namespace App\Jobs\Invoice;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\PaymentTerm;
use App\Repositories\InvoiceRepository;
use App\Utils\Traits\NumberFormatter;
use Illuminate\Bus\Queueable;
@ -85,7 +86,7 @@ class ApplyPaymentToInvoice implements ShouldQueue
if(!$this->invoice->due_date)
$this->invoice->due_date = Carbon::now()->addDays($this->invoice->settings->payment_terms)->format(config('ninja.date_format'));
$this->invoice->due_date = Carbon::now()->addDays(PaymentTerm::find($this->invoice->settings->payment_terms)->num_days)->format(config('ninja.date_format'));
}

2
config/ninja.php
View File

@ -48,7 +48,7 @@ return [
'datetime_moment_format' => env('DEFAULT_DATETIME_MOMENT_FORMAT', 'MMM D, YYYY h:mm:ss a'),
'locale' => env('DEFAULT_LOCALE', 'en'),
'map_zoom' => env('DEFAULT_MAP_ZOOM', 10),
'payment_terms' => env('DEFAULT_PAYMENT_TERMS', 7),
'payment_terms' => env('DEFAULT_PAYMENT_TERMS', 1),
'military_time' => env('MILITARY_TIME', 0),
'start_of_week' => env('START_OF_WEEK',1),
'financial_year_start' => env('FINANCIAL_YEAR_START', '2000-01-01')

2
database/factories/ClientFactory.php
View File

@ -15,7 +15,7 @@ $factory->define(App\Models\Client::class, function (Faker $faker) {
'id_number' => $faker->text(20),
'custom_value1' => $faker->text(20),
'custom_value2' => $faker->text(20),
'payment_terms' => $faker->text(40),
'payment_terms' => 1,
'address1' => $faker->buildingNumber,
'address2' => $faker->streetAddress,
'city' => $faker->city,

2
database/migrations/2014_10_13_000000_create_users_table.php
View File

@ -291,7 +291,7 @@ class CreateUsersTable extends Migration
$table->text('settings');
$table->boolean('is_deleted')->default(false);
$table->string('payment_terms')->nullable(); //todo type? depends how we are storing this
$table->integer('payment_terms')->nullable();
$table->string('vat_number')->nullable();
$table->string('id_number')->nullable();