@colijnit/transaction 255.1.23 → 255.1.25

package/fesm2015/colijnit-transaction.js

@@ -219,7 +219,6 @@ import { PurchaseAdviceFilters } from '@colijnit/transactionapi/build/model/purc
 import { CatalogFilterModule, CatalogService, CatalogEventService, CatalogSearchModule, CatalogExternalSourceModule } from '@colijnit/catalog';
 import { DoPaymentRequest } from '@colijnit/transactionapi/build/model/do-payment-request';
 import { IonePaymentStatusCode } from '@colijnit/transactionapi/build/enum/ione-payment-status-code.enum';
-import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
 import { GenderType } from '@colijnit/relationapi/build/enum/gender-type.enum';
 import { ContactOption } from '@colijnit/relationapi/build/model/contact-option.bo';
 import { BusinessObjectUtils } from '@colijnit/ioneconnector/build/utils/business-object-utils';
@@ -261,6 +260,7 @@ import { TransactionAddPaymentLineRequest } from '@colijnit/transactionapi/build
 import { take } from 'rxjs/operators';
 import { TagCategory } from '@colijnit/mainapi/build/enum/tab-category.enum';
 import { CssUtils } from '@colijnit/mainapi/build/utils/css-utils';
+import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
 import { CoDocument as CoDocument$1 } from '@colijnit/sharedapi/build/model/co-document.bo';
 
 // this file is dynamically created, do not change this
@@ -268,8 +268,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "255.1.23";
-        this.publishDate = "28/08/2024, 11:01:27";
+        this.symVer = "255.1.25";
+        this.publishDate = "29/08/2024, 16:16:35";
     }
 }
 
