diff --git a/app/Designs/Bold.php b/app/Designs/Bold.php index 774af5cbba72..8d78ff6c9c49 100644 --- a/app/Designs/Bold.php +++ b/app/Designs/Bold.php @@ -60,10 +60,7 @@ class Bold extends AbstractDesign
$client.city_state_postal
', '$client.postal_city_state' => '$client.postal_city_state
', '$client.country' => '$client.country
', - '$contact.email' => '$client.email
', + '$contact.email' => '$client.email
', '$client.custom1' => '$client.custom1
', '$client.custom2' => '$client.custom2
', '$client.custom3' => '$client.custom3
', '$client.custom4' => '$client.custom4
', - '$contact.contact1' => '$contact.custom1
', - '$contact.contact2' => '$contact.custom2
', - '$contact.contact3' => '$contact.custom3
', - '$contact.contact4' => '$contact.custom4
', + '$contact.contact1' => '$contact.custom1
', + '$contact.contact2' => '$contact.custom2
', + '$contact.contact3' => '$contact.custom3
', + '$contact.contact4' => '$contact.custom4
', ]; return $this->processCustomFields($company, $data); @@ -266,21 +266,21 @@ class Designer private function invoiceDetails(Company $company) { $data = [ - '$invoice.number' => '$invoice.number_label: $invoice.number', - '$invoice.po_number' => '$invoice.po_number_label: $invoice.po_number', - '$invoice.date' => '$invoice.date_label: $invoice.date', - '$invoice.due_date' => '$invoice.due_date_label: $invoice.due_date', - '$invoice.balance_due' => '$invoice.balance_due_label: $invoice.balance_due', - '$invoice.total' => '$invoice.total_label: $invoice.total', - '$invoice.partial_due' => '$invoice.partial_due_label: $invoice.partial_due', - '$invoice.custom1' => '$invoice1_label: $invoice.custom1', - '$invoice.custom2' => '$invoice2_label: $invoice.custom2', - '$invoice.custom3' => '$invoice3_label: $invoice.custom3', - '$invoice.custom4' => '$invoice4_label: $invoice.custom4', - '$surcharge1' => '$surcharge1_label: $surcharge1', - '$surcharge2' => '$surcharge2_label: $surcharge2', - '$surcharge3' => '$surcharge3_label: $surcharge3', - '$surcharge4' => '$surcharge4_label: $surcharge4', + '$invoice.number' => '$invoice.number_label: $invoice.number', + '$invoice.po_number' => '$invoice.po_number_label: $invoice.po_number', + '$invoice.date' => '$invoice.date_label: $invoice.date', + '$invoice.due_date' => '$invoice.due_date_label: $invoice.due_date', + '$invoice.balance_due' => '$invoice.balance_due_label: $invoice.balance_due', + '$invoice.total' => '$invoice.total_label: $invoice.total', + '$invoice.partial_due' => '$invoice.partial_due_label: $invoice.partial_due', + '$invoice.custom1' => '$invoice1_label: $invoice.custom1', + '$invoice.custom2' => '$invoice2_label: $invoice.custom2', + '$invoice.custom3' => '$invoice3_label: $invoice.custom3', + '$invoice.custom4' => '$invoice4_label: $invoice.custom4', + '$surcharge1' => '$surcharge1_label: $surcharge1', + '$surcharge2' => '$surcharge2_label: $surcharge2', + '$surcharge3' => '$surcharge3_label: $surcharge3', + '$surcharge4' => '$surcharge4_label: $surcharge4', ]; return $this->processCustomFields($company, $data); @@ -289,21 +289,21 @@ class Designer private function quoteDetails(Company $company) { $data = [ - '$quote.quote_number' => '$quote.number', - '$quote.po_number' => '$quote.po_number', - '$quote.quote_date' => '$quote.date', - '$quote.valid_until' => '$quote.valid_until', - '$quote.balance_due' => '$quote.balance_due', - '$quote.quote_total' => '$quote.total', - '$quote.partial_due' => '$quote.partial_due', - '$quote.quote1' => '$quote1', - '$quote.quote2' => '$quote2', - '$quote.quote3' => '$quote3', - '$quote.quote4' => '$quote4', - '$quote.surcharge1' => '$surcharge1', - '$quote.surcharge2' => '$surcharge2', - '$quote.surcharge3' => '$surcharge3', - '$quote.surcharge4' => '$surcharge4', + '$quote.quote_number' => '$quote.number_label: $quote.number', + '$quote.po_number' => '$quote.po_number_label: $quote.po_number', + '$quote.quote_date' => '$quote.date_label: $quote.date', + '$quote.valid_until' => '$quote.valid_until_label: $quote.valid_until', + '$quote.balance_due' => '$quote.balance_due_label: $quote.balance_due', + '$quote.quote_total' => '$quote.total_label: $quote.total', + '$quote.partial_due' => '$quote.partial_due_label: $quote.partial_due', + '$quote.custom1' => '$quote.custom1_label: $quote.custom1', + '$quote.custom2' => '$quote.custom2_label: $quote.custom2', + '$quote.custom3' => '$quote.custom3_label: $quote.custom3', + '$quote.custom4' => '$quote.custom4_label: $quote.custom4', + '$quote.surcharge1' => '$surcharge1_label: $surcharge1', + '$quote.surcharge2' => '$surcharge2_label: $surcharge2', + '$quote.surcharge3' => '$surcharge3_label: $surcharge3', + '$quote.surcharge4' => '$surcharge4_label: $surcharge4', ]; return $this->processCustomFields($company, $data); @@ -318,14 +318,14 @@ class Designer '$credit.credit_balance' => '$credit.balance', '$credit.credit_amount' => '$credit.amount', '$credit.partial_due' => '$credit.partial_due', - '$credit.credit1' => '$credit1', - '$credit.credit2' => '$credit2', - '$credit.credit3' => '$credit3', - '$credit.credit4' => '$credit4', - '$credit.surcharge1' => '$surcharge1', - '$credit.surcharge2' => '$surcharge2', - '$credit.surcharge3' => '$surcharge3', - '$credit.surcharge4' => '$surcharge4', + '$credit.custom1' => '$credit.custom1', + '$credit.custom2' => '$credit.custom2', + '$credit.custom3' => '$credit.custom3', + '$credit.custom4' => '$credit.custom4', + '$credit.surcharge1' => '$surcharge1_label: $surcharge1', + '$credit.surcharge2' => '$surcharge2_label: $surcharge2', + '$credit.surcharge3' => '$surcharge3_label: $surcharge3', + '$credit.surcharge4' => '$surcharge4_label: $surcharge4', ]; return $this->processCustomFields($company, $data); diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 9ed032f1255b..6db15143efd0 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -192,8 +192,11 @@ trait MakesInvoiceValues $data['$credit.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_total')]; $data['$credit.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.credit_number')]; $data['$credit.amount'] = &$data['$credit.total']; - + $data['$credit.po_number'] = &$data['$invoice.po_number']; + $data['$credit.date'] = ['value' => $this->date, 'label' => ctrans('texts.credit_date')]; $data['$balance'] = ['value' => Number::formatMoney($calc->getBalance(), $this->client) ?: ' ', 'label' => ctrans('texts.balance')]; + $data['$credit.balance'] = &$data['$balance']; + $data['$invoice.balance'] = &$data['$balance']; $data['$taxes'] = ['value' => Number::formatMoney($calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')]; $data['$invoice.taxes'] = &$data['$taxes']; diff --git a/tests/Unit/Migration/ImportTest.php b/tests/Unit/Migration/ImportTest.php index c77d072acecf..c6c9f0823472 100644 --- a/tests/Unit/Migration/ImportTest.php +++ b/tests/Unit/Migration/ImportTest.php @@ -45,13 +45,13 @@ class ImportTest extends TestCase $this->migration_array = json_decode(file_get_contents($migration_file), 1); } -// public function testImportClassExists() -// { -// $status = class_exists('App\Jobs\Util\Import'); + public function testImportClassExists() + { + $status = class_exists('App\Jobs\Util\Import'); -// $this->assertTrue($status); + $this->assertTrue($status); -// } + } // public function testExceptionOnUnavailableResource() // { diff --git a/tests/Unit/PdfVariablesTest.php b/tests/Unit/PdfVariablesTest.php index 0c58242c77b2..8c0bf0676de4 100644 --- a/tests/Unit/PdfVariablesTest.php +++ b/tests/Unit/PdfVariablesTest.php @@ -18,6 +18,11 @@ class PdfVariablesTest extends TestCase $this->settings = CompanySettings::defaults(); } + + public function testPdfVariableDefaults() + { + $this->assertTrue(is_array($this->settings->pdf_variables->client_details)); + } /* public function testPdfVariableDefaults() {