@colijnit/transaction 12.1.73 → 12.1.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/bundles/colijnit-transaction.umd.js +89 -14
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.metadata.json +1 -1
  4. package/esm2015/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.js +6 -2
  5. package/esm2015/lib/component/relation/relation-general/relation-general.component.js +3 -3
  6. package/esm2015/lib/component/transaction/transaction.component.js +7 -2
  7. package/esm2015/lib/component/transaction-confirmation-details/transaction-confirmation-details.component.js +23 -4
  8. package/esm2015/lib/component/transaction-confirmation-history/transaction-confirmation-history.component.js +4 -2
  9. package/esm2015/lib/component/transaction-line-fields/transaction-line-supplier-button.component.js +1 -1
  10. package/esm2015/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.js +4 -1
  11. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/transaction-quick-access-purchase-order-overview.component.js +49 -1
  12. package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/transaction-quick-access-purchase-order-overview.module.js +8 -2
  13. package/esm2015/lib/service/pending-reason.service.js +1 -1
  14. package/esm2015/lib/service/transaction-mapping.service.js +3 -1
  15. package/esm2015/lib/service/transaction.service.js +1 -1
  16. package/fesm2015/colijnit-transaction.js +94 -10
  17. package/fesm2015/colijnit-transaction.js.map +1 -1
  18. package/lib/component/transaction-confirmation-details/style/_layout.scss +16 -0
  19. package/lib/component/transaction-confirmation-details/transaction-confirmation-details.component.d.ts +4 -0
  20. package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts +1 -0
  21. package/lib/component/transaction-quick-access/transaction-quick-access/style/material.scss +1 -1
  22. package/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/style/_layout.scss +21 -0
  23. package/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/style/_material-definition.scss +2 -0
  24. package/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/transaction-quick-access-purchase-order-overview.component.d.ts +10 -0
  25. package/package.json +1 -1
@@ -76,6 +76,7 @@ import { FlexModule } from '@angular/flex-layout';
76
76
  import { trigger, state, style, transition, animate } from '@angular/animations';
77
77
  import { RelationKind as RelationKind$1 } from '@colijnit/relationapi/build/enum/relation-kind.enum';
78
78
  import { AddressType } from '@colijnit/relationapi/build/enum/address-type.enum';
79
+ import { RelationNameKind } from '@colijnit/relationapi/build/enum/relation-name-kind.enum';
79
80
  import { CommonModule, DatePipe } from '@angular/common';
80
81
  import { DateUtils } from '@colijnit/ioneconnector/build/utils/date-utils';
81
82
  import { NumberUtils } from '@colijnit/ioneconnector/build/utils/number-utils';
@@ -105,7 +106,6 @@ import { PrintPurchaseOrderRequest } from '@colijnit/mainapi/build/model/print-p
105
106
  import { PdfPurchaseOrderRequest } from '@colijnit/mainapi/build/model/pdf-purchase-order-request';
106
107
  import { RelationRequest } from '@colijnit/relationapi/build/model/relation-request';
107
108
  import { CoDocument } from '@colijnit/sharedapi/build/model/co-document.bo';
108
- import { RelationNameKind } from '@colijnit/relationapi/build/enum/relation-name-kind.enum';
109
109
  import { GenderType } from '@colijnit/relationapi/build/enum/gender-type.enum';
110
110
  import { FunctionUtils } from '@colijnit/ioneconnector/build/utils/function-utils';
111
111
  import { ContactOption } from '@colijnit/relationapi/build/model/contact-option.bo';
