Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 12:04:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for displaying recurring invoices in the client portal

Browse Source
This commit is contained in:
David Bomba 2021-01-03 18:56:42 +11:00
parent 7ee0e22978
commit e791741efa
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -32,6 +32,16 @@ class InvitationController extends Controller
use MakesDates; use MakesDates;
public function router(string $entity, string $invitation_key) public function router(string $entity, string $invitation_key)
{
return $this->genericRouter($entity, $invitation_key);
}
public function recurringRouter(string $invitation_key)
{
return $this->genericRouter('recurring_invoice', $invitation_key);
}
private function genericRouter(string $entity, string $invitation_key)
{ {
$key = $entity.'_id'; $key = $entity.'_id';

3
app/Models/RecurringInvoice.php
View File

@ -300,6 +300,9 @@ class RecurringInvoice extends BaseModel
public static function frequencyForKey(int $frequency_id) :string public static function frequencyForKey(int $frequency_id) :string
{ {
switch ($frequency_id) { switch ($frequency_id) {
case self::FREQUENCY_DAILY:
return ctrans('texts.freq_daily');
break;
case self::FREQUENCY_WEEKLY: case self::FREQUENCY_WEEKLY:
return ctrans('texts.freq_weekly'); return ctrans('texts.freq_weekly');
break; break;

2
app/Providers/RouteServiceProvider.php
View File

@ -11,6 +11,7 @@
namespace App\Providers; namespace App\Providers;
use App\Models\RecurringInvoice;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
@ -36,6 +37,7 @@ class RouteServiceProvider extends ServiceProvider
{ {
// //
parent::boot(); parent::boot();
} }
/** /**

3
routes/client.php
View File

@ -34,7 +34,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence
Route::get('invoices/{invoice_invitation}', 'ClientPortal\InvoiceController@show')->name('invoice.show_invitation'); Route::get('invoices/{invoice_invitation}', 'ClientPortal\InvoiceController@show')->name('invoice.show_invitation');
Route::get('recurring_invoices', 'ClientPortal\RecurringInvoiceController@index')->name('recurring_invoices.index')->middleware('portal_enabled'); Route::get('recurring_invoices', 'ClientPortal\RecurringInvoiceController@index')->name('recurring_invoices.index')->middleware('portal_enabled');
Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoices.show'); Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoice.show');
Route::get('recurring_invoices/{recurring_invoice}/request_cancellation', 'ClientPortal\RecurringInvoiceController@requestCancellation')->name('recurring_invoices.request_cancellation'); Route::get('recurring_invoices/{recurring_invoice}/request_cancellation', 'ClientPortal\RecurringInvoiceController@requestCancellation')->name('recurring_invoices.request_cancellation');
Route::post('payments/process', 'ClientPortal\PaymentController@process')->name('payments.process'); Route::post('payments/process', 'ClientPortal\PaymentController@process')->name('payments.process');
@ -78,6 +78,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence
Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
/*Invitation catches*/ /*Invitation catches*/
Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
Route::get('{entity}/{invitation_key}', 'ClientPortal\InvitationController@router'); Route::get('{entity}/{invitation_key}', 'ClientPortal\InvitationController@router');
Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key'); Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key');
Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key'); Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key');