diff --git a/app/Http/Controllers/Admin/CurrenciesController.php b/app/Http/Controllers/Admin/CurrenciesController.php index 5d3ed760..00c8a051 100644 --- a/app/Http/Controllers/Admin/CurrenciesController.php +++ b/app/Http/Controllers/Admin/CurrenciesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Resources\CurrencyResource; -use App\Services\Documents\CurrencyService; +use App\Services\Document\CurrencyService; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; diff --git a/app/Http/Controllers/Company/Estimate/EstimatesController.php b/app/Http/Controllers/Company/Estimate/EstimatesController.php index cf26d882..5ac5a3f7 100644 --- a/app/Http/Controllers/Company/Estimate/EstimatesController.php +++ b/app/Http/Controllers/Company/Estimate/EstimatesController.php @@ -11,7 +11,7 @@ use App\Http\Resources\InvoiceResource; use App\Jobs\GenerateEstimatePdfJob; use App\Models\Estimate; use App\Models\Invoice; -use App\Services\Documents\EstimateService; +use App\Services\Document\EstimateService; use Illuminate\Http\Request; use Illuminate\Mail\Markdown; diff --git a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php index c55ca669..436c3e4d 100644 --- a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php +++ b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php @@ -14,7 +14,7 @@ use App\Models\ExchangeRateProvider; use App\Models\Invoice; use App\Models\Payment; use App\Models\Tax; -use App\Services\ExchangeRate\ExchangeRateProviderService; +use App\Services\Integrations\ExchangeRate\ExchangeRateProviderService; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Arr; diff --git a/app/Http/Controllers/Company/Expense/ExpensesController.php b/app/Http/Controllers/Company/Expense/ExpensesController.php index 27e692da..0a9ca30b 100644 --- a/app/Http/Controllers/Company/Expense/ExpensesController.php +++ b/app/Http/Controllers/Company/Expense/ExpensesController.php @@ -8,7 +8,7 @@ use App\Http\Requests\ExpenseRequest; use App\Http\Requests\UploadExpenseReceiptRequest; use App\Http\Resources\ExpenseResource; use App\Models\Expense; -use App\Services\Documents\ExpenseService; +use App\Services\Document\ExpenseService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Company/General/SerialNumberController.php b/app/Http/Controllers/Company/General/SerialNumberController.php index 4731c9a0..61dc98b0 100644 --- a/app/Http/Controllers/Company/General/SerialNumberController.php +++ b/app/Http/Controllers/Company/General/SerialNumberController.php @@ -6,7 +6,7 @@ use App\Http\Controllers\Controller; use App\Models\Estimate; use App\Models\Invoice; use App\Models\Payment; -use App\Services\Documents\SerialNumberService; +use App\Services\Document\SerialNumberService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Company/Invoice/InvoicesController.php b/app/Http/Controllers/Company/Invoice/InvoicesController.php index 51fa9df1..abe48b2a 100644 --- a/app/Http/Controllers/Company/Invoice/InvoicesController.php +++ b/app/Http/Controllers/Company/Invoice/InvoicesController.php @@ -11,7 +11,7 @@ use App\Http\Resources\InvoiceResource; use App\Jobs\GenerateInvoicePdfJob; use App\Models\Estimate; use App\Models\Invoice; -use App\Services\Documents\InvoiceService; +use App\Services\Document\InvoiceService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Mail\Markdown; diff --git a/app/Http/Controllers/Company/Payment/PaymentsController.php b/app/Http/Controllers/Company/Payment/PaymentsController.php index 0ad4b1d3..473ef6ca 100644 --- a/app/Http/Controllers/Company/Payment/PaymentsController.php +++ b/app/Http/Controllers/Company/Payment/PaymentsController.php @@ -8,7 +8,7 @@ use App\Http\Requests\PaymentRequest; use App\Http\Requests\SendPaymentRequest; use App\Http\Resources\PaymentResource; use App\Models\Payment; -use App\Services\Documents\PaymentService; +use App\Services\Document\PaymentService; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Mail\Markdown; diff --git a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php index 4aeac0ba..05121b2f 100644 --- a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php +++ b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php @@ -6,7 +6,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\RecurringInvoiceRequest; use App\Http\Resources\RecurringInvoiceResource; use App\Models\RecurringInvoice; -use App\Services\Documents\RecurringInvoiceService; +use App\Services\Document\RecurringInvoiceService; use Illuminate\Http\Request; use Illuminate\Http\Response; diff --git a/app/Http/Controllers/Pdf/DocumentPdfController.php b/app/Http/Controllers/Pdf/DocumentPdfController.php index c9a44357..4c97ab2d 100644 --- a/app/Http/Controllers/Pdf/DocumentPdfController.php +++ b/app/Http/Controllers/Pdf/DocumentPdfController.php @@ -6,8 +6,8 @@ use App\Http\Controllers\Controller; use App\Models\Estimate; use App\Models\Invoice; use App\Models\Payment; -use App\Services\Documents\EstimateService; -use App\Services\Documents\InvoiceService; +use App\Services\Document\EstimateService; +use App\Services\Document\InvoiceService; use Illuminate\Http\Request; class DocumentPdfController extends Controller diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index 40c190b7..2b05c54b 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Services\Documents\EstimateService; +use App\Services\Document\EstimateService; use App\Support\Pdf\PdfHtmlSanitizer; use App\Support\Pdf\PdfTemplateUtils; use App\Traits\GeneratesPdfTrait; diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index a723e1bf..48089932 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Services\Documents\InvoiceService; +use App\Services\Document\InvoiceService; use App\Support\Pdf\PdfHtmlSanitizer; use App\Support\Pdf\PdfTemplateUtils; use App\Traits\GeneratesPdfTrait; diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 9f716751..30c4aaa9 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -3,7 +3,7 @@ namespace App\Models; use App\Jobs\GeneratePaymentPdfJob; -use App\Services\Documents\PaymentService; +use App\Services\Document\PaymentService; use App\Support\Pdf\PdfHtmlSanitizer; use App\Traits\GeneratesPdfTrait; use App\Traits\HasCustomFieldsTrait; diff --git a/app/Providers/DriverRegistryProvider.php b/app/Providers/DriverRegistryProvider.php index aecc4d8e..dda68f4b 100644 --- a/app/Providers/DriverRegistryProvider.php +++ b/app/Providers/DriverRegistryProvider.php @@ -2,10 +2,10 @@ namespace App\Providers; -use App\Services\ExchangeRate\CurrencyConverterDriver; -use App\Services\ExchangeRate\CurrencyFreakDriver; -use App\Services\ExchangeRate\CurrencyLayerDriver; -use App\Services\ExchangeRate\OpenExchangeRateDriver; +use App\Services\Integrations\ExchangeRate\CurrencyConverterDriver; +use App\Services\Integrations\ExchangeRate\CurrencyFreakDriver; +use App\Services\Integrations\ExchangeRate\CurrencyLayerDriver; +use App\Services\Integrations\ExchangeRate\OpenExchangeRateDriver; use Illuminate\Support\ServiceProvider; use InvoiceShelf\Modules\Registry; diff --git a/app/Services/Documents/CurrencyService.php b/app/Services/Document/CurrencyService.php similarity index 95% rename from app/Services/Documents/CurrencyService.php rename to app/Services/Document/CurrencyService.php index f47e6e22..583e7fd8 100644 --- a/app/Services/Documents/CurrencyService.php +++ b/app/Services/Document/CurrencyService.php @@ -1,6 +1,6 @@