OO#162_adding_customer_designation_to_invoice

OpenOlitor · Jul 8, 2024 · 56275cb · 56275cb
1 parent b29cb7f
commit 56275cb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/app/scripts/rechnungen/overview/rechnungenoverview.controller.js b/app/scripts/rechnungen/overview/rechnungenoverview.controller.js
@@ -72,14 +72,10 @@ angular.module('openolitor-admin')
             listKundeIds.push($scope.checkboxes.data[id].kundeId);
         });
 
-        var allEntries = KundenOverviewModel.query({
-            f: $scope.search.filterQuery
-        }, function() {
-            angular.forEach(listKundeIds, function(kundeId){
-                $scope.filteredEntries.push($filter('filter')(allEntries,{id:kundeId},true)[0]);
-            });
-            DetailNavigationService.detailFromOverview(currentKundeId.kundeId, $scope, 'kunden', $location.url());
+        angular.forEach(listKundeIds, function(kundeId){
+          $scope.filteredEntries.push($filter('filter')($scope.allKunden, {id:kundeId},true)[0]);
         });
+        DetailNavigationService.detailFromOverview(currentKundeId.kundeId, $scope, 'kunden', $location.url());
       };
 
 
@@ -390,11 +386,24 @@ angular.module('openolitor-admin')
         }
 
         $scope.loading = true;
-        $scope.entries = RechnungenOverviewModel.query({
+
+        $scope.allKunden = KundenOverviewModel.query({
+            f: $scope.search.filterQuery
+        }, function() {
+          $scope.tableParams.reload();
+          $scope.loading = false;
+        });
+
+        RechnungenOverviewModel.query({
           f: $scope.search.filterQuery,
           g: /^\d+$/.test($scope.geschaeftsjahr)?$scope.geschaeftsjahr:'',
           q: $scope.search.queryQuery
-        }, function() {
+        }, function(rechnungen) {
+          angular.forEach(rechnungen, function(rechnung){
+            var kunde = lodash.find($scope.allKunden, {'id' : rechnung.kundeId});
+            rechnung.kundeBezeichnung = kunde.bezeichnung;
+            $scope.entries.push(rechnung);
+          });
           $scope.tableParams.reload();
           $scope.loading = false;
         });

diff --git a/app/scripts/rechnungen/overview/rechnungenoverview.html b/app/scripts/rechnungen/overview/rechnungenoverview.html
@@ -47,6 +47,9 @@ <h3 class="panel-title"><span class="navbar-brand" translate>Rechnungen</span>
                 {{rechnung.kundeId}} &nbsp;
                 <a target="_blank" rel="noopener noreferrer" ng-click="navigateToKunde(rechnung.id)" ng-href="#/kunden/{{rechnung.kundeId}}"><i class="glyphicon small glyphicon-new-window"></i></a>
               </td>
+              <td data-title="'Bezeichnung'|translate" sortable="'bezeichnung'">
+                {{rechnung.kundeBezeichnung}} &nbsp;
+              </td>
               <td data-title="'Titel'|translate" sortable="'titel'">
                 {{rechnung.titel}}
               </td>