Compare commits

...

114 Commits
4.1.0 ... 5.0.1

Author SHA1 Message Date
6c1fc8e514 fix build errors 501 2021-12-01 19:32:16 +05:30
618d644c14 new build 501 2021-12-01 19:23:31 +05:30
deaab665dd Merge branch 'master' 2021-12-01 19:22:24 +05:30
aa6553233a Fix mark as accepted not updating state 2021-12-01 13:52:12 +00:00
d839962292 Fix mark as accepted not updating state 2021-12-01 13:52:12 +00:00
4d14b1552f new build 501 2021-12-01 19:20:53 +05:30
e1ef208073 Merge branch 'recurring-index-refresh' into 'master'
Recurring index  delete refresh page

See merge request mohit.panjvani/crater-web!1303
2021-12-01 13:44:28 +00:00
40f3415e28 Merge branch 'compnay-fix' into 'master'
fix: company save loader on duplicate name error

See merge request mohit.panjvani/crater-web!1304
2021-12-01 13:28:38 +00:00
5c39525a2b fix: company save loader on duplicate name error 2021-12-01 18:57:33 +05:30
3a5901c70d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into recurring-index-refresh 2021-12-01 18:35:30 +05:30
d978557366 fix 2021-12-01 18:35:13 +05:30
f97868d98a Merge branch 'quantity-fix' into 'master'
fix: exchange rate

See merge request mohit.panjvani/crater-web!1302
2021-12-01 12:57:12 +00:00
91e369ddcc new build 2021-12-01 18:02:08 +05:30
8806fe76ad Merge branch 'overlap-page' into 'master'
fix : overlap page in view and index pages

See merge request mohit.panjvani/crater-web!1299
2021-12-01 12:26:50 +00:00
cfc7e2231c fix: some minor changes 2021-12-01 17:53:26 +05:30
64326dd5f3 Merge branch 'v5-issues' into 'master'
V5 issues

See merge request mohit.panjvani/crater-web!1301
2021-12-01 12:08:37 +00:00
dee14455bb fix: exchange rate 2021-12-01 17:21:37 +05:30
9403fe265e fix expense currency issue 2021-12-01 17:06:20 +05:30
e30b99a730 fix currency issue 2021-12-01 16:24:23 +05:30
c1fb29bdbf Merge branch 'master' 2021-12-01 16:19:18 +05:30
6ea74a79bb Merge branch 'fix-unit-tests-master' into 'master'
solve unit tests

See merge request mohit.panjvani/crater-web!1298
2021-12-01 10:49:04 +00:00
8d94f4efbe fix code style 2021-12-01 16:18:27 +05:30
cc52cde16c add predis 2021-12-01 16:14:11 +05:30
e16e4c6d52 fix : overlap page in view and index pages 2021-12-01 16:04:55 +05:30
e22f60ff16 fix issues 2021-12-01 14:46:25 +05:30
88bfb38b56 solve unit tests 2021-12-01 13:25:24 +05:30
f57fa41640 Merge branch 'quantity-fix' into 'master'
fix: quantity decimal value not allow

See merge request mohit.panjvani/crater-web!1297
2021-12-01 06:57:09 +00:00
0f99568eaf fix: quantity decimal value not allow 2021-12-01 11:48:32 +05:30
f3dad8d48b fix issues 2021-11-30 21:55:25 +05:30
9629771d22 fix migration error 2021-11-30 19:20:51 +05:30
082d5cacf2 v5.0.0 update 2021-11-30 18:58:19 +05:30
d332712c22 Merge branch 'master' of https://github.com/bytefury/crater 2021-11-30 15:37:00 +05:30
f434c3e0d1 Merge pull request #577 from manythingsatonce/master
Added the Polish language localization.
2021-10-26 17:40:26 +05:30
c810ad5246 Merge pull request #574 from luzpaz/typos
Fix source comment and documentation typos
2021-10-26 17:38:06 +05:30
29705662e3 Added the Polish language localization. 2021-10-14 15:43:27 +02:00
31bfaadfad Fix source comment and documentation typos
Found via `codespell-q 3`
2021-10-10 07:17:18 -04:00
e2299794ad fix formatting 2021-09-15 11:24:13 +05:30
7d71cc1607 Merge branch 'fix-file-disk-pdf-issue' into 'master'
Solve issue of pdf store to local disk

See merge request mohit.panjvani/crater-web!996
2021-09-14 13:15:25 +00:00
40d9ecfe02 Solve issue of pdf store to local disk 2021-09-14 17:17:38 +05:30
3d3d7d0ec0 Merge branch 'master' 2021-09-07 11:33:00 +05:30
63b1ee5849 Merge pull request #480 from patricklucas/no_drafts_on_dashboard
Only show non-draft invoices on dashboard
2021-09-07 10:05:29 +05:30
bfe13ef79d Merge branch 'ob-clean-issue' into 'master'
solve empty buffer clean issue

See merge request mohit.panjvani/crater-web!909
2021-08-17 06:18:41 +00:00
010c7b02ed solve empty buffer clean issue 2021-08-16 18:29:41 +05:30
81739d4db7 add debit & credit notes to roadmap 2021-08-16 12:21:15 +05:30
05110526a7 new build 2021-07-30 19:12:19 +05:30
15bff7cd3f Merge branch 'master' of https://github.com/bytefury/crater 2021-07-30 19:12:07 +05:30
37470fe7a2 Merge pull request #513 from patricklucas/add_tax_column
Add tax column to invoices
2021-07-30 19:11:59 +05:30
1a50aca26d Merge branch 'master' of https://github.com/bytefury/crater 2021-07-30 19:09:56 +05:30
8219d19222 fix partial payment issue 2021-07-30 19:08:07 +05:30
8fa0252779 Add translation 2021-07-21 14:08:58 +02:00
6bfab30f14 Add tax column to invoices
When an invoice has tax per item enabled, include a tax column so that
it's clear how much tax is being applied to each item.
2021-07-21 14:07:07 +02:00
d972279adc Merge pull request #505 from michelmelo/patch-1
add support português Portugal
2021-07-16 12:42:34 +05:30
900a18c479 Merge pull request #502 from ytilotti/ytilotti-patch-1
Delete limit 255 description estimate
2021-07-16 12:41:53 +05:30
433c6a7c44 fix tax test failure 2021-07-16 12:00:28 +05:30
9f673d7eb3 fix tax-per-item issue display for estimates 2021-07-16 11:56:18 +05:30
d3a745605e fix tax-per-item issue 2021-07-16 11:49:56 +05:30
b004e7e379 Update i18n.js 2021-07-10 09:00:48 +01:00
9893108539 Delete limit 255 description estimate
There is a limit on the description of the estimate vue which is not necessary.
The field in the database is in TEXT.
2021-07-07 15:51:23 +02:00
2b80082996 Merge branch 'negative-tax-options' into 'master'
Solved negative tax options issue

See merge request mohit.panjvani/crater-web!735
2021-06-30 06:52:23 +00:00
8d596f5c19 Merge branch 'payment-unable-click' into 'master'
ref solve issue in create payment unable to click
2021-06-28 07:50:16 +00:00
ce4335d8fa Merge branch 'pdf-issue' into 'master' 2021-06-28 07:49:27 +00:00
5eaea3ad59 solve empty address issue on pdf 2021-06-28 07:49:27 +00:00
375d4d428e ref solve issue in create payment unable to click 2021-06-28 13:18:31 +05:30
2ec87baa6f fix mysql & mariadb requirement checks on installation 2021-06-25 16:24:18 +05:30
18a2e83348 Merge branch 'version-check-issue' into 'master'
solve version check issue

See merge request mohit.panjvani/crater-web!792
2021-06-25 10:14:54 +00:00
d53e227b08 solve version check issue 2021-06-25 15:43:30 +05:30
7721bf6f93 disable autocomplete and lpignore 2021-06-25 05:25:51 +00:00
76977c3d2a disable autocomplete and lpignore 2021-06-25 05:25:50 +00:00
512983deee update composer lock file 2021-06-24 15:27:54 +05:30
f5c23b33da fix code style 2021-06-24 14:21:43 +05:30
a0898a1fa0 build 420 2021-06-24 14:18:02 +05:30
236db087ba Merge branch 'master' of https://github.com/bytefury/crater 2021-06-24 14:15:50 +05:30
4772079d13 Merge branch 'foreign-key-issue' into 'master'
drop foreign issue solved

See merge request mohit.panjvani/crater-web!787
2021-06-24 08:12:48 +00:00
0e0ef1d99e drop foreign issue solved 2021-06-24 13:39:35 +05:30
3d9a73f9ec new build 2021-06-24 13:00:16 +05:30
b452c3f173 Merge branch 'feat/version-check' into 'master' 2021-06-24 07:28:36 +00:00
87667be90c add domain verify feature 2021-06-24 07:28:35 +00:00
31481739f1 update translations from crowdin 2021-06-23 12:57:56 +05:30
da43797d9c update deps 2021-06-23 11:39:46 +05:30
e1fcf0695c Merge branch 'drop-foreign-issue' into 'master'
solve drop foreign issue on sqlite

See merge request mohit.panjvani/crater-web!781
2021-06-22 13:20:38 +00:00
a52d5bc582 solve drop foreign issue on sqlite 2021-06-22 18:44:02 +05:30
e7bf86f9c0 remove pcntl_fork, generate new encryption key on onboarding & update minimum php version 2021-06-22 16:03:59 +05:30
fca7d164a6 update minimum php version 2021-06-22 12:48:53 +05:30
4b603f8823 build 420 2021-06-19 17:51:01 +05:30
4552138787 Add File based templates 2021-06-19 12:11:22 +00:00
d1dd704cdf Add File based templates 2021-06-19 12:11:21 +00:00
00961bcae1 update json file indent_size 2021-06-18 15:23:56 +05:30
98ba17e56a Add Domain Verification on Onboarding Wizard 2021-06-18 09:51:19 +00:00
8eb47b553e Add Domain Verification on Onboarding Wizard 2021-06-18 09:51:19 +00:00
2fb46a4ab3 Merge branch 'number-validation' into 'master'
change message for number validation

See merge request mohit.panjvani/crater-web!770
2021-06-17 13:29:11 +00:00
6fcddd6feb refactor message 2021-06-17 18:58:08 +05:30
43c871f374 refactor unique number message 2021-06-17 18:57:17 +05:30
4ec9b2e817 change message for number validation 2021-06-17 16:23:06 +05:30
f2c6e06c54 Merge pull request #488 from pgrimaud/master
docs: fix typos
2021-06-15 14:14:31 +05:30
f95b292717 docs: fix typos 2021-06-15 10:42:35 +02:00
6ecd9728d4 add mariadb-client to fix backups 2021-06-08 18:09:06 +05:30
b2d4b7212b Added invoice test with negative tax 2021-06-02 16:25:20 +05:30
b4956d38f7 Minor fix taxtype test 2021-06-01 16:33:07 +05:30
ed966b02eb Added test for negative taxtype test 2021-06-01 16:32:06 +05:30
bcbffdcf30 Solved negative tax options issue 2021-06-01 14:18:08 +05:30
3cf70135f3 Only show non-draft invoices on dashboard
An invoice cannot be considered due if it has not been sent (and thus
still a 'DRAFT').

This change adds a `WHERE status != 'DRAFT'` to each invoice query in
the dashboard controller.

Additionally, this change replaces `->get()->count()` calls to just
`->count()`, which should be equivalent and more efficient.
2021-05-26 10:49:08 +02:00
90bb90cd99 remove trailing_comma_in_multiline_array from csfixer config 2021-05-25 13:24:30 +05:30
ebad76c8d7 remove extra cs-fixer config file 2021-05-25 13:20:22 +05:30
c35b00493c remove extra semicolon 2021-05-25 12:47:19 +05:30
e5ae937a88 Merge branch 'helper-get-custom-field-bySlug' into 'master'
Helper for custom field to get by slug

See merge request mohit.panjvani/crater-web!707
2021-05-25 07:07:07 +00:00
736df5fcae Merge branch 'proxies-issue' into 'master'
allow to customize trusted proxies

See merge request mohit.panjvani/crater-web!709
2021-05-25 06:55:35 +00:00
89c264c6a9 update implementation 2021-05-25 12:22:27 +05:30
1837bf3f3e allow to customize trusted proxies 2021-05-24 13:13:46 +05:30
83234cfac3 get custom field by slug in models 2021-05-22 13:52:30 +05:30
5ccc9eba4c Helper for custom field to get by slug 2021-05-22 13:24:10 +05:30
3f0008ec95 Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2021-05-21 17:28:45 +05:30
9e98a96d61 Implement PHP CS Fixer and a coding standard to follow (#471)
* Create PHP CS Fixer config and add to CI workflow

* Run php cs fixer on project

* Add newline at end of file

* Update to use PHP CS Fixer v3

* Run v3 config on project

* Run seperate config in CI
2021-05-21 17:27:51 +05:30
27bc89bf76 Merge branch 'fix-invoice-template-issue' into 'master'
Clone Invoice Template issue

See merge request mohit.panjvani/crater-web!700
2021-05-20 06:59:04 +00:00
e4c2b44da5 Clone Invoice Template issue 2021-05-20 12:08:48 +05:30
1379 changed files with 92520 additions and 68684 deletions

View File

@ -19,4 +19,7 @@ indent_size = 2
indent_size = 2
[*.js]
indent_size = 2
indent_size = 2
[*.json]
indent_size = 2

View File

@ -34,3 +34,5 @@ PUSHER_SECRET=
SANCTUM_STATEFUL_DOMAINS=crater.test
SESSION_DOMAIN=crater.test
TRUSTED_PROXIES="*"

View File

@ -9,5 +9,5 @@ MAIL_PORT=587
MAIL_USERNAME=ff538f0e1037f4
MAIL_PASSWORD=c04c81145fcb73
MAIL_ENCRYPTION=tls
MAIL_FROM_ADDRESS="admin@crater.com"
MAIL_FROM_ADDRESS="admin@craterapp.com"
MAIL_FROM_NAME="John Doe"

View File

@ -1,20 +1,14 @@
// .eslintrc.js
module.exports = {
root: true,
env: {
node: true,
},
extends: [
'plugin:vue/recommended',
'eslint:recommended',
'prettier/vue',
'plugin:prettier/recommended',
// add more generic rulesets here, such as:
// 'eslint:recommended',
"plugin:vue/vue3-recommended",
"prettier",
],
parserOptions: {
parser: 'babel-eslint',
},
plugins: ['prettier'],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// override/add rules settings here, such as:
// 'vue/no-unused-vars': 'error'
},
}
};

View File

@ -30,5 +30,8 @@ jobs:
run: composer update --ignore-platform-req=php --no-interaction --no-progress
if: "matrix.php >= 8"
- name: Check coding style
run: ./vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no --config=.php-cs-fixer.dist.php
- name: Unit Tests
run: php ./vendor/bin/pest

2
.gitignore vendored
View File

@ -11,4 +11,4 @@ Homestead.yaml
.rnd
/.expo
/.vscode
/docker-compose/db/data/
/docker-compose/db/data/

42
.php-cs-fixer.dist.php Normal file
View File

