diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 014c84f..4c0c863 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -140,7 +140,7 @@ $routes->get('dashboard', 'Users::dashboard'); // Model // $routes->get('bike_model_index/(:any)', 'Model::index/$1'); - $routes->post('create_model/(:any)', 'Model::create_model/(:any)'); + $routes->post('create_model/(:any)', 'Model::create_model/$1'); $routes->get('delete_model/(:any)', 'Model::delete_model/$1'); $routes->post('status_model', 'Model::status_model'); // Model End's// diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php index d80634b..a4d43ad 100644 --- a/app/Controllers/Jobcard.php +++ b/app/Controllers/Jobcard.php @@ -207,7 +207,7 @@ echo $html;die; // Using '&' to reference the original array element foreach ($servicedata as &$value) { $product_ids = !empty(json_decode($value['product_id'], true)) ? json_decode($value['product_id'], true) : [0]; - $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname') + $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname, products.qty_stock') ->join('products', 'products.product_id = job_card_product.product_id') ->whereIn('job_card_product.job_card_product_id', $product_ids)->findAll(); $value['product'] = $product; @@ -218,7 +218,7 @@ echo $html;die; // Using '&' to reference the original array element foreach ($complaintdata as &$value) { $product_ids = !empty(json_decode($value['product_id'], true)) ? json_decode($value['product_id'], true) : [0]; - $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname') + $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname, products.qty_stock') ->join('products', 'products.product_id = job_card_product.product_id') ->whereIn('job_card_product_id', $product_ids)->findAll(); $value['product'] = $product; @@ -230,7 +230,7 @@ echo $html;die; // Using '&' to reference the original array element foreach ($ccomplaintdata as &$value) { $product_ids = !empty(json_decode($value['product_id'], true)) ? json_decode($value['product_id'], true) : [0]; - $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname') + $product = $JobcardProductModel->select('job_card_product.* , products.product_name as pname, products.qty_stock') ->join('products', 'products.product_id = job_card_product.product_id') ->whereIn('job_card_product_id', $product_ids)->findAll(); $value['product'] = $product; @@ -266,7 +266,7 @@ echo $html;die; $encodedModelId = json_encode([$makeId]); // array_push($makeId, 0); // array_push($modelId, 0); - $product = $productModel->where('JSON_CONTAINS(make_id, \'' . $encodedModelId . '\')', null, false)->findAll(); + $product = $productModel->where('JSON_CONTAINS(make_id, \'' . $encodedModelId . '\')', null, false)->where('qty_stock >',0)->findAll(); $data['product']=$product; // echo json_encode($product);die; @@ -527,7 +527,7 @@ echo $html;die; foreach ($id_array as $key => $product_id) { $product = $JobcardProductModel->find($product_id); $qty = isset($product['qty']) ? $product['qty'] : 0; - if ($status == 'Paid') { + if ($status == 'Created') { $this->updateProductQuantity($ProductModel, $product['product_id'], $qty); }elseif ($status == 'Cancelled'){ $this->addBackProductQuantity($ProductModel, $product['product_id'], $qty); @@ -690,6 +690,7 @@ echo $html;die; // Query the database to find the service based on make_id and model_id $service = $ServiceModel->where('makes_id LIKE \'%"' . $makeId . '"%\'', null, false) ->where('models_id LIKE \'%"' . $modelId . '"%\'', null, false) + ->where('category',0) ->findAll(); $modelName = $this->BikemodelsModel->where('model_id',$modelId)->get()->getRow()->model_name; diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index e08d74b..4e8cdd6 100644 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -85,12 +85,14 @@ + - + + @@ -440,7 +442,7 @@ $(document).ready(async function() { for (const product of products) { total_wih_tax =( parseInt(product.amount) + (parseInt(product.amount) * (product.tax / 100)) )* product.qty; - console.log(total_wih_tax); + console.log(product.pname,product.qty_stock,'qty_stock'); total_tax_amt = total_wih_tax - ( parseInt(product.amount) * product.qty); var newRow = ` @@ -450,7 +452,7 @@ $(document).ready(async function() { newRow += '' + '' + '' + - '' + + '' + ' ' + '' + '' + @@ -941,7 +943,7 @@ $(window).on('load', function() { JSON.parse(data.product_id).forEach(async(element,index) => { if(element == 0) return; var product = products.find(function(item) { - return item.product_id == element; + return item.product_id == element && item.qty_stock > 0; }); var cgst = parseFloat(product.cgst); @@ -955,7 +957,7 @@ $(window).on('load', function() { newRow += '' + '' + '' + - '' + + '' + ' ' + '' + '' +