Merge branch 'main' of bitbucket.org:venbainformationtechnology/the_mechanic

This commit is contained in:
Gowtham M 2025-04-10 17:21:40 +05:30
commit 0d61440b6e

View File

@ -619,7 +619,7 @@ class Jobcard extends BaseController
$encodedMakeId1 = 0;
$encodedModelId1 = 0;
$selectServiceString = ($type == "With General") ? "services.wg_price,services.wg_labour_cost as labour_cost" : "services.wog_price,services.wog_labour_cost as labour_cost";
$selectServiceString = ($type == "General") ? "services.wg_price,services.wg_labour_cost as labour_cost" : "services.wog_price,services.wog_labour_cost as labour_cost";
// Query the database to find the service - cubic_capacity_id .. category 1 na standlone and ccId must
$service1 = $this->ServiceModel->select('services.service_id,services.branch_id,services.cubic_capacity_id,services.service_name,services.category,services.tax,services.cgst,services.sgst,services.description, services.product_id,services.sub_service_id,services.created_at,services.created_by,services.updated_at,services.updated_by,services.isactive,cubic_capacity.value')