From 1b89482e5b78549e468b9f387ae1a26080b66843 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 17 Feb 2024 10:32:29 +0530 Subject: [PATCH] ss --- app/Controllers/Books.php | 1 + app/Controllers/Business.php | 137 +++++- app/Controllers/Invoice.php | 140 +++++- app/Models/BooksModel.php | 2 +- app/Models/NotificationModel.php | 6 +- app/Views/audit_history.php | 10 +- app/Views/book_form.php | 19 +- app/Views/book_list.php | 11 +- app/Views/business_form.php | 193 +++++++- app/Views/customer_form.php | 59 ++- app/Views/invoice_form.php | 217 +++++---- app/Views/invoice_list.php | 356 +++++++++++--- app/Views/invoice_pdf_template.php | 426 ++++++---------- app/Views/invoice_pdf_template_o.php | 304 ++++++++++++ app/Views/invoice_pdf_template_old.php | 92 ---- app/Views/setting_form.php | 36 +- app/Views/template/footer.php | 16 +- app/Views/template/topbar.php | 155 +----- app/Views/template_creation_form.php | 4 +- app/Views/user_form.php | 646 ++++++++++++------------- 20 files changed, 1676 insertions(+), 1154 deletions(-) create mode 100644 app/Views/invoice_pdf_template_o.php delete mode 100644 app/Views/invoice_pdf_template_old.php diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php index 1ad5723..4d5d0b1 100644 --- a/app/Controllers/Books.php +++ b/app/Controllers/Books.php @@ -72,6 +72,7 @@ class Books extends BaseController $data = [ 'name' => $this->request->getPost('name'), + 'type' => $this->request->getPost('type'), 'description' => $this->request->getPost('description'), 'from_date' => ($this->request->getPost('from_date') != '') ? $this->request->getPost('from_date') : null, 'to_date' => ($this->request->getPost('to_date') != '') ? $this->request->getPost('to_date') : null, diff --git a/app/Controllers/Business.php b/app/Controllers/Business.php index 4287168..a3363a4 100644 --- a/app/Controllers/Business.php +++ b/app/Controllers/Business.php @@ -3,6 +3,7 @@ namespace App\Controllers; use App\Models\BusinessModel; +use App\Models\SettingsModel; class Business extends BaseController { @@ -36,12 +37,15 @@ class Business extends BaseController { helper('session'); $session_role = get_user_role(); + $session_bid = get_business_id(); if ($id === '0') { $data['page_name'] = 'Add Organization'; $data['loged_user'] = $session_role; $data['businesses'] = []; $data['branches'] = []; + // ----------- + $data['details'] = []; } else if ($id !== '0') { $data['page_name'] = 'Edit Organization'; @@ -55,10 +59,45 @@ class Business extends BaseController // Fetch branch details $branchData = $model->getBranchesByBusinessId($id); $data['branches'] = $branchData; - } + // ============================ + $smodel = new SettingsModel(); + $smodel->setTable('settings'); + if($session_role === 'sadmin'){ + + $details = $smodel->where(['setting_id' => $id, 'isactive' => 1])->first(); + } + else{ + $details = $smodel->where(['business_id' => $session_bid, 'isactive' => 1])->first(); + } + // echo json_decode($details);die; + $data['details'] = $details; + // echo json_encode($data);die; + + } + $data['business_details']=$this->business_details(); + $this->render_page('business_form', $data); } + + public function business_details() + { + helper('session'); + $session_role = get_user_role(); + $session_bid = get_business_id(); + + $model = new BusinessModel(); + $model->setTable('business'); + if($session_role === 'sadmin'){ + + $business_details = $model->where('business_id !=', 0)->orderBy('business_id', 'DESC')->findAll(); + } + else{ + $business_details = $model->where('business_id', $session_bid)->findAll(); + + } + return $business_details; + } ## For inserting/updating details of business @@ -162,6 +201,102 @@ class Business extends BaseController } } +//SITE SETTINGS +helper('session'); +$session_bid = get_business_id(); +$session_uid = get_logged_user_id(); +$session_role = get_user_role(); + +$img = $this->request->getFile('slogo'); +print_r($img); +$business_id = $this->request->getPost('business_id'); +$app_setting_id = $this->request->getPost('app_setting_id'); +$filePath = 'public/uploads/' . $this->request->getPost('slogo'); +$fileName = $img->getName(); +var_dump($fileName); +echo $fileName; +echo $fileName !== "" && $fileName !== null ? "Yes":"No"; +// die(); + +if($fileName !== ""){ + + if ($img->isValid() && !$img->hasMoved()) { + + $img->move(ROOTPATH . 'public/uploads', $fileName); + } + +} + + +$favicon = $this->request->getFile('favicon'); +$faviconName = $favicon->getName(); + + if($faviconName !== ""){ + + if ($favicon->isValid() && !$favicon->hasMoved()) { + + $favicon->move(ROOTPATH . 'public/uploads', $faviconName); + } +} + +$SettingsModel = new SettingsModel(); +$data = [ + + 'site_name' => $this->request->getPost('site_name'), + 'site_title' => $this->request->getPost('site_title'), + 'terms_service' => $this->request->getPost('terms_service'), + 'footer_about' => $this->request->getPost('footer_about'), + 'admin_email' => $this->request->getPost('admin_email'), + 'mobile'=> $this->request->getPost('mobile'), + 'copyright'=> $this->request->getPost('copyright'), + 'pagination_limit'=> $this->request->getPost('pagination_limit'), + 'site_info'=> $this->request->getPost('site_info'), + 'about_info'=> $this->request->getPost('about_info'), + 'mail_protocol'=> $this->request->getPost('mail_protocol'), + 'mail_title'=> $this->request->getPost('mail_title'), + 'mail_host'=> $this->request->getPost('mail_host'), + 'mail_port'=> $this->request->getPost('mail_port'), + 'mail_encryption'=> $this->request->getPost('mail_encryption'), + 'mail_username'=> $this->request->getPost('mail_username'), + 'mail_password'=> $this->request->getPost('mail_password'), + 'currency'=> $this->request->getPost('currency'), + 'country'=> $this->request->getPost('country'), + 'business_id'=> $this->request->getPost('business_id'), + 'start_no'=> $this->request->getPost('start_no'), + 'left_pad'=> $this->request->getPost('left_pad'), + 'prefix_format'=> $this->request->getPost('prefix_format'), +]; + +if($fileName !== "" && $fileName !== null) +{ + $data['logo'] = $fileName; +} + +if($faviconName !== "" && $faviconName !== null) +{ + $data['favicon'] = $faviconName; +} + +// echo '
';
+// print_r($data); die;
+
+$setting_id = $this->request->getPost('setting_id'); // Get the business ID for update
+
+if (empty($setting_id)) {
+    // It's an insert operation
+    $data['isactive'] = 1;
+    $data['created_by'] = $session_uid;
+  
+    $SettingsModel->insert($data);
+    // print_r($data);die;
+} else {
+    // It's an update operation
+    $isactive = $this->request->getPost('isactive');
+    $data['isactive'] = ($isactive == 'on') ? 1 : 0;
+    $data['updated_by'] = $session_uid;
+    $SettingsModel->update($setting_id, $data);
+}
+
 
 // ... exis
     // ... existing code ...
diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 355df73..9a4f73d 100644
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -9,8 +9,9 @@ use App\Models\InvoiceModel;
 use App\Models\BooksModel;
 use App\Models\AuditHistoryModel;
 use App\Models\UsersModel;
+use App\Models\NotificationModel;
+use App\Models\BusinessModel;
 use App\Helpers\NotificationHelper;
-
 use Mpdf\Mpdf;
 use Dompdf\Dompdf;
 use Dompdf\Options;
@@ -23,6 +24,8 @@ class Invoice extends BaseController
 	{
 
 		$this->AuditHistoryModel = new AuditHistoryModel();
+        $this->UserModel = new UsersModel();
+        $this->Business_Model = new BusinessModel();
 
 	}
 
@@ -39,6 +42,13 @@ class Invoice extends BaseController
             $data['Donors'] = $model->getData('donor', $where);
             $data['page_name'] = 'Receipt  Details';
             $data['receipt']   = $model->where(["business_id"=>$session_bid])->findAll();
+            $data['temp_receipt_count'] = $model->where(["business_id"=>$session_bid, 'receipt_header' => 'Temporary Receipt'])->countAllResults();
+
+            foreach ($data['receipt'] as $key => $value) {
+                $data['receipt'][$key]['created_name'] = $this->UserModel->where('user_id', $value['created_by'])->get()->getRow()->first_name;
+            }
+
+            // echo json_encode($data['receipt']);die;
             
             // echo '
';
             // print_r($data); die;
@@ -120,10 +130,7 @@ class Invoice extends BaseController
         $data['currency'] =  $setting_model->select('currency')->where($where)->findAll();
         $data['customers'] = $model->getData('donor', $where);
         // $data['causes']    = $model->getData('causes', $where);
-        $data['causes']  = $bmodel->select('causes.* , donations_accepted.id as donations_accepted_id , donations_accepted.name as donations_accepted_name')
-											->join('donations_accepted', 'causes.name = donations_accepted.id', 'left')
-											->where('causes.business_id', (int)get_business_id() )
-											->get()->getResult();
+        $data['causes']  = $bmodel->select('*')->where('business_id', (int)get_business_id() )->get()->getResult();
         $data['count_receipt_no'] = $count_receipt_no;
         $data['campaign']    = $model->getData('campaign', $where);
         $data['invoice_number_formatting'] = $model->getData('settings', $where);
@@ -192,7 +199,7 @@ class Invoice extends BaseController
         $model = new InvoiceModel();
         $where = ['business_id' => (int)get_business_id(),'receipt_id' => $this->request->getPost('id') ];
         $data['isactive'] = 0;
-        $data['receipt_header'] = 'Receipt Deleted';
+        $data['receipt_header'] = 'Rejected';
         $data['reason'] = $this->request->getPost('reason');
         $updata = $model->getData('receipt', $where);
         $upt_data = $model->updateData('receipt', $data, $where);
@@ -374,18 +381,42 @@ class Invoice extends BaseController
                     $records['description'] = $html;
                     $notification->sendEmail($records);
                 }
-                
-                // $template = "Dear " . '$recipient_name' . ",\r\r\n\nYour Invoice has been approved.\n\nDetails:\r\n- Approval Date: " . '$approval_date' . "\r\n- Approved By: " . '$approved_by' . "\r\n- Reference ID: " . '$reference_number' . "\r\n\nBest regards,\n".'$business_name'.",\n".'$business_address'." ".'$business_city'." ".'$business_state'." - ".'$business_postal_code'.".\nCall Us: +91 ".'$business_mobile_no'."\nEmail Us:".'$business_email';
+                $notificationModel = new NotificationModel(); 
+                $bmodel = new BooksModel();
+                $donormodel = new CustomerModel();
+                $template_data = $notificationModel->select('*')->where('template_id',7)->findAll();
+                $cause = $bmodel->select('name')->where('causes_id',(int)$this->request->getPost('causes_id'))->findAll();
+                $d_name = $donormodel->select('first_name')->where('donor_id',$customer_id)->findAll();
+                $business = $this->Business_Model->select('*')->where('business_id',(int)get_business_id())->findAll(); 
 
+                $donor_name = $d_name[0]['first_name'];
+                $currency_amount = $this->request->getPost('amount');
+                $cause_name = $cause[0]['name'];
+                $receipt_number = $this->request->getPost('receipt_number');
+                $r_date = (!empty($receipt_date)) ? date("d-m-Y", strtotime($receipt_date)) : NULL;
+                $business_name = $business[0]['title'];
+
+                // Your original message
+                $message = $template_data[0]['message'];
+
+                // Replace placeholders with actual values
+                $message = str_replace(
+                    array('{donor_name}', '{currency_amount}', '{cause_name}', '{receipt_name}', '{receipt_date}', '{bisuness_name}'),
+                    array($donor_name, $currency_amount, $cause_name, $receipt_number, $receipt_date, $business_name),
+                    $message
+                );
+
+                // Output the modified message
+                // echo $message;die;
                 // // WHATSAPP
-                // $params = (object) Null;
-                // // $params->number = (int)'91' . $donordata[0]->mobile_no;
-                // $params->number = (int)'919677462018';
-                // $params->type = "text";
-                // $params->message = $template;
-                // $params->instance_id = '65C9B978325A2';
-                // $params->access_token = '65c715e797d16';
-                // $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params);
+                $params = (object) Null;
+                // $params->number = (int)'91' . $donordata[0]->mobile_no;
+                $params->number = (int)'919677462018';
+                $params->type = "text";
+                $params->message = $message;
+                $params->instance_id = '65C9B978325A2';
+                $params->access_token = '65c715e797d16';
+                $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params);
           
         } catch (\Exception $e) {
             $this->logger->error("Receipt: Err Occur =" . $e->getMessage());
@@ -418,6 +449,7 @@ class Invoice extends BaseController
                     $user = $usermodel->select('first_name,last_name')->where('user_id',$audit_data->updated_by)->findAll();
                     if($con){
                         $temp_diff[] = (object) [
+                            'id' => $audit_data->id,
                             'key' => $key,
                             'old_value' => $value,
                             'new_value' => $arr2[0][$key],
@@ -432,6 +464,7 @@ class Invoice extends BaseController
                     // echo $key;die;
                     $user = $usermodel->select('first_name,last_name')->where('user_id',$audit_data->created_by)->findAll();
                     $temp_diff[] = (object) [
+                        'id' => $audit_data->id,
                         'key' => '-',
                         'old_value' => '-',
                         'new_value' => 'New Receipt No "'.$arr1[0]['receipt_number'].'" Created',
@@ -446,6 +479,7 @@ class Invoice extends BaseController
                     // echo $key;die;
                     $user = $usermodel->select('first_name,last_name')->where('user_id',$audit_data->updated_by)->findAll();
                     $temp_diff[] = (object) [
+                        'id' => $audit_data->id,
                         'key' => '-',
                         'old_value' => '-',
                         'new_value' => 'Receipt No "'.$arr1[0]['receipt_number'].'" Deleted',
@@ -601,6 +635,7 @@ class Invoice extends BaseController
         try {
             // Fetch the receipt data based on $receipt_id
             $model = new InvoiceModel();
+            $usermodel = new UsersModel();
             $setting_model = new SettingsModel();
             $where = ['business_id' => (int)get_business_id()];
             $currency_data =  $setting_model->select('currency')->where($where)->findAll();
@@ -619,9 +654,9 @@ class Invoice extends BaseController
             $dompdf = new Dompdf($options);
     
             define("DOMPDF_UNICODE_ENABLED", true);
-
+            $user = $usermodel->select('first_name')->where('user_id',$data[0]->created_by)->findAll();
             $baseurl = base_url()."public/uploads/".$data[0]->business_logo;
-            $html = view('invoice_pdf_template', ['data' => $data[0],'currency' => $currency_data[0]['currency'] ,'baseurl' => $baseurl]);
+            $html = view('invoice_pdf_template', ['data' => $data[0],'currency' => $currency_data[0]['currency'], 'currency_in_words' => $this->convertNumberToWords($data[0]->amount) ,'baseurl' => $baseurl, 'staff_name' => $user[0]['first_name'] ]);
             // echo $html;die;
             
             $dompdf->loadHtml($html);
@@ -650,6 +685,75 @@ class Invoice extends BaseController
         }
     }
 
+    public function convertNumberToWords($number) {
+        $words = array(
+            0 => 'Zero',
+            1 => 'One',
+            2 => 'Two',
+            3 => 'Three',
+            4 => 'Four',
+            5 => 'Five',
+            6 => 'Six',
+            7 => 'Seven',
+            8 => 'Eight',
+            9 => 'Nine',
+            10 => 'Ten',
+            11 => 'Eleven',
+            12 => 'Twelve',
+            13 => 'Thirteen',
+            14 => 'Fourteen',
+            15 => 'Fifteen',
+            16 => 'Sixteen',
+            17 => 'Seventeen',
+            18 => 'Eighteen',
+            19 => 'Nineteen',
+            20 => 'Twenty',
+            30 => 'Thirty',
+            40 => 'Forty',
+            50 => 'Fifty',
+            60 => 'Sixty',
+            70 => 'Seventy',
+            80 => 'Eighty',
+            90 => 'Ninety'
+        );
+    
+        // Special case for zero
+        if ($number == 0) {
+            return $words[0];
+        }
+    
+        $num = (int)$number;
+        $result = '';
+    
+        // Handle numbers greater than 1000
+        if ($num >= 1000) {
+            $thousands = floor($num / 1000);
+            $result .= $words[$thousands] . ' Thousand ';
+            $num %= 1000;
+        }
+    
+        // Handle numbers between 100 and 999
+        if ($num >= 100) {
+            $hundreds = floor($num / 100);
+            $result .= $words[$hundreds] . ' Hundred ';
+            $num %= 100;
+        }
+    
+        // Handle numbers between 20 and 99
+        if ($num >= 20) {
+            $tens = floor($num / 10) * 10;
+            $result .= $words[$tens] . ' ';
+            $num %= 10;
+        }
+    
+        // Handle numbers between 1 and 19
+        if ($num > 0) {
+            $result .= $words[$num];
+        }
+    
+        return $result;
+    }
+
 
     
 
diff --git a/app/Models/BooksModel.php b/app/Models/BooksModel.php
index 5419fc0..228d506 100644
--- a/app/Models/BooksModel.php
+++ b/app/Models/BooksModel.php
@@ -5,7 +5,7 @@ class BooksModel extends Model
 {
     protected $table = 'causes';
     protected $primaryKey = 'causes_id';
-    protected $allowedFields = ['causes_id','name','description','from_date', 'to_date', 'business_id', 'created_on','created_by','updated_on','updated_by','isactive'];
+    protected $allowedFields = ['causes_id','name','type','description','from_date', 'to_date', 'business_id', 'created_on','created_by','updated_on','updated_by','isactive'];
     // protected $allowedFields = ['causes_id','title','cover_picture','publication_date','isbn_code','publisher','category','genre','language','description','page_count','tax','price','created_on','created_by','updated_on','updated_by','isactive','business_id'];
 
     public function saveData($data, $id = null)
diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php
index a6b2f79..38d0f88 100644
--- a/app/Models/NotificationModel.php
+++ b/app/Models/NotificationModel.php
@@ -3,7 +3,11 @@ namespace App\Models;
 use CodeIgniter\Model;
 class NotificationModel extends Model
 {
-    protected $table;
+    // protected $table;
+    protected $table = 'templates';
+    protected $primaryKey = 'template_id';
+    // protected $allowedFields = ['invoice_id','invoice_number','donor_id','invoice_date','event_id','business_id','created_on','business_id'];
+    protected $allowedFields = ['template_name', 'subject', 'message','mode','crteated_on', 'created_by', 'updated_on',  'updated_by', 'isactive'];
 
     public function setCustomTable($tableName)
     {
diff --git a/app/Views/audit_history.php b/app/Views/audit_history.php
index 3f7dbd3..7c969ce 100644
--- a/app/Views/audit_history.php
+++ b/app/Views/audit_history.php
@@ -8,9 +8,10 @@
                 

 
                 

-                
+                

+                                
@@ -24,13 +25,14 @@
                             
+                                        
-                                        
+                                        
@@ -46,8 +48,8 @@
 
@@ -260,7 +282,7 @@ function restriction(event) {
     

         

             

-                
+                
                 
             

             

@@ -281,18 +303,37 @@ function restriction(event) {
                         

                     

 
-                    

-                        

-                            
-                            
-                            
 Please provide. 

+                    

+                        

+                            

+                                
+                                
+                                
 Please provide. 

+                            

                         

+
+                        

+                            

+                                
+                                
+                                
 Please provide. 

+                            

+                        

+
+                        

+                            

+                                
+                                
+                                
 Please provide. 

+                            

+                        

+
                     

 
                     

                         

-                            
-                            
+                            
+                            
                             
 Please provide. 

                         

                     

@@ -305,10 +346,10 @@ function restriction(event) {
                         

                     

 
-                    

+                    

                         

-                            
-                            
+                            
+                            
                             
 Please provide. 

                         

                     

@@ -334,30 +375,6 @@ function restriction(event) {
     

 

 
-
-
 
 
 
diff --git a/app/Views/invoice_list.php b/app/Views/invoice_list.php
index f9e5043..37e5b12 100644
--- a/app/Views/invoice_list.php
+++ b/app/Views/invoice_list.php
@@ -1,12 +1,25 @@
+    

         

             

                 

                     

-                        " class="btn btn-primary"> Add Receipt 
+                        
+                        
                     

                     

-                    

+                    
 (Temporary Receipt: )

                     getFlashdata('success') || session()->getFlashdata('error')) : ?>
                         getFlashdata('success')) : ?>
                             

                         
                             

                                 Action
                                 Module
                                 Key
                                 
                                     

                                         mode ?>
                                         module ?>
                                         key ?>
                                         old_value ?>
                                         new_value ?>
                                         updated_by ?>updated_on ?>updated_on)) ?>
                                     

                                 
                             
 
 
 
     

-                            
-                                
-                                    
-                                    
-                                    
-                                    
-                                    
-                                    
-                                    
-                                
-                            
-                            
-                                
-                                    
-                                            
-                                            
-                                            
-                                            
-                                            
-                                            
-                                            
-                                    
-                                
-                            
-                        
Receipt NumberReceipt DateDonor NameAmountStatus/ReasonAction
 
-                                            
-                                                donor_id ? $DonorData->first_name . $DonorData->last_name : ''; ?>
-                                            
-                                             / 
-                                                " class="edit-button" title="Edit the Invoice"> 
-                                                   
-                                                    " class="download-pdf-button" title="Download the Invoice"> 
-                                                
-                                            

+                    
+            
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                
+            
+        
>SelectReceipt NumberReceipt DateCreated ByDonor NameAmountPayment ModeStatusReasonAction
> 
+                            
+                                donor_id ? $DonorData->first_name . $DonorData->last_name : ''; ?>
+                            
+                        
+                            " class="edit-button" title="Edit the Invoice"> 
+                            " class="download-pdf-button" title="Download the Invoice"> 
+                            
+
+                            
+                                
+                                
+                                    
+                                
+                                
+                                    
+                                
+                            
+                        

+
                     

                  
              
         
     
-    
-    
-    
\ No newline at end of file
+    // Handle "Select All" checkbox functionality
+    $('#select-all-checkbox').on('change', function() {
+        $('.select-checkbox').prop('checked', this.checked);
+        if(this.checked) {
+            $('#addDonorBtn').hide();
+            $('#checkAll').show();
+        }
+        else {
+            $('#addDonorBtn').show();
+            $('#checkAll').hide();
+        }
+    });
+});
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php
index d3c0ac8..f5b9512 100644
--- a/app/Views/invoice_pdf_template.php
+++ b/app/Views/invoice_pdf_template.php
@@ -2,303 +2,161 @@
 
 
     
-    
-    
     
     Donation Receipt
     
 
 
-
-

-    

+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Your Organization Logo
+
title ?>

+
org_address ?>, org_city ?>,org_state ?> ,org_zip ?>.

+            MobileNo: org_mobile ?>, Email: org_email ?>,

+            PAN No: org_pan ?>, Register No:org_reg_no ?>

+

+ 
receipt_header?>

+  
Receipt: receipt_number?>Date:  receipt_date));?>
Received with thanks from customer_name ?> cust_pan_no) { echo ', PAN '.$data->cust_pan_no.''; } ?>, a sum of   (.amount ?>), towards cause_name ?>.
Collected by:  " width="100px" alt="Signature">
Note: notes ?>

+    

+
-                    

-                        Receipt :
-                        #receipt_number?>
-                    

-                    

-                        Date :
-                        receipt_date));?>
-                    

-                    

-                        Recipt Type :
-                        receipt_header?>
-                    

-                

-            

+            
title ?>

+            
org_address ?>, org_city ?>,org_state ?> ,org_zip ?>.

+            MobileNo: org_mobile ?>, Email: org_email ?>,

+            PAN No: org_pan ?>, Register No:org_reg_no ?>

         
-        

+        
+    

 
-            

-                

-                    
Payment Method

-                    
 payment_mode?>

-                

-                 

-                    
Donated Amount

-                    
. amount?> /-

-                

-            

-
-            

-                

-                    

-                        

-                            signature ?>" height="50" width="50" style="position: relative; left: -13px;top: 4px;" >
-                        

-                    

-                    
signature

-                

-            

+    

+        

+            
Receipt: receipt_number?>

         

-        

-            
Received with thanks from customer_name ?> , PAN cust_pan_no ?>, a sum of amount ?> , towards cause_name ?>.

-            
Receipt Note:

-            

-                
notes ?>

-            

+        

+            
receipt_header?>

+        

+        

+            
Date: receipt_date));?>

         

     

