diff --git a/app/Models/Company.php b/app/Models/Company.php index 4194cd827280..8185da8693a2 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -72,6 +72,7 @@ class Company extends BaseModel ]; protected $fillable = [ + 'enabled_item_tax_rates', 'fill_products', 'industry_id', 'subdomain', @@ -192,7 +193,7 @@ class Company extends BaseModel public function activities() { - return $this->hasMany(Activity::class); + return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(300); } /** diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 1e63b29e1698..47d528baefbb 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -6,6 +6,7 @@ + diff --git a/routes/client.php b/routes/client.php index 5c5e22fc69e1..5be6c2ad86ca 100644 --- a/routes/client.php +++ b/routes/client.php @@ -49,7 +49,9 @@ Route::group(['middleware' => ['auth:contact','locale'], 'prefix' => 'client', ' Route::resource('payment_methods', 'ClientPortal\PaymentMethodController');// name = (payment_methods. index / create / show / update / destroy / edit Route::match(['GET', 'POST'], 'quotes/approve', 'ClientPortal\QuoteController@bulk')->name('quotes.bulk'); - Route::resource('quotes', 'ClientPortal\QuoteController')->only('index', 'show'); + Route::get('quotes', 'ClientPortal\QuoteController@index')->name('quotes.index')->middleware('portal_enabled'); + Route::get('quotes/{quote}', 'ClientPortal\QuoteController@show')->name('quote.show'); + Route::get('quotes/{quote_invitation}', 'ClientPortal\QuoteController@show')->name('quote.show_invitation'); Route::resource('credits', 'ClientPortal\CreditController')->only('index', 'show');