Merge branch 'akaunting:master' into master
This commit is contained in:
Burak Civan
GitHub
@@ -2,7 +2,7 @@
|
||||
|
||||
@if (! $hideNewDropdown)
|
||||
<x-dropdown id="show-new-actions-{{ $contact->type }}">
|
||||
<x-slot name="trigger" class="flex items-center px-3 py-1.5 mb-3 sm:mb-0 bg-green hover:bg-green-700 rounded-xl text-white text-sm font-bold leading-6" override="class">
|
||||
<x-slot name="trigger" class="w-full flex items-center justify-between sm:justify-start px-3 py-1.5 mb-3 sm:mb-0 bg-green hover:bg-green-700 rounded-xl text-white text-sm font-bold leading-6" override="class">
|
||||
{{ trans('general.new_more') }}
|
||||
<span class="material-icons ltr:ml-2 rtl:mr-2">expand_more</span>
|
||||
</x-slot>
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
<x-show.content.left>
|
||||
@stack('customer_address_start')
|
||||
@if (! $hideAddress)
|
||||
<div class="flex flex-col text-sm mb-5">
|
||||
<div class="flex flex-col text-sm sm:mb-5">
|
||||
<div class="font-medium">{{ trans('general.address') }}</div>
|
||||
<span>{{ $contact->address }}<br>{{ $contact->location }}</span>
|
||||
</div>
|
||||
@@ -76,7 +76,7 @@
|
||||
@stack('customer_tax_number_start')
|
||||
@if (! $hideTaxNumber)
|
||||
@if ($contact->tax_number)
|
||||
<div class="flex flex-col text-sm mb-5">
|
||||
<div class="flex flex-col text-sm sm:mb-5">
|
||||
<div class="font-medium">{{ trans('general.tax_number') }}</div>
|
||||
<span>{{ $contact->tax_number }}</span>
|
||||
</div>
|
||||
@@ -87,7 +87,7 @@
|
||||
@stack('customer_website_start')
|
||||
@if (! $hideWebsite)
|
||||
@if ($contact->website)
|
||||
<div class="flex flex-col text-sm mb-5">
|
||||
<div class="flex flex-col text-sm sm:mb-5">
|
||||
<div class="font-medium">{{ trans('general.website') }}</div>
|
||||
<span>{{ $contact->website }}</span>
|
||||
</div>
|
||||
@@ -98,7 +98,7 @@
|
||||
@stack('customer_reference_start')
|
||||
@if (! $hideReference)
|
||||
@if ($contact->reference)
|
||||
<div class="flex flex-col text-sm mb-5">
|
||||
<div class="flex flex-col text-sm sm:mb-5">
|
||||
<div class="font-medium">{{ trans('general.reference') }}</div>
|
||||
<span>{{ $contact->reference }}</span>
|
||||
</div>
|
||||
@@ -108,7 +108,7 @@
|
||||
|
||||
@stack('customer_client_portal_start')
|
||||
@if (! $hideUser)
|
||||
<div class="flex flex-col text-sm mb-5">
|
||||
<div class="flex flex-col text-sm sm:mb-5">
|
||||
<div class="flex items-center font-medium">
|
||||
<div class="flex items-center cursor-default">
|
||||
<x-tooltip id="tooltip-client-describe" placement="bottom" size="w-2/12" message="{{ trans('customers.client_portal_description') }}">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div id="{{ $id }}" role="tooltip" class="w-full lg:w-96 inline-block absolute left-0 z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible information-content">
|
||||
<div class="absolute w-2 h-2 inset-y-1/2 -right-1 before:content-[' '] before:absolute before:w-2 before:h-2 before:bg-lilac-900 before:border-gray-200 before:transform before:rotate-45 before:border before:border-t-0 before:border-l-0 data-popper-arrow"></div>
|
||||
<div id="{{ $id }}" role="tooltip" class="w-full sm:w-96 inline-block absolute left-0 z-10 text-sm font-medium rounded-lg border border-gray-200 shadow-sm whitespace-nowrap transition-visible bg-lilac-900 border-none text-black p-6 cursor-auto opacity-0 invisible information-content">
|
||||
<div class="absolute w-2 h-2 sm:inset-y-1/2 sm:-right-1 before:content-[' '] before:absolute before:w-2 before:h-2 before:bg-lilac-900 before:border-gray-200 before:transform before:rotate-45 before:border before:border-t-0 before:border-l-0 data-popper-arrow"></div>
|
||||
|
||||
<ul>
|
||||
<li class="relative flex items-center text-sm mb-7">
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
<br>
|
||||
|
||||
{{ $document->document_number }}
|
||||
<p class="classic-invoice"> {{ $document->document_number }} </p>
|
||||
</div>
|
||||
@endif
|
||||
@stack('invoice_number_input_end')
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="w-full lg:w-1/2 flex justify-end lg:mt-60">
|
||||
<div class="w-full lg:w-1/2 flex justify-end mt-8 lg:mt-60">
|
||||
<img src="{{ $image }}" alt="{{ $title }}" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@stack($name . '_input_start')
|
||||
<div
|
||||
@class([
|
||||
'grid grid-cols-6 gap-8',
|
||||
'grid sm:grid-cols-6 gap-8',
|
||||
$formGroupClass,
|
||||
'required' => $required,
|
||||
'readonly' => $readonly,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="flex items-center justify-center text-black mt-5 sm:mt-10 mb-10">
|
||||
<div class="flex items-center justify-center text-black mt-10 mb-10">
|
||||
@if (! empty($slot) && $slot->isNotEmpty())
|
||||
{!! $slot !!}
|
||||
@elseif (! empty($items))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@stack('footer_start')
|
||||
<footer class="footer">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between lg:mt-20 py-7 text-sm font-light">
|
||||
<div>
|
||||
{{ trans('footer.powered') }}:
|
||||
<x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
|
||||
|
||||
@@ -1,66 +1,66 @@
|
||||
<div class="relative w-full flex border-b pt-8 mb-4">
|
||||
<div class="flex flex-row items-center place-center border-r">
|
||||
<button class="flex items-center" id="dropdownButton" data-dropdown-toggle="dropdown">
|
||||
<i class="material-icons w-10 flex items-center aspect-square text-light-gray ltr:pl-2 rtl:pr-2 hover:text-gray-700"> apps_outlined </i>
|
||||
</button>
|
||||
<div class="relative w-full flex flex-col sm:flex-row border-b pt-8 mb-4">
|
||||
<div class="flex items-center">
|
||||
<div class="flex flex-row items-center place-center border-r">
|
||||
<button class="flex items-center" id="dropdownButton" data-dropdown-toggle="dropdown">
|
||||
<i class="material-icons w-10 flex items-center aspect-square text-light-gray ltr:pl-2 rtl:pr-2 hover:text-gray-700"> apps_outlined </i>
|
||||
</button>
|
||||
|
||||
<div id="dropdown" data-click-outside-none class="w-full px-0 hidden z-10">
|
||||
<div class="flex flex-col md:flex-row">
|
||||
<div class="w-full lg:w-6/12 flex flex-col shadow-md bg-white px-4 lg:pl-8 py-8 gap-2 rounded-l-xl">
|
||||
<h4 class="capitalize font-thin">
|
||||
{{ trans_choice('general.categories', 1) }}
|
||||
</h4>
|
||||
<div id="dropdown" data-click-outside-none class="w-full px-0 hidden z-10">
|
||||
<div class="flex flex-col md:flex-row">
|
||||
<div class="w-full lg:w-6/12 flex flex-col shadow-md bg-white px-4 lg:pl-8 py-8 gap-2 rounded-l-xl">
|
||||
<h4 class="capitalize font-thin">
|
||||
{{ trans_choice('general.categories', 1) }}
|
||||
</h4>
|
||||
|
||||
<div class="grid grid-cols-2 gap-2">
|
||||
@foreach ($categories as $slug => $category)
|
||||
<x-link href="{{ $categoryUrl($slug) }}" class="font-semibold text-sm ltr:pr-4 rtl:pl-4 lg:pr-0 truncate bg-transparent" override="class">
|
||||
<x-link.hover>
|
||||
{{ $category }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="w-full lg:w-6/12 flex flex-col shadow-md bg-purple-lighter px-4 lg:px-12 py-8 gap-2 rounded-r-xl">
|
||||
<h4 class="capitalize font-thin mb-2">
|
||||
{{ trans('modules.popular_this_week') }}
|
||||
</h4>
|
||||
|
||||
@if ($popular)
|
||||
<div class="flex flex-col gap-4">
|
||||
@foreach ($popular->data as $item)
|
||||
<div class="hover:shadow-2xl rounded-lg">
|
||||
<x-link href="{{ route('apps.app.show', $item->slug) }}" class="flex items-center p-2" override="class">
|
||||
@foreach ($item->files as $file)
|
||||
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
|
||||
<img src="{{ $file->path_string }}" alt="{{ $item->name }}" class="w-28 h-20 rounded-md object-cover ltr:mr-3 rtl:ml-3" />
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
<div class="flex flex-col py-1 gap-0">
|
||||
<h6 class="text-sm font-bold capitalize">
|
||||
{!! $item->name !!}
|
||||
</h6>
|
||||
|
||||
<div class="line-clamp-2">
|
||||
<p class="font-thin text-xs text-left">
|
||||
{!! $item->description !!}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</x-link>
|
||||
</div>
|
||||
<div class="grid grid-cols-2 gap-2">
|
||||
@foreach ($categories as $slug => $category)
|
||||
<x-link href="{{ $categoryUrl($slug) }}" class="font-semibold text-sm ltr:pr-4 rtl:pl-4 lg:pr-0 truncate bg-transparent" override="class">
|
||||
<x-link.hover>
|
||||
{{ $category }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="w-full lg:w-6/12 flex flex-col shadow-md bg-purple-lighter px-4 lg:px-12 py-8 gap-2 rounded-r-xl">
|
||||
<h4 class="capitalize font-thin mb-2">
|
||||
{{ trans('modules.popular_this_week') }}
|
||||
</h4>
|
||||
|
||||
@if ($popular)
|
||||
<div class="flex flex-col gap-4">
|
||||
@foreach ($popular->data as $item)
|
||||
<div class="hover:shadow-2xl rounded-lg">
|
||||
<x-link href="{{ route('apps.app.show', $item->slug) }}" class="flex items-center p-2" override="class">
|
||||
@foreach ($item->files as $file)
|
||||
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
|
||||
<img src="{{ $file->path_string }}" alt="{{ $item->name }}" class="w-28 h-20 rounded-md object-cover ltr:mr-3 rtl:ml-3" />
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
<div class="flex flex-col py-1 gap-0">
|
||||
<h6 class="text-sm font-bold capitalize">
|
||||
{!! $item->name !!}
|
||||
</h6>
|
||||
|
||||
<div class="line-clamp-2">
|
||||
<p class="font-thin text-xs text-left">
|
||||
{!! $item->description !!}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</x-link>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col lg:flex-row w-full justify-between">
|
||||
<div class="w-8/12 h-full">
|
||||
<form method="GET" action="{{ url("/" . company_id()) }}/apps/search">
|
||||
<div class="h-full flex items-center pl-2 gap-2">
|
||||
@@ -107,31 +107,31 @@
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row items-end lg:items-center mb-1 divide-x divide-black-400 mt-4 lg:mt-0">
|
||||
<x-link href="{{ route('apps.home.index') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.home') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
<div class="lg:absolute lg:bottom-2.5 ltr:lg:right-0 rtl:lg:left-0 flex flex-row items-end lg:items-center mb-1 divide-x divide-black-400 mt-4 lg:mt-0">
|
||||
<x-link href="{{ route('apps.home.index') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.home') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
|
||||
<x-link href="{{ route('apps.new') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.new') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
<x-link href="{{ route('apps.new') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.new') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
|
||||
<x-link href="{{ route('apps.paid') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.top_paid') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
<x-link href="{{ route('apps.paid') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.top_paid') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
|
||||
<x-link href="{{ route('apps.free') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.top_free') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
</div>
|
||||
<x-link href="{{ route('apps.free') }}" class="text-sm font-semibold px-2 sm:mt-0 sm:mb-0 leading-4" override="class">
|
||||
<x-link.hover color="to-black-400">
|
||||
{{ trans('modules.top_free') }}
|
||||
</x-link.hover>
|
||||
</x-link>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,6 +1,6 @@
|
||||
@stack('footer_start')
|
||||
<footer class="footer">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between lg:mt-20 py-7 text-sm font-light">
|
||||
<div>
|
||||
{{ trans('footer.powered') }}:
|
||||
<a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a> |
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
<div class="flex flex-col h-screen">
|
||||
<header class="py-5 bg-purple-lighter text-purple text-center">
|
||||
<div class="w-full lg:max-w-6xl m-auto flex flex-col lg:flex-row items-center justify-between">
|
||||
<div class="flex flex-col items-start">
|
||||
<div class="w-full lg:max-w-6xl m-auto flex flex-col lg:flex-row items-center justify-between px-4 lg:px-0">
|
||||
<div class="flex flex-col items-center lg:items-start">
|
||||
<span class="font-medium uppercase">
|
||||
{{ trans('general.preview_mode') }}
|
||||
</span>
|
||||
@@ -22,7 +22,7 @@
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<x-link href="{!! !empty($sticky->attributes->has('url')) ? $sticky->attributes->get('url') : route('dashboard') !!}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 bg-purple hover:bg-purple-700 text-white disabled:bg-purple-100" override="class">
|
||||
<x-link href="{!! !empty($sticky->attributes->has('url')) ? $sticky->attributes->get('url') : route('dashboard') !!}" class="px-3 py-1.5 mt-5 lg:mt-0 rounded-xl text-sm font-medium leading-6 bg-purple hover:bg-purple-700 text-white disabled:bg-purple-100" override="class">
|
||||
{{ trans('general.go_back', ['type' => company()->name]) }}
|
||||
</x-link>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@stack('footer_start')
|
||||
|
||||
<footer class="footer">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between lg:mt-20 py-7 text-sm font-light">
|
||||
<div>
|
||||
{{ trans('footer.powered') }}:
|
||||
<x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@stack('footer_start')
|
||||
|
||||
<footer class="footer">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
|
||||
<div class="flex flex-col sm:flex-row items-center justify-between lg:mt-20 py-7 text-sm font-light">
|
||||
<div>
|
||||
{{ trans('footer.powered') }}:
|
||||
<x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<div class="w-full lg:h-48 px-6 bg-dark-blue rounded-lg flex flex-col lg:flex-row justify-between items-center my-8">
|
||||
<div class="w-full lg:w-1/2 flex flex-col self-end py-6">
|
||||
<div
|
||||
class="h-28"
|
||||
class="lg:h-28"
|
||||
x-data="{
|
||||
text: '',
|
||||
textArray : ['{{ trans('modules.premium_banner') }}'],
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="overflow-x-visible mb-8 margin-bottom-spacing">
|
||||
<table class="w-full rp-border-collapse">
|
||||
<div class="overflow-x-scroll large-overflow-unset mb-8 margin-bottom-spacing">
|
||||
<table class="w-full small-table-width rp-border-collapse">
|
||||
@include($class->views['detail.table.header'])
|
||||
@include($class->views['detail.table.body'])
|
||||
@include($class->views['detail.table.footer'])
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<div class="flex flex-col lg:flex-row mt-12">
|
||||
<div class="flex flex-col lg:flex-row sm:mt-12">
|
||||
{!! $slot !!}
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<div class="lg:w-4/12 lg:border-r border-gray-300 pr-12">
|
||||
<div class="lg:w-4/12 lg:border-r border-gray-300 pr-12 mb-4 sm:mb-0">
|
||||
{!! $slot !!}
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<div class="w-full lg:w-5/12 flex items-center">
|
||||
<div class="w-full lg:w-5/12 flex items-center mb-10 sm:mb-0">
|
||||
@if (! empty($avatar) && $avatar->isNotEmpty())
|
||||
<div class="w-12 h-12 flex items-center justify-center text-2xl font-regular border border-gray-300 rounded-full p-6">
|
||||
{!! $avatar !!}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="flex flex-col text-black text-sm font-medium ml-8">
|
||||
<div class="flex flex-col text-black text-sm font-medium ml-2 sm:ml-8">
|
||||
{!! $slot !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="w-full lg:w-7/12 flex items-center mt-5 lg:mt-0">
|
||||
<div class="w-full lg:w-7/12 flex items-center">
|
||||
@if (! empty($slot) && $slot->isNotEmpty())
|
||||
{!! $slot !!}
|
||||
@elseif (! empty($items))
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<div x-data="{ active: window.location.hash.split('#')[1] == undefined ? '{{ $active }}' : window.location.hash.split('#')[1] }">
|
||||
<div>
|
||||
<ul {{ ((! $attributes->has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'flex items-center']) : $attributes }}>
|
||||
<ul {{ ((! $attributes->has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'flex items-center overflow-x-scroll lg:overflow-visible']) : $attributes }}>
|
||||
{!! $navs !!}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@props(['id', 'name', 'href', 'active'])
|
||||
|
||||
<li
|
||||
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b tabs-link"
|
||||
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
|
||||
id="tab-{{ $id }}"
|
||||
data-id="tab-{{ $id }}"
|
||||
data-tabs="{{ $id }}"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@props(['id', 'name', 'active'])
|
||||
|
||||
<li
|
||||
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b tabs-link"
|
||||
class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
|
||||
id="tab-{{ $id }}"
|
||||
data-id="tab-{{ $id }}"
|
||||
data-tabs="{{ $id }}"
|
||||
|
||||
Reference in New Issue
Block a user