-

 
+    

+        

+            
Received with thanks from customer_name ?> cust_pan_no) { echo ', PAN '.$data->cust_pan_no.''; } ?>, a sum of amount ?>, towards cause_name ?>.

+        

+    

+
+    

+        

+            

+                
Collected by: 

+            

+            

+                " width="100px" alt="Signature"> 
+             

+        

+    

+        

+         

+            
Note: This template includes placeholders for various pieces of information related to the donation receipt, such as receipt number, receipt date, donor information, donation details, and a thank you message.

+        

+    

+ -->
 
 
 
diff --git a/app/Views/invoice_pdf_template_o.php b/app/Views/invoice_pdf_template_o.php
new file mode 100644
index 0000000..157d5bf
--- /dev/null
+++ b/app/Views/invoice_pdf_template_o.php
@@ -0,0 +1,304 @@
+
+
+
+    
+    
+    
+    
+    Donation Receipt
+    
+
+
+
+

+    

+        

+            

+                

+                    
+                    

+                        
title ?>

+                        
Email : org_email ?>

+                        
PAN No : org_pan ?>

+                        
Register N0 :org_reg_no ?>

+                        
org_address ?>, org_city ?>,

+                        
org_state ?> ,org_zip ?>. MobileNo : org_mobile ?>

+                    