@@ -6439,6 +6439,9 @@ class CheckoutOverviewRelationEditComponent {
6439
6439
  if (this._relation instanceof CustomerFullObject) {
6440
6440
  this.customerGroup = this._relation.customerGroup;
6441
6441
  }
6442
+ else {
6443
+ this._relation.type = RelationNameKind.Company;
6444
+ }
6442
6445
  this.address = this._relation.getFirstAddressOrCreateNew();
6443
6446
  const firstActiveAddress = this._relation.activeAddresses.length > 0 ? this._relation.activeAddresses[0] : undefined;
6444
6447
  this.deliveryAddressNawNr = firstActiveAddress ? firstActiveAddress.nawNr : 0;
@@ -6508,7 +6511,7 @@ CheckoutOverviewRelationEditComponent.decorators = [
6508
6511
  </div>
6509
6512
  <div class="checkout-data-column">
6510
6513
  <div class="checkout-data-row">
6511
- <co-relation-type
6514
+ <co-relation-type *ngIf="relationType === relationKind.Customer"
6512
6515
  [relation]="relation"
6513
6516
  ></co-relation-type>
6514
6517
  </div>
@@ -11772,10 +11775,42 @@ class TransactionQuickAccessPurchaseOrderOverviewComponent extends TransactionQu
11772
11775
  this.reportDocumentEmailRequest = new EmailPurchaseOrderRequest();
11773
11776
  this.reportDocumentPrintRequest = new PrintPurchaseOrderRequest();
11774
11777
  this.reportDocumentPdfRequest = new PdfPurchaseOrderRequest();
11778
+ this.catalogOptions = {
11779
+ searchOnStart: true,
11780
+ showAddToCart: false,
11781
+ showLookAtArticleButton: false,
11782
+ showAddArticleButton: false
11783
+ };
11784
+ this.catalogParameters = {};
11785
+ this.showCatalog = false;
11786
+ this.searchText = "";
11775
11787
  }
11776
11788
  showClass() {
11777
11789
  return true;
11778
11790
  }
11791
+ handleSearch(text) {
11792
+ this.showCatalogDialog();
11793
+ }
11794
+ handleAddArticle(event) {
11795
+ event.preventDefault();
11796
+ event.stopPropagation();
11797
+ this.service.addArticle(this.searchText);
11798
+ }
11799
+ handleSearchCatalog(event) {
11800
+ this.showCatalogDialog();
11801
+ }
11802
+ handleCatalogArticleClick(article) {
11803
+ return __awaiter(this, void 0, void 0, function* () {
11804
+ if (yield this.service.addArticle(article.articleNumber)) {
11805
+ this.showCatalog = false;
11806
+ }
11807
+ });
11808
+ }
11809
+ showCatalogDialog() {
11810
+ this.catalogParameters.general = this.searchText;
11811
+ this.catalogParameters.publicationCode = 71; // todo: fix this?
11812
+ this.showCatalog = true;
11813
+ }
11779
11814
  emailDocument(request) {
11780
11815
  return __awaiter(this, void 0, void 0, function* () {
11781
11816
  yield this.service.emailPurchaseOrder(request);
@@ -11807,12 +11842,28 @@ TransactionQuickAccessPurchaseOrderOverviewComponent.decorators = [
11807
11842
  { type: Component, args: [{
11808
11843
  selector: "co-transaction-quick-access-purchase-order-overview",
11809
11844
  template: `
11845
+ <co-input-search
11846
+ [(model)]="searchText"
11847
+ [placeholder]="'SEARCH_ADD_ARTICLE' | localize"
11848
+ [centerLabel]="true"
11849
+ [useLeftIcon]="true"
11850
+ [useRightIcon]="true"
11851
+ (search)="handleSearch($event)"
11852
+ ></co-input-search>
11810
11853
  <co-quick-send-button
11811
11854
  [defaultMethodIcon]="defaultSendMethodIcon"
11812
11855
  [showLoader]="showLoader"
11813
11856
  (sendIconClicked)="handleSend(defaultSendMethod)"
11814
11857
  (openSendMethodDialog)="showSendMethodDialog = true"
11815
11858
  ></co-quick-send-button>
11859
+ <co-dialog-catalog *ngIf="showCatalog"
11860
+ [options]="catalogOptions"
11861
+ [parameters]="catalogParameters"
11862
+ [showNavigation]="true"
11863
+ (closeClick)="showCatalog = false"
11864
+ (articleClicked)="handleCatalogArticleClick($event)"
11865
+ >
11866
+ </co-dialog-catalog>
11816
11867
  <co-send-method-dialog *ngIf="showSendMethodDialog"
11817
11868
  [headerTitle]="'Verzendmethode'"
11818
11869
  [defaultSendMethod]="defaultSendMethod"
@@ -11879,7 +11930,9 @@ class TransactionMappingService {
11879
11930
  [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderAllocation }, TransactionGoodsAllocationLineComponent],
11880
11931
  [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderDeliveryNote }, TransactionOrderDeliveryLineComponent],
11881
11932
  [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderInvoice }, TransactionOrderDeliveryLineComponent],
11933
+ [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderOverview }, TransactionPurchaseLineComponent],
11882
11934
  [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderReceivedGoods }, TransactionReceiveGoodsLineComponent],
11935
+ [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderOrderConfirmation }, TransactionReceiveGoodsLineComponent],
11883
11936
  ]);
11884
11937
  this._transactionFilterComponent = new Map([
11885
11938
  [{ type: TransactionKind.SalesOrder }, TransactionSalesOrderFilterComponent],
@@ -13416,7 +13469,7 @@ RelationGeneralComponent.decorators = [
13416
13469
  template: `
13417
13470
  <div *ngIf="relation.type === relType.Private" class="collapseable" @showHidePrivateRelationFields>
13418
13471
  <div class="default-data-row">
13419
- <co-input-text *ngIf="relationType !== relationKind.Supplier"
13472
+ <co-input-text
13420
13473
  class="checkout-first-name"
13421
13474
  [readonly]="readonly"
13422
13475
  [(model)]="relation.firstName"
@@ -13425,7 +13478,7 @@ RelationGeneralComponent.decorators = [
13425
13478
  (blur)="checkVisibilitySuggestions()"
13426
13479
  [required]="true"
13427
13480
  ></co-input-text>
13428
- <co-input-text *ngIf="relationType !== relationKind.Supplier"
13481
+ <co-input-text
13429
13482
  class="checkout-prefix-name default-width"
13430
13483
  [readonly]="readonly"
13431
13484
  [(model)]="relation.prefix"
@@ -15934,7 +15987,6 @@ class TransactionComponent {
15934
15987
  this.showQuickAccess = true;
15935
15988
  this.showButtonBar = true;
15936
15989
  this.activeViewMode = ContentViewMode.List;
15937
- this.activeCategory = TransactionTypeCategory.SalesOrderOverview;
15938
15990
  this.sidePanelOpen = false;
15939
15991
  this._subs = [];
15940
15992
  this._transaction = new TransactionInfoResponse();
@@ -15951,6 +16003,11 @@ class TransactionComponent {
15951
16003
  set transaction(value) {
15952
16004
  if (value) {
15953
16005
  this._transaction = value;
16006
+ if (this._transaction) {
16007
+ this.activeCategory = this._transaction.transactionInfo.transactionKind === TransactionKind.PurchaseOrder ?
16008
+ TransactionTypeCategory.PurchaseOrderOverview :
16009
+ TransactionTypeCategory.SalesOrderOverview;
16010
+ }
15954
16011
  }
15955
16012
  }
15956
16013
  get transaction() {
@@ -18599,7 +18656,9 @@ class TransactionConfirmationHistoryComponent {
18599
18656
  this.getPurchasePortalLine.filterObject = this.purchasePortalFilter;
18600
18657
  this.transactionService.getPurchasePortalLines(this.getPurchasePortalLine).then((result) => {
18601
18658
  this.transactionService.purchasePortalLine = result;
18602
- this.filteredDocBatchArray = this.transactionService.purchasePortalLine[0].docBatchArray.filter(value => value.historical === 'G');
18659
+ this.transactionService.purchasePortalLine.forEach((element) => {
18660
+ this.filteredDocBatchArray = element.docBatchArray.filter(value => value.historical === 'G');
18661
+ });
18603
18662
  });
18604
18663
  });
18605
18664
  }
@@ -18702,20 +18761,31 @@ class TransactionConfirmationDetailsComponent {
18702
18761
  this.showAddOrder = false;
18703
18762
  this.newDocBatchArray = new DocDeliveryBatch();
18704
18763
  this.docBatchSaved = new EventEmitter();
18764
+ this.isEditMode = false;
18705
18765
  }
18706
18766
  showClass() {
18707
18767
  return true;
18708
18768
  }
18769
+ set isEditing(value) {
18770
+ this.isEditMode = value;
18771
+ console.log(this.isEditMode);
18772
+ console.log(this.isEditing);
18773
+ }
18774
+ get isEditing() {
18775
+ return this.isEditMode;
18776
+ }
18709
18777
  addButtonClicked() {
18710
18778
  this.showAddOrder = !this.showAddOrder;
18711
18779
  }
18712
18780
  handleOkClick() {
18713
18781
  return __awaiter(this, void 0, void 0, function* () {
18714
18782
  if (this.newDocBatchArray.docAmount && this.newDocBatchArray.confirmedPrice) {
18715
- this.newDocBatchArray.docDateOrg = new Date();
18716
18783
  this.newDocBatchArray.deleteLine = "F";
18717
18784
  this.newDocBatchArray.historical = "G";
18718
- this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
18785
+ if (!this.newDocBatchArray.docDateOrg) {
18786
+ this.newDocBatchArray.docDateOrg = this.newDocBatchArray.docDate;
18787
+ this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
18788
+ }
18719
18789
  this.transactionService.purchasePortalLine[0].docKind = "IB";
18720
18790
  yield this.transactionService.updatePurchasePortalLines(this.transactionService.purchasePortalLine[0]);
18721
18791
  this.docBatchSaved.emit(true);
@@ -18726,6 +18796,10 @@ class TransactionConfirmationDetailsComponent {
18726
18796
  }
18727
18797
  });
18728
18798
  }
18799
+ handleCancelClick() {
18800
+ this.newDocBatchArray = new DocDeliveryBatch();
18801
+ this.isEditing = false;
18802
+ }
18729
18803
  }
18730
18804
  TransactionConfirmationDetailsComponent.decorators = [
18731
18805
  { type: Component, args: [{
@@ -18743,6 +18817,9 @@ TransactionConfirmationDetailsComponent.decorators = [
18743
18817
  <span class="header-right-text" [textContent]="transactionLines.deliveryDate | date:'dd-MM-YYYY'"></span>
18744
18818
  </div>
18745
18819
  </div>
18820
+ <div class="header-inform-user" *ngIf="isEditing">
18821
+ <span class="header-inform-user editting" [textContent]="'EDITING_DATA_ROW' | localize"></span>
18822
+ </div>
18746
18823
  <div *ngIf="showAddOrder" class="columns-wrapper">
18747
18824
  <div class="details-column">
18748
18825
  <co-input-text class="details-input"
@@ -18783,7 +18860,7 @@ TransactionConfirmationDetailsComponent.decorators = [
18783
18860
  </co-form>
18784
18861
 
18785
18862
  <div *ngIf="showAddOrder" class="save-cancel-wrapper">
18786
- <co-default-ok-cancel-buttons (okClick)="handleOkClick()"></co-default-ok-cancel-buttons>
18863
+ <co-default-ok-cancel-buttons (okClick)="handleOkClick()" (cancelClick)="handleCancelClick()"></co-default-ok-cancel-buttons>
18787
18864
  </div>
18788
18865
  </div>
18789
18866
  `,
@@ -18802,6 +18879,7 @@ TransactionConfirmationDetailsComponent.propDecorators = {
18802
18879
  transactionInfoNr: [{ type: Input }],
18803
18880
  showClass: [{ type: HostBinding, args: ["class.co-transaction-confirmation-details",] }],
18804
18881
  newDocBatchArray: [{ type: Input }],
18882
+ isEditing: [{ type: Input }],
18805
18883
  docBatchSaved: [{ type: Output }]
18806
18884
  };
18807
18885
 
@@ -18898,6 +18976,7 @@ class TransactionLineSidePanelPurchaseComponent {
18898
18976
  this.goodsReceiptStatus = new GoodsReceiptStatusWithHistory();
18899
18977
  this.selectedLineDocBatchArray = new DocDeliveryBatch();
18900
18978
  this.isDocBatchSaved = false;
18979
+ this.editingMode = false;
18901
18980
  this._transactionInfo = new TransactionInfo();
18902
18981
  }
18903
18982
  set transactionInfo(value) {
@@ -18924,6 +19003,7 @@ class TransactionLineSidePanelPurchaseComponent {
18924
19003
  }
18925
19004
  fillInputOnClick(data) {
18926
19005
  this.selectedLineDocBatchArray = data;
19006
+ this.editingMode = true;
18927
19007
  }
18928
19008
  docBatchSaved(data) {
18929
19009
  this.isDocBatchSaved = data;
@@ -18939,6 +19019,7 @@ TransactionLineSidePanelPurchaseComponent.decorators = [
18939
19019
  [transactionInfoNr]="transactionInfo.transactionNr"
18940
19020
  [transactionLines]="transactionLine"
18941
19021
  [newDocBatchArray]="selectedLineDocBatchArray"
19022
+ [isEditing]="editingMode"
18942
19023
  (docBatchSaved)="docBatchSaved($event)"
18943
19024
  ></co-transaction-confirmation-details>
18944
19025
  <co-transaction-confirmation-history
@@ -20888,7 +20969,10 @@ TransactionQuickAccessPurchaseOrderOverviewModule.decorators = [
20888
20969
  imports: [
20889
20970
  CommonModule,
20890
20971
  QuickSendButtonModule,
20891
- SendMethodDialogModule
20972
+ SendMethodDialogModule,
20973
+ InputSearchModule,
20974
+ DialogCatalogModule,
20975
+ PipeModule
20892
20976
  ],
20893
20977
  declarations: [
20894
20978
  TransactionQuickAccessPurchaseOrderOverviewComponent