Merge branch 'akaunting:master' into master
This commit is contained in:
Burak Civan
GitHub
commit
199117a0d3
18
public/akaunting-js/generalAction.js
vendored
18
public/akaunting-js/generalAction.js
vendored
@ -246,11 +246,10 @@ function runTooltip(tooltipToggleEl) {
|
||||
|
||||
function show() {
|
||||
// Make the tooltip visible
|
||||
if (tooltipEl.classList.contains("opacity-0", "invisible")) {
|
||||
tooltipEl.classList.remove("opacity-0", "invisible");
|
||||
} else {
|
||||
tooltipEl.classList.add("opacity-100", "visible");
|
||||
}
|
||||
tooltipEl.classList.remove("opacity-0");
|
||||
tooltipEl.classList.add("opacity-100");
|
||||
tooltipEl.classList.remove("invisible");
|
||||
tooltipEl.classList.add("visible");
|
||||
// Enable the event listeners
|
||||
|
||||
popperInstance.setOptions((options) => ({
|
||||
@ -268,11 +267,10 @@ function runTooltip(tooltipToggleEl) {
|
||||
}
|
||||
|
||||
function hide() {
|
||||
if (tooltipEl.classList.contains("opacity-100", "visible")) {
|
||||
tooltipEl.classList.remove("opacity-100", "visible");
|
||||
} else {
|
||||
tooltipEl.classList.add("opacity-0", "invisible");
|
||||
}
|
||||
tooltipEl.classList.remove("opacity-100");
|
||||
tooltipEl.classList.add("opacity-0");
|
||||
tooltipEl.classList.remove("visible");
|
||||
tooltipEl.classList.add("invisible");
|
||||
// Hide the tooltip
|
||||
// Disable the event listeners
|
||||
|
||||
|
||||
7
public/css/app.css
vendored
7
public/css/app.css
vendored
@ -57885,5 +57885,12 @@ body{
|
||||
.\32xl\:w-8{
|
||||
width: 2rem;
|
||||
}
|
||||
|
||||
.\32xl\:flex-row{
|
||||
-webkit-box-orient: horizontal;
|
||||
-webkit-box-direction: normal;
|
||||
-ms-flex-direction: row;
|
||||
flex-direction: row;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
accept-charset="{{ $acceptCharset }}"
|
||||
@endif
|
||||
@submit.prevent="{{ $submit }}"
|
||||
@keydown="form.errors ? form.errors.clear($event.target.name) : null"
|
||||
@keydown="form.errors.clear($event.target.name)"
|
||||
{{ $attributes }}
|
||||
>
|
||||
@csrf
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@props(['module', 'installed', 'enable'])
|
||||
|
||||
<div x-show="price_type == 'monthly'" class="w-full">
|
||||
<div x-show="price_type == 'monthly'" class="w-full flex space-x-6">
|
||||
<x-tooltip message="{{ trans('modules.hosted_on_akaunting') }}" placement="top" width="w-full">
|
||||
<x-link
|
||||
href="{{ $module->action_url }}"
|
||||
@ -13,7 +13,7 @@
|
||||
</x-tooltip>
|
||||
</div>
|
||||
|
||||
<div x-show="price_type == 'yearly'" class="w-full">
|
||||
<div x-show="price_type == 'yearly'" class="w-full flex space-x-6">
|
||||
@if (in_array('onprime', $module->where_to_use) || $module->isPurchase)
|
||||
@if ($installed)
|
||||
@can('delete-modules-item')
|
||||
@ -98,7 +98,7 @@
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div x-show="price_type == 'lifetime'" class="w-full">
|
||||
<div x-show="price_type == 'lifetime'" class="w-full flex space-x-6">
|
||||
@if (empty($module->plan))
|
||||
@if ($installed)
|
||||
@can('delete-modules-item')
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@props(['module'])
|
||||
|
||||
@if ($module->price != '0.0000')
|
||||
<div class="flex gap-2 items-baseline cursor-default">
|
||||
<div class="flex flex-col 2xl:flex-row gap-2 items-baseline cursor-default">
|
||||
{!! $module->price_prefix !!}
|
||||
|
||||
<div x-show="price_type == 'monthly'">
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
<x-form>
|
||||
<div class="lg:absolute lg:ltr:right-0 lg:rtl:left-0 top-4">
|
||||
<div>
|
||||
<div class="relative" x-model="price_type">
|
||||
<div class="w-58 flex items-center bg-gray-200 p-1 ltr:mr-2 rtl:ml-2 rounded-lg">
|
||||
<div class="w-58 flex items-center">
|
||||
<button type="button"
|
||||
x-on:click="price_type = 'monthly'"
|
||||
class="w-18 flex justify-center px-2"
|
||||
x-bind:class="price_type == 'monthly' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
|
||||
class="w-18 flex justify-center text-base px-2 py-1 rounded-tl-lg rounded-bl-lg"
|
||||
x-bind:class="price_type == 'monthly' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
|
||||
>
|
||||
{{ trans('general.monthly') }}
|
||||
</button>
|
||||
|
||||
<button type="button"
|
||||
x-on:click="price_type = 'yearly'"
|
||||
class="w-18 flex justify-center px-2"
|
||||
x-bind:class="price_type == 'yearly' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
|
||||
class="w-18 flex justify-center text-base px-2 py-1 border-r border-l border-gray-300"
|
||||
x-bind:class="price_type == 'yearly' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
|
||||
>
|
||||
{{ trans('general.yearly') }}
|
||||
</button>
|
||||
|
||||
<button type="button"
|
||||
x-on:click="price_type = 'lifetime'"
|
||||
class="w-18 flex justify-center px-2"
|
||||
x-bind:class="price_type == 'lifetime' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
|
||||
class="w-18 flex justify-center text-base px-2 py-1 rounded-tr-lg rounded-br-lg "
|
||||
x-bind:class="price_type == 'lifetime' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
|
||||
>
|
||||
{{ trans('general.lifetime') }}
|
||||
</button>
|
||||
|
||||
@ -14,6 +14,8 @@
|
||||
</x-slot>
|
||||
|
||||
<x-slot name="content">
|
||||
<x-loading.content />
|
||||
|
||||
<div class="flex flex-col space-y-16 py-4 cursor-default">
|
||||
<div class="flex flex-col lg:flex-row w-full lg:space-x-16 rtl:space-x-reverse space-y-0">
|
||||
<div class="w-full lg:w-7/12 flex flex-col space-x-2 banner">
|
||||
@ -54,7 +56,7 @@
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="w-full lg:w-5/12" x-data="{ price_type : 'yearly' }">
|
||||
<div class="relative w-full lg:w-5/12" x-data="{ price_type : 'yearly' }">
|
||||
<div class="flex flex-col space-y-6">
|
||||
<div class="flex flex-col cursor-default">
|
||||
<div class="flex flex-col space-y-4">
|
||||
@ -101,10 +103,10 @@
|
||||
{!! ! empty($module->sort_desc) ? $module->sort_desc : strip_tags($module->description) !!}
|
||||
</div>
|
||||
|
||||
<div class="relative flex items-center space-x-4 justify-between">
|
||||
<div class="flex items-center space-x-4 justify-between">
|
||||
<x-layouts.modules.show.price :module="$module" />
|
||||
|
||||
<div class="flex w-1/2 lg:justify-center">
|
||||
<div class="flex lg:justify-center">
|
||||
@if ($module->price != '0.0000')
|
||||
<x-layouts.modules.show.toggle />
|
||||
@endif
|
||||
@ -114,7 +116,7 @@
|
||||
<x-layouts.modules.show.information :module="$module" />
|
||||
</div>
|
||||
|
||||
<div class="flex justify-around space-x-12 mt-5">
|
||||
<div class="flex justify-around mt-5">
|
||||
<x-layouts.modules.show.buttons :module="$module" :installed="$installed" :enable="$enable" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -70,6 +70,7 @@ lg:overflow-x-hidden
|
||||
xl:grid-cols-4
|
||||
xl:w-8/12
|
||||
xl:pt-6
|
||||
2xl:flex-row
|
||||
ltr:-right-10
|
||||
rtl:-left-10
|
||||
ltr:rounded-tl-md
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user