+                

+                
+            

+            

+                

+
+                    
customer_name?>

+                    
+                      Mobile No : customer_mobile?>

+                      PAN No : cust_pan_no?>

+                      Address :address?>

+                    
+                

+
+                

+                    
+                    

+                        Receipt :
+                        #receipt_number?>
+                    

+                    

+                        Date :
+                        receipt_date));?>
+                    

+                    

+                        Recipt Type :
+                        receipt_header?>
+                    

+                

+            

+        

+        

+
+            

+                

+                    
Payment Method

+                    
 payment_mode?>

+                

+                 

+                    
Donated Amount

+                    
. amount?> /-

+                

+            

+
+            

+                

+                    

+                        

+                            signature ?>" height="50" width="50" style="position: relative; left: -13px;top: 4px;" >
+                        

+                    

+                    
signature

+                

+            

+        

+        

+            
Received with thanks from customer_name ?> , PAN cust_pan_no ?>, a sum of amount ?> , towards cause_name ?>.

+            
Receipt Note:

+            

+                
notes ?>

+            

+        

+    

+

+
+
+
+
diff --git a/app/Views/invoice_pdf_template_old.php b/app/Views/invoice_pdf_template_old.php
deleted file mode 100644
index 4f623d6..0000000
--- a/app/Views/invoice_pdf_template_old.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-    Report PDF
-    
-
-
-    

