Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
= 2021-05-10 18:17:32 +10:00
commit 438cf2d3ee
26 changed files with 161244 additions and 160856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.example
View File

@ -51,11 +51,13 @@ TRUSTED_PROXIES=
NINJA_ENVIRONMENT=selfhost
PHANTOMJS_PDF_GENERATION=true
#options - snappdf / phantom / hosted_ninja
PDF_GENERATOR=phantom
PHANTOMJS_KEY='a-demo-key-with-low-quota-per-ip-address'
PHANTOMJS_SECRET=secret
UPDATE_SECRET=
UPDATE_SECRET=secret
COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
SENTRY_LARAVEL_DSN=https://cc7e8e2c678041689e53e409b7dba236@sentry.invoicing.co/5

4
app/Http/Controllers/ActivityController.php
View File

@ -141,10 +141,10 @@ class ActivityController extends BaseController
return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404);
}
if (config('ninja.phantomjs_pdf_generation')) {
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
$pdf = (new Phantom)->convertHtmlToPdf($backup->html_backup);
}
elseif(config('ninja.invoiceninja_hosted_pdf_generation')){
elseif(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
$pdf = (new NinjaPdf())->build($backup->html_backup);
}
else {

14
app/Http/Controllers/MigrationController.php
View File

@ -21,6 +21,7 @@ use App\Mail\ExistingMigration;
use App\Mail\Migration\MaxCompanies;
use App\Models\Company;
use App\Models\CompanyToken;
use App\Utils\Ninja;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
@ -378,14 +379,15 @@ class MigrationController extends BaseController
return;
}
// try {
// StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5));
nlog("starting migration job");
nlog($migration_file);
StartMigration::dispatch($migration_file, $user, $fresh_company)->onQueue('migration');
// } catch (\Exception $e) {
// nlog($e->getMessage());
// }
if(Ninja::isHosted())
StartMigration::dispatch($migration_file, $user, $fresh_company)->onQueue('migration');
else
StartMigration::dispatch($migration_file, $user, $fresh_company);
}
}

4
app/Http/Controllers/PreviewController.php
View File

@ -131,11 +131,11 @@ class PreviewController extends BaseController
}
//if phantom js...... inject here..
if (config('ninja.phantomjs_pdf_generation')) {
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
}
if(config('ninja.invoiceninja_hosted_pdf_generation')){
if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
return (new NinjaPdf())->build($maker->getCompiledHTML(true));
}

