@colijnit/transaction 12.1.31 → 12.1.32

package/fesm2015/colijnit-transaction.js

@@ -429,10 +429,9 @@ class Dictionary {
                 "SAME_AS_DELIVERY": "Hetzelfde als bezorgadres",
                 "SAVE": "Opslaan",
                 "SEARCH": "Zoeken",
-                "SEARCH_ADD_ARTICLE": "Zoeken en toevoegen artikel",
-                "SEARCH_DELIVERY_METHOD": "Zoek levermethode",
-                "SEARCH_IN_COLLECTION": "Zoek binnen collectie...",
                 "SEARCH_NUMBER_CUSTOMER_OR_DATE": "Zoeken op nummer, klant of datum",
+                "SEARCH_IN_COLLECTION": "Zoek binnen collectie...",
+                "SEARCH_ADD_ARTICLE": "Zoeken en toevoegen artikel",
                 "SEARCH_WAREHOUSE": "Zoek magazijn",
                 "SELECT": "Selecteren",
                 "SELECT_A": "Selecteer een",
@@ -741,10 +740,9 @@ class Dictionary {
                 "SAME_AS_DELIVERY": "Same as delivery address",
                 "SAVE": "Save",
                 "SEARCH": "Search",
+                "SEARCH_NUMBER_CUSTOMER_OR_DATE": "Search for number, customer or date",
                 "SEARCH_ADD_ARTICLE": "Search and add article",
-                "SEARCH_DELIVERY_METHOD": "Search deliverymethod",
                 "SEARCH_IN_COLLECTION": "Search in collection...",
-                "SEARCH_NUMBER_CUSTOMER_OR_DATE": "Search for number, customer or date",
                 "SEARCH_WAREHOUSE": "Search warehouse",
                 "SELECT": "Select",
                 "SELECT_A": "Select a",
@@ -2000,14 +1998,14 @@ class TransactionConnectorService {
     getDeliveryMethods() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                // const collection = this._collectionService.getCollection(DeliveryMethod.name);
-                // if (collection) {
-                //   return resolve(collection);
-                // }
+                const collection = this._collectionService.getCollection(DeliveryMethod.name);
+                if (collection) {
+                    return resolve(collection);
+                }
                 return this.connector.getDeliveryMethods().then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         const collection = this._boFactory.makeBOArrayFromRawBackendDataArray(DeliveryMethod, result.resultObjects);
-                        // this._collectionService.cacheCollection(DeliveryMethod.name, collection);
+                        this._collectionService.cacheCollection(DeliveryMethod.name, collection);
                         resolve(collection);
                     }
                     else {
@@ -2378,14 +2376,14 @@ class TransactionConnectorService {
     getWarehouses(branchNr) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                // const collection = this._collectionService.getCollection(Warehouse.name);
-                // if (collection) {
-                //   return resolve(collection);
-                // }
+                const collection = this._collectionService.getCollection(Warehouse.name);
+                if (collection) {
+                    return resolve(collection);
+                }
                 return this.connector.getWarehouses(branchNr).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         const collection = this._boFactory.makeBOArrayFromRawBackendDataArray(Warehouse, result.resultObjects);
-                        // this._collectionService.cacheCollection(Warehouse.name, collection);
+                        this._collectionService.cacheCollection(Warehouse.name, collection);
                         resolve(collection);
                     }
                     else {
@@ -12486,14 +12484,9 @@ class TransactionLineDeliveryMethodComponent extends TransactionLineBaseComponen
         this._transactionService.getDeliveryMethods().then((methods) => {
             this.data = methods.slice();
             this.data.forEach((d, index) => {
-                this.viewModels.push({
-                    value: d.code,
-                    text: d.description,
-                    label: ((d.code !== null && d.code !== undefined) ? d.code + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
-                    checked: this.useTransactionLine ? this.transactionLine.deliveryMethodCode === d.code : index === 0
-                });
+                this.viewModels.push({ value: d.code, text: d.description, checked: this.useTransactionLine ? this.transactionLine.deliveryMethodCode === d.code : index === 0 });
+                super.ngOnInit();
             });
-            super.ngOnInit();
         });
     }
     commitDeliveryMethod(method) {
@@ -12536,7 +12529,7 @@ TransactionLineDeliveryMethodComponent.decorators = [
     <div class="co-transaction-default-flex-row" *ngFor="let row of viewModelsFiltered">
       <co-input-checkbox
         [model]="row.checked"
-        [label]="row.label"
+        [label]="row.value + ' ' + row.text"
         (click)="handleChecked($event, row)"
       ></co-input-checkbox>
     </div>
@@ -12710,12 +12703,7 @@ class TransactionLineCommissionCodeComponent extends TransactionLineBaseComponen
         this._transactionService.getCommissionCodes("NL").then((codes) => {
             this.data = codes.slice();
             this.data.forEach((d, index) => {
-                this.viewModels.push({
-                    value: d.code,
-                    text: d.description,
-                    label: ((d.code !== null && d.code !== undefined) ? d.code + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
-                    checked: this.useTransactionLine ? this.transactionLine.commissionCode === d.code : index === 0
-                });
+                this.viewModels.push({ value: d.code, text: d.description, checked: this.useTransactionLine ? this.transactionLine.commissionCode === d.code : index === 0 });
             });
         });
     }
@@ -12759,7 +12747,7 @@ TransactionLineCommissionCodeComponent.decorators = [
     <div class="co-transaction-default-flex-row" *ngFor="let row of viewModels">
       <co-input-checkbox
         [model]="row.checked"
-        [label]="row.label"
+        [label]="row.value + ' ' + row.text"
         (click)="handleChecked($event, row)"
       ></co-input-checkbox>
     </div>
@@ -12794,21 +12782,16 @@ class TransactionLineWarehouseComponent extends TransactionLineBaseComponent {
     constructor(_transactionService) {
         super();
         this._transactionService = _transactionService;
-        this.collection = [];
+        this.data = [];
     }
     ngOnInit() {
         this.viewModels.length = 0;
         this._transactionService.getWarehouses(this.branch).then((warehouses) => {
-            this.collection = warehouses.slice();
-            this.collection.forEach((d, index) => {
-                this.viewModels.push({
-                    value: d.warehouseNo,
-                    text: d.description,
-                    label: ((d.warehouseNo !== null && d.warehouseNo !== undefined) ? d.warehouseNo + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
-                    checked: this.useTransactionLine ? this.transactionLine.warehouseNumber === d.warehouseNo : index === 0
-                });
+            this.data = warehouses.slice();
+            this.data.forEach((d, index) => {
+                this.viewModels.push({ value: d.warehouseNo, text: d.description, checked: this.useTransactionLine ? this.transactionLine.warehouseNumber === d.warehouseNo : index === 0 });
+                super.ngOnInit();
             });
-            super.ngOnInit();
         });
     }
     commitWarehouse(warehouse) {
@@ -12848,7 +12831,7 @@ TransactionLineWarehouseComponent.decorators = [
     <div class="co-transaction-default-flex-row" *ngFor="let row of viewModelsFiltered">
       <co-input-checkbox
         [model]="row.checked"
-        [label]="row.label"
+        [label]="row.value + ' ' + row.text"
         (click)="handleChecked($event, row)"></co-input-checkbox>
     </div>
   `,
@@ -16662,6 +16645,19 @@ TransactionPurchaseOrderFilterContentArticleComponent.decorators = [
         <co-input-text [(model)]="searchRequest.batchNumber" [placeholder]="searchPlaceholder | localize"></co-input-text>
       </co-filter-item>
 
+      <!--Leverancier-->
+      <co-filter-item
+        [placeholder]="'SUPPLIER' | localize"
+        [expanded]="true"
+        [collection]="suppliers"
+        [searchPlaceholder]="searchCollectionPlaceholder | localize"
+        [noResultsLabel]="noResultsLabel | localize"
+        [showMoreLabel]="showMoreLabel | localize"
+        [showLessLabel]="showLessLabel | localize"
+        (collectionChange)="filterRequestService.handleCollectionChangeForRange($event, 'rangeSupplier')"
+      >
+      </co-filter-item>
+
       <div class="filter-button-container">
         <co-button class="clickable" [label]="'Filter'" (click)="onFilterButtonClick()"></co-button>
       </div>