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

ui issues. #1530

Merged
merged 2 commits into from
Aug 30, 2024
Merged

ui issues. #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0d990
ui issues.
suraj-webkul Aug 29, 2024
008d022
minor changes.
suraj-webkul Aug 29, 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
6 changes: 3 additions & 3 deletions .../Admin/src/Resources/views/components/form/control-group/controls/inline/select.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<!-- Non-editing view -->
<div
v-if="! isEditing"
class="flex h-[34px] items-center border border-transparent transition-all rounded"
class="flex h-[34px] items-center rounded border border-transparent transition-all"
:class="allowEdit ? 'hover:bg-gray-100 dark:hover:bg-gray-800' : ''"
>
<x-admin::form.control-group.control
Expand All @@ -32,7 +32,7 @@ class="flex h-[34px] items-center border border-transparent transition-all round
class="group relative !w-full pl-2.5"
:style="{ 'text-align': position }"
>
<span class="truncate rounded cursor-pointer">
<span class="cursor-pointer truncate rounded">
@{{ valueLabel ? valueLabel : selectedValue?.name.length > 20 ? selectedValue?.name.substring(0, 20) + '...' : selectedValue?.name }}
</span>

Expand All @@ -45,7 +45,7 @@ class="absolute bottom-0 mb-5 hidden flex-col group-hover:flex"
@{{ selectedValue?.name }}
</span>

<div class="-mt-2 h-3 w-3 ml-4 rotate-45 bg-black dark:bg-white"></div>
<div class="-mt-2 ml-4 h-3 w-3 rotate-45 bg-black dark:bg-white"></div>
</div>
</div>

Expand Down
15 changes: 10 additions & 5 deletions packages/Webkul/Admin/src/Resources/views/components/lookup/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@ class="relative inline-block w-full"
@click="toggle"
>
<!-- Input Container -->
<div class="relative flex items-center justify-between rounded border border-gray-200 p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:text-gray-300">
<div class="relative flex cursor-pointer items-center justify-between rounded border border-gray-200 p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:text-gray-300">
<!-- Selected Item or Placeholder Text -->
@{{ selectedItem?.name !== "" ? selectedItem?.name : "@lang('admin::app.components.lookup.click-to-add')" }}
<span
class="overflow-hidden text-ellipsis"
:title="selectedItem?.name"
>
@{{ selectedItem?.name !== "" ? selectedItem?.name : "@lang('admin::app.components.lookup.click-to-add')" }}
</span>

<!-- Icons Container -->
<div class="flex gap-2 items-center">
<div class="flex items-center gap-2">
<!-- Close Icon -->
<i
v-if="(selectedItem?.name) && ! isSearching"
class="icon-cross-large cursor-pointer text-2xl text-gray-600"
class="icon-cross-large cursor-pointer text-xl text-gray-600"
@click="remove"
></i>

Expand Down Expand Up @@ -94,7 +99,7 @@ class="cursor-pointer px-4 py-2 text-gray-800 transition-colors hover:bg-blue-10
<li
v-if="searchTerm.length > 2 && canAddNew"
@click="selectItem({ id: '', name: searchTerm })"
class="px-4 py-2 cursor-pointer border-t border-gray-800 text-gray-500 hover:bg-brandColor hover:text-white dark:border-gray-300 dark:text-gray-400 dark:hover:bg-brandColor dark:hover:text-white"
class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-brandColor hover:text-white dark:border-gray-300 dark:text-gray-400 dark:hover:bg-brandColor dark:hover:text-white"
>
+ @lang('admin::app.components.lookup.add-as-new')
</li>
Expand Down
12 changes: 7 additions & 5 deletions packages/Webkul/Admin/src/Resources/views/leads/common/products.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
@lang('admin::app.leads.common.products.product-name')
</x-admin::table.th>

<x-admin::table.th class="text-right">
<x-admin::table.th class="text-center">
@lang('admin::app.leads.common.products.quantity')
</x-admin::table.th>

