diff --git a/app/Abstracts/View/Components/Transactions/Show.php b/app/Abstracts/View/Components/Transactions/Show.php index b6569c2d9..b02f6b0d4 100644 --- a/app/Abstracts/View/Components/Transactions/Show.php +++ b/app/Abstracts/View/Components/Transactions/Show.php @@ -299,6 +299,9 @@ abstract class Show extends Component /** @var bool */ public $hideRecurringMessage; + /** @var bool */ + public $hideCreated; + /** * Create a new component instance. * @@ -327,7 +330,7 @@ abstract class Show extends Component string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '', bool $hideSchedule = false, bool $hideChildren = false, bool $hideAttachment = false, $attachment = [], - array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false + array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false, bool $hideCreated = false ) { $this->type = $type; $this->transaction = $transaction; @@ -461,6 +464,7 @@ abstract class Show extends Component $this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType); $this->hideRecurringMessage = $hideRecurringMessage; + $this->hideCreated = $hideCreated; } protected function getTransactionTemplate($type, $transactionTemplate) diff --git a/resources/views/components/empty-page.blade.php b/resources/views/components/empty-page.blade.php index e1ade856b..2f0949bf8 100644 --- a/resources/views/components/empty-page.blade.php +++ b/resources/views/components/empty-page.blade.php @@ -46,9 +46,13 @@
  • -

    {{ $suggestion->name }}

    +

    + {{ $suggestion->name }} +

    -
    Enter details and create your first expense easily
    +
    + {{ $suggestion->description ?? '' }} +
    chevron_right diff --git a/resources/views/components/layouts/modules/show/information.blade.php b/resources/views/components/layouts/modules/show/information.blade.php index 2a0b65108..23655263c 100644 --- a/resources/views/components/layouts/modules/show/information.blade.php +++ b/resources/views/components/layouts/modules/show/information.blade.php @@ -6,6 +6,6 @@
    - * {!! trans('modules.information_monthly') !!} + * {!! trans('modules.information_monthly') !!} -
    \ No newline at end of file + diff --git a/resources/views/components/transactions/show/buttons.blade.php b/resources/views/components/transactions/show/buttons.blade.php index fe2a13d6a..2b60820cc 100644 --- a/resources/views/components/transactions/show/buttons.blade.php +++ b/resources/views/components/transactions/show/buttons.blade.php @@ -2,7 +2,7 @@ @if (! $hideButtonAddNew) @can($permissionCreate) - + {{ trans($textButtonAddNew) }} @endcan diff --git a/resources/views/components/transactions/show/content.blade.php b/resources/views/components/transactions/show/content.blade.php index 64d885530..80617c27c 100644 --- a/resources/views/components/transactions/show/content.blade.php +++ b/resources/views/components/transactions/show/content.blade.php @@ -29,10 +29,12 @@ @stack('recurring_message_end') @stack('row_create_start') + @if (! $hideCreated) + @endif @stack('row_create_end') @stack('schedule_start') diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index 69b302056..6ae93650b 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -1,61 +1,61 @@
    @stack('company_start') - @if (!$hideCompany) - - - @if (!$hideCompanyLogo) - - @endif - - @if (!$hideCompanyDetails) - + @endif + +
    - @stack('company_logo_start') - @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) - {{ $transaction->contact_name }} - @else - {{ setting('company.name') }} - @endif - @stack('company_logo_end') - - @stack('company_details_start') - @if (!$hideCompanyName) -

    - {{ setting('company.name') }} -

    - @endif - - @if (!$hideCompanyAddress) -

    {!! (setting('company.address')) !!}

    - @endif - - @if (!$hideCompanyTaxNumber) - @if (setting('company.tax_number')) -

    - {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} -

    + @if (! $hideCompany) + + + @if (! $hideCompanyLogo) + @endif - @if (!$hideCompanyPhone) - @if (setting('company.phone')) -

    - {{ setting('company.phone') }} -

    + @if (! $hideCompanyDetails) + - @endif - -
    + @stack('company_logo_start') + @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id)) + {{ $transaction->contact_name }} + @else + {{ setting('company.name') }} @endif + @stack('company_logo_end') + + @stack('company_details_start') + @if (! $hideCompanyName) +

    + {{ setting('company.name') }} +

    @endif - @endif - @if (!$hideCompanyEmail) -

    {{ setting('company.email') }}

    + @if (! $hideCompanyAddress) +

    {!! (setting('company.address')) !!}

    @endif - @stack('company_details_end') -
    + + @if (! $hideCompanyTaxNumber) + @if (setting('company.tax_number')) +

    + {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} +

    + @endif + @endif + + @if (! $hideCompanyPhone) + @if (setting('company.phone')) +

    + {{ setting('company.phone') }} +

    + @endif + @endif + + @if (! $hideCompanyEmail) +

    {{ setting('company.email') }}

    + @endif + @stack('company_details_end') +
    @endif @stack('company_end') - @if (!$hideContentTitle) + @if (! $hideContentTitle)
    @@ -69,7 +69,7 @@ @stack('number_input_start') - @if (!$hideNumber) + @if (! $hideNumber)
    {{ trans_choice($textNumber, 1) }}: @@ -83,7 +83,7 @@ @stack('number_input_end') @stack('paid_at_input_start') - @if (!$hidePaidAt) + @if (! $hidePaidAt)
    {{ trans($textPaidAt) }}: @@ -97,7 +97,7 @@ @stack('paid_at_input_end') @stack('account_id_input_start') - @if (!$hideAccount) + @if (! $hideAccount)
    {{ trans_choice($textAccount, 1) }}: @@ -111,7 +111,7 @@ @stack('account_id_input_end') @stack('category_id_input_start') - @if (!$hideCategory) + @if (! $hideCategory)
    {{ trans_choice($textCategory, 1) }}: @@ -125,7 +125,7 @@ @stack('category_id_input_end') @stack('payment_method_input_start') - @if (!$hidePaymentMethods) + @if (! $hidePaymentMethods)
    {{ trans_choice($textPaymentMethods, 1) }}: @@ -139,7 +139,7 @@ @stack('payment_method_input_end') @stack('reference_input_start') - @if (!$hideReference) + @if (! $hideReference)
    {{ trans($textReference) }}: @@ -153,7 +153,7 @@ @stack('reference_input_end') @stack('description_input_start') - @if (!$hideDescription) + @if (! $hideDescription)
    {{ trans($textDescription) }}: @@ -180,170 +180,189 @@
    - @if (!$hideContact) + @if (! $hideContact) + @if (! $hideContactInfo) + + + + @endif - @if (! $hideContactInfo) - - - + @stack('name_input_start') + @if (! $hideContactName) + + + + + + @endif + @stack('name_input_end') + + @stack('address_input_start') + @if (! $hideContactAddress) + + + + + + @endif + @stack('address_input_end') + + @stack('tax_number_input_start') + @if (! $hideContactTaxNumber) + + + + + + @endif + @stack('tax_number_input_end') + + @stack('phone_input_start') + @if (! $hideContactPhone) + + + + + + @endif + @stack('phone_input_end') + + @stack('email_start') + @if (! $hideContactEmail) + + + + + + @endif + @stack('email_input_end') @endif - @stack('name_input_start') - @if (!$hideContactName) - - - - - @endif - @stack('name_input_end') - - @stack('address_input_start') - @if (!$hideContactAddress) - - - - - @endif - @stack('address_input_end') - - @stack('tax_number_input_start') - @if (!$hideContactTaxNumber) - - - - - @endif - @stack('tax_number_input_end') - - @stack('phone_input_start') - @if (!$hideContactPhone) - - - - - @endif - @stack('phone_input_end') - - @stack('email_start') - @if (!$hideContactEmail) - - - - - @endif - @stack('email_input_end') - @endif
    + {{ trans($textContactInfo) }}
    +
    - {{ trans($textContactInfo) }}
    -
    + {{ trans('general.name') }} + + {{ $transaction->contact->name }} +
    + {{ trans('general.address') }} + + {!! nl2br($transaction->contact->address) !!} +
    + {{ trans('general.tax_number') }} + + @if ($transaction->contact->tax_number) + {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} + @endif +
    + {{ trans('general.phone') }} + + @if ($transaction->contact->phone) + {{ $transaction->contact->phone }} + @endif +
    + {{ trans('general.email') }} + + {{ $transaction->contact->email }} +
    - {{ trans('general.name') }} - - {{ $transaction->contact->name }} -
    - {{ trans('general.address') }} - - {!! nl2br($transaction->contact->address) !!} -
    - {{ trans('general.tax_number') }} - - @if ($transaction->contact->tax_number) - {{ trans('general.tax_number') }}: {{ $transaction->contact->tax_number }} - @endif -
    - {{ trans('general.phone') }} - - @if ($transaction->contact->phone) - {{ $transaction->contact->phone }} - @endif -
    - {{ trans('general.email') }} - - {{ $transaction->contact->email }} -
    - @if (!$hideRelated) + @if (! $hideRelated) @if ($transaction->document) - - - - -
    -

    {{ trans($textRelatedTransansaction) }}

    -
    - - - - - - - - @if (!$hideRelatedDocumentDate) - - @endif - - - - - - - - +
    - @if (!$hideRelatedDocumentNumber) - {{ trans_choice($textRelatedDocumentNumber, 1) }}
    - @endif - - @if (!$hideRelatedContact) - {{ trans_choice($textRelatedContact, 1) }} - @endif -     		- {{ trans($textRelatedDocumentDate) }} - - @if (!$hideRelatedDocumentAmount) - {{ trans($textRelatedDocumentAmount) }}
    - @endif - - @if (!$hideRelatedAmount) - {{ trans($textRelatedAmount) }} - @endif -
    - - - @if (!$hideRelatedDocumentDate) - - @endif - - - -
    - @if (!$hideRelatedDocumentNumber) - - {{ $transaction->document->document_number }} -
    - @endif - - @if (!$hideRelatedContact) - {{ $transaction->document->contact_name }} - @endif -     		- @date($transaction->document->due_at) - - @if (!$hideRelatedDocumentAmount) - @money($transaction->document->amount, $transaction->document->currency_code, true)
    - @endif - - @if (!$hideRelatedAmount) - @money($transaction->amount, $transaction->currency_code, true) - @endif +     		+

    + {{ trans($textRelatedTransansaction) }} +

    +
    + + + + + + + @if (! $hideRelatedDocumentDate) + + @endif + + + + + + + + + + @if (! $hideRelatedDocumentDate) + + @endif + + + + +
    + @if (! $hideRelatedDocumentNumber) + + {{ trans_choice($textRelatedDocumentNumber, 1) }} + +
    + @endif + + @if (! $hideRelatedContact) + + {{ trans_choice($textRelatedContact, 1) }} + + @endif +     		+ {{ trans($textRelatedDocumentDate) }} + + @if (! $hideRelatedDocumentAmount) + + {{ trans($textRelatedDocumentAmount) }} + +
    + @endif + + @if (! $hideRelatedAmount) + + {{ trans($textRelatedAmount) }} + + @endif +
    + @if (! $hideRelatedDocumentNumber) + + {{ $transaction->document->document_number }} + +
    + @endif + + @if (! $hideRelatedContact) + + {{ $transaction->document->contact_name }} + + @endif +     		+ @date($transaction->document->due_at) + + @if (! $hideRelatedDocumentAmount) + @money($transaction->document->amount, $transaction->document->currency_code, true)
    + @endif + + @if (! $hideRelatedAmount) + + @money($transaction->amount, $transaction->currency_code, true) + + @endif +
    @endif @endif - @if (!$hideAmount) + @if (! $hideAmount) +
    @@ -352,6 +371,7 @@ {{ trans($textAmount) }}: @money($transaction->amount, $transaction->currency_code, true)