shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brkcvn/akaunting into mobile-index-actions

Browse Source
This commit is contained in:
Burak Civan 2022-11-14 09:31:09 +03:00
commit 6d5f520c95
7 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Notification.php
View File

@ -91,7 +91,7 @@ abstract class Notification extends BaseNotification implements ShouldQueue
public function getFooter() public function getFooter()
{ {
$url = 'https://akaunting.com/lp/accounting-software?utm_source=email&utm_medium=footer&utm_campaign=plg&utm_content=' . $this->template->alias; $url = 'https://akaunting.com/accounting-software?utm_source=email&utm_medium=footer&utm_campaign=plg&utm_content=' . $this->template->alias;
$get_started = '<a href="' . $url . '" style="color: #676ba2; text-decoration: none;">' . trans('footer.get_started') . '</a>'; $get_started = '<a href="' . $url . '" style="color: #676ba2; text-decoration: none;">' . trans('footer.get_started') . '</a>';

18
app/Traits/Recurring.php
View File

@ -188,7 +188,11 @@ trait Recurring
return false; return false;
} }
return $schedule->current()->getStart(); if (! $current = $schedule->current()) {
return false;
}
return $current->getStart();
} }
public function getNextRecurring() public function getNextRecurring()
@ -210,7 +214,11 @@ trait Recurring
return false; return false;
} }
return $schedule->first()->getStart(); if (! $first = $schedule->first()) {
return false;
}
return $first->getStart();
} }
public function getLastRecurring() public function getLastRecurring()
@ -219,6 +227,10 @@ trait Recurring
return false; return false;
} }
return $schedule->last()->getStart(); if (! $last = $schedule->last()) {
return false;
}
return $last->getStart();
} }
} }

10
public/css/app.css vendored
View File

@ -1399,7 +1399,7 @@ input[type=file]::file-selector-button:hover{
background-color: #DCE2F9; background-color: #DCE2F9;
} }
.menu-list a svg { .menu-list ul svg {
width: 22px; width: 22px;
height: 24px; height: 24px;
fill: none; fill: none;
@ -54059,6 +54059,14 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
} }
/* responsive for role mobile */ /* responsive for role mobile */
/* full-width for mobile. Some component use inline styling for width */
@media only screen and (max-width: 991px) {
.full-width-mobile {
width: 100% !important;
}
}
/* full-width for mobile. Some component use inline styling for width */
[dir="ltr"] .ltr\:-right-57 { [dir="ltr"] .ltr\:-right-57 {
right: -14.5rem; right: -14.5rem;
} }

10
resources/assets/sass/app.css vendored
View File

@ -93,7 +93,7 @@
background-color: #DCE2F9; background-color: #DCE2F9;
} }
.menu-list a svg { .menu-list ul svg {
width: 22px; width: 22px;
height: 24px; height: 24px;
fill: none; fill: none;
@ -572,6 +572,14 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
} }
/* responsive for role mobile */ /* responsive for role mobile */
/* full-width for mobile. Some component use inline styling for width */
@media only screen and (max-width: 991px) {
.full-width-mobile {
width: 100% !important;
}
}
/* full-width for mobile. Some component use inline styling for width */
[dir="ltr"] .ltr\:-right-57 { [dir="ltr"] .ltr\:-right-57 {
right: -14.5rem; right: -14.5rem;
} }

2
resources/views/components/layouts/portal/finish/content.blade.php
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="my-10"> <div class="my-10">
<x-link href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_payment&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700" override="class"> <x-link href="https://akaunting.com/accounting-software?utm_source=software&utm_medium=invoice_payment&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700" override="class">
{{ trans('portal.get_started') }} {{ trans('portal.get_started') }}
</x-link> </x-link>
</div> </div>

2
resources/views/portal/invoices/index.blade.php
View File

@ -159,7 +159,7 @@
<div class="my-10"> <div class="my-10">
<x-link <x-link
href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_index&utm_campaign=plg" href="https://akaunting.com/accounting-software?utm_source=software&utm_medium=invoice_index&utm_campaign=plg"
class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"
override="class" override="class"
> >

2
resources/views/portal/payments/index.blade.php
View File

@ -67,7 +67,7 @@
<div class="my-10"> <div class="my-10">
<x-link <x-link
href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=payment_index&utm_campaign=plg" href="https://akaunting.com/accounting-software?utm_source=software&utm_medium=payment_index&utm_campaign=plg"
class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"
override="class" override="class"
> >