-        
-        

-            
Company Details

-            

-                
-                
title ?>

-                
address ?>

-                
postal_code ?>

-            

-    

-        

-    
-    

-        
Donation Receipt

-        

-            
-            
Receipt No: receipt_number?>

-            
Donor Name: customer_name?>

-            
Amount: amount?>

-            
Contact Number: mobile_no?>

-            
PAN No: pan_no?>

-            
Donation Date: receipt_date?>

-            
-        

-    

-    

-        
Company Contact Details

-        

-            
-            
Email: contact@company.com

-            
Phone: +9876543210

-            
-        

-    

-
-
diff --git a/app/Views/setting_form.php b/app/Views/setting_form.php
index 96d30c2..176b349 100644
--- a/app/Views/setting_form.php
+++ b/app/Views/setting_form.php
@@ -62,38 +62,6 @@
                                     value="" />
                             
                         
-                        
-                        
-                        
                         

                             

                                 
@@ -126,7 +94,7 @@
                             

                                 
                                 
                             

                             
@@ -139,7 +107,7 @@
                             

                                 
                                 
                             

                             
diff --git a/app/Views/template/footer.php b/app/Views/template/footer.php
index 110e717..598d00f 100644
--- a/app/Views/template/footer.php
+++ b/app/Views/template/footer.php
@@ -319,21 +319,7 @@
 
 
                               

