diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index fd16e04cefe7..1e8866771492 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 
+use App\Factory\PaymentFactory;
 use App\Filters\PaymentFilters;
 use App\Http\Requests\Payment\ActionPaymentRequest;
 use App\Http\Requests\Payment\CreatePaymentRequest;
@@ -14,6 +15,7 @@ use App\Http\Requests\Payment\UpdatePaymentRequest;
 use App\Jobs\Entity\ActionEntity;
 use App\Models\Payment;
 use App\Repositories\BaseRepository;
+use App\Repositories\PaymentRepository;
 use App\Transformers\PaymentTransformer;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
@@ -109,7 +111,7 @@ class PaymentController extends BaseController
      *
      * @return \Illuminate\Http\Response
      */
-    public function show(ShowPaymentRequest $request, Invoice $payment)
+    public function show(ShowPaymentRequest $request, Payment $payment)
     {
 
         return $this->itemResponse($payment);
@@ -124,7 +126,7 @@ class PaymentController extends BaseController
      *
      * @return \Illuminate\Http\Response
      */
-    public function edit(EditPaymentRequest $request, Invoice $payment)
+    public function edit(EditPaymentRequest $request, Payment $payment)
     {
 
         return $this->itemResponse($payment);
@@ -139,7 +141,7 @@ class PaymentController extends BaseController
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdatePaymentRequest $request, Invoice $payment)
+    public function update(UpdatePaymentRequest $request, Payment $payment)
     {
 
         $payment = $this->payment_repo->save(request(), $payment);
@@ -156,7 +158,7 @@ class PaymentController extends BaseController
      *
      * @return     \Illuminate\Http\Response
      */
-    public function destroy(DestroyPaymentRequest $request, Invoice $payment)
+    public function destroy(DestroyPaymentRequest $request, Payment $payment)
     {
 
         $payment->delete();
@@ -191,7 +193,7 @@ class PaymentController extends BaseController
         
     }
 
-    public function action(ActionPaymentRequest $request, Invoice $payment, $action)
+    public function action(ActionPaymentRequest $request, Payment $payment, $action)
     {
         
         switch ($action) {
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index 919a6473a10d..de107b6e2eb9 100644
--- a/database/factories/PaymentFactory.php
+++ b/database/factories/PaymentFactory.php
@@ -6,7 +6,7 @@ use Faker\Generator as Faker;
 
 $factory->define(App\Models\Payment::class, function (Faker $faker) {
     return [
-		'id_deleted' => false,
+		'is_deleted' => false,
 		'amount' => $faker->numberBetween(1,10),
 		'payment_date' => $faker->date(),
 		'transaction_reference' => $faker->text(10),
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index 2c1bbab9f132..984cdf54d0b4 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -624,7 +624,7 @@ class CreateUsersTable extends Migration
             $t->string('transaction_reference')->nullable();
             $t->string('payer_id')->nullable();
 
-            $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
+            //$t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $t->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
             $t->foreign('client_contact_id')->references('id')->on('client_contacts')->onDelete('cascade');
diff --git a/routes/api.php b/routes/api.php
index 6109501d69e8..84bfd75bf191 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -51,14 +51,16 @@ Route::group(['middleware' => ['db','api_secret_check','token_auth'], 'prefix' =
   Route::post('recurring_invoices/bulk', 'RecurringInvoiceController@bulk')->name('recurring_invoices.bulk');
 
   Route::resource('client_statement', 'ClientStatementController@statement'); // name = (client_statement. index / create / show / update / destroy / edit
+
+  Route::resource('payments', 'PaymentController'); // name = (payments. index / create / show / update / destroy / edit
+  
+  Route::post('payments/bulk', 'PaymentController@bulk')->name('payments.bulk');
+
 /*
   Route::resource('tasks', 'TaskController'); // name = (tasks. index / create / show / update / destroy / edit
   
   Route::post('tasks/bulk', 'TaskController@bulk')->name('tasks.bulk');
   
-  Route::resource('payments', 'PaymentController'); // name = (payments. index / create / show / update / destroy / edit
-  
-  Route::post('payments/bulk', 'PaymentController@bulk')->name('payments.bulk');
   
   Route::resource('credits', 'CreditController'); // name = (credits. index / create / show / update / destroy / edit
   
diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php
index 3ce8ac6e4d88..32d8545962b8 100644
--- a/tests/Feature/PaymentTest.php
+++ b/tests/Feature/PaymentTest.php
@@ -157,9 +157,7 @@ class PaymentTest extends TestCase
 
         factory(\App\Models\Payment::class, 1)->create(['user_id' => $user->id, 'company_id' => $company->id, 'client_id' => $client->id]);
 
-        $Payment = Payment::where('user_id',$user->id)->first();
-        $Payment->settings = $client->getMergedSettings();
-        $Payment->save();
+        $Payment = Payment::all()->first();
 
         $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
@@ -180,9 +178,7 @@ class PaymentTest extends TestCase
         ];
 
         $this->assertNotNull($Payment);
-        $this->assertNotNull($Payment->settings);
 
-        $this->assertTrue(property_exists($Payment->settings, 'custom_taxes1'));
 
         $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),