From d54683412656a130c769ed7ca464a99e0e474573 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Sat, 2 Mar 2024 17:08:57 +0530
Subject: [PATCH] GWM

---
 app/Controllers/Invoice.php          | 5 +++--
 app/Views/customer_form.php          | 7 ++++---
 app/Views/customer_group_form.php    | 6 +++++-
 app/Views/invoice_form.php           | 4 ++--
 app/Views/template_creation_form.php | 2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index f4c9483..3ad1d6a 100644
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -123,7 +123,8 @@ class Invoice extends BaseController
         $model = new InvoiceModel();
         $bmodel = new BooksModel();
         $setting_model = new SettingsModel();
-        $where = ['business_id' => (int)get_business_id()];
+        $where = ['business_id' => (int)get_business_id() ];
+        $cus_where = ['business_id' => (int)get_business_id() , 'isactive' => 1];
         $rec_where = ['business_id' => (int)get_business_id(), 'YEAR(created_on)' => date('Y')];
         $receipt = $model->getData('receipt', $rec_where);
 
@@ -137,7 +138,7 @@ class Invoice extends BaseController
         $data['count_receipt_no'] = $settingData[0]['prefix_format'].'/'.$pad.''.$count_receipt_no;
         // Get customer names for the dropdown, events details, and books details
         $data['currency'] =  $setting_model->select('currency')->where($where)->findAll();
-        $data['customers'] = $model->getData('donor', $where);
+        $data['customers'] = $model->getData('donor', $cus_where);
         // $data['causes']    = $model->getData('causes', $where);
         $data['causes']  = $bmodel->select('*')->where('business_id', (int)get_business_id() )->where('isactive',1)->get()->getResult();
         $data['campaign']    = $model->getData('campaign', $where);
diff --git a/app/Views/customer_form.php b/app/Views/customer_form.php
index 88a9ec4..9db1477 100644
--- a/app/Views/customer_form.php
+++ b/app/Views/customer_form.php
@@ -65,15 +65,16 @@
                                 <div class="form-group col-md-4">
                                     <label for="cmobile" class="col-form-label"><span class="contactPerson">Contact Person </span>Mobile<span class="text-danger"> *</span></label>
                                     <div class="input-group mb-2">
-                                        <div class="input-group-prepend">
+                                        <!-- <div class="input-group-prepend"> -->
                                             <div class="input-group-text">+91</div>
-                                        </div>
-<input name="mobile"class="form-control" pattern="[0-9]{10}" value="<?= isset($customer['mobile_no']) ? $customer['mobile_no'] : '' ?>" type="tel" data-parsley-type="number" data-parsley-length="[10,10]" class="form-control" placeholder="Enter Contact Mobile"  id="mobile" maxlength="10" onkeypress = "return onlyNumbers(event)" required>
+                                        <!-- </div> -->
+                                        <input name="mobile"class="form-control" pattern="[0-9]{10}" value="<?= isset($customer['mobile_no']) ? $customer['mobile_no'] : '' ?>" type="tel" data-parsley-type="number" data-parsley-length="[10,10]" class="form-control" placeholder="Enter Contact Mobile"  id="mobile" maxlength="10" onkeypress = "return onlyNumbers(event)" style="width: 85% !important;" required>
 
                          
                                         <div class="invalid-feedback"> Please provide. </div>
                                     </div>
                                 </div>
+
                             </div>
 
                             <div class="form-row">
diff --git a/app/Views/customer_group_form.php b/app/Views/customer_group_form.php
index 3525899..fb084dc 100644
--- a/app/Views/customer_group_form.php
+++ b/app/Views/customer_group_form.php
@@ -155,7 +155,8 @@
 
                                                     </div>
                                                     <div class="modal-footer">
-                                                        <button id="save" class="btn btn-success waves-effect waves-light mr-1" type="submit" id="submitBtn"> Submit </button>
+                                                        <button id="original_save" type="submit" id="submitBtn" hidden> Submit </button>
+                                                        <button id="save" class="btn btn-success waves-effect waves-light mr-1" > Submit </button>
                                                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                                                         <!-- <button type="button" class="btn btn-primary">Save changes</button> -->
                                                     </div>
@@ -491,7 +492,10 @@ document.getElementById("addItem").addEventListener("click", function() {
 </script>
 <script>
         $("#save").on("click", function () {
+        //    alert('testing');
             $("#string_flag").val("save");
+             $("#save").prop("disabled", true);
+             $("#original_save").click();
         });
 
 function FieldChange(selectElement, rowCounter) {
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 5142eee..2db288f 100644
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -44,7 +44,7 @@
 
                             <div class="form-group col-md-6">
                                 <label for="event" class="col-form-label">Causes</label>
-                                <select class="form-control" id="event" name="causes_id" data-toggle="select2">
+                                <select class="form-control" id="event" name="causes_id" data-toggle="select2" required>
                                     <option value="">Select the Causes</option>
                                     <?php foreach ($causes as  $causesData) : if(date("Y-m-d") >= $causesData->from_date && date("Y-m-d") <= $causesData->to_date ||  $causesData->from_date == '' && $causesData->to_date == ''){?>
                                         <option value="<?= $causesData->causes_id ?>" <?php if (isset($receipt_details['causes_id']) && ($receipt_details['causes_id'] === $causesData->causes_id)) echo "selected"; ?> ><?= $causesData->name ?> <?= ($causesData->from_date != '') ?  '('. date("d-m-Y", strtotime($causesData->from_date)) .' - '. date("d-m-Y", strtotime($causesData->to_date)).' )' : '';  ?> </option>
@@ -58,7 +58,7 @@
 
                             <div class="form-group col-md-6">
                                 <label for="event" class="col-form-label">Source Of Receipt</label>
-                                <select class="form-control" id="campaign" name="campaign_id" data-toggle="select2">
+                                <select class="form-control" id="campaign" name="campaign_id" data-toggle="select2" >
                                     <option value="">Select the Campaign</option>
                                     <?php foreach ($campaign as  $cam) : if(date("Y-m-d") >= $cam->start_date && date("Y-m-d") <= $cam->end_date ||  $cam->start_date == '' && $cam->end_date == ''){?>
                                         <option value="<?= $cam->campaign_id ?>" <?php if (isset($receipt_details['campaign_id']) && ($receipt_details['campaign_id'] === $cam->campaign_id)) echo "selected"; ?>><?= $cam->name ?> ( <?= date("d-m-Y", strtotime($cam->start_date)) ?> - <?= date("d-m-Y", strtotime($cam->end_date)) ?> )</option>
diff --git a/app/Views/template_creation_form.php b/app/Views/template_creation_form.php
index ba2c92e..723fc5e 100644
--- a/app/Views/template_creation_form.php
+++ b/app/Views/template_creation_form.php
@@ -26,7 +26,7 @@
                             </div>
                             
                             <div class="form-group col-md-6" id="emailSubject" style="display: block;">
-                                    <label for="templatename" class="col-form-label">subject</label>
+                                    <label for="templatename" class="col-form-label">Subject</label>
                                     <input type="text" class="form-control" id="subject" name="subject" value="<?= isset($template_details['subject']) ? $template_details['subject'] : '' ?>" placeholder="Subject" />
                             </div>