diff --git a/app/Http/Controllers/Purchase/SupplierController.php b/app/Http/Controllers/Purchase/SupplierController.php
index f807acf..50c579e 100644
--- a/app/Http/Controllers/Purchase/SupplierController.php
+++ b/app/Http/Controllers/Purchase/SupplierController.php
@@ -40,14 +40,15 @@ class SupplierController extends Controller
     public function store(Request $request)
     {
         $request->validate([
-            'name'        => 'required|string|max:255',
-            'credit_days' => 'nullable|integer|min:0',
+            'name'             => 'required|string|max:255',
+            'credit_days'      => 'nullable|integer|min:0',
+            'whatsapp_number'  => ['nullable', 'string', 'max:20'],
         ]);
 
         Supplier::create(array_merge(
             $request->only([
                 'supplier_code', 'name', 'category', 'contact_person',
-                'email', 'secondary_email', 'phone', 'phone2', 'whatsapp',
+                'email', 'secondary_email', 'phone', 'phone2', 'whatsapp', 'whatsapp_number',
                 'address', 'website', 'tax_number', 'credit_terms', 'credit_days', 'remarks',
             ]),
             ['is_active' => (bool) $request->input('is_active', 1)]
@@ -69,15 +70,16 @@ class SupplierController extends Controller
     public function update(Request $request, Supplier $supplier)
     {
         $request->validate([
-            'name'        => 'required|string|max:255',
-            'credit_days' => 'nullable|integer|min:0',
-            'is_active'   => 'nullable',
+            'name'             => 'required|string|max:255',
+            'credit_days'      => 'nullable|integer|min:0',
+            'is_active'        => 'nullable',
+            'whatsapp_number'  => ['nullable', 'string', 'max:20'],
         ]);
 
         $supplier->update(array_merge(
             $request->only([
                 'supplier_code', 'name', 'category', 'contact_person',
-                'email', 'secondary_email', 'phone', 'phone2', 'whatsapp',
+                'email', 'secondary_email', 'phone', 'phone2', 'whatsapp', 'whatsapp_number',
                 'address', 'website', 'tax_number', 'credit_terms', 'credit_days', 'remarks',
             ]),
             ['is_active' => (bool) $request->input('is_active', 0)]
diff --git a/app/Http/Controllers/Sales/CustomerController.php b/app/Http/Controllers/Sales/CustomerController.php
index d087e43..319b52b 100644
--- a/app/Http/Controllers/Sales/CustomerController.php
+++ b/app/Http/Controllers/Sales/CustomerController.php
@@ -22,14 +22,21 @@ class CustomerController extends Controller
 
     public function store(Request $request)
     {
-        $request->validate([
-            'name'    => 'required|string|max:255',
-            'email'   => 'nullable|email|max:255',
-            'phone'   => 'nullable|string|max:50',
-            'address' => 'nullable|string',
+        $validated = $request->validate([
+            'name'             => 'required|string|max:255',
+            'email'            => 'nullable|email|max:255',
+            'phone'            => 'nullable|string|max:50',
+            'whatsapp_number'  => 'nullable|string|max:20',
+            'address'          => 'nullable|string',
+            'contact_person'   => 'nullable|string|max:255',
+            'tax_number'       => 'nullable|string|max:50',
+            'credit_limit'     => 'nullable|numeric|min:0',
+            'is_active'        => 'nullable|boolean',
         ]);
 
-        Customer::create($request->all());
+        $validated['is_active'] = (bool) $request->input('is_active', 1);
+
+        Customer::create($validated);
 
         return redirect()->route('sales.customers.index')->with('success', 'Customer created successfully.');
     }
@@ -46,14 +53,21 @@ class CustomerController extends Controller
 
     public function update(Request $request, Customer $customer)
     {
-        $request->validate([
-            'name'    => 'required|string|max:255',
-            'email'   => 'nullable|email|max:255',
-            'phone'   => 'nullable|string|max:50',
-            'address' => 'nullable|string',
+        $validated = $request->validate([
+            'name'             => 'required|string|max:255',
+            'email'            => 'nullable|email|max:255',
+            'phone'            => 'nullable|string|max:50',
+            'whatsapp_number'  => 'nullable|string|max:20',
+            'address'          => 'nullable|string',
+            'contact_person'   => 'nullable|string|max:255',
+            'tax_number'       => 'nullable|string|max:50',
+            'credit_limit'     => 'nullable|numeric|min:0',
+            'is_active'        => 'nullable|boolean',
         ]);
 
-        $customer->update($request->all());
+        $validated['is_active'] = (bool) $request->input('is_active', 0);
+
+        $customer->update($validated);
 
         return redirect()->route('sales.customers.index')->with('success', 'Customer updated successfully.');
     }
diff --git a/resources/views/purchase/suppliers/create.blade.php b/resources/views/purchase/suppliers/create.blade.php
index 3cdeebc..39be4fc 100644
--- a/resources/views/purchase/suppliers/create.blade.php
+++ b/resources/views/purchase/suppliers/create.blade.php
@@ -43,6 +43,15 @@
                 <input type="text" name="phone" value="{{ old('phone') }}" class="form-input">
             </div>
 
+            <div>
+                <label class="form-label">WhatsApp Number</label>
+                <input type="text" name="whatsapp_number"
+                    value="{{ old('whatsapp_number', '') }}"
+                    placeholder="+971501234567"
+                    class="form-input">
+                <p style="font-size:12px;color:#6b7280;margin-top:4px;">International format. Used for WhatsApp notifications.</p>
+            </div>
+
             <div>
                 <label class="form-label">Tax Number</label>
                 <input type="text" name="tax_number" value="{{ old('tax_number') }}" class="form-input">
diff --git a/resources/views/purchase/suppliers/edit.blade.php b/resources/views/purchase/suppliers/edit.blade.php
index 2534c27..9098347 100644
--- a/resources/views/purchase/suppliers/edit.blade.php
+++ b/resources/views/purchase/suppliers/edit.blade.php
@@ -44,6 +44,15 @@
                 <input type="text" name="phone" value="{{ old('phone', $supplier->phone) }}" class="form-input">
             </div>
 
+            <div>
+                <label class="form-label">WhatsApp Number</label>
+                <input type="text" name="whatsapp_number"
+                    value="{{ old('whatsapp_number', $supplier->whatsapp_number ?? '') }}"
+                    placeholder="+971501234567"
+                    class="form-input">
+                <p style="font-size:12px;color:#6b7280;margin-top:4px;">International format. Used for WhatsApp notifications.</p>
+            </div>
+
             <div>
                 <label class="form-label">Tax Number</label>
                 <input type="text" name="tax_number" value="{{ old('tax_number', $supplier->tax_number) }}" class="form-input">
diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php
index 08669ff..1aabc1e 100644
--- a/resources/views/sales/customers/create.blade.php
+++ b/resources/views/sales/customers/create.blade.php
@@ -43,6 +43,15 @@
                 <input type="text" name="phone" value="{{ old('phone') }}" class="form-input">
             </div>
 
+            <div>
+                <label class="form-label">WhatsApp Number</label>
+                <input type="text" name="whatsapp_number"
+                    value="{{ old('whatsapp_number', '') }}"
+                    placeholder="+971501234567"
+                    class="form-input">
+                <p style="font-size:12px;color:#6b7280;margin-top:4px;">International format. Used for WhatsApp notifications.</p>
+            </div>
+
             <div>
                 <label class="form-label">Tax Number</label>
                 <input type="text" name="tax_number" value="{{ old('tax_number') }}" class="form-input">
diff --git a/resources/views/sales/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php
index d40ad42..e1c4230 100644
--- a/resources/views/sales/customers/edit.blade.php
+++ b/resources/views/sales/customers/edit.blade.php
@@ -44,6 +44,15 @@
                 <input type="text" name="phone" value="{{ old('phone', $customer->phone) }}" class="form-input">
             </div>
 
+            <div>
+                <label class="form-label">WhatsApp Number</label>
+                <input type="text" name="whatsapp_number"
+                    value="{{ old('whatsapp_number', $customer->whatsapp_number ?? '') }}"
+                    placeholder="+971501234567"
+                    class="form-input">
+                <p style="font-size:12px;color:#6b7280;margin-top:4px;">International format. Used for WhatsApp notifications.</p>
+            </div>
+
             <div>
                 <label class="form-label">Tax Number</label>
                 <input type="text" name="tax_number" value="{{ old('tax_number', $customer->tax_number) }}" class="form-input">