improvement(component cashbox select)

- add filter for primary cashbox
Third-Culture-Software · Feb 4, 2022 · ed1171b · ed1171b
1 parent 7b6515b
commit ed1171b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/client/src/js/components/bhCashboxSelect.js b/client/src/js/components/bhCashboxSelect.js
@@ -13,6 +13,7 @@ angular.module('bhima.components')
       validationTrigger : '<?',
       restrictToUser    : '<?',
       isAuxiliary       : '<?',
+      isPrimary         : '<?',
     },
   });
 
@@ -48,6 +49,10 @@ function CashboxSelectController(Cashbox, Notify, Session) {
       params.is_auxiliary = 1;
     }
 
+    if ($ctrl.isPrimary) {
+      params.is_auxiliary = 0;
+    }
+
     // load all Cashbox
     Cashbox.read(null, params)
       .then(cashboxes => {

diff --git a/client/src/modules/vouchers/complex-voucher.html b/client/src/modules/vouchers/complex-voucher.html
@@ -57,7 +57,7 @@
             </li>
 
             <li role="menuitem">
-              <a href data-action="payment-employee" ng-click="ComplexVoucherCtrl.openAdvancesLoansInstallments()">
+              <a href data-action="advance-loans-installments" ng-click="ComplexVoucherCtrl.openAdvancesLoansInstallments()">
                 <i class="fa fa-money"></i> <span translate>VOUCHERS.GLOBAL.ADVANCES_LOANS_INSTALLMENTS</span>
               </a>
             </li>            

diff --git a/client/src/modules/vouchers/templates/amount_paiment.grid.tmpl.html b/client/src/modules/vouchers/templates/amount_paiment.grid.tmpl.html
@@ -4,5 +4,6 @@
     ng-change="grid.appScope.onChanges()"
     ng-disabled="row.entity.locked"
     type="number"
+    ng-min="0"
     class="form-control text-right">
 </div>
diff --git a/...dules/vouchers/toolkit/advances_loans_installments/advances_loans_installments.modal.html b/...dules/vouchers/toolkit/advances_loans_installments/advances_loans_installments.modal.html
@@ -12,7 +12,9 @@
       cashbox-id = "ToolCtrl.searchQueries.cashbox_id"
       name = "cashbox_id"
       on-select-callback = "ToolCtrl.onSelectCashbox(cashbox)"
-      restrict-to-user = "false">
+      restrict-to-user = "false"
+      required = "true"
+      is-primary = "true">
     </bh-cashbox-select>
 
     <bh-account-select