diff --git a/Modules/Reports/Http/Controllers/ReportsController.php b/Modules/Reports/Http/Controllers/ReportsController.php index 0efd73af..e22dd8f2 100644 --- a/Modules/Reports/Http/Controllers/ReportsController.php +++ b/Modules/Reports/Http/Controllers/ReportsController.php @@ -9,39 +9,31 @@ use Illuminate\Support\Facades\Gate; class ReportsController extends Controller { - public function profitLossReport() { - abort_if(Gate::denies('access_profit_loss_report'), 403); + public function __construct() { + abort_if(Gate::denies('access_reports'), 403); + } + public function profitLossReport() { return view('reports::profit-loss.index'); } public function paymentsReport() { - abort_if(Gate::denies('access_payments_report'), 403); - return view('reports::payments.index'); } public function salesReport() { - abort_if(Gate::denies('access_sales_report'), 403); - return view('reports::sales.index'); } public function purchasesReport() { - abort_if(Gate::denies('access_purchases_report'), 403); - return view('reports::purchases.index'); } public function salesReturnReport() { - abort_if(Gate::denies('access_sales_return_report'), 403); - return view('reports::sales-return.index'); } public function purchasesReturnReport() { - abort_if(Gate::denies('access_purchases_return_report'), 403); - return view('reports::purchases-return.index'); } } diff --git a/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php b/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php index 4aebba92..4e436e39 100644 --- a/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php +++ b/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php @@ -22,7 +22,7 @@ class SettingDatabaseSeeder extends Seeder 'notification_email' => 'notification@test.com', 'default_currency_id' => 1, 'default_currency_position' => 'prefix', - 'footer_text' => 'Triangle Pos © 2021 || Developed by Fahim Anzam', + 'footer_text' => 'Triangle Pos © 2021 || Developed by Fahim Anzam', 'company_address' => 'Tangail, Bangladesh' ]); } diff --git a/Modules/User/Database/Seeders/PermissionsTableSeeder.php b/Modules/User/Database/Seeders/PermissionsTableSeeder.php index e39584f5..eda33f72 100644 --- a/Modules/User/Database/Seeders/PermissionsTableSeeder.php +++ b/Modules/User/Database/Seeders/PermissionsTableSeeder.php @@ -105,6 +105,8 @@ class PermissionsTableSeeder extends Seeder 'delete_purchase_returns', //Purchase Return Payments 'access_purchase_return_payments', + //Reports + 'access_reports', //Currencies 'access_currencies', 'create_currencies', diff --git a/Modules/User/Resources/views/roles/edit.blade.php b/Modules/User/Resources/views/roles/edit.blade.php index 4d1d23a4..47e731f7 100644 --- a/Modules/User/Resources/views/roles/edit.blade.php +++ b/Modules/User/Resources/views/roles/edit.blade.php @@ -782,6 +782,27 @@ + +
+
+
+ Reports +
+
+
+
+
+ hasPermissionTo('access_reports') ? 'checked' : '' }}> + +
+
+
+
+
+
+
diff --git a/README.md b/README.md index 5955a0b1..f8c33286 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Triangle POS](public/images/logo-dark.png) ->This Project is ready for Testing & also for Production. (Only Reports are not available right now). +> This Project is ready for Production. If you find any bug or have any suggestion please create an Issue. -# Installation +# Local Installation - run `` git clone https://github.com/FahimAnzamDip/triangle-pos.git `` - run ``composer update `` @@ -15,13 +15,14 @@ - run `` php artisan serve `` - then visit `` http://localhost:8000 or http://127.0.0.1:8000 ``. +> **Important Note:** "Triangle POS" uses Laravel Snappy Package for PDFs. If you are using Linux then no configuration is needed. But in other Operating Systems please refer to [Laravel Snappy Documentation](https://github.com/barryvdh/laravel-snappy). # Admin Credentials > Email: admin@test.com || Password: 12345678 ## Demo ![Triangle POS](public/images/screenshot.jpg) -[Live Link] (https://soon.will.be.available) +**Live Demo:** https://soon.will.be.available ## Triangle POS Features @@ -37,7 +38,7 @@ - **Product Multiple Images** - **Multiple Currency Settings** - **System Settings** -- **Various Reports (Upcoming)** +- **Reports** # License **[Creative Commons Attribution 4.0 cc-by-4.0](https://creativecommons.org/licenses/by/4.0/)** diff --git a/public/images/screenshot.jpg b/public/images/screenshot.jpg index e3ed3a73..1ccd6a3c 100644 Binary files a/public/images/screenshot.jpg and b/public/images/screenshot.jpg differ diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index 2f528451..11c7f751 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -233,54 +233,42 @@ @endcan -@can('access_sales_report|access_purchases_report|access_sales_return_report|access_purchases_return_report|access_payments_reports|access_profit_loss_report') +@can('access_reports')
  • Reports
    • @endcan