diff --git a/config/livewire.php b/config/livewire.php
index 31afc042..7802ac27 100644
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -113,7 +113,7 @@ return [
     |
     */
 
-    'inject_assets' => true,
+    'inject_assets' => false,
 
     /*
     |---------------------------------------------------------------------------
diff --git a/resources/views/includes/main-css.blade.php b/resources/views/includes/main-css.blade.php
index b8e6ee96..7754595c 100644
--- a/resources/views/includes/main-css.blade.php
+++ b/resources/views/includes/main-css.blade.php
@@ -10,6 +10,8 @@
 
 @stack('page_css')
 
+@livewireStyles
+
 <style>
     div.dataTables_wrapper div.dataTables_length select {
         width: 65px;
diff --git a/resources/views/includes/main-js.blade.php b/resources/views/includes/main-js.blade.php
index 0f826c57..352b4ee6 100644
--- a/resources/views/includes/main-js.blade.php
+++ b/resources/views/includes/main-js.blade.php
@@ -11,3 +11,5 @@
 @yield('third_party_scripts')
 
 @stack('page_scripts')
+
+@livewireScripts
diff --git a/resources/views/livewire/includes/product-cart-modal.blade.php b/resources/views/livewire/includes/product-cart-modal.blade.php
index 0951e74e..700934be 100644
--- a/resources/views/livewire/includes/product-cart-modal.blade.php
+++ b/resources/views/livewire/includes/product-cart-modal.blade.php
@@ -1,24 +1,24 @@
-<!-- Button trigger Discount Modal -->
-<span wire:click="$emitSelf('discountModalRefresh', '{{ $cart_item->id }}', '{{ $cart_item->rowId }}')" role="button" class="badge badge-warning pointer-event" data-toggle="modal" data-target="#discountModal{{ $cart_item->id }}">
-    <i class="bi bi-pencil-square text-white"></i>
-</span>
-<!-- Discount Modal -->
-<div wire:ignore.self class="modal fade" id="discountModal{{ $cart_item->id }}" tabindex="-1" role="dialog" aria-labelledby="discountModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="discountModalLabel">
-                    {{ $cart_item->name }}
-                    <br>
-                    <span class="badge badge-success">
+<div class="d-inline-block">
+    <!-- Button trigger Discount Modal -->
+    <span wire:click="$dispatch('discountModalRefresh', { product_id: {{ $cart_item->id }}, row_id: '{{ $cart_item->rowId }}' })" role="button" class="badge badge-warning pointer-event" data-toggle="modal" data-target="#discountModal{{ $cart_item->id }}">
+        <i class="bi bi-pencil-square text-white"></i>
+    </span>
+    <!-- Discount Modal -->
+    <div wire:ignore.self class="modal fade" id="discountModal{{ $cart_item->id }}" tabindex="-1" role="dialog" aria-labelledby="discountModalLabel" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="discountModalLabel">
+                        {{ $cart_item->name }}
+                        <br>
+                        <span class="badge badge-success">
                         {{ $cart_item->options->code }}
                     </span>
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <form wire:submit="setProductDiscount('{{ $cart_item->rowId }}', '{{ $cart_item->id }}')" method="POST">
+                    </h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
                 <div class="modal-body">
                     @if (session()->has('discount_message' . $cart_item->id))
                         <div class="alert alert-success alert-dismissible fade show" role="alert">
@@ -49,9 +49,9 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-primary">Save changes</button>
+                    <button wire:click="setProductDiscount('{{ $cart_item->rowId }}', {{ $cart_item->id }})" type="button" class="btn btn-primary">Save changes</button>
                 </div>
-            </form>
+            </div>
         </div>
     </div>
 </div>