From 33f805fba5999ea6334e1d0e30c664c55b24a7c5 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 16 Oct 2017 21:02:32 +0300
Subject: [PATCH] moved transformers

---
 app/Http/Controllers/Api/Auth/Permissions.php |  2 +-
 app/Http/Controllers/Api/Auth/Roles.php       |  2 +-
 app/Http/Controllers/Api/Auth/Users.php       |  2 +-
 app/Http/Controllers/Api/Banking/Accounts.php |  2 +-
 .../Controllers/Api/Banking/Transfers.php     |  2 +-
 .../Controllers/Api/Companies/Companies.php   |  2 +-
 app/Http/Controllers/Api/Expenses/Bills.php   |  2 +-
 .../Controllers/Api/Expenses/Payments.php     |  2 +-
 app/Http/Controllers/Api/Expenses/Vendors.php |  2 +-
 .../Controllers/Api/Incomes/Customers.php     |  2 +-
 .../Api/Incomes/InvoicePayments.php           |  2 +-
 app/Http/Controllers/Api/Incomes/Invoices.php |  2 +-
 app/Http/Controllers/Api/Incomes/Revenues.php |  2 +-
 app/Http/Controllers/Api/Items/Items.php      |  2 +-
 .../Controllers/Api/Settings/Categories.php   |  2 +-
 .../Controllers/Api/Settings/Currencies.php   |  2 +-
 app/Http/Controllers/Api/Settings/Taxes.php   |  2 +-
 app/Listeners/Updates/Version106.php          | 30 +++++++++++++++++++
 .../Transformers/Auth/Permission.php          |  2 +-
 app/{Http => }/Transformers/Auth/Role.php     |  2 +-
 app/{Http => }/Transformers/Auth/User.php     |  4 +--
 .../Transformers/Banking/Account.php          |  2 +-
 .../Transformers/Banking/Transfer.php         |  6 ++--
 .../Transformers/Company/Company.php          |  2 +-
 app/{Http => }/Transformers/Expense/Bill.php  | 12 ++++----
 .../Transformers/Expense/BillHistories.php    |  2 +-
 .../Transformers/Expense/BillItems.php        |  2 +-
 .../Transformers/Expense/BillPayments.php     |  4 +--
 .../Transformers/Expense/BillStatus.php       |  2 +-
 .../Transformers/Expense/BillTotals.php       |  2 +-
 .../Transformers/Expense/Payment.php          |  8 ++---
 .../Transformers/Expense/Vendor.php           |  2 +-
 .../Transformers/Income/Customer.php          |  2 +-
 .../Transformers/Income/Invoice.php           | 12 ++++----
 .../Transformers/Income/InvoiceHistories.php  |  2 +-
 .../Transformers/Income/InvoiceItems.php      |  2 +-
 .../Transformers/Income/InvoicePayments.php   |  4 +--
 .../Transformers/Income/InvoiceStatus.php     |  2 +-
 .../Transformers/Income/InvoiceTotals.php     |  2 +-
 .../Transformers/Income/Revenue.php           |  8 ++---
 app/{Http => }/Transformers/Item/Item.php     |  6 ++--
 .../Transformers/Setting/Category.php         |  2 +-
 .../Transformers/Setting/Currency.php         |  2 +-
 app/{Http => }/Transformers/Setting/Tax.php   |  2 +-
 44 files changed, 96 insertions(+), 66 deletions(-)
 create mode 100644 app/Listeners/Updates/Version106.php
 rename app/{Http => }/Transformers/Auth/Permission.php (93%)
 rename app/{Http => }/Transformers/Auth/Role.php (95%)
 rename app/{Http => }/Transformers/Auth/User.php (92%)
 rename app/{Http => }/Transformers/Banking/Account.php (95%)
 rename app/{Http => }/Transformers/Banking/Transfer.php (89%)
 rename app/{Http => }/Transformers/Company/Company.php (96%)
 rename app/{Http => }/Transformers/Expense/Bill.php (90%)
 rename app/{Http => }/Transformers/Expense/BillHistories.php (94%)
 rename app/{Http => }/Transformers/Expense/BillItems.php (95%)
 rename app/{Http => }/Transformers/Expense/BillPayments.php (93%)
 rename app/{Http => }/Transformers/Expense/BillStatus.php (93%)
 rename app/{Http => }/Transformers/Expense/BillTotals.php (94%)
 rename app/{Http => }/Transformers/Expense/Payment.php (91%)
 rename app/{Http => }/Transformers/Expense/Vendor.php (95%)
 rename app/{Http => }/Transformers/Income/Customer.php (95%)
 rename app/{Http => }/Transformers/Income/Invoice.php (90%)
 rename app/{Http => }/Transformers/Income/InvoiceHistories.php (94%)
 rename app/{Http => }/Transformers/Income/InvoiceItems.php (95%)
 rename app/{Http => }/Transformers/Income/InvoicePayments.php (94%)
 rename app/{Http => }/Transformers/Income/InvoiceStatus.php (93%)
 rename app/{Http => }/Transformers/Income/InvoiceTotals.php (94%)
 rename app/{Http => }/Transformers/Income/Revenue.php (91%)
 rename app/{Http => }/Transformers/Item/Item.php (92%)
 rename app/{Http => }/Transformers/Setting/Category.php (94%)
 rename app/{Http => }/Transformers/Setting/Currency.php (94%)
 rename app/{Http => }/Transformers/Setting/Tax.php (93%)

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 @@
+<?php
+
+namespace App\Listeners\Updates;
+
+use App\Events\UpdateFinished;
+use File;
+
+class Version106 extends Listener
+{
+    const ALIAS = 'core';
+
+    const VERSION = '1.0.6';
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        // Check if should listen
+        if (!$this->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 @@
 <?php
 
-namespace App\Http\Transformers\Auth;
+namespace App\Transformers\Auth;
 
 use App\Models\Auth\Permission as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Auth/Role.php b/app/Transformers/Auth/Role.php
similarity index 95%
rename from app/Http/Transformers/Auth/Role.php
rename to app/Transformers/Auth/Role.php
index 9c9b1efe2..932a26f18 100644
--- a/app/Http/Transformers/Auth/Role.php
+++ b/app/Transformers/Auth/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Auth;
+namespace App\Transformers\Auth;
 
 use App\Models\Auth\Role as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Auth/User.php b/app/Transformers/Auth/User.php
similarity index 92%
rename from app/Http/Transformers/Auth/User.php
rename to app/Transformers/Auth/User.php
index 4a700fa39..e7c098322 100644
--- a/app/Http/Transformers/Auth/User.php
+++ b/app/Transformers/Auth/User.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Transformers\Auth;
+namespace App\Transformers\Auth;
 
-use App\Http\Transformers\Company\Company;
+use App\Transformers\Company\Company;
 use App\Models\Auth\User as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Banking/Account.php b/app/Transformers/Banking/Account.php
similarity index 95%
rename from app/Http/Transformers/Banking/Account.php
rename to app/Transformers/Banking/Account.php
index 1bf6668bc..2195599a0 100644
--- a/app/Http/Transformers/Banking/Account.php
+++ b/app/Transformers/Banking/Account.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Banking;
+namespace App\Transformers\Banking;
 
 use App\Models\Banking\Account as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Banking/Transfer.php b/app/Transformers/Banking/Transfer.php
similarity index 89%
rename from app/Http/Transformers/Banking/Transfer.php
rename to app/Transformers/Banking/Transfer.php
index bb9d0c96c..e55beae23 100644
--- a/app/Http/Transformers/Banking/Transfer.php
+++ b/app/Transformers/Banking/Transfer.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Transformers\Banking;
+namespace App\Transformers\Banking;
 
-use App\Http\Transformers\Expense\Payment;
-use App\Http\Transformers\Income\Revenue;
+use App\Transformers\Expense\Payment;
+use App\Transformers\Income\Revenue;
 use App\Models\Banking\Transfer as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Company/Company.php b/app/Transformers/Company/Company.php
similarity index 96%
rename from app/Http/Transformers/Company/Company.php
rename to app/Transformers/Company/Company.php
index bed4420f1..b69718764 100644
--- a/app/Http/Transformers/Company/Company.php
+++ b/app/Transformers/Company/Company.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Company;
+namespace App\Transformers\Company;
 
 use App\Models\Company\Company as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Expense/Bill.php b/app/Transformers/Expense/Bill.php
similarity index 90%
rename from app/Http/Transformers/Expense/Bill.php
rename to app/Transformers/Expense/Bill.php
index 09ccd60f2..5b7d2e993 100644
--- a/app/Http/Transformers/Expense/Bill.php
+++ b/app/Transformers/Expense/Bill.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
-use App\Http\Transformers\Expense\BillHistories;
-use App\Http\Transformers\Expense\BillItems;
-use App\Http\Transformers\Expense\BillPayments;
-use App\Http\Transformers\Expense\BillStatus;
-use App\Http\Transformers\Expense\Vendor;
+use App\Transformers\Expense\BillHistories;
+use App\Transformers\Expense\BillItems;
+use App\Transformers\Expense\BillPayments;
+use App\Transformers\Expense\BillStatus;
+use App\Transformers\Expense\Vendor;
 use App\Models\Expense\Bill as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Expense/BillHistories.php b/app/Transformers/Expense/BillHistories.php
similarity index 94%
rename from app/Http/Transformers/Expense/BillHistories.php
rename to app/Transformers/Expense/BillHistories.php
index 63a274dab..e679bb832 100644
--- a/app/Http/Transformers/Expense/BillHistories.php
+++ b/app/Transformers/Expense/BillHistories.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
 use App\Models\Expense\BillHistory as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Expense/BillItems.php b/app/Transformers/Expense/BillItems.php
similarity index 95%
rename from app/Http/Transformers/Expense/BillItems.php
rename to app/Transformers/Expense/BillItems.php
index d446f7342..d3488ce44 100644
--- a/app/Http/Transformers/Expense/BillItems.php
+++ b/app/Transformers/Expense/BillItems.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
 use App\Models\Expense\BillItem as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Expense/BillPayments.php b/app/Transformers/Expense/BillPayments.php
similarity index 93%
rename from app/Http/Transformers/Expense/BillPayments.php
rename to app/Transformers/Expense/BillPayments.php
index 564933e4a..9dd2c50ce 100644
--- a/app/Http/Transformers/Expense/BillPayments.php
+++ b/app/Transformers/Expense/BillPayments.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
-use App\Http\Transformers\Banking\Account;
+use App\Transformers\Banking\Account;
 use App\Models\Expense\BillPayment as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Expense/BillStatus.php b/app/Transformers/Expense/BillStatus.php
similarity index 93%
rename from app/Http/Transformers/Expense/BillStatus.php
rename to app/Transformers/Expense/BillStatus.php
index 71c0a424d..216f30241 100644
--- a/app/Http/Transformers/Expense/BillStatus.php
+++ b/app/Transformers/Expense/BillStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
 use App\Models\Expense\BillStatus as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Expense/BillTotals.php b/app/Transformers/Expense/BillTotals.php
similarity index 94%
rename from app/Http/Transformers/Expense/BillTotals.php
rename to app/Transformers/Expense/BillTotals.php
index e78156261..c51b46cd0 100644
--- a/app/Http/Transformers/Expense/BillTotals.php
+++ b/app/Transformers/Expense/BillTotals.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
 use App\Models\Expense\BillTotal as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Expense/Payment.php b/app/Transformers/Expense/Payment.php
similarity index 91%
rename from app/Http/Transformers/Expense/Payment.php
rename to app/Transformers/Expense/Payment.php
index e2fdb6382..0e722dc37 100644
--- a/app/Http/Transformers/Expense/Payment.php
+++ b/app/Transformers/Expense/Payment.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
-use App\Http\Transformers\Banking\Account;
-use App\Http\Transformers\Expense\Vendor;
-use App\Http\Transformers\Setting\Category;
+use App\Transformers\Banking\Account;
+use App\Transformers\Expense\Vendor;
+use App\Transformers\Setting\Category;
 use App\Models\Expense\Payment as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Expense/Vendor.php b/app/Transformers/Expense/Vendor.php
similarity index 95%
rename from app/Http/Transformers/Expense/Vendor.php
rename to app/Transformers/Expense/Vendor.php
index 215474eed..e9f7569e4 100644
--- a/app/Http/Transformers/Expense/Vendor.php
+++ b/app/Transformers/Expense/Vendor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Expense;
+namespace App\Transformers\Expense;
 
 use App\Models\Expense\Vendor as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/Customer.php b/app/Transformers/Income/Customer.php
similarity index 95%
rename from app/Http/Transformers/Income/Customer.php
rename to app/Transformers/Income/Customer.php
index f0e3712d0..0d9d642f4 100644
--- a/app/Http/Transformers/Income/Customer.php
+++ b/app/Transformers/Income/Customer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
 use App\Models\Income\Customer as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/Invoice.php b/app/Transformers/Income/Invoice.php
similarity index 90%
rename from app/Http/Transformers/Income/Invoice.php
rename to app/Transformers/Income/Invoice.php
index e226cb433..d015e785f 100644
--- a/app/Http/Transformers/Income/Invoice.php
+++ b/app/Transformers/Income/Invoice.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
-use App\Http\Transformers\Income\Customer;
-use App\Http\Transformers\Income\InvoiceHistories;
-use App\Http\Transformers\Income\InvoiceItems;
-use App\Http\Transformers\Income\InvoicePayments;
-use App\Http\Transformers\Income\InvoiceStatus;
+use App\Transformers\Income\Customer;
+use App\Transformers\Income\InvoiceHistories;
+use App\Transformers\Income\InvoiceItems;
+use App\Transformers\Income\InvoicePayments;
+use App\Transformers\Income\InvoiceStatus;
 use App\Models\Income\Invoice as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Income/InvoiceHistories.php b/app/Transformers/Income/InvoiceHistories.php
similarity index 94%
rename from app/Http/Transformers/Income/InvoiceHistories.php
rename to app/Transformers/Income/InvoiceHistories.php
index 991a8f77b..8e2ad7bc9 100644
--- a/app/Http/Transformers/Income/InvoiceHistories.php
+++ b/app/Transformers/Income/InvoiceHistories.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
 use App\Models\Income\InvoiceHistory as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/InvoiceItems.php b/app/Transformers/Income/InvoiceItems.php
similarity index 95%
rename from app/Http/Transformers/Income/InvoiceItems.php
rename to app/Transformers/Income/InvoiceItems.php
index cf2b2c64a..8ce9c0fa3 100644
--- a/app/Http/Transformers/Income/InvoiceItems.php
+++ b/app/Transformers/Income/InvoiceItems.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
 use App\Models\Income\InvoiceItem as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/InvoicePayments.php b/app/Transformers/Income/InvoicePayments.php
similarity index 94%
rename from app/Http/Transformers/Income/InvoicePayments.php
rename to app/Transformers/Income/InvoicePayments.php
index d58b199e3..cc8e5195a 100644
--- a/app/Http/Transformers/Income/InvoicePayments.php
+++ b/app/Transformers/Income/InvoicePayments.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
-use App\Http\Transformers\Banking\Account;
+use App\Transformers\Banking\Account;
 use App\Models\Income\InvoicePayment as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Income/InvoiceStatus.php b/app/Transformers/Income/InvoiceStatus.php
similarity index 93%
rename from app/Http/Transformers/Income/InvoiceStatus.php
rename to app/Transformers/Income/InvoiceStatus.php
index 9ce92a572..76d029f8c 100644
--- a/app/Http/Transformers/Income/InvoiceStatus.php
+++ b/app/Transformers/Income/InvoiceStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
 use App\Models\Income\InvoiceStatus as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/InvoiceTotals.php b/app/Transformers/Income/InvoiceTotals.php
similarity index 94%
rename from app/Http/Transformers/Income/InvoiceTotals.php
rename to app/Transformers/Income/InvoiceTotals.php
index 18d612c63..025c9b62f 100644
--- a/app/Http/Transformers/Income/InvoiceTotals.php
+++ b/app/Transformers/Income/InvoiceTotals.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
 use App\Models\Income\InvoiceTotal as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Income/Revenue.php b/app/Transformers/Income/Revenue.php
similarity index 91%
rename from app/Http/Transformers/Income/Revenue.php
rename to app/Transformers/Income/Revenue.php
index 1acf41fbd..3aafc5e6f 100644
--- a/app/Http/Transformers/Income/Revenue.php
+++ b/app/Transformers/Income/Revenue.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Transformers\Income;
+namespace App\Transformers\Income;
 
-use App\Http\Transformers\Banking\Account;
-use App\Http\Transformers\Income\Customer;
-use App\Http\Transformers\Setting\Category;
+use App\Transformers\Banking\Account;
+use App\Transformers\Income\Customer;
+use App\Transformers\Setting\Category;
 use App\Models\Income\Revenue as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Item/Item.php b/app/Transformers/Item/Item.php
similarity index 92%
rename from app/Http/Transformers/Item/Item.php
rename to app/Transformers/Item/Item.php
index 353c2f25a..e7f724703 100644
--- a/app/Http/Transformers/Item/Item.php
+++ b/app/Transformers/Item/Item.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Transformers\Item;
+namespace App\Transformers\Item;
 
-use App\Http\Transformers\Setting\Category;
-use App\Http\Transformers\Setting\Tax;
+use App\Transformers\Setting\Category;
+use App\Transformers\Setting\Tax;
 use App\Models\Item\Item as Model;
 use League\Fractal\TransformerAbstract;
 
diff --git a/app/Http/Transformers/Setting/Category.php b/app/Transformers/Setting/Category.php
similarity index 94%
rename from app/Http/Transformers/Setting/Category.php
rename to app/Transformers/Setting/Category.php
index 97528a9bb..22c776501 100644
--- a/app/Http/Transformers/Setting/Category.php
+++ b/app/Transformers/Setting/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Setting;
+namespace App\Transformers\Setting;
 
 use App\Models\Setting\Category as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Setting/Currency.php b/app/Transformers/Setting/Currency.php
similarity index 94%
rename from app/Http/Transformers/Setting/Currency.php
rename to app/Transformers/Setting/Currency.php
index 7c098e531..836a8bf62 100644
--- a/app/Http/Transformers/Setting/Currency.php
+++ b/app/Transformers/Setting/Currency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Setting;
+namespace App\Transformers\Setting;
 
 use App\Models\Setting\Currency as Model;
 use League\Fractal\TransformerAbstract;
diff --git a/app/Http/Transformers/Setting/Tax.php b/app/Transformers/Setting/Tax.php
similarity index 93%
rename from app/Http/Transformers/Setting/Tax.php
rename to app/Transformers/Setting/Tax.php
index f83c97a5e..be4deb69a 100644
--- a/app/Http/Transformers/Setting/Tax.php
+++ b/app/Transformers/Setting/Tax.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Transformers\Setting;
+namespace App\Transformers\Setting;
 
 use App\Models\Setting\Tax as Model;
 use League\Fractal\TransformerAbstract;