daybook approval filter

Apollo/api/application/models/DayBook_model.php

@@ -254,10 +254,7 @@ class DayBook_model extends CI_Model
             WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' 
             AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel')
 
-             and t1.Type='$exptype' 
+             ";
-
-            AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL)
-             ORDER BY ORDER_ID DESC";
         } 
         else {   $reqpayType = $reqDataBy['localBranchID'];
             $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName 
@@ -270,10 +267,42 @@ class DayBook_model extends CI_Model
             LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID  AND t7.BranchCode = t1.BranchCode
             WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel')
 
-             and t1.Type='$exptype' 
+             ";
-             AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL) 
-             ORDER BY ORDER_ID DESC";
         }
+
+
+        if($exptype != '')
+        {
+            $querys.="and t1.Type='$exptype'";
+        }
+
+        if($ModeOfPayment !='')
+        {
+            $querys.= "AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL)";
+        }
+
+        $querys.="ORDER BY ORDER_ID DESC";
+
+
+        // $this->db->select('t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName');
+        // $this->db->from('T_DayBookMaster t1');
+        // $this->db->join('T_PickListDetails t2','t2.ListCode = t1.Name','left');
+        // $this->db->join('T_Income_Outcome_Master t3','t3.ID = t1.Type  AND t3.BranchCode = t1.BranchCode','left');
+        // $this->db->join('T_Login t4','t4 ON t4.ID = t1.Approval_By','left');
+        // $this->db->join('T_StaffDetails t5','t5.StaffID = t4.StaffID','left');
+        // $this->
+
+
+
+
+
+
+
+
+
+
+
+
             $dayBookDetails = $this->db->query($querys);
             $dayBookDetailsList = $dayBookDetails->result();
             $results['dayBookListStatus']      = true;

Apollo/assets/js/controllers/daybookadminapprovalCtrl.js

@@ -127,7 +127,115 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
             } else {
             }
         });
+
+
+
+          var getExpenseType = {
+            method: 'POST',
+            url: apiPoint.url + 'getExpenseType/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                branch: localDetails.localBranchID,
+
             }
+        };
+        $http(getExpenseType).then(function (response) {
+            
+             if(response.data.status='200')
+             {
+                $scope.ExpenseType= response.data.details;
+             }
+
+             else
+             {
+
+             }
+        
+        });
+
+
+
+    }
+
+
+
+
+
+
+
+    $scope.searchData = {
+        "modeofpayment": "",
+        "exptype": ""
+    }
+
+
+    $scope.getfilterDetails=function(p)
+    {
+        // alert()
+     //console.log(p)
+    // return false;
+        // console.log(p.paymentOn.paymentOn)
+
+        if((p.expensetype != undefined)||(p.paymentOn != undefined))
+         {   
+
+            var getDayBookfilterDetails = {
+            method: 'POST',
+            url: apiPoint.url + 'getDayBookfilterDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.searchData,
+                localReqDetails: localDetails,
+                exptype:p.expensetype,
+                modeofpayment:p.paymentOn,
+                fdate:$scope.searchData.date,
+                tdate:$scope.searchData.dateTo
+            }
+        };
+        $http(getDayBookfilterDetails).then(function (response) {
+            if (response.data.dayBookListStatus) {
+                $scope.loadingsearch = false;
+               
+                $scope.searchResultDetails = response.data.dayBookListDetails;
+                $scope.searchResultDetailsCopy = response.data.dayBookListDetails;
+            } else {
+                $scope.loadingsearch = false;
+            }
+        });
+
+       }
+
+       else
+       {
+           $scope.getDayBookList();
+       }
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     $scope.loadingsearch = false;
     $scope.noRecordFound = true;

Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js

@@ -237,10 +237,11 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste
     $scope.getfilterDetails=function(p)
     {
         // alert()
-     //console.log(p.expensetype)
+    // console.log(p)
+    // return false;
         // console.log(p.paymentOn.paymentOn)
 
-        if((p.expensetype != undefined)&&(p.paymentOn.paymentOn != undefined))
+        if((p.expensetype != undefined)||(p.paymentOn != undefined))
          {   
 
             var getDayBookfilterDetails = {
@@ -253,7 +254,7 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste
                 data: $scope.searchData,
                 localReqDetails: localDetails,
                 exptype:p.expensetype,
-                modeofpayment:p.paymentOn.paymentOn,
+                modeofpayment:p.paymentOn,
                 fdate:$scope.searchData.date,
                 tdate:$scope.searchData.dateTo
             }

Apollo/assets/views/daybook/dayBookApproval.html

@@ -86,6 +86,82 @@
                                         </div> -->
                                         
                                     </div>
+
+
+
+
+
+
+
+<div class="row">
+
+
+        <div class="col-md-3">
+
+                <label>
+                    Mode Of Payment <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
+                    ng-model="updateModel.paymentOn"
+                    required>
+                    <option value=""> Select Payment</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
+
+                </select>
+        </div>
+
+        <div class="col-md-3">
+
+                <label>
+                    Expense Type <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="expensetype"
+                    ng-model="updateModel.expensetype"
+                    required>
+                    <option value=""> Select</option>
+
+                    <option  ng-repeat="exp in ExpenseType" value="{{exp.ID}}">{{exp.TypeName}}</option>
+                </select>
+        </div>
+
+
+        <div class="col-md-3">
+
+        <br/>
+
+            <button type="submit" class="btn btn-success btn-o" ng-click="getfilterDetails(updateModel);" tabindex="8">
+                    Submit
+            </button>
+
+        </div>
+
+
+</div>
+
+<div>
+<br/>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
                                             <span style="color: #007AFF;

Apollo/assets/views/daybook/dayBookadminApproval.html

@@ -91,6 +91,77 @@
 
                                         </div> -->
                                     </div>
+
+
+
+
+<div class="row">
+
+
+        <div class="col-md-3">
+
+                <label>
+                    Mode Of Payment <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
+                    ng-model="updateModel.paymentOn"
+                    required>
+                    <option value=""> Select Payment</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
+
+                </select>
+        </div>
+
+        <div class="col-md-3">
+
+                <label>
+                    Expense Type <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="expensetype"
+                    ng-model="updateModel.expensetype"
+                    required>
+                    <option value=""> Select</option>
+
+                    <option  ng-repeat="exp in ExpenseType" value="{{exp.ID}}">{{exp.TypeName}}</option>
+                </select>
+        </div>
+
+
+        <div class="col-md-3">
+
+        <br/>
+
+            <button type="submit" class="btn btn-success btn-o" ng-click="getfilterDetails(updateModel);" tabindex="8">
+                    Submit
+            </button>
+
+        </div>
+
+
+</div>
+
+<div>
+<br/>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
                                             <span style="color: #007AFF;

Apollo/assets/views/daybook/daybooksuperAdminApproval.html

@@ -79,10 +79,14 @@
                 </label>
                 <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
                     ng-model="updateModel.paymentOn"
-                    ng-options="payment.paymentOn for payment in paymentOptions"
                     required>
                     <option value=""> Select Payment</option>
-                    <option  ng-repeat="pay in paymentOptions" value="{{pay.paymentOn}}">{{pay.paymentOn}}</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
 
                 </select>
         </div>