From 8230fc862e30185a58d99691b556b373989c5392 Mon Sep 17 00:00:00 2001 From: sriramv Date: Sat, 25 Aug 2018 15:25:56 +0530 Subject: [PATCH 1/3] Reregister Issues Fixed by sriram --- Apollo/assets/views/status-update/setFeesForStudent.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index bc77dd75..2e4562f4 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -413,7 +413,7 @@ - + From f3947c74d40608c87fa07caa78bed0295012e4e3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 25 Aug 2018 17:04:32 +0530 Subject: [PATCH 2/3] bill correction screen updated --- .../api/application/models/DayBook_model.php | 49 +++++++++---------- .../js/controllers/datacorrectionCtrl.js | 2 +- Apollo/assets/views/data_correction.html | 16 +++--- Apollo/assets/views/edit_daybookentries.html | 19 ++----- 4 files changed, 36 insertions(+), 50 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 60f646e6..606a2096 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -760,13 +760,11 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can { //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='') //{ - $this->db->select('T_DayBookMaster.ID,Name,Type,Amount,Date,T_DayBookMaster.Description,VoucherNumber,PaidTo,T_DayBookMaster.ModeOfPayment,FeePaymentDetails,Firstname,ListName,T_DayBookMaster.ReceiptNo,T_Students_Fees_PaidDetails.IsActive as IsActive,T_Students_Fees_PaidDetails.ID as FID,T_DayBookMaster.Reason as Reason'); - $this->db->from('T_DayBookMaster'); - $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_DayBookMaster.StudentID','left'); - $this->db->join('T_PickListDetails','T_PickListDetails.ListCode=T_DayBookMaster.Name','left'); - $this->db->join('T_Students_Fees_PaidDetails','T_Students_Fees_PaidDetails.ID = T_DayBookMaster.FeesPaymentID'); - - if($search['MobileNumber']!='') + $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo'); + $this->db->from('T_Students_Fees_PaidDetails'); + $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left'); + + if($search['MobileNumber']!='') { $this->db->where('T_StudentDetails.MobileNumber',$search['MobileNumber']); } @@ -777,8 +775,8 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can } if($search['receipt']!='') { - $this->db->where('T_DayBookMaster.VoucherNumber',$search['receipt']); - $this->db->or_where('T_DayBookMaster.ReceiptNo',$search['receipt']); + $this->db->where('T_Students_Fees_PaidDetails.ReceiptNo',$search['receipt']); + } $searchDetails = $this->db->get(); @@ -819,35 +817,36 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can // echo $dateTime; // die(); - $daybookarr['ID'] = $up_details['ID']; + //$daybookarr['ID'] = $up_details['ID']; // $daybookarr['IsActive'] = $up_details['IsActive']; - $daybookarr['Reason'] = $up_details['Reason']; - $daybookarr['UpdatedOn'] = $dateTime; - $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; + // $daybookarr['Reason'] = $up_details['Reason']; + // $daybookarr['UpdatedOn'] = $dateTime; + // $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; - if($up_details['IsActive'] == 0) - { - $daybookarr['Status'] = 'Cancel'; - } + // if($up_details['IsActive'] == 0) + // { + // $daybookarr['Status'] = 'Cancel'; + // } - else - { - $daybookarr['Status'] = 'Approved'; - } + // else + // { + // $daybookarr['Status'] = 'Approved'; + // } - $this->db->where('ID', $daybookarr['ID']); - $this->db->update('T_DayBookMaster', $daybookarr); + // $this->db->where('ID', $daybookarr['ID']); + // $this->db->update('T_DayBookMaster', $daybookarr); - $feearr['ID'] = $up_details['FeesPaymentID']; + //$feearr['ID'] = $up_details['FeesPaymentID']; $feearr['IsActive'] = $up_details['IsActive']; + $feearr['InternalComments'] = $up_details['Reason']; $feearr['UpdatedOn'] = $dateTime; $feearr['UpdatedBy'] = $up_details['branchId']; - $this->db->where('ID', $feearr['ID']); + $this->db->where('ID', $up_details['ID']); $this->db->update('T_Students_Fees_PaidDetails', $feearr); return TRUE; diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index eeab03dc..b00957e5 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -181,7 +181,7 @@ else if(myModel.IsActive == false) mobileNumber: myModel.mobileNumber, receipt: myModel.receipt, ID : myModel.ID, - FID : myModel.FID, + FID : myModel.FeesID, Date :myModel.Date, Amount :myModel.Amount, Reason : myModel.Reason, diff --git a/Apollo/assets/views/data_correction.html b/Apollo/assets/views/data_correction.html index 5e6673b6..d1064439 100644 --- a/Apollo/assets/views/data_correction.html +++ b/Apollo/assets/views/data_correction.html @@ -135,12 +135,10 @@ - - + - - + @@ -148,13 +146,11 @@ - + + + - - - - - + diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html index 49c3874c..f8c28d90 100644 --- a/Apollo/assets/views/edit_daybookentries.html +++ b/Apollo/assets/views/edit_daybookentries.html @@ -11,19 +11,10 @@
- +
-
- - -
- - +
- @@ -54,7 +45,7 @@ - @@ -67,7 +58,7 @@ Amount - +
From 291fc0befaa09ed497ccc44118172c6eb6b3bc22 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 25 Aug 2018 12:16:40 +0000 Subject: [PATCH 3/3] nav.html edited online with Bitbucket-access for bill correction --- Apollo/assets/views/partials/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 3e4d2679..9909bfd4 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1178,7 +1178,7 @@ -
  • +
  • DATA CORRECTION
    • TypeReceipt NoBill Number Paid To / Received From DateSemVoucher Number / Bill NumberReceipt No Amount Action
    {{p.ListName}}{{p.BillNO}}{{p.Firstname}}{{p.BillDate}} {{p.ReceiptNo}}{{p.PaidTo}}{{p.Date}}{{p.FeePaymentDetails}}{{p.VoucherNumber}}{{p.Amount}}{{p.BillAmount}}