Updated: Angularjs to v1.2.0 final.

Updated: Loading-bar to v0.0.5
Updated: Using the $promise of function to return promises instead of $q and callback function.

brewman/static/scripts/account.js

@@ -4,15 +4,8 @@ var AccountListCtrl = ['$scope', 'accounts', function ($scope, accounts) {
     $scope.info = accounts;
 }];
 AccountListCtrl.resolve = {
-    accounts: ['$q', '$route', 'Account', function ($q, $route, Account) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Account.query({}, successCb);
-        return deferred.promise;
+    accounts: ['Account', function (Account) {
+        return Account.query({}).$promise;
     }]
 };
 
@@ -25,7 +18,7 @@ var AccountCtrl = ['$scope', '$location', '$modal', 'account', 'account_types',
     $scope.save = function () {
         $scope.account.$save(function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
-            $location.path('/Accounts')
+            $location.path('/Accounts');
         }, function (data, status) {
             $scope.toasts.push({Type: 'Danger', Message: data.data});
         });
@@ -34,7 +27,7 @@ var AccountCtrl = ['$scope', '$location', '$modal', 'account', 'account_types',
     $scope.delete = function () {
         $scope.account.$delete(function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
-            $location.path('/Accounts')
+            $location.path('/Accounts');
         }, function (data, status) {
             $scope.toasts.push({Type: 'Danger', Message: data.data});
         });
@@ -60,40 +53,19 @@ var AccountCtrl = ['$scope', '$location', '$modal', 'account', 'account_types',
             $scope.delete();
         });
     };
-
     $('#txtName').focus();
-}]
+}];
 
 AccountCtrl.resolve = {
-    account: ['$q', '$route', 'Account', function ($q, $route, Account) {
-        var deferred = $q.defer();
-
+    account: ['$route', 'Account', function ($route, Account) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        Account.get({id: id}, successCb);
-        return deferred.promise;
+        return Account.get({id: id}).$promise;
     }],
-    account_types: ['$q', 'AccountType', function ($q, AccountType) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        AccountType.query({}, successCb);
-        return deferred.promise;
+    account_types: ['AccountType', function (AccountType) {
+        return AccountType.query({}).$promise;
     }],
-    cost_centers: ['$q', 'CostCenter', function ($q, CostCenter) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        CostCenter.query({}, successCb);
-        return deferred.promise;
+    cost_centers: ['CostCenter', function (CostCenter) {
+        return CostCenter.query({}).$promise;
     }]
 };

brewman/static/scripts/angular_directive.js

@@ -8,7 +8,7 @@ overlord_directive.directive('fadey', function () {
             var duration = 500;
             element = jQuery(element);
             element.hide();
-            element.fadeIn(duration)
+            element.fadeIn(duration);
 
             scope.destroy = function (complete) {
                 element.fadeOut(duration, function () {

brewman/static/scripts/attendance.js

@@ -20,7 +20,7 @@ var AttendanceCtrl = ['$scope', '$location', 'dateFilter', 'Attendance', 'attend
         });
     };
     $('#txtDate').focus();
-}]
+}];
 
 var AttendanceSubCtrl = ['$scope', function ($scope) {
     $scope.original = {};
@@ -28,46 +28,35 @@ var AttendanceSubCtrl = ['$scope', function ($scope) {
 
     $scope.isLabel = function () {
         return true;
-    }
+    };
 
     $scope.isError = function () {
         return $scope.item.Worked === 'Error';
-    }
+    };
 
     $scope.isGood = function () {
         return $scope.item.Worked === true;
-    }
+    };
 
     $scope.isBad = function () {
         return $scope.item.Worked === false;
-    }
+    };
 
     $scope.isDirty = function () {
-        return !angular.equals($scope.original, $scope.item)
-    }
-}]
+        return !angular.equals($scope.original, $scope.item);
+    };
+}];
 
 AttendanceCtrl.resolve = {
-    info: ['$q', '$route', 'Attendance', function ($q, $route, Attendance) {
-        var deferred = $q.defer();
+    info: ['$route', 'Attendance', function ($route, Attendance) {
         var date = $route.current.params.date;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof date === 'undefined') {
-            Attendance.get({}, successCb);
+            return Attendance.get({}).$promise;
         } else {
-            Attendance.get({date: date}, successCb);
+            return Attendance.get({date: date}).$promise;
         }
-        return deferred.promise;
     }],
-    attendance_types: ['$q', 'AttendanceTypes', function ($q, AttendanceTypes) {
-        var deferred = $q.defer();
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-        AttendanceTypes.query({}, successCb);
-        return deferred.promise;
+    attendance_types: ['AttendanceTypes', function (AttendanceTypes) {
+        return AttendanceTypes.query({}).$promise;
     }]
 };

brewman/static/scripts/balance-sheet.js

@@ -12,20 +12,13 @@ var BalanceSheetCtrl = ['$scope', '$location', 'dateFilter', 'info', function ($
 }];
 
 BalanceSheetCtrl.resolve = {
-    info: ['$q', '$route', 'BalanceSheet', function ($q, $route, BalanceSheet) {
-        var deferred = $q.defer();
-
+    info: ['$route', 'BalanceSheet', function ($route, BalanceSheet) {
         var date = $route.current.params.date;
 
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof date === 'undefined') {
-            BalanceSheet.get({}, successCb);
+            return BalanceSheet.get({}).$promise;
         } else {
-            BalanceSheet.get({date:date}, successCb);
+            return BalanceSheet.get({date:date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/cash-flow.js

@@ -14,24 +14,17 @@ var CashFlowCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'cash_f
     $('#txtStartDate').focus();
 }];
 CashFlowCtrl.resolve = {
-    cash_flow:['$q', '$route', 'CashFlow', function ($q, $route, CashFlow) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    cash_flow:['$route', 'CashFlow', function ($route, CashFlow) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            CashFlow.get({}, successCb);
+            return CashFlow.get({}).$promise;
         } else if (typeof id === 'undefined') {
-            CashFlow.get({StartDate:start_date, FinishDate:finish_date}, successCb);
+            return CashFlow.get({StartDate:start_date, FinishDate:finish_date}).$promise;
         } else {
-            CashFlow.get({id:id, StartDate:start_date, FinishDate:finish_date}, successCb);
+            return CashFlow.get({id:id, StartDate:start_date, FinishDate:finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/client.js

@@ -2,18 +2,11 @@
 
 var ClientListCtrl = ['$scope', 'clients', function ($scope, clients) {
     $scope.info = clients;
-}]
+}];
 
 ClientListCtrl.resolve = {
-    clients: ['$q', 'Client', function ($q, Client) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Client.query({}, successCb);
-        return deferred.promise;
+    clients: ['Client', function (Client) {
+        return Client.query({}).$promise;
     }]
 };
 
@@ -59,18 +52,11 @@ var ClientCtrl = ['$scope', '$location', '$modal', 'client', function ($scope, $
         });
     };
     $('#txtName').focus();
-}]
+}];
 
 ClientCtrl.resolve = {
-    client: ['$q', '$route', 'Client', function ($q, $route, Client) {
-        var deferred = $q.defer();
-
+    client: ['$route', 'Client', function ($route, Client) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Client.get({id: id}, successCb);
-        return deferred.promise;
+        return Client.get({id: id}).$promise;
     }]
 };

brewman/static/scripts/closing-stock.js

@@ -12,20 +12,13 @@ var ClosingStockCtrl = ['$scope', '$location', 'dateFilter', 'info', function ($
 }];
 
 ClosingStockCtrl.resolve = {
-    info:['$q', '$route', 'ClosingStock', function ($q, $route, ClosingStock) {
-        var deferred = $q.defer();
-
+    info:['$route', 'ClosingStock', function ($route, ClosingStock) {
         var date = $route.current.params.date;
 
-        var successCb = function(result){
-          deferred.resolve(result);
-        };
-
         if (typeof date === 'undefined') {
-            ClosingStock.get({}, successCb);
+            return ClosingStock.get({}).$promise;
         } else {
-            ClosingStock.get({date:date}, successCb);
+            return ClosingStock.get({date:date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/cost-center.js

@@ -2,18 +2,11 @@
 
 var CostCenterListCtrl = ['$scope', 'cost_centers', function ($scope, cost_centers) {
     $scope.info = cost_centers;
-}]
+}];
 
 CostCenterListCtrl.resolve = {
-    cost_centers: ['$q', '$route', 'CostCenter', function ($q, $route, CostCenter) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        CostCenter.query({}, successCb);
-        return deferred.promise;
+    cost_centers: ['CostCenter', function (CostCenter) {
+        return CostCenter.query({}).$promise;
     }]
 };
 
@@ -38,18 +31,12 @@ var CostCenterCtrl = ['$scope', '$routeParams', '$location', 'cost_center', func
         });
     };
     $('#txtName').focus();
-}]
+}];
 
 CostCenterCtrl.resolve = {
-    cost_center: ['$q', '$route', 'CostCenter', function ($q, $route, CostCenter) {
-        var deferred = $q.defer();
-
+    cost_center: ['$route', 'CostCenter', function ($route, CostCenter) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        CostCenter.get({id: id}, successCb);
-        return deferred.promise;
+        return CostCenter.get({id: id}).$promise;
     }]
 };

brewman/static/scripts/daybook.js

@@ -12,23 +12,16 @@ var DaybookCtrl = ['$scope', '$location', 'dateFilter', 'info', function ($scope
         $location.path('/Daybook').search({StartDate:$scope.info.StartDate, FinishDate:$scope.info.FinishDate});
     };
     $('#txtStartDate').focus();
-}]
+}];
 DaybookCtrl.resolve = {
-    info:['$q', '$route', 'Daybook', function ($q, $route, Daybook) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function(result){
-            deferred.resolve(result);
-        };
+    info:['$route', 'Daybook', function ($route, Daybook) {
+        var start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            Daybook.get({}, successCb);
+            return Daybook.get({}).$promise;
         } else {
-            Daybook.get({StartDate:start_date, FinishDate:finish_date}, successCb);
+            return Daybook.get({StartDate:start_date, FinishDate:finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/employee-attendance.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var EmployeeAttendanceCtrl = ['$scope', '$location', '$q', '$routeParams', 'dateFilter', 'EmployeeAttendance', 'attendance_types', 'info', 'Employee', function ($scope, $location, $q, $routeParams, dateFilter, EmployeeAttendance, attendance_types, info, Employee) {
+var EmployeeAttendanceCtrl = ['$scope', '$location', '$routeParams', 'dateFilter', 'EmployeeAttendance', 'attendance_types', 'info', 'Employee', function ($scope, $location, $routeParams, dateFilter, EmployeeAttendance, attendance_types, info, Employee) {
     $scope.attendance_types = attendance_types;
     $scope.info = info;
     $scope.show = function () {
@@ -24,12 +24,8 @@ var EmployeeAttendanceCtrl = ['$scope', '$location', '$q', '$routeParams', 'date
     };
 
     $scope.employees = function ($viewValue) {
-        var deferred = $q.defer();
-        Employee.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
-    }
+        return Employee.autocomplete({term: $viewValue, count: 20}).$promise;
+    };
 
     $scope.save = function () {
         $scope.info.$save(function (u, putResponseHeaders) {
@@ -39,7 +35,7 @@ var EmployeeAttendanceCtrl = ['$scope', '$location', '$q', '$routeParams', 'date
         });
     };
     $('#txtEmployee').focus();
-}]
+}];
 
 var EmployeeAttendanceSubCtrl = ['$scope', function ($scope) {
     $scope.original = {};
@@ -47,48 +43,37 @@ var EmployeeAttendanceSubCtrl = ['$scope', function ($scope) {
 
     $scope.isLabel = function () {
         return true;
-    }
+    };
 
     $scope.isError = function () {
         return $scope.item.Worked === 'Error';
-    }
+    };
 
     $scope.isGood = function () {
         return $scope.item.Worked === true;
-    }
+    };
 
     $scope.isBad = function () {
         return $scope.item.Worked === false;
-    }
+    };
 
     $scope.isDirty = function () {
         return !angular.equals($scope.original, $scope.item)
-    }
-}]
+    };
+}];
 EmployeeAttendanceCtrl.resolve = {
-    info: ['$q', '$route', 'EmployeeAttendance', function ($q, $route, EmployeeAttendance) {
-        var deferred = $q.defer();
+    info: ['$route', 'EmployeeAttendance', function ($route, EmployeeAttendance) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
         if (typeof id === 'undefined') {
-            EmployeeAttendance.get({}, successCb);
+            return EmployeeAttendance.get({}).$promise;
         } else {
-            EmployeeAttendance.get({id: id, StartDate: start_date, FinishDate: finish_date}, successCb);
+            return EmployeeAttendance.get({id: id, StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }],
-    attendance_types: ['$q', 'AttendanceTypes', function ($q, AttendanceTypes) {
-        var deferred = $q.defer();
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-        AttendanceTypes.query({}, successCb);
-        return deferred.promise;
+    attendance_types: ['AttendanceTypes', function (AttendanceTypes) {
+        return AttendanceTypes.query({}).$promise;
     }]
 };

brewman/static/scripts/employee.js

@@ -84,15 +84,8 @@ var EmployeeListCtrl = ['$scope', '$location', '$routeParams', 'employees', func
 }];
 
 EmployeeListCtrl.resolve = {
-    employees: ['$q', '$route', 'Employee', function ($q, $route, Employee) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Employee.query({}, successCb);
-        return deferred.promise;
+    employees: ['Employee', function (Employee) {
+        return Employee.query({}).$promise;
     }]
 };
 
@@ -150,25 +143,12 @@ var EmployeeCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', '$modal
 }];
 
 EmployeeCtrl.resolve = {
-    employee: ['$q', '$route', 'Employee', function ($q, $route, Employee) {
-        var deferred = $q.defer();
-
+    employee: ['$route', 'Employee', function ($route, Employee) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        Employee.get({id: id}, successCb);
-        return deferred.promise;
+        return Employee.get({id: id}).$promise;
     }],
-    cost_centers: ['$q', '$route', 'CostCenter', function ($q, $route, CostCenter) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        CostCenter.query({}, successCb);
-        return deferred.promise;
+    cost_centers: ['CostCenter', function (CostCenter) {
+        return CostCenter.query({}).$promise;
     }]
 };

brewman/static/scripts/group.js

@@ -2,18 +2,11 @@
 
 var GroupListCtrl = ['$scope', 'groups', function ($scope, groups) {
     $scope.info = groups;
-}]
+}];
 
 GroupListCtrl.resolve = {
-    groups: ['$q', 'Group', function ($q, Group) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Group.query({}, successCb);
-        return deferred.promise;
+    groups: ['Group', function (Group) {
+        return Group.query({}).$promise;
     }]
 };
 
@@ -38,18 +31,11 @@ var GroupCtrl = ['$scope', '$location', 'group', function ($scope, $location, gr
         });
     };
     $('#txtName').focus();
-}]
+}];
 
 GroupCtrl.resolve = {
-    group: ['$q', '$route', 'Group', function ($q, $route, Group) {
-        var deferred = $q.defer();
-
+    group: ['$route', 'Group', function ($route, Group) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Group.get({id: id}, successCb);
-        return deferred.promise;
+        return Group.get({id: id}).$promise;
     }]
 };

brewman/static/scripts/home.js

@@ -3,31 +3,24 @@
 var HomeCtrl = ['$scope', '$location', 'messages', 'Message', function ($scope, $location, messages, Message) {
     $scope.chosen = messages.Type;
     $scope.info = messages.Threads;
-    $scope.tags = messages.Tags
+    $scope.tags = messages.Tags;
     $scope.getMessages = function (type) {
         Message.query({type: type}, function (result) {
             $scope.info = result.Threads;
             $scope.tags = result.Tags;
             $scope.chosen = result.Type;
         });
-    }
+    };
     $scope.getTags = function (tag) {
         Message.query({type: $scope.Type, tag: tag}, function (result) {
             $scope.info = result.Threads;
             $scope.tags = result.Tags;
             $scope.chosen = result.Type;
         });
-    }
+    };
 }];
 HomeCtrl.resolve = {
-    messages: ['$q', '$route', 'Message', function ($q, $route, Message) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Message.query({type: 'open'}, successCb);
-        return deferred.promise;
+    messages: ['Message', function (Message) {
+        return Message.query({type: 'open'}).$promise;
     }]
 };

brewman/static/scripts/issue.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var IssueCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'voucher', 'cost_centers', 'issue_grid', 'IssueGrid', 'Voucher', '$modal', 'Batch', function ($scope, $routeParams, $location, $q, dateFilter, voucher, cost_centers, issue_grid, IssueGrid, Voucher, $modal, Batch) {
+var IssueCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'voucher', 'cost_centers', 'issue_grid', 'IssueGrid', 'Voucher', '$modal', 'Batch', function ($scope, $routeParams, $location, dateFilter, voucher, cost_centers, issue_grid, IssueGrid, Voucher, $modal, Batch) {
     $scope.voucher = voucher;
     $scope.cost_centers = cost_centers;
     $scope.smallGrid = issue_grid;
@@ -224,74 +224,49 @@ var IssueCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'vou
     };
 
     $scope.batches = function ($viewValue) {
-        var deferred = $q.defer();
         var params = {term: $viewValue, count: 20};
         if (angular.isDate($scope.voucher.Date)) {
             params.date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         } else {
             params.date = $scope.voucher.Date;
         }
-        Batch.autocomplete(params, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Batch.autocomplete(params).$promise;
     };
 }];
 
 IssueCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var source = $route.current.params.Source;
-        var destination = $route.current.params.Destination;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
+        var id = $route.current.params.id,
+            source = $route.current.params.Source,
+            destination = $route.current.params.Destination;
 
         if (typeof source !== 'undefined' && typeof destination !== 'undefined' && typeof id !== 'undefined') {
-            Voucher.get({type: 'Issue', Date: id, Source: source, Destination: destination}, successCb);
+            return Voucher.get({type: 'Issue', Date: id, Source: source, Destination: destination}).$promise;
         } else if (typeof source === 'undefined' && typeof destination === 'undefined' && typeof id !== 'undefined') {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         } else {
-            Voucher.get({type: 'Issue'}, successCb);
+            return Voucher.get({type: 'Issue'}).$promise;
         }
-        return deferred.promise;
     }],
-    issue_grid: ['$q', '$route', 'IssueGrid', function ($q, $route, IssueGrid) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var source = $route.current.params.Source;
-        var destination = $route.current.params.Destination;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    issue_grid: ['$route', 'IssueGrid', function ($route, IssueGrid) {
+        var id = $route.current.params.id,
+            source = $route.current.params.Source,
+            destination = $route.current.params.Destination;
 
         if (typeof source !== 'undefined' && typeof destination !== 'undefined' && typeof id !== 'undefined') {
-            IssueGrid.query({date: id, Source: source, Destination: destination}, successCb);
+            return IssueGrid.query({date: id, Source: source, Destination: destination}).$promise;
         } else if (typeof source === 'undefined' && typeof destination === 'undefined' && typeof id !== 'undefined') {
-            IssueGrid.query({date: id}, successCb);
+            return IssueGrid.query({date: id}).$promise;
         } else {
-            deferred.resolve([]);
+            return [];
         }
-        return deferred.promise;
     }],
-    cost_centers: ['$q', 'CostCenter', function ($q, CostCenter) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        CostCenter.query({}, successCb);
-        return deferred.promise;
+    cost_centers: ['CostCenter', function (CostCenter) {
+        return CostCenter.query({}).$promise;
     }]
 };
 
-var IssueModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Batch', function ($scope, $modalInstance, $q, edit, Batch) {
+var IssueModalCtrl = ['$scope', '$modalInstance', 'edit', 'Batch', function ($scope, $modalInstance, edit, Batch) {
     $scope.edit = edit;
     $scope.ok = function () {
         $scope.edit.Product = $scope.edit.Batch.Product;
@@ -306,10 +281,6 @@ var IssueModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Batch', functio
         $modalInstance.dismiss('cancel');
     };
     $scope.batches = function ($viewValue) {
-        var deferred = $q.defer();
-        Batch.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Batch.autocomplete({term: $viewValue, count: 20}).$promise;
     };
-}]
+}];

brewman/static/scripts/journal.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var JournalCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'Account', function ($scope, $location, $q, dateFilter, $modal, voucher, Account) {
+var JournalCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Account', function ($scope, $location, dateFilter, $modal, voucher, Account) {
     $('#txtAccount').focus();
 
     $scope.voucher = voucher;
@@ -151,34 +151,22 @@ var JournalCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, a: true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];
 
 JournalCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
         var id = $route.current.params.id;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof id === 'undefined') {
-            Voucher.get({type: 'Journal'}, successCb);
+            return Voucher.get({type: 'Journal'}).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }]
 };
 
-var JournalModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', function ($scope, $modalInstance, $q, edit, Account) {
+var JournalModalCtrl = ['$scope', '$modalInstance', 'edit', 'Account', function ($scope, $modalInstance, edit, Account) {
     $scope.toggleDebit = function () {
         $scope.edit.Debit = ($scope.edit.Debit === 1) ? -1 : 1;
     };
@@ -192,10 +180,6 @@ var JournalModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', fun
         $modalInstance.dismiss('cancel');
     };
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];

brewman/static/scripts/ledger.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var LedgerCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'ledger', 'Ledger', 'Account', function ($scope, $routeParams, $location, $q, dateFilter, ledger, Ledger, Account) {
+var LedgerCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'ledger', 'Ledger', 'Account', function ($scope, $routeParams, $location, dateFilter, ledger, Ledger, Account) {
     $scope.info = ledger;
     $scope.show = function () {
         var id = $scope.info.Ledger.LedgerID;
@@ -62,32 +62,21 @@ var LedgerCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'le
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];
 
 LedgerCtrl.resolve = {
-    ledger: ['$q', '$route', 'Ledger', function ($q, $route, Ledger) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    ledger: ['$route', 'Ledger', function ($route, Ledger) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof id === 'undefined') {
-            Ledger.get({}, successCb);
+            return Ledger.get({}).$promise;
         } else {
-            Ledger.get({id: id, StartDate: start_date, FinishDate: finish_date}, successCb);
+            return Ledger.get({id: id, StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };
 

brewman/static/scripts/message.js

@@ -39,23 +39,17 @@ var MessageCtrl = ['$scope', '$location', 'dateFilter', 'message', 'tags', 'user
 }];
 
 MessageCtrl.resolve = {
-    message: ['$q', '$route', 'Message', function ($q, $route, Message) {
-        var deferred = $q.defer();
-
+    message: ['$route', 'Message', function ($route, Message) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        Message.get({id: id}, successCb);
-        return deferred.promise;
+        return Message.get({id: id}).$promise;
     }],
     tags: ['$q', 'Tag', function ($q, Tag) {
         var deferred = $q.defer();
         var successCb = function (result) {
             var len = result.length;
             var i = 0;
-            var list = []
+            var list = [];
             for (i = 0; i < len; i++) {
                 list.push(result[i].Name);
             }
@@ -69,7 +63,7 @@ MessageCtrl.resolve = {
         var successCb = function (result) {
             var len = result.length;
             var i = 0;
-            var list = []
+            var list = [];
             for (i = 0; i < len; i++) {
                 list.push(result[i].Name);
             }
@@ -78,17 +72,15 @@ MessageCtrl.resolve = {
         User.names({}, successCb);
         return deferred.promise;
     }],
-    priorities: ['$q', function ($q) {
-        var deferred = $q.defer();
-        deferred.resolve([
+    priorities: [function () {
+        return [
             {id: 1, name: 'Critical'},
             {id: 2, name: 'Urgent'},
             {id: 3, name: 'Semi-Urgent'},
             {id: 4, name: 'Normal'},
             {id: 5, name: 'Below-Normal'},
             {id: 6, name: 'Casual'}
-        ]);
-        return deferred.promise;
+        ];
     }]
 
 };

brewman/static/scripts/net-transactions.js

@@ -15,21 +15,14 @@ var NetTransactionsCtrl = ['$scope', '$location', 'dateFilter', 'net_transaction
 }];
 
 NetTransactionsCtrl.resolve = {
-    net_transactions: ['$q', '$route', 'NetTransactions', function ($q, $route, NetTransactions) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    net_transactions: ['$route', 'NetTransactions', function ($route, NetTransactions) {
+        var start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            NetTransactions.get({}, successCb);
+            return NetTransactions.get({}).$promise;
         } else {
-            NetTransactions.get({StartDate: start_date, FinishDate: finish_date}, successCb);
+            return NetTransactions.get({StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/payment.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var PaymentCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'ledgers', 'Account', function ($scope, $location, $q, dateFilter, $modal, voucher, ledgers, Account) {
+var PaymentCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'ledgers', 'Account', function ($scope, $location, dateFilter, $modal, voucher, ledgers, Account) {
     $('#txtAccount').focus();
 
     $scope.voucher = voucher;
@@ -149,49 +149,31 @@ var PaymentCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, a: true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];
 
 PaymentCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var account = $route.current.params.a;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
+        var id = $route.current.params.id,
+            account = $route.current.params.a;
 
         if (typeof id === 'undefined') {
             var options = {type: 'Payment'};
             if (!angular.isUndefined(account)) {
                 options.a = account;
             }
-            Voucher.get(options, successCb);
+            return Voucher.get(options).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }],
-    ledgers: ['$q', 'Account', function ($q, Account) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Account.autocomplete({term: '', type: 1}, successCb);
-        return deferred.promise;
+    ledgers: ['Account', function (Account) {
+        return Account.autocomplete({term: '', type: 1}).$promise;
     }]
-}
+};
 
-var PaymentModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', function ($scope, $modalInstance, $q, edit, Account) {
+var PaymentModalCtrl = ['$scope', '$modalInstance', 'edit', 'Account', function ($scope, $modalInstance, edit, Account) {
     $scope.edit = edit;
     $scope.ok = function () {
         $scope.edit.Amount = Number($scope.edit.Amount);
@@ -201,10 +183,6 @@ var PaymentModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', fun
         $modalInstance.dismiss('cancel');
     };
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];

brewman/static/scripts/product-group.js

@@ -5,15 +5,8 @@ var ProductGroupListCtrl = ['$scope', 'product_groups', function ($scope, produc
 }];
 
 ProductGroupListCtrl.resolve = {
-    product_groups: ['$q', 'ProductGroup', function ($q, ProductGroup) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        ProductGroup.query({}, successCb);
-        return deferred.promise;
+    product_groups: ['ProductGroup', function (ProductGroup) {
+        return ProductGroup.query({}).$promise;
     }]
 };
 
@@ -41,15 +34,8 @@ var ProductGroupCtrl = ['$scope', '$location', 'product_group', function ($scope
 }];
 
 ProductGroupCtrl.resolve = {
-    product_group: ['$q', '$route', 'ProductGroup', function ($q, $route, ProductGroup) {
-        var deferred = $q.defer();
-
+    product_group: ['$route', 'ProductGroup', function ($route, ProductGroup) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        ProductGroup.get({id: id}, successCb);
-        return deferred.promise;
+        return ProductGroup.get({id: id}).$promise;
     }]
 };

brewman/static/scripts/product-ledger.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var ProductLedgerCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'product_ledger', 'ProductLedger', 'Product', function ($scope, $routeParams, $location, $q, dateFilter, product_ledger, ProductLedger, Product) {
+var ProductLedgerCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'product_ledger', 'ProductLedger', 'Product', function ($scope, $routeParams, $location, dateFilter, product_ledger, ProductLedger, Product) {
     $scope.info = product_ledger;
     $scope.show = function () {
         var id = $scope.info.Product.ProductID;
@@ -23,32 +23,21 @@ var ProductLedgerCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilte
     };
 
     $scope.products = function ($viewValue) {
-        var deferred = $q.defer();
-        Product.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Product.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 
     $('#txtProduct').focus();
 }];
 ProductLedgerCtrl.resolve = {
-    product_ledger: ['$q', '$route', 'ProductLedger', function ($q, $route, ProductLedger) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    product_ledger: ['$route', 'ProductLedger', function ($route, ProductLedger) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof id === 'undefined') {
-            ProductLedger.get({}, successCb);
+            return ProductLedger.get({}).$promise;
         } else {
-            ProductLedger.get({id: id, StartDate: start_date, FinishDate: finish_date}, successCb);
+            return ProductLedger.get({id: id, StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
-}
+};

brewman/static/scripts/product.js

@@ -80,15 +80,8 @@ var ProductListCtrl = ['$scope', '$location', '$routeParams', 'products', functi
 }];
 
 ProductListCtrl.resolve = {
-    products: ['$q', '$route', 'Product', function ($q, $route, Product) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Product.query({}, successCb);
-        return deferred.promise;
+    products: ['Product', function (Product) {
+        return Product.query({}).$promise;
     }]
 };
 
@@ -139,25 +132,12 @@ var ProductCtrl = ['$scope', '$location', '$modal', 'product', 'product_groups',
 }];
 
 ProductCtrl.resolve = {
-    product: ['$q', '$route', 'Product', function ($q, $route, Product) {
-        var deferred = $q.defer();
-
+    product: ['$route', 'Product', function ($route, Product) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        Product.get({id: id}, successCb);
-        return deferred.promise;
+        return Product.get({id: id}).$promise;
     }],
-    product_groups: ['$q', 'ProductGroup', function ($q, ProductGroup) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        ProductGroup.query({}, successCb);
-        return deferred.promise;
+    product_groups: ['ProductGroup', function (ProductGroup) {
+        return ProductGroup.query({}).$promise;
     }]
 };

brewman/static/scripts/profit-loss.js

@@ -15,21 +15,14 @@ var ProfitLossCtrl = ['$scope', '$location', 'dateFilter', 'profit_loss', functi
 }];
 
 ProfitLossCtrl.resolve = {
-    profit_loss: ['$q', '$route', 'ProfitLoss', function ($q, $route, ProfitLoss) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    profit_loss: ['$route', 'ProfitLoss', function ($route, ProfitLoss) {
+        var start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            ProfitLoss.get({}, successCb);
+            return ProfitLoss.get({}).$promise;
         } else {
-            ProfitLoss.get({StartDate: start_date, FinishDate: finish_date}, successCb);
+            return ProfitLoss.get({StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/purchase-entries.js

@@ -16,23 +16,14 @@ var PurchaseEntriesCtrl = ['$scope', '$location', 'dateFilter', 'purchase_entrie
 }];
 
 PurchaseEntriesCtrl.resolve = {
-    purchase_entries: ['$q', '$route', 'PurchaseEntries', function ($q, $route, PurchaseEntries) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    purchase_entries: ['$route', 'PurchaseEntries', function ($route, PurchaseEntries) {
+        var start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            PurchaseEntries.get({}, successCb);
+            return PurchaseEntries.get({}).$promise;
         } else {
-            PurchaseEntries.get({StartDate: start_date, FinishDate: finish_date}, successCb);
+            return PurchaseEntries.get({StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };
-
-

brewman/static/scripts/purchase-return.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var PurchaseReturnCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'Account', 'Batch', function ($scope, $location, $q, dateFilter, $modal, voucher, Account, Batch) {
+var PurchaseReturnCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Account', 'Batch', function ($scope, $location, dateFilter, $modal, voucher, Account, Batch) {
     $scope.voucher = voucher;
     $scope.rate = 0;
     function getOldInventory(productID, inventories) {
@@ -158,48 +158,33 @@ var PurchaseReturnCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', '
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, a:true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20, a:true}).$promise;
     };
     $scope.batches = function ($viewValue) {
-        var deferred = $q.defer();
         var params = {term: $viewValue, count: 20};
+
         if (angular.isDate($scope.voucher.Date)) {
             params.date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         } else {
             params.date = $scope.voucher.Date;
         }
-        Batch.autocomplete(params, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Batch.autocomplete(params).$promise;
     };
 }];
 
 PurchaseReturnCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
         var id = $route.current.params.id;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof id === 'undefined') {
-            Voucher.get({type: 'Purchase Return'}, successCb);
+            return Voucher.get({type: 'Purchase Return'}).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }]
 };
 
 
-var PurchaseReturnModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Batch', function ($scope, $modalInstance, $q, edit, Batch) {
+var PurchaseReturnModalCtrl = ['$scope', '$modalInstance', 'edit', 'Batch', function ($scope, $modalInstance, edit, Batch) {
     $scope.edit = edit;
     $scope.ok = function () {
         $scope.edit.Product = $scope.edit.Batch.Product;
@@ -214,10 +199,6 @@ var PurchaseReturnModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Batch'
         $modalInstance.dismiss('cancel');
     };
     $scope.batches = function ($viewValue) {
-        var deferred = $q.defer();
-        Batch.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Batch.autocomplete({term: $viewValue, count: 20}).$promise;
     };
-}]
+}];

brewman/static/scripts/purchase.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var PurchaseCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'Account', 'Product', function ($scope, $location, $q, dateFilter, $modal, voucher, Account, Product) {
+var PurchaseCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Account', 'Product', function ($scope, $location, dateFilter, $modal, voucher, Account, Product) {
     $scope.voucher = voucher;
     function getOldInventory(productID, inventories) {
         if (angular.isUndefined(productID)) {
@@ -163,42 +163,27 @@ var PurchaseCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'vouche
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, a:true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20, a: true}).$promise;
     };
 
     $scope.products = function ($viewValue) {
-        var deferred = $q.defer();
-        Product.autocomplete({term: $viewValue, count: 20, a:true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Product.autocomplete({term: $viewValue, count: 20, a: true}).$promise;
     };
 }];
 
 PurchaseCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
         var id = $route.current.params.id;
 
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof id === 'undefined') {
-            Voucher.get({type: 'Purchase'}, successCb);
+            return Voucher.get({type: 'Purchase'}).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }]
 };
 
-var PurchaseModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Product', function ($scope, $modalInstance, $q, edit, Product) {
+var PurchaseModalCtrl = ['$scope', '$modalInstance', 'edit', 'Product', function ($scope, $modalInstance, edit, Product) {
     $scope.edit = edit;
     $scope.ok = function () {
         $scope.edit.Quantity = Number(edit.Quantity);
@@ -212,10 +197,6 @@ var PurchaseModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Product', fu
         $modalInstance.dismiss('cancel');
     };
     $scope.products = function ($viewValue) {
-        var deferred = $q.defer();
-        Product.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
-    }
-}]
+        return Product.autocomplete({term: $viewValue, count: 20}).$promise;
+    };
+}];

brewman/static/scripts/purchases.js

@@ -13,21 +13,14 @@ var PurchasesCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'purch
     };
 }];
 PurchasesCtrl.resolve = {
-    purchases:['$q', '$route', 'Purchases', function ($q, $route, Purchases) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.s;
-        var finish_date = $route.current.params.f;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    purchases:['$route', 'Purchases', function ($route, Purchases) {
+        var start_date = $route.current.params.s,
+            finish_date = $route.current.params.f;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            Purchases.get({}, successCb);
+            return Purchases.get({}).$promise;
         } else {
-            Purchases.get({s:start_date, f:finish_date}, successCb);
+            return Purchases.get({s:start_date, f:finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/raw-material-cost.js

@@ -13,25 +13,19 @@ var RawMaterialCostCtrl = ['$scope', '$location', 'dateFilter', 'raw_material_co
     };
     $('#txtStartDate').focus();
 }];
+
 RawMaterialCostCtrl.resolve = {
-    raw_material_cost: ['$q', '$route', 'RawMaterialCost', function ($q, $route, RawMaterialCost) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    raw_material_cost: ['$route', 'RawMaterialCost', function ($route, RawMaterialCost) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            RawMaterialCost.get({}, successCb);
+           return RawMaterialCost.get({}).$promise;
         } else if (typeof id === 'undefined') {
-            RawMaterialCost.get({StartDate: start_date, FinishDate: finish_date}, successCb);
+           return RawMaterialCost.get({StartDate: start_date, FinishDate: finish_date}).$promise;
         } else {
-            RawMaterialCost.get({id: id, StartDate: start_date, FinishDate: finish_date}, successCb);
+            return RawMaterialCost.get({id: id, StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/receipt.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var ReceiptCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'ledgers', 'Voucher', 'Account', function ($scope, $routeParams, $location, $q, dateFilter, $modal, voucher, ledgers, Voucher, Account) {
+var ReceiptCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', '$modal', 'voucher', 'ledgers', 'Voucher', 'Account', function ($scope, $routeParams, $location, dateFilter, $modal, voucher, ledgers, Voucher, Account) {
     $('#txtAccount').focus();
 
     $scope.voucher = voucher;
@@ -149,49 +149,31 @@ var ReceiptCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', '$
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, 'a': true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20, 'a': true}).$promise;
     };
 }];
 
 ReceiptCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var account = $route.current.params.a;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
+        var id = $route.current.params.id,
+            account = $route.current.params.a;
 
         if (typeof id === 'undefined') {
             var options = {type: 'Receipt'};
             if (!angular.isUndefined(account)) {
                 options.a = account;
             }
-            Voucher.get(options, successCb);
+            return Voucher.get(options).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }],
-    ledgers: ['$q', 'Account', function ($q, Account) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Account.autocomplete({term: '', type: 1}, successCb);
-        return deferred.promise;
+    ledgers: ['Account', function (Account) {
+        return Account.autocomplete({term: '', type: 1}).$promise;
     }]
 };
 
-var ReceiptModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', function ($scope, $modalInstance, $q, edit, Account) {
+var ReceiptModalCtrl = ['$scope', '$modalInstance', 'edit', 'Account', function ($scope, $modalInstance, edit, Account) {
     $scope.edit = edit;
     $scope.ok = function () {
         $scope.edit.Amount = Number($scope.edit.Amount);
@@ -201,10 +183,6 @@ var ReceiptModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Account', fun
         $modalInstance.dismiss('cancel');
     };
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
-    }
-}]
+        return Account.autocomplete({term: $viewValue, count: 20}).$promise;
+    };
+}];

brewman/static/scripts/reconcile.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var ReconcileCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'reconcile', 'Reconcile', 'Account', function ($scope, $routeParams, $location, $q, dateFilter, reconcile, Reconcile, Account) {
+var ReconcileCtrl = ['$scope', '$routeParams', '$location', 'dateFilter', 'reconcile', 'Reconcile', 'Account', function ($scope, $routeParams, $location, dateFilter, reconcile, Reconcile, Account) {
     $scope.info = reconcile;
     $scope.show = function () {
         var id = $scope.info.Account.LedgerID;
@@ -78,32 +78,21 @@ var ReconcileCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter',
     };
 
     $scope.accounts = function ($viewValue) {
-        var deferred = $q.defer();
-        Account.autocomplete({term: $viewValue, count: 20, r:true}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Account.autocomplete({term: $viewValue, count: 20, r:true}).$promise;
     };
 }];
 
 ReconcileCtrl.resolve = {
-    reconcile: ['$q', '$route', 'Reconcile', function ($q, $route, Reconcile) {
-        var deferred = $q.defer();
-
-        var id = $route.current.params.id;
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    reconcile: ['$route', 'Reconcile', function ($route, Reconcile) {
+        var id = $route.current.params.id,
+            start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof id === 'undefined') {
-            Reconcile.get({}, successCb);
+            return Reconcile.get({}).$promise;
         } else {
-            Reconcile.get({id: id, StartDate: start_date, FinishDate: finish_date}, successCb);
+            return Reconcile.get({id: id, StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };
 

brewman/static/scripts/salary-deduction.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var SalaryDeductionCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher', 'Employee', function ($scope, $location, $q, dateFilter, $modal, voucher, Employee) {
+var SalaryDeductionCtrl = ['$scope', '$location', 'dateFilter', '$modal', 'voucher', 'Employee', function ($scope, $location, dateFilter, $modal, voucher, Employee) {
     $scope.voucher = voucher;
 
     function getOldItem(ledgerID, items) {
@@ -160,31 +160,19 @@ var SalaryDeductionCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal',
     };
 
     $scope.employees = function ($viewValue) {
-        var deferred = $q.defer();
-        Employee.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
-    }
-
-}]
+        return Employee.autocomplete({term: $viewValue, count: 20}).$promise;
+    };
+}];
 
 
 SalaryDeductionCtrl.resolve = {
-    voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
-        var deferred = $q.defer();
-
+    voucher: ['$route', 'Voucher', function ($route, Voucher) {
         var id = $route.current.params.id;
 
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof id === 'undefined') {
-            Voucher.get({type: 'Salary Deduction'}, successCb);
+            return Voucher.get({type: 'Salary Deduction'}).$promise;
         } else {
-            Voucher.get({id: id}, successCb);
+            return Voucher.get({id: id}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/settings.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var SettingsCtrl = ['$scope', '$http', '$q', 'dateFilter', '$modal', 'lockDate', 'Product', function ($scope, $http, $q, dateFilter, $modal, lockDate, Product) {
+var SettingsCtrl = ['$scope', '$http', 'dateFilter', '$modal', 'lockDate', 'Product', function ($scope, $http, dateFilter, $modal, lockDate, Product) {
     $scope.lockDate = lockDate.data['Lock Date'];
     $scope.rebaseDate = '';
     $scope.setLockDate = function () {
@@ -109,11 +109,7 @@ var SettingsCtrl = ['$scope', '$http', '$q', 'dateFilter', '$modal', 'lockDate',
             });
     };
     $scope.products = function ($viewValue) {
-        var deferred = $q.defer();
-        Product.autocomplete({term: $viewValue, count: 20}, function (result) {
-            deferred.resolve(result);
-        });
-        return deferred.promise;
+        return Product.autocomplete({term: $viewValue, count: 20}).$promise;
     };
 }];
 

brewman/static/scripts/stock-movement.js

@@ -15,21 +15,14 @@ var StockMovementCtrl = ['$scope', '$location', 'dateFilter', 'stock_movement',
 }];
 
 StockMovementCtrl.resolve = {
-    stock_movement: ['$q', '$route', 'StockMovement', function ($q, $route, StockMovement) {
-        var deferred = $q.defer();
-
-        var start_date = $route.current.params.StartDate;
-        var finish_date = $route.current.params.FinishDate;
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
+    stock_movement: ['$route', 'StockMovement', function ($route, StockMovement) {
+        var start_date = $route.current.params.StartDate,
+            finish_date = $route.current.params.FinishDate;
 
         if (typeof start_date === 'undefined' || typeof finish_date === 'undefined') {
-            StockMovement.get({}, successCb);
+           return StockMovement.get({}).$promise;
         } else {
-            StockMovement.get({StartDate: start_date, FinishDate: finish_date}, successCb);
+           return StockMovement.get({StartDate: start_date, FinishDate: finish_date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/trial-balance.js

@@ -12,20 +12,13 @@ var TrialBalanceCtrl = ['$scope', '$location', 'dateFilter', 'trial_balance', fu
     $('#txtDate').focus();
 }];
 TrialBalanceCtrl.resolve = {
-    trial_balance: ['$q', '$route', 'TrialBalance', function ($q, $route, TrialBalance) {
-        var deferred = $q.defer();
-
+    trial_balance: ['$route', 'TrialBalance', function ($route, TrialBalance) {
         var date = $route.current.params.date;
 
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
         if (typeof date === 'undefined') {
-            TrialBalance.get({}, successCb);
+           return TrialBalance.get({}).$promise;
         } else {
-            TrialBalance.get({date: date}, successCb);
+           return TrialBalance.get({date: date}).$promise;
         }
-        return deferred.promise;
     }]
 };

brewman/static/scripts/unposted.js

@@ -7,17 +7,10 @@ var UnpostedCtrl = ['$scope', 'info', 'Unposted', function ($scope, info, Unpost
             $scope.info = result;
             $scope.apply();
         });
-    }
-}]
+    };
+}];
 UnpostedCtrl.resolve = {
-    info:['$q', 'Unposted', function ($q, Unposted) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        Unposted.query({}, successCb);
-        return deferred.promise;
+    info:['Unposted', function (Unposted) {
+        return Unposted.query({}).$promise;
     }]
-}
+};

brewman/static/scripts/user.js

@@ -2,18 +2,11 @@
 
 var UserListCtrl = ['$scope', 'users', function ($scope, users) {
     $scope.info = users;
-}]
+}];
 
 UserListCtrl.resolve = {
-    users: ['$q', 'User', function ($q, User) {
-        var deferred = $q.defer();
-
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
-
-        User.query({}, successCb);
-        return deferred.promise;
+    users: ['User', function (User) {
+        return User.query({}).$promise;
     }]
 };
 
@@ -41,15 +34,9 @@ var UserCtrl = ['$scope', '$location', 'user', function ($scope, $location, user
 }];
 
 UserCtrl.resolve = {
-    user: ['$q', '$route', 'User', function ($q, $route, User) {
-        var deferred = $q.defer();
-
+    user: ['$route', 'User', function ($route, User) {
         var id = $route.current.params.id;
-        var successCb = function (result) {
-            deferred.resolve(result);
-        };
 
-        User.get({id: id}, successCb);
-        return deferred.promise;
+        return User.get({id: id}).$promise;
     }]
 };