diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
index d57ef5e7d..9bb287f5c 100644
--- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
@@ -146,7 +146,7 @@ class AddressDataGrid extends DataGrid
             'sortable'   => true,
             'searchable' => false,
             'closure'    => function ($row) {
-                if ($row->default_address == 1) {
+                if ($row->default_address) {
                     return '<span class="badge badge-md badge-success"">' . trans('admin::app.customers.addresses.yes') . '</span>';
                 } else {
                     return trans('admin::app.customers.addresses.dash');
diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
index bccf9960d..335bc82ff 100755
--- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
@@ -89,7 +89,7 @@ class AttributeDataGrid extends DataGrid
             'sortable'   => true,
             'searchable' => false,
             'closure'    => function ($value) {
-                if ($value->is_required == 1) {
+                if ($value->is_required) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
@@ -105,7 +105,7 @@ class AttributeDataGrid extends DataGrid
             'searchable' => false,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->is_unique == 1) {
+                if ($value->is_unique) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
@@ -121,7 +121,7 @@ class AttributeDataGrid extends DataGrid
             'searchable' => false,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->value_per_locale == 1) {
+                if ($value->value_per_locale) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
@@ -137,7 +137,7 @@ class AttributeDataGrid extends DataGrid
             'searchable' => false,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->value_per_channel == 1) {
+                if ($value->value_per_channel) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
diff --git a/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php
index aec8098d3..a86f72a9b 100755
--- a/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CampaignDataGrid.php
@@ -77,7 +77,7 @@ class CampaignDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php
index 88fb10f20..609b737b6 100644
--- a/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php
@@ -86,7 +86,7 @@ class CartRuleCouponsDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->end_other_rules == 1) {
+                if ($value->end_other_rules) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
index f2d01dd70..fe92cae38 100644
--- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php
@@ -88,7 +88,7 @@ class CatalogRuleDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
index 0dc2867d0..51c65f3d1 100755
--- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
@@ -128,7 +128,7 @@ class CategoryDataGrid extends DataGrid
             'searchable' => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php
index 99f20d548..7b3d153e0 100644
--- a/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CategoryProductDataGrid.php
@@ -161,7 +161,7 @@ class CategoryProductDataGrid extends DataGrid
             'searchable' => false,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
index 70db39260..e21d44e18 100755
--- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
@@ -145,13 +145,13 @@ class CustomerDataGrid extends DataGrid
             'closure'    => function ($row) {
                 $html = '';
 
-                if ($row->status == 1) {
+                if ($row->status) {
                     $html .= '<span class="badge badge-md badge-success">' . trans('admin::app.customers.customers.active') . '</span>';
                 } else {
                     $html .= '<span class="badge badge-md badge-danger">' . trans('admin::app.customers.customers.inactive') . '</span>';
                 }
 
-                if ($row->is_suspended == 1) {
+                if ($row->is_suspended) {
                     $html .= '<span class="badge badge-md badge-danger">' . trans('admin::app.customers.customers.suspended') . '</span>';
                 }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
index 34446e92a..1d160f0ae 100755
--- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
@@ -86,7 +86,7 @@ class InventorySourcesDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
index 538a768c1..f6ba22caa 100755
--- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
@@ -59,7 +59,7 @@ class NewsLetterDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status === 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.true');
                 } else {
                     return trans('admin::app.datagrid.false');
diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
index 0facb5f0e..fc23ad046 100644
--- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -204,7 +204,7 @@ class ProductDataGrid extends DataGrid
             'closure'    => function ($value) {
                 $html = '';
 
-                if ($value->status == 1) {
+                if ($value->status) {
                     $html .= '<span class="badge badge-md badge-success">' . trans('admin::app.datagrid.active') . '</span>';
                 } else {
                     $html .= '<span class="badge badge-md badge-danger">' . trans('admin::app.datagrid.inactive') . '</span>';
diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
index 0ce3688db..f42441929 100755
--- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
@@ -81,7 +81,7 @@ class UserDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return trans('admin::app.datagrid.active');
                 } else {
                     return trans('admin::app.datagrid.inactive');
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php
index aad52e0e5..74d1d1dc5 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php
@@ -138,7 +138,7 @@ class AddressController extends Controller
 
         session()->flash('success', trans('admin::app.customers.addresses.success-update'));
 
-        return redirect()->route('admin.customer.addresses.index', ['id' => $address->customer_id]);
+        return redirect()->route('admin.customer.addresses.index', ['id' => $customerAddress->customer_id]);
     }
 
     /**
diff --git a/packages/Webkul/BookingProduct/src/Helpers/Booking.php b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
index 88bda8cee..72f3eccc4 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/Booking.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
@@ -577,10 +577,6 @@ class Booking
      */
     public function isCartItemInactive(\Webkul\Checkout\Contracts\CartItem $item): bool
     {
-        if ($item->product->status === 0) {
-            return true;
-        }
-
-        return false;
+        return ! $item->product->status;
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 6129920e6..c43b5d98f 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -278,7 +278,7 @@ class Cart
 
             if (
                 $item->product
-                && $item->product->status === 0
+                && ! $item->product->status
             ) {
                 throw new Exception(__('shop::app.checkout.cart.item.inactive'));
             }
@@ -330,7 +330,7 @@ class Cart
         if ($cartItem = $cart->items()->find($itemId)) {
             $cartItem->delete();
 
-            if ($cart->items()->get()->count() == 0) {
+            if (! $cart->items()->get()->count()) {
                 $this->removeCart($cart);
             } else {
                 Shipping::collectRates();
@@ -383,7 +383,7 @@ class Cart
             if ($this->isCartItemInactive($item)) {
                 $this->cartItemRepository->delete($item->id);
 
-                if ($cart->items->count() == 0) {
+                if (! $cart->items->count()) {
                     $this->removeCart($cart);
                 }
 
@@ -621,7 +621,7 @@ class Cart
 
         $cartItems = $cart->items()->get();
 
-        if (count($cartItems) === 0) {
+        if (! count($cartItems)) {
             $this->removeCart($cart);
 
             return false;
diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php
index c92c80c44..ec27a6a7e 100755
--- a/packages/Webkul/Checkout/src/Models/Cart.php
+++ b/packages/Webkul/Checkout/src/Models/Cart.php
@@ -178,7 +178,7 @@ class Cart extends Model implements CartContract
     public function hasGuestCheckoutItems(): bool
     {
         foreach ($this->items as $item) {
-            if ($item->product->getAttribute('guest_checkout') === 0) {
+            if (! $item->product->getAttribute('guest_checkout')) {
                 return false;
             }
         }
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 7f1fb44c7..0349ae372 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -917,7 +917,7 @@ class Core
      */
     public function isCountryRequired()
     {
-        return $this->getConfigData('customer.address.requirements.country') == 1;
+        return (bool) $this->getConfigData('customer.address.requirements.country');
     }
 
     /**
@@ -927,7 +927,7 @@ class Core
      */
     public function isStateRequired()
     {
-        return $this->getConfigData('customer.address.requirements.state') == 1;
+        return (bool) $this->getConfigData('customer.address.requirements.state');
     }
 
     /**
@@ -937,7 +937,7 @@ class Core
      */
     public function isPostCodeRequired()
     {
-        return $this->getConfigData('customer.address.requirements.postcode') == 1;
+        return (bool) $this->getConfigData('customer.address.requirements.postcode');
     }
 
     /**
diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
index 22f43aca5..189cf414a 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
@@ -53,7 +53,7 @@ class SessionController extends Controller
             return redirect()->back();
         }
 
-        if (auth()->guard('customer')->user()->status == 0) {
+        if (! auth()->guard('customer')->user()->status) {
             auth()->guard('customer')->logout();
 
             session()->flash('warning', trans('shop::app.customer.login-form.not-activated'));
@@ -61,7 +61,7 @@ class SessionController extends Controller
             return redirect()->back();
         }
 
-        if (auth()->guard('customer')->user()->is_verified == 0) {
+        if (! auth()->guard('customer')->user()->is_verified) {
             session()->flash('info', trans('shop::app.customer.login-form.verify-first'));
 
             Cookie::queue(Cookie::make('enable-resend', 'true', 1));
diff --git a/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php b/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
index 310ef5da6..646c66d4e 100755
--- a/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
+++ b/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
@@ -20,7 +20,7 @@ class RedirectIfNotCustomer
         if (! Auth::guard($guard)->check()) {
             return redirect()->route('customer.session.index');
         } else {
-            if (Auth::guard($guard)->user()->status == 0) {
+            if (! Auth::guard($guard)->user()->status) {
                 Auth::guard($guard)->logout();
 
                 session()->flash('warning', trans('shop::app.customer.login-form.not-activated'));
diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php
index a6ac0349e..62aae6b6a 100644
--- a/packages/Webkul/Product/src/Type/AbstractType.php
+++ b/packages/Webkul/Product/src/Type/AbstractType.php
@@ -1024,14 +1024,14 @@ abstract class AbstractType
      */
     public function isCartItemInactive(\Webkul\Checkout\Contracts\CartItem $item): bool
     {
-        if ($item->product->status === 0) {
+        if (! $item->product->status) {
             return true;
         }
 
         switch ($item->product->type) {
             case 'bundle':
                 foreach ($item->children as $child) {
-                    if ($child->product->status === 0) {
+                    if (! $child->product->status) {
                         return true;
                     }
                 }
@@ -1040,7 +1040,7 @@ abstract class AbstractType
             case 'configurable':
                 if (
                     $item->child
-                    && $item->child->product->status === 0
+                    && ! $item->child->product->status
                 ) {
                     return true;
                 }
diff --git a/packages/Webkul/Rule/src/Helpers/Validator.php b/packages/Webkul/Rule/src/Helpers/Validator.php
index 6553e39c1..4abe24561 100644
--- a/packages/Webkul/Rule/src/Helpers/Validator.php
+++ b/packages/Webkul/Rule/src/Helpers/Validator.php
@@ -40,7 +40,7 @@ class Validator
 
             $totalConditionCount++;
 
-            if ($rule->condition_type == 1) {
+            if ($rule->condition_type) {
                 if (! $this->validateObject($condition, $entity)) {
                     return false;
                 } else {
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
index 7c4bdcf4b..597d62105 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php
@@ -95,7 +95,7 @@ class SubscriptionController extends Controller
         if (isset($subscriber)) {
             if (
                 $subscriber->count() > 0
-                && $subscriber->is_subscribed == 1
+                && $subscriber->is_subscribed
                 && $subscriber->update(['is_subscribed' => 0])
             ) {
                 session()->flash('info', trans('shop::app.subscription.unsubscribed'));
diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php
index 4182da59b..b5063bd15 100755
--- a/packages/Webkul/User/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php
@@ -63,7 +63,7 @@ class SessionController extends Controller
             return redirect()->back();
         }
 
-        if (auth()->guard('admin')->user()->status == 0) {
+        if (! auth()->guard('admin')->user()->status) {
             session()->flash('warning', trans('admin::app.users.users.activate-warning'));
 
             auth()->guard('admin')->logout();
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index cbc8ca810..a9ef378a6 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -243,7 +243,7 @@ class UserController extends Controller
          */
         $data['status'] = isset($data['status']);
 
-        $isStatusChangedToInactive = (int) $data['status'] === 0 && (int) $user->status === 1;
+        $isStatusChangedToInactive = ! $data['status'] && (bool) $user->status;
 
         if (
             $isStatusChangedToInactive
diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
index d3fbef305..4e12bc25c 100644
--- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
+++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
@@ -84,7 +84,7 @@ class ContentDataGrid extends DataGrid
             'searchable' => false,
             'filterable' => true,
             'closure'    => function ($value) {
-                if ($value->status == 1) {
+                if ($value->status) {
                     return 'Active';
                 } else {
                     return 'Inactive';