diff --git a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
index 4cca8221a..0405e8302 100644
--- a/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
+++ b/packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
@@ -8,6 +8,8 @@ class FixedAmount extends Action
 {
     public function __construct($rule)
     {
+        parent::__construct();
+
         /**
          * Setting the rule getting applied
          */
diff --git a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
index 9f29ad329..d741c42b0 100644
--- a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
+++ b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
@@ -8,6 +8,8 @@ class PercentOfProduct extends Action
 {
     public function __construct($rule)
     {
+        parent::__construct();
+
         /**
          * Setting the rule getting applied
          */
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
index 1ba84ca86..7fbc39cd4 100644
--- a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
+++ b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToFixed.php
@@ -15,7 +15,7 @@ class WholeCartToFixed
      */
     public function calculate($rule)
     {
-        $actualInstance = new FixedAmount();
+        $actualInstance = new FixedAmount($rule);
 
         $result = $actualInstance->calculate($rule);
 
diff --git a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
index ec54f2886..ffd334370 100644
--- a/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
+++ b/packages/Webkul/Discount/src/Actions/Cart/WholeCartToPercent.php
@@ -15,7 +15,7 @@ class WholeCartToPercent
      */
     public function calculate($rule)
     {
-        $actualInstance = new PercentOfProduct();
+        $actualInstance = new PercentOfProduct($rule);
 
         $result = $actualInstance->calculate($rule);
 
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/partials/default-header.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/partials/default-header.blade.php
new file mode 100644
index 000000000..6f6b34c17
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/partials/default-header.blade.php
@@ -0,0 +1,33 @@
+<thead v-if="massActionsToggle == false">
+    <tr style="height: 65px;">
+        @if (count($results['records']) && $results['enableMassActions'])
+            <th class="grid_head" id="mastercheckbox" style="width: 50px;">
+                <span class="checkbox">
+                    <input type="checkbox" v-model="allSelected" v-on:change="selectAll">
+
+                    <label class="checkbox-view" for="checkbox"></label>
+                </span>
+            </th>
+        @endif
+
+        @foreach($results['columns'] as $key => $column)
+            <th class="grid_head"
+                @if(isset($column['width']))
+                    style="width: {{ $column['width'] }}"
+                @endif
+
+                @if(isset($column['sortable']) && $column['sortable'])
+                    v-on:click="sortCollection('{{ $column['index'] }}')"
+                @endif
+            >
+                {{ $column['label'] }}
+            </th>
+        @endforeach
+
+        @if ($results['enableActions'])
+            <th>
+                {{ __('ui::app.datagrid.actions') }}
+            </th>
+        @endif
+    </tr>
+</thead>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/partials/mass-action-header.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/partials/mass-action-header.blade.php
new file mode 100644
index 000000000..26f8e9cc6
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/partials/mass-action-header.blade.php
@@ -0,0 +1,34 @@
+<thead v-if="massActionsToggle">
+    @if (isset($results['massactions']))
+        <tr class="mass-action" v-if="massActionsToggle" style="height: 65px;">
+            <th colspan="100%">
+                <div class="mass-action-wrapper" style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start;">
+
+                    <span class="massaction-remove" v-on:click="removeMassActions" style="margin-right: 10px; margin-top: 3px;">
+                        <span class="icon checkbox-dash-icon"></span>
+                    </span>
+
+                    <form method="POST" id="mass-action-form" style="display: inline-flex;" action="" onsubmit="return confirm('{{ __('ui::app.datagrid.click_on_action') }}')">
+                        @csrf()
+
+                        <input type="hidden" id="indexes" name="indexes" v-model="dataIds">
+
+                        <div class="control-group">
+                            <select class="control" v-model="massActionType" @change="changeMassActionTarget" name="massaction-type" required>
+                                <option v-for="(massAction, index) in massActions" :key="index" :value="massAction.type">@{{ massAction.label }}</option>
+                            </select>
+                        </div>
+
+                        <div class="control-group" style="margin-left: 10px;" v-if="massActionType == 'update'">
+                            <select class="control" v-model="massActionUpdateValue" name="update-options" required>
+                                <option v-for="(massActionValue, id) in massActionValues" :value="massActionValue">@{{ id }}</option>
+                            </select>
+                        </div>
+
+                        <input type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px;">
+                    </form>
+                </div>
+            </th>
+        </tr>
+    @endif
+</thead>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index 1b03e194c..6ebd93a0e 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -146,74 +146,9 @@
                 </div>
 
                 <table class="table">
-                    <thead v-if="massActionsToggle">
-                        @if (isset($results['massactions']))
-                            <tr class="mass-action" v-if="massActionsToggle" style="height: 65px;">
-                                <th colspan="100%">
-                                    <div class="mass-action-wrapper" style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start;">
+                    @include('ui::datagrid.partials.mass-action-header')
 
-                                        <span class="massaction-remove" v-on:click="removeMassActions" style="margin-right: 10px; margin-top: 3px;">
-                                            <span class="icon checkbox-dash-icon"></span>
-                                        </span>
-
-                                        <form method="POST" id="mass-action-form" style="display: inline-flex;" action="" onsubmit="return confirm('{{ __('ui::app.datagrid.click_on_action') }}')">
-                                            @csrf()
-
-                                            <input type="hidden" id="indexes" name="indexes" v-model="dataIds">
-
-                                            <div class="control-group">
-                                                <select class="control" v-model="massActionType" @change="changeMassActionTarget" name="massaction-type" required>
-                                                    <option v-for="(massAction, index) in massActions" :key="index" :value="massAction.type">@{{ massAction.label }}</option>
-                                                </select>
-                                            </div>
-
-                                            <div class="control-group" style="margin-left: 10px;" v-if="massActionType == 'update'">
-                                                <select class="control" v-model="massActionUpdateValue" name="update-options" required>
-                                                    <option v-for="(massActionValue, id) in massActionValues" :value="massActionValue">@{{ id }}</option>
-                                                </select>
-                                            </div>
-
-                                            <input type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px;">
-                                        </form>
-                                    </div>
-                                </th>
-                            </tr>
-                        @endif
-                    </thead>
-
-                    <thead v-if="massActionsToggle == false">
-                        <tr style="height: 65px;">
-                            @if (count($results['records']) && $results['enableMassActions'])
-                                <th class="grid_head" id="mastercheckbox" style="width: 50px;">
-                                    <span class="checkbox">
-                                        <input type="checkbox" v-model="allSelected" v-on:change="selectAll">
-
-                                        <label class="checkbox-view" for="checkbox"></label>
-                                    </span>
-                                </th>
-                            @endif
-
-                            @foreach($results['columns'] as $key => $column)
-                                <th class="grid_head"
-                                    @if(isset($column['width']))
-                                        style="width: {{ $column['width'] }}"
-                                    @endif
-
-                                    @if(isset($column['sortable']) && $column['sortable'])
-                                        v-on:click="sortCollection('{{ $column['index'] }}')"
-                                    @endif
-                                >
-                                    {{ $column['label'] }}
-                                </th>
-                            @endforeach
-
-                            @if ($results['enableActions'])
-                                <th>
-                                    {{ __('ui::app.datagrid.actions') }}
-                                </th>
-                            @endif
-                        </tr>
-                    </thead>
+                    @include('ui::datagrid.partials.default-header')
 
                     @include('ui::datagrid.body', ['records' => $results['records'], 'actions' => $results['actions'], 'index' => $results['index'], 'columns' => $results['columns'],'enableMassActions' => $results['enableMassActions'], 'enableActions' => $results['enableActions'], 'norecords' => $results['norecords']])
                 </table>
@@ -725,6 +660,12 @@
                         }
                     },
 
+                    captureColumn: function(id) {
+                        element = document.getElementById(id);
+
+                        console.log(element.innerHTML);
+                    },
+
                     removeMassActions: function() {
                         this.dataIds = [];