From 000c4520e2edecde3125854d01e4f2ea755b1e4e Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Thu, 24 Aug 2023 13:16:18 +0530
Subject: [PATCH] Buiness Fixes : ps

---
 app/Controllers/Business.php | 72 +++++++++++++++++++++---------------
 app/Views/business_form.php  | 44 +++++++++++-----------
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/app/Controllers/Business.php b/app/Controllers/Business.php
index 1dee7f3b..dced3b16 100644
--- a/app/Controllers/Business.php
+++ b/app/Controllers/Business.php
@@ -60,44 +60,58 @@ class Business extends BaseController
                 ],
             ],
         ];
-        if (!$this->validate($validationRule)) {
+
+        if (!$this->validate($validationRule) && $this->request->getPost('bfile') === '') {
             $data = ['errors' => $this->validator->getErrors()];
             print_r($data);
             return 'hello';
         }
         $img = $this->request->getFile('bfile');
+        $filePath = WRITEPATH . 'uploads/' . $this->request->getPost('bfile');
 
-        if (!$img->hasMoved()) {
-            $filepath = WRITEPATH . 'uploads/Business_files' . $img->store();
-            $fileName = $img->getName();
-
-            $BusinessModel = new BusinessModel();
-            $data = [
-                'title' => $this->request->getPost('bname'),
-                'email' => $this->request->getPost('bmail'),
-                'mobile_no' => $this->request->getPost('bmobile'),
-                'address' => $this->request->getPost('baddress'),
-                'city' => $this->request->getPost('bcity'),
-                'state' => $this->request->getPost('bstate'),
-                'postal_code' => $this->request->getPost('bzip'),
-                'business_logo' => $fileName
-            ];
-            $business_id = $this->request->getPost('business_id'); // Get the business ID for update
-
-            if (empty($business_id)) {
-                // It's an insert operation
-                $data['isactive'] = 1;
-                $data['created_by'] = $session_uid;
-                $BusinessModel->insert($data);
+        ## File Already Existing or not
+        if (!is_file($filePath)) {
+            ## echo 'File not Existing'
+            if (!$img->hasMoved()) {
+                ## echo 'File not Existing and Not Moved'
+                // $filepath = WRITEPATH . 'uploads/Business_files' . $img->store();
+                // $fileName = $img->getName();
+                $fileName = $img->getName();
+                $img->move(WRITEPATH . 'uploads', $fileName);
             } else {
-                // It's an update operation
-                $isactive = $this->request->getPost('bcheckbox');
-                $data['isactive'] = ($isactive == 'on') ? 1 : 0;
-                $data['updated_by'] = $session_uid;
-                $BusinessModel->update($business_id, $data);
+                ## display the error file not uploaded like that...
             }
-            return redirect()->route('business_list');
+        } else {
+            ## echo 'File Existing'
+            $fileName = $this->request->getPost('bfile');
         }
+
+        $BusinessModel = new BusinessModel();
+        $data = [
+            'title' => $this->request->getPost('bname'),
+            'email' => $this->request->getPost('bmail'),
+            'mobile_no' => $this->request->getPost('bmobile'),
+            'address' => $this->request->getPost('baddress'),
+            'city' => $this->request->getPost('bcity'),
+            'state' => $this->request->getPost('bstate'),
+            'postal_code' => $this->request->getPost('bzip'),
+            'business_logo' => $fileName
+        ];
+        $business_id = $this->request->getPost('business_id'); // Get the business ID for update
+
+        if (empty($business_id)) {
+            // It's an insert operation
+            $data['isactive'] = 1;
+            $data['created_by'] = $session_uid;
+            $BusinessModel->insert($data);
+        } else {
+            // It's an update operation
+            $isactive = $this->request->getPost('bcheckbox');
+            $data['isactive'] = ($isactive == 'on') ? 1 : 0;
+            $data['updated_by'] = $session_uid;
+            $BusinessModel->update($business_id, $data);
+        }
+        return redirect()->route('business_list');
     }
     public function delete_business($id)
     {
diff --git a/app/Views/business_form.php b/app/Views/business_form.php
index 2bdbbc52..41ba31e7 100644
--- a/app/Views/business_form.php
+++ b/app/Views/business_form.php
@@ -5,7 +5,7 @@
                 <h4 class="header-title"><?= $page_name; ?></h4>
                 <p class="sub-header"> </p>
                 <form method="POST" enctype="multipart/form-data" action="<?php echo base_url(); ?>insert_business">
-                <div class="form-group">
+                    <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-6">
                                 <label for="bname" class="col-form-label">Business Name<span class="text-danger">*</span></label>
@@ -14,22 +14,22 @@
                             <div class="form-group col-md-6">
                                 <label for="bmail" class="col-form-label">Email<span class="text-danger">*</span></label>
                                 <input type="email" class="form-control" name="bmail" value="<?= isset($businesses['email']) ? $businesses['email'] : '' ?>" placeholder="Email" required />
-                            </div>                            
+                            </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-6">
                                 <label for="bmobile" class="col-form-label">Mobile Number<span class="text-danger">*</span></label>
-                                <input type="number" class="form-control" name="bmobile"value="<?= isset($businesses['mobile_no']) ? $businesses['mobile_no'] : '' ?>" placeholder="Mobile Number (Enter only numbers)" required data-parsley-type="number" />
+                                <input type="number" class="form-control" name="bmobile" value="<?= isset($businesses['mobile_no']) ? $businesses['mobile_no'] : '' ?>" placeholder="Mobile Number (Enter only numbers)" required data-parsley-type="number" />
                             </div>
                             <div class="form-group col-md-6">
                                 <label for="baddress" class="col-form-label">Address<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" name="baddress"value="<?= isset($businesses['address']) ? $businesses['address'] : '' ?>" placeholder="Address (eg : 1234 Main St)" required />
+                                <input type="text" class="form-control" name="baddress" value="<?= isset($businesses['address']) ? $businesses['address'] : '' ?>" placeholder="Address (eg : 1234 Main St)" required />
                             </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-4">
                                 <label for="bcity" class="col-form-label">City<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" name="bcity" value="<?= isset($businesses['city']) ? $businesses['city'] : '' ?>"placeholder="City" required />
+                                <input type="text" class="form-control" name="bcity" value="<?= isset($businesses['city']) ? $businesses['city'] : '' ?>" placeholder="City" required />
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="bstate" class="col-form-label">State<span class="text-danger">*</span></label>
@@ -43,23 +43,28 @@
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="bzip" class="col-form-label">Postal Code<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" name="bzip" value="<?= isset($businesses['postal_code']) ? $businesses['postal_code'] : '' ?>"placeholder="Postal Code (Eg: Pincode)" required />
+                                <input type="text" class="form-control" name="bzip" value="<?= isset($businesses['postal_code']) ? $businesses['postal_code'] : '' ?>" placeholder="Postal Code (Eg: Pincode)" required />
                             </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-12">
-                            <label for="bfile" class="col-form-label">File</label>
-                            <input type="file" class="form-control" style="border: 0px !important;" id="bfile" name="bfile" value="<?= isset($businesses['cover_picture']) ? $businesses['cover_picture'] : '' ?>" multiple />
+                                <label for="bfile" class="col-form-label">File</label>
+                                <!-- <input type="file" class="form-control" style="border: 0px !important;" id="bfile" name="bfile" value="<?= isset($businesses['cover_picture']) ? $businesses['cover_picture'] : '' ?>" multiple /> -->
+                                <?php if (isset($businesses['business_logo']) && $businesses['business_logo']) { ?>
+                                    <input type="text" class="form-control" id="bfile" name="bfile" value="<?= $businesses['business_logo']; ?>" readonly />
+                                <?php } else { ?>
+                                    <input type="file" class="form-control" style="border: 0px !important;" id="bfile" name="bfile" value="<?= isset($businesses['business_logo']) ? $businesses['business_logo'] : '' ?>" multiple />
+                                <?php } ?>
                             </div>
                         </div>
                         <input type="hidden" id="business_id" name="business_id" placeholder="hidden for business id" value="<?= isset($businesses['business_id']) ? $businesses['business_id'] : '' ?>" />
 
-                        <?php if(!empty($businesses)){ ?>
-                        <div class="form-group text-right m-b-0 checkbox checkbox-purple">
-                            <input type="checkbox" id="bcheckbox" name="bcheckbox" class="form-control" <?= isset($businesses) && $businesses['isactive'] == 1 ? 'checked' : '' ?>>
-                            <label for="bcheckbox"> Is Active</label>
-                        </div>
-                        <br>
+                        <?php if (!empty($businesses)) { ?>
+                            <div class="form-group text-right m-b-0 checkbox checkbox-purple">
+                                <input type="checkbox" id="bcheckbox" name="bcheckbox" class="form-control" <?= isset($businesses) && $businesses['isactive'] == 1 ? 'checked' : '' ?>>
+                                <label for="bcheckbox"> Is Active</label>
+                            </div>
+                            <br>
                         <?php } ?>
                         <div class="form-group text-right m-b-0">
                             <button class="btn btn-success waves-effect waves-light mr-1" type="submit">
@@ -70,16 +75,9 @@
                             </button>
                             <button type="button" class="btn btn-secondary waves-effect">Cancel</button>
                         </div>
-                    </div>   
+                    </div>
                 </form>
             </div> <!-- end card-body-->
         </div> <!-- end card-->
     </div> <!-- end col-->
-</div>
-<!-- end row -->
-<script src="<?= base_url()."public/assets/js/vendor.min.js"?>"></script>
-
-<!-- Plugins js -->
-
-<!-- App js -->
-<script src="<?= base_url()."public/assets/js/app.min.js"?>"></script>
\ No newline at end of file
+</div><!-- end row -->
\ No newline at end of file