-                              

-                                  

-                                      
-                                          About Us
-                                          Privacy Policy
-                                          Terms & Conditions
-                                          Delivery, Payments & Refunds
-                                          Contact Us
-                                      
-                                      
-                                          About Us
-                                          Contact Us
-                                      
-                                  

-                              

+
                           

                       
                   
diff --git a/app/Views/template/topbar.php b/app/Views/template/topbar.php
index 17f5190..1fe99f2 100644
--- a/app/Views/template/topbar.php
+++ b/app/Views/template/topbar.php
@@ -15,16 +15,16 @@
                     
                 
 
-                
  • 
+                
 
                 
  • 
-                    
    
                         
 
-                        
+                        
                        
                         " class="dropdown-item notify-item">
                             
@@ -105,11 +105,11 @@
                 
    • 
                 
 
-                
  • 
+                
 
             
 
@@ -156,145 +156,6 @@
                     
                     
                 
    • 
-
-                
  • 
-                    
-                    
    
-                        
-                        
-                            
-                            New Projects
-                        
-
-                        
-                        
-                            
-                            Create Users
-                        
-
-                        
-                        
-                            
-                            Settings
-                        
-
-                        
    
-
-                        
-                        
-                            
-                            Help & Support
-                        
-
-                    
    
-                
    • 
