diff --git a/app/DataMapper/EDoc/Schema/RO.php b/app/DataMapper/EDoc/Schema/RO.php new file mode 100644 index 000000000000..e0db66cdcc40 --- /dev/null +++ b/app/DataMapper/EDoc/Schema/RO.php @@ -0,0 +1,23 @@ +data, true); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/StaticController.php b/app/Http/Controllers/StaticController.php index a8f8e4ad1d09..1456534362fb 100644 --- a/app/Http/Controllers/StaticController.php +++ b/app/Http/Controllers/StaticController.php @@ -11,6 +11,7 @@ namespace App\Http\Controllers; +use App\DataMapper\EDoc\Schema\RO; use App\Utils\Statics; use Illuminate\Http\Response; @@ -56,8 +57,15 @@ class StaticController extends BaseController /** @var \App\Models\User $user */ $user = auth()->user(); - $response = Statics::company($user->getLocale() ?? $user->company()->getLocale()); + $response_data = Statics::company($user->getLocale() ?? $user->company()->getLocale()); - return response()->json($response, 200, ['Content-type' => 'application/json; charset=utf-8'], JSON_PRETTY_PRINT); + if(request()->has('einvoice')){ + + $ro = new RO; + + $response_data['einvoice_schema'] = $ro(); + } + + return response()->json($response_data, 200, ['Content-type' => 'application/json; charset=utf-8'], JSON_PRETTY_PRINT); } } diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index 8af23142ba94..2d55d8ad9689 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -822,8 +822,16 @@ class TemplateService $credits = collect($credits) ->map(function ($credit) { + $payments = []; + $this->entity = $credit; + if($credit->payments ?? false) { + $payments = $credit->payments->map(function ($payment) { + return $this->transformPayment($payment); + })->toArray(); + } + return [ 'amount' => Number::formatMoney($credit->amount, $credit->client), 'balance' => Number::formatMoney($credit->balance, $credit->client), @@ -879,7 +887,7 @@ class TemplateService 'vat_number' => $credit->client->vat_number ?? '', 'currency' => $credit->client->currency()->code ?? 'USD', ], - 'payments' => [], + 'payments' => $payments, 'total_tax_map' => $credit->calc()->getTotalTaxMap(), 'line_tax_map' => $credit->calc()->getTaxMap(), ];