diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7e7fa97..954d2d0 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -63,6 +63,7 @@ $routes->post("get_models", "Products::get_models"); $routes->get("get_makes", "Products::get_makes"); $routes->post("save_make", "Products::save_make"); $routes->post("save_model", "Products::save_model"); +$routes->get("product_list_for_service", "Products::product_list_for_service"); //end products// //Sales order // @@ -146,6 +147,8 @@ $routes->get('dashboard', 'Users::dashboard'); $routes->post("add_service", "Service::add_service"); $routes->post("get_models_service", "Service::get_models"); $routes->get("delete_service/(:any)", "Service::delete_service/$1"); + $routes->post("get_product_by_models", "Service::get_product_by_models"); + // Service End's// diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index 1a66db3..532001d 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -219,6 +219,7 @@ class Products extends BaseController { foreach ($Vendors as $vendorsKey => $vendorsValue) { + print_r($vendorsValue);die; $modelsArray = json_decode($vendorsValue['model'], true); if (is_array($modelsArray)) { @@ -371,4 +372,13 @@ class Products extends BaseController return $this->response->setJSON($response); } + + + public function product_list_for_service(){ + $ProductModel = new ProductModel(); + $products = $ProductModel->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll(); + + return $this->response->setJSON($products); + } + } \ No newline at end of file diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 28459dc..4ebc8bf 100644 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -85,6 +85,8 @@ class Sales extends BaseController $encodedMakeId = json_encode([$makeId]); $encodedModelId = json_encode([$modelId]); + // print_r("aadhavan"); + // print_r($encodedMakeId);die; // Load the ProductModel $productModel = new ProductModel(); diff --git a/app/Controllers/Service.php b/app/Controllers/Service.php index 16705fa..d1b78d8 100644 --- a/app/Controllers/Service.php +++ b/app/Controllers/Service.php @@ -150,6 +150,7 @@ class Service extends BaseController 'service_name' => $this->request->getPost('servicename'), 'category' => $this->request->getPost('category'), 'product_id' => json_encode($this->request->getPost('product_id')), + 'sub_service_id' => json_encode($this->request->getPost('sub_service_id')), 'cgst' => $tax, 'sgst' => $tax, 'tax' => $this->request->getPost('tax'), @@ -222,7 +223,20 @@ 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); + } public function get_models() diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 5653f4f..a2a0d7f 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -155,7 +155,7 @@