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

Fixes for ach bank import - Stripe

Browse Source
This commit is contained in:
David Bomba 2022-03-16 09:31:35 +11:00
parent e035a75cc3
commit f0ec25a606
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/UserController.php
View File

@ -380,7 +380,7 @@ class UserController extends BaseController
*/ */
public function update(UpdateUserRequest $request, User $user) public function update(UpdateUserRequest $request, User $user)
{ {
$old_company_user = $user->company_user(); $old_company_user = $user->company_user;
$old_user = json_encode($user); $old_user = json_encode($user);
$old_user_email = $user->getOriginal('email'); $old_user_email = $user->getOriginal('email');
@ -398,8 +398,8 @@ class UserController extends BaseController
if( if(
strcasecmp($old_company_user->permissions, $user->company_user()->permissions) != 0 || strcasecmp($old_company_user->permissions, $user->company_user->permissions) != 0 ||
$old_company_user->is_admin != $user->company_user()->is_admin $old_company_user->is_admin != $user->company_user->is_admin
){ ){
$user->company_user()->update(["permissions_updated_at" => now()]); $user->company_user()->update(["permissions_updated_at" => now()]);
} }

3
app/Models/BaseModel.php
View File

@ -21,6 +21,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
/** /**
@ -189,7 +190,7 @@ class BaseModel extends Model
public function numberFormatter() public function numberFormatter()
{ {
$number = strlen($this->number) > 1 ? $this->number : class_basename($this); $number = strlen($this->number) >= 1 ? $this->number : class_basename($this) . "_" . Str::random(5); ;
$formatted_number = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $number); $formatted_number = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $number);
// Remove any runs of periods (thanks falstro!) // Remove any runs of periods (thanks falstro!)

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

@ -107,7 +107,7 @@ class UpdatePaymentMethods
$additional_data = ['gateway_customer_reference' => $customer->id]; $additional_data = ['gateway_customer_reference' => $customer->id];
if($customer->default_source === $method->id) if($customer->default_source === $method->id)
$additional_data = ['gateway_customer_reference' => $customer->id, 'is_default', 1]; $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
$this->stripe->storeGatewayToken($data, $additional_data); $this->stripe->storeGatewayToken($data, $additional_data);