@colijnit/transaction 258.1.35 → 258.1.37

package/fesm2015/colijnit-transaction.js

@@ -294,8 +294,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "258.1.35";
-        this.publishDate = "19-6-2025 10:49:58";
+        this.symVer = "258.1.37";
+        this.publishDate = "23-6-2025 11:42:41";
     }
 }
 
@@ -15312,9 +15312,7 @@ CheckoutOverviewRelationEditComponent.decorators = [
                 (inputChangeForSuggestions)="handleInputChange($event)"
               ></co-relation-address>
             </div>
-          </div>
-          <div class="checkout-data-column" *ngIf="relationKind === relKind.Customer">
-            <div class="checkout-data-row">
+              <div *ngIf="relationKind === relKind.Customer">
               <co-vat-payment [model]="vatPayment"
                               [screenConfigurationObject]="cfgNames.RelationVatPayment"
                               (modelChange)="handleVatPaymentChange($event)"
@@ -15323,7 +15321,7 @@ CheckoutOverviewRelationEditComponent.decorators = [
                              [screenConfigurationObject]="cfgNames.RelationVatCode"
                              (modelChange)="handleVatCodeChange($event)"
               ></co-vat-code>
-            </div>
+              </div>
           </div>
           <ng-container *ngIf="showAddresses">
             <div class="checkout-data-column">
@@ -16878,7 +16876,7 @@ class RelationAddressComponent extends RelationBaseComponent {
         this.transactionService = transactionService;
         this.addressChange = new EventEmitter();
         this.countries = [];
-        // public addressTypes: CoDomainValue[] = [];
+        this.addressTypes = [];
         this.fields = { text: "description", value: "code" };
         this.postalCodeCheckErrorMessage = "";
         this._prevPostalCodeForCheck = "";
@@ -16901,9 +16899,9 @@ class RelationAddressComponent extends RelationBaseComponent {
                 this.countries = countries;
                 this._setSelectedAddress();
             });
-            // this._connector.getAddressTypes('NL').then((codes: CoDomainValue[]) => {
-            //   this.addressTypes = codes;
-            // });
+            this._connector.getAddressTypes('NL').then((codes) => {
+                this.addressTypes = codes;
+            });
         });
     }
     checkForPostalCodeCheckError() {
@@ -16967,6 +16965,14 @@ class RelationAddressComponent extends RelationBaseComponent {
             this.inputChangeForSuggestions.next(this.suggestionRequest);
         }
     }
