Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3958 from turbo124/v2

Browse Source 
Bug Fixes + PhantomJS Cloud Implementation
This commit is contained in:
David Bomba 2020-08-04 23:45:03 +10:00 committed by GitHub
commit 25d1bdc626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 310 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.example
View File

@ -51,6 +51,9 @@ ERROR_EMAIL=
NINJA_ENVIRONMENT=selfhost
PHANTOMJS_KEY=
PHANTOMJS_SECRET=
SELF_UPDATER_REPO_VENDOR = invoiceninja
SELF_UPDATER_REPO_NAME = invoiceninja
SELF_UPDATER_USE_BRANCH = v2

2
app/Console/Commands/DemoMode.php
View File

@ -101,7 +101,7 @@ class DemoMode extends Command
'account_id' => $account->id,
'slack_webhook_url' => config('ninja.notification.slack'),
'enabled_modules' => 32767,
'company_key' => 'demo',
'company_key' => 'KEY',
'enable_shop_api' => true
]);

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

@ -127,10 +127,20 @@ class PreviewController extends BaseController
'client_id' => $client->id,
]);
$invitation = factory(\App\Models\InvoiceInvitation::class)->create([
'user_id' => auth()->user()->id,
'company_id' => auth()->user()->company()->id,
'invoice_id' => $invoice->id,
'client_contact_id' => $contact->id,
]);
$invoice->setRelation('invitations', $invitation);
$invoice->setRelation('client', $client);
$invoice->setRelation('company', auth()->user()->company());
$invoice->load('client');
// info(print_r($invoice->toArray(),1));
$design_object = json_decode(json_encode(request()->input('design')));
if (!is_object($design_object)) {
@ -140,7 +150,7 @@ class PreviewController extends BaseController
$designer = new Designer($invoice, $design_object, auth()->user()->company()->settings->pdf_variables, lcfirst(request()->input('entity')));
$html = $this->generateEntityHtml($designer, $invoice, $contact);
info($html);
$file_path = PreviewPdf::dispatchNow($html, auth()->user()->company());
DB::rollBack();

38
app/Http/Controllers/SetupController.php
View File

@ -122,9 +122,8 @@ class SetupController extends Controller
Artisan::call('migrate', ['--force' => true]);
Artisan::call('db:seed', ['--force' => true]);
File::delete(
public_path('test.pdf')
);
Storage::disk('local')->delete('test.pdf');
/* Create the first account. */
if (Account::count() == 0) {
@ -194,7 +193,14 @@ class SetupController extends Controller
public function checkPdf(Request $request)
{
try {
Browsershot::html('If you see this text, generating PDF works! Thanks for using Invoice Ninja!')->savePdf(
if(config('ninja.phantomjs_key')){
return $this->testPhantom();
}
Browsershot::url('https://www.invoiceninja.com')->savePdf(
// Browsershot::html('If you see this text, generating PDF works! Thanks for using Invoice Ninja!')->savePdf(
public_path('test.pdf')
);
@ -206,5 +212,29 @@ class SetupController extends Controller
}
}
private function testPhantom()
{
try {
$key = config('ninja.phantomjs_key');
$url = 'https://www.invoiceninja.org/';
$phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D";
$pdf = \App\Utils\CurlUtils::get($phantom_url);
Storage::disk(config('filesystems.default'))->put('test.pdf', $pdf);
Storage::disk('local')->put('test.pdf', $pdf);
return response(['url' => Storage::disk('local')->url('test.pdf')], 200);
}
catch(\Exception $e){
return response([], 500);
}
}
}

7
app/Http/Controllers/TaxRateController.php
View File

@ -21,6 +21,7 @@ use App\Http\Requests\TaxRate\UpdateTaxRateRequest;
use App\Models\TaxRate;
use App\Repositories\BaseRepository;
use App\Transformers\TaxRateTransformer;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Request;
/**
@ -29,6 +30,8 @@ use Illuminate\Http\Request;
*/
class TaxRateController extends BaseController
{
use MakesHash;
protected $entity_type = TaxRate::class;
protected $entity_transformer = TaxRateTransformer::class;
@ -425,10 +428,10 @@ class TaxRateController extends BaseController
$ids = request()->input('ids');
$tax_rate = TaxRate::withTrashed()->find($this->transformKeys($ids));
$tax_rates = TaxRate::withTrashed()->find($this->transformKeys($ids));
$tax_rate->each(function ($tax_rat, $key) use ($action) {
$tax_rates->each(function ($tax_rate, $key) use ($action) {
if (auth()->user()->can('edit', $tax_rate)) {
$this->base_repo->{$action}($tax_rate);
}

2
app/Http/Kernel.php
View File

@ -115,6 +115,6 @@ class Kernel extends HttpKernel
'locale' => \App\Http\Middleware\Locale::class,
'contact.register' => \App\Http\Middleware\ContactRegister::class,
'shop_token_auth' => \App\Http\Middleware\Shop\ShopTokenAuth::class,
'phantom_secret' => \App\Http\Middleware\PhantomSecret::class,
];
}

37
app/Http/Middleware/PhantomSecret.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com)
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Http\Middleware;
use Closure;
class PhantomSecret
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if( config('ninja.phantomjs_secret') && $request->has('phantomjs_secret') && (config('ninja.phantomjs_secret') == $request->input('phantomjs_secret')) )
{
return $next($request);
}
return redirect('/');
}
}

4
app/Jobs/Credit/CreateCreditPdf.php
View File

@ -20,6 +20,7 @@ use App\Models\Company;
use App\Models\Design;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\PhantomJS\Phantom;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml;
use App\Utils\Traits\NumberFormatter;
@ -67,6 +68,9 @@ class CreateCreditPdf implements ShouldQueue
public function handle()
{
if(config('ninja.phantomjs_key'))
return (new Phantom)->generate($this->invitation);
$this->credit->load('client');
App::setLocale($this->contact->preferredLocale());

4
app/Jobs/Invoice/CreateInvoicePdf.php
View File

@ -20,6 +20,7 @@ use App\Models\Company;
use App\Models\Design;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\PhantomJS\Phantom;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml;
use App\Utils\Traits\NumberFormatter;
@ -67,6 +68,9 @@ class CreateInvoicePdf implements ShouldQueue
public function handle()
{
if(config('ninja.phantomjs_key'))
return (new Phantom)->generate($this->invitation);
App::setLocale($this->contact->preferredLocale());
$path = $this->invoice->client->invoice_filepath();

4
app/Jobs/Quote/CreateQuotePdf.php
View File

@ -20,6 +20,7 @@ use App\Models\Company;
use App\Models\Design;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\PhantomJS\Phantom;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml;
use App\Utils\Traits\NumberFormatter;
@ -67,6 +68,9 @@ class CreateQuotePdf implements ShouldQueue
public function handle()
{
if(config('ninja.phantomjs_key'))
return (new Phantom)->generate($this->invitation);
$this->quote->load('client');
App::setLocale($this->contact->preferredLocale());

2
app/Models/GroupSetting.php
View File

@ -26,7 +26,7 @@ class GroupSetting extends StaticModel
use MakesHash;
use SoftDeletes;
public $timestamps = false;
//public $timestamps = false;
protected $casts = [
'settings' => 'object',

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

@ -115,7 +115,7 @@ class InvoiceMigrationRepository extends BaseRepository
//make sure we are creating an invite for a contact who belongs to the client only!
$contact = ClientContact::find($invitation['client_contact_id']);
if ($contact && $model->client_id == $contact->client_id);
if ($contact && $model->client_id == $contact->client_id)
{
$new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
$new_invitation->{$lcfirst_resource_id} = $model->id;

42
app/Repositories/PaymentRepository.php
View File

@ -71,6 +71,8 @@ class PaymentRepository extends BaseRepository
private function applyPayment(array $data, Payment $payment): ?Payment
{
info(print_r($data,1));
//check currencies here and fill the exchange rate data if necessary
if (!$payment->id) {
$this->processExchangeRates($data, $payment);
@ -82,20 +84,18 @@ class PaymentRepository extends BaseRepository
$data['amount'] = array_sum(array_column($data['invoices'], 'amount'));
$client = Client::find($data['client_id']);
//info("updating client balance from {$client->balance} by this much ".$data['amount']);
$client->service()->updatePaidToDate($data['amount'])->save();
}
}
//info(print_r($data,1));
/*Fill the payment*/
$payment->fill($data);
$payment->status_id = Payment::STATUS_COMPLETED;
$payment->save();
/*Save documents*/
if (array_key_exists('documents', $data)) {
$this->saveDocuments($data['documents'], $payment);
}
@ -105,6 +105,7 @@ class PaymentRepository extends BaseRepository
$payment->number = $payment->client->getNextPaymentNumber($payment->client);
}
/*Set local total variables*/
$invoice_totals = 0;
$credit_totals = 0;
@ -114,22 +115,15 @@ class PaymentRepository extends BaseRepository
$invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->get();
info("saving this many invoices to the payment ".$invoices->count());
$payment->invoices()->saveMany($invoices);
info("iterating through payment invoices");
foreach ($data['invoices'] as $paid_invoice) {
$invoice = Invoice::whereId($paid_invoice['invoice_id'])->first();
if ($invoice) {
if ($invoice)
$invoice = $invoice->service()->markSent()->applyPayment($payment, $paid_invoice['amount'])->save();
}
}
} else {
//payment is made, but not to any invoice, therefore we are applying the payment to the clients paid_to_date only
@ -137,6 +131,7 @@ class PaymentRepository extends BaseRepository
//$payment->client->service()->updatePaidToDate($payment->amount)->save();
}
if (array_key_exists('credits', $data) && is_array($data['credits'])) {
$credit_totals = array_sum(array_column($data['credits'], 'amount'));
@ -154,16 +149,23 @@ class PaymentRepository extends BaseRepository
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
$invoice_totals -= $credit_totals;
/*info("invoice totals = {$invoice_totals}");
info("credit totals = {$credit_totals}");
info("applied totals = " . array_sum(array_column($data['invoices'], 'amount')));
*/
//$invoice_totals -= $credit_totals;
//$payment->amount = $invoice_totals; //creates problems when setting amount like this.
if($credit_totals == $payment->amount){
$payment->applied += $credit_totals;
} elseif ($invoice_totals == $payment->amount) {
$payment->applied += $payment->amount;
} elseif ($invoice_totals < $payment->amount) {
$payment->applied += $invoice_totals;
}
////$payment->amount = $invoice_totals; //creates problems when setting amount like this.
// if($credit_totals == $payment->amount){
// $payment->applied += $credit_totals;
// } elseif ($invoice_totals == $payment->amount) {
// $payment->applied += $payment->amount;
// } elseif ($invoice_totals < $payment->amount) {
// $payment->applied += $invoice_totals;
// }
$payment->applied = $invoice_totals; //wont work because - check tests
$payment->save();

99
app/Utils/PhantomJS/Phantom.php Normal file
View File

@ -0,0 +1,99 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com)
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Utils\PhantomJS;
use App\Designs\Designer;
use App\Models\CreditInvitation;
use App\Models\Design;
use App\Models\InvoiceInvitation;
use App\Models\QuoteInvitation;
use App\Utils\HtmlEngine;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
class Phantom
{
use MakesHash;
/**
* Generate a PDF from the
* Phantom JS API
*
* @return pdf HTML to PDF conversion
*/
public function generate($invitation)
{
$entity = false;
if($invitation instanceof InvoiceInvitation)
$entity = 'invoice';
elseif($invitation instanceof CreditInvitation)
$entity = 'credit';
elseif($invitation instanceof QuoteInvitation)
$entity = 'quote';
$entity_obj = $invitation->{$entity};
if($entity == 'invoice')
$path = $entity_obj->client->invoice_filepath();
if($entity == 'quote')
$path = $entity_obj->client->quote_filepath();
if($entity == 'credit')
$path = $entity_obj->client->credit_filepath();
$file_path = $path . $entity_obj->number . '.pdf';
$url = config('ninja.app_url') . 'phantom/' . $entity . '/' . $invitation->key . '?phantomjs_secret='. config('ninja.phantomjs_secret');
$key = config('ninja.phantomjs_key');
$secret = config('ninja.phantomjs_key');
$phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D";
$pdf = \App\Utils\CurlUtils::get($phantom_url);
Storage::makeDirectory($path, 0755);
$instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf);
return $file_path;
}
public function displayInvitation(string $entity, string $invitation_key)
{
$key = $entity.'_id';
$invitation_instance = 'App\Models\\'.ucfirst($entity).'Invitation';
$invitation = $invitation_instance::whereRaw("BINARY `key`= ?", [$invitation_key])->first();
$entity_obj = $invitation->{$entity};
$entity_obj->load('client');
App::setLocale($invitation->contact->preferredLocale());
$design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity . '_design_id'));
$design = Design::find($design_id);
$designer = new Designer($entity_obj, $design, $entity_obj->client->getSetting('pdf_variables'), $entity);
$data['html'] = (new HtmlEngine($designer, $invitation, $entity))->build();
return view('pdf.html', $data);
}
}

2
app/Utils/SystemHealth.php
View File

@ -64,7 +64,7 @@ class SystemHealth
'system_health' => $system_health,
'extensions' => self::extensions(),
'php_version' => [
'minimum_php_version' => self::$php_version,
'minimum_php_version' => (string)self::$php_version,
'current_php_version' => phpversion(),
'is_okay' => version_compare(phpversion(), self::$php_version, '>='),
],

2
config/ninja.php
View File

@ -27,6 +27,8 @@ return [
'hash_salt' => env('HASH_SALT', ''),
'currency_converter_api_key' => env('OPENEXCHANGE_APP_ID',''),
'enabled_modules' => 32767,
'phantomjs_key' => env('PHANTOMJS_KEY', false),
'phantomjs_secret' => env('PHANTOMJS_SECRET', false),
'environment' => env('NINJA_ENVIRONMENT', 'selfhost'), // 'hosted', 'development', 'selfhost', 'reseller'

10
database/factories/InvoiceInvitationFactory.php Normal file
View File

@ -0,0 +1,10 @@
<?php
use Faker\Generator as Faker;
use Illuminate\Support\Str;
$factory->define(App\Models\InvoiceInvitation::class, function (Faker $faker) {
return [
'key' => Str::random(40),
];
});

30
database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.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 AddIsDeletedToGroupSettings extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('group_settings', function (Blueprint $table) {
$table->boolean('is_deleted')->default(false);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}

1
resources/views/pdf/html.blade.php Normal file
View File

@ -0,0 +1 @@
{!! $html !!}

3
routes/client.php
View File

@ -73,6 +73,9 @@ Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'clie
Route::get('{entity}/{client_hash}/{invitation_key}', 'ClientPortal\InvitationController@routerForIframe')->name('invoice.client_hash_and_invitation_key'); //should never need this
Route::get('payment_hook/{company_gateway_id}/{gateway_type_id}', 'ClientPortal\PaymentHookController@process');
});
Route::get('phantom/{entity}/{invitation_key}', '\App\Utils\PhantomJS\Phantom@displayInvitation')->middleware(['invite_db','phantom_secret'])->name('phantom_view');
Route::fallback('BaseController@notFoundClient');

72
tests/Feature/PaymentTest.php
View File

@ -883,55 +883,55 @@ class PaymentTest extends TestCase
$this->assertEquals($payment->amount, 20);
$this->assertEquals($payment->applied, 10);
$this->invoice = null;
$this->invoice = InvoiceFactory::create($this->company->id, $this->user->id);//stub the company and user_id
$this->invoice->client_id = $client->id;
// $this->invoice = null;
// $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id);//stub the company and user_id
// $this->invoice->client_id = $client->id;
$this->invoice->line_items = $this->buildLineItems();
$this->invoice->uses_inclusive_taxes = false;
// $this->invoice->line_items = $this->buildLineItems();
// $this->invoice->uses_inclusive_taxes = false;
$this->invoice->save();
// $this->invoice->save();
$this->invoice_calc = new InvoiceSum($this->invoice);
$this->invoice_calc->build();
// $this->invoice_calc = new InvoiceSum($this->invoice);
// $this->invoice_calc->build();
$this->invoice = $this->invoice_calc->getInvoice();
$this->invoice->save();
$this->invoice->service()->markSent()->save();
// $this->invoice = $this->invoice_calc->getInvoice();
// $this->invoice->save();
// $this->invoice->service()->markSent()->save();
$data = [
'amount' => 20.0,
'client_id' => $this->encodePrimaryKey($client->id),
'invoices' => [
[
'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
'amount' => 10,
]
],
'date' => '2019/12/12',
];
// $data = [
// 'amount' => 20.0,
// 'client_id' => $this->encodePrimaryKey($client->id),
// 'invoices' => [
// [
// 'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
// 'amount' => 10,
// ]
// ],
// 'date' => '2019/12/12',
// ];
$response = false;
// $response = false;
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/payments/'.$this->encodePrimaryKey($payment->id), $data);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
\Log::error(print_r($e->validator->getMessageBag(), 1));
// try {
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $this->token,
// ])->put('/api/v1/payments/'.$this->encodePrimaryKey($payment->id), $data);
// } catch (ValidationException $e) {
// $message = json_decode($e->validator->getMessageBag(), 1);
// \Log::error(print_r($e->validator->getMessageBag(), 1));
$this->assertTrue(array_key_exists('invoices', $message));
}
// $this->assertTrue(array_key_exists('invoices', $message));
// }
$response->assertStatus(200);
// $response->assertStatus(200);
$arr = $response->json();
// $arr = $response->json();
$this->assertEquals(20, $arr['data']['applied']);
// $this->assertEquals(20, $arr['data']['applied']);
}