-
-                
  • 
-                    
-                    
    
-                        
    
-                            
    
-
-                                
    
-                                    
    
-                                        
    UI Components
    
-                                        
-                                    
    
-
-                                    
    
-                                        
    Applications
    
-                                        
-                                    
    
-
-                                    
    
-                                        
    Extra Pages
    
-                                        
-                                    
    
-                                
    
-                            
    
-                            
    
-                                
    
-                                    
    Special Discount Sale!
    
-                                    
    Save up to 70% off.
    
-                                    
-                                
    
-                            
    
-                        
    
-
-                    
    
-                
    • 
             
             
    
         
diff --git a/app/Views/template_creation_form.php b/app/Views/template_creation_form.php
index 79f70eb..ba2c92e 100644
--- a/app/Views/template_creation_form.php
+++ b/app/Views/template_creation_form.php
@@ -44,7 +44,7 @@
                                                               Please, write text here!.";
                                         } ?>
                                     
-                                    Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE}
+                                    Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE},{donor_name}','{currency_amount}','{cause_name}','{receipt_name}','{receipt_date}','{bisuness_name}
                                 
                                 
                                 
     Please provide. 
    
@@ -58,7 +58,7 @@
                                           else{ echo "Sample Template : \n Hello {USER_NAME}, \n\t\t Please, write text here!.";
                                         } ?>
                                     
