Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Payment tests

Browse Source
This commit is contained in:
David Bomba 2019-05-03 18:28:48 +10:00
parent ac05fc6ff6
commit 6660e881ef
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PaymentController.php
View File

@ -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) {

2
database/factories/PaymentFactory.php
View File

@ -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),

2
database/migrations/2014_10_13_000000_create_users_table.php
View File

@ -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');

8
routes/api.php
View File

@ -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

6
tests/Feature/PaymentTest.php
View File

@ -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'),