From 6cae917ebe7d895cf562ef6ca41011a637f8d127 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Sat, 27 Apr 2024 12:53:42 +0530 Subject: [PATCH] CHANGE_MAKE_MODEL_COMPLAINT_MANUFACTOR_BUSINESS_ID_ADD : AADHAVAN --- app/Config/Routes.php | 1 + app/Controllers/Products.php | 12 +++-- app/Controllers/ReturnOrder.php | 3 +- app/Controllers/Service.php | 28 +++++----- app/Controllers/Vehicle.php | 26 +++++++++- app/Controllers/Vendor.php | 4 +- app/Models/BikemakeModel.php | 2 +- app/Models/BikemodelsModel.php | 2 +- app/Models/ComplaintModel.php | 2 +- app/Models/ManufacturerModel.php | 2 +- app/Models/PurchaseOrderModel.php | 2 +- app/Views/complaint_list.php | 4 +- app/Views/product_form.php | 26 +++++----- app/Views/purchase_list.php | 2 + app/Views/reorder_level_list.php | 2 +- app/Views/return_list.php | 3 +- app/Views/service_form.php | 86 ++++++++++++++++--------------- app/Views/vehicle_form.php | 54 +++++++++---------- 18 files changed, 146 insertions(+), 115 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 954d2d0..7d2f325 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -109,6 +109,7 @@ $routes->get('vehicle_index/', 'Vehicle::vehicle_index'); $routes->post("add_vehicle", "Vehicle::add_vehicle"); $routes->get("new_vehicle/(:any)", "Vehicle::new_vehicle/$1"); $routes->get("delete_vehicle/(:any)", "Vehicle::delete_vehicle/$1"); +$routes->post("get_models_vehicle", "Vehicle::get_models"); //end Vehicle diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index 532001d..5c6bf3c 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -62,11 +62,12 @@ class Products extends BaseController $tax=$ProductModel->getTax(); $data['tax']=$tax; $BikemakeModel = new BikemakeModel(); - $data['make'] = $BikemakeModel->findAll(); + $data['make'] = $BikemakeModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $VendorModel = new VendorModel(); $data['vendors']=$VendorModel->findAll(); $ManufacturerModel = new ManufacturerModel(); - $data['manufacturers']=$ManufacturerModel->findAll(); + + $data['manufacturers']=$ManufacturerModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $data['page_name']="Add Product"; $data['vendorsProduct'] =[]; } else if ($product_id !== '0') { @@ -81,7 +82,7 @@ class Products extends BaseController $data['products']=$products; $BikemakeModel = new BikemakeModel(); - $data['make'] = $BikemakeModel->findAll(); + $data['make'] = $BikemakeModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $BikemodelsModel = new BikemodelsModel(); $make_id = $products['make_id']; $BikemodelsModel = new BikemodelsModel(); @@ -89,6 +90,7 @@ class Products extends BaseController $models = []; if( $products['make_id'] != null) { foreach ($products['make_id'] as $make_id) { + // $models[] = $BikemodelsModel->where('make_id', $make_id)->findAll(); $models[] = $BikemodelsModel->where('make_id', $make_id)->findAll(); } } @@ -99,7 +101,7 @@ class Products extends BaseController $VendorModel = new VendorModel(); $data['vendors']=$VendorModel->findAll(); $ManufacturerModel = new ManufacturerModel(); - $data['manufacturers']=$ManufacturerModel->findAll(); + $data['manufacturers']=$ManufacturerModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $vendorIds = json_decode($products['vendor'], true); @@ -275,7 +277,7 @@ class Products extends BaseController if ($make_ids) { foreach ($make_ids as $make_id) { // Fetch models based on the selected make ID - $models = $BikemodelsModel->where('make_id', $make_id)->findAll(); + $models = $BikemodelsModel->where('make_id', $make_id)->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); // Iterate over each fetched model and format it as needed foreach ($models as $model) { diff --git a/app/Controllers/ReturnOrder.php b/app/Controllers/ReturnOrder.php index 8d383d2..7cc6e2e 100644 --- a/app/Controllers/ReturnOrder.php +++ b/app/Controllers/ReturnOrder.php @@ -36,7 +36,6 @@ class ReturnOrder extends BaseController $return = $this->returnModel->findAll(); $data['return']=$return; - return view('return_order_liist',$data); } @@ -45,7 +44,7 @@ class ReturnOrder extends BaseController if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } $ReturnModel = new ReturnModel(); - $return_orders = $ReturnModel->select('return_order.*, vendor.vendor_name as vendor_name, COUNT(return_order_child.return_order_id) AS return_count') + $return_orders = $ReturnModel->select('return_order.*, vendor.vendor_name as vendor_name, COUNT(return_order_child.return_order_id) AS return_count, SUM(return_order_child.qty) AS return_qty') ->join('vendor', 'vendor.vendor_id = return_order.vendor_id') ->join('return_order_child', 'return_order_child.return_order_id = return_order.return_order_id', 'left') ->where('return_order.branch_id', $this->session->get('logged_user_branch_id')) diff --git a/app/Controllers/Service.php b/app/Controllers/Service.php index d1b78d8..d5330b7 100644 --- a/app/Controllers/Service.php +++ b/app/Controllers/Service.php @@ -76,7 +76,7 @@ class Service extends BaseController $tax=$ServiceModel->getTax(); $data['tax']=$tax; $BikemakeModel = new BikemakeModel(); - $data['make'] = $BikemakeModel->findAll(); + $data['make'] = $BikemakeModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $data['models'] = []; $service=$ServiceModel->where('isactive',1)->where('category','0')->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll(); // echo $this->session->get('logged_user_branch_id');die; @@ -111,7 +111,7 @@ class Service extends BaseController // Load make data $BikemakeModel = new BikemakeModel(); - $data['make'] = $BikemakeModel->findAll(); + $data['make'] = $BikemakeModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $tax=$ServiceModel->getTax(); $data['tax']=$tax; @@ -226,18 +226,22 @@ class Service extends BaseController public function get_product_by_models(){ $make_id = $this->request->getPost('make_id'); $model_ids = $this->request->getPost('model_ids'); - + $ProductModel = new ProductModel(); - - $encodedModelId = json_encode($model_ids); - // print_r("heloooo"); - // print_r($encodedModelId);die; - - $product = $ProductModel->where('JSON_CONTAINS(models_id, \'' . $encodedModelId . '\')', null, false) - ->findAll(); - return $this->response->setJSON($product); + $products = []; + + foreach ($model_ids as $modelId) { + $product = $ProductModel->where('JSON_CONTAINS(models_id, \'["' . $modelId . '"]\')', null, false) + ->findAll(); + $products = array_merge($products, $product); + } + + $products = array_unique($products, SORT_REGULAR); + + return $this->response->setJSON($products); } + public function get_models() { @@ -253,7 +257,7 @@ class Service extends BaseController if ($selected_makes) { foreach ($selected_makes as $make_id) { // Fetch models based on the selected make ID - $models = $BikemodelModel->where('make_id', $make_id)->findAll(); + $models = $BikemodelModel->where('make_id', $make_id)->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); // Iterate over each fetched model and format it as needed foreach ($models as $model) { diff --git a/app/Controllers/Vehicle.php b/app/Controllers/Vehicle.php index fbda542..8e3dc9f 100644 --- a/app/Controllers/Vehicle.php +++ b/app/Controllers/Vehicle.php @@ -63,7 +63,7 @@ class Vehicle extends BaseController $data['client']=$client; } $data['vehicle_id'] = $vehicle_id; - $data['makeData'] =$this->bikeMakeModel->findAll(); + $data['makeData'] =$this->bikeMakeModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); return view('vehicle_form',$data); } @@ -128,5 +128,29 @@ class Vehicle extends BaseController return redirect()->to('vehicle_index'); } + + + + public function get_models() + { + $selected_makes = $this->request->getPost('selected_makes'); + $BikemodelModel = new BikemodelsModel(); + + $formatted_models = []; + + foreach ($selected_makes as $make_id) { + $models = $BikemodelModel->where('make_id', $make_id)->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); + foreach ($models as $model) { + $formatted_model = [ + 'model_id' => $model['model_id'], + 'model_name' => $model['model_name'] + ]; + + $formatted_models[] = $formatted_model; + } + } + + return $this->response->setJSON($formatted_models); + } } \ No newline at end of file diff --git a/app/Controllers/Vendor.php b/app/Controllers/Vendor.php index 5e15915..3c0d244 100644 --- a/app/Controllers/Vendor.php +++ b/app/Controllers/Vendor.php @@ -40,12 +40,12 @@ class Vendor extends BaseController $data['vendor'] = []; $data['page_name'] = "Add Vendor"; $ManufacturerModel = new ManufacturerModel(); - $data['manufacturers']=$ManufacturerModel->findAll(); + $data['manufacturers']=$ManufacturerModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); } else { $VendorModel = new VendorModel(); $vendor = $VendorModel->where('vendor_id', $vendor_id)->get()->getRowArray(); $ManufacturerModel = new ManufacturerModel(); - $data['manufacturers']=$ManufacturerModel->findAll(); + $data['manufacturers']=$ManufacturerModel->where('business_id', $this->session->get('logged_user_business_id'))->findAll(); $data['vendor'] = $vendor; $data['page_name'] = "Edit Vendor"; diff --git a/app/Models/BikemakeModel.php b/app/Models/BikemakeModel.php index 8b302c1..d9a967b 100644 --- a/app/Models/BikemakeModel.php +++ b/app/Models/BikemakeModel.php @@ -5,7 +5,7 @@ class BikemakeModel extends Model { protected $table = 'make'; protected $primaryKey = 'make_id'; - protected $allowedFields = ['make_id','make','isactive']; + protected $allowedFields = ['make_id','business_id','make','isactive']; } \ No newline at end of file diff --git a/app/Models/BikemodelsModel.php b/app/Models/BikemodelsModel.php index 12c019e..cbe7014 100644 --- a/app/Models/BikemodelsModel.php +++ b/app/Models/BikemodelsModel.php @@ -5,5 +5,5 @@ class BikemodelsModel extends Model { protected $table = 'model'; protected $primaryKey = 'model_id'; - protected $allowedFields = ['model_id','make_id','model_name','isactive']; + protected $allowedFields = ['model_id','business_id','make_id','model_name','isactive']; } \ No newline at end of file diff --git a/app/Models/ComplaintModel.php b/app/Models/ComplaintModel.php index ffe05d6..158e35b 100644 --- a/app/Models/ComplaintModel.php +++ b/app/Models/ComplaintModel.php @@ -5,5 +5,5 @@ class ComplaintModel extends Model { protected $table = 'complaints'; protected $primaryKey = 'complaint_id'; - protected $allowedFields = ['complaint_id','name','labour_charge','cgst','sgst','tax','isactive']; + protected $allowedFields = ['complaint_id','business_id','name','labour_charge','cgst','sgst','tax','isactive']; } \ No newline at end of file diff --git a/app/Models/ManufacturerModel.php b/app/Models/ManufacturerModel.php index 174e858..ee65b53 100644 --- a/app/Models/ManufacturerModel.php +++ b/app/Models/ManufacturerModel.php @@ -5,7 +5,7 @@ class ManufacturerModel extends Model { protected $table = 'manufacturer'; protected $primaryKey = 'manufacturer_id'; - protected $allowedFields = ['manufacturer_id','manufacturer_name','isactive','quality']; + protected $allowedFields = ['manufacturer_id','business_id','manufacturer_name','isactive','quality']; } \ No newline at end of file diff --git a/app/Models/PurchaseOrderModel.php b/app/Models/PurchaseOrderModel.php index 6e690ea..c3b64da 100644 --- a/app/Models/PurchaseOrderModel.php +++ b/app/Models/PurchaseOrderModel.php @@ -10,7 +10,7 @@ class PurchaseOrderModel extends Model public function getPurchaseOrdersWithProducts($logged_user_branch_id) { // Select required fields from both tables - $this->select('purchase_order.*, COUNT(purchase_order_child.purchase_order_id) AS product_count,vendor.vendor_name'); + $this->select('purchase_order.*, COUNT(purchase_order_child.purchase_order_id) AS product_count,vendor.vendor_name,SUM(purchase_order_child.qty) AS purchase_qty '); // Join the sales_order_product table based on sales_order_id $this->join('purchase_order_child', 'purchase_order_child.purchase_order_id = purchase_order.purchase_order_id'); diff --git a/app/Views/complaint_list.php b/app/Views/complaint_list.php index e65474c..690b86c 100644 --- a/app/Views/complaint_list.php +++ b/app/Views/complaint_list.php @@ -73,9 +73,7 @@
diff --git a/app/Views/product_form.php b/app/Views/product_form.php index f13d615..fea84cb 100644 --- a/app/Views/product_form.php +++ b/app/Views/product_form.php @@ -196,20 +196,18 @@
- - -
+ + + diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php index 1824196..a277e14 100644 --- a/app/Views/purchase_list.php +++ b/app/Views/purchase_list.php @@ -55,6 +55,7 @@ Contact Person Details Items + Qty Received Items Status Actions @@ -71,6 +72,7 @@
+ " class="edit-button" title="Return">      diff --git a/app/Views/service_form.php b/app/Views/service_form.php index e0f3060..b382dae 100644 --- a/app/Views/service_form.php +++ b/app/Views/service_form.php @@ -19,46 +19,50 @@

" method="post"> -

Service Details :


+

Service Details :

- + +
+
> + + +
+
> + +
-
> - - -
-
> - - -
+ +

+

Select Item :

+
- - + +
- - + +

-

Pricing Information :


+

Pricing Information :

@@ -102,15 +106,13 @@ $sgst = isset($services['sgst']) ? $services['sgst'] : 0; // SGST value (half of the tax amount) $tax = $cgst + $sgst; // Total tax (sum of CGST and SGST) ?> - - - +

-

Description Details :


+

Description Details :

@@ -302,7 +304,7 @@ document.getElementById('category').addEventListener('change', function() {