From 2262600b37cda45245a2f136d088f4e7b955bb86 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 23 Jun 2022 13:59:49 +0300 Subject: [PATCH] structure created for view components --- .../assets/js/components/AkauntingContactCard.vue | 4 ++-- resources/lang/en-GB/general.php | 2 +- .../components/documents/form/line-item.blade.php | 8 ++------ .../components/documents/form/totals.blade.php | 6 ++---- .../components/documents/show/get-paid.blade.php | 14 ++++---------- .../documents/show/make-payment.blade.php | 14 ++++---------- resources/views/components/text/hover.blade.php | 11 +++++++++++ .../views/components/widgets/header.blade.php | 4 +--- .../views/settings/email-templates/edit.blade.php | 4 ++-- 9 files changed, 29 insertions(+), 38 deletions(-) create mode 100644 resources/views/components/text/hover.blade.php diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue index 212c5dad6..5ee7d4d1e 100644 --- a/resources/assets/js/components/AkauntingContactCard.vue +++ b/resources/assets/js/components/AkauntingContactCard.vue @@ -98,12 +98,12 @@
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 5c54baa21..9d025c80a 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -286,7 +286,7 @@ return [ ], 'empty' => [ - 'documentation' => 'Check out the documentation for more details.', + 'documentation' => 'Check out the documentation for more details.', 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', 'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.', 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index b201acbb2..36a661f2c 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -190,18 +190,14 @@ @if (! $hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
@endif
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php index cc24db664..20d3f0f58 100644 --- a/resources/views/components/documents/form/totals.blade.php +++ b/resources/views/components/documents/form/totals.blade.php @@ -79,10 +79,8 @@ -
- - {{ trans('invoices.add_discount') }} - +
+
diff --git a/resources/views/components/documents/show/get-paid.blade.php b/resources/views/components/documents/show/get-paid.blade.php index 5a9014bcb..4f8491287 100644 --- a/resources/views/components/documents/show/get-paid.blade.php +++ b/resources/views/components/documents/show/get-paid.blade.php @@ -62,16 +62,12 @@ @if (! empty($transaction->contact) && $transaction->contact->email) - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - + @else - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - + @endif @@ -84,9 +80,7 @@ class="text-purple mt-1" override="class" > - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - + - @@ -105,7 +99,7 @@ :message="$message" :label="trans('general.title.delete', ['type' => trans_choice('general.payments', 1)])" class="text-purple mt-1" - text-class="border-b border-transparent transition-all hover:border-purple" + text-class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize" override="class" />
diff --git a/resources/views/components/documents/show/make-payment.blade.php b/resources/views/components/documents/show/make-payment.blade.php index 67773333b..6c693280b 100644 --- a/resources/views/components/documents/show/make-payment.blade.php +++ b/resources/views/components/documents/show/make-payment.blade.php @@ -46,16 +46,12 @@ @if (! empty($transaction->contact) && $transaction->contact->email) - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - + @else - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - + @endif @@ -68,9 +64,7 @@ class="text-purple mt-1" override="class" > - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - + - @@ -89,7 +83,7 @@ :message="$message" :label="trans('general.title.delete', ['type' => trans_choice('general.payments', 1)])" class="text-purple mt-1" - text-class="border-b border-transparent transition-all hover:border-purple" + text-class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize" override="class" /> diff --git a/resources/views/components/text/hover.blade.php b/resources/views/components/text/hover.blade.php new file mode 100644 index 000000000..d6620c703 --- /dev/null +++ b/resources/views/components/text/hover.blade.php @@ -0,0 +1,11 @@ +@props(['color', 'text']) + +@php + if (empty($color)) { + $color = 'to-purple'; + } +@endphp + + + {{ $text }} + \ No newline at end of file diff --git a/resources/views/components/widgets/header.blade.php b/resources/views/components/widgets/header.blade.php index d2681a235..c7bdf5f91 100644 --- a/resources/views/components/widgets/header.blade.php +++ b/resources/views/components/widgets/header.blade.php @@ -8,9 +8,7 @@
@if ($report = $class->getReportUrl()) - - {{ trans('widgets.view_report') }} - + @endif diff --git a/resources/views/settings/email-templates/edit.blade.php b/resources/views/settings/email-templates/edit.blade.php index 93b52a2ad..2fd086c5c 100644 --- a/resources/views/settings/email-templates/edit.blade.php +++ b/resources/views/settings/email-templates/edit.blade.php @@ -14,8 +14,8 @@
@foreach ($template as $item) - @endforeach