Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 05:32:39 +01:00
Code Issues Releases Activity

Merge pull request #7656 from turbo124/v5-stable

Browse Source 
v5.4.11
This commit is contained in:
David Bomba 2022-07-19 20:25:46 +10:00 committed by GitHub
commit 1401068a9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.4.10
5.4.11

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

@ -179,6 +179,7 @@ class MigrationController extends BaseController
$company->tasks()->forceDelete();
$company->vendors()->forceDelete();
$company->expenses()->forceDelete();
$company->purchase_orders()->forceDelete();
$settings = $company->settings;
@ -196,6 +197,7 @@ class MigrationController extends BaseController
$settings->ticket_number_counter = 1;
$settings->payment_number_counter = 1;
$settings->project_number_counter = 1;
$settings->purchase_order_number_counter = 1;
$company->settings = $settings;

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

@ -120,7 +120,7 @@ class StripeConnectController extends BaseController
$company_gateway->setConfig($payload);
$company_gateway->save();
StripeWebhook::dispatch($company->company_key, $company_gateway->id);
// StripeWebhook::dispatch($company->company_key, $company_gateway->id);
//response here
return view('auth.connect.completed');

4
app/Http/Requests/Company/StoreCompanyRequest.php
View File

@ -63,10 +63,6 @@ class StoreCompanyRequest extends Request
{
$input = $this->all();
//https not sure i should be forcing this.
// if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1)
// $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']);
if (array_key_exists('google_analytics_url', $input)) {
$input['google_analytics_key'] = $input['google_analytics_url'];
}

2
app/Jobs/Company/CompanyImport.php
View File

@ -458,7 +458,7 @@ class CompanyImport implements ShouldQueue
$settings->ticket_number_counter = 1;
$settings->payment_number_counter = 1;
$settings->project_number_counter = 1;
$settings->purchase_order_counter = 1;
$settings->purchase_order_number_counter = 1;
$this->company->settings = $co->settings;
// $this->company->settings = $this->backup_file->company->settings;
$this->company->save();

2
app/Listeners/Invoice/InvoiceArchivedActivity.php
View File

@ -21,7 +21,7 @@ class InvoiceArchivedActivity implements ShouldQueue
{
protected $activity_repo;
public $delay = 5;
public $delay = 15;
/**
* Create the event listener.

2
app/Listeners/Invoice/InvoicePaidActivity.php
View File

@ -21,7 +21,7 @@ class InvoicePaidActivity implements ShouldQueue
{
protected $activity_repo;
public $delay = 5;
public $delay = 10;
/**
* Create the event listener.

8
app/Models/Task.php
View File

@ -71,22 +71,22 @@ class Task extends BaseModel
public function client()
{
return $this->belongsTo(Client::class);
return $this->belongsTo(Client::class)->withTrashed();
}
public function status()
{
return $this->belongsTo(TaskStatus::class);
return $this->belongsTo(TaskStatus::class)->withTrashed();
}
public function invoice()
{
return $this->belongsTo(Invoice::class);
return $this->belongsTo(Invoice::class)->withTrashed();
}
public function project()
{
return $this->belongsTo(Project::class);
return $this->belongsTo(Project::class)->withTrashed();
}

2
app/PaymentDrivers/Stripe/Alipay.php
View File

@ -59,7 +59,7 @@ class Alipay
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded', 'pending'])) {
return $this->processSuccesfulRedirect($request->source);
}

2
app/PaymentDrivers/Stripe/Bancontact.php
View File

@ -81,7 +81,7 @@ class Bancontact
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

2
app/PaymentDrivers/Stripe/EPS.php
View File

@ -80,7 +80,7 @@ class EPS
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

2
app/PaymentDrivers/Stripe/FPX.php
View File

@ -81,7 +81,7 @@ class FPX
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

2
app/PaymentDrivers/Stripe/GIROPAY.php
View File

@ -80,7 +80,7 @@ class GIROPAY
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

2
app/PaymentDrivers/Stripe/PRZELEWY24.php
View File

@ -80,7 +80,7 @@ class PRZELEWY24
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

3
app/PaymentDrivers/Stripe/SOFORT.php
View File

@ -77,10 +77,11 @@ class SOFORT
public function paymentResponse($request)
{
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

2
app/PaymentDrivers/Stripe/iDeal.php
View File

@ -80,7 +80,7 @@ class iDeal
$this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all());
$this->stripe->payment_hash->save();
if ($request->redirect_status == 'succeeded') {
if (in_array($request->redirect_status, ['succeeded','pending'])) {
return $this->processSuccessfulPayment($request->payment_intent);
}

3
app/Services/Invoice/InvoiceService.php
View File

@ -310,6 +310,9 @@ class InvoiceService
elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
$this->invoice->status_id = Invoice::STATUS_PARTIAL;
}
elseif ($this->invoice->balance < 0) {
$this->invoice->status_id = Invoice::STATUS_SENT;
}
return $this;
}

3
app/Utils/Traits/ClientGroupSettingsSaver.php
View File

@ -89,8 +89,9 @@ trait ClientGroupSettingsSaver
if(property_exists($settings, 'translations'))
unset($settings->translations);
//18-07-2022 removed || empty($settings->{$key}) from this check to allow "0" values to persist
foreach ($settings as $key => $value) {
if (! isset($settings->{$key}) || empty($settings->{$key}) || (! is_object($settings->{$key}) && strlen($settings->{$key}) == 0)) {
if (! isset($settings->{$key}) || (! is_object($settings->{$key}) && strlen($settings->{$key}) == 0)) {
unset($settings->{$key});
}
}

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.4.10',
'app_tag' => '5.4.10',
'app_version' => '5.4.11',
'app_tag' => '5.4.11',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),