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

Merge pull request #8976 from turbo124/v5-develop

Browse Source 
V5.7.51
This commit is contained in:
David Bomba 2023-11-15 20:34:25 +11:00 committed by GitHub
commit c5c75f3574
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.50
5.7.51

5
app/Http/Requests/Account/CreateAccountRequest.php
View File

@ -49,6 +49,11 @@ class CreateAccountRequest extends Request
'email' => $email_rules,
'privacy_policy' => 'required|boolean',
'terms_of_service' => 'required|boolean',
'utm_source' => 'sometimes|nullable|string',
'utm_medium' => 'sometimes|nullable|string',
'utm_campaign' => 'sometimes|nullable|string',
'utm_term' => 'sometimes|nullable|string',
'utm_content' => 'sometimes|nullable|string',
];
}

18
app/Jobs/Util/Import.php
View File

@ -365,6 +365,24 @@ class Import implements ShouldQueue
unset($data['plan_expires']);
}
}
else {
if(isset($data['plan']))
$account->plan = $data['plan'];
if (isset($data['plan_term']))
$account->plan_term = $data['plan_term'];
if (isset($data['plan_paid']))
$account->plan_paid = $data['plan_paid'];
if (isset($data['plan_started']))
$account->plan_started = $data['plan_started'];
if (isset($data['plan_expires']))
$account->plan_expires = $data['plan_expires'];
}
$account->fill($data);
$account->save();

14
app/Models/Account.php
View File

@ -110,12 +110,13 @@ class Account extends BaseModel
protected $presenter = AccountPresenter::class;
protected $fillable = [
'plan',
'plan_term',
'plan_price',
'plan_paid',
'plan_started',
'plan_expires',
// 'plan',
// 'plan_term',
// 'plan_price',
// 'plan_paid',
// 'plan_started',
// 'plan_expires',
// 'num_users',
'utm_source',
'utm_medium',
'utm_campaign',
@ -125,7 +126,6 @@ class Account extends BaseModel
'platform',
'set_react_as_default_ap',
'inapp_transaction_id',
'num_users',
];
protected $casts = [

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.50'),
'app_tag' => env('APP_TAG','5.7.50'),
'app_version' => env('APP_VERSION','5.7.51'),
'app_tag' => env('APP_TAG','5.7.51'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

12
routes/client.php
View File

@ -125,12 +125,12 @@ Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'clie
Route::get('invoice/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'invoiceRouter']);
Route::get('quote/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'quoteRouter']);
Route::get('credit/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'creditRouter']);
Route::get('recurring_invoice/{invitation_key}/download_pdf', [RecurringInvoiceController::class, 'downloadPdf'])->name('recurring_invoice.download_invitation_key')->middleware('token_auth');
Route::get('invoice/{invitation_key}/download_pdf', [InvoiceController::class, 'downloadPdf'])->name('invoice.download_invitation_key')->middleware('token_auth');
Route::get('invoice/{invitation_key}/download_e_invoice', [InvoiceController::class, 'downloadEInvoice'])->name('invoice.download_e_invoice')->middleware('token_auth');
Route::get('quote/{invitation_key}/download_pdf', [QuoteController::class, 'downloadPdf'])->name('quote.download_invitation_key')->middleware('token_auth');
Route::get('credit/{invitation_key}/download_pdf', [CreditController::class, 'downloadPdf'])->name('credit.download_invitation_key')->middleware('token_auth');
Route::get('{entity}/{invitation_key}/download', [App\Http\Controllers\ClientPortal\InvitationController::class, 'routerForDownload'])->middleware('token_auth');
Route::get('recurring_invoice/{invitation_key}/download_pdf', [RecurringInvoiceController::class, 'downloadPdf'])->name('recurring_invoice.download_invitation_key');//->middleware('token_auth');
Route::get('invoice/{invitation_key}/download_pdf', [InvoiceController::class, 'downloadPdf'])->name('invoice.download_invitation_key');//->middleware('token_auth');
Route::get('invoice/{invitation_key}/download_e_invoice', [InvoiceController::class, 'downloadEInvoice'])->name('invoice.download_e_invoice');//->middleware('token_auth');
Route::get('quote/{invitation_key}/download_pdf', [QuoteController::class, 'downloadPdf'])->name('quote.download_invitation_key');//->middleware('token_auth');
Route::get('credit/{invitation_key}/download_pdf', [CreditController::class, 'downloadPdf'])->name('credit.download_invitation_key');//->middleware('token_auth');
Route::get('{entity}/{invitation_key}/download', [App\Http\Controllers\ClientPortal\InvitationController::class, 'routerForDownload']);//->middleware('token_auth');
Route::get('pay/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'payInvoice'])->name('pay.invoice');
Route::get('unsubscribe/{entity}/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'unsubscribe'])->name('unsubscribe');