Skip to content

fix: product handling in lead creation #2441

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

Open
bhavesh-018 wants to merge 1 commit into
base: 2.1
Choose a base branch
from
+5 −7
Open

fix: product handling in lead creation #2441

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
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Http/Controllers/Products/ProductController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ public function search(): JsonResource
$products = $this->productRepository
->pushCriteria(app(RequestCriteria::class))
->orderBy('created_at', 'desc')
->take(5)
->get();

return ProductResource::collection($products);
Expand Down
11 changes: 5 additions & 6 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 @@ -12,7 +12,7 @@
<div class="flex flex-col gap-4">
{!! view_render_event('admin.leads.create.products.form_controls.table.before') !!}

<div class="block w-full overflow-x-auto">
<div class="block w-full">
<!-- Table -->
<x-admin::table>
{!! view_render_event('admin.leads.create.products.form_controls.table.head.before') !!}
Expand Down Expand Up @@ -92,10 +92,9 @@ class="flex max-w-max items-center gap-2 text-brandColor"
<x-admin::lookup
::src="src"
::name="`${inputName}[name]`"
::params="params"
:preload="true"
:placeholder="trans('admin::app.leads.common.products.product-name')"
@on-selected="(product) => addProduct(product)"
::value="{ id: product.product_id, name: product.name }"
/>

<x-admin::form.control-group.control
Expand Down Expand Up @@ -138,7 +137,7 @@ class="flex max-w-max items-center gap-2 text-brandColor"
:label="trans('admin::app.leads.common.products.price')"
:placeholder="trans('admin::app.leads.common.products.price')"
@on-change="(event) => product.price = event.value"
::value-label="$admin.formatPrice(product.price)"
::value-label="$admin.formatPrice(Number(product.price) || 0)"
position="center"
/>
</x-admin::form.control-group>
Expand All @@ -154,7 +153,7 @@ class="flex max-w-max items-center gap-2 text-brandColor"
rules="required|decimal:4"
:label="trans('admin::app.leads.common.products.total')"
:placeholder="trans('admin::app.leads.common.products.total')"
::value-label="$admin.formatPrice(product.price * product.quantity)"
::value-label="$admin.formatPrice((Number(product.price) || 0) * (Number(product.quantity) || 0))"
:allowEdit="false"
position="center"
/>
Expand Down Expand Up @@ -266,4 +265,4 @@ class="icon-delete cursor-pointer text-2xl"
}
});
</script>
@endPushOnce
@endPushOnce
Loading