From f211864982a4f6db94334e923262584e286414b3 Mon Sep 17 00:00:00 2001 From: Merve Karaman Date: Thu, 2 Mar 2023 16:47:31 +0300 Subject: [PATCH 1/2] Cursor style changed --- resources/views/modals/transactions/share.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/modals/transactions/share.blade.php b/resources/views/modals/transactions/share.blade.php index 43195086a..29a818866 100644 --- a/resources/views/modals/transactions/share.blade.php +++ b/resources/views/modals/transactions/share.blade.php @@ -10,7 +10,7 @@ value="{{ $signedUrl }}" ref="clone" @click="onCopyLink()" - style="appearance: none; background-color: whitesmoke; border: none; font-size: 16px;" + style="appearance: none; background-color: whitesmoke; cursor:pointer; border: none; font-size: 16px;" /> From 40beacde8e61264816ec5844a4cb1dc4cc535e7c Mon Sep 17 00:00:00 2001 From: Merve Karaman Date: Thu, 2 Mar 2023 17:12:46 +0300 Subject: [PATCH 2/2] Invoice align problem solved --- .../documents/show/get-paid.blade.php | 80 ++++++++++--------- .../documents/show/make-payment.blade.php | 80 ++++++++++--------- 2 files changed, 82 insertions(+), 78 deletions(-) diff --git a/resources/views/components/documents/show/get-paid.blade.php b/resources/views/components/documents/show/get-paid.blade.php index 5f7d1f2f4..d08cd1254 100644 --- a/resources/views/components/documents/show/get-paid.blade.php +++ b/resources/views/components/documents/show/get-paid.blade.php @@ -61,54 +61,56 @@
- @if (! empty($transaction->contact) && $transaction->contact->email) - - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - - @else - - +
+ @if (! empty($transaction->contact) && $transaction->contact->email) + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - @endif + @else + + + + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} + + + + @endif - - + - - - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - - + + + {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} + + - - + - - @php - $message = trans('general.delete_confirm', [ - 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', - 'type' => strtolower(trans_choice('general.transactions', 1)) - ]); - @endphp + @php + $message = trans('general.delete_confirm', [ + 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', + 'type' => strtolower(trans_choice('general.transactions', 1)) + ]); + @endphp - + +
@endforeach @else diff --git a/resources/views/components/documents/show/make-payment.blade.php b/resources/views/components/documents/show/make-payment.blade.php index ed7a37304..c382bae9a 100644 --- a/resources/views/components/documents/show/make-payment.blade.php +++ b/resources/views/components/documents/show/make-payment.blade.php @@ -44,54 +44,56 @@
- @if (! empty($transaction->contact) && $transaction->contact->email) - - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - - @else - - +
+ @if (! empty($transaction->contact) && $transaction->contact->email) + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - @endif + @else + + + + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} + + + + @endif - - + - - - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - - + + + {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} + + - - + - - @php - $message = trans('general.delete_confirm', [ - 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', - 'type' => strtolower(trans_choice('general.transactions', 1)) - ]); - @endphp + @php + $message = trans('general.delete_confirm', [ + 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', + 'type' => strtolower(trans_choice('general.transactions', 1)) + ]); + @endphp - + +
@endforeach @else