From a5022dd553779258f433a0a7fa6d4f27b88c2353 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Mar 2024 22:54:18 +1100 Subject: [PATCH] Fixes for tests / name spaces --- .../Requests/Payment/StorePaymentRequest.php | 10 +++++++-- .../Requests/Payment/UpdatePaymentRequest.php | 4 ++-- app/Jobs/EDocument/CreateEDocument.php | 21 +++++++++---------- .../EDocument/Standards/FacturaEInvoice.php | 2 +- .../EDocument/Standards/FatturaPA.php | 2 +- .../EDocument/Standards/OrderXDocument.php | 2 +- .../EDocument/Standards/RoEInvoice.php | 2 +- .../EDocument/Standards/ZugferdEDokument.php | 2 +- .../PurchaseOrder/PurchaseOrderService.php | 2 +- routes/client.php | 4 ++-- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php index fed4c2f9c808..01ddc9f72cd5 100644 --- a/app/Http/Requests/Payment/StorePaymentRequest.php +++ b/app/Http/Requests/Payment/StorePaymentRequest.php @@ -47,8 +47,8 @@ class StorePaymentRequest extends Request 'client_id' => ['bail','required',Rule::exists('clients','id')->where('company_id',$user->company()->id)->where('is_deleted', 0)], 'amount' => ['bail', 'numeric', new PaymentAmountsBalanceRule()], 'invoices.*.amount' => ['bail','required'], - 'invoices.*.invoice_id' => ['bail','required','distinct',new ValidInvoicesRules($this->all()),Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', request()->input('client_id'))], - 'credits.*.credit_id' => ['bail','required','distinct',new ValidCreditsRules($this->all()),Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', request()->input('client_id'))], + 'invoices.*.invoice_id' => ['bail','required','distinct', new ValidInvoicesRules($this->all()),Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], + 'credits.*.credit_id' => ['bail','required','distinct', new ValidCreditsRules($this->all()),Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], 'credits.*.amount' => ['bail','required', new CreditsSumRule($this->all())], 'invoices' => ['bail','sometimes','array', new ValidPayableInvoicesRule()], 'number' => ['bail', 'nullable', Rule::unique('payments')->where('company_id', $user->company()->id)], @@ -133,6 +133,12 @@ class StorePaymentRequest extends Request $input['idempotency_key'] = substr(sha1(json_encode($input)).time()."{$input['date']}{$input['amount']}{$user->id}", 0, 64); } + nlog($input); + $i = \App\Models\Invoice::find($input['invoices'][0]['invoice_id']); + nlog($i->client_id); + nlog($i->id); + nlog($user->company()->id); + nlog($i->company_id); $this->replace($input); } diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php index 67198525aaee..befbe9499c5b 100644 --- a/app/Http/Requests/Payment/UpdatePaymentRequest.php +++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php @@ -45,9 +45,9 @@ class UpdatePaymentRequest extends Request 'client_id' => ['sometimes', 'bail', Rule::in([$this->payment->client_id])], 'number' => ['sometimes', 'bail', Rule::unique('payments')->where('company_id', $user->company()->id)->ignore($this->payment->id)], 'invoices' => ['sometimes', 'bail', 'array', new PaymentAppliedValidAmount($this->all())], - 'invoices.*.invoice_id' => ['sometimes','distinct',Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', request()->input('client_id'))], + 'invoices.*.invoice_id' => ['sometimes','distinct',Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], 'invoices.*.amount' => ['sometimes','numeric','min:0'], - 'credits.*.credit_id' => ['sometimes','bail','distinct',Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', request()->input('client_id'))], + 'credits.*.credit_id' => ['sometimes','bail','distinct',Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], 'credits.*.amount' => ['required', 'bail'], ]; diff --git a/app/Jobs/EDocument/CreateEDocument.php b/app/Jobs/EDocument/CreateEDocument.php index 59226608316c..fafb89da2810 100644 --- a/app/Jobs/EDocument/CreateEDocument.php +++ b/app/Jobs/EDocument/CreateEDocument.php @@ -11,22 +11,21 @@ namespace App\Jobs\EDocument; +use App\Utils\Ninja; +use App\Models\Quote; use App\Models\Credit; use App\Models\Invoice; use App\Models\PurchaseOrder; -use App\Models\Quote; -use App\Services\EInvoicing\Standards\FacturaEInvoice; -use App\Services\EInvoicing\Standards\OrderXDocument; -use App\Services\EInvoicing\Standards\ZugferdEDokument; -use App\Utils\Ninja; -use horstoeko\zugferd\ZugferdDocumentBuilder; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\App; +use Illuminate\Queue\SerializesModels; +use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\App; -use function App\Jobs\Invoice\app; +use horstoeko\zugferd\ZugferdDocumentBuilder; +use App\Services\EDocument\Standards\OrderXDocument; +use App\Services\EDocument\Standards\FacturaEInvoice; +use App\Services\EDocument\Standards\ZugferdEDokument; class CreateEDocument implements ShouldQueue { @@ -55,7 +54,7 @@ class CreateEDocument implements ShouldQueue $t = app('translator'); /* Set the locale*/ $settings_entity = ($this->document instanceof PurchaseOrder) ? $this->document->vendor : $this->document->client; - App::setLocale($$settings_entity->locale()); + App::setLocale($settings_entity->locale()); /* Set customized translations _NOW_ */ $t->replace(Ninja::transformTranslations($this->document->client->getMergedSettings())); diff --git a/app/Services/EDocument/Standards/FacturaEInvoice.php b/app/Services/EDocument/Standards/FacturaEInvoice.php index 623fe724d172..c4182efbbb9a 100644 --- a/app/Services/EDocument/Standards/FacturaEInvoice.php +++ b/app/Services/EDocument/Standards/FacturaEInvoice.php @@ -9,7 +9,7 @@ * @license https://www.elastic.co/licensing/elastic-license */ -namespace App\Services\EInvoicing\Standards; +namespace App\Services\EDocument\Standards; use App\Models\Invoice; use App\Models\PaymentType; diff --git a/app/Services/EDocument/Standards/FatturaPA.php b/app/Services/EDocument/Standards/FatturaPA.php index 7b40e9c8b33f..e8c0ad2145c7 100644 --- a/app/Services/EDocument/Standards/FatturaPA.php +++ b/app/Services/EDocument/Standards/FatturaPA.php @@ -9,7 +9,7 @@ * @license https://www.elastic.co/licensing/elastic-license */ -namespace App\Services\EInvoicing\Standards; +namespace App\Services\EDocument\Standards; use App\Models\Invoice; use App\Services\AbstractService; diff --git a/app/Services/EDocument/Standards/OrderXDocument.php b/app/Services/EDocument/Standards/OrderXDocument.php index 71fe18844344..fb431531405b 100644 --- a/app/Services/EDocument/Standards/OrderXDocument.php +++ b/app/Services/EDocument/Standards/OrderXDocument.php @@ -9,7 +9,7 @@ * @license https://www.elastic.co/licensing/elastic-license */ -namespace App\Services\EInvoicing\Standards; +namespace App\Services\EDocument\Standards; use App\Models\Credit; use App\Models\Invoice; diff --git a/app/Services/EDocument/Standards/RoEInvoice.php b/app/Services/EDocument/Standards/RoEInvoice.php index 4a8ce29969e9..d9945e9834df 100644 --- a/app/Services/EDocument/Standards/RoEInvoice.php +++ b/app/Services/EDocument/Standards/RoEInvoice.php @@ -9,7 +9,7 @@ * @license https://www.elastic.co/licensing/elastic-license */ -namespace App\Services\EInvoicing\Standards; +namespace App\Services\EDocument\Standards; use App\Models\Invoice; use App\Services\AbstractService; diff --git a/app/Services/EDocument/Standards/ZugferdEDokument.php b/app/Services/EDocument/Standards/ZugferdEDokument.php index 7c6a754904e1..918a96a6177b 100644 --- a/app/Services/EDocument/Standards/ZugferdEDokument.php +++ b/app/Services/EDocument/Standards/ZugferdEDokument.php @@ -9,7 +9,7 @@ * @license https://www.elastic.co/licensing/elastic-license */ -namespace App\Services\EInvoicing\Standards; +namespace App\Services\EDocument\Standards; use App\Models\Credit; use App\Models\Invoice; diff --git a/app/Services/PurchaseOrder/PurchaseOrderService.php b/app/Services/PurchaseOrder/PurchaseOrderService.php index cdcf0517842c..686329599f62 100644 --- a/app/Services/PurchaseOrder/PurchaseOrderService.php +++ b/app/Services/PurchaseOrder/PurchaseOrderService.php @@ -94,7 +94,7 @@ class PurchaseOrderService // if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->e_invoice_filepath($invitation).$this->invoice->getFileName("xml"))) { if (Ninja::isHosted()) { - Storage::disk('public')->delete($this->purchase_order->->vendor->e_document_filepath($invitation).$this->purchase_order->getFileName("xml")); + Storage::disk('public')->delete($this->purchase_order->vendor->e_document_filepath($invitation).$this->purchase_order->getFileName("xml")); } } catch (\Exception $e) { nlog($e->getMessage()); diff --git a/routes/client.php b/routes/client.php index 78a7cc50bdbb..feeefd1e9fb0 100644 --- a/routes/client.php +++ b/routes/client.php @@ -131,9 +131,9 @@ Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'clie Route::get('invoice/{invitation_key}/download_pdf', [InvoiceController::class, 'downloadPdf'])->name('invoice.download_invitation_key')->middleware('token_auth'); Route::get('invoice/{invitation_key}/download_e_invoice', [InvoiceController::class, 'downloadEInvoice'])->name('invoice.download_e_invoice')->middleware('token_auth'); Route::get('quote/{invitation_key}/download_pdf', [QuoteController::class, 'downloadPdf'])->name('quote.download_invitation_key')->middleware('token_auth'); - Route::get('quote/{invitation_key}/download_e_quote', [QuoteController::class, "downloadEQuote"])->name()->name('invoice.download_e_quote')->middleware('token_auth'); + Route::get('quote/{invitation_key}/download_e_quote', [QuoteController::class, "downloadEQuote"])->name('invoice.download_e_quote')->middleware('token_auth'); Route::get('credit/{invitation_key}/download_pdf', [CreditController::class, 'downloadPdf'])->name('credit.download_invitation_key')->middleware('token_auth'); - Route::get('credit/{invitation_key}/download_e_credit', [CreditController::class, 'downloadECredit'])->name('credit.download_invitation_key')->middleware('token_auth'); + Route::get('credit/{invitation_key}/download_e_credit', [CreditController::class, 'downloadECredit'])->name('credit.download_e_credit')->middleware('token_auth'); Route::get('{entity}/{invitation_key}/download', [App\Http\Controllers\ClientPortal\InvitationController::class, 'routerForDownload'])->middleware('token_auth'); Route::get('pay/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'payInvoice'])->name('pay.invoice');