@colijnit/transaction 12.1.153 → 12.1.154

package/fesm2015/colijnit-transaction.js

@@ -199,8 +199,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.153";
-        this.publishDate = "19-10-2023 15:15:35";
+        this.symVer = "12.1.154";
+        this.publishDate = "20-10-2023 19:08:26";
     }
 }
 
@@ -1251,6 +1251,12 @@ class BusinessObjectCacheManagerService {
         const cacheId = id.toString();
         return this._selectSingleCache.has(key) && this._selectSingleCache.get(key)[cacheId];
     }
+    deleteSingleCacheItem(key, id = BusinessObjectCacheManagerService._NullBoId) {
+        const cacheId = id.toString();
+        if (this._selectSingleCache.has(key)) {
+            this._selectSingleCache.delete(key);
+        }
+    }
     // Returns the parameterized cache item with the given key. T is the type of the cache value items requested, e.g. Color.
     getSelectMultipleParameterCacheItem(key) {
         return this._selectMultipleParameterizedCache.get(key);
@@ -4657,7 +4663,10 @@ class SelectSingleCacheService {
     constructor(_boCacheManager) {
         this._boCacheManager = _boCacheManager;
     }
-    requestCache(clazz, sourceId, loadFunction) {
+    requestCache(clazz, sourceId, loadFunction, reload = false) {
+        if (reload) {
+            this._boCacheManager.deleteSingleCacheItem(clazz, sourceId);
+        }
         if (!this._boCacheManager.hasSingleCacheItem(clazz, sourceId)) {
             this._createCacheItem(clazz, sourceId, loadFunction);
         }
@@ -6753,14 +6762,14 @@ class RelationService {
         this._boFactory = new BusinessObjectFactory();
     }
     getCustomerFullObject(relationNo) {
-        // return this._selectSingleCacheService.requestCache<CustomerFullObject>(CustomerFullObject, relationNo, () => {
-        return this._adapterService.getCustomerFullObject(relationNo);
-        // }).getValue();
+        return this._selectSingleCacheService.requestCache(CustomerFullObject, relationNo, () => {
+            return this._adapterService.getCustomerFullObject(relationNo);
+        }).getValue();
     }
     getSupplierFullObject(relationNo) {
-        // return this._selectSingleCacheService.requestCache<SupplierFullObject>(SupplierFullObject, relationNo, () => {
-        return this._adapterService.getSupplierFullObject(relationNo);
-        // }).getValue();
+        return this._selectSingleCacheService.requestCache(SupplierFullObject, relationNo, () => {
+            return this._adapterService.getSupplierFullObject(relationNo);
+        }).getValue();
     }
     insertAddress(address) {
         return this._adapterService.insertAddress(address);
@@ -6769,19 +6778,27 @@ class RelationService {
         return this._adapterService.updateAddress(address);
     }
     insertCustomer(relation) {
-        return this._adapterService.insertCustomer(relation);
+        return this._selectSingleCacheService.requestCache(CustomerFullObject, relation.relationNumber, () => {
+            return this._adapterService.insertCustomer(relation);
+        }, true).getValue();
     }
     updateCustomer(relation) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapterService.updateCustomer(relation);
+            return this._selectSingleCacheService.requestCache(CustomerFullObject, relation.relationNumber, () => {
+                return this._adapterService.updateCustomer(relation);
+            }, true).getValue();
         });
     }
     insertSupplier(relation) {
-        return this._adapterService.insertSupplier(relation);
+        return this._selectSingleCacheService.requestCache(SupplierFullObject, relation.relationNumber, () => {
+            return this._adapterService.insertSupplier(relation);
+        }, true).getValue();
     }
     updateSupplier(relation) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapterService.updateSupplier(relation);
+            return this._selectSingleCacheService.requestCache(SupplierFullObject, relation.relationNumber, () => {
+                return this._adapterService.updateSupplier(relation);
+            }, true).getValue();
         });
     }
     getRelationListObjects(relationRequest) {
@@ -7087,6 +7104,14 @@ class TransactionBaseService extends BaseModuleService {
         const clazz = this._getRelationClass(this.transactionKind);
         this.relation = new clazz;
     }
+    setRelationOnTransaction(relationNr, relationKind) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const relation = yield this.relationService.getRelation(relationKind, relationNr);
+            if (relation) {
+                this.relation = relation;
+            }
+        });
+    }
     resetCurrentTransaction() {
         this.currentTransaction = new TransactionInfoResponse();
         this._relation = new CustomerFullObject();
@@ -9403,6 +9428,9 @@ class CheckoutComponent {
         this.service.transactionKind = this.transactionType;
         this.relationType = this.service.getRelationKindFromTransactionKind();
         this.service.createNewRelation();
+        if (this.relationNr) {
+            this.service.setRelationOnTransaction(this.relationNr, this.relationType);
+        }
     }
     ngOnDestroy() {
         this._subs.forEach(s => s.unsubscribe());
@@ -9565,6 +9593,7 @@ CheckoutComponent.propDecorators = {
     checkoutDelivery: [{ type: ViewChild, args: ["checkoutDelivery",] }],
     checkoutPayment: [{ type: ViewChild, args: ["checkoutPayment",] }],
     newTransaction: [{ type: Input }],
+    relationNr: [{ type: Input }],
     sellerId: [{ type: Input }],
     transactionType: [{ type: Input }],
     showCreateTransactionButton: [{ type: Input }],
@@ -13410,8 +13439,8 @@ class TransactionQuickAccessOrderConfirmationComponent extends TransactionBaseCo
             .map((line) => {
             const details = new PurchaseOrderConfirmationLineDetails();
             details.lineNumber = line.lineNr;
-            details.amountConfirmed = line.quantityPurchaseToConfirm;
-            details.confirmedDate = this.purchaseOrderConfirmation.confirmationDate;
+            details.amountConfirmed = +line.purchasePortalLine.amountToBeConfirmed;
+            details.confirmedDate = line.purchasePortalLine.deliveryDateConfirmed ? new Date(line.purchasePortalLine.deliveryDateConfirmed) : this.purchaseOrderConfirmation.confirmationDate;
             details.confirmedPrice = +line.purchasePortalLine.confirmedPrice;
             return details;
         });
@@ -15686,6 +15715,9 @@ class TransactionPurchaseOrderLineBaseComponent extends TransactionBaseComponent
         this._subs = [];
     }
     ngOnInit() {
+        if (this.transactionLine.purchasePortalLine.amountToBeConfirmed === null || this.transactionLine.purchasePortalLine.amountToBeConfirmed === undefined) {
+            this.transactionLine.purchasePortalLine.amountToBeConfirmed = this.transactionLine.amount.toString();
+        }
         this._subs.push(this.transactionEventService.selectAllSalesOrderLinesForPurchase.subscribe((value) => {
             this.selected = value && this.showCheckboxForLine;
             this.detectChanges();
@@ -15811,28 +15843,24 @@ TransactionPurchaseOrderLineComponent.decorators = [
                           [model]="transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'"
                           [leftIconData]="iconCacheService.getIcon(icons.RegularIndustryTag)"
                           [customHeight]="true"
-                          [tooltip]="'ARTICLE_NO_SUPPLIER' | localize"
                   ></co-input-text>
                   <co-transaction-line-confirmed-price class="transaction-line-confirmed-price price"
                                                        [screenConfigurationObject]="cfgNames.LineConfirmedPrice"
                                                        [(price)]="transactionLine.purchasePortalLine.confirmedPrice"
                                                        [showLabel]="false"
                                                        [defaultEditMode]="false"
-                                                       [tooltip]="'CONFIRMED_PRICE' | localize"
                   ></co-transaction-line-confirmed-price>
                   <co-input-number-picker class="amount-number-picker"
                                           [screenConfigurationObject]="cfgNames.LineConfirmedAmount"
                                           [required]="true"
-                                          [(model)]="+transactionLine.purchasePortalLine.amountConfirmed"
+                                          [(model)]="transactionLine.purchasePortalLine.amountToBeConfirmed"
                                           [min]="1"
                                           [max]="+transactionLine.purchasePortalLine.amountOrdered"
                                           [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"
-                                          [tooltip]="'CONFIRMED' | localize"
                   ></co-input-number-picker>
                   <co-transaction-line-supplier-delivery-date-button
                           [screenConfigurationObject]="cfgNames.LineConfirmedDate"
                           [transactionLine]="transactionLine"
-                          [tooltip]="'CONFIRMED_DATE' | localize"
                   ></co-transaction-line-supplier-delivery-date-button>
               </div>
           </div>
@@ -19779,7 +19807,7 @@ TransactionLineDeliveryDateButtonComponent.decorators = [
       [label]="transactionLine.deliveryDate | date:'d MMM yyyy'"
       [rightIconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"
       (click)="handleShowHideClick()"
-      ></co-transaction-button>
+    ></co-transaction-button>
   `,
                 providers: [
                     OverlayService,
@@ -21767,11 +21795,12 @@ PaymentService.ctorParameters = () => [
 ];
 
 class PaymentComponent {
-    constructor(_transactionService, _sharedService, _paymentService, _transactionEventService) {
+    constructor(_transactionService, _sharedService, _paymentService, _transactionEventService, iconCacheService) {
         this._transactionService = _transactionService;
         this._sharedService = _sharedService;
         this._paymentService = _paymentService;
         this._transactionEventService = _transactionEventService;
+        this.iconCacheService = iconCacheService;
         this.icons = Icon;
         this.updateDepositAmount = true;
         this.payed = new EventEmitter();
@@ -21784,6 +21813,7 @@ class PaymentComponent {
         this.showPspQrCode = false;
         this.showLoader = true;
         this.amountToPay = 0;
+        this.depositAmount = 0;
         this.statusMessage = "";
         this._amount = 0;
         this._paymentStatusPollIntervalMs = 5000;
@@ -21878,6 +21908,7 @@ class PaymentComponent {
                 const info = yield this._paymentService.getDepositPaymentInfo(this.transactionUuid);
                 if (info) {
                     this.amountToPay = info.depositRemainderAmount;
+                    this.depositAmount = info.depositAmount;
                 }
             }
             else {
@@ -21987,47 +22018,59 @@ PaymentComponent.decorators = [
                 selector: "co-payment",
                 template: `
     <div class="payment-wrapper">
-      <div class="payment-methods-header">
-        <span class="payment-header-title" [textContent]="'SELECT_A' | localize"></span>
-        <span class="payment-header-title extra" [textContent]="'FREE' | localize:false"></span>
-        <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
-      </div>
-      <div class="payment-methods">
-        <co-loader class="loader" *ngIf="showLoader"></co-loader>
-        <ng-container *ngIf="!showLoader">
-          <co-payment-tile *ngFor="let paymentMethod of paymentMethods; let index = index"
-                           [image]="paymentMethod.image"
-                           [description]="paymentMethod.payment.description"
-                           [selected]="paymentMethodIdx === index"
-                           (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
-          ></co-payment-tile>
-        </ng-container>
-      </div>
-      <div class="payment-cash-register-wrapper" *ngIf="showCashRegisters">
-        <div class="payment-cash-register-header">
-          <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
+      <div class="payment-methods-register-wrapper">
+        <div class="payment-methods-wrapper">
+          <div class="payment-methods-header">
+            <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
+            <!--span class="payment-header-title extra" [textContent]="'FREE' | localize:false"></span-->
+            <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
+          </div>
+          <div class="payment-methods co-small-scrollbar">
+            <co-loader class="loader" *ngIf="showLoader"></co-loader>
+            <ng-container *ngIf="!showLoader">
+              <co-payment-tile *ngFor="let paymentMethod of paymentMethods; let index = index"
+                               [image]="paymentMethod.image"
+                               [description]="paymentMethod.payment.description"
+                               [selected]="paymentMethodIdx === index"
+                               (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
+              ></co-payment-tile>
+            </ng-container>
+          </div>
         </div>
-        <div class="payment-methods">
-          <co-payment-tile *ngFor="let cashRegister of cashRegisters; let index = index"
-                           [icon]="cashRegister.icon"
-                           [description]="cashRegister.description"
-                           [selected]="cashRegisterIdx === index"
-                           (selectedChange)="cashRegisterSelected(cashRegister, index)"
-          ></co-payment-tile>
+        <div class="payment-cash-register-wrapper" *ngIf="showCashRegisters">
+          <div class="payment-cash-register-header">
+            <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
+          </div>
+          <div class="payment-methods">
+            <co-payment-tile *ngFor="let cashRegister of cashRegisters; let index = index"
+                             [icon]="cashRegister.icon"
+                             [description]="cashRegister.description"
+                             [selected]="cashRegisterIdx === index"
+                             (selectedChange)="cashRegisterSelected(cashRegister, index)"
+            ></co-payment-tile>
+          </div>
         </div>
       </div>
       <div class="payment-to-pay-wrapper">
-        <co-payment-to-pay [amountToPay]="amountToPay"></co-payment-to-pay>
+        <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]="depositAmount === 0 ? depositAmount : (depositAmount | coCurrency)"></span>
+          </div>
+          <div class="payment-input-button-wrapper">
+            <div class="payment-input-button">
+                <co-payment-to-pay [amountToPay]="amountToPay"></co-payment-to-pay>
+                <div class="payment-to-pay-button">
+                    <co-button [iconData]="iconCacheService.getIcon(icons.CheckDuotone)" (click)="handlePayment()" [disabled]="amountToPay === 0"></co-button>
+                </div>
+            </div>
+            <div class="payment-error-message" *ngIf="statusMessage" [textContent]="statusMessage"></div>
+          </div>
+        </div>
+
         <div class="payment-deposit">
           <co-deposit-payment [branch]="branch" [transactionUuid]="transactionUuid"></co-deposit-payment>
         </div>
-        <div class="payment-to-pay-button">
-          <!--
-                    <co-loader *ngIf="statusMessage"></co-loader>
-          -->
-          <div class="payment-error-message" *ngIf="statusMessage" [textContent]="statusMessage"></div>
-          <co-button [label]="'PAY' | localize" (click)="handlePayment()" [disabled]="amountToPay === 0"></co-button>
-        </div>
         <co-key-pad class="payment-to-pay-keypad"
                     [showValue]="false"
                     [emitModelChangeOnEnter]="false"
@@ -22050,7 +22093,8 @@ PaymentComponent.ctorParameters = () => [
     { type: TransactionService },
     { type: SharedService },
     { type: PaymentService },
-    { type: TransactionEventService }
+    { type: TransactionEventService },
+    { type: IconCacheService }
 ];
 PaymentComponent.propDecorators = {
     transId: [{ type: Input }],
@@ -22215,9 +22259,10 @@ DepositPaymentComponent.decorators = [
           [image]="payment.paymentMethod?.image"
           [description]="payment.paymentMethod?.payment.description"
         ></co-payment-tile>
-        <div class="deposit-payment-spacer"></div>
+        <div class="down-payment-date-wrapper">
+          <div class="down-payment-date" [textContent]="payment.depositPayment?.date | date:'d MMMM yyyy'"></div>
+        </div>
         <div class="down-payment-amount-wrapper">
-          <div class="down-payment-date" [textContent]="payment.depositPayment?.date | date:'d MMMM yyyy | HH:mm'"></div>
           <div class="down-payment-amount" [textContent]="payment.depositPayment?.depositPaymentAmount | coCurrency"></div>
         </div>
       </div>
@@ -22316,7 +22361,8 @@ PaymentModule.decorators = [
                     PaymentQrCodeModule,
                     DepositPaymentModule,
                     LoaderModule,
-                    PaymentToPayModule
+                    PaymentToPayModule,
+                    IconModule
                 ],
                 declarations: [
                     PaymentComponent
@@ -27728,10 +27774,13 @@ TransactionHeaderPaymentComponent.decorators = [
       </div>
     </co-dialog>
 -->
-    <co-dialog class="payment-dialog" [customCssClass]="'co-small-scrollbar'" *ngIf="showPaymentDialog"
-               [modal]="true"
-               (closeClick)="showPaymentDialog = false"
-    >
+    <co-dialog class="payment-dialog" [modal]="true" [headerTemplate]="headerTemplate" *ngIf="showPaymentDialog" (closeClick)="showPaymentDialog = false">
+      <ng-template #headerTemplate>
+        <div class="payment-wrapper-popup-title">
+          <co-icon [iconData]="iconCacheService.getIcon(icons.CreditCardRegularCheck)"></co-icon>
+          <div class="co-dialog-header-title" [textContent]="'PAYMENT_METHOD' | localize"></div>
+        </div>
+      </ng-template>
       <co-payment
         [transId]="transactionInfo.id"
         [branch]="transactionInfo.branch?.relationNr"
@@ -29830,8 +29879,6 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
                     existingBatch.docAmount = this.docDeliveryBatch.docAmount;
                     existingBatch.docDate = this.docDeliveryBatch.docDate;
                     existingBatch.reference = this.docDeliveryBatch.reference;
-                    existingBatch.docAmountOrg = this.docDeliveryBatch.docAmountOrg;
-                    existingBatch.docDateOrg = this.docDeliveryBatch.docDateOrg;
                 }
                 else { // or create a new one
                     this.docDeliveryBatch.deleteLine = 'F';
@@ -29861,7 +29908,7 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
     }
     handleSelectHistoryRow(row) {
         this.docDeliveryBatch = row;
-        // this.docDeliveryBatch.docDate = new Date(row.docDate);
+        this.docDeliveryBatch.docDate = new Date(row.docDate);
     }
     handleCancelClick() {
         this._initNewDocDeliveryBatch();
@@ -29874,7 +29921,9 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
     }
     _initNewDocDeliveryBatch() {
         this.docDeliveryBatch = new DocDeliveryBatch();
-        this.docDeliveryBatch.docAmount = +this.transactionLine.purchasePortalLine.amountOrdered;
+        this.docDeliveryBatch.docAmount = this.transactionLine.purchasePortalLine.docBatchArray.length === 0
+            ? +this.transactionLine.amount
+            : +this.transactionLine.purchasePortalLine.amountOrdered;
         this.docDeliveryBatch.confirmedPrice = +this.transactionLine.purchasePortalLine.netOrderPrice;
     }
 }
@@ -33256,24 +33305,53 @@ class TransactionLineSupplierDeliveryDateButtonComponent extends TransactionBase
         this._overlayService = _overlayService;
         this._elementRef = _elementRef;
         this.icons = Icon;
+        this.showCalender = false;
     }
     showClass() {
         return true;
     }
-    handleShowDialog(event) {
+    handleShowHideClick() {
+        this.showCalender = !this.showCalender;
+        if (this.showCalender) {
+            this._showPopup();
+        }
+        else {
+            this._hidePopup();
+        }
+    }
+    _showPopup() {
+        this.showCalender = true;
+        this._calendarPopupComponentRef = this._overlayService.createComponent(CalendarComponent, {
+            parentForOverlay: this.parentComponent,
+            selectedDate: new Date(this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                ? this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                : new Date())
+        }, {
+            dateSelected: (date) => this._handleDateChanged(date),
+            clickedOutside: () => this.handleShowHideClick()
+        });
+    }
+    _handleDateChanged(date) {
+        this.transactionLine.purchasePortalLine.deliveryDateConfirmed = date.toDateString();
+        this.handleShowHideClick();
+        this.detectChanges();
+    }
+    _hidePopup() {
+        this.showCalender = false;
+        this._overlayService.removeComponent(this._calendarPopupComponentRef);
     }
 }
 TransactionLineSupplierDeliveryDateButtonComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-line-supplier-delivery-date-button',
                 template: `
-        <co-transaction-button class="big center-align"
+        <co-transaction-button #parentComponent class="big center-align"
                                [hidden]="hidden"
                                [readonly]="readonly"
                                [iconData]="iconCacheService.getIcon(icons.RegularIndustryClock)"
                                [label]="transactionLine.purchasePortalLine.deliveryDateConfirmed | date:'d MMM yyyy'"
                                [rightIconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"
-                               (click)="handleShowDialog($event)"
+                               (click)="handleShowHideClick()"
         ></co-transaction-button>
     `,
                 providers: [
@@ -33298,6 +33376,7 @@ TransactionLineSupplierDeliveryDateButtonComponent.ctorParameters = () => [
     { type: ElementRef }
 ];
 TransactionLineSupplierDeliveryDateButtonComponent.propDecorators = {
+    parentComponent: [{ type: ViewChild, args: ['parentComponent', { read: ElementRef },] }],
     showClass: [{ type: HostBinding, args: ['class.co-transaction-line-supplier-delivery-date-button',] }]
 };