2
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -200,6 +200,8 @@ class RecurringInvoiceController extends BaseController
{
$recurring_invoice = $this->recurring_invoice_repo->save($request->all(), RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
nlog($recurring_invoice);
return $this->itemResponse($recurring_invoice);
}

1
app/Http/Controllers/SelfUpdateController.php
View File

@ -79,7 +79,6 @@ class SelfUpdateController extends BaseController
if (file_exists($cacheServices)) { unlink ($cacheServices); }
Artisan::call('clear-compiled');
Artisan::call('cache:clear');
Artisan::call('route:clear');
Artisan::call('view:clear');
Artisan::call('config:clear');

14
app/Http/Controllers/StripeConnectController.php
View File

@ -43,20 +43,26 @@ class StripeConnectController extends BaseController
'country' => $request->getCompany()->country()->iso_3166_2,
];
$exists = CompanyGateway::query()
$company_gateway = CompanyGateway::query()
->where('gateway_key', 'd14dd26a47cecc30fdd65700bfb67b34')
->where('company_id', $request->getCompany()->id)
->first();
if ($exists) {
return render('gateways.stripe.connect.existing');
if ($company_gateway) {
$config = decrypt($company_gateway->config);
if(property_exists($config, 'account_id'))
return render('gateways.stripe.connect.existing');
}
$account = Account::create($data);
$link = Account::link($account->id, $token);
$company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->id);
if(!$company_gateway)
$company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->id);
$company_gateway->fill([
'gateway_key' => 'd14dd26a47cecc30fdd65700bfb67b34',

4
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -105,7 +105,7 @@ class CreateEntityPdf implements ShouldQueue
$this->entity->service()->deletePdf();
if (config('ninja.phantomjs_pdf_generation')) {
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
return (new Phantom)->generate($this->invitation);
}
@ -171,7 +171,7 @@ class CreateEntityPdf implements ShouldQueue
try {
if(config('ninja.invoiceninja_hosted_pdf_generation')){
if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
$pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
}
else {

59
app/Jobs/Util/Import.php
View File

@ -84,6 +84,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\UploadedFile;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
@ -462,6 +463,8 @@ class Import implements ShouldQueue
private function checkUniqueConstraint($model, $column, $value)
{
$value = trim($value);
$model_query = (new $model())
->query()
->where($column, $value)
@ -504,10 +507,10 @@ class Import implements ShouldQueue
);
if(array_key_exists('created_at', $modified))
$client->created_at = $modified['created_at'];
$client->created_at = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$client->updated_at = $modified['updated_at'];
$client->updated_at = Carbon::parse($modified['updated_at']);
$client->save(['timestamps' => false]);
@ -584,6 +587,12 @@ class Import implements ShouldQueue
unset($modified['id']);
unset($modified['contacts']);
if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$modified['updated_at'] = Carbon::parse($modified['updated_at']);
$vendor = $vendor_repository->save(
$modified,
VendorFactory::create(
@ -651,6 +660,12 @@ class Import implements ShouldQueue
$modified['company_id'] = $this->company->id;
$modified['user_id'] = $this->processUserId($resource);
if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$modified['updated_at'] = Carbon::parse($modified['updated_at']);
unset($modified['id']);
$product_repository->save(
@ -697,6 +712,12 @@ class Import implements ShouldQueue
$modified['company_id'] = $this->company->id;
$modified['line_items'] = $this->cleanItems($modified['line_items']);
if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$modified['updated_at'] = Carbon::parse($modified['updated_at']);
unset($modified['id']);
if (array_key_exists('invitations', $resource)) {
@ -833,6 +854,12 @@ class Import implements ShouldQueue
$modified['user_id'] = $this->processUserId($resource);
$modified['company_id'] = $this->company->id;
if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$modified['updated_at'] = Carbon::parse($modified['updated_at']);
unset($modified['id']);
$credit = $credit_repository->save(
@ -892,6 +919,18 @@ class Import implements ShouldQueue
$modified['company_id'] = $this->company->id;
if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$modified['updated_at'] = Carbon::parse($modified['updated_at']);
if(array_key_exists('tax_rate1', $modified) && is_null($modified['tax_rate1']))
$modified['tax_rate1'] = 0;
if(array_key_exists('tax_rate2', $modified) && is_null($modified['tax_rate2']))
$modified['tax_rate2'] = 0;
unset($modified['id']);
@ -989,10 +1028,10 @@ class Import implements ShouldQueue
);
if(array_key_exists('created_at', $modified))
$payment->created_at = $modified['created_at'];
$payment->created_at = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$payment->updated_at = $modified['updated_at'];
$payment->updated_at = Carbon::parse($modified['updated_at']);
$payment->save(['timestamps' => false]);
@ -1364,10 +1403,12 @@ class Import implements ShouldQueue
$task = Task::Create($modified);
if(array_key_exists('created_at', $modified))
$task->created_at = $modified['created_at'];
$task->created_at = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$task->updated_at = $modified['updated_at'];
$task->updated_at = Carbon::parse($modified['updated_at']);
$task->save(['timestamps' => false]);
@ -1452,10 +1493,12 @@ class Import implements ShouldQueue
$expense = Expense::Create($modified);
if(array_key_exists('created_at', $modified))
$expense->created_at = $modified['created_at'];
$expense->created_at = Carbon::parse($modified['created_at']);
if(array_key_exists('updated_at', $modified))
$expense->updated_at = $modified['updated_at'];
$expense->updated_at = Carbon::parse($modified['updated_at']);
$expense->save(['timestamps' => false]);

26
app/Jobs/Util/StartMigration.php
View File

@ -91,6 +91,21 @@ class StartMigration implements ShouldQueue
$archive = $zip->open(public_path("storage/{$this->filepath}"));
$filename = pathinfo($this->filepath, PATHINFO_FILENAME);
if($this->company->id == $this->company->account->default_company_id)
{
$new_default_company = $this->company->account->companies->first();
if ($new_default_company) {
$this->company->account->default_company_id = $new_default_company->id;
$this->company->account->save();
}
}
$update_product_flag = $this->company->update_products;
$this->company->update_products = false;
$this->company->save();
try {
if (! $archive) {
throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.');
@ -113,7 +128,16 @@ class StartMigration implements ShouldQueue
Storage::deleteDirectory(public_path("storage/migrations/{$filename}"));
} catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) {
$this->company->account->default_company_id = $this->company->id;
$this->company->account->save();
$this->company->update_products = $update_product_flag;
$this->company->save();
} catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing | \Exception $e) {
$this->company->update_products = $update_product_flag;
$this->company->save();
Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage()));

6
app/Repositories/ActivityRepository.php
View File

@ -80,7 +80,11 @@ class ActivityRepository extends BaseRepository
$backup = new Backup();
if (get_class($entity) == Invoice::class || get_class($entity) == Quote::class || get_class($entity) == Credit::class) {
if (get_class($entity) == Invoice::class
|| get_class($entity) == Quote::class
|| get_class($entity) == Credit::class
|| get_class($entity) == RecurringInvoice::class
) {
$contact = $entity->client->primary_contact()->first();
$backup->html_backup = $this->generateHtml($entity);
$backup->amount = $entity->amount;

5
app/Repositories/BaseRepository.php
View File

@ -302,11 +302,6 @@ class BaseRepository
/* Perform model specific tasks */
if ($model instanceof Invoice) {
nlog("in base");
nlog($state['finished_amount']);
nlog($state['starting_amount']);
nlog($model->status_id);
if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {
$model->service()->updateStatus()->save();

21
app/Repositories/Migration/InvoiceMigrationRepository.php
View File

@ -23,6 +23,7 @@ use App\Models\RecurringInvoiceInvitation;
use App\Repositories\BaseRepository;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments;
use Illuminate\Support\Carbon;
use ReflectionClass;
/**
@ -59,6 +60,12 @@ class InvoiceMigrationRepository extends BaseRepository
$tmp_data = $data;
if(array_key_exists('tax_rate1', $tmp_data) && is_null($tmp_data['tax_rate1']))
$tmp_data['tax_rate1'] = 0;
if(array_key_exists('tax_rate2', $tmp_data) && is_null($tmp_data['tax_rate2']))
$tmp_data['tax_rate2'] = 0;
/* We need to unset some variable as we sometimes unguard the model */
if (isset($tmp_data['invitations'])) {
@ -71,7 +78,15 @@ class InvoiceMigrationRepository extends BaseRepository
$model->fill($tmp_data);
$model->status_id = $tmp_data['status_id'];
$model->save();
if($tmp_data['created_at'])
$model->created_at = Carbon::parse($tmp_data['created_at']);
if($tmp_data['updated_at'])
$model->updated_at = Carbon::parse($tmp_data['updated_at']);
$model->save(['timestamps' => false]);
if (array_key_exists('documents', $data)) {
$this->saveDocuments($data['documents'], $model);
@ -130,10 +145,6 @@ class InvoiceMigrationRepository extends BaseRepository
$model->design_id = $this->decodePrimaryKey($client->getSetting('invoice_design_id'));
}
if ($model->company->update_products) {
//UpdateOrCreateProduct::dispatchNow($model->line_items, $model, $model->company);
}
}
if ($class->name == Credit::class) {

4
app/Services/Invoice/GenerateDeliveryNote.php
View File

@ -60,7 +60,7 @@ class GenerateDeliveryNote
$file_path = sprintf('%s%s_delivery_note.pdf', $this->invoice->client->invoice_filepath(), $this->invoice->number);
if (config('ninja.phantomjs_pdf_generation')) {
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
return (new Phantom)->generate($this->invoice->invitations->first());
}
@ -92,7 +92,7 @@ class GenerateDeliveryNote
// Storage::makeDirectory($this->invoice->client->invoice_filepath(), 0775);
if(config('ninja.invoiceninja_hosted_pdf_generation')){
if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
$pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
}
else {

2
app/Utils/SystemHealth.php
View File

@ -17,6 +17,7 @@ use Exception;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Queue;
/**
* Class SystemHealth.
@ -80,6 +81,7 @@ class SystemHealth
'open_basedir' => (bool)self::checkOpenBaseDir(),
'mail_mailer' => (string)self::checkMailMailer(),
'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'),
'jobs_pending' => (int) Queue::size(),
];
}

2
app/Utils/Traits/AppSetup.php
View File

@ -54,7 +54,7 @@ trait AppSetup
$orderBy = 'id';
}
$tableData = $class::orderBy($orderBy)->get();
if ($tableData->count()) {
if ($tableData->count() > 1) {
Cache::forever($name, $tableData);
}
}

3
config/ninja.php
View File

@ -18,7 +18,7 @@ return [
'app_tag' => '5.1.61-release',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),
'api_secret' => env('API_SECRET', ''),
'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'),
'google_analytics_url' => env('GOOGLE_ANALYTICS_URL', 'https://www.google-analytics.com/collect'),
'key_length' => 64,
@ -148,4 +148,5 @@ return [
'disable_auto_update' => env('DISABLE_AUTO_UPDATE', false),
'invoiceninja_hosted_pdf_generation' => env('NINJA_HOSTED_PDF', false),
'ninja_stripe_key' => env('NINJA_STRIPE_KEY', null),
'pdf_generator' => env('PDF_GENERATOR', false),
];

30
database/migrations/2021_05_10_041528_add_recurring_invoice_id_to_activities_table.php Normal file
View File

@ -0,0 +1,30 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddRecurringInvoiceIdToActivitiesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('activities', function (Blueprint $table) {
$table->unsignedInteger('recurring_invoice_id')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}

2
public/flutter_service_worker.js vendored
View File

@ -30,7 +30,7 @@ const RESOURCES = {
"favicon.png": "dca91c54388f52eded692718d5a98b8b",
"version.json": "7069906ad6cc610c71d600bca7105f49",
"manifest.json": "ce1b79950eb917ea619a0a30da27c6a3",
"main.dart.js": "5b353584f44f0e0be7e2a111520caf7c",
"main.dart.js": "fd54043017e0f068af3799eeac80ee9f",
"favicon.ico": "51636d3a390451561744c42188ccd628",
"/": "23224b5e03519aaa87594403d54412cf"
};

160219
public/main.dart.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/main.dart.js.map
View File

File diff suppressed because one or more lines are too long

161639
public/main.foss.dart.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/main.foss.dart.js.map
View File

File diff suppressed because one or more lines are too long

5
routes/api.php
View File

@ -196,9 +196,4 @@ Route::get('token_hash_router', 'OneTimeTokenController@router');
Route::get('webcron', 'WebCronController@index');
Route::group(['middleware' => ['locale']], function () {
Route::get('stripe_connect/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization');
Route::get('stripe_connect/completed', 'StripeConnectController@completed')->name('stripe_connect.return');
});
Route::fallback('BaseController@notFound');

3
routes/web.php
View File

@ -34,3 +34,6 @@ Route::group(['middleware' => ['url_db']], function () {
Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');
Route::post('/user/confirm/{confirmation_code}', 'UserController@confirmWithPassword');
});
Route::get('stripe/signup/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization');
Route::get('stripe/completed', 'StripeConnectController@completed')->name('stripe_connect.return');

1
tests/Unit/InvitationTest.php
View File

@ -52,7 +52,6 @@ class InvitationTest extends TestCase
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $this->invoice->toArray());
} catch (\Exception $e) {