Area wise report generation fixed

abrarShariar · Jun 3, 2017 · 4256e80 · 4256e80
1 parent b9fba7b
commit 4256e80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/frontend/src/app/report/location-due-report/location-due-report.component.ts b/frontend/src/app/report/location-due-report/location-due-report.component.ts
@@ -37,7 +37,9 @@ export class LocationDueReportComponent implements OnInit {
                   report.current_due = res['current_due'];
                   report.previous_due = res['previous_due'];
                   report.total_due = res['total_due'];
-                  this.reportList.push(report);
+                  if (res['total_due'] != 0) {
+                    this.reportList.push(report);
+                  }
                 },
                 (err) => {
                   console.log("Error in getReport");

diff --git a/node-api/app/controllers/report.controller.ts b/node-api/app/controllers/report.controller.ts
@@ -40,43 +40,21 @@ export class ReportController {
             $and: [
                 {
                     customer_id: id
-                },
-                {
-                    $or: [
-                        {
-                            status: "Due"
-                        },
-                        {
-                            status: "Partially Paid"
-                        }
-                    ]
-
                 }
             ]
 
         }, function (err, recentInvoice) {
-            if (recentInvoice) {
+            if (!err) {
                 result['current_due'] = recentInvoice['amount_due'];
             }
             AllInvoiceModel.find({
                 $and: [
                     {
                         customer_id: id
-                    },
-                    {
-                        $or: [
-                            {
-                                status: "Due"
-                            },
-                            {
-                                status: "Partially Paid"
-                            }
-                        ]
-
                     }
                 ]
             }, function (err, allInvoice) {
-                if (allInvoice) {
+                if (!err) {
                     _.each(allInvoice, (item) => {
                         result['previous_due'] += item['amount_due'];
                     });