Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_IN CRM APP While Partner creating new "Nhance Branch" fields implemented (Odoo 2540)

Browse Source
This commit is contained in:
sanjeev.p 2025-12-18 12:51:47 +05:30
parent 70f8ed7fd8
commit 454428733f
3 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/PartnerStaffModel.php
View File

@ -16,7 +16,7 @@ class PartnerStaffModel extends Model
protected $useSoftDeletes = false; protected $useSoftDeletes = false;
// allowed fields for insert/update // allowed fields for insert/update
protected $allowedFields = ['name','email','mobile','emp_id','role_id','email_otp','is_active','created_by','updated_by','manager_id','retention_rate']; protected $allowedFields = ['name','email','mobile','emp_id','role_id','email_otp','is_active','created_by','updated_by','manager_id','retention_rate','nhance_branch_id'];
// automatic timestamps // automatic timestamps
protected $useTimestamps = true; protected $useTimestamps = true;

67
app/Views/UserList.php
View File

@ -609,7 +609,7 @@ table.dataTable tbody td {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="partner_name">Name<span class="text-danger">*</span></label> <label for="partner_name">Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="partner_name" placeholder="Ente Name" name="name" required> <input type="text" class="form-control" id="partner_name" placeholder="Enter Name" name="name" required>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="mobile_no">Mobile Number<span class="text-danger">*</span></label> <label for="mobile_no">Mobile Number<span class="text-danger">*</span></label>
@ -630,10 +630,20 @@ table.dataTable tbody td {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-6">
<label for="partner_nhance_branch_id">NHance Branch<span class="text-danger">*</span></label>
<select class="form-control" id="partner_nhance_branch_id" name="nhance_branch_id" required>
<option value="">Select NHance Branch</option>
<?php foreach($NHanceBranchData as $value) { ?>
<option value="<?= $value['id'] ?>"><?= $value['branch_name'] ?></option>
<?php } ?>
</select>
</div>
<!-- <div class="form-group col-md-6">
<label for="locn">Address</label> <label for="locn">Address</label>
<textarea class="form-control" id="locn" name="address" placeholder="Enter address" rows="3" maxlength="1500"></textarea> <textarea class="form-control" id="locn" name="address" placeholder="Enter address" rows="3" maxlength="1500"></textarea>
</div> </div> -->
</div> </div>
@ -880,12 +890,18 @@ table.dataTable tbody td {
$(document).ready(function () { $(document).ready(function () {
$('#nhance_branch_id').select2(); $('#nhance_branch_id').select2();
$('#partner_nhance_branch_id').select2();
$('#rm_id').select2(); $('#rm_id').select2();
$('#nhance_branch_id') $('#nhance_branch_id')
.val(null) // ✅ MUST be null .val(null) // ✅ MUST be null
.trigger('change.select2'); // ✅ correct trigger .trigger('change.select2'); // ✅ correct trigger
$('#partner_nhance_branch_id')
.val(null) // ✅ MUST be null
.trigger('change.select2'); // ✅ correct trigger
var incentiveMonthPicker = flatpickr("#incentive_month", { var incentiveMonthPicker = flatpickr("#incentive_month", {
dateFormat: "Y-m-d", // real value stored (hidden) dateFormat: "Y-m-d", // real value stored (hidden)
@ -1152,8 +1168,19 @@ table.dataTable tbody td {
$('#partner_name').val(user.name); $('#partner_name').val(user.name);
$('#email_addr').val(user.email); $('#email_addr').val(user.email);
$('#mobile_no').val(user.mobile); $('#mobile_no').val(user.mobile);
$('#locn').val(user.address); // $('#locn').val(user.address);
$('#retention_rate').val(user.retention_rate); $('#retention_rate').val(user.retention_rate);
if (user.nhance_branch_id !== null &&
user.nhance_branch_id !== "" &&
user.nhance_branch_id !== 0) {
$('#partner_nhance_branch_id')
.val(user.nhance_branch_id)
.trigger('change.select2');
} else {
$('#partner_nhance_branch_id')
.val(null) // ✅ MUST be null
.trigger('change.select2'); // ✅ correct trigger
}
// $('#btnPartnerSubmit').html('Update'); // $('#btnPartnerSubmit').html('Update');
$('.modal-title').html('Update Nhance Partner'); $('.modal-title').html('Update Nhance Partner');
let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal')); let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal'));
@ -1163,10 +1190,12 @@ table.dataTable tbody td {
$('body').on('click', '.btnPartnerDelete', function () { $('body').on('click', '.btnPartnerDelete', function () {
var partner_role = $(this).attr('data-role'); var partner_role = $(this).attr('data-role');
var alertText = "You need to remove this user"; var alertText = "You need to remove this user";
if (partner_role == 2) { if (partner_role == 3) {
alertText = "You need to remove this Staff"; alertText = "You need to remove this Staff";
} else if (partner_role == 2) {
alertText = "You need to remove this Handler";
} else if (partner_role == 1) { } else if (partner_role == 1) {
alertText = "You need to remove this Manager and related agent and staff are also delete"; alertText = "You need to remove this Manager and related Handler and Staff are also delete";
} }
Swal.fire({ Swal.fire({
@ -1246,23 +1275,25 @@ table.dataTable tbody td {
var name = document.getElementById('partner_name').value.trim(); var name = document.getElementById('partner_name').value.trim();
var mobile = document.getElementById('mobile_no').value.trim(); var mobile = document.getElementById('mobile_no').value.trim();
var email = document.getElementById('email_addr').value.trim(); var email = document.getElementById('email_addr').value.trim();
var address = document.getElementById('locn').value.trim(); // var address = document.getElementById('locn').value.trim();
var rate = document.getElementById('retention_rate').value.trim();
var nb = document.getElementById('partner_nhance_branch_id').value.trim();
// Validation checks // Validation checks
if (name === "" || mobile === "" || email === "") { if (name === "" || mobile === "" || email === "" || rate === "" || nb === "") {
console.log(name); // console.log(name);
console.log(mobile); // console.log(mobile);
console.log(email); // console.log(email);
toastr.warning('Please fill all required fields.', 'Warning'); toastr.warning('Please fill all required fields.', 'Warning');
form.classList.add('was-validated'); form.classList.add('was-validated');
return; return;
} }
if (address.length > 1500) { // if (address.length > 1500) {
toastr.error('Address cannot exceed 1500 characters', 'Warning'); // toastr.error('Address cannot exceed 1500 characters', 'Warning');
form.classList.add('was-validated'); // form.classList.add('was-validated');
return; // return;
} // }
var mobilePattern = /^[6-9]\d{9}$/; // must start with 6–9 and be 10 digits var mobilePattern = /^[6-9]\d{9}$/; // must start with 6–9 and be 10 digits
if (!mobilePattern.test(mobile)) { if (!mobilePattern.test(mobile)) {
@ -1857,7 +1888,9 @@ table.dataTable tbody td {
$('#email_addr').val(''); $('#email_addr').val('');
$('#partner_id').val(''); $('#partner_id').val('');
$('#mobile_no').val(''); $('#mobile_no').val('');
$('#locn').val(''); // $('#locn').val('');
$('#retention_rate').val('');
$('#partner_nhance_branch_id').val('0');
$('.modal-title').html('Add Nhance Partner'); $('.modal-title').html('Add Nhance Partner');
$('#PartnerForm').attr('action', '<?php echo base_url('/user/partner');?>'); $('#PartnerForm').attr('action', '<?php echo base_url('/user/partner');?>');
let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal')); let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal'));

1
app/Views/nhance_branch_list.php
View File

@ -150,6 +150,7 @@
}) })
function openModal(){ function openModal(){
resetValues();
var myModal = new bootstrap.Modal(document.getElementById('con-close-modal')); var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
myModal.show(); myModal.show();
} }