From 71df99b014f43fe449d59ff74d047ba99912610c Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Sat, 6 Apr 2024 18:58:28 +0530
Subject: [PATCH 1/2] gwm:merge

---
 app/Views/layout/header.php    |  5 +++++
 app/Views/sales_order_form.php | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 42c1ddc..ece5dfa 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -33,6 +33,11 @@
             background-color: #edd179 !important; /* Set background color to a solid color */
             opacity: 1 !important; /* Set opacity to 1 to remove transparency */
             }
+            .toast-success {
+            color: black !important;
+            background-color: #2aa762 !important; /* Set background color to a solid color */
+            opacity: 1 !important; /* Set opacity to 1 to remove transparency */
+            }
         </style>
     </head>
 
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index d0444fd..38adb3c 100644
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -26,8 +26,8 @@
                     <div class="form-row">
                         <div class="form-group col-md-6">
                             <label for="inputEmail4" class="col-form-label">Client Name<span class="text-danger">*</span></label>
-
-                            <i type="button" class="fe-plus-circle" id="addClientModalButton" style="font-size: 18px;" data-toggle="modal" data-target="#addClientModal" title="Add Client"></i>
+                            <?= isset($sales['client_id']) ? '' : '<i type="button" class="fe-plus-circle" id="addClientModalButton" style="font-size: 18px;" data-toggle="modal" data-target="#addClientModal" title="Add Client"></i>' ?>
+                            
 
                             <select class="form-control cleint-select SelExample" name="client_id"   <?= isset($sales['client_id']) ? '' : 'required' ?>>
 
@@ -494,10 +494,13 @@ $(document).ready(function() {
 
   // AJAX request to save client
   $('#saveClientBtn').click(function() {
+
+
     var clientName = $('#clientName').val();
     var clientMobile = $('#clientMobile').val();
+    if(clientName != '' && clientMobile != ''){
 
-    // Send AJAX request to save the client
+            // Send AJAX request to save the client
     $.ajax({
       url: '<?php echo base_url().'save_client'?>', // URL to your save_client method
       method: 'POST',
@@ -516,15 +519,21 @@ $(document).ready(function() {
 
         } else {
           // Client save operation failed, display error message
-          alert('Failed to save client. Please try again.');
+          toastr.warning("Failed to save client. Please try again"); 
         }
       },
       error: function(xhr, status, error) {
         // AJAX request failed, display error message
         console.error('Error occurred while saving client:', error);
-        alert('Failed to save client. Please try again.');
+        toastr.warning("Failed to save client. Please try again"); 
       }
     });
+
+    }else{
+        toastr.warning("Please Fill Name and Mobile data"); 
+    }
+
+
   });
 });
 

From fb1f32769d1815d5718003f7e3d37f9627b91a98 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Mon, 8 Apr 2024 09:50:16 +0530
Subject: [PATCH 2/2] FEATURE_MAKE_AND_MODEL_MODEL:AADHAVAN

---
 app/Models/BikemakeModel.php   | 11 +++++++++++
 app/Models/BikemodelsModel.php |  9 +++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 app/Models/BikemakeModel.php
 create mode 100644 app/Models/BikemodelsModel.php

diff --git a/app/Models/BikemakeModel.php b/app/Models/BikemakeModel.php
new file mode 100644
index 0000000..8b302c1
--- /dev/null
+++ b/app/Models/BikemakeModel.php
@@ -0,0 +1,11 @@
+<?php 
+namespace App\Models;
+use CodeIgniter\Model;
+class BikemakeModel extends Model
+{
+    protected $table = 'make';
+    protected $primaryKey = 'make_id';
+    protected $allowedFields = ['make_id','make','isactive'];
+
+
+}
\ No newline at end of file
diff --git a/app/Models/BikemodelsModel.php b/app/Models/BikemodelsModel.php
new file mode 100644
index 0000000..12c019e
--- /dev/null
+++ b/app/Models/BikemodelsModel.php
@@ -0,0 +1,9 @@
+<?php 
+namespace App\Models;
+use CodeIgniter\Model;
+class BikemodelsModel extends Model
+{
+    protected $table = 'model';
+    protected $primaryKey = 'model_id';
+    protected $allowedFields = ['model_id','make_id','model_name','isactive'];
+}
\ No newline at end of file