From 6a24ed723ec699040b7d787988bab8e6a8e2ff6a Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Sat, 7 Sep 2019 16:29:33 +0530
Subject: [PATCH] Rogue statement found in discount amount initialization

---
 packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php      | 2 +-
 .../Webkul/Discount/src/Actions/Cart/PercentOfProduct.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
index 56887114a..5fb6fb511 100644
--- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
@@ -90,7 +90,7 @@ class CartRuleDataGrid extends DataGrid
 
         $this->addColumn([
             'index' => 'disc_amount',
-            'label' => 'Quantity',
+            'label' => 'Discount Amount',
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
diff --git a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
index ce776ef7c..55e601dcd 100644
--- a/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
+++ b/packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
@@ -66,10 +66,10 @@ class PercentOfProduct extends Action
                 if ($rule->disc_amount > 100) {
                     $discount_amount = 100;
                 } else {
-                    $discount_amount = 100;
+                    $discount_amount = $rule->disc_amount;
                 }
 
-                $discount = round(($itemPrice * $discount_amount) / 100, 4) * $discQuantity;
+                $discount = $itemPrice * ($discount_amount / 100) * $discQuantity;
 
                 $discount = $discount <= $itemPrice * $discQuantity ? $discount : $itemPrice * $discQuantity;