@ -0,0 +1,42 @@
<?php
$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude(['bootstrap', 'storage', 'vendor'])
->name('*.php')
->name('_ide_helper')
->notName('*.blade.php')
->ignoreDotFiles(true)
->ignoreVCS(true);
$rules = [
'@PSR12' => true,
'array_syntax' => ['syntax' => 'short'],
'ordered_imports' => ['sort_algorithm' => 'alpha'],
'concat_space' => true,
'no_unused_imports' => true,
'not_operator_with_successor_space' => true,
'phpdoc_scalar' => true,
'unary_operator_spaces' => true,
'binary_operator_spaces' => true,
'blank_line_before_statement' => [
'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_var_without_name' => true,
'class_attributes_separation' => [
'elements' => [
'method' => 'one',
'property' => 'one',
],
],
'method_argument_space' => [
'on_multiline' => 'ensure_fully_multiline',
'keep_multiple_spaces_after_comma' => true,
],
];
return (new PhpCsFixer\Config())
->setUsingCache(true)
->setRules($rules)
->setFinder($finder);

View File

@ -1,39 +1,44 @@
FROM php:7.4-fpm
FROM php:7.4-fpm-alpine
# Arguments defined in docker-compose.yml
ARG user
ARG uid
# Install system dependencies
RUN apt-get update && apt-get install -y \
git \
curl \
libpng-dev \
libonig-dev \
libxml2-dev \
zip \
unzip \
libzip-dev \
libmagickwand-dev
# Clear cache
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
RUN pecl install imagick \
&& docker-php-ext-enable imagick
# Install PHP extensions
RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd
# Get latest Composer
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
# Create system user to run Composer and Artisan Commands
RUN useradd -G www-data,root -u $uid -d /home/$user $user
RUN mkdir -p /home/$user/.composer && \
chown -R $user:$user /home/$user
# Set working directory
WORKDIR /var/www
USER $user
RUN apk add --no-cache \
$PHPIZE_DEPS \
freetype-dev \
git \
zip \
libzip-dev \
php7-bcmath \
curl \
unzip \
libjpeg-turbo-dev \
libpng-dev \
libxml2-dev \
mariadb-client \
sqlite \
php7-json \
php7-openssl \
php7-pdo \
php7-pdo_mysql \
php7-session \
php7-simplexml \
php7-tokenizer \
php7-xml \
imagemagick \
imagemagick-libs \
imagemagick-dev \
php7-imagick \
php7-pcntl \
--repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ gnu-libiconv=1.15-r3
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
RUN printf "\n" | pecl install \
imagick && \
docker-php-ext-enable --ini-name 20-imagick.ini imagick
RUN docker-php-ext-configure zip
RUN docker-php-ext-install zip
RUN docker-php-ext-install iconv pdo pdo_mysql bcmath pcntl exif
RUN docker-php-ext-configure gd --with-jpeg --with-freetype
RUN docker-php-ext-install gd

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Console\Commands;
use Illuminate\Console\Command;
use Carbon\Carbon;
use Crater\Models\Estimate;
use Illuminate\Console\Command;
class CheckEstimateStatus extends Command
{
@ -39,7 +40,7 @@ class CheckEstimateStatus extends Command
public function handle()
{
$date = Carbon::now();
$status = array(Estimate::STATUS_ACCEPTED, Estimate::STATUS_REJECTED, Estimate::STATUS_EXPIRED);
$status = [Estimate::STATUS_ACCEPTED, Estimate::STATUS_REJECTED, Estimate::STATUS_EXPIRED];
$estimates = Estimate::whereNotIn('status', $status)->whereDate('expiry_date', '<', $date)->get();
foreach ($estimates as $estimate) {

View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Console\Commands;
use Illuminate\Console\Command;
use Carbon\Carbon;
use Crater\Models\Invoice;
use Illuminate\Console\Command;
class CheckInvoiceStatus extends Command
{
@ -39,7 +40,7 @@ class CheckInvoiceStatus extends Command
public function handle()
{
$date = Carbon::now();
$invoices = Invoice::where('status', '<>', Invoice::STATUS_COMPLETED)->whereDate('due_date', '<',$date)->get();
$invoices = Invoice::where('status', '<>', Invoice::STATUS_COMPLETED)->whereDate('due_date', '<', $date)->get();
foreach ($invoices as $invoice) {
$invoice->status = Invoice::STATUS_OVERDUE;

View File

@ -0,0 +1,63 @@
<?php
namespace Crater\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage;
class CreateTemplateCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'make:template {name} {--type=}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Create estimate or invoice pdf template. ';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$templateName = $this->argument('name');
$type = $this->option('type');
if (! $type) {
$type = $this->choice('Create a template for?', ['invoice', 'estimate']);
}
if (Storage::disk('views')->exists("/app/pdf/{$type}/{$templateName}.blade.php")) {
$this->info("Template with given name already exists.");
return 0;
}
Storage::disk('views')->copy("/app/pdf/{$type}/{$type}1.blade.php", "/app/pdf/{$type}/{$templateName}.blade.php");
copy(resource_path("/static/img/PDF/{$type}1.png"), resource_path("/static/img/PDF/{$templateName}.png"));
$path = resource_path("app/pdf/{$type}/{$templateName}.blade.php");
$type = ucfirst($type);
$this->info("{$type} Template created successfully at ".$path);
return 0;
}
}

View File

@ -5,7 +5,6 @@ namespace Crater\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Console\ConfirmableTrait;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Filesystem\Filesystem;
class ResetApp extends Command
{
@ -42,7 +41,7 @@ class ResetApp extends Command
*/
public function handle()
{
if (!$this->confirmToProceed()) {
if (! $this->confirmToProceed()) {
return;
}

View File

@ -2,9 +2,9 @@
namespace Crater\Console\Commands;
use Illuminate\Console\Command;
use Crater\Space\Updater;
use Crater\Models\Setting;
use Crater\Space\Updater;
use Illuminate\Console\Command;
// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
class UpdateCommand extends Command
@ -57,42 +57,43 @@ class UpdateCommand extends Command
return;
}
if (!$this->version) {
if (! $this->version) {
$this->info('No Update Available! You are already on the latest version.');
return;
}
if (!$this->confirm("Do you wish to update to {$this->version}?")) {
if (! $this->confirm("Do you wish to update to {$this->version}?")) {
return;
}
if (!$path = $this->download()) {
if (! $path = $this->download()) {
return;
}
if (!$path = $this->unzip($path)) {
if (! $path = $this->unzip($path)) {
return;
}
if (!$this->copyFiles($path)) {
if (! $this->copyFiles($path)) {
return;
}
if(isset($this->response->deleted_files) && !empty($this->response->deleted_files)) {
if (!$this->deleteFiles($this->response->deleted_files)) {
if (isset($this->response->deleted_files) && ! empty($this->response->deleted_files)) {
if (! $this->deleteFiles($this->response->deleted_files)) {
return;
}
}
if (!$this->migrateUpdate()) {
if (! $this->migrateUpdate()) {
return;
}
if (!$this->finish()) {
if (! $this->finish()) {
return;
}
$this->info('Successfully updated to ' . $this->version);
$this->info('Successfully updated to '.$this->version);
}
public function getInstalledVersion()
@ -102,7 +103,7 @@ class UpdateCommand extends Command
public function getLatestVersionResponse()
{
$this->info('Your currently installed version is ' . $this->installed);
$this->info('Your currently installed version is '.$this->installed);
$this->line('');
$this->info('Checking for update...');
@ -110,14 +111,12 @@ class UpdateCommand extends Command
$response = Updater::checkForUpdate($this->installed);
if ($response->success) {
$extensions = $response->version->extensions;
$is_required = false;
foreach ($extensions as $key => $extension) {
if(!$extension) {
if (! $extension) {
$is_required = true;
$this->info('❌ '.$key);
}
@ -125,7 +124,7 @@ class UpdateCommand extends Command
$this->info('✅ '.$key);
}
if($is_required) {
if ($is_required) {
return 'extension_required';
}
@ -146,8 +145,9 @@ class UpdateCommand extends Command
try {
$path = Updater::download($this->version, 1);
if (!is_string($path)) {
if (! is_string($path)) {
$this->error('Download exception');
return false;
}
} catch (\Exception $e) {
@ -165,8 +165,9 @@ class UpdateCommand extends Command
try {
$path = Updater::unzip($path);
if (!is_string($path)) {
if (! is_string($path)) {
$this->error('Unzipping exception');
return false;
}
} catch (\Exception $e) {

View File

@ -1,6 +1,8 @@
<?php
namespace Crater\Console;
use Crater\Models\RecurringInvoice;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@ -13,7 +15,8 @@ class Kernel extends ConsoleKernel
*/
protected $commands = [
Commands\ResetApp::class,
Commands\UpdateCommand::class
Commands\UpdateCommand::class,
Commands\CreateTemplateCommand::class
];
/**
@ -29,6 +32,13 @@ class Kernel extends ConsoleKernel
$schedule->command('check:estimates:status')
->daily();
$recurringInvoices = RecurringInvoice::where('status', 'ACTIVE')->get();
foreach ($recurringInvoices as $recurringInvoice) {
$schedule->call(function () use ($recurringInvoice) {
$recurringInvoice->generateInvoice();
})->cron($recurringInvoice->frequency);
}
}
/**

View File

@ -2,7 +2,7 @@
namespace Crater\Events;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Foundation\Events\Dispatchable;
class UpdateFinished
{

View File

@ -1,8 +1,9 @@
<?php
namespace Crater\Exceptions;
use Throwable;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{

View File

@ -1,9 +1,7 @@
<?php
namespace Crater\Generators;
use Crater\Models\Estimate;
use Crater\Models\Invoice;
use Crater\Models\Payment;
@ -12,20 +10,19 @@ use Spatie\MediaLibrary\Support\PathGenerator\PathGenerator;
class CustomPathGenerator implements PathGenerator
{
public function getPath(Media $media): string
{
return $this->getBasePath($media) . '/';
return $this->getBasePath($media).'/';
}
public function getPathForConversions(Media $media): string
{
return $this->getBasePath($media) . '/conversations/';
return $this->getBasePath($media).'/conversations/';
}
public function getPathForResponsiveImages(Media $media): string
{
return $this->getBasePath($media) . '/responsive-images/';
return $this->getBasePath($media).'/responsive-images/';
}
/*

View File

@ -1,12 +1,15 @@
<?php
namespace Crater\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Crater\Providers\RouteServiceProvider;

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
@ -45,6 +45,8 @@ class ForgotPasswordController extends Controller
*/
protected function sendResetLinkFailedResponse(Request $request, $response)
{
return response('Email could not be sent to this email address.', 403);
return response()->json([
'error' => 'Email could not be sent to this email address.'
], 403);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Crater\Providers\RouteServiceProvider;

View File

@ -1,12 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Crater\Providers\RouteServiceProvider;
use Crater\Models\User;
use Crater\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
@ -67,7 +66,7 @@ class RegisterController extends Controller
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => $data['password']
'password' => $data['password'],
]);
}
}

View File

@ -1,13 +1,13 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Crater\Providers\RouteServiceProvider;
use Illuminate\Support\Str;
use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Http\Request;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
class ResetPasswordController extends Controller
{
@ -31,7 +31,6 @@ class ResetPasswordController extends Controller
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Get the response for a successful password reset.
*
@ -42,7 +41,7 @@ class ResetPasswordController extends Controller
protected function sendResetResponse(Request $request, $response)
{
return response()->json([
'message' => 'Password reset successfully.'
'message' => 'Password reset successfully.',
]);
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Auth;
namespace Crater\Http\Controllers\V1\Admin\Auth;
use Crater\Http\Controllers\Controller;
use Crater\Providers\RouteServiceProvider;

View File

@ -1,7 +1,8 @@
<?php
// Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
namespace Crater\Http\Controllers\V1\Backup;
namespace Crater\Http\Controllers\V1\Admin\Backup;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
@ -12,12 +13,10 @@ class ApiController extends Controller
*
* @return JsonResponse
*/
public function respondSuccess(): JsonResponse
{
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,17 +1,17 @@
<?php
// Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
namespace Crater\Http\Controllers\V1\Backup;
namespace Crater\Http\Controllers\V1\Admin\Backup;
use Crater\Jobs\CreateBackupJob;
use Crater\Rules\Backup\PathToZip;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Spatie\Backup\BackupDestination\Backup;
use Spatie\Backup\BackupDestination\BackupDestination;
use Spatie\Backup\Helpers\Format;
use Crater\Jobs\CreateBackupJob;
use Crater\Rules\Backup\BackupDisk;
use Crater\Rules\Backup\PathToZip;
use Illuminate\Http\JsonResponse;
class BackupsController extends ApiController
{
@ -22,6 +22,8 @@ class BackupsController extends ApiController
*/
public function index(Request $request)
{
$this->authorize('manage backups');
$configuredBackupDisks = config('backup.backup.destination.disks');
try {
@ -42,14 +44,14 @@ class BackupsController extends ApiController
return response()->json([
'backups' => $backups,
'disks' => $configuredBackupDisks
'disks' => $configuredBackupDisks,
]);
} catch (\Exception $e) {
return response()->json([
'backups' => [],
'error' => 'invalid_disk_credentials',
'error_message' => $e->getMessage(),
'disks' => $configuredBackupDisks
'disks' => $configuredBackupDisks,
]);
}
}
@ -62,6 +64,8 @@ class BackupsController extends ApiController
*/
public function store(Request $request)
{
$this->authorize('manage backups');
dispatch(new CreateBackupJob($request->all()))->onQueue(config('backup.queue.name'));
return $this->respondSuccess();
@ -75,6 +79,8 @@ class BackupsController extends ApiController
*/
public function destroy($disk, Request $request)
{
$this->authorize('manage backups');
$validated = $request->validate([
'path' => ['required', new PathToZip()],
]);

View File

@ -1,14 +1,13 @@
<?php
// Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
namespace Crater\Http\Controllers\V1\Backup;
namespace Crater\Http\Controllers\V1\Admin\Backup;
use Crater\Http\Controllers\Controller;
use Crater\Rules\Backup\PathToZip;
use Illuminate\Http\Request;
use Spatie\Backup\BackupDestination\Backup;
use Spatie\Backup\BackupDestination\BackupDestination;
use Crater\Rules\Backup\BackupDisk;
use Crater\Rules\Backup\PathToZip;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
@ -16,6 +15,8 @@ class DownloadBackupController extends ApiController
{
public function __invoke(Request $request)
{
$this->authorize('manage backups');
$validated = $request->validate([
'path' => ['required', new PathToZip()],
]);

View File

@ -0,0 +1,85 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Company;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\CompaniesRequest;
use Crater\Http\Resources\CompanyResource;
use Crater\Models\Company;
use Crater\Models\User;
use Illuminate\Http\Request;
use Silber\Bouncer\BouncerFacade;
use Vinkla\Hashids\Facades\Hashids;
class CompaniesController extends Controller
{
public function store(CompaniesRequest $request)
{
$this->authorize('create company');
$user = $request->user();
$company = Company::create($request->getCompanyPayload());
$company->unique_hash = Hashids::connection(Company::class)->encode($company->id);
$company->save();
$company->setupDefaultData();
$user->companies()->attach($company->id);
$user->assign('super admin');
if ($request->address) {
$company->address()->create($request->address);
}
return new CompanyResource($company);
}
public function destroy(Request $request)
{
$company = Company::find($request->header('company'));
$this->authorize('delete company', $company);
$user = $request->user();
if ($request->name !== $company->name) {
return respondJson('company_name_must_match_with_given_name', 'Company name must match with given name');
}
if ($user->loadCount('companies')->companies_count <= 1) {
return respondJson('You_cannot_delete_all_companies', 'You cannot delete all companies');
}
$company->deleteCompany($user);
return response()->json([
'success' => true
]);
}
public function transferOwnership(Request $request, User $user)
{
$company = Company::find($request->header('company'));
$this->authorize('transfer company ownership', $company);
if ($user->hasCompany($company->id)) {
return response()->json([
'success' => false,
'message' => 'User does not belongs to this company.'
]);
}
$company->update(['owner_id' => $user->id]);
BouncerFacade::sync($user)->roles(['super admin']);
return response()->json([
'success' => true
]);
}
public function getUserCompanies(Request $request)
{
$companies = $request->user()->companies;
return CompanyResource::collection($companies);
}
}

View File

@ -0,0 +1,24 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Company;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\CompanyResource;
use Crater\Models\Company;
use Illuminate\Http\Request;
class CompanyController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$company = Company::find($request->header('company'));
return new CompanyResource($company);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\Config;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
@ -16,7 +16,7 @@ class FiscalYearsController extends Controller
public function __invoke(Request $request)
{
return response()->json([
'fiscal_years' => config('crater.fiscal_years')
'fiscal_years' => config('crater.fiscal_years'),
]);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\Config;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
@ -16,7 +16,7 @@ class LanguagesController extends Controller
public function __invoke(Request $request)
{
return response()->json([
'languages' => config('crater.languages')
'languages' => config('crater.languages'),
]);
}
}

View File

@ -1,12 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\Update;
namespace Crater\Http\Controllers\V1\Admin\Config;
use Crater\Http\Controllers\Controller;
use Crater\Space\Updater;
use Illuminate\Http\Request;
class MigrateUpdateController extends Controller
class RetrospectiveEditsController extends Controller
{
/**
* Handle the incoming request.
@ -16,10 +15,8 @@ class MigrateUpdateController extends Controller
*/
public function __invoke(Request $request)
{
Updater::migrateUpdate();
return response()->json([
'success' => true
'retrospective_edits' => config('crater.retrospective_edits'),
]);
}
}

View File

@ -1,10 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\CustomField;
namespace Crater\Http\Controllers\V1\Admin\CustomField;
use Crater\Models\CustomField;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\CustomFieldRequest;
use Crater\Http\Resources\CustomFieldResource;
use Crater\Models\CustomField;
use Illuminate\Http\Request;
class CustomFieldsController extends Controller
@ -16,20 +17,16 @@ class CustomFieldsController extends Controller
*/
public function index(Request $request)
{
$limit = $request->has('limit') ? $request->limit : 5;
$this->authorize('viewAny', CustomField::class);
$customFields = CustomField::whereCompany($request->header('company'))
->applyFilters($request->only([
'type',
'search'
]))
$limit = $request->has('limit') ? $request->limit : 5;
$customFields = CustomField::applyFilters($request->all())
->whereCompany()
->latest()
->paginateData($limit);
return response()->json([
'customFields' => $customFields
]);
return CustomFieldResource::collection($customFields);
}
/**
@ -40,12 +37,11 @@ class CustomFieldsController extends Controller
*/
public function store(CustomFieldRequest $request)
{
$this->authorize('create', CustomField::class);
$customField = CustomField::createCustomField($request);
return response()->json([
'customField' => $customField,
'success' => true
]);
return new CustomFieldResource($customField);
}
/**
@ -56,10 +52,9 @@ class CustomFieldsController extends Controller
*/
public function show(CustomField $customField)
{
return response()->json([
'customField' => $customField,
'success' => true
]);
$this->authorize('view', $customField);
return new CustomFieldResource($customField);
}
/**
@ -71,12 +66,11 @@ class CustomFieldsController extends Controller
*/
public function update(CustomFieldRequest $request, CustomField $customField)
{
$this->authorize('update', $customField);
$customField->updateCustomField($request);
return response()->json([
'customField' => $customField,
'success' => true
]);
return new CustomFieldResource($customField);
}
/**
@ -87,16 +81,16 @@ class CustomFieldsController extends Controller
*/
public function destroy(CustomField $customField)
{
if ($customField->customFieldValue()->exists()) {
return response()->json([
'error' => 'values_attached'
]);
$this->authorize('delete', $customField);
if ($customField->customFieldValues()->exists()) {
$customField->customFieldValues()->delete();
}
$customField->delete();
$customField->forceDelete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,14 +1,15 @@
<?php
namespace Crater\Http\Controllers\V1\Customer;
namespace Crater\Http\Controllers\V1\Admin\Customer;
use Crater\Http\Controllers\Controller;
use Crater\Models\Invoice;
use Crater\Models\Expense;
use Crater\Models\Payment;
use Crater\Models\User;
use Crater\Models\CompanySetting;
use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\CustomerResource;
use Crater\Models\CompanySetting;
use Crater\Models\Customer;
use Crater\Models\Expense;
use Crater\Models\Invoice;
use Crater\Models\Payment;
use Illuminate\Http\Request;
class CustomerStatsController extends Controller
@ -19,8 +20,10 @@ class CustomerStatsController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, User $customer)
public function __invoke(Request $request, Customer $customer)
{
$this->authorize('view', $customer);
$i = 0;
$months = [];
$invoiceTotals = [];
@ -56,7 +59,7 @@ class CustomerStatsController extends Controller
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany($request->header('company'))
->whereCompany()
->whereCustomer($customer->id)
->sum('total') ?? 0
);
@ -66,7 +69,7 @@ class CustomerStatsController extends Controller
'expense_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany($request->header('company'))
->whereCompany()
->whereUser($customer->id)
->sum('amount') ?? 0
);
@ -76,7 +79,7 @@ class CustomerStatsController extends Controller
'payment_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany($request->header('company'))
->whereCompany()
->whereCustomer($customer->id)
->sum('amount') ?? 0
);
@ -94,53 +97,46 @@ class CustomerStatsController extends Controller
$start->subMonth()->endOfMonth();
$salesTotal = Invoice::whereCompany($request->header('company'))
->whereBetween(
'invoice_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
$salesTotal = Invoice::whereBetween(
'invoice_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->whereCustomer($customer->id)
->sum('total');
$totalReceipts = Payment::whereCompany($request->header('company'))
->whereBetween(
'payment_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
$totalReceipts = Payment::whereBetween(
'payment_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->whereCustomer($customer->id)
->sum('amount');
$totalExpenses = Expense::whereCompany($request->header('company'))
->whereBetween(
'expense_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
$totalExpenses = Expense::whereBetween(
'expense_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->whereUser($customer->id)
->sum('amount');
$netProfit = (int) $totalReceipts - (int) $totalExpenses;
$chartData = [
'months' => $months,
'months' => $months,
'invoiceTotals' => $invoiceTotals,
'expenseTotals' => $expenseTotals,
'receiptTotals' => $receiptTotals,
'netProfit' => $netProfit,
'netProfits' => $netProfits,
'salesTotal' => $salesTotal,
'netProfit' => $netProfit,
'netProfits' => $netProfits,
'salesTotal' => $salesTotal,
'totalReceipts' => $totalReceipts,
'totalExpenses' => $totalExpenses
'totalExpenses' => $totalExpenses,
];
$customer = User::with([
'billingAddress',
'shippingAddress',
'billingAddress.country',
'shippingAddress.country',
'currency',
'fields.customField'
])->find($customer->id);
$customer = Customer::find($customer->id);
return response()->json([
'customer' => $customer,
'chartData' => $chartData,
]);
return (new CustomerResource($customer))
->additional(['meta' => [
'chartData' => $chartData
]]);
}
}

View File

@ -0,0 +1,108 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Customer;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests;
use Crater\Http\Requests\DeleteCustomersRequest;
use Crater\Http\Resources\CustomerResource;
use Crater\Models\Customer;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class CustomersController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\JsonResponse
*/
public function index(Request $request)
{
$this->authorize('viewAny', Customer::class);
$limit = $request->has('limit') ? $request->limit : 10;
$customers = Customer::with('creator')
->whereCompany()
->applyFilters($request->all())
->select(
'customers.*',
DB::raw('sum(invoices.base_due_amount) as base_due_amount'),
DB::raw('sum(invoices.due_amount) as due_amount'),
)
->groupBy('customers.id')
->leftJoin('invoices', 'customers.id', '=', 'invoices.customer_id')
->paginateData($limit);
return (CustomerResource::collection($customers))
->additional(['meta' => [
'customer_total_count' => Customer::whereCompany()->count(),
]]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function store(Requests\CustomerRequest $request)
{
$this->authorize('create', Customer::class);
$customer = Customer::createCustomer($request);
return new CustomerResource($customer);
}
/**
* Display the specified resource.
*
* @param Customer $customer
* @return \Illuminate\Http\JsonResponse
*/
public function show(Customer $customer)
{
$this->authorize('view', $customer);
return new CustomerResource($customer);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Crater\Models\Customer $customer
* @return \Illuminate\Http\JsonResponse
*/
public function update(Requests\CustomerRequest $request, Customer $customer)
{
$this->authorize('update', $customer);
$customer = Customer::updateCustomer($request, $customer);
if (is_string($customer)) {
return respondJson('you_cannot_edit_currency', 'Cannot change currency once transactions created');
}
return new CustomerResource($customer);
}
/**
* Remove a list of Customers along side all their resources (ie. Estimates, Invoices, Payments and Addresses)
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function delete(DeleteCustomersRequest $request)
{
$this->authorize('delete multiple customers');
Customer::deleteCustomers($request->ids);
return response()->json([
'success' => true,
]);
}
}

View File

@ -0,0 +1,165 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Dashboard;
use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Customer;
use Crater\Models\Estimate;
use Crater\Models\Expense;
use Crater\Models\Invoice;
use Crater\Models\Payment;
use Illuminate\Http\Request;
class DashboardController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(Request $request)
{
$company = Company::find($request->header('company'));
$this->authorize('view dashboard', $company);
$invoice_totals = [];
$expense_totals = [];
$receipt_totals = [];
$net_income_totals = [];
$i = 0;
$months = [];
$monthCounter = 0;
$fiscalYear = CompanySetting::getSetting('fiscal_year', $request->header('company'));
$startDate = Carbon::now();
$start = Carbon::now();
$end = Carbon::now();
$terms = explode('-', $fiscalYear);
if ($terms[0] <= $start->month) {
$startDate->month($terms[0])->startOfMonth();
$start->month($terms[0])->startOfMonth();
$end->month($terms[0])->endOfMonth();
} else {
$startDate->subYear()->month($terms[0])->startOfMonth();
$start->subYear()->month($terms[0])->startOfMonth();
$end->subYear()->month($terms[0])->endOfMonth();
}
if ($request->has('previous_year')) {
$startDate->subYear()->startOfMonth();
$start->subYear()->startOfMonth();
$end->subYear()->endOfMonth();
}
while ($monthCounter < 12) {
array_push(
$invoice_totals,
Invoice::whereBetween(
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany()
->sum('base_total')
);
array_push(
$expense_totals,
Expense::whereBetween(
'expense_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany()
->sum('base_amount')
);
array_push(
$receipt_totals,
Payment::whereBetween(
'payment_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->whereCompany()
->sum('base_amount')
);
array_push(
$net_income_totals,
($receipt_totals[$i] - $expense_totals[$i])
);
$i++;
array_push($months, $start->format('M'));
$monthCounter++;
$end->startOfMonth();
$start->addMonth()->startOfMonth();
$end->addMonth()->endOfMonth();
}
$start->subMonth()->endOfMonth();
$total_sales = Invoice::whereBetween(
'invoice_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->sum('base_total');
$total_receipts = Payment::whereBetween(
'payment_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->sum('base_amount');
$total_expenses = Expense::whereBetween(
'expense_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
)
->whereCompany()
->sum('base_amount');
$total_net_income = (int)$total_receipts - (int)$total_expenses;
$chart_data = [
'months' => $months,
'invoice_totals' => $invoice_totals,
'expense_totals' => $expense_totals,
'receipt_totals' => $receipt_totals,
'net_income_totals' => $net_income_totals,
];
$total_customer_count = Customer::whereCompany()->count();
$total_invoice_count = Invoice::whereCompany()
->count();
$total_estimate_count = Estimate::whereCompany()->count();
$total_amount_due = Invoice::whereCompany()
->sum('base_due_amount');
$recent_due_invoices = Invoice::with('customer')
->whereCompany()
->where('base_due_amount', '>', 0)
->take(5)
->latest()
->get();
$recent_estimates = Estimate::with('customer')->whereCompany()->take(5)->latest()->get();
return response()->json([
'total_amount_due' => $total_amount_due,
'total_customer_count' => $total_customer_count,
'total_invoice_count' => $total_invoice_count,
'total_estimate_count' => $total_estimate_count,
'recent_due_invoices' => $recent_due_invoices,
'recent_estimates' => $recent_estimates,
'chart_data' => $chart_data,
'total_sales' => $total_sales,
'total_receipts' => $total_receipts,
'total_expenses' => $total_expenses,
'total_net_income' => $total_net_income,
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Estimate;
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Illuminate\Http\Request;
use Crater\Http\Controllers\Controller;
use Crater\Models\Estimate;
use Illuminate\Http\Request;
class ChangeEstimateStatusController extends Controller
{
@ -15,12 +15,14 @@ class ChangeEstimateStatusController extends Controller
* @param Estimate $estimate
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Estimate $estimate)
{
public function __invoke(Request $request, Estimate $estimate)
{
$this->authorize('send estimate', $estimate);
$estimate->update($request->only('status'));
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -0,0 +1,132 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\InvoiceResource;
use Crater\Models\CompanySetting;
use Crater\Models\Estimate;
use Crater\Models\Invoice;
use Crater\Services\SerialNumberFormatter;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Vinkla\Hashids\Facades\Hashids;
class ConvertEstimateController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Crater\Models\Estimate $estimate
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Estimate $estimate, Invoice $invoice)
{
$this->authorize('create', Invoice::class);
$estimate->load(['items', 'items.taxes', 'customer', 'taxes']);
$invoice_date = Carbon::now();
$due_date = null;
$dueDateEnabled = CompanySetting::getSetting(
'invoice_set_due_date_automatically',
$request->header('company')
);
if ($dueDateEnabled === 'YES') {
$dueDateDays = CompanySetting::getSetting(
'invoice_due_date_days',
$request->header('company')
);
$due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
}
$serial = (new SerialNumberFormatter())
->setModel($invoice)
->setCompany($estimate->company_id)
->setCustomer($estimate->customer_id)
->setNextNumbers();
$templateName = $estimate->getInvoiceTemplateName();
$exchange_rate = $estimate->exchange_rate;
$invoice = Invoice::create([
'creator_id' => Auth::id(),
'invoice_date' => $invoice_date->format('Y-m-d'),
'due_date' => $due_date,
'invoice_number' => $serial->getNextNumber(),
'sequence_number' => $serial->nextSequenceNumber,
'customer_sequence_number' => $serial->nextCustomerSequenceNumber,
'reference_number' => $serial->getNextNumber(),
'customer_id' => $estimate->customer_id,
'company_id' => $request->header('company'),
'template_name' => $templateName,
'status' => Invoice::STATUS_DRAFT,
'paid_status' => Invoice::STATUS_UNPAID,
'sub_total' => $estimate->sub_total,
'discount' => $estimate->discount,
'discount_type' => $estimate->discount_type,
'discount_val' => $estimate->discount_val,
'total' => $estimate->total,
'due_amount' => $estimate->total,
'tax_per_item' => $estimate->tax_per_item,
'discount_per_item' => $estimate->discount_per_item,
'tax' => $estimate->tax,
'notes' => $estimate->notes,
'exchange_rate' => $exchange_rate,
'base_discount_val' => $estimate->discount_val * $exchange_rate,
'base_sub_total' => $estimate->sub_total * $exchange_rate,
'base_total' => $estimate->total * $exchange_rate,
'base_tax' => $estimate->tax * $exchange_rate,
'currency_id' => $estimate->currency_id,
]);
$invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);
$invoice->save();
$invoiceItems = $estimate->items->toArray();
foreach ($invoiceItems as $invoiceItem) {
$invoiceItem['company_id'] = $request->header('company');
$invoiceItem['name'] = $invoiceItem['name'];
$estimateItem['exchange_rate'] = $exchange_rate;
$estimateItem['base_price'] = $invoiceItem['price'] * $exchange_rate;
$estimateItem['base_discount_val'] = $invoiceItem['discount_val'] * $exchange_rate;
$estimateItem['base_tax'] = $invoiceItem['tax'] * $exchange_rate;
$estimateItem['base_total'] = $invoiceItem['total'] * $exchange_rate;
$item = $invoice->items()->create($invoiceItem);
if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
foreach ($invoiceItem['taxes'] as $tax) {
$tax['company_id'] = $request->header('company');
if ($tax['amount']) {
$item->taxes()->create($tax);
}
}
}
}
if ($estimate->taxes) {
foreach ($estimate->taxes->toArray() as $tax) {
$tax['company_id'] = $request->header('company');
$tax['exchange_rate'] = $exchange_rate;
$tax['base_amount'] = $tax['amount'] * $exchange_rate;
$tax['currency_id'] = $estimate->currency_id;
unset($tax['estimate_id']);
$invoice->taxes()->create($tax);
}
}
$estimate->checkForEstimateConvertAction();
$invoice = Invoice::find($invoice->id);
return new InvoiceResource($invoice);
}
}

View File

@ -0,0 +1,27 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Crater\Http\Controllers\Controller;
use Crater\Models\Estimate;
use Illuminate\Http\Request;
class EstimateTemplatesController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$this->authorize('viewAny', Estimate::class);
$estimateTemplates = Estimate::estimateTemplates();
return response()->json([
'estimateTemplates' => $estimateTemplates
]);
}
}

View File

@ -0,0 +1,77 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\DeleteEstimatesRequest;
use Crater\Http\Requests\EstimatesRequest;
use Crater\Http\Resources\EstimateResource;
use Crater\Jobs\GenerateEstimatePdfJob;
use Crater\Models\Estimate;
use Illuminate\Http\Request;
class EstimatesController extends Controller
{
public function index(Request $request)
{
$this->authorize('viewAny', Estimate::class);
$limit = $request->has('limit') ? $request->limit : 10;
$estimates = Estimate::whereCompany()
->join('customers', 'customers.id', '=', 'estimates.customer_id')
->applyFilters($request->all())
->select('estimates.*', 'customers.name')
->latest()
->paginateData($limit);
return (EstimateResource::collection($estimates))
->additional(['meta' => [
'estimate_total_count' => Estimate::whereCompany()->count(),
]]);
}
public function store(EstimatesRequest $request)
{
$this->authorize('create', Estimate::class);
$estimate = Estimate::createEstimate($request);
if ($request->has('estimateSend')) {
$estimate->send($request->title, $request->body);
}
GenerateEstimatePdfJob::dispatch($estimate);
return new EstimateResource($estimate);
}
public function show(Request $request, Estimate $estimate)
{
$this->authorize('view', $estimate);
return new EstimateResource($estimate);
}
public function update(EstimatesRequest $request, Estimate $estimate)
{
$this->authorize('update', $estimate);
$estimate = $estimate->updateEstimate($request);
GenerateEstimatePdfJob::dispatch($estimate, true);
return new EstimateResource($estimate);
}
public function delete(DeleteEstimatesRequest $request)
{
$this->authorize('delete multiple estimates');
Estimate::destroy($request->ids);
return response()->json([
'success' => true,
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Estimate;
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Crater\Http\Controllers\Controller;
use Crater\Models\Estimate;
use Crater\Http\Requests\SendEstimatesRequest;
use Crater\Models\Estimate;
class SendEstimateController extends Controller
{
@ -16,6 +16,8 @@ class SendEstimateController extends Controller
*/
public function __invoke(SendEstimatesRequest $request, Estimate $estimate)
{
$this->authorize('send estimate', $estimate);
$response = $estimate->send($request->all());
return response()->json($response);

View File

@ -0,0 +1,26 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Estimate;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\SendEstimatesRequest;
use Crater\Models\Estimate;
use Illuminate\Mail\Markdown;
class SendEstimatePreviewController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Crater\Http\Requests\SendEstimatesRequest $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(SendEstimatesRequest $request, Estimate $estimate)
{
$this->authorize('send estimate', $estimate);
$markdown = new Markdown(view(), config('mail.markdown'));
return $markdown->render('emails.send.estimate', ['data' => $estimate->sendEstimateData($request->all())]);
}
}

View File

@ -0,0 +1,117 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\ExchangeRate;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\ExchangeRateProviderRequest;
use Crater\Http\Resources\ExchangeRateProviderResource;
use Crater\Models\ExchangeRateProvider;
use Illuminate\Http\Request;
class ExchangeRateProviderController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$this->authorize('viewAny', ExchangeRateProvider::class);
$limit = $request->has('limit') ? $request->limit : 5;
$exchangeRateProviders = ExchangeRateProvider::whereCompany()->paginate($limit);
return ExchangeRateProviderResource::collection($exchangeRateProviders);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(ExchangeRateProviderRequest $request)
{
$this->authorize('create', ExchangeRateProvider::class);
$query = ExchangeRateProvider::checkActiveCurrencies($request);
if (count($query) !== 0) {
return respondJson('currency_used', 'Currency used.');
}
$checkConverterApi = ExchangeRateProvider::checkExchangeRateProviderStatus($request);
if ($checkConverterApi->status() == 200) {
$exchangeRateProvider = ExchangeRateProvider::createFromRequest($request);
return new ExchangeRateProviderResource($exchangeRateProvider);
}
return $checkConverterApi;
}
/**
* Display the specified resource.
*
* @param \Crater\Models\ExchangeRateProvider $exchangeRateProvider
* @return \Illuminate\Http\Response
*/
public function show(ExchangeRateProvider $exchangeRateProvider)
{
$this->authorize('view', $exchangeRateProvider);
return new ExchangeRateProviderResource($exchangeRateProvider);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Crater\Models\ExchangeRateProvider $exchangeRateProvider
* @return \Illuminate\Http\Response
*/
public function update(ExchangeRateProviderRequest $request, ExchangeRateProvider $exchangeRateProvider)
{
$this->authorize('update', $exchangeRateProvider);
$query = $exchangeRateProvider->checkUpdateActiveCurrencies($request);
if (count($query) !== 0) {
return respondJson('currency_used', 'Currency used.');
}
$checkConverterApi = ExchangeRateProvider::checkExchangeRateProviderStatus($request);
if ($checkConverterApi->status() == 200) {
$exchangeRateProvider->updateFromRequest($request);
return new ExchangeRateProviderResource($exchangeRateProvider);
}
return $checkConverterApi;
}
/**
* Remove the specified resource from storage.
*
* @param \Crater\Models\ExchangeRateProvider $exchangeRateProvider
* @return \Illuminate\Http\Response
*/
public function destroy(ExchangeRateProvider $exchangeRateProvider)
{
$this->authorize('delete', $exchangeRateProvider);
if ($exchangeRateProvider->active == true) {
return respondJson('provider_active', 'Provider Active.');
}
$exchangeRateProvider->delete();
return response()->json([
'success' => true,
]);
}
}

View File

@ -0,0 +1,35 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\ExchangeRate;
use Crater\Http\Controllers\Controller;
use Crater\Models\Currency;
use Crater\Models\ExchangeRateProvider;
use Illuminate\Http\Request;
class GetActiveProviderController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Currency $currency)
{
$query = ExchangeRateProvider::whereCompany()->whereJsonContains('currencies', $currency->code)
->where('active', true)
->get();
if (count($query) !== 0) {
return response()->json([
'success' => true,
'message' => 'provider_active',
], 200);
}
return response()->json([
'error' => 'no_active_provider',
], 200);
}
}

View File

@ -0,0 +1,57 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\ExchangeRate;
use Crater\Http\Controllers\Controller;
use Crater\Models\CompanySetting;
use Crater\Models\Currency;
use Crater\Models\ExchangeRateLog;
use Crater\Models\ExchangeRateProvider;
use Crater\Traits\ExchangeRateProvidersTrait;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
class GetExchangeRateController extends Controller
{
use ExchangeRateProvidersTrait;
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Currency $currency)
{
$settings = CompanySetting::getSettings(['currency'], $request->header('company'));
$baseCurrency = Currency::findOrFail($settings['currency']);
$query = ExchangeRateProvider::whereJsonContains('currencies', $currency->code)
->where('active', true)
->get()
->toArray();
$exchange_rate = ExchangeRateLog::where('base_currency_id', $currency->id)
->where('currency_id', $baseCurrency->id)
->orderBy('created_at', 'desc')
->value('exchange_rate');
if ($query) {
$filter = Arr::only($query[0], ['key', 'driver', 'driver_config']);
$exchange_rate_value = $this->getExchangeRate($filter, $currency->code, $baseCurrency->code);
if ($exchange_rate_value->status() == 200) {
return $exchange_rate_value;
}
}
if ($exchange_rate) {
return response()->json([
'exchangeRate' => [$exchange_rate],
], 200);
}
return response()->json([
'error' => 'no_exchange_rate_available',
], 200);
}
}

View File

@ -0,0 +1,26 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\ExchangeRate;
use Crater\Http\Controllers\Controller;
use Crater\Models\ExchangeRateProvider;
use Crater\Traits\ExchangeRateProvidersTrait;
use Illuminate\Http\Request;
class GetSupportedCurrenciesController extends Controller
{
use ExchangeRateProvidersTrait;
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$this->authorize('viewAny', ExchangeRateProvider::class);
return $this->getSupportedCurrencies($request);
}
}

View File

@ -0,0 +1,55 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\ExchangeRate;
use Crater\Http\Controllers\Controller;
use Crater\Models\ExchangeRateProvider;
use Illuminate\Http\Request;
class GetUsedCurrenciesController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$this->authorize('viewAny', ExchangeRateProvider::class);
$providerId = $request->provider_id;
$activeExchangeRateProviders = ExchangeRateProvider::where('active', true)
->whereCompany()
->when($providerId, function ($query) use ($providerId) {
return $query->where('id', '<>', $providerId);
})
->pluck('currencies');
$activeExchangeRateProvider = [];
foreach ($activeExchangeRateProviders as $data) {
if (is_array($data)) {
for ($limit = 0; $limit < count($data); $limit++) {
$activeExchangeRateProvider[] = $data[$limit];
}
}
}
$allExchangeRateProviders = ExchangeRateProvider::whereCompany()->pluck('currencies');
$allExchangeRateProvider = [];
foreach ($allExchangeRateProviders as $data) {
if (is_array($data)) {
for ($limit = 0; $limit < count($data); $limit++) {
$allExchangeRateProvider[] = $data[$limit];
}
}
}
return response()->json([
'allUsedCurrencies' => $allExchangeRateProvider ? $allExchangeRateProvider : [],
'activeUsedCurrencies' => $activeExchangeRateProvider ? $activeExchangeRateProvider : [],
]);
}
}

View File

@ -1,10 +1,12 @@
<?php
namespace Crater\Http\Controllers\V1\Expense;
namespace Crater\Http\Controllers\V1\Admin\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\ExpenseCategoryRequest;
use Crater\Http\Resources\ExpenseCategoryResource;
use Crater\Models\ExpenseCategory;
use Illuminate\Http\Request;
use Crater\Http\Requests\ExpenseCategoryRequest;
use Crater\Http\Controllers\Controller;
class ExpenseCategoriesController extends Controller
{
@ -15,19 +17,16 @@ class ExpenseCategoriesController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', ExpenseCategory::class);
$limit = $request->has('limit') ? $request->limit : 5;
$categories = ExpenseCategory::whereCompany($request->header('company'))
->applyFilters($request->only([
'category_id',
'search'
]))
$categories = ExpenseCategory::applyFilters($request->all())
->whereCompany()
->latest()
->paginateData($limit);
return response()->json([
'categories' => $categories
]);
return ExpenseCategoryResource::collection($categories);
}
/**
@ -38,14 +37,11 @@ class ExpenseCategoriesController extends Controller
*/
public function store(ExpenseCategoryRequest $request)
{
$data = $request->validated();
$data['company_id'] = $request->header('company');
$category = ExpenseCategory::create($data);
$this->authorize('create', ExpenseCategory::class);
return response()->json([
'category' => $category,
'success' => true
]);
$category = ExpenseCategory::create($request->getExpenseCategoryPayload());
return new ExpenseCategoryResource($category);
}
/**
@ -56,9 +52,9 @@ class ExpenseCategoriesController extends Controller
*/
public function show(ExpenseCategory $category)
{
return response()->json([
'category' => $category
]);
$this->authorize('view', $category);
return new ExpenseCategoryResource($category);
}
/**
@ -70,12 +66,11 @@ class ExpenseCategoriesController extends Controller
*/
public function update(ExpenseCategoryRequest $request, ExpenseCategory $category)
{
$category->update($request->validated());
$this->authorize('update', $category);
return response()->json([
'category' => $category,
'success' => true
]);
$category->update($request->getExpenseCategoryPayload());
return new ExpenseCategoryResource($category);
}
/**
@ -86,16 +81,16 @@ class ExpenseCategoriesController extends Controller
*/
public function destroy(ExpenseCategory $category)
{
$this->authorize('delete', $category);
if ($category->expenses() && $category->expenses()->count() > 0) {
return response()->json([
'success' => false
]);
return respondJson('expense_attached', 'Expense Attached');
}
$category->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,12 +1,13 @@
<?php
namespace Crater\Http\Controllers\V1\Expense;
namespace Crater\Http\Controllers\V1\Admin\Expense;
use Crater\Models\Expense;
use Illuminate\Http\Request;
use Crater\Http\Requests\ExpenseRequest;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\DeleteExpensesRequest;
use Crater\Http\Requests\ExpenseRequest;
use Crater\Http\Resources\ExpenseResource;
use Crater\Models\Expense;
use Illuminate\Http\Request;
class ExpensesController extends Controller
{
@ -17,29 +18,22 @@ class ExpensesController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', Expense::class);
$limit = $request->has('limit') ? $request->limit : 10;
$expenses = Expense::with('category', 'creator', 'fields')
->leftJoin('users', 'users.id', '=', 'expenses.user_id')
->whereCompany()
->leftJoin('customers', 'customers.id', '=', 'expenses.customer_id')
->join('expense_categories', 'expense_categories.id', '=', 'expenses.expense_category_id')
->applyFilters($request->only([
'expense_category_id',
'user_id',
'expense_id',
'search',
'from_date',
'to_date',
'orderByField',
'orderBy'
]))
->whereCompany($request->header('company'))
->select('expenses.*', 'expense_categories.name', 'users.name as user_name')
->applyFilters($request->all())
->select('expenses.*', 'expense_categories.name', 'customers.name as user_name')
->paginateData($limit);
return response()->json([
'expenses' => $expenses,
'expenseTotalCount' => Expense::count()
]);
return (ExpenseResource::collection($expenses))
->additional(['meta' => [
'expense_total_count' => Expense::whereCompany()->count(),
]]);
}
/**
@ -50,12 +44,11 @@ class ExpensesController extends Controller
*/
public function store(ExpenseRequest $request)
{
$this->authorize('create', Expense::class);
$expense = Expense::createExpense($request);
return response()->json([
'expense' => $expense,
'success' => true
]);
return new ExpenseResource($expense);
}
/**
@ -66,11 +59,9 @@ class ExpensesController extends Controller
*/
public function show(Expense $expense)
{
$expense->load('creator', 'fields.customField');
$this->authorize('view', $expense);
return response()->json([
'expense' => $expense
]);
return new ExpenseResource($expense);
}
/**
@ -82,20 +73,21 @@ class ExpensesController extends Controller
*/
public function update(ExpenseRequest $request, Expense $expense)
{
$this->authorize('update', $expense);
$expense->updateExpense($request);
return response()->json([
'expense' => $expense,
'success' => true
]);
return new ExpenseResource($expense);
}
public function delete(DeleteExpensesRequest $request)
{
$this->authorize('delete multiple expenses');
Expense::destroy($request->ids);
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -0,0 +1,30 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Models\Expense;
class ShowReceiptController extends Controller
{
/**
* Retrieve details of an expense receipt from storage.
*
* @param \Crater\Models\Expense $expense
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(Expense $expense)
{
$this->authorize('view', $expense);
if ($expense) {
$media = $expense->getFirstMedia('receipts');
if ($media) {
return response()->file($media->getPath());
}
return respondJson('receipt_does_not_exist', 'Receipt does not exist.');
}
}
}

View File

@ -1,9 +1,9 @@
<?php
namespace Crater\Http\Controllers\V1\Expense;
namespace Crater\Http\Controllers\V1\Admin\Expense;
use Crater\Models\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Models\Expense;
use Illuminate\Http\Request;
class UploadReceiptController extends Controller
@ -17,6 +17,8 @@ class UploadReceiptController extends Controller
*/
public function __invoke(Request $request, Expense $expense)
{
$this->authorize('update', $expense);
$data = json_decode($request->attachment_receipt);
if ($data) {
@ -26,11 +28,11 @@ class UploadReceiptController extends Controller
$expense->addMediaFromBase64($data->data)
->usingFileName($data->name)
->toMediaCollection('receipts', 'local');
->toMediaCollection('receipts');
}
return response()->json([
'success' => 'Expense receipts uploaded successfully'
]);
'success' => 'Expense receipts uploaded successfully',
], 200);
}
}

View File

@ -0,0 +1,63 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\CompanyResource;
use Crater\Http\Resources\UserResource;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Currency;
use Crater\Traits\GeneratesMenuTrait;
use Illuminate\Http\Request;
use Silber\Bouncer\BouncerFacade;
class BootstrapController extends Controller
{
use GeneratesMenuTrait;
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(Request $request)
{
$current_user = $request->user();
$current_user_settings = $current_user->getAllSettings();
$main_menu = $this->generateMenu('main_menu', $current_user);
$setting_menu = $this->generateMenu('setting_menu', $current_user);
$companies = $current_user->companies;
$current_company = Company::find($request->header('company'));
if ((! $current_company) || ($current_company && ! $current_user->hasCompany($current_company->id))) {
$current_company = $current_user->companies()->first();
}
$current_company_settings = CompanySetting::getAllSettings($current_company->id);
$current_company_currency = $current_company_settings->has('currency')
? Currency::find($current_company_settings->get('currency'))
: Currency::first();
BouncerFacade::refreshFor($current_user);
return response()->json([
'current_user' => new UserResource($current_user),
'current_user_settings' => $current_user_settings,
'current_user_abilities' => $current_user->getAbilities(),
'companies' => CompanyResource::collection($companies),
'current_company' => new CompanyResource($current_company),
'current_company_settings' => $current_company_settings,
'current_company_currency' => $current_company_currency,
'config' => config('crater'),
'main_menu' => $main_menu,
'setting_menu' => $setting_menu,
]);
}
}

View File

@ -0,0 +1,128 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\BulkExchangeRateRequest;
use Crater\Models\CompanySetting;
use Crater\Models\Estimate;
use Crater\Models\Invoice;
use Crater\Models\Payment;
use Crater\Models\Tax;
class BulkExchangeRateController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(BulkExchangeRateRequest $request)
{
$bulkExchangeRate = CompanySetting::getSetting('bulk_exchange_rate_configured', $request->header('company'));
if ($bulkExchangeRate == 'NO') {
if ($request->currencies) {
foreach ($request->currencies as $currency) {
$currency['exchange_rate'] = $currency['exchange_rate'] ?? 1;
$invoices = Invoice::where('currency_id', $currency['id'])->get();
if ($invoices) {
foreach ($invoices as $invoice) {
$invoice->update([
'exchange_rate' => $currency['exchange_rate'],
'base_discount_val' => $invoice->sub_total * $currency['exchange_rate'],
'base_sub_total' => $invoice->sub_total * $currency['exchange_rate'],
'base_total' => $invoice->total * $currency['exchange_rate'],
'base_tax' => $invoice->tax * $currency['exchange_rate'],
'base_due_amount' => $invoice->due_amount * $currency['exchange_rate']
]);
$this->items($invoice);
}
}
$estimates = Estimate::where('currency_id', $currency['id'])->get();
if ($estimates) {
foreach ($estimates as $estimate) {
$estimate->update([
'exchange_rate' => $currency['exchange_rate'],
'base_discount_val' => $estimate->sub_total * $currency['exchange_rate'],
'base_sub_total' => $estimate->sub_total * $currency['exchange_rate'],
'base_total' => $estimate->total * $currency['exchange_rate'],
'base_tax' => $estimate->tax * $currency['exchange_rate']
]);
$this->items($estimate);
}
}
$taxes = Tax::where('currency_id', $currency['id'])->get();
if ($taxes) {
foreach ($taxes as $tax) {
$tax->base_amount = $tax->base_amount * $currency['exchange_rate'];
$tax->save();
}
}
$payments = Payment::where('currency_id', $currency['id'])->get();
if ($payments) {
foreach ($payments as $payment) {
$payment->exchange_rate = $currency['exchange_rate'];
$payment->base_amount = $payment->amount * $currency['exchange_rate'];
$payment->save();
}
}
}
}
$settings = [
'bulk_exchange_rate_configured' => 'YES'
];
CompanySetting::setSettings($settings, $request->header('company'));
return response()->json([
'success' => true
]);
}
return response()->json([
'error' => false
]);
}
public function items($model)
{
foreach ($model->items as $item) {
$item->update([
'exchange_rate' => $model->exchange_rate,
'base_discount_val' => $item->discount_val * $model->exchange_rate,
'base_price' => $item->price * $model->exchange_rate,
'base_tax' => $item->tax * $model->exchange_rate,
'base_total' => $item->total * $model->exchange_rate
]);
$this->taxes($item);
}
$this->taxes($model);
}
public function taxes($model)
{
if ($model->taxes()->exists()) {
$model->taxes->map(function ($tax) use ($model) {
$tax->update([
'exchange_rate' => $model->exchange_rate,
'base_amount' => $tax->amount * $model->exchange_rate,
]);
});
}
}
}

View File

@ -1,12 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\Estimate;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Models\EstimateTemplate;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
class EstimateTemplatesController extends Controller
class ConfigController extends Controller
{
/**
* Handle the incoming request.
@ -17,7 +16,7 @@ class EstimateTemplatesController extends Controller
public function __invoke(Request $request)
{
return response()->json([
'templates' => EstimateTemplate::all()
$request->key => config('crater.'.$request->key),
]);
}
}

View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Models\Country;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\CountryResource;
use Crater\Models\Country;
use Illuminate\Http\Request;
class CountriesController extends Controller
@ -16,8 +17,8 @@ class CountriesController extends Controller
*/
public function __invoke(Request $request)
{
return response()->json([
'countries' => Country::all()
]);
$countries = Country::all();
return CountryResource::collection($countries);
}
}

View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Models\Currency;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\CurrencyResource;
use Crater\Models\Currency;
use Illuminate\Http\Request;
class CurrenciesController extends Controller
@ -18,8 +19,6 @@ class CurrenciesController extends Controller
{
$currencies = Currency::latest()->get();
return response()->json([
'currencies' => $currencies
]);
return CurrencyResource::collection($currencies);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Space\DateFormatter;
@ -17,7 +17,7 @@ class DateFormatsController extends Controller
public function __invoke(Request $request)
{
return response()->json([
'date_formats' => DateFormatter::get_list()
'date_formats' => DateFormatter::get_list(),
]);
}
}

View File

@ -0,0 +1,37 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Models\Currency;
use Crater\Models\Estimate;
use Crater\Models\Invoice;
use Crater\Models\Payment;
use Crater\Models\Tax;
use Illuminate\Http\Request;
class GetAllUsedCurrenciesController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$invoices = Invoice::where('exchange_rate', null)->pluck('currency_id')->toArray();
$taxes = Tax::where('exchange_rate', null)->pluck('currency_id')->toArray();
$estimates = Estimate::where('exchange_rate', null)->pluck('currency_id')->toArray();
$payments = Payment::where('exchange_rate', null)->pluck('currency_id')->toArray();
$currencies = array_merge($invoices, $taxes, $estimates, $payments);
return response()->json([
'currencies' => Currency::whereIn('id', $currencies)->get()
]);
}
}

View File

@ -0,0 +1,66 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Models\Estimate;
use Crater\Models\Invoice;
use Crater\Models\Payment;
use Crater\Services\SerialNumberFormatter;
use Illuminate\Http\Request;
class NextNumberController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Invoice $invoice, Estimate $estimate, Payment $payment)
{
$key = $request->key;
$nextNumber = null;
$serial = (new SerialNumberFormatter())
->setCompany($request->header('company'))
->setCustomer($request->userId);
try {
switch ($key) {
case 'invoice':
$nextNumber = $serial->setModel($invoice)
->setModelObject($request->model_id)
->getNextNumber();
break;
case 'estimate':
$nextNumber = $serial->setModel($estimate)
->setModelObject($request->model_id)
->getNextNumber();
break;
case 'payment':
$nextNumber = $serial->setModel($payment)
->setModelObject($request->model_id)
->getNextNumber();
break;
default:
return;
}
} catch (\Exception $exception) {
return response()->json([
'success' => false,
'message' => $exception->getMessage()
]);
}
return response()->json([
'success' => true,
'nextNumber' => $nextNumber,
]);
}
}

View File

@ -1,9 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\NotesRequest;
use Crater\Http\Resources\NoteResource;
use Crater\Models\Note;
use Illuminate\Http\Request;
@ -16,15 +17,16 @@ class NotesController extends Controller
*/
public function index(Request $request)
{
$this->authorize('view notes');
$limit = $request->limit ?? 10;
$notes = Note::latest()
->applyFilters($request->only(['type', 'search']))
->whereCompany()
->applyFilters($request->all())
->paginate($limit);
return response()->json([
'notes' => $notes
]);
return NoteResource::collection($notes);
}
/**
@ -35,11 +37,11 @@ class NotesController extends Controller
*/
public function store(NotesRequest $request)
{
$note = Note::create($request->validated());
$this->authorize('manage notes');
return response()->json([
'note' => $note
]);
$note = Note::create($request->getNotesPayload());
return new NoteResource($note);
}
/**
@ -50,9 +52,9 @@ class NotesController extends Controller
*/
public function show(Note $note)
{
return response()->json([
'note' => $note
]);
$this->authorize('view notes');
return new NoteResource($note);
}
/**
@ -64,11 +66,11 @@ class NotesController extends Controller
*/
public function update(NotesRequest $request, Note $note)
{
$note->update($request->validated());
$this->authorize('manage notes');
return response()->json([
'note' => $note
]);
$note->update($request->getNotesPayload());
return new NoteResource($note);
}
/**
@ -79,10 +81,12 @@ class NotesController extends Controller
*/
public function destroy(Note $note)
{
$this->authorize('manage notes');
$note->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -0,0 +1,30 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Services\SerialNumberFormatter;
use Illuminate\Http\Request;
class NumberPlaceholdersController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
if ($request->format) {
$placeholders = SerialNumberFormatter::getPlaceholders($request->format);
} else {
$placeholders = [];
}
return response()->json([
'success' => true,
'placeholders' => $placeholders,
]);
}
}

View File

@ -1,11 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Models\Customer;
use Crater\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class SearchController extends Controller
{
@ -17,21 +17,21 @@ class SearchController extends Controller
*/
public function __invoke(Request $request)
{
$customers = User::where('role', 'customer')
->applyFilters($request->only(['search']))
$user = $request->user();
$customers = Customer::applyFilters($request->only(['search']))
->latest()
->paginate(10);
if (Auth::user()->role == 'super admin') {
$users = User::where('role', 'admin')
->applyFilters($request->only(['search']))
if ($user->isOwner()) {
$users = User::applyFilters($request->only(['search']))
->latest()
->paginate(10);
}
return response()->json([
'customers' => $customers,
'users' => $users ?? []
'users' => $users ?? [],
]);
}
}

View File

@ -0,0 +1,27 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Models\User;
use Illuminate\Http\Request;
class SearchUsersController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$this->authorize('create', User::class);
$users = User::whereEmail($request->email)
->latest()
->paginate(10);
return response()->json(['users' => $users]);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\General;
namespace Crater\Http\Controllers\V1\Admin\General;
use Crater\Http\Controllers\Controller;
use Crater\Space\TimeZones;
@ -17,7 +17,7 @@ class TimezonesController extends Controller
public function __invoke(Request $request)
{
return response()->json([
'time_zones' => TimeZones::get_list()
'time_zones' => TimeZones::get_list(),
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Invoice;
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Illuminate\Http\Request;
use Crater\Http\Controllers\Controller;
use Crater\Models\Invoice;
use Illuminate\Http\Request;
class ChangeInvoiceStatusController extends Controller
{
@ -14,8 +14,10 @@ class ChangeInvoiceStatusController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(Request $request, Invoice $invoice)
{
public function __invoke(Request $request, Invoice $invoice)
{
$this->authorize('send invoice', $invoice);
if ($request->status == Invoice::STATUS_SENT) {
$invoice->status = Invoice::STATUS_SENT;
$invoice->sent = true;
@ -28,7 +30,7 @@ class ChangeInvoiceStatusController extends Controller
}
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -0,0 +1,131 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Carbon\Carbon;
use Crater\Http\Controllers\Controller;
use Crater\Http\Resources\InvoiceResource;
use Crater\Models\CompanySetting;
use Crater\Models\Invoice;
use Crater\Services\SerialNumberFormatter;
use Illuminate\Http\Request;
use Vinkla\Hashids\Facades\Hashids;
class CloneInvoiceController extends Controller
{
/**
* Mail a specific invoice to the corresponding customer's email address.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(Request $request, Invoice $invoice)
{
$this->authorize('create', Invoice::class);
$date = Carbon::now();
$serial = (new SerialNumberFormatter())
->setModel($invoice)
->setCompany($invoice->company_id)
->setCustomer($invoice->customer_id)
->setNextNumbers();
$due_date = null;
$dueDateEnabled = CompanySetting::getSetting(
'invoice_set_due_date_automatically',
$request->header('company')
);
if ($dueDateEnabled === 'YES') {
$dueDateDays = CompanySetting::getSetting(
'invoice_due_date_days',
$request->header('company')
);
$due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
}
$exchange_rate = $invoice->exchange_rate;
$newInvoice = Invoice::create([
'invoice_date' => $date->format('Y-m-d'),
'due_date' => $due_date,
'invoice_number' => $serial->getNextNumber(),
'sequence_number' => $serial->nextSequenceNumber,
'customer_sequence_number' => $serial->nextCustomerSequenceNumber,
'reference_number' => $invoice->reference_number,
'customer_id' => $invoice->customer_id,
'company_id' => $request->header('company'),
'template_name' => $invoice->template_name,
'status' => Invoice::STATUS_DRAFT,
'paid_status' => Invoice::STATUS_UNPAID,
'sub_total' => $invoice->sub_total,
'discount' => $invoice->discount,
'discount_type' => $invoice->discount_type,
'discount_val' => $invoice->discount_val,
'total' => $invoice->total,
'due_amount' => $invoice->total,
'tax_per_item' => $invoice->tax_per_item,
'discount_per_item' => $invoice->discount_per_item,
'tax' => $invoice->tax,
'notes' => $invoice->notes,
'exchange_rate' => $exchange_rate,
'base_total' => $invoice->total * $exchange_rate,
'base_discount_val' => $invoice->discount_val * $exchange_rate,
'base_sub_total' => $invoice->sub_total * $exchange_rate,
'base_tax' => $invoice->tax * $exchange_rate,
'base_due_amount' => $invoice->total * $exchange_rate,
'currency_id' => $invoice->currency_id,
]);
$newInvoice->unique_hash = Hashids::connection(Invoice::class)->encode($newInvoice->id);
$newInvoice->save();
$invoice->load('items.taxes');
$invoiceItems = $invoice->items->toArray();
foreach ($invoiceItems as $invoiceItem) {
$invoiceItem['company_id'] = $request->header('company');
$invoiceItem['name'] = $invoiceItem['name'];
$invoiceItem['exchange_rate'] = $exchange_rate;
$invoiceItem['base_price'] = $invoiceItem['price'] * $exchange_rate;
$invoiceItem['base_discount_val'] = $invoiceItem['discount_val'] * $exchange_rate;
$invoiceItem['base_tax'] = $invoiceItem['tax'] * $exchange_rate;
$invoiceItem['base_total'] = $invoiceItem['total'] * $exchange_rate;
$item = $newInvoice->items()->create($invoiceItem);
if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
foreach ($invoiceItem['taxes'] as $tax) {
$tax['company_id'] = $request->header('company');
if ($tax['amount']) {
$item->taxes()->create($tax);
}
}
}
}
if ($invoice->taxes) {
foreach ($invoice->taxes->toArray() as $tax) {
$tax['company_id'] = $request->header('company');
$newInvoice->taxes()->create($tax);
}
}
if ($invoice->fields()->exists()) {
$customFields = [];
foreach ($invoice->fields as $data) {
$customFields[] = [
'id' => $data->custom_field_id,
'value' => $data->defaultAnswer
];
}
$newInvoice->addCustomFields($customFields);
}
return new InvoiceResource($newInvoice);
}
}

View File

@ -1,9 +1,9 @@
<?php
namespace Crater\Http\Controllers\V1\Invoice;
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Crater\Http\Controllers\Controller;
use Crater\Models\InvoiceTemplate;
use Crater\Models\Invoice;
use Illuminate\Http\Request;
class InvoiceTemplatesController extends Controller
@ -16,10 +16,12 @@ class InvoiceTemplatesController extends Controller
*/
public function __invoke(Request $request)
{
$invoiceTemplates = InvoiceTemplate::all();
$this->authorize('viewAny', Invoice::class);
$invoiceTemplates = Invoice::invoiceTemplates();
return response()->json([
'invoiceTemplates' => $invoiceTemplates
'invoiceTemplates' => $invoiceTemplates,
]);
}
}

View File

@ -1,13 +1,14 @@
<?php
namespace Crater\Http\Controllers\V1\Invoice;
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Illuminate\Http\Request;
use Crater\Http\Requests;
use Crater\Models\Invoice;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests;
use Crater\Http\Requests\DeleteInvoiceRequest;
use Crater\Http\Resources\InvoiceResource;
use Crater\Jobs\GenerateInvoicePdfJob;
use Crater\Models\Invoice;
use Illuminate\Http\Request;
class InvoicesController extends Controller
{
@ -18,31 +19,21 @@ class InvoicesController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', Invoice::class);
$limit = $request->has('limit') ? $request->limit : 10;
$invoices = Invoice::with(['items', 'user', 'creator', 'invoiceTemplate', 'taxes'])
->join('users', 'users.id', '=', 'invoices.user_id')
->applyFilters($request->only([
'status',
'paid_status',
'customer_id',
'invoice_id',
'invoice_number',
'from_date',
'to_date',
'orderByField',
'orderBy',
'search',
]))
->whereCompany($request->header('company'))
->select('invoices.*', 'users.name')
$invoices = Invoice::whereCompany()
->join('customers', 'customers.id', '=', 'invoices.customer_id')
->applyFilters($request->all())
->select('invoices.*', 'customers.name')
->latest()
->paginateData($limit);
return response()->json([
'invoices' => $invoices,
'invoiceTotalCount' => Invoice::count()
]);
return (InvoiceResource::collection($invoices))
->additional(['meta' => [
'invoice_total_count' => Invoice::whereCompany()->count(),
]]);
}
/**
@ -53,6 +44,8 @@ class InvoicesController extends Controller
*/
public function store(Requests\InvoicesRequest $request)
{
$this->authorize('create', Invoice::class);
$invoice = Invoice::createInvoice($request);
if ($request->has('invoiceSend')) {
@ -61,9 +54,7 @@ class InvoicesController extends Controller
GenerateInvoicePdfJob::dispatch($invoice);
return response()->json([
'invoice' => $invoice
]);
return new InvoiceResource($invoice);
}
/**
@ -72,24 +63,11 @@ class InvoicesController extends Controller
* @param \Crater\Models\Invoice $invoice
* @return \Illuminate\Http\JsonResponse
*/
public function show(Invoice $invoice)
public function show(Request $request, Invoice $invoice)
{
$invoice->load([
'items',
'items.taxes',
'user',
'invoiceTemplate',
'taxes.taxType',
'fields.customField'
]);
$this->authorize('view', $invoice);
$siteData = [
'invoice' => $invoice,
'nextInvoiceNumber' => $invoice->getInvoiceNumAttribute(),
'invoicePrefix' => $invoice->getInvoicePrefixAttribute(),
];
return response()->json($siteData);
return new InvoiceResource($invoice);
}
/**
@ -101,14 +79,17 @@ class InvoicesController extends Controller
*/
public function update(Requests\InvoicesRequest $request, Invoice $invoice)
{
$this->authorize('update', $invoice);
$invoice = $invoice->updateInvoice($request);
if (is_string($invoice)) {
return respondJson($invoice, $invoice);
}
GenerateInvoicePdfJob::dispatch($invoice, true);
return response()->json([
'invoice' => $invoice,
'success' => true
]);
return new InvoiceResource($invoice);
}
/**
@ -119,10 +100,12 @@ class InvoicesController extends Controller
*/
public function delete(DeleteInvoiceRequest $request)
{
$this->authorize('delete multiple invoices');
Invoice::destroy($request->ids);
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Invoice;
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Crater\Http\Controllers\Controller;
use Crater\Models\Invoice;
use Crater\Http\Requests\SendInvoiceRequest;
use Crater\Models\Invoice;
class SendInvoiceController extends Controller
{
@ -16,10 +16,12 @@ class SendInvoiceController extends Controller
*/
public function __invoke(SendInvoiceRequest $request, Invoice $invoice)
{
$this->authorize('send invoice', $invoice);
$invoice->send($request->all());
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -0,0 +1,26 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Invoice;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\SendInvoiceRequest;
use Crater\Models\Invoice;
use Illuminate\Mail\Markdown;
class SendInvoicePreviewController extends Controller
{
/**
* Mail a specific invoice to the corresponding customer's email address.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function __invoke(SendInvoiceRequest $request, Invoice $invoice)
{
$this->authorize('send invoice', $invoice);
$markdown = new Markdown(view(), config('mail.markdown'));
return $markdown->render('emails.send.invoice', ['data' => $invoice->sendInvoiceData($request->all())]);
}
}

View File

@ -1,13 +1,14 @@
<?php
namespace Crater\Http\Controllers\V1\Item;
namespace Crater\Http\Controllers\V1\Admin\Item;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Crater\Http\Requests;
use Crater\Http\Requests\DeleteItemsRequest;
use Crater\Http\Resources\ItemResource;
use Crater\Models\Item;
use Crater\Models\TaxType;
use Illuminate\Http\Request;
class ItemsController extends Controller
{
@ -19,28 +20,22 @@ class ItemsController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', Item::class);
$limit = $request->has('limit') ? $request->limit : 10;
$items = Item::with(['taxes', 'creator'])
$items = Item::whereCompany()
->leftJoin('units', 'units.id', '=', 'items.unit_id')
->applyFilters($request->only([
'search',
'price',
'unit_id',
'item_id',
'orderByField',
'orderBy'
]))
->whereCompany($request->header('company'))
->applyFilters($request->all())
->select('items.*', 'units.name as unit_name')
->latest()
->paginateData($limit);
return response()->json([
'items' => $items,
'taxTypes' => TaxType::latest()->get(),
'itemTotalCount' => Item::count()
]);
return (ItemResource::collection($items))
->additional(['meta' => [
'tax_types' => TaxType::whereCompany()->latest()->get(),
'item_total_count' => Item::whereCompany()->count(),
]]);
}
/**
@ -51,11 +46,11 @@ class ItemsController extends Controller
*/
public function store(Requests\ItemsRequest $request)
{
$this->authorize('create', Item::class);
$item = Item::createItem($request);
return response()->json([
'item' => $item
]);
return new ItemResource($item);
}
/**
@ -66,11 +61,9 @@ class ItemsController extends Controller
*/
public function show(Item $item)
{
$item->load('taxes');
$this->authorize('view', $item);
return response()->json([
'item' => $item
]);
return new ItemResource($item);
}
/**
@ -82,11 +75,11 @@ class ItemsController extends Controller
*/
public function update(Requests\ItemsRequest $request, Item $item)
{
$this->authorize('update', $item);
$item = $item->updateItem($request);
return response()->json([
'item' => $item
]);
return new ItemResource($item);
}
/**
@ -97,10 +90,12 @@ class ItemsController extends Controller
*/
public function delete(DeleteItemsRequest $request)
{
$this->authorize('delete multiple items');
Item::destroy($request->ids);
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,11 +1,12 @@
<?php
namespace Crater\Http\Controllers\V1\Item;
namespace Crater\Http\Controllers\V1\Admin\Item;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\UnitRequest;
use Crater\Http\Resources\UnitResource;
use Crater\Models\Unit;
use Illuminate\Http\Request;
use Crater\Http\Requests\UnitRequest;
use Crater\Http\Controllers\Controller;
class UnitsController extends Controller
{
@ -16,28 +17,16 @@ class UnitsController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', Unit::class);
$limit = $request->has('limit') ? $request->limit : 5;
$units = Unit::whereCompany($request->header('company'))
->applyFilters($request->only([
'unit_id'
]))
$units = Unit::applyFilters($request->all())
->whereCompany()
->latest()
->paginateData($limit);
return response()->json([
'units' => $units
]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
return UnitResource::collection($units);
}
/**
@ -48,13 +37,11 @@ class UnitsController extends Controller
*/
public function store(UnitRequest $request)
{
$data = $request->validated();
$data['company_id'] = $request->header('company');
$unit = Unit::create($data);
$this->authorize('create', Unit::class);
return response()->json([
'unit' => $unit
]);
$unit = Unit::create($request->getUnitPayload());
return new UnitResource($unit);
}
/**
@ -65,9 +52,9 @@ class UnitsController extends Controller
*/
public function show(Unit $unit)
{
return response()->json([
'unit' => $unit
]);
$this->authorize('view', $unit);
return new UnitResource($unit);
}
/**
@ -79,11 +66,11 @@ class UnitsController extends Controller
*/
public function update(UnitRequest $request, Unit $unit)
{
$unit->update($request->validated());
$this->authorize('update', $unit);
return response()->json([
'unit' => $unit
]);
$unit->update($request->getUnitPayload());
return new UnitResource($unit);
}
/**
@ -94,16 +81,16 @@ class UnitsController extends Controller
*/
public function destroy(Unit $unit)
{
$this->authorize('delete', $unit);
if ($unit->items()->exists()) {
return response()->json([
'error' => 'items_attached'
]);
return respondJson('items_attached', 'Items Attached');
}
$unit->delete();
return response()->json([
'success' => 'Unit deleted successfully'
'success' => 'Unit deleted successfully',
]);
}
}

View File

@ -1,23 +1,19 @@
<?php
namespace Crater\Http\Controllers\V1\Mobile;
namespace Crater\Http\Controllers\V1\Admin\Mobile;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\LoginRequest;
use Crater\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\ValidationException;
class AuthController extends Controller
{
public function login(Request $request)
public function login(LoginRequest $request)
{
$request->validate([
'username' => 'required|email',
'password' => 'required',
'device_name' => 'required',
]);
$user = User::where('email', $request->username)->first();
if (! $user || ! Hash::check($request->password, $user->password)) {
@ -28,7 +24,7 @@ class AuthController extends Controller
return response()->json([
'type' => 'Bearer',
'token' => $user->createToken($request->device_name)->plainTextToken
'token' => $user->createToken($request->device_name)->plainTextToken,
]);
}
@ -37,7 +33,12 @@ class AuthController extends Controller
$request->user()->currentAccessToken()->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
public function check()
{
return Auth::check();
}
}

View File

@ -1,11 +1,12 @@
<?php
namespace Crater\Http\Controllers\V1\Payment;
namespace Crater\Http\Controllers\V1\Admin\Payment;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\PaymentMethodRequest;
use Crater\Http\Resources\PaymentMethodResource;
use Crater\Models\PaymentMethod;
use Illuminate\Http\Request;
use Crater\Http\Requests\PaymentMethodRequest;
use Crater\Http\Controllers\Controller;
class PaymentMethodsController extends Controller
{
@ -16,19 +17,16 @@ class PaymentMethodsController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', PaymentMethod::class);
$limit = $request->has('limit') ? $request->limit : 5;
$paymentMethods = PaymentMethod::whereCompany($request->header('company'))
->applyFilters($request->only([
'method_id',
'search'
]))
$paymentMethods = PaymentMethod::applyFilters($request->all())
->whereCompany()
->latest()
->paginateData($limit);
return response()->json([
'paymentMethods' => $paymentMethods
]);
return PaymentMethodResource::collection($paymentMethods);
}
/**
@ -39,11 +37,11 @@ class PaymentMethodsController extends Controller
*/
public function store(PaymentMethodRequest $request)
{
$this->authorize('create', PaymentMethod::class);
$paymentMethod = PaymentMethod::createPaymentMethod($request);
return response()->json([
'paymentMethod' => $paymentMethod
]);
return new PaymentMethodResource($paymentMethod);
}
/**
@ -54,9 +52,9 @@ class PaymentMethodsController extends Controller
*/
public function show(PaymentMethod $paymentMethod)
{
return response()->json([
'paymentMethod' => $paymentMethod
]);
$this->authorize('view', $paymentMethod);
return new PaymentMethodResource($paymentMethod);
}
/**
@ -68,11 +66,11 @@ class PaymentMethodsController extends Controller
*/
public function update(PaymentMethodRequest $request, PaymentMethod $paymentMethod)
{
$this->authorize('update', $paymentMethod);
$paymentMethod->update($request->validated());
return response()->json([
'paymentMethod' => $paymentMethod
]);
return new PaymentMethodResource($paymentMethod);
}
/**
@ -83,18 +81,18 @@ class PaymentMethodsController extends Controller
*/
public function destroy(PaymentMethod $paymentMethod)
{
$this->authorize('delete', $paymentMethod);
$payments = $paymentMethod->payments;
if ($payments->count() > 0) {
return response()->json([
'error' => 'payments_attached'
]);
return respondJson('payments_attached', 'Payments Attached.');
}
$paymentMethod->delete();
return response()->json([
'success' => 'Payment method deleted successfully'
'success' => 'Payment method deleted successfully',
]);
}
}

View File

@ -0,0 +1,81 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Payment;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\DeletePaymentsRequest;
use Crater\Http\Requests\PaymentRequest;
use Crater\Http\Resources\PaymentResource;
use Crater\Models\Payment;
use Illuminate\Http\Request;
class PaymentsController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$this->authorize('viewAny', Payment::class);
$limit = $request->has('limit') ? $request->limit : 10;
$payments = Payment::whereCompany()
->join('customers', 'customers.id', '=', 'payments.customer_id')
->leftJoin('invoices', 'invoices.id', '=', 'payments.invoice_id')
->leftJoin('payment_methods', 'payment_methods.id', '=', 'payments.payment_method_id')
->applyFilters($request->all())
->select('payments.*', 'customers.name', 'invoices.invoice_number', 'payment_methods.name as payment_mode')
->latest()
->paginateData($limit);
return (PaymentResource::collection($payments))
->additional(['meta' => [
'payment_total_count' => Payment::whereCompany()->count(),
]]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(PaymentRequest $request)
{
$this->authorize('create', Payment::class);
$payment = Payment::createPayment($request);
return new PaymentResource($payment);
}
public function show(Request $request, Payment $payment)
{
$this->authorize('view', $payment);
return new PaymentResource($payment);
}
public function update(PaymentRequest $request, Payment $payment)
{
$this->authorize('update', $payment);
$payment = $payment->updatePayment($request);
return new PaymentResource($payment);
}
public function delete(DeletePaymentsRequest $request)
{
$this->authorize('delete multiple payments');
Payment::deletePayments($request->ids);
return response()->json([
'success' => true,
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Payment;
namespace Crater\Http\Controllers\V1\Admin\Payment;
use Crater\Http\Controllers\Controller;
use Crater\Models\Payment;
use Crater\Http\Requests\SendPaymentRequest;
use Crater\Models\Payment;
class SendPaymentController extends Controller
{
@ -16,6 +16,8 @@ class SendPaymentController extends Controller
*/
public function __invoke(SendPaymentRequest $request, Payment $payment)
{
$this->authorize('send payment', $payment);
$response = $payment->send($request->all());
return response()->json($response);

View File

@ -0,0 +1,26 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Payment;
use Crater\Http\Controllers\Controller;
use Crater\Models\Payment;
use Illuminate\Http\Request;
use Illuminate\Mail\Markdown;
class SendPaymentPreviewController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request, Payment $payment)
{
$this->authorize('send payment', $payment);
$markdown = new Markdown(view(), config('mail.markdown'));
return $markdown->render('emails.send.payment', ['data' => $payment->sendPaymentData($request->all())]);
}
}

View File

@ -0,0 +1,94 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\RecurringInvoice;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\RecurringInvoiceRequest;
use Crater\Http\Resources\RecurringInvoiceResource;
use Crater\Models\RecurringInvoice;
use Illuminate\Http\Request;
class RecurringInvoiceController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$this->authorize('viewAny', RecurringInvoice::class);
$limit = $request->has('limit') ? $request->limit : 10;
$recurringInvoices = RecurringInvoice::whereCompany()
->applyFilters($request->all())
->paginateData($limit);
return (RecurringInvoiceResource::collection($recurringInvoices))
->additional(['meta' => [
'recurring_invoice_total_count' => RecurringInvoice::whereCompany()->count(),
]]);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(RecurringInvoiceRequest $request)
{
$this->authorize('create', RecurringInvoice::class);
$recurringInvoice = RecurringInvoice::createFromRequest($request);
return new RecurringInvoiceResource($recurringInvoice);
}
/**
* Display the specified resource.
*
* @param \Crater\Models\RecurringInvoice $recurringInvoice
* @return \Illuminate\Http\Response
*/
public function show(RecurringInvoice $recurringInvoice)
{
$this->authorize('view', $recurringInvoice);
return new RecurringInvoiceResource($recurringInvoice);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Crater\Models\RecurringInvoice $recurringInvoice
* @return \Illuminate\Http\Response
*/
public function update(RecurringInvoiceRequest $request, RecurringInvoice $recurringInvoice)
{
$this->authorize('update', $recurringInvoice);
$recurringInvoice->updateFromRequest($request);
return new RecurringInvoiceResource($recurringInvoice);
}
/**
* Remove the specified resource from storage.
*
* @param \Crater\Models\RecurringInvoice $recurringInvoice
* @return \Illuminate\Http\Response
*/
public function delete(Request $request)
{
$this->authorize('delete multiple recurring invoices');
RecurringInvoice::deleteRecurringInvoice($request->ids);
return response()->json([
'success' => true,
]);
}
}

View File

@ -0,0 +1,20 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\RecurringInvoice;
use Crater\Http\Controllers\Controller;
use Crater\Models\RecurringInvoice;
use Illuminate\Http\Request;
class RecurringInvoiceFrequencyController extends Controller
{
public function __invoke(Request $request)
{
$nextInvoiceAt = RecurringInvoice::getNextInvoiceDate($request->frequency, $request->starts_at);
return response()->json([
'success' => true,
'next_invoice_at' => $nextInvoiceAt,
]);
}
}

View File

@ -1,15 +1,15 @@
<?php
namespace Crater\Http\Controllers\V1\Report;
namespace Crater\Http\Controllers\V1\Admin\Report;
use Illuminate\Support\Facades\App;
use Illuminate\Http\Request;
use Crater\Models\Company;
use PDF;
use Carbon\Carbon;
use Crater\Models\User;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Customer;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use PDF;
class CustomerSalesReportController extends Controller
{
@ -24,6 +24,8 @@ class CustomerSalesReportController extends Controller
{
$company = Company::where('unique_hash', $hash)->first();
$this->authorize('view report', $company);
$locale = CompanySetting::getSetting('language', $company->id);
App::setLocale($locale);
@ -31,14 +33,13 @@ class CustomerSalesReportController extends Controller
$start = Carbon::createFromFormat('Y-m-d', $request->from_date);
$end = Carbon::createFromFormat('Y-m-d', $request->to_date);
$customers = User::with(['invoices' => function ($query) use ($start, $end) {
$query->whereBetween(
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
);
}])
->customer()
->whereCompany($company->id)
$customers = Customer::with(['invoices' => function ($query) use ($start, $end) {
$query->whereBetween(
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
);
}])
->where('company_id', $company->id)
->applyInvoiceFilters($request->only(['from_date', 'to_date']))
->get();
@ -65,7 +66,7 @@ class CustomerSalesReportController extends Controller
'footer_text_color',
'footer_total_color',
'footer_bg_color',
'date_text_color'
'date_text_color',
];
$colorSettings = CompanySetting::whereIn('option', $colors)
@ -78,11 +79,15 @@ class CustomerSalesReportController extends Controller
'colorSettings' => $colorSettings,
'company' => $company,
'from_date' => $from_date,
'to_date' => $to_date
'to_date' => $to_date,
]);
$pdf = PDF::loadView('app.pdf.reports.sales-customers');
if ($request->has('preview')) {
return view('app.pdf.reports.sales-customers');
}
if ($request->has('download')) {
return $pdf->download();
}

View File

@ -1,15 +1,15 @@
<?php
namespace Crater\Http\Controllers\V1\Report;
namespace Crater\Http\Controllers\V1\Admin\Report;
use Illuminate\Http\Request;
use Crater\Models\Company;
use PDF;
use Carbon\Carbon;
use Crater\Models\Expense;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Expense;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use PDF;
class ExpensesReportController extends Controller
{
@ -24,16 +24,17 @@ class ExpensesReportController extends Controller
{
$company = Company::where('unique_hash', $hash)->first();
$this->authorize('view report', $company);
$locale = CompanySetting::getSetting('language', $company->id);
App::setLocale($locale);
$expenseCategories = Expense::with('category')
->whereCompany($company->id)
->whereCompanyId($company->id)
->applyFilters($request->only(['from_date', 'to_date']))
->expensesAttributes()
->get();
$totalAmount = 0;
foreach ($expenseCategories as $category) {
$totalAmount += $category->total_amount;
@ -52,7 +53,7 @@ class ExpensesReportController extends Controller
'footer_text_color',
'footer_total_color',
'footer_bg_color',
'date_text_color'
'date_text_color',
];
$colorSettings = CompanySetting::whereIn('option', $colors)
->whereCompany($company->id)
@ -64,10 +65,14 @@ class ExpensesReportController extends Controller
'totalExpense' => $totalAmount,
'company' => $company,
'from_date' => $from_date,
'to_date' => $to_date
'to_date' => $to_date,
]);
$pdf = PDF::loadView('app.pdf.reports.expenses');
if ($request->has('preview')) {
return view('app.pdf.reports.expenses');
}
if ($request->has('download')) {
return $pdf->download();
}

View File

@ -1,15 +1,15 @@
<?php
namespace Crater\Http\Controllers\V1\Report;
namespace Crater\Http\Controllers\V1\Admin\Report;
use Illuminate\Http\Request;
use Crater\Models\Company;
use PDF;
use Carbon\Carbon;
use Crater\Models\InvoiceItem;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\InvoiceItem;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use PDF;
class ItemSalesReportController extends Controller
{
@ -24,6 +24,8 @@ class ItemSalesReportController extends Controller
{
$company = Company::where('unique_hash', $hash)->first();
$this->authorize('view report', $company);
$locale = CompanySetting::getSetting('language', $company->id);
App::setLocale($locale);
@ -51,7 +53,7 @@ class ItemSalesReportController extends Controller
'footer_text_color',
'footer_total_color',
'footer_bg_color',
'date_text_color'
'date_text_color',
];
$colorSettings = CompanySetting::whereIn('option', $colors)
->whereCompany($company->id)
@ -63,10 +65,14 @@ class ItemSalesReportController extends Controller
'totalAmount' => $totalAmount,
'company' => $company,
'from_date' => $from_date,
'to_date' => $to_date
'to_date' => $to_date,
]);
$pdf = PDF::loadView('app.pdf.reports.sales-items');
if ($request->has('preview')) {
return view('app.pdf.reports.sales-items');
}
if ($request->has('download')) {
return $pdf->download();
}

View File

@ -1,16 +1,16 @@
<?php
namespace Crater\Http\Controllers\V1\Report;
namespace Crater\Http\Controllers\V1\Admin\Report;
use Illuminate\Http\Request;
use Crater\Models\Company;
use PDF;
use Carbon\Carbon;
use Crater\Models\Invoice;
use Crater\Models\Expense;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Expense;
use Crater\Models\Invoice;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use PDF;
class ProfitLossReportController extends Controller
{
@ -25,17 +25,19 @@ class ProfitLossReportController extends Controller
{
$company = Company::where('unique_hash', $hash)->first();
$this->authorize('view report', $company);
$locale = CompanySetting::getSetting('language', $company->id);
App::setLocale($locale);
$invoicesAmount = Invoice::whereCompany($company->id)
$invoicesAmount = Invoice::whereCompanyId($company->id)
->applyFilters($request->only(['from_date', 'to_date']))
->wherePaidStatus(Invoice::STATUS_PAID)
->sum('total');
$expenseCategories = Expense::with('category')
->whereCompany($company->id)
->whereCompanyId($company->id)
->applyFilters($request->only(['from_date', 'to_date']))
->expensesAttributes()
->get();
@ -58,7 +60,7 @@ class ProfitLossReportController extends Controller
'footer_text_color',
'footer_total_color',
'footer_bg_color',
'date_text_color'
'date_text_color',
];
$colorSettings = CompanySetting::whereIn('option', $colors)
->whereCompany($company->id)
@ -72,10 +74,14 @@ class ProfitLossReportController extends Controller
'colorSettings' => $colorSettings,
'company' => $company,
'from_date' => $from_date,
'to_date' => $to_date
'to_date' => $to_date,
]);
$pdf = PDF::loadView('app.pdf.reports.profit-loss');
if ($request->has('preview')) {
return view('app.pdf.reports.profit-loss');
}
if ($request->has('download')) {
return $pdf->download();
}

View File

@ -1,15 +1,15 @@
<?php
namespace Crater\Http\Controllers\V1\Report;
namespace Crater\Http\Controllers\V1\Admin\Report;
use Illuminate\Http\Request;
use Crater\Models\Company;
use PDF;
use Carbon\Carbon;
use Crater\Models\Tax;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
use Crater\Models\Tax;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use PDF;
class TaxSummaryReportController extends Controller
{
@ -24,12 +24,14 @@ class TaxSummaryReportController extends Controller
{
$company = Company::where('unique_hash', $hash)->first();
$this->authorize('view report', $company);
$locale = CompanySetting::getSetting('language', $company->id);
App::setLocale($locale);
$taxTypes = Tax::with('taxType', 'invoice', 'invoiceItem')
->whereCompany($company->id)
->whereCompany($company->id)
->whereInvoicesFilters($request->only(['from_date', 'to_date']))
->taxAttributes()
->get();
@ -52,7 +54,7 @@ class TaxSummaryReportController extends Controller
'footer_text_color',
'footer_total_color',
'footer_bg_color',
'date_text_color'
'date_text_color',
];
$colorSettings = CompanySetting::whereIn('option', $colors)
@ -65,11 +67,15 @@ class TaxSummaryReportController extends Controller
'colorSettings' => $colorSettings,
'company' => $company,
'from_date' => $from_date,
'to_date' => $to_date
'to_date' => $to_date,
]);
$pdf = PDF::loadView('app.pdf.reports.tax-summary');
if ($request->has('preview')) {
return view('app.pdf.reports.tax-summary');
}
if ($request->has('download')) {
return $pdf->download();
}

View File

@ -0,0 +1,20 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Role;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
class AbilitiesController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
return response()->json(['abilities' => config('abilities.abilities')]);
}
}

View File

@ -0,0 +1,119 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Role;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\RoleRequest;
use Crater\Http\Resources\RoleResource;
use Crater\Models\User;
use Illuminate\Http\Request;
use Silber\Bouncer\BouncerFacade;
use Silber\Bouncer\Database\Role;
class RolesController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$this->authorize('viewAny', Role::class);
$roles = Role::when($request->has('orderByField'), function ($query) use ($request) {
return $query->orderBy($request['orderByField'], $request['orderBy']);
})
->when($request->company_id, function ($query) use ($request) {
return $query->where('scope', $request->company_id);
})
->get();
return RoleResource::collection($roles);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(RoleRequest $request)
{
$this->authorize('create', Role::class);
$role = Role::create($request->getRolePayload());
$this->syncAbilities($request, $role);
return new RoleResource($role);
}
/**
* Display the specified resource.
*
* @param \Spatie\Permission\Models\Role $role
* @return \Illuminate\Http\Response
*/
public function show(Role $role)
{
$this->authorize('view', $role);
return new RoleResource($role);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Spatie\Permission\Models\Role $role
* @return \Illuminate\Http\Response
*/
public function update(RoleRequest $request, Role $role)
{
$this->authorize('update', $role);
$role->update($request->getRolePayload());
$this->syncAbilities($request, $role);
return new RoleResource($role);
}
/**
* Remove the specified resource from storage.
*
* @param \Spatie\Permission\Models\Role $role
* @return \Illuminate\Http\Response
*/
public function destroy(Role $role)
{
$this->authorize('delete', $role);
$users = User::whereIs($role->name)->get()->toArray();
if (! empty($users)) {
return respondJson('role_attached_to_users', 'Roles Attached to user');
}
$role->delete();
return response()->json([
'success' => true
]);
}
private function syncAbilities(RoleRequest $request, $role)
{
foreach (config('abilities.abilities') as $ability) {
$check = array_search($ability['ability'], array_column($request->abilities, 'ability'));
if ($check !== false) {
BouncerFacade::allow($role)->to($ability['ability'], $ability['model']);
} else {
BouncerFacade::disallow($role)->to($ability['ability'], $ability['model']);
}
}
return true;
}
}

View File

@ -1,13 +1,14 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Illuminate\Http\Request;
use Crater\Models\Company;
use Crater\Http\Requests\ProfileRequest;
use Crater\Http\Requests\CompanyRequest;
use Crater\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Crater\Http\Requests\CompanyRequest;
use Crater\Http\Requests\ProfileRequest;
use Crater\Http\Resources\CompanyResource;
use Crater\Http\Resources\UserResource;
use Crater\Models\Company;
use Illuminate\Http\Request;
class CompanyController extends Controller
{
@ -15,21 +16,9 @@ class CompanyController extends Controller
* Retrive the Admin account.
* @return \Illuminate\Http\JsonResponse
*/
public function getUser()
public function getUser(Request $request)
{
$user = Auth::user();
$user->load([
'addresses',
'addresses.country',
'company',
'company.address',
'company.address.country'
]);
return response()->json([
'user' => $user
]);
return new UserResource($request->user());
}
/**
@ -41,14 +30,11 @@ class CompanyController extends Controller
*/
public function updateProfile(ProfileRequest $request)
{
$user = Auth::user();
$user = $request->user();
$user->update($request->validated());
return response()->json([
'user' => $user,
'success' => true
]);
return new UserResource($user);
}
/**
@ -58,16 +44,15 @@ class CompanyController extends Controller
*/
public function updateCompany(CompanyRequest $request)
{
$company = Auth::user()->company;
$company = Company::find($request->header('company'));
$this->authorize('manage company', $company);
$company->update($request->only('name'));
$company->address()->updateOrCreate(['company_id' => $company->id], $request->except(['name']));
$company->address()->updateOrCreate(['company_id' => $company->id], $request->address);
return response()->json([
'company' => $company,
'success' => true
]);
return new CompanyResource($company);
}
/**
@ -78,6 +63,10 @@ class CompanyController extends Controller
*/
public function uploadCompanyLogo(Request $request)
{
$company = Company::find($request->header('company'));
$this->authorize('manage company', $company);
$data = json_decode($request->company_logo);
if ($data) {
@ -93,7 +82,7 @@ class CompanyController extends Controller
}
return response()->json([
'success' => true
'success' => true,
]);
}
@ -105,23 +94,24 @@ class CompanyController extends Controller
*/
public function uploadAvatar(Request $request)
{
$data = json_decode($request->admin_avatar);
$user = auth()->user();
if ($data) {
$user = auth()->user();
if ($user && $request->hasFile('admin_avatar')) {
$user->clearMediaCollection('admin_avatar');
if ($user) {
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromBase64($data->data)
->usingFileName($data->name)
->toMediaCollection('admin_avatar');
}
$user->addMediaFromRequest('admin_avatar')
->toMediaCollection('admin_avatar');
}
return response()->json([
'user' => $user,
'success' => true
]);
if ($user && $request->has('avatar')) {
$data = json_decode($request->avatar);
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromBase64($data->data)
->usingFileName($data->name)
->toMediaCollection('admin_avatar');
}
return new UserResource($user);
}
}

View File

@ -1,12 +1,13 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Crater\Models\FileDisk;
use Crater\Http\Requests\DiskEnvironmentRequest;
use Crater\Http\Resources\FileDiskResource;
use Crater\Models\FileDisk;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class DiskController extends Controller
{
@ -16,14 +17,14 @@ class DiskController extends Controller
*/
public function index(Request $request)
{
$this->authorize('manage file disk');
$limit = $request->has('limit') ? $request->limit : 5;
$disks = FileDisk::applyFilters($request->all())
->latest()
->paginateData($limit);
return response()->json([
'disks' => $disks,
]);
return FileDiskResource::collection($disks);
}
/**
@ -33,19 +34,15 @@ class DiskController extends Controller
*/
public function store(DiskEnvironmentRequest $request)
{
if(!FileDisk::validateCredentials($request->credentials, $request->driver)) {
return response()->json([
'success' => false,
'error' => 'invalid_credentials'
]);
$this->authorize('manage file disk');
if (! FileDisk::validateCredentials($request->credentials, $request->driver)) {
return respondJson('invalid_credentials', 'Invalid Credentials.');
}
$disk = FileDisk::createDisk($request);
return response()->json([
'success' => true,
'disk' => $disk
]);
return new FileDiskResource($disk);
}
/**
@ -56,26 +53,22 @@ class DiskController extends Controller
*/
public function update(FileDisk $disk, Request $request)
{
$this->authorize('manage file disk');
$credentials = $request->credentials;
$driver = $request->driver;
if($credentials && $driver && $disk->type !== 'SYSTEM') {
if(!FileDisk::validateCredentials($credentials, $driver)) {
return response()->json([
'success' => false,
'error' => 'invalid_credentials'
]);
if ($credentials && $driver && $disk->type !== 'SYSTEM') {
if (! FileDisk::validateCredentials($credentials, $driver)) {
return respondJson('invalid_credentials', 'Invalid Credentials.');
}
$disk->updateDisk($request);
} else if($request->set_as_default) {
} elseif ($request->set_as_default) {
$disk->setAsDefaultDisk();
}
return response()->json([
'success' => true,
'disk' => $disk
]);
return new FileDiskResource($disk);
}
/**
@ -84,12 +77,15 @@ class DiskController extends Controller
*/
public function show($disk)
{
$this->authorize('manage file disk');
$diskData = [];
switch ($disk) {
case 'local':
$diskData = [
'root' => config('filesystems.disks.local.root'),
];
break;
@ -101,6 +97,7 @@ class DiskController extends Controller
'bucket' => '',
'root' => '',
];
break;
case 'doSpaces':
@ -112,6 +109,7 @@ class DiskController extends Controller
'endpoint' => '',
'root' => '',
];
break;
case 'dropbox':
@ -122,6 +120,7 @@ class DiskController extends Controller
'app' => '',
'root' => '',
];
break;
}
@ -138,16 +137,16 @@ class DiskController extends Controller
*/
public function destroy(FileDisk $disk)
{
$this->authorize('manage file disk');
if ($disk->setAsDefault() && $disk->type === 'SYSTEM') {
return response()->json([
'success' => false
]);
return respondJson('not_allowed', 'Not Allowed');
}
$disk->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
@ -157,22 +156,24 @@ class DiskController extends Controller
*/
public function getDiskDrivers()
{
$this->authorize('manage file disk');
$drivers = [
[
'name' => 'Local',
'value' => 'local'
'value' => 'local',
],
[
'name' => 'Amazon S3',
'value' => 's3'
'value' => 's3',
],
[
'name' => 'Digital Ocean Spaces',
'value' => 'doSpaces'
'value' => 'doSpaces',
],
[
'name' => 'Dropbox',
'value' => 'dropbox'
'value' => 'dropbox',
],
];
@ -180,7 +181,7 @@ class DiskController extends Controller
return response()->json([
'drivers' => $drivers,
'default' => $default
'default' => $default,
]);
}
}

View File

@ -0,0 +1,25 @@
<?php
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
class GetCompanyMailConfigurationController extends Controller
{
/**
* Handle the incoming request.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function __invoke(Request $request)
{
$mailConfig = [
'from_name' => config('mail.from.name'),
'from_mail' => config('mail.from.address'),
];
return response()->json($mailConfig);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\GetSettingsRequest;
use Crater\Models\CompanySetting;
class GetCompanySettingsController extends Controller
{

View File

@ -1,8 +1,7 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Auth;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\GetSettingsRequest;
@ -16,7 +15,7 @@ class GetUserSettingsController extends Controller
*/
public function __invoke(GetSettingsRequest $request)
{
$user = Auth::user();
$user = $request->user();
return response()->json($user->getSettings($request->settings));
}

View File

@ -1,14 +1,14 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Models\Setting;
use Illuminate\Http\Request;
use Crater\Space\EnvironmentManager;
use Crater\Http\Requests\MailEnvironmentRequest;
use Illuminate\Http\JsonResponse;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\MailEnvironmentRequest;
use Crater\Mail\TestMail;
use Crater\Models\Setting;
use Crater\Space\EnvironmentManager;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Mail;
class MailConfigurationController extends Controller
@ -33,11 +33,12 @@ class MailConfigurationController extends Controller
*/
public function saveMailEnvironment(MailEnvironmentRequest $request)
{
$this->authorize('manage email config');
$setting = Setting::getSetting('profile_complete');
$results = $this->environmentManager->saveMailVariables($request);
if ($setting !== 'COMPLETED')
{
if ($setting !== 'COMPLETED') {
Setting::setSetting('profile_complete', 4);
}
@ -46,6 +47,8 @@ class MailConfigurationController extends Controller
public function getMailEnvironment()
{
$this->authorize('manage email config');
$MailData = [
'mail_driver' => config('mail.driver'),
'mail_host' => config('mail.host'),
@ -72,12 +75,14 @@ class MailConfigurationController extends Controller
*/
public function getMailDrivers()
{
$this->authorize('manage email config');
$drivers = [
'smtp',
'mail',
'sendmail',
'mailgun',
'ses'
'ses',
];
return response()->json($drivers);
@ -85,16 +90,18 @@ class MailConfigurationController extends Controller
public function testEmailConfig(Request $request)
{
$this->authorize('manage email config');
$this->validate($request, [
'to' => 'required|email',
'subject' => 'required',
'message' => 'required'
'message' => 'required',
]);
Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,11 +1,12 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Models\TaxType;
use Crater\Http\Requests\TaxTypeRequest;
use Illuminate\Http\Request;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\TaxTypeRequest;
use Crater\Http\Resources\TaxTypeResource;
use Crater\Models\TaxType;
use Illuminate\Http\Request;
class TaxTypesController extends Controller
{
@ -16,21 +17,16 @@ class TaxTypesController extends Controller
*/
public function index(Request $request)
{
$this->authorize('viewAny', TaxType::class);
$limit = $request->has('limit') ? $request->limit : 5;
$taxTypes = TaxType::whereCompany($request->header('company'))
->applyFilters($request->only([
'tax_type_id',
'search',
'orderByField',
'orderBy'
]))
$taxTypes = TaxType::applyFilters($request->all())
->whereCompany()
->latest()
->paginateData($limit);
return response()->json([
'taxTypes' => $taxTypes
]);
return TaxTypeResource::collection($taxTypes);
}
/**
@ -41,15 +37,11 @@ class TaxTypesController extends Controller
*/
public function store(TaxTypeRequest $request)
{
$data = $request->validated();
$this->authorize('create', TaxType::class);
$data['company_id'] = $request->header('company');
$taxType = TaxType::create($request->getTaxTypePayload());
$taxType = TaxType::create($data);
return response()->json([
'taxType' => $taxType,
]);
return new TaxTypeResource($taxType);
}
/**
@ -60,9 +52,9 @@ class TaxTypesController extends Controller
*/
public function show(TaxType $taxType)
{
return response()->json([
'taxType' => $taxType
]);
$this->authorize('view', $taxType);
return new TaxTypeResource($taxType);
}
/**
@ -74,11 +66,11 @@ class TaxTypesController extends Controller
*/
public function update(TaxTypeRequest $request, TaxType $taxType)
{
$taxType->update($request->validated());
$this->authorize('update', $taxType);
return response()->json([
'taxType' => $taxType,
]);
$taxType->update($request->getTaxTypePayload());
return new TaxTypeResource($taxType);
}
/**
@ -89,15 +81,16 @@ class TaxTypesController extends Controller
*/
public function destroy(TaxType $taxType)
{
$this->authorize('delete', $taxType);
if ($taxType->taxes() && $taxType->taxes()->count() > 0) {
return response()->json([
'success' => false
]);
return respondJson('taxes_attached', 'Taxes Attached.');
}
$taxType->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,10 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\UpdateSettingsRequest;
use Crater\Models\Company;
use Crater\Models\CompanySetting;
class UpdateCompanySettingsController extends Controller
{
@ -16,10 +17,12 @@ class UpdateCompanySettingsController extends Controller
*/
public function __invoke(UpdateSettingsRequest $request)
{
$this->authorize('manage company', Company::find($request->header('company')));
CompanySetting::setSettings($request->settings, $request->header('company'));
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,8 +1,7 @@
<?php
namespace Crater\Http\Controllers\V1\Settings;
namespace Crater\Http\Controllers\V1\Admin\Settings;
use Auth;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\UpdateSettingsRequest;
@ -16,12 +15,12 @@ class UpdateUserSettingsController extends Controller
*/
public function __invoke(UpdateSettingsRequest $request)
{
$user = Auth::user();
$user = $request->user();
$user->setSettings($request->settings);
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Update;
namespace Crater\Http\Controllers\V1\Admin\Update;
use Crater\Http\Controllers\Controller;
use Crater\Models\Setting;
@ -17,6 +17,13 @@ class CheckVersionController extends Controller
*/
public function __invoke(Request $request)
{
if ((! $request->user()) || (! $request->user()->isOwner())) {
return response()->json([
'success' => false,
'message' => 'You are not allowed to update this app.'
], 401);
}
set_time_limit(600); // 10 minutes
$json = Updater::checkForUpdate(Setting::getSetting('version'));

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Update;
namespace Crater\Http\Controllers\V1\Admin\Update;
use Crater\Http\Controllers\Controller;
use Crater\Space\Updater;
@ -16,6 +16,13 @@ class CopyFilesController extends Controller
*/
public function __invoke(Request $request)
{
if ((! $request->user()) || (! $request->user()->isOwner())) {
return response()->json([
'success' => false,
'message' => 'You are not allowed to update this app.'
], 401);
}
$request->validate([
'path' => 'required',
]);
@ -24,7 +31,7 @@ class CopyFilesController extends Controller
return response()->json([
'success' => true,
'path' => $path
'path' => $path,
]);
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace Crater\Http\Controllers\V1\Update;
namespace Crater\Http\Controllers\V1\Admin\Update;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Crater\Space\Updater;
use Illuminate\Http\Request;
class DeleteFilesController extends Controller
{
@ -16,8 +16,14 @@ class DeleteFilesController extends Controller
*/
public function __invoke(Request $request)
{
if ((! $request->user()) || (! $request->user()->isOwner())) {
return response()->json([
'success' => false,
'message' => 'You are not allowed to update this app.'
], 401);
}
if(isset($request->deleted_files) && !empty($request->deleted_files)) {
if (isset($request->deleted_files) && ! empty($request->deleted_files)) {
Updater::deleteFiles($request->deleted_files);
}

View File

@ -1,6 +1,6 @@
<?php
namespace Crater\Http\Controllers\V1\Update;
namespace Crater\Http\Controllers\V1\Admin\Update;
use Crater\Http\Controllers\Controller;
use Crater\Space\Updater;
@ -16,6 +16,13 @@ class DownloadUpdateController extends Controller
*/
public function __invoke(Request $request)
{
if ((! $request->user()) || (! $request->user()->isOwner())) {
return response()->json([
'success' => false,
'message' => 'You are not allowed to update this app.'
], 401);
}
$request->validate([
'version' => 'required',
]);
@ -24,7 +31,7 @@ class DownloadUpdateController extends Controller
return response()->json([
'success' => true,
'path' => $path
'path' => $path,
]);
}
}

Some files were not shown because too many files have changed in this diff Show More