-                                    Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE}
+                                    Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE},{donor_name}','{currency_amount}','{cause_name}','{receipt_name}','{receipt_date}','{bisuness_name}
                                 
                                 
     Please provide. 
    
                             
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 423dc27..58914b7 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -1,281 +1,239 @@
-
-
-
-
-
-
-
-
 
    
-    
    
-        
    
-            
    
-                
    
-                
-                
    " method="post" enctype="multipart/form-data" id="myForm">
-                    
    
-                        
    
-                            
-                        
-                            
    
-    
-    
+   
    
+      
    
+         
    
+            
    
+            
+            " method="post" enctype="multipart/form-data" id="myForm">
+               
    
+               
    
+                    
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                     
    
+                  
    
+                  
    
+                     
+                     
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                     
    
+                     
+                     
    
+                        
+                        
+                     
    
+                     
+                     
    
+                        
+                        
+                     
    
+                     
+                  
    
+                  
    
+                     
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                     
    
+                  
    
+                  
    
+                     
    
+                        
+                        
+                     
    
+                     
    
+                        
+                        
+                        
    
+                     
    
+                     
+                     
    
+                        
+                        
+                     
    
+                     
+                     
+                     
    
+                        
    
+                           Business Logo
+                           
    
+                              
+                              
+                              
+                           
    
