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

Laravel 9

Browse Source
This commit is contained in:
David Bomba 2022-06-22 21:57:45 +10:00
parent 6edb82308f
commit 865bb009ad
7 changed files with 1129 additions and 1978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/TrustProxies.php
View File

@ -46,7 +46,7 @@ class TrustProxies extends Middleware
*/ */
public function __construct(Repository $config) public function __construct(Repository $config)
{ {
parent::__construct($config); // parent::__construct($config);
if (config('ninja.trusted_proxies')) { if (config('ninja.trusted_proxies')) {
$this->proxies = config('ninja.trusted_proxies'); $this->proxies = config('ninja.trusted_proxies');

2
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -131,7 +131,7 @@ class StoreClientRequest extends Request
$settings->language_id = $this->getLanguageId($input['language_code']); $settings->language_id = $this->getLanguageId($input['language_code']);
} }
$input['settings'] = $settings; $input['settings'] = (array)$settings;
if (isset($input['country_code'])) { if (isset($input['country_code'])) {
$input['country_id'] = $this->getCountryCode($input['country_code']); $input['country_id'] = $this->getCountryCode($input['country_code']);

2
app/Providers/MailServiceProvider.php
View File

@ -28,7 +28,7 @@ class MailServiceProvider extends MailProvider
public function boot() public function boot()
{ {
app('mail.manager')->getSymfonyTransport()->registerPlugin($this->app->make(CssInlinerPlugin::class)); // app('mail.manager')->getSymfonyTransport()->registerPlugin($this->app->make(CssInlinerPlugin::class));
} }
protected function registerIlluminateMailer() protected function registerIlluminateMailer()

15
composer.json
View File

@ -31,20 +31,19 @@
], ],
"type": "project", "type": "project",
"require": { "require": {
"php": "^8.0", "php": "^8.1",
"ext-dom": "*", "ext-dom": "*",
"ext-json": "*", "ext-json": "*",
"ext-libxml": "*", "ext-libxml": "*",
"afosto/yaac": "^1.4", "afosto/yaac": "^1.4",
"asm/php-ansible": "^3", "asm/php-ansible": "^4",
"authorizenet/authorizenet": "^2.0", "authorizenet/authorizenet": "^2.0",
"awobaz/compoships": "^2.1", "awobaz/compoships": "^2.1",
"bacon/bacon-qr-code": "^2.0", "bacon/bacon-qr-code": "^2.0",
"beganovich/snappdf": "^1.7", "beganovich/snappdf": "^2",
"braintree/braintree_php": "^6.0", "braintree/braintree_php": "^6.0",
"checkout/checkout-sdk-php": "^2.5", "checkout/checkout-sdk-php": "^2.5",
"cleverit/ubl_invoice": "^1.3", "cleverit/ubl_invoice": "^1.3",
"coconutcraig/laravel-postmark": "^2.10",
"doctrine/dbal": "^3.0", "doctrine/dbal": "^3.0",
"eway/eway-rapid-php": "^1.3", "eway/eway-rapid-php": "^1.3",
"fakerphp/faker": "^1.14", "fakerphp/faker": "^1.14",
@ -53,10 +52,10 @@
"guzzlehttp/guzzle": "^7.2", "guzzlehttp/guzzle": "^7.2",
"halaxa/json-machine": "^0.7.0", "halaxa/json-machine": "^0.7.0",
"hashids/hashids": "^4.0", "hashids/hashids": "^4.0",
"hedii/laravel-gelf-logger": "^6.0", "hedii/laravel-gelf-logger": "^7.0",
"imdhemy/laravel-purchases": "^0.10.3", "imdhemy/laravel-purchases": "^0.10.3",
"intervention/image": "^2.5", "intervention/image": "^2.5",
"invoiceninja/inspector": "dev-main", "invoiceninja/inspector": "^1.0",
"laracasts/presenter": "^0.2.1", "laracasts/presenter": "^0.2.1",
"laravel/framework": "^9.17", "laravel/framework": "^9.17",
"laravel/slack-notification-channel": "^2.2", "laravel/slack-notification-channel": "^2.2",
@ -86,8 +85,7 @@
"stripe/stripe-php": "^7.50", "stripe/stripe-php": "^7.50",
"symfony/http-client": "^6.0", "symfony/http-client": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2", "tijsverkoyen/css-to-inline-styles": "^2.2",
"turbo124/beacon": "^1.0", "turbo124/beacon": "^1.2",
"turbo124/laravel-gmail": "^5",
"webpatser/laravel-countries": "dev-master#75992ad", "webpatser/laravel-countries": "dev-master#75992ad",
"wepay/php-sdk": "^0.3", "wepay/php-sdk": "^0.3",
"symfony/postmark-mailer": "^6.0" "symfony/postmark-mailer": "^6.0"
@ -100,7 +98,6 @@
"darkaonline/l5-swagger": "8.1.0", "darkaonline/l5-swagger": "8.1.0",
"fakerphp/faker": "^1.14", "fakerphp/faker": "^1.14",
"filp/whoops": "^2.7", "filp/whoops": "^2.7",
"friendsofphp/php-cs-fixer": "^2.16",
"laravel/dusk": "^6.15", "laravel/dusk": "^6.15",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1", "nunomaduro/collision": "^6.1",

3076
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

9
routes/api.php
View File

@ -44,7 +44,9 @@ use App\Http\Controllers\LogoutController;
use App\Http\Controllers\MigrationController; use App\Http\Controllers\MigrationController;
use App\Http\Controllers\OneTimeTokenController; use App\Http\Controllers\OneTimeTokenController;
use App\Http\Controllers\PaymentController; use App\Http\Controllers\PaymentController;
use App\Http\Controllers\PaymentNotificationWebhookController;
use App\Http\Controllers\PaymentTermController; use App\Http\Controllers\PaymentTermController;
use App\Http\Controllers\PaymentWebhookController;
use App\Http\Controllers\PingController; use App\Http\Controllers\PingController;
use App\Http\Controllers\PostMarkController; use App\Http\Controllers\PostMarkController;
use App\Http\Controllers\PreviewController; use App\Http\Controllers\PreviewController;
@ -63,6 +65,7 @@ use App\Http\Controllers\StripeController;
use App\Http\Controllers\SubdomainController; use App\Http\Controllers\SubdomainController;
use App\Http\Controllers\SubscriptionController; use App\Http\Controllers\SubscriptionController;
use App\Http\Controllers\Support\Messages; use App\Http\Controllers\Support\Messages;
use App\Http\Controllers\Support\Messages\SendingController;
use App\Http\Controllers\SystemLogController; use App\Http\Controllers\SystemLogController;
use App\Http\Controllers\TaskController; use App\Http\Controllers\TaskController;
use App\Http\Controllers\TaskSchedulerController; use App\Http\Controllers\TaskSchedulerController;
@ -236,7 +239,7 @@ Route::middleware('throttle:100,1', 'api_db', 'token_auth', 'locale')->prefix('a
Route::resource('task_scheduler', TaskSchedulerController::class)->except('edit')->parameters(['task_scheduler' => 'scheduler']); Route::resource('task_scheduler', TaskSchedulerController::class)->except('edit')->parameters(['task_scheduler' => 'scheduler']);
Route::get('scheduler', [SchedulerController::class, 'index']); Route::get('scheduler', [SchedulerController::class, 'index']);
Route::post('support/messages/send', Support\Messages\SendingController::class); Route::post('support/messages/send', SendingController::class);
Route::post('self-update', [SelfUpdateController::class, 'update'])->middleware('password_protected'); Route::post('self-update', [SelfUpdateController::class, 'update'])->middleware('password_protected');
Route::post('self-update/check_version', [SelfUpdateController::class, 'checkVersion']); Route::post('self-update/check_version', [SelfUpdateController::class, 'checkVersion']);
@ -301,11 +304,11 @@ Route::middleware('throttle:100,1', 'api_db', 'token_auth', 'locale')->prefix('a
// Route::post('apple_pay/upload_file',[ApplyPayController::class, 'upload']); // Route::post('apple_pay/upload_file',[ApplyPayController::class, 'upload']);
}); });
Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', 'PaymentWebhookController') Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', PaymentWebhookController::class)
->middleware(['throttle:1000,1', 'guest']) ->middleware(['throttle:1000,1', 'guest'])
->name('payment_webhook'); ->name('payment_webhook');
Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{company_gateway_id}/{client}', 'PaymentNotificationWebhookController') Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{company_gateway_id}/{client}', PaymentNotificationWebhookController::class)
->middleware(['throttle:1000,1', 'guest']) ->middleware(['throttle:1000,1', 'guest'])
->name('payment_notification_webhook'); ->name('payment_notification_webhook');

1
routes/vendor.php
View File

@ -12,7 +12,6 @@
use App\Http\Controllers\Auth\VendorContactLoginController; use App\Http\Controllers\Auth\VendorContactLoginController;
use App\Http\Controllers\BaseController; use App\Http\Controllers\BaseController;
use App\Http\Controllers\ClientPortal; use App\Http\Controllers\ClientPortal;
use App\Http\Controllers\PurchaseOrderController;
use App\Http\Controllers\VendorPortal\InvitationController; use App\Http\Controllers\VendorPortal\InvitationController;
use App\Http\Controllers\VendorPortal\PurchaseOrderController; use App\Http\Controllers\VendorPortal\PurchaseOrderController;
use App\Http\Controllers\VendorPortal\VendorContactController; use App\Http\Controllers\VendorPortal\VendorContactController;