+    handleAddressTypeChange(addressType) {
+        if (Object.values(AddressType).includes(addressType.code)) {
+            this.address.addressType = addressType.code;
+        }
+    }
+    addressTypeForCode(addressType) {
+        return this.addressTypes.find((addressTypeListItem) => addressTypeListItem.code === addressType);
+    }
     _setSelectedAddress() {
         if (!this.address || !this.countries) {
             return;
@@ -17026,16 +17032,17 @@ RelationAddressComponent.decorators = [
           (modelChange)="handleCountryChange($event)"
         ></co-list-of-values>
       </div>
-<!--      <div class="relation-address-data-row default single">-->
-<!--        <co-list-of-values-->
-<!--          [(model)]="address.addressType"-->
-<!--          [collection]="addressTypes"-->
-<!--          [displayField]="'description'"-->
-<!--          [label]="'ADDRESS_TYPE' | localize"-->
-<!--          [required]="true"-->
-<!--        ></co-list-of-values>-->
-<!--      </div>-->
-<!--      -->
+      <div class="relation-address-data-row default single">
+        <co-list-of-values
+          [model]="addressTypeForCode(address.addressType)"
+          (modelChange)="handleAddressTypeChange($event)"
+          [collection]="addressTypes"
+          [displayField]="'description'"
+          [label]="'ADDRESS_TYPE' | localize"
+          [required]="true"
+        ></co-list-of-values>
+      </div>
+      
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -20302,6 +20309,7 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
         this.additionalFileName = '';
         this.pdfDoc = '';
         this.disablePdfPreview = false;
+        this.isAdditionalDocAllowedByScreenConfig = false;
     }
     ngOnInit() {
         super.ngOnInit();
@@ -20390,6 +20398,9 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
         this.transactionService.getTermsAndConditionsForm(this.transactionInfo.id).then(result => {
             this.additionalFileContents = result;
             this.additionalFileName = this.transactionInfo.transactionKind + '_' + this.transactionInfo.transactionNr.toString();
+            // @ts-ignore
+            this.isAdditionalDocEnabled = this.isAdditionalDocAllowedByScreenConfig && !!result;
+            this.detectChanges();
         });
     }
     upsertDocument(doc) {
@@ -20419,7 +20430,11 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
         this._getEmailLayouts();
         this._getPrintLayouts();
         this.isDocSignEnabled = this.screenConfigService.getObjectConfigurationFor(this.cfgNames.IsDocSignEnabled).immediatelyVisible();
-        this.isAdditionalDocEnabled = this.screenConfigService.getObjectConfigurationFor(this.cfgNames.IsAdditionalDocEnabled).immediatelyVisible();
+        this.isAdditionalDocAllowedByScreenConfig =
+            this.screenConfigService.getObjectConfigurationFor(this.cfgNames.IsAdditionalDocEnabled).immediatelyVisible();
+        if (this.isAdditionalDocAllowedByScreenConfig) {
+            this.getTermsAndConditionsForm();
+        }
         this.getHistoricDocuments();
     }
     _getPrinters() {
@@ -21999,6 +22014,7 @@ class TransactionReceiveGoodsLineBaseComponent extends TransactionLineBaseCompon
         this.transactionTypeCategory = TransactionTypeCategory;
         this.warehouseLocationButtonDisabled = false;
         this.showCheckboxForLine = false;
+        this.returnStockMode = false;
         this._subscriptions = [];
     }
     ngOnInit() {
@@ -22026,6 +22042,7 @@ class TransactionReceiveGoodsLineBaseComponent extends TransactionLineBaseCompon
     transactionLineSet() {
         super.transactionLineSet();
         this._handleTransactionLineSet(this.transactionLine);
+        this.returnStockMode = this.transactionLine.amount < 0;
     }
     _handleTransactionLineSet(transLine) {
         this.warehouseLocationButtonDisabled = transLine.articleLineStatus.quantityReceived === transLine.amount ||
@@ -22112,9 +22129,8 @@ TransactionReceiveGoodsLineComponent.decorators = [
                               <co-transaction-line-label [insideLabel]="'BATCH_NR'"></co-transaction-line-label>
                               <co-input-text class="side-panel-input"
                                              [(model)]="transactionLine.batchNr"
-                                             [type]="'number'"
                                              [hideArrowButtons]="true"
-                                             [readonly]="true"
+                                             [readonly]="this.returnStockMode || readonly"
                                              [required]="true"
                                              [customHeight]="true"
                               ></co-input-text>
@@ -37482,7 +37498,8 @@ class TransactionLinePurchaseReceiveGoodsComponent extends TransactionLineBaseCo
         this.receiptDetails.lineNr = this.transactionLine.lineNr;
         this.receiptDetails.quantityToReceive = this.lineQuantityToReceive;
         this.receiptDetails.locationNr = this.transactionLine.locationNr;
-        this.returnStockMode === this.transactionLine.amount < 0;
+        this.returnStockMode = this.transactionLine.amount < 0;
+        this.receiptDetails.batchNr = this.transactionLine.batchNr;
         this.getGoodsReceiptHistory();
     }
     _getAvailableStock() {
@@ -37539,7 +37556,6 @@ TransactionLinePurchaseReceiveGoodsComponent.decorators = [
           ></co-transaction-labeled-warehouse-location-button>
 -->
           <co-input-text class="side-panel-input" [(model)]="receiptDetails.batchNr" *ngIf="transactionLine.isBatchNrRequired"
-                         [type]="'number'"
                          [hideArrowButtons]="true"
                          [readonly]="readonly || returnStockMode"
                          [disabled]="returnStockMode"
@@ -49751,6 +49767,9 @@ class PaymentComponent extends TransactionPaymentBaseComponent {
         super.cashRegisterSelected(cashRegister, index);
         this.activeCashRegister = cashRegister;
     }
+    onDepositPaymentFetched(depositAmount) {
+        this.depositAmount = depositAmount;
+    }
 }
 PaymentComponent.decorators = [
     { type: Component, args: [{
@@ -49794,7 +49813,7 @@ PaymentComponent.decorators = [
               <div class="payment-to-pay-total">
                   <div class="payment-to-pay-header">
                       <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
-                      <span class="payment-total-pay" [textContent]="amount === 0 ? amount : (amount | coCurrency)"></span>
+                      <span class="payment-total-pay" [textContent]="depositAmount ? (depositAmount | coCurrency: true) : (paymentService.amount | coCurrency: true)"></span>
                   </div>
                   <div class="payment-input-button-wrapper">
                       <div class="payment-input-button">
@@ -49817,7 +49836,11 @@ PaymentComponent.decorators = [
               </div>
 
               <div class="payment-deposit">
-                  <co-deposit-payment [branch]="branch" [transactionUuid]="transactionUuid"></co-deposit-payment>
+                  <co-deposit-payment
+                          [branch]="branch"
+                          [transactionUuid]="transactionUuid"
+                          (depositPaymentFetched)="onDepositPaymentFetched($event)">
+                  </co-deposit-payment>
               </div>
               <co-key-pad class="payment-to-pay-keypad" *ngIf="showKeyPad"
                           [showValue]="false"
@@ -49979,6 +50002,7 @@ class DepositPaymentComponent {
         this._transactionEventService = _transactionEventService;
         this.transKind = TransactionKind;
         this.showTitle = true;
+        this.depositPaymentFetched = new EventEmitter();
         this.paymentMethods = [];
         this.depositPayments = [];
         this.showLoader = true;
@@ -50002,6 +50026,7 @@ class DepositPaymentComponent {
         this._paymentConnectorService.getDepositPaymentInfo(this.transactionUuid).then((info) => {
             this.depositPayments.length = 0;
             if (info && info.depositPayments) {
+                this.depositPaymentFetched.emit(info.depositAmount);
                 info.depositPayments.sort((a, b) => a.id > b.id ? 1 : -1);
                 info.depositPayments.forEach((dp) => {
                     const paymentMethod = this.paymentMethods.find(pm => pm.payment.code === dp.paymentMethodCode);
@@ -50055,6 +50080,7 @@ DepositPaymentComponent.propDecorators = {
     transactionKind: [{ type: Input }],
     showTitle: [{ type: Input }],
     transactionUuid: [{ type: Input }],
+    depositPaymentFetched: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ["class.co-deposit-payment",] }]
 };