diff --git a/app/Export/CSV/CreditExport.php b/app/Export/CSV/CreditExport.php index 1cadfea5b7dd..ae21d1d74618 100644 --- a/app/Export/CSV/CreditExport.php +++ b/app/Export/CSV/CreditExport.php @@ -16,6 +16,7 @@ use App\Models\Company; use App\Models\Credit; use App\Transformers\CreditTransformer; use App\Utils\Ninja; +use Illuminate\Contracts\Database\Eloquent\Builder; use Illuminate\Support\Facades\App; use League\Csv\Writer; @@ -80,14 +81,40 @@ class CreditExport extends BaseExport $this->credit_transformer = new CreditTransformer(); } - public function run() + public function returnJson(string $hash) { + $query = $this->init(); + + $header = $this->buildHeader(); + + $report = $query->cursor() + ->map(function ($credit) { + return $this->buildRow($credit); + })->toJson(); + } + + private function init(): Builder + { + MultiDB::setDb($this->company->db); App::forgetInstance('translator'); App::setLocale($this->company->locale()); $t = app('translator'); $t->replace(Ninja::transformTranslations($this->company->settings)); + $query = Credit::query() + ->withTrashed() + ->with('client')->where('company_id', $this->company->id) + ->where('is_deleted', 0); + + $query = $this->addDateRange($query); + + return $query; + } + + public function run() + { + $query = $this->init(); //load the CSV document from a string $this->csv = Writer::createFromString(); @@ -98,12 +125,7 @@ class CreditExport extends BaseExport //insert the header $this->csv->insertOne($this->buildHeader()); - $query = Credit::query() - ->withTrashed() - ->with('client')->where('company_id', $this->company->id) - ->where('is_deleted', 0); - - $query = $this->addDateRange($query); + $query->cursor() ->each(function ($credit) { diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index cc60c74b1f94..fdcf887beb5a 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -78,7 +78,9 @@ class EmailController extends BaseController $entity_obj->service()->markSent()->save(); $mo->invitation_id = $invitation->id; - + $mo->client_id = $invitation->contact->client_id ?? null; + $mo->vendor_id = $invitation->contact->vendor_id ?? null; + Email::dispatch($mo, $invitation->company); } }); diff --git a/app/Http/Controllers/Reports/CreditReportController.php b/app/Http/Controllers/Reports/CreditReportController.php index f940f33cb190..30f77cee63ce 100644 --- a/app/Http/Controllers/Reports/CreditReportController.php +++ b/app/Http/Controllers/Reports/CreditReportController.php @@ -62,14 +62,26 @@ class CreditReportController extends BaseController */ public function __invoke(GenericReportRequest $request) { + /** @var \App\Models\User $user */ + $user = auth()->user(); + if ($request->has('send_email') && $request->get('send_email')) { - SendToAdmin::dispatch(auth()->user()->company(), $request->all(), CreditExport::class, $this->filename); + SendToAdmin::dispatch($user->company(), $request->all(), CreditExport::class, $this->filename); return response()->json(['message' => 'working...'], 200); } // expect a list of visible fields, or use the default - $export = new CreditExport(auth()->user()->company(), $request->all()); + $export = new CreditExport($user->company(), $request->all()); + + if($request->has('output') && $request->input('output') == 'json') { + + $hash = \Illuminate\Support\Str::uuid(); + + $data = $export->returnJson($hash); + + return response()->json(['message' => $hash], 200); + } $csv = $export->run(); diff --git a/app/Http/Controllers/Reports/ReportPreviewController.php b/app/Http/Controllers/Reports/ReportPreviewController.php new file mode 100644 index 000000000000..cddbbb005493 --- /dev/null +++ b/app/Http/Controllers/Reports/ReportPreviewController.php @@ -0,0 +1,47 @@ +user(); + + $report = Cache::get($hash); + + if(!$report) + return response()->json(['message' => 'Still working.....'], 409); + + if($report){ + + Cache::forget($hash); + + return response()->json($report, 200); + } + + + } +} diff --git a/app/Http/Requests/Report/ReportPreviewRequest.php b/app/Http/Requests/Report/ReportPreviewRequest.php new file mode 100644 index 000000000000..82d53002fe47 --- /dev/null +++ b/app/Http/Requests/Report/ReportPreviewRequest.php @@ -0,0 +1,42 @@ +user(); + + return $user->isAdmin() || $user->hasPermission('view_reports'); + + } + + public function rules() + { + return [ + 'hash' => 'bail|required|string', + ]; + } + + public function prepareForValidation() + { + } +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 6d5e145af815..089287512bfd 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -93,6 +93,7 @@ class AppServiceProvider extends ServiceProvider }); Mailer::macro('postmark_config', function (string $postmark_key) { + // @phpstan-ignore /** @phpstan-ignore-next-line **/ Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([ 'transport' => 'postmark', 'token' => $postmark_key @@ -101,8 +102,10 @@ class AppServiceProvider extends ServiceProvider return $this; }); + Mailer::macro('mailgun_config', function (string $secret, string $domain, string $endpoint = 'api.mailgun.net') { - Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([ + // @phpstan-ignore /** @phpstan-ignore-next-line **/ + Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([ 'transport' => 'mailgun', 'secret' => $secret, 'domain' => $domain, diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php index 4a9663ea43f4..4c114d586d31 100644 --- a/app/Services/Email/Email.php +++ b/app/Services/Email/Email.php @@ -138,7 +138,9 @@ class Email implements ShouldQueue $this->email_object->company = $this->company; - $this->email_object->client_id ? $this->email_object->settings = $this->email_object->client->getMergedSettings() : $this->email_object->settings = $this->company->settings; + $this->email_object->client_id ? $this->email_object->settings = $this->email_object->client->getMergedSettings() : $this->email_object->settings = $this->company->settings; + + $this->email_object->client_id ? nlog("client settings") : nlog("company settings "); $this->email_object->whitelabel = $this->company->account->isPaid() ? true : false; diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php index af78d20d92eb..cd668ba6bf63 100644 --- a/app/Transformers/TaskTransformer.php +++ b/app/Transformers/TaskTransformer.php @@ -30,6 +30,7 @@ class TaskTransformer extends EntityTransformer protected $defaultIncludes = [ 'documents', + 'project', ]; /** diff --git a/phpstan.neon b/phpstan.neon index 13799a2a91b7..fffe8123c3fd 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,18 +1,22 @@ includes: - ./vendor/nunomaduro/larastan/extension.neon - ./vendor/spaze/phpstan-stripe/extension.neon + - phpstan-baseline.neon parameters: level: 2 paths: - - 'app/' + - app excludePaths: - - 'vendor/' - - 'resources/views/*' + - 'vendor/*' + - '../resources/*' + - resources/ + - resources/* - 'app/Jobs/Ninja/*' - 'app/Models/Presenters/*' - 'app/Console/Commands/*' - 'app/DataMapper/Analytics/*' - 'app/PaymentDrivers/Authorize/*' + - 'app/PaymentDrivers/AuthorizePaymentDriver.php' - 'app/Utils/Traits/*' universalObjectCratesClasses: - App\DataMapper\Tax\RuleInterface diff --git a/routes/api.php b/routes/api.php index 93a84ea8f65d..99b17d8d2242 100644 --- a/routes/api.php +++ b/routes/api.php @@ -312,7 +312,9 @@ Route::group(['middleware' => ['throttle:api', 'api_db', 'token_auth', 'locale'] Route::post('reports/client_sales_report', ClientSalesReportController::class); Route::post('reports/tax_summary_report', TaxSummaryReportController::class); Route::post('reports/user_sales_report', UserSalesReportController::class); - + Route::post('reports/preview/{hash}', UserSalesReportController::class); + + Route::resource('task_schedulers', TaskSchedulerController::class); Route::post('task_schedulers/bulk', [TaskSchedulerController::class, 'bulk'])->name('task_schedulers.bulk'); diff --git a/tests/Feature/Export/ReportCsvGenerationTest.php b/tests/Feature/Export/ReportCsvGenerationTest.php index 4ae21985a610..35e56272ec1c 100644 --- a/tests/Feature/Export/ReportCsvGenerationTest.php +++ b/tests/Feature/Export/ReportCsvGenerationTest.php @@ -674,6 +674,38 @@ class ReportCsvGenerationTest extends TestCase } + public function testCreditJsonReport() + { + + // Credit::factory()->create([ + // 'user_id' => $this->user->id, + // 'company_id' => $this->company->id, + // 'client_id' => $this->client->id, + // 'amount' => 100, + // 'balance' => 50, + // 'number' => '1234', + // 'status_id' => 2, + // 'discount' => 10, + // 'po_number' => '1234', + // 'public_notes' => 'Public', + // 'private_notes' => 'Private', + // 'terms' => 'Terms', + // ]); + + // $data = [ + // 'date_range' => 'all', + // 'report_keys' => ["client.name","credit.number","credit.amount","payment.date", "payment.amount"], + // 'send_email' => false, + // ]; + + // $response = $this->withHeaders([ + // 'X-API-SECRET' => config('ninja.api_secret'), + // 'X-API-TOKEN' => $this->token, + // ])->post('/api/v1/reports/credits?output=json', $data); + + + } + public function testCreditCustomColumnsCsvGeneration() {