diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 80af5bacc9ff..07180c504f19 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -25,7 +25,7 @@ use App\Http\Requests\Invoice\ShowInvoiceRequest; use App\Http\Requests\Invoice\StoreInvoiceRequest; use App\Http\Requests\Invoice\UpdateInvoiceRequest; use App\Jobs\Entity\ActionEntity; -use App\Jobs\Invoice\MarkPaid; +use App\Jobs\Invoice\MarkInvoicePaid; use App\Jobs\Invoice\StoreInvoice; use App\Models\Invoice; use App\Repositories\BaseRepository; @@ -237,9 +237,12 @@ class InvoiceController extends BaseController if($invoice->balance == 0 || $invoice->status_id == Invoice::STATUS_PAID) return $this->errorResponse(['message' => 'Invoice has no balance owing'], 400); - $invoice = MarkPaid::dispatchNow($invoice); + $invoice = MarkInvoicePaid::dispatchNow($invoice); return $this->itemResponse($invoice); break; + case 'download': + # code... + break; case 'archive': # code... break; diff --git a/app/Jobs/Invoice/MarkPaid.php b/app/Jobs/Invoice/MarkInvoicePaid.php similarity index 97% rename from app/Jobs/Invoice/MarkPaid.php rename to app/Jobs/Invoice/MarkInvoicePaid.php index 758fc5a226d8..0e2f5cc4aef0 100644 --- a/app/Jobs/Invoice/MarkPaid.php +++ b/app/Jobs/Invoice/MarkInvoicePaid.php @@ -25,7 +25,7 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Log; -class MarkPaid implements ShouldQueue +class MarkInvoicePaid implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; diff --git a/tests/Integration/MarkPaidInvoiceTest.php b/tests/Integration/MarkInvoicePaidTest.php similarity index 82% rename from tests/Integration/MarkPaidInvoiceTest.php rename to tests/Integration/MarkInvoicePaidTest.php index 034c39e143e9..9c3aded0610c 100644 --- a/tests/Integration/MarkPaidInvoiceTest.php +++ b/tests/Integration/MarkInvoicePaidTest.php @@ -2,7 +2,7 @@ namespace Tests\Integration; -use App\Jobs\Invoice\MarkPaid; +use App\Jobs\Invoice\MarkInvoicePaid; use App\Models\Account; use App\Models\Company; use App\Models\Invoice; @@ -15,9 +15,9 @@ use Tests\TestCase; /** * @test - * @covers App\Jobs\Invoice\MarkPaid + * @covers App\Jobs\Invoice\MarkInvoicePaid */ -class MarkPaidInvoiceTest extends TestCase +class MarkInvoicePaidTest extends TestCase { use MockAccountData; use DatabaseTransactions; @@ -34,9 +34,9 @@ class MarkPaidInvoiceTest extends TestCase $this->assertNotNull($this->client); } - public function testMarkPaidInvoice() + public function testMarkInvoicePaidInvoice() { - MarkPaid::dispatchNow($this->invoice); + MarkInvoicePaid::dispatchNow($this->invoice); $invoice = Invoice::find($this->invoice->id); diff --git a/tests/Integration/UpdateCompanyLedgerTest.php b/tests/Integration/UpdateCompanyLedgerTest.php index 9fd00ad2469a..b3d48b300b2d 100644 --- a/tests/Integration/UpdateCompanyLedgerTest.php +++ b/tests/Integration/UpdateCompanyLedgerTest.php @@ -5,7 +5,7 @@ namespace Tests\Integration; use App\Events\Invoice\InvoiceWasCreated; use App\Events\Invoice\InvoiceWasUpdated; use App\Events\Payment\PaymentWasCreated; -use App\Jobs\Invoice\MarkPaid; +use App\Jobs\Invoice\MarkInvoicePaid; use App\Models\Account; use App\Models\Activity; use App\Models\Company; @@ -37,7 +37,7 @@ class UpdateCompanyLedgerTest extends TestCase public function testPaymentIsPresentInLedger() { - $invoice = MarkPaid::dispatchNow($this->invoice); + $invoice = MarkInvoicePaid::dispatchNow($this->invoice); $ledger = CompanyLedger::whereClientId($invoice->client_id)