diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0fc9ba8..908fc5c 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -74,6 +74,7 @@ $routes->get("product_list_for_service", "Products::product_list_for_service"); $routes->post('status_product', 'Products::status_product'); $routes->get('delete_product_name/(:any)', 'Products::delete_product_name/$1'); $routes->get('get_product_addtional_details/(:any)', 'Products::get_product_addtional_details/$1'); +$routes->get('product_categories', 'Products::product_categories'); //end products// //Sales order // diff --git a/app/Controllers/ProductCategory.php b/app/Controllers/ProductCategory.php index 32ecb5d..af24b50 100644 --- a/app/Controllers/ProductCategory.php +++ b/app/Controllers/ProductCategory.php @@ -20,10 +20,10 @@ class ProductCategory extends BaseController public function index() { - // print_r($this->session->get());die; + $ProductCategoryModel = new ProductCategoryModel(); $productcategory = $ProductCategoryModel->orderBy('product_category_id')->findAll(); - $data['productcategory']=$productcategory; + $data['productcategory'] = $productcategory; return view('product_category_list',$data); } @@ -40,21 +40,39 @@ class ProductCategory extends BaseController try { $data['business_id'] = $this->session->get('logged_user_business_id'); $data['created_by'] = $logged_user; + + // Check for duplicate entry + $existing = $ProductCategoryModel->where('product_category_name', $product_category_name)->first(); + + if ($existing) { + return $this->respond([ + 'status' => 'failed', + 'code' => 200, + 'data' => 'Duplicate entry detected.' + ], 200); + } + + // Insert data if no duplicate found $inserted = $ProductCategoryModel->insert($data); } catch (\CodeIgniter\Database\Exceptions\DatabaseException $e) { - - return $this->respond(['status' => 'failed','code' => 404,'data' => $e->getMessage()],200); + return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500); } if ($inserted) { $result = $data; - $product_category_list = $ProductCategoryModel->orderBy('product_category_id','asc')->findAll(); - - return $this->respond(['status' => 'success','code' => 200,'data' => $result,'product_category_list'=>$product_category_list],200); + $product_category_list = $ProductCategoryModel->orderBy('product_category_id', 'asc')->findAll(); + + return $this->respond([ + 'status' => 'success', + 'code' => 200, + 'data' => $result, + 'product_category_list' => $product_category_list + ], 200); } else { - $result = "No Match's"; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + $result = "Insert failed."; + return $this->respond(['status' => 'failed', 'code' => 400, 'data' => $result], 400); } + }else{ $data['updated_by'] = $logged_user; $updated = $ProductCategoryModel->update($product_category_id,$data); diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index 73b12eb..0c2ce7c 100755 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -38,26 +38,39 @@ class Products extends BaseController $this->additionalProductNameModal = new AdditionalProductNameModal(); } + public function product_categories() + { + + $ProductCategoryModel = new ProductCategoryModel(); + $productcategory = $ProductCategoryModel->orderBy('product_category_id')->findAll(); + $data['productcategory'] = $productcategory; + return view('product_categories',$data); + } + public function product_index($manufacturer_id = null) { if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } + $category = $this->request->getGet('category'); if ($manufacturer_id) { - $products = $this->ProductModel->where('manufacturer_id',$manufacturer_id)->orderBy('product_name')->findAll(); + $data['products'] = $this->ProductModel->where('manufacturer_id',$manufacturer_id)->orderBy('product_name')->findAll(); $manufacturer = $this->ManufacturerModel->where('manufacturer_id',$manufacturer_id)->select('manufacturer_name')->first(); - - $data['products']=$products; $data['manufacturer_id'] = $manufacturer_id; $data['manufacturer_name'] = $manufacturer['manufacturer_name']; return view('product_list',$data); - } else { + + } else if(isset($category)) { - $products = $this->ProductModel->get_products($this->session->get('logged_user_branch_id')); - $data['products']=$products; - // echo "
";
-            // print_r($products);die;
+            $data['products'] = $this->ProductModel->get_products($this->session->get('logged_user_branch_id'),$category);
+            $data['manufacturer_id'] = $manufacturer_id;
+
+        
+            return view('product_list',$data);
+        }else {
+            
+            $data['products'] = $this->ProductModel->get_products($this->session->get('logged_user_branch_id'));
             $data['manufacturer_id'] = $manufacturer_id;
 
         
diff --git a/app/Helpers/ClientDetailsUpdate.php b/app/Helpers/ClientDetailsUpdate.php
index 63f4186..35b28e4 100644
--- a/app/Helpers/ClientDetailsUpdate.php
+++ b/app/Helpers/ClientDetailsUpdate.php
@@ -19,14 +19,13 @@ class ClientDetailsUpdate
         $client_id = $VehicleModel->where('vehicle_id', $vehicle_id)->get()->getRow()->client_id;
 
         $data = [
-            
             'address' => $address['billing_address'],
             'city' => $address['billing_city'],
             'state' => $address['billing_state'],
             'postal_code' => $address['billing_postal_code']
-    
         ];
 
+        $VehicleModel->update($vehicle_id, $data);
         $update = $ClientModel->update($client_id, $data);
 
         if($update){
diff --git a/app/Models/ProductModel.php b/app/Models/ProductModel.php
index b8e6f6c..c1486d0 100755
--- a/app/Models/ProductModel.php
+++ b/app/Models/ProductModel.php
@@ -28,11 +28,15 @@ class ProductModel extends Model
         }
     }
 
