diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 4de4dce..03c45a3 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -85,7 +85,7 @@ $routes->get('dashboard', 'Users::dashboard'); -//---------------------- Make And Model // Service +//---------------------- Make And Model | Service | Spare Manufacturer and Category // Make $routes->get('make_index', 'Make::index'); $routes->post('create_make', 'Make::create_make'); @@ -103,3 +103,16 @@ $routes->get("new_service/(:any)", "Service::new_service/$1"); $routes->post("add_service", "Service::add_service"); $routes->post("get_models_service", "Service::get_models"); $routes->get("delete_service/(:any)", "Service::delete_service/$1"); + + + +//Spare manufacturer + +$routes->get('spare_manufacturer_index', 'SpareManufacturer::index'); +$routes->post('create_spare_manufacturer', 'SpareManufacturer::create_make'); + +//Spare category + +$routes->get('spare_category_index/(:any)', 'SpareCategory::index/$1'); +$routes->post('create_model', 'SpareCategory::create_model'); +$routes->post('status_model', 'SpareCategory::status_model'); \ No newline at end of file diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index f76fa8a..cf686d3 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -6,7 +6,7 @@ use App\Models\ProductModel; use App\Models\BikemakeModel; use App\Models\VendorModel; use App\Models\BikemodelsModel; - + class Products extends BaseController { @@ -44,14 +44,24 @@ class Products extends BaseController $data['page_name']="Add Product"; } else if ($product_id !== '0') { $data['page_name']="Edit Product"; + $ProductModel = new ProductModel(); + $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray(); + + $data['products']=$products; + $BikemakeModel = new BikemakeModel(); $data['make'] = $BikemakeModel->findAll(); - $ProductModel = new ProductModel(); + $BikemodelsModel = new BikemodelsModel(); + $make_id = $products['make_id']; + $data['models'] = $BikemodelsModel->where('make_id', $make_id)->findAll(); + $tax=$ProductModel->getTax(); $data['tax']=$tax; - - $products=$ProductModel->where('product_id', $product_id)->get()->getRowArray(); - $data['products']=$products; + $VendorModel = new VendorModel(); + $data['vendors']=$VendorModel->findAll(); + + + // print_r($data);die; } $data['product_id'] = $product_id; diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index a2b85f9..af2e330 100644 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -63,7 +63,7 @@ class Sales extends BaseController $data['page_name']="Edit Sale Order"; $ClientModel = new ClientModel(); $client=$ClientModel->where('isactive',1)->where('branch_id',$this->session->get('logged_user_branch_id'))->findAll(); -$SalesOrderModel = new SalesOrderModel(); +$SalesOrderModel = new SalesOrderModel(); $sales=$SalesOrderModel->where('sales_order_id', $sales_order_id)->get()->getRowArray(); $data['sales']=$sales; $VehicleModel = new VehicleModel(); @@ -71,7 +71,7 @@ $vehicles = $VehicleModel->where('isactive',1)->where('vehicle_id',$sales['vehic ->where('branch_id',$this->session->get('logged_user_branch_id')) ->first(); $makeId = $vehicles['make']; - $modelId = $vehicles['model']; + $modelId = $vehicle['model']; // Encode the modelId before searching $encodedModelId = json_encode([$modelId]); diff --git a/app/Controllers/SpareManufacturer.php b/app/Controllers/SpareManufacturer.php new file mode 100644 index 0000000..2fe73f7 --- /dev/null +++ b/app/Controllers/SpareManufacturer.php @@ -0,0 +1,55 @@ +session = session(); + $this->SpareManufacturerModel = new SpareManufacturerModel(); + } + + public function index() + { + + $SpareManufacturerModel = new SpareManufacturerModel(); + $spare_manufacturer = $SpareManufacturerModel->findAll(); + $data['spare_manufacturer']=$spare_manufacturer; + + return view('spare_manufacturer_list',$data); + } + + + + public function create_make() + { + try { + $make_name = $this->request->getPost('makename'); + $SpareManufacturerModel = new SpareManufacturerModel(); + $data = [ + 'make' => $make_name + ]; + $inserted = $SpareManufacturerModel->insert($data); + if ($inserted) { + $result = $data; + return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + } else { + $result = "No Match's"; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + } + } catch (\Exception $e) { + return $this->respond(['status' => 'failed','code' => 500,'data' => $e],500); + } + } + +} \ No newline at end of file diff --git a/app/Models/SpareManufacturerModel.php b/app/Models/SpareManufacturerModel.php new file mode 100644 index 0000000..c8b1cbe --- /dev/null +++ b/app/Models/SpareManufacturerModel.php @@ -0,0 +1,11 @@ + - +<<<<<<< HEAD +
  • + + + Spare + +
    • + get('logged_user_role') == 'Floor Manager' || session()->get('logged_user_role') == 'Job Card Manager') { ?> diff --git a/app/Views/product_form.php b/app/Views/product_form.php index cc44005..8531590 100644 --- a/app/Views/product_form.php +++ b/app/Views/product_form.php @@ -1,4 +1,5 @@ +
    @@ -27,18 +28,29 @@
    - - -
    + + +
    +
    @@ -48,6 +60,13 @@
    diff --git a/app/Views/spare_manufacturer_list.php b/app/Views/spare_manufacturer_list.php new file mode 100644 index 0000000..21a0a95 --- /dev/null +++ b/app/Views/spare_manufacturer_list.php @@ -0,0 +1,179 @@ + + +
    +
    +
    +
    +

    Spare Manufacturer List

    +
    +
      +
    1. + + + +
      2. +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + +
    Spare Manufacturer QuantityAction
    + + + + " class="view-list-button" title="Model List" style="margin-left: 16px;"> + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + +