Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inline component issues #1574

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Inline component issues #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f72d6ab
inline component and datagrid date component fixed.
suraj-webkul Sep 5, 2024
22f4e14
fix minor issue.
suraj-webkul Sep 5, 2024
08406a0
Remove arbetary value.
suraj-webkul Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/components/attributes/view/date.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<x-admin::form.control-group.controls.inline.date
::name="'{{ $attribute->code }}'"
::value="'{{ $value }}'"
::value="'{{ $value->format('Y-m-d') }}'"
rules="required"
position="left"
:label="$attribute->name"
Expand Down
8 changes: 5 additions & 3 deletions packages/Webkul/Admin/src/Resources/views/components/datagrid/toolbar/filter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,14 @@ class="cursor-pointer rounded-md border px-3 py-2 text-center text-sm font-mediu
>
</p>

<x-admin::flat-picker.date ::allow-input="false">
<x-admin::flat-picker.date
::allow-input="false"
>
<input
type="date"
:name="`${column.index}[from]`"
value=""
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
:placeholder="column.label"
:ref="`${column.index}[from]`"
@change="addFilter(
Expand All @@ -272,7 +274,7 @@ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-60
type="date"
:name="`${column.index}[to]`"
value=""
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
:placeholder="column.label"
:ref="`${column.index}[from]`"
@change="addFilter(
Expand Down
2 changes: 1 addition & 1 deletion ...ul/Admin/src/Resources/views/components/form/control-group/controls/inline/date.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class="relative flex w-full flex-col ltr:[&>span>i]:right-14 rtl:[&>span>i]:left
type="date"
::id="name"
::name="name"
class="text-normal py-1 ltr:pr-16 rtl:pl-16"
class="text-normal py-1 ltr:pr-20 rtl:pl-20"
::rules="rules"
::label="label"
::placeholder="placeholder"
Expand Down
8 changes: 6 additions & 2 deletions packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
<!-- Drawer Toggler -->
<x-slot:toggle>
<div class="relative flex cursor-pointer items-center rounded-md bg-sky-100 px-4 py-[9px] font-semibold text-sky-600 dark:bg-brandColor dark:text-white">
<span>
@lang('admin::app.leads.index.kanban.toolbar.filters.filter')
@lang('admin::app.leads.index.kanban.toolbar.filters.filter')

<span
class="absolute right-2 top-2 h-1.5 w-1.5 rounded-full bg-sky-600 dark:bg-white"
v-if="hasAnyAppliedColumn()"
>
</span>
</div>
</x-slot>
Expand Down
Loading