The-Mechanic/the_mechanic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
heama 2024-04-10 10:26:30 +05:30
commit e559698799
7 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/Vehicle.php
View File

@ -87,6 +87,7 @@ class Vehicle extends BaseController
'colour' => $this->request->getPost('colour'),
'year_of_manufacturing' => $this->request->getPost('year_of_manufacturing'),
'branch_id' => $this->session->get('logged_user_branch_id'),
'specific' => $this->request->getPost('specific'),
'isactive' => 1 // Assuming this is a default value or handled separately
];
// print_r($data);die;

39
app/Controllers/Vendor.php
View File

@ -36,29 +36,14 @@ class Vendor extends BaseController
if ($vendor_id === '0') {
$data['vendor'] = [];
$data['page_name'] = "Add Vendor";
$BikemakeModel = new BikemakeModel();
$data['make'] = $BikemakeModel->findAll();
$data['models'] = []; // Initialize models array for the view
} else {
$VendorModel = new VendorModel();
$vendor = $VendorModel->where('vendor_id', $vendor_id)->get()->getRowArray();
$vendor['model_ids'] = json_decode($vendor['model'], true);
$vendor['make_ids'] = json_decode($vendor['make'], true);
$data['vendor'] = $vendor;
$data['page_name'] = "Edit Vendor";
// Load models based on the selected make IDs
$BikemodelModel = new BikemodelsModel();
$models = [];
foreach ($vendor['make_ids'] as $make_id) {
$models[] = $BikemodelModel->where('make_id', $make_id)->findAll();
}
$data['models'] = $models; // Pass models array to the view
// Load make data
$BikemakeModel = new BikemakeModel();
$data['make'] = $BikemakeModel->findAll();
}
$data['vendor_id'] = $vendor_id;
@ -71,30 +56,28 @@ class Vendor extends BaseController
{
$VendorModel = new VendorModel();
// Retrieve the selected make IDs and model IDs from the form
$make_ids = $this->request->getPost('make');
$model_ids = $this->request->getPost('model');
// Convert model IDs to JSON format
$model_json = json_encode($model_ids);
$make_json=json_encode($make_ids);
$data = [
'vendor_name' => $this->request->getPost('vendor_name'),
'contact_name' => $this->request->getPost('contact_name'),
'gstnumber' => $this->request->getPost('gstnumber'),
'vendor_email' => $this->request->getPost('email'),
'address' => $this->request->getPost('address'),
'vendor_mobile' => $this->request->getPost('mobile'),
'city' => $this->request->getPost('city'),
'state' => $this->request->getPost('state'),
'postal_code' => $this->request->getPost('postalcode'),
'country' => $this->request->getPost('country'),
'category' => $this->request->getPost('category'),
'website' => $this->request->getPost('website'),
'contact_person_name1' => $this->request->getPost('contact_person_name1'),
'contact_person_name2' => $this->request->getPost('contact_person_name2'),
'contact_person_name3' => $this->request->getPost('contact_person_name3'),
'contact_person_mobile1' => $this->request->getPost('contact_person_mobile1'),
'contact_person_mobile2' => $this->request->getPost('contact_person_mobile2'),
'contact_person_mobile3' => $this->request->getPost('contact_person_mobile3'),
'contact_person_resignation1' => $this->request->getPost('contact_person_resignation1'),
'contact_person_resignation2' => $this->request->getPost('contact_person_resignation2'),
'contact_person_resignation3' => $this->request->getPost('contact_person_resignation3'),
'isactive' => 1 ,
'branch_id' => $this->session->get('logged_user_branch_id'),
'make' => $make_json, // Store the selected make IDs
'model' => $model_json, // Store the selected model IDs in JSON format
];
$vendor_id = $this->request->getPost('vendor_id');

2
app/Models/VehicleModel.php
View File

@ -7,7 +7,7 @@ class VehicleModel extends Model
protected $table = 'vehicle';
protected $primaryKey = 'vehicle_id';
protected $allowedFields = ['branch_id','vehicle_id','make','model','reg_no','year_of_manufacturing','colour','client_id','address','country','state','city','email','postal_code','mobile_no','isactive'];
protected $allowedFields = ['branch_id','vehicle_id','make','model','reg_no','year_of_manufacturing','colour','client_id','address','country','state','city','email','postal_code','mobile_no','specific','isactive'];
public function getCustomerandVehicle($branch_id)
{

2
app/Models/VendorModel.php
View File

@ -5,7 +5,7 @@ class VendorModel extends Model
{
protected $table = 'vendor';
protected $primaryKey = 'vendor_id';
protected $allowedFields = ['vendor_id','branch_id','vendor_name','vendor_email','vendor_mobile','contact_name','website','gstnumber','conatct_person','vendortype','make','model','category','address','state','postal_code','city','country','description','isactive'];
protected $allowedFields = ['vendor_id','branch_id','vendor_name','vendor_email','manufacturer_id','contact_person_name1','contact_person_name2','contact_person_name3','contact_person_mobile1','contact_person_mobile2','contact_person_mobile3','contact_person_designation1','contact_person_designation2','contact_person_designation3','gstnumber','conatct_person','vendortype','make','model','category','address','state','postal_code','city','country','description','isactive'];
public function get_vendors_by_model($model_ids)
{

4
app/Views/vehicle_form.php
View File

@ -57,6 +57,10 @@
<label for="inputPassword4" class="col-form-label">Colour</label>
<input type="text" class="form-control" name="colour" placeholder="Colour"value="<?= isset($vehicle['colour']) ? $vehicle['colour'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputPassword4" class="col-form-label">Specific</label>
<input type="text" class="form-control" name="specific" placeholder="Specific" value="<?= isset($vehicle['specific']) ? $vehicle['specific'] : '' ?>" >
</div>
</div>
</br>
<h4 class="header-title">Client Details :</h4>

102
app/Views/vendor_form.php
View File

@ -32,50 +32,31 @@
<label for="inputEmail4" class="col-form-label">Email</label>
<input type="email" class="form-control" name="email" placeholder="Email" value="<?= isset($vendor['vendor_email']) ? $vendor['vendor_email'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">Website<span class="text-danger"></span></label>
<input type="text" class="form-control" name="website" placeholder="Website" value="<?= isset($vendor['website']) ? $vendor['website'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">Category<span class="text-danger"></span></label>
<input type="text" class="form-control" name="category" placeholder="Category" value="<?= isset($vendor['category']) ? $vendor['category'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">GST Number<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="gstnumber" placeholder="GST Number" value="<?= isset($vendor['gstnumber']) ? $vendor['gstnumber'] : '' ?>" pattern="[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[0-9]{1}[Z]{1}[0-9A-Z]{1}" title="Enter a valid GST Number">
</div>
<div class="form-group col-md-4">
<label for="inputPassword4" class="col-form-label">Vendor Type<span class="text-danger">*</span></label>
<select class="form-control " name="vendortype" required data-toggle="select2" >
<!-- <option value="">Select a Status</option> -->
<option value="Retailer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Retailer' ? 'selected' : '' ?>>Retailer</option>
<option value="Authorised Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Authorised Dealer' ? 'selected' : '' ?>>Authorised Dealer</option>
<option value="Wholesale Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Wholesale Dealer' ? 'selected' : '' ?>>Wholesale Dealer</option>
<option value="Wholesale OEM Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Wholesale OEM Dealer' ? 'selected' : '' ?>>Wholesale OEM Dealer</option>
</select>
</div>
<div class="form-group col-md-6">
<label for="inputPassword4" class="col-form-label">Make<span class="text-danger">*</span></label>
<select class="form-control SelExample" id="make" name="make[]" required multiple>
<!-- Options for make -->
<?php foreach ($make as $value): ?>
<option value="<?= $value['make_id'] ?>" <?= isset($vendor['make_ids']) && in_array($value['make_id'], $vendor['make_ids']) ? 'selected' : '' ?>><?= $value['make'] ?></option>
<?php endforeach; ?>
</select>
</div>
<div class="form-group col-md-6">
<label for="inputPassword4" class="col-form-label">Model<span class="text-danger">*</span></label>
<select class="form-control status-select" id="model" name="model[]" required data-toggle="select2" multiple>
<!-- Options for models -->
<?php foreach ($models as $make_models): ?>
<?php foreach ($make_models as $model): ?>
<option value="<?= $model['model_id'] ?>" <?= isset($vendor['model_ids']) && in_array($model['model_id'], $vendor['model_ids']) ? 'selected' : '' ?>><?= $model['model_name'] ?></option>
<?php endforeach; ?>
<?php endforeach; ?>
</select>
</div>
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">GST Number<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="gstnumber" placeholder="GST Number" value="<?= isset($vendor['gstnumber']) ? $vendor['gstnumber'] : '' ?>" pattern="[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[0-9]{1}[Z]{1}[0-9A-Z]{1}" title="Enter a valid GST Number">
</div>
<div class="form-group col-md-4">
<label for="inputPassword4" class="col-form-label">Vendor Type<span class="text-danger">*</span></label>
<select class="form-control " name="vendortype" required data-toggle="select2" >
<option value="">Select a Type</option>
<option value="Retailer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Retailer' ? 'selected' : '' ?>>Retailer</option>
<option value="Authorised Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Authorised Dealer' ? 'selected' : '' ?>>Authorised Dealer</option>
<option value="Wholesale Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Wholesale Dealer' ? 'selected' : '' ?>>Wholesale Dealer</option>
<option value="Wholesale OEM Dealer" <?= isset($vendor['vendortype']) && $vendor['vendortype'] === 'Wholesale OEM Dealer' ? 'selected' : '' ?>>Wholesale OEM Dealer</option>
</select>
</div>
@ -84,16 +65,49 @@
<h4 class="header-title">Contact Person Details :</h4>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">Contact Person Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="contact_name" placeholder="Contactt Name" value="<?= isset($vendor['contact_name']) ? $vendor['contact_name'] : '' ?>" required>
<label for="inputEmail4" class="col-form-label">Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="contact_person_name1" placeholder="Name" value="<?= isset($vendor['contact_person_name1']) ? $vendor['contact_person_name1'] : '' ?>" required>
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Contact Mobile<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="mobile" placeholder="Mobile" value="<?= isset($vendor['vendor_mobile']) ? $vendor['vendor_mobile'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" required/>
<label for="inputAddress" class="col-form-label">Mobile<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="contact_person_mobile1" placeholder="Mobile" value="<?= isset($vendor['contact_person_mobile1']) ? $vendor['contact_person_mobile1'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" required/>
</div>
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Designation<span class="text-danger">*</span></label>
<input type="text" class="form-control" name="contact_person_designation1" placeholder="Designation" value="<?= isset($vendor['contact_person_designation1']) ? $vendor['contact_person_designation1'] : '' ?>" required/>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">Name</label>
<input type="text" class="form-control" name="contact_person_name2" placeholder="Name" value="<?= isset($vendor['contact_person_name2']) ? $vendor['contact_person_name2'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Mobile</label>
<input type="text" class="form-control" name="contact_person_mobile2" placeholder="Mobile" value="<?= isset($vendor['contact_person_mobile2']) ? $vendor['contact_person_mobile2'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" />
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Designation</label>
<input type="text" class="form-control" name="contact_person_designation2" placeholder="Designation" value="<?= isset($vendor['contact_person_designation2']) ? $vendor['contact_person_designation2'] : '' ?>" />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputEmail4" class="col-form-label">Name</label>
<input type="text" class="form-control" name="contact_person_name3" placeholder="Name" value="<?= isset($vendor['contact_person_name3']) ? $vendor['contact_person_name3'] : '' ?>" >
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Mobile</label>
<input type="text" class="form-control" name="contact_person_mobile3" placeholder="Mobile" value="<?= isset($vendor['contact_person_mobile3']) ? $vendor['contact_person_mobile3'] : '' ?>" maxlength="10" minlength="10" onkeypress = "return onlyNumbers(event)" />
</div>
<div class="form-group col-md-4">
<label for="inputAddress" class="col-form-label">Designation</label>
<input type="text" class="form-control" name="contact_person_designation3" placeholder="Designation" value="<?= isset($vendor['contact_person_designation3']) ? $vendor['contact_person_designation3'] : '' ?>" />
</div>
</div>
<input type="hidden" id="vendor_id" name="vendor_id" value="<?= isset($vendor['vendor_id']) ? $vendor['vendor_id'] : '' ?>">
<h4 class="header-title">Address Information :</h4>
<h4 class="header-title">Vendor Address Information :</h4>
<div class="form-row">
<div class="form-group col-md-6">
<label for="inputPassword4" class="col-form-label">Address</label>

4
app/Views/vendor_list.php
View File

@ -33,7 +33,6 @@
<th>#</th>
<th>Vendor Name</th>
<th>Email</th>
<th>Mobile</th>
<th>Category</th>
<th>Action</th>
@ -47,8 +46,7 @@
<tr>
<td><?= $value['vendor_id']; ?></td>
<td><?= $value['vendor_name']; ?></td>
<td><?= $value['vendor_email']; ?></td>
<td><?= $value['vendor_mobile']; ?></td>
<td><?= $value['vendor_email']; ?></td>
<td><?= $value['category']; ?></td> <!-- Call the model method -->
<td>
<a href="<?= "new_vendor/" . $value['vendor_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>