sales report

dvbondoy · Feb 15, 2017 · 189cded · 189cded
1 parent f2e4ed1
commit 189cded
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 193 deletions.
diff --git a/www/app.module.js b/www/app.module.js
@@ -11,7 +11,7 @@
     'app.pouch',
     'app.model',
     'app.settings',
-    'app.sales'
-    // 'app.report'
+    'app.sales',
+    'app.report'
   ]);
 })();
diff --git a/www/index.html b/www/index.html
@@ -52,6 +52,7 @@
     <script src="model/model.sales.js"></script>
     <script src="model/model.local.js"></script>
     <script src="model/model.uom.js"></script>
+    <script src="model/model.reports.js"></script>
 
     <script src="settings/settings.module.js"></script>
     <script src="settings/settings.route.js"></script>
@@ -62,6 +63,10 @@
     <script src="sales/sales.route.js"></script>
     <script src="sales/sales.services.js"></script>
     <script src="sales/sales.controller.js"></script>
+
+    <script src="reports/report.module.js"></script>
+    <script src="reports/report.route.js"></script>
+    <script src="reports/report.controller.js"></script>
 
   </head>
   <body ng-app="app">

diff --git a/www/model/model.reports.js b/www/model/model.reports.js
@@ -0,0 +1,53 @@
+(function() {
+'use strict';
+
+    angular
+        .module('app.model')
+        .factory('Report', Report);
+
+    Report.$inject = ['$q'];
+    function Report($q) {
+        return {
+            salesToday:salesToday,
+            salesYesterday:salesYesterday,
+            dateRange:dateRange
+        };
+
+        function salesToday(){
+            var now = moment().format('YYYY-MM-DD');
+
+            return $q.when(_db.allDocs({include_docs:true,startkey:'sale/'+now,endkey:'sale/'+now+'\uffff'})
+            .then(function(docs){
+                return docs.rows.map(function(row){
+                    return row.doc;
+                });
+            }).catch(function(error){
+                return error;
+            }));
+        }
+
+        function salesYesterday() {
+            var yesterdate = moment().subtract(1, 'days').format('YYYY-MMM-DD');
+
+            return $q.when(_db.allDocs({include_docs:true,startkey:'sale/'+yesterdate,endkey:'sale/'+yesterdate+'uffff'})
+            .then(function(docs){
+                return docs.rows.map(function(row){
+                    return row.doc;
+                });
+            }).catch(function(error){
+                return error;
+            }));
+        }
+
+        function dateRange(from_date, to_date) {
+            return $q.when(_db.allDocs({include_docs:true,startkey:moment(from_date).format('YYYY-MM-DD'),endkey:moment(to_date).format('YYYY-MM-DD')+'\uffff'})
+            .then(function(docs){
+                return docs.rows.map(function(row){
+                    return row.doc;
+                });
+            }).catch(function(error){
+                return error;
+            }));
+        }
+    }
+})();
diff --git a/www/report/report.controller.js b/www/report/report.controller.js
diff --git a/www/report/templates/report.html b/www/report/templates/report.html
diff --git a/www/reports/report.controller.js b/www/reports/report.controller.js
@@ -0,0 +1,70 @@
+(function() {
+'use strict';
+
+  angular
+    .module('app.report')
+    .controller('ReportController', ReportController);
+
+  ReportController.$inject = ['$scope','Report','$ionicActionSheet'];
+  function ReportController($scope,Report,$ionicActionSheet) {
+    var vm = this;
+
+    // Report.salesToday().then(function(result){
+    //   console.log(result);
+    // });
+
+    $scope.Sales = {
+      list:[],
+      setDate:function(){
+        var sales = this;
+
+        var menu = [
+          {text:'Today'},{text:'Yesteday'},{text:'Date Range'}
+        ];
+
+        var hideSheet = $ionicActionSheet.show({
+          buttons:menu,
+          cancelText:'Cancel',
+          cancel:function(){
+            return 0;
+          },
+          buttonClicked:function(index){
+            switch(index){
+              case 0:
+              break;
+              case 1:
+              break;
+              case 2:
+            }
+          }
+        });
+      },
+      today:function(){
+        var sales = this;
+
+        Report.salesToday().then(function(result){
+          console.log('report.controller:46');
+          console.log(result);
+          sales.list = result;
+        });
+      },
+      yesteday:function(){
+        var sales = this;
+
+        Report.salesYesterday().then(function(result){
+          sales.list = result;
+        });
+      },
+      range:function(from, to){
+        var sales = this;
+
+        Report.dateRange(from, to).then(function(result){
+          sales.list = result;
+        });
+      }
+    };
+
+    $scope.Sales.today();
+
+  }
+})();
diff --git a/www/report/report.module.js → www/reports/report.module.js b/www/report/report.module.js → www/reports/report.module.js
diff --git a/www/report/report.route.js → www/reports/report.route.js b/www/report/report.route.js → www/reports/report.route.js
@@ -14,14 +14,7 @@
         state: 'app.report',
         config: {
           url: '/report',
-          templateUrl: 'report/templates/report.html'
-        }
-      },
-      {
-        state: 'app.sales_report',
-        config: {
-          url: '/sales_report',
-          templateUrl: 'report/templates/sales_report.html'
+          templateUrl: 'reports/templates/report.html'
         }
       }
     ];

diff --git a/...ort/templates/active-inventory-modal.html → ...rts/templates/active-inventory-modal.html b/...ort/templates/active-inventory-modal.html → ...rts/templates/active-inventory-modal.html
diff --git a/www/report/templates/active-inventory.html → www/reports/templates/active-inventory.html b/www/report/templates/active-inventory.html → www/reports/templates/active-inventory.html
diff --git a/www/report/templates/daily-activity.html → www/reports/templates/daily-activity.html b/www/report/templates/daily-activity.html → www/reports/templates/daily-activity.html
diff --git a/www/reports/templates/report.html b/www/reports/templates/report.html
@@ -0,0 +1,33 @@
+<ion-view view-title="Sales Reports" ng-controller="ReportController as vm">
+  <ion-nav-bar class="bar-stable bar-no-border" align-title="center">
+    <!-- Back button -->
+    <ion-nav-back-button>
+      Back
+    </ion-nav-back-button>
+
+    <!-- Burger button -->
+    <ion-nav-buttons side="left">
+      <button class="button button-icon button-clear ion-navicon" menu-toggle="left">
+      </button>
+    </ion-nav-buttons>
+
+    <!-- View order button-->
+    <ion-nav-buttons side="right">
+      <button class="button button-icon ion-calendar"></button>
+    </ion-nav-buttons>
+  </ion-nav-bar>
+
+  <ion-content>
+    <div class="padding">
+      <h2>Sales</h2>
+      <ion-list>
+        <ion-item ng-repeat="sale in Sales.list">
+          <span class="gray">Trans ID: {{sale._id}}</span>
+          <p>Time: {{sale.time}}</p>
+          <p>Charge: {{sale.charge | currency:"Php "}}</p>
+          <p>Items: {{sale.items.length}}</p>
+        </ion-item>
+      </ion-list>
+    </div>
+  </ion-content>
+</ion-view>
diff --git a/www/report/templates/sales-report-modal.html → ...reports/templates/sales-report-modal.html b/www/report/templates/sales-report-modal.html → ...reports/templates/sales-report-modal.html
diff --git a/www/report/templates/sales-report.html → www/reports/templates/sales-report.html b/www/report/templates/sales-report.html → www/reports/templates/sales-report.html