Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 10:34:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for designs (#3554)

Browse Source 
* Fixes for designs

* minor fixes

* Fixes for composer.json

* Convert PDF variables to object instead of array

* Fixes for testS"
This commit is contained in:
David Bomba 2020-03-27 18:22:35 +11:00 committed by GitHub
parent 1882836d8d
commit 060b5ef432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.ci
View File

@ -16,5 +16,5 @@ DB_DATABASE=ninja
DB_USERNAME=root DB_USERNAME=root
DB_PASSWORD=ninja DB_PASSWORD=ninja
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
NINJA_ENVIRONMENT=selfhost NINJA_ENVIRONMENT=development
COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'

16
app/DataMapper/CompanySettings.php
View File

@ -466,7 +466,7 @@ class CompanySettings extends BaseSettings
private static function getEntityVariableDefaults() private static function getEntityVariableDefaults()
{ {
$variables = [ $variables = [
'client_details' => [ 'client_details' => (object)[
'$client.name' => ctrans('texts.client_name'), '$client.name' => ctrans('texts.client_name'),
'$client.id_number' => ctrans('texts.id_number'), '$client.id_number' => ctrans('texts.id_number'),
'$client.vat_number' => ctrans('texts.vat_number'), '$client.vat_number' => ctrans('texts.vat_number'),
@ -476,7 +476,7 @@ class CompanySettings extends BaseSettings
'$client.country' => ctrans('texts.country'), '$client.country' => ctrans('texts.country'),
'$client.email' => ctrans('texts.email'), '$client.email' => ctrans('texts.email'),
], ],
'company_details' => [ 'company_details' => (object)[
'$company.company_name' => ctrans('texts.company_name'), '$company.company_name' => ctrans('texts.company_name'),
'$company.id_number' => ctrans('texts.id_number'), '$company.id_number' => ctrans('texts.id_number'),
'$company.vat_number' => ctrans('texts.vat_number'), '$company.vat_number' => ctrans('texts.vat_number'),
@ -484,13 +484,13 @@ class CompanySettings extends BaseSettings
'$company.email' => ctrans('texts.email'), '$company.email' => ctrans('texts.email'),
'$company.phone' => ctrans('texts.phone'), '$company.phone' => ctrans('texts.phone'),
], ],
'company_address' => [ 'company_address' => (object)[
'$company.address1' => ctrans('texts.address1'), '$company.address1' => ctrans('texts.address1'),
'$company.address2' => ctrans('texts.address2'), '$company.address2' => ctrans('texts.address2'),
'$company.city_state_postal' => ctrans('texts.city_state_postal'), '$company.city_state_postal' => ctrans('texts.city_state_postal'),
'$company.country' => ctrans('texts.country'), '$company.country' => ctrans('texts.country'),
], ],
'invoice_details' => [ 'invoice_details' => (object)[
'$invoice.invoice_number' => ctrans('texts.invoice_number'), '$invoice.invoice_number' => ctrans('texts.invoice_number'),
'$invoice.po_number' => ctrans('texts.po_number'), '$invoice.po_number' => ctrans('texts.po_number'),
'$invoice.invoice_date' => ctrans('texts.invoice_date'), '$invoice.invoice_date' => ctrans('texts.invoice_date'),
@ -498,7 +498,7 @@ class CompanySettings extends BaseSettings
'$invoice.balance_due' => ctrans('texts.balance_due'), '$invoice.balance_due' => ctrans('texts.balance_due'),
'$invoice.invoice_total' => ctrans('texts.invoice_total'), '$invoice.invoice_total' => ctrans('texts.invoice_total'),
], ],
'quote_details' => [ 'quote_details' => (object)[
'$quote.quote_number' => ctrans('texts.quote_number'), '$quote.quote_number' => ctrans('texts.quote_number'),
'$quote.po_number' => ctrans('texts.po_number'), '$quote.po_number' => ctrans('texts.po_number'),
'$quote.quote_date' => ctrans('texts.quote_date'), '$quote.quote_date' => ctrans('texts.quote_date'),
@ -506,14 +506,14 @@ class CompanySettings extends BaseSettings
'$quote.balance_due' => ctrans('texts.balance_due'), '$quote.balance_due' => ctrans('texts.balance_due'),
'$quote.quote_total' => ctrans('texts.quote_total'), '$quote.quote_total' => ctrans('texts.quote_total'),
], ],
'credit_details' => [ 'credit_details' => (object)[
'$credit.credit_number' => ctrans('texts.credit_number'), '$credit.credit_number' => ctrans('texts.credit_number'),
'$credit.po_number' => ctrans('texts.po_number'), '$credit.po_number' => ctrans('texts.po_number'),
'$credit.credit_date' => ctrans('texts.credit_date'), '$credit.credit_date' => ctrans('texts.credit_date'),
'$credit.credit_balance' => ctrans('texts.credit_balance'), '$credit.credit_balance' => ctrans('texts.credit_balance'),
'$credit.credit_amount' => ctrans('texts.credit_amount'), '$credit.credit_amount' => ctrans('texts.credit_amount'),
], ],
'product_columns' => [ 'product_columns' => (object)[
'$product.product_key' => ctrans('texts.product_key'), '$product.product_key' => ctrans('texts.product_key'),
'$product.notes' => ctrans('texts.notes'), '$product.notes' => ctrans('texts.notes'),
'$product.cost' => ctrans('texts.cost'), '$product.cost' => ctrans('texts.cost'),
@ -522,7 +522,7 @@ class CompanySettings extends BaseSettings
'$product.tax_name1' => ctrans('texts.tax_name1'), '$product.tax_name1' => ctrans('texts.tax_name1'),
'$product.line_total' => ctrans('texts.line_total'), '$product.line_total' => ctrans('texts.line_total'),
], ],
'task_columns' => [ 'task_columns' => (object)[
'$task.product_key' => ctrans('texts.product_key'), '$task.product_key' => ctrans('texts.product_key'),
'$task.notes' => ctrans('texts.notes'), '$task.notes' => ctrans('texts.notes'),
'$task.cost' => ctrans('texts.cost'), '$task.cost' => ctrans('texts.cost'),

8
composer.json
View File

@ -93,14 +93,12 @@
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
"@php artisan key:generate" "@php artisan key:generate",
"@php artisan storage:link"
], ],
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", "@php artisan package:discover --ansi"
"@php artisan package:discover --ansi",
"php artisan key:generate",
"@php artisan storage:link"
] ]
}, },
"config": { "config": {