-    public function get_products($branch_id)
+    public function get_products($branch_id,$category = null)
     {
         $this->select('products.*, manufacturer.manufacturer_name');
         $this->join('manufacturer', 'manufacturer.manufacturer_id = products.manufacturer_id','left');
         $this->where('products.branch_id', $branch_id);
+        if($category != null)
+        {
+            $this->where('products.product_category', $category);
+        }
         $this->orderBy('products.product_name');
         return $this->findAll();
     }
diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php
index 697965e..eddf8c6 100644
--- a/app/Views/invoice_pdf_template.php
+++ b/app/Views/invoice_pdf_template.php
@@ -84,7 +84,7 @@
     
     
     
 

-    
+    

@@ -112,14 +112,14 @@
     ?>
 
         
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 2e51bd5..f8db6bc 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -418,7 +418,8 @@
                                 

                                     

     
 
     
   product_name; ?> net_price; ?>qty; ?>per; ?>tax; ?> amount, 2, '.', ''); ?>   product_name; ?> net_price; ?>qty; ?>per; ?>tax; ?> amount, 2, '.', ''); ?>
         

        
     

+                        
+                            
+                                  
+                                
+                                
+                            
+                        
+                                                        
+                             $item): ?>
+                                
+                                    
+                                    
+                                    
+                                
+                            
+                        
+                    
Product CategoryStatusProducts

+                                            
+                                                Active
+                                            
+                                                Inactive
+                                            
+                                    
+
+                                    
+                                                     
+                                    

+                
+            
+        
+    
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
diff --git a/app/Views/product_category_list.php b/app/Views/product_category_list.php
index 14fdc94..c441129 100644
--- a/app/Views/product_category_list.php
+++ b/app/Views/product_category_list.php
@@ -132,6 +132,7 @@
             data: formData,
             dataType: 'json',
             success: function(response) {
+                console.log(response);
                 if (response.status == "failed") {
                     toastr.warning(response.data, 'Warning');
                 }else{
diff --git a/app/Views/product_list.php b/app/Views/product_list.php
index c2c45aa..6c16830 100755
--- a/app/Views/product_list.php
+++ b/app/Views/product_list.php
@@ -29,7 +29,9 @@
                 

                     
    
                     
-                        
  1.  " class="btn btn-primary waves-effect"> Add Product
+                        
  2.  
+                            " class="btn btn-primary waves-effect">Categories View
+                            " class="btn btn-primary waves-effect"> Add New Product
                         
    3. 
                     
                     

diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php
index ed42105..8cad833 100755
--- a/app/Views/purchase_form.php
+++ b/app/Views/purchase_form.php
@@ -60,7 +60,7 @@
                         

                         

                      
-                        
+                        
                

                
                

diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php
index a7071be..3559cba 100755
--- a/app/Views/sales_order_form.php
+++ b/app/Views/sales_order_form.php
@@ -255,7 +255,7 @@
                                          -->
                                         
                                             
+                                                value="" readonly>
                                         
                                         ' +
                 '' +
                 '' +
-                '' +
+                '' +
                 '' +
                 '
' +
                 '';
@@ -1125,6 +1149,9 @@ $(document).on('click', '#selectClient', function() {
 
         }
     });
+
+
+