diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php index 88a3c3635d..641708c7d0 100644 --- a/app/Services/Payment/UpdateInvoicePayment.php +++ b/app/Services/Payment/UpdateInvoicePayment.php @@ -9,7 +9,6 @@ * @license https://opensource.org/licenses/AAL */ - namespace App\Services\Payment; use App\Events\Invoice\InvoiceWasUpdated; @@ -25,9 +24,6 @@ class UpdateInvoicePayment { use MakesHash; - /** - * @deprecated This is bad logic, assumes too much. - */ public $payment; public $payment_hash; @@ -84,30 +80,6 @@ class UpdateInvoicePayment }); - // } else { - // SystemLogger::dispatch( - // [ - // 'payment' => $this->payment, - // 'invoices' => $invoices, - // 'invoices_total' => $invoices_total, - // 'payment_amount' => $this->payment->amount, - // 'partial_check_amount' => $total, - // ], - // SystemLog::CATEGORY_GATEWAY_RESPONSE, - // SystemLog::EVENT_PAYMENT_RECONCILIATION_FAILURE, - // SystemLog::TYPE_LEDGER, - // $this->payment->client - // ); - - // throw new \Exception("payment amount {$this->payment->amount} does not match invoice totals {$invoices_total} reversing payment"); - - // $this->payment->invoice()->delete(); - // $this->payment->is_deleted=true; - // $this->payment->save(); - // $this->payment->delete(); - // } - - return $this->payment; } } diff --git a/tests/Integration/DesignTest.php b/tests/Integration/DesignTest.php deleted file mode 100644 index daafe7218b..0000000000 --- a/tests/Integration/DesignTest.php +++ /dev/null @@ -1,192 +0,0 @@ -makeTestData(); - } - - public function testInvoiceDesignExists() - { - $this->contact = $this->invoice->client->primary_contact()->first(); - - $design = json_decode(Design::find(3)); - - $designer = new Designer($this->invoice, $design, $this->company->settings->pdf_variables, 'quote'); - - $html = $designer->build()->getHtml(); - - $this->assertNotNull($html); - - $this->invoice = factory(\App\Models\Invoice::class)->create([ - 'user_id' => $this->user->id, - 'client_id' => $this->client->id, - 'company_id' => $this->company->id, - ]); - - $this->invoice->uses_inclusive_taxes = false; - - $this->invoice->service()->createInvitations()->markSent()->applyNumber()->save(); - - $this->invoice->fresh(); - $this->invoice->load('invitations'); - - $settings = $this->invoice->client->settings; - $settings->invoice_design_id = "VolejRejNm"; - $settings->all_pages_header = true; - $settings->all_pages_footer = true; - - $this->client->settings = $settings; - $this->client->save(); - - CreateInvoicePdf::dispatchNow($this->invoice->invitations->first()); - } - - public function testQuoteDesignExists() - { - $this->contact = $this->quote->client->primary_contact()->first(); - - $design = json_decode(Design::find(3)); - - $designer = new Designer($this->quote, $design, $this->company->settings->pdf_variables, 'quote'); - - $html = $designer->build()->getHtml(); - - $this->assertNotNull($html); - - $this->quote = factory(\App\Models\Invoice::class)->create([ - 'user_id' => $this->user->id, - 'client_id' => $this->client->id, - 'company_id' => $this->company->id, - ]); - - $this->quote->uses_inclusive_taxes = false; - - $this->quote->service()->createInvitations()->markSent()->save(); - - $this->quote->fresh(); - $this->quote->load('invitations'); - $settings = $this->quote->client->settings; - $settings->invoice_design_id = "VolejRejNm"; - $settings->all_pages_header = true; - $settings->all_pages_footer = true; - - $this->client->settings = $settings; - $this->client->save(); - - $this->quote->setRelation('client', $this->client); - - $invitation = $this->quote->invitations->first(); - $invitation->setRelation('quote', $this->quote); - - CreateQuotePdf::dispatchNow($invitation); - } - - - public function testCreditDesignExists() - { - $design = json_decode(Design::find(3)); - - $designer = new Designer($this->credit, $design, $this->company->settings->pdf_variables, 'credit'); - - $html = $designer->build()->getHtml(); - - $this->assertNotNull($html); - - $settings = $this->invoice->client->settings; - $settings->quote_design_id = "4"; - $settings->all_pages_header = true; - $settings->all_pages_footer = true; - - $this->credit->client_id = $this->client->id; - $this->credit->setRelation('client', $this->client); - - $this->credit->service()->createInvitations()->markSent()->save(); - $this->credit->fresh(); - $this->credit->load('invitations'); - - $invitation = $this->credit->invitations->first(); - $invitation->setRelation('credit', $this->credit); - - - $this->client->settings = $settings; - $this->client->save(); - - CreateCreditPdf::dispatchNow($invitation); - } - - public function testAllDesigns() - { - - $this->quote->client_id = $this->client->id; - $this->quote->setRelation('client', $this->client); - $this->quote->save(); - - - for ($x=1; $x<=9; $x++) { - - $settings = $this->invoice->client->settings; - $settings->quote_design_id = (string)$this->encodePrimaryKey($x); - $settings->all_pages_header = true; - $settings->all_pages_footer = true; - $this->client->settings = $settings; - $this->client->save(); - - $this->quote->service()->createInvitations()->markSent()->save(); - $this->quote->fresh(); - $this->quote->load('invitations'); - - $invitation = $this->quote->invitations->first(); - $invitation->setRelation('quote', $this->quote); - - CreateQuotePdf::dispatchNow($invitation); - - $this->quote->number = $this->getNextQuoteNumber($this->quote->client); - -// $this->quote->save(); - - } - - $this->assertTrue(true); - } - -}