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

🛠️ [v2.0] : Fixed Issue #1797 #1897

Open
wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open

🛠️ [v2.0] : Fixed Issue #1797 #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/address.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ class="group relative !w-full pl-2.5"
:style="{ 'text-align': position }"
>
<span class="cursor-pointer truncate rounded">
@{{ valueLabel ? valueLabel : `${inputValue?.address} ${inputValue?.postcode} ${inputValue?.city} ${inputValue?.state} ${inputValue?.country}`.length > 20 ? `${inputValue?.address} ${inputValue?.postcode} ${inputValue?.city} ${inputValue?.state} ${inputValue?.country}`.substring(0, 20) + '...' : `${inputValue?.address} ${inputValue?.postcode} ${inputValue?.city} ${inputValue?.state} ${inputValue?.country}` }}
@{{ valueLabel ? valueLabel : `${inputValue?.address} ${inputValue?.city} ${inputValue?.state} ${inputValue?.postcode} ${inputValue?.country}`.length > 20 ? `${inputValue?.address} ${inputValue?.city} ${inputValue?.state} ${inputValue?.postcode} ${inputValue?.country}`.substring(0, 20) + '...' : `${inputValue?.address} ${inputValue?.city} ${inputValue?.state} ${inputValue?.postcode} ${inputValue?.country}` }}
</span>

<div class="absolute bottom-0 mb-5 hidden flex-col group-hover:flex">
<span class="whitespace-no-wrap relative z-10 rounded-md bg-black px-4 py-2 text-xs leading-none text-white shadow-lg dark:bg-white dark:text-gray-900">
@{{ inputValue?.address }}<br>
@{{ `${inputValue?.postcode} ${inputValue?.city}` }}<br>
@{{ `${inputValue?.state}, ${inputValue?.country}` }}<br>
@{{ `${inputValue?.city}, ${inputValue?.state}, ${inputValue?.postcode}` }}<br>
@{{ `${inputValue?.country}` }}<br>
</span>

<div class="-mt-2 ml-4 h-3 w-3 rotate-45 bg-black dark:bg-white"></div>
Expand Down
6 changes: 1 addition & 5 deletions packages/Webkul/Admin/src/Resources/views/contacts/persons/view/organization.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ class="icon-edit rounded-md p-1 text-2xl transition-all hover:bg-gray-100 dark:h
</span>

<span>
{{ $person->organization->address['postcode'] . ' ' . $person->organization->address['city'] }}
</span>

<span>
{{ core()->state_name($person->organization->address['state']) }}
{{ $person->organization->address['city'] . ' ' . core()->state_name($person->organization->address['state']) . ' ' . $person->organization->address['postcode'] }}
</span>

<span>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/settings/warehouses/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="[&>div:last-child]:border-b-0 sticky top-[73px] flex min-w-[394px] max-w-[394px] flex-col self-start rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
<!-- Product Information -->
<div class="flex w-full flex-col gap-2 border-b border-gray-200 p-4 dark:border-gray-800">
<!-- Breadcrums -->
<!-- Breadcrumb -->
<div class="flex items-center justify-between">
<x-admin::breadcrumbs
name="settings.warehouses.view"
Expand Down
Loading