diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 081e54f3..cca98a50 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -207,7 +207,7 @@ $scope.dayBookApprovalAccess = ''; value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo || '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname || '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-'; @@ -253,11 +253,12 @@ $scope.dayBookApprovalAccess = ''; col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, - col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, - col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + //col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, + col_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, + col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -289,11 +290,12 @@ $scope.dayBookApprovalAccess = ''; row.push(data.UnivCourseSem.toString()); row.push(data.Type.toString()); row.push(data.ReceiptNo.toString()); - row.push(data.Comments.toString()); + // row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); + row.push(data.Comments.toString()); body.push(row); } } diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 5bca1e9c..dec4defa 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -209,7 +209,7 @@ $scope.dayBookApprovalAccess = ''; value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo || '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname|| '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-'; @@ -255,11 +255,12 @@ $scope.dayBookApprovalAccess = ''; col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, - col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, - col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + //col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, + col_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, + col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -291,11 +292,12 @@ $scope.dayBookApprovalAccess = ''; row.push(data.UnivCourseSem.toString()); row.push(data.Type.toString()); row.push(data.ReceiptNo.toString()); - row.push(data.Comments.toString()); + // row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); + row.push(data.Comments.toString()); body.push(row); } } diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index f04e7a98..c9223e97 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -302,7 +302,7 @@ $scope.loadStaring = true; value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo || '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' ' +element.Lastname || '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-'; @@ -314,6 +314,7 @@ $scope.loadStaring = true; value['Status'] = element.Status || '-'; value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-'; value['Balance'] = element.Balance || '-'; + o[intDate] = value; intDate++; intDataSNo++; @@ -348,11 +349,12 @@ $scope.loadStaring = true; col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, - col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, - col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + // col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, + col_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, + col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -384,11 +386,12 @@ $scope.loadStaring = true; row.push(data.UnivCourseSem.toString()); row.push(data.Type.toString()); row.push(data.ReceiptNo.toString()); - row.push(data.Comments.toString()); + // row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); + row.push(data.Comments.toString()); body.push(row); } }