@@ -20014,28 +20014,32 @@ TransactionPurchaseOrderLineComponent.decorators = [
                 selector: "co-transaction-purchase-order-line",
                 template: `
     <co-transaction-base-line
-        [transactionInfo]="transactionInfo"
-        [transactionLine]="transactionLine"
-        [preview]="preview"
-        [isFirst]="isFirst"
-        [checkbox]="showCheckboxForLine"
-        [checkboxValue]="transactionLine.selected"
-        [showColorIndicator]="showColorIndicator"
-        [colorIndicatorColor]="colorIndicatorColor"
-        (click)="handleOpenSidePanel($event)"
-        (checkboxValueChanged)="transactionLine.selected = $event"
-        (dragover)="handleDragOver($event)"
-        (drop)="handleDrop($event)"
-        (dragleave)="handleDragLeave($event)"
-        observeVisibility #observer=visibilityObserve (visibilityChange)="handleVisibilityChange(transactionLine, $event)">
+      [transactionInfo]="transactionInfo"
+      [transactionLine]="transactionLine"
+      [preview]="preview"
+      [isFirst]="isFirst"
+      [checkbox]="showCheckboxForLine"
+      [checkboxValue]="transactionLine.selected"
+      [showColorIndicator]="showColorIndicator"
+      [colorIndicatorColor]="colorIndicatorColor"
+      (click)="handleOpenSidePanel($event)"
+      (checkboxValueChanged)="transactionLine.selected = $event"
+      (dragover)="handleDragOver($event)"
+      (drop)="handleDrop($event)"
+      (dragleave)="handleDragLeave($event)"
+      observeVisibility #observer=visibilityObserve
+      (visibilityChange)="handleVisibilityChange(transactionLine, $event)">
       <div class="transaction-line-wrapper">
         <div class="transaction-line-extended-wrapper">
           <div class="column1">
-            <span class="transaction-field-label" [textContent]="'WAREHOUSE_AND_STATUS' | localize" *ngIf="isFirst"></span>
+            <span class="transaction-field-label" [textContent]="'WAREHOUSE_AND_STATUS' | localize"
+                  *ngIf="isFirst"></span>
             <co-transaction-line-delivery-date-button
+              [class.warning]="transactionLine.deliveryDate < transactionLine.purchasePortalLine.deliveryDateConfirmed"
               [screenConfigurationObject]="cfgNames.DeliveryDate"
               [transactionLine]="transactionLine"
-              [transactionInfo]="transactionInfo"></co-transaction-line-delivery-date-button>
+              [transactionInfo]="transactionInfo">
+            </co-transaction-line-delivery-date-button>
             <co-transaction-line-statusbar data-action="openSidePanel"
                                            [screenConfigurationObject]="cfgNames.StatusBar"
                                            [configNames]="statusBarConfigNames"
@@ -20045,17 +20049,20 @@ TransactionPurchaseOrderLineComponent.decorators = [
             ></co-transaction-line-statusbar>
           </div>
           <div class="column3">
-            <span class="transaction-field-label" [textContent]="'TOTALS_AND_DISCOUNT' | localize" *ngIf="isFirst"></span>
+            <span class="transaction-field-label" [textContent]="'TOTALS_AND_DISCOUNT' | localize"
+                  *ngIf="isFirst"></span>
             <co-transaction-line-vat-button
               [screenConfigurationObject]="cfgNames.LineVat"
               [transactionLine]="transactionLine"
               [transactionInfo]="transactionInfo">
             </co-transaction-line-vat-button>
             <div class="transaction-line-totals">
-              <co-input-text class="transaction-line-totals-price"
-                             [model]="transactionLine.purchasePortalLine.grossOrderPrice | coCurrency: true"
-                             [readonly]="true"
-                             [customHeight]="true"
+              <co-input-text
+                class="transaction-line-totals-price"
+                [class.warning]="transactionLine.purchasePortalLine.grossOrderPrice != transactionLine.purchasePortalLine.confirmedPrice"
+                [model]="transactionLine.purchasePortalLine.grossOrderPrice | coCurrency: true"
+                [readonly]="true"
+                [customHeight]="true"
               ></co-input-text>
               <co-transaction-line-discount-button
                 [screenConfigurationObject]="cfgNames.LineDiscount"
@@ -20064,6 +20071,7 @@ TransactionPurchaseOrderLineComponent.decorators = [
               ></co-transaction-line-discount-button>
               <div class="transaction-line-totals-amount">
                 <co-input-text
+                  [class.warning]="transactionLine.amount !== transactionLine.quantityPurchaseToConfirm"
                   [model]="transactionLine.amount"
                   [leftIconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"
                   [readonly]="true"
@@ -20103,15 +20111,15 @@ TransactionPurchaseOrderLineComponent.decorators = [
                 [forceReadonly]="true"
                 [digitsOnly]="true"
               ></co-input-text>
-<!--              <co-input-number-picker class="amount-number-picker"-->
-<!--                                      [screenConfigurationObject]="cfgNames.LineConfirmedAmount"-->
-<!--                                      [required]="true"-->
-<!--                                      [(model)]="+transactionLine.quantityPurchaseToConfirm"-->
-<!--                                      [decimals]="decimals"-->
-<!--                                      [min]="1"-->
-<!--                                      [max]="+transactionLine.purchasePortalLine.amountOrdered"-->
-<!--                                      [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"-->
-<!--              ></co-input-number-picker>-->
+              <!--              <co-input-number-picker class="amount-number-picker"-->
+              <!--                                      [screenConfigurationObject]="cfgNames.LineConfirmedAmount"-->
+              <!--                                      [required]="true"-->
+              <!--                                      [(model)]="+transactionLine.quantityPurchaseToConfirm"-->
+              <!--                                      [decimals]="decimals"-->
+              <!--                                      [min]="1"-->
+              <!--                                      [max]="+transactionLine.purchasePortalLine.amountOrdered"-->
+              <!--                                      [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"-->
+              <!--              ></co-input-number-picker>-->
             </div>
             <co-transaction-line-confirmed-price class="transaction-line-confirmed-price price"
                                                  [screenConfigurationObject]="cfgNames.LineConfirmedPrice"
@@ -30410,10 +30418,11 @@ DeliveryTypeTileModule.decorators = [
 ];
 
 class TransactionPaymentService {
-    constructor(_transactionEventService, _paymentConnectorService, _dictionaryService, _http) {
+    constructor(_transactionEventService, _paymentConnectorService, _dictionaryService, _dialogService, _http) {
         this._transactionEventService = _transactionEventService;
         this._paymentConnectorService = _paymentConnectorService;
         this._dictionaryService = _dictionaryService;
+        this._dialogService = _dialogService;
         this._http = _http;
         this.amount = 0;
         this.amountToPay = 0;
@@ -30453,10 +30462,20 @@ class TransactionPaymentService {
             request.cashRegisterNr = this.cashRegisterNr;
             request.cashRegisterGroupId = this.cashRegisterGroupId;
             request.cashRegisterDrawerId = this.cashRegisterDrawerId;
+            //All payments need a cash drawer. Otherwise financial reports will be wrong.
+            if (!this.cashRegisterDrawerId) {
+                this._dialogService.showInformation('NEED_REGISTER_DRAWER_MESSAGE', true);
+                return;
+            }
             if (this.currentPaymentMethod && this.currentPaymentMethod.externalSourceId) { // psp payment
                 let pspTransactionUuid = "";
                 if (this.currentPaymentMethod.openCashDrawer) {
-                    yield this._paymentConnectorService.openDrawer(this.printerName);
+                    if (this.printerName) {
+                        yield this._paymentConnectorService.openDrawer(this.printerName);
+                    }
+                    else {
+                        this._dialogService.showInformation('OPEN_DRAWER_NO_PRINTER_MESSAGE', true);
+                    }
                 }
                 if (this.currentPaymentMethod.pinTerminal) {
                     pspTransactionUuid = yield this._paymentConnectorService.doPayment(request);
@@ -30477,7 +30496,12 @@ class TransactionPaymentService {
             }
             else {
                 if (this.currentPaymentMethod.openCashDrawer) {
-                    yield this._paymentConnectorService.openDrawer(this.printerName);
+                    if (this.printerName) {
+                        yield this._paymentConnectorService.openDrawer(this.printerName);
+                    }
+                    else {
+                        this._dialogService.showInformation('OPEN_DRAWER_NO_PRINTER_MESSAGE', true);
+                    }
                 }
                 this._paymentConnectorService.doPayment(request).then(() => __awaiter(this, void 0, void 0, function* () {
                     yield this.preparePaymentInfo();
@@ -30609,6 +30633,7 @@ TransactionPaymentService.ctorParameters = () => [
     { type: TransactionEventService },
     { type: TransactionPaymentConnectorService },
     { type: DictionaryService },
+    { type: DialogService },
     { type: HttpClient }
 ];
 
@@ -30761,6 +30786,7 @@ class TransactionPaymentBaseComponent {
         this.cashRegisterNr = cashRegister.nr;
         this.cashRegisterGroupId = cashRegister.group;
         this.cashRegisterDrawerId = +cashRegister.defaultDrawerNumber;
+        this.paymentService.printerName = cashRegister.defaultPrinter;
     }
     handlePayment() {
         return this.paymentService.handlePayment();
@@ -30801,6 +30827,7 @@ class TransactionPaymentBaseComponent {
                 this.cashRegisterGroupId = currentCashRegister.group;
                 this.cashRegisterDrawerId = +currentCashRegister.defaultDrawerNumber;
                 this.prepareCashDrawers(currentCashRegister.group);
+                this.paymentService.printerName = currentCashRegister.defaultPrinter;
             }
         });
     }
@@ -30851,34 +30878,10 @@ class PaymentComponent extends TransactionPaymentBaseComponent {
     constructor() {
         super(...arguments);
         this.showClass = true;
-        this.cashDrawers = [];
-    }
-    handleDrawerChanged(cashDrawer) {
-        this.activeCashDrawer = cashDrawer;
-        this.cashRegisterDrawerId = cashDrawer.id;
     }
     cashRegisterSelected(cashRegister, index) {
-        this.cashRegisterIdx = index;
-        this.cashRegisterNr = cashRegister.nr;
-        this.cashRegisterGroupId = cashRegister.group;
-        this.cashRegisterDrawerId = +cashRegister.defaultDrawerNumber;
+        super.cashRegisterSelected(cashRegister, index);
         this.activeCashRegister = cashRegister;
-        this.prepareCashDrawers(this.activeCashRegister.group).then(() => this._checkDefaultParameters(this.activeCashRegister));
-    }
-    prepareCashDrawers(group) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cashDrawersRequest = new CashDrawersRequest();
-            cashDrawersRequest.group = group;
-            this.cashDrawers = yield this.transactionService.getCashDrawers(cashDrawersRequest);
-            this.changeDetector.detectChanges();
-        });
-    }
-    _checkDefaultParameters(cashRegister) {
-        this.activeCashDrawer = null;
-        if (cashRegister.defaultDrawerNumber) {
-            const defaultCashDrawer = this.cashDrawers.find((drawer) => drawer.nr === cashRegister.defaultDrawerNumber);
-            this.activeCashDrawer = defaultCashDrawer ? defaultCashDrawer : this.activeCashDrawer;
-        }
     }
 }
 PaymentComponent.decorators = [
@@ -30917,17 +30920,6 @@ PaymentComponent.decorators = [
                              (selectedChange)="cashRegisterSelected(cashRegister, index)"
             ></co-payment-tile>
           </div>
-
-          <co-list-of-values [label]="'CASH_DRAWER' | localize"
-                             [(model)]="activeCashDrawer"
-                             [displayField]="'nr'"
-                             [collection]="cashDrawers"
-                             [multiselect]="false"
-                             [required]="false"
-                             [searchDisabled]="true"
-                             (modelChange)="handleDrawerChanged($event)"
-          ></co-list-of-values>
-
         </div>
       </div>
       <div class="payment-to-pay-wrapper">