+                        
    
+                     
    
+                     
+                  
    
+                  
+                  
+                  
    
+                     >
+                     
+                  
    
+                  
    
+                  
+                  
    
+                     
+                     
+                     
+                     " class="btn btn-secondary waves-effect">Cancel
+                     
+                  
    
+               
    
+            
+         
    
+         
+      
    
+      
+   
    
+   
 
    
-
-
    
-    
-    
-
    
-
-    
-
-                            
-                            
-                            
-                            
    
-                                
-                                
-                            
    
-
-                            
-                                
    
-                                    
-                                    
-                                
    
-                            
-                        
    
-                        
    
-                            
    
-                                
-                                
-                            
    
-                            
    
-                                
-                                
-                            
    
-                            
-                        
    
-                        
    
-                            
    
-                                
-                                
-                            
    
-                            
    
-                                
-                                
-                            
    
-                            
    
-                                
-                                
-                            
    
-
-
-                        
    
-                        
    
-                            
    
-                                
-                                
-                            
    
-
-                            
    
-                                
-                                
-                            
    
-
-                            
    
-                                
-                                
-                            
    
-                        
    
-                        
    
-                            
    
-                                
-                                
-                            
    
-                          
-                            
    
-                                
-                                
-                                
    
-                            
    
-                            
-    
    
-        
-        
-    
    
-    
-
-
-                            
-                                
    
-                                    
    
-                                        Business Logo
-                                        
    
-                                            
-                                            
-                                            
-                                        
    
-                                    
    
-                                
    
-                            
-
-                        
    
-                        
-
-                        
-                            
    
-                                >
-                                
-                            
    
-                            
    
-                        
-                        
    
-                            
-                            
-                            
-                                " class="btn btn-secondary waves-effect">Cancel
-                            
-                        
    
-                    
    
-                
-            
     
-        
     
-    
     
-
    
-
+
 
-
-
 
+
 
 
-