diff --git a/app/Http/Controllers/Api/Auth/Permissions.php b/app/Http/Controllers/Api/Auth/Permissions.php index cda1194dd..321ed8bc4 100644 --- a/app/Http/Controllers/Api/Auth/Permissions.php +++ b/app/Http/Controllers/Api/Auth/Permissions.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Auth; use App\Http\Controllers\ApiController; use App\Http\Requests\Auth\Permission as Request; -use App\Http\Transformers\Auth\Permission as Transformer; use App\Models\Auth\Permission; +use App\Transformers\Auth\Permission as Transformer; use Dingo\Api\Routing\Helpers; class Permissions extends ApiController diff --git a/app/Http/Controllers/Api/Auth/Roles.php b/app/Http/Controllers/Api/Auth/Roles.php index 2e58554ec..425e3c48a 100644 --- a/app/Http/Controllers/Api/Auth/Roles.php +++ b/app/Http/Controllers/Api/Auth/Roles.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Auth; use App\Http\Controllers\ApiController; use App\Http\Requests\Auth\Role as Request; -use App\Http\Transformers\Auth\Role as Transformer; use App\Models\Auth\Role; +use App\Transformers\Auth\Role as Transformer; use Dingo\Api\Routing\Helpers; class Roles extends ApiController diff --git a/app/Http/Controllers/Api/Auth/Users.php b/app/Http/Controllers/Api/Auth/Users.php index b4aebd293..59781a369 100644 --- a/app/Http/Controllers/Api/Auth/Users.php +++ b/app/Http/Controllers/Api/Auth/Users.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Auth; use App\Http\Controllers\ApiController; use App\Http\Requests\Auth\User as Request; -use App\Http\Transformers\Auth\User as Transformer; use App\Models\Auth\User; +use App\Transformers\Auth\User as Transformer; use Dingo\Api\Routing\Helpers; class Users extends ApiController diff --git a/app/Http/Controllers/Api/Banking/Accounts.php b/app/Http/Controllers/Api/Banking/Accounts.php index ae19c28a9..b363b8c94 100644 --- a/app/Http/Controllers/Api/Banking/Accounts.php +++ b/app/Http/Controllers/Api/Banking/Accounts.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Banking; use App\Http\Controllers\ApiController; use App\Http\Requests\Banking\Account as Request; -use App\Http\Transformers\Banking\Account as Transformer; use App\Models\Banking\Account; +use App\Transformers\Banking\Account as Transformer; use Dingo\Api\Routing\Helpers; class Accounts extends ApiController diff --git a/app/Http/Controllers/Api/Banking/Transfers.php b/app/Http/Controllers/Api/Banking/Transfers.php index ed413a1b8..764da2f63 100644 --- a/app/Http/Controllers/Api/Banking/Transfers.php +++ b/app/Http/Controllers/Api/Banking/Transfers.php @@ -4,10 +4,10 @@ namespace App\Http\Controllers\Api\Banking; use App\Http\Controllers\ApiController; use App\Http\Requests\Banking\Transfer as Request; -use App\Http\Transformers\Banking\Transfer as Transformer; use App\Models\Banking\Transfer; use App\Models\Expense\Payment; use App\Models\Income\Revenue; +use App\Transformers\Banking\Transfer as Transformer; use Dingo\Api\Routing\Helpers; class Transfers extends ApiController diff --git a/app/Http/Controllers/Api/Companies/Companies.php b/app/Http/Controllers/Api/Companies/Companies.php index e0e53e07b..3b345d5f4 100644 --- a/app/Http/Controllers/Api/Companies/Companies.php +++ b/app/Http/Controllers/Api/Companies/Companies.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Companies; use App\Http\Controllers\ApiController; use App\Http\Requests\Company\Company as Request; -use App\Http\Transformers\Company\Company as Transformer; use App\Models\Company\Company; +use App\Transformers\Company\Company as Transformer; use Dingo\Api\Routing\Helpers; class Companies extends ApiController diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Expenses/Bills.php index caabf8d05..a7bed3970 100644 --- a/app/Http/Controllers/Api/Expenses/Bills.php +++ b/app/Http/Controllers/Api/Expenses/Bills.php @@ -6,7 +6,6 @@ use App\Events\BillCreated; use App\Events\BillUpdated; use App\Http\Controllers\ApiController; use App\Http\Requests\Expense\Bill as Request; -use App\Http\Transformers\Expense\Bill as Transformer; use App\Models\Expense\Bill; use App\Models\Expense\BillHistory; use App\Models\Expense\BillItem; @@ -14,6 +13,7 @@ use App\Models\Expense\BillPayment; use App\Models\Expense\BillStatus; use App\Models\Item\Item; use App\Models\Setting\Tax; +use App\Transformers\Expense\Bill as Transformer; use Dingo\Api\Routing\Helpers; class Bills extends ApiController diff --git a/app/Http/Controllers/Api/Expenses/Payments.php b/app/Http/Controllers/Api/Expenses/Payments.php index b831f165d..7490fcca3 100644 --- a/app/Http/Controllers/Api/Expenses/Payments.php +++ b/app/Http/Controllers/Api/Expenses/Payments.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Expenses; use App\Http\Controllers\ApiController; use App\Http\Requests\Expense\Payment as Request; -use App\Http\Transformers\Expense\Payment as Transformer; use App\Models\Expense\Payment; +use App\Transformers\Expense\Payment as Transformer; use Dingo\Api\Routing\Helpers; class Payments extends ApiController diff --git a/app/Http/Controllers/Api/Expenses/Vendors.php b/app/Http/Controllers/Api/Expenses/Vendors.php index 0117b03a4..65e210d19 100644 --- a/app/Http/Controllers/Api/Expenses/Vendors.php +++ b/app/Http/Controllers/Api/Expenses/Vendors.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Expenses; use App\Http\Controllers\ApiController; use App\Http\Requests\Expense\Vendor as Request; -use App\Http\Transformers\Expense\Vendor as Transformer; use App\Models\Expense\Vendor; +use App\Transformers\Expense\Vendor as Transformer; use Dingo\Api\Routing\Helpers; class Vendors extends ApiController diff --git a/app/Http/Controllers/Api/Incomes/Customers.php b/app/Http/Controllers/Api/Incomes/Customers.php index 36b4fa1f3..0cc37be84 100644 --- a/app/Http/Controllers/Api/Incomes/Customers.php +++ b/app/Http/Controllers/Api/Incomes/Customers.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Incomes; use App\Http\Controllers\ApiController; use App\Http\Requests\Income\Customer as Request; -use App\Http\Transformers\Income\Customer as Transformer; use App\Models\Income\Customer; +use App\Transformers\Income\Customer as Transformer; use Dingo\Api\Routing\Helpers; class Customers extends ApiController diff --git a/app/Http/Controllers/Api/Incomes/InvoicePayments.php b/app/Http/Controllers/Api/Incomes/InvoicePayments.php index 2e3f54889..de4ebe880 100644 --- a/app/Http/Controllers/Api/Incomes/InvoicePayments.php +++ b/app/Http/Controllers/Api/Incomes/InvoicePayments.php @@ -3,12 +3,12 @@ namespace App\Http\Controllers\Api\Incomes; use App\Http\Requests\Income\InvoicePayment as Request; -use App\Http\Transformers\Income\InvoicePayments as Transformer; use App\Models\Income\Invoice; use App\Models\Income\InvoiceHistory; use App\Models\Income\InvoicePayment; use App\Models\Setting\Currency; use App\Traits\DateTime; +use App\Transformers\Income\InvoicePayments as Transformer; use Date; use Dingo\Api\Routing\Helpers; use Illuminate\Foundation\Bus\DispatchesJobs; diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php index bee22df4e..d28fe57a2 100644 --- a/app/Http/Controllers/Api/Incomes/Invoices.php +++ b/app/Http/Controllers/Api/Incomes/Invoices.php @@ -6,7 +6,6 @@ use App\Events\InvoiceCreated; use App\Events\InvoiceUpdated; use App\Http\Controllers\ApiController; use App\Http\Requests\Income\Invoice as Request; -use App\Http\Transformers\Income\Invoice as Transformer; use App\Models\Income\Invoice; use App\Models\Income\InvoiceHistory; use App\Models\Income\InvoiceItem; @@ -14,6 +13,7 @@ use App\Models\Income\InvoicePayment; use App\Models\Income\InvoiceTotal; use App\Models\Item\Item; use App\Models\Setting\Tax; +use App\Transformers\Income\Invoice as Transformer; use Dingo\Api\Routing\Helpers; class Invoices extends ApiController diff --git a/app/Http/Controllers/Api/Incomes/Revenues.php b/app/Http/Controllers/Api/Incomes/Revenues.php index 0b7fc9942..b0a959568 100644 --- a/app/Http/Controllers/Api/Incomes/Revenues.php +++ b/app/Http/Controllers/Api/Incomes/Revenues.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Incomes; use App\Http\Controllers\ApiController; use App\Http\Requests\Income\Revenue as Request; -use App\Http\Transformers\Income\Revenue as Transformer; use App\Models\Income\Revenue; +use App\Transformers\Income\Revenue as Transformer; use Dingo\Api\Routing\Helpers; class Revenues extends ApiController diff --git a/app/Http/Controllers/Api/Items/Items.php b/app/Http/Controllers/Api/Items/Items.php index 25c50af18..8e2f343ed 100644 --- a/app/Http/Controllers/Api/Items/Items.php +++ b/app/Http/Controllers/Api/Items/Items.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Items; use App\Http\Controllers\ApiController; use App\Http\Requests\Item\Item as Request; -use App\Http\Transformers\Item\Item as Transformer; use App\Models\Item\Item; +use App\Transformers\Item\Item as Transformer; use Dingo\Api\Routing\Helpers; class Items extends ApiController diff --git a/app/Http/Controllers/Api/Settings/Categories.php b/app/Http/Controllers/Api/Settings/Categories.php index c3614486e..4fc3bd77e 100644 --- a/app/Http/Controllers/Api/Settings/Categories.php +++ b/app/Http/Controllers/Api/Settings/Categories.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Settings; use App\Http\Controllers\ApiController; use App\Http\Requests\Setting\Category as Request; -use App\Http\Transformers\Setting\Category as Transformer; use App\Models\Setting\Category; +use App\Transformers\Setting\Category as Transformer; use Dingo\Api\Routing\Helpers; class Categories extends ApiController diff --git a/app/Http/Controllers/Api/Settings/Currencies.php b/app/Http/Controllers/Api/Settings/Currencies.php index b57c35d0f..2b59b2cca 100644 --- a/app/Http/Controllers/Api/Settings/Currencies.php +++ b/app/Http/Controllers/Api/Settings/Currencies.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Settings; use App\Http\Controllers\ApiController; use App\Http\Requests\Setting\Currency as Request; -use App\Http\Transformers\Setting\Currency as Transformer; use App\Models\Setting\Currency; +use App\Transformers\Setting\Currency as Transformer; use Dingo\Api\Routing\Helpers; class Currencies extends ApiController diff --git a/app/Http/Controllers/Api/Settings/Taxes.php b/app/Http/Controllers/Api/Settings/Taxes.php index 4bffeff6f..5484e6097 100644 --- a/app/Http/Controllers/Api/Settings/Taxes.php +++ b/app/Http/Controllers/Api/Settings/Taxes.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Api\Settings; use App\Http\Controllers\ApiController; use App\Http\Requests\Setting\Tax as Request; -use App\Http\Transformers\Setting\Tax as Transformer; use App\Models\Setting\Tax; +use App\Transformers\Setting\Tax as Transformer; use Dingo\Api\Routing\Helpers; class Taxes extends ApiController diff --git a/app/Listeners/Updates/Version106.php b/app/Listeners/Updates/Version106.php new file mode 100644 index 000000000..7f4da5069 --- /dev/null +++ b/app/Listeners/Updates/Version106.php @@ -0,0 +1,30 @@ +check($event)) { + return; + } + + // Moved to app directory + File::deleteDirectory(app_path('Http' . DIRECTORY_SEPARATOR .'Transformers')); + } +} diff --git a/app/Http/Transformers/Auth/Permission.php b/app/Transformers/Auth/Permission.php similarity index 93% rename from app/Http/Transformers/Auth/Permission.php rename to app/Transformers/Auth/Permission.php index e60c78cd3..ef04d22a5 100644 --- a/app/Http/Transformers/Auth/Permission.php +++ b/app/Transformers/Auth/Permission.php @@ -1,6 +1,6 @@