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

Forwarding URL automation for v4

Browse Source
This commit is contained in:
David Bomba 2021-11-12 07:29:19 +11:00
parent 7aa172b1db
commit bdecb380fc
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/Http/Controllers/Migration/StepsController.php
View File

@ -107,31 +107,32 @@ class StepsController extends BaseController
public function forwardUrl(Request $request)
{
$this->autoForwardUrl();
if(Utils::isNinjaProd())
return $this->autoForwardUrl();
// $rules = [
// 'url' => 'nullable|url',
// ];
$rules = [
'url' => 'nullable|url',
];
// $validator = Validator::make($request->all(), $rules);
$validator = Validator::make($request->all(), $rules);
// if ($validator->fails()) {
// return back()
// ->withErrors($validator)
// ->withInput();
// }
if ($validator->fails()) {
return back()
->withErrors($validator)
->withInput();
}
// $account_settings = \Auth::user()->account->account_email_settings;
$account_settings = \Auth::user()->account->account_email_settings;
// if(strlen($request->input('url')) == 0) {
// $account_settings->is_disabled = false;
// }
// else {
// $account_settings->is_disabled = true;
// }
if(strlen($request->input('url')) == 0) {
$account_settings->is_disabled = false;
}
else {
$account_settings->is_disabled = true;
}
// $account_settings->forward_url_for_v5 = rtrim($request->input('url'),'/');
// $account_settings->save();
$account_settings->forward_url_for_v5 = rtrim($request->input('url'),'/');
$account_settings->save();
return back();
}
@ -221,7 +222,7 @@ class StepsController extends BaseController
}
return back();
}

2
resources/views/accounts/management.blade.php
View File

@ -283,7 +283,7 @@
<div class="form-group">
<label for="url" class="control-label col-lg-4 col-sm-4 text-right">{!! trans('texts.url') !!}</label>
<div class="col-lg-8 col-sm-8">
<input type="text" name="url" placeholder="https://subdomain.invoicing.co" class="form form-control" value="{{ $account->account_email_settings->forward_url_for_v5}}" disabled>
<input type="text" name="url" placeholder="https://subdomain.invoicing.co" class="form form-control" value="{{ $account->account_email_settings->forward_url_for_v5}}" @if(Utils::isNinjaProd())disabled @endif>
@if($errors->has('url'))
<div class="col-sm-5">
@foreach ($errors->get('url') as $message)