<x-admin::table.th class="text-right">
<x-admin::table.th class="text-center">
@lang('admin::app.leads.common.products.price')
</x-admin::table.th>

<x-admin::table.th class="text-right">
<x-admin::table.th class="text-center">
@lang('admin::app.leads.common.products.amount')
</x-admin::table.th>

Expand Down Expand Up @@ -97,7 +97,7 @@ class="text-md cursor-pointer font-semibold text-brandColor hover:underline dark
:label="trans('admin::app.leads.common.products.quantity')"
:placeholder="trans('admin::app.leads.common.products.quantity')"
@on-change="(event) => product.quantity = event.value"
position="left"
position="center"
/>
</x-admin::form.control-group>
</x-admin::table.td>
Expand All @@ -113,7 +113,8 @@ class="text-md cursor-pointer font-semibold text-brandColor hover:underline dark
:label="trans('admin::app.leads.common.products.price')"
:placeholder="trans('admin::app.leads.common.products.price')"
@on-change="(event) => product.price = event.value"
position="left"
::value-label="$admin.formatPrice(product.price)"
position="center"
/>
</x-admin::form.control-group>
</x-admin::table.td>
Expand All @@ -129,6 +130,7 @@ class="text-md cursor-pointer font-semibold text-brandColor hover:underline dark
:label="trans('admin::app.leads.common.products.total')"
:placeholder="trans('admin::app.leads.common.products.total')"
::allowEdit="false"
position="center"
/>
</x-admin::form.control-group>
</x-admin::table.td>
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/views/leads/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<x-admin::layouts>
<!-- Page Title -->
<x-slot:title>
@lang('admin::app.leads.edit.title')
</x-slot>
Expand Down
15 changes: 9 additions & 6 deletions packages/Webkul/Admin/src/Resources/views/leads/view/products.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
@lang('admin::app.leads.view.products.product-name')
</x-admin::table.th>

<x-admin::table.th class="ltr:text-right rtl:text-left">
<x-admin::table.th class="ltr:text-left rtl:text-right">
@lang('admin::app.leads.view.products.quantity')
</x-admin::table.th>

<x-admin::table.th class="ltr:text-right rtl:text-left">
<x-admin::table.th class="ltr:text-left rtl:text-right">
@lang('admin::app.leads.view.products.price')
</x-admin::table.th>

<x-admin::table.th class="ltr:text-right rtl:text-left">
<x-admin::table.th class="ltr:text-left rtl:text-right">
@lang('admin::app.leads.view.products.amount')
</x-admin::table.th>

Expand Down Expand Up @@ -89,7 +89,7 @@ class="secondary-button"
type="text/x-template"
id="v-product-item-template"
>
<x-admin::table.tbody.tr class="align-top border-b border-gray-200 dark:border-gray-800">
<x-admin::table.tbody.tr class="border-b border-gray-200 align-top dark:border-gray-800">
<!-- Product Name -->
<x-admin::table.td class="!px-4">
<v-form v-slot="{ errors }">
Expand Down Expand Up @@ -154,6 +154,7 @@ class="secondary-button"
::url="url(product)"
::params="{product_id: product.product_id}"
position="left"
::value-label="$admin.formatPrice(product.price)"
::errors="errors"
/>
</x-admin::form.control-group>
Expand All @@ -173,17 +174,19 @@ class="secondary-button"
:placeholder="trans('admin::app.leads.view.products.total')"
::allowEdit="false"
::url="url(product)"
position="left"
::value-label="$admin.formatPrice(product.price * product.quantity)"
::errors="errors"
/>
</x-admin::form.control-group>
</v-form>
</x-admin::table.td>

<!-- Action -->
<x-admin::table.td class="!px-4 ltr:text-right rtl:text-left">
<x-admin::table.td class="ltr:text-right rtl:text-left">
<template v-if="product.is_new">
<x-admin::form.control-group class="!mb-0">
<div class="flex items-center justify-end gap-4">
<div class="flex items-center justify-center gap-4">
<i
@click="attachProduct(product)"
class="icon-enter cursor-pointer text-2xl text-black"
Expand Down
Loading