@colijnit/transaction 12.1.148 → 12.1.149

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.148";
-        this.publishDate = "30-9-2023 12:06:31";
+        this.symVer = "12.1.149";
+        this.publishDate = "2-10-2023 16:56:15";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNDhcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIzMC05LTIwMjMgMTI6MDY6MzFcIjtcbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNDlcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyLTEwLTIwMjMgMTY6NTY6MTVcIjtcbn0iXX0=

package/fesm2015/colijnit-transaction.js

@@ -110,7 +110,7 @@ import { GoodsPickedRequest } from '@colijnit/transactionapi/build/model/goods-p
 import { GoodsPickedRequestLine } from '@colijnit/transactionapi/build/model/goods-picked-request-line';
 import { ArticleFlatTreeDTO } from '@colijnit/articleapi/build/model/article-flat-tree.bo';
 import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
-import { IFrameCatalogType } from '@colijnit/transactionapi/build/enum/iframe-catalog-types.enum';
+import { ExternalCatalogTypes } from '@colijnit/transactionapi/build/enum/external-catalog-types.enum';
 import { FormMasterService, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, FormModule, InputRadioButtonModule, IconModule, InputTextComponent, TooltipDirectiveModule, CheckmarkOverlayModule, InputSearchModule, ColumnAlign, SimpleGridColumnDirective, OverlayService, ObserveVisibilityModule, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, InputDatePickerComponent, InputDatePickerModule, ColorSequenceService, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, FilterPipeModule, InputTextareaComponent, InputTextareaModule, FormComponent, ScreenConfigurationModule, PopupModule, ContentViewMode, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, CoDialogWizardModule, ViewModeButtonsModule, FilterItemModule, FilterItemMode, FilterViewmodel, PaginationModule, PaginationBarModule, IconCollapseHandleModule } from '@colijnit/corecomponents_v12';
 import { FlexModule } from '@angular/flex-layout';
 import { AddressType } from '@colijnit/relationapi/build/enum/address-type.enum';
@@ -198,8 +198,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.148";
-        this.publishDate = "30-9-2023 12:06:31";
+        this.symVer = "12.1.149";
+        this.publishDate = "2-10-2023 16:56:15";
     }
 }
 
@@ -4258,6 +4258,18 @@ class TransactionConnectorAdapterService {
             }
         });
     }
+    addExternalCatalogArticlesToTransaction(uuid, catalogId, rawData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.connector.addExternalCatalogArticlesToTransaction(uuid, catalogId, rawData);
+            if (response && response.validationResult && response.validationResult.success) {
+                return this._boFactory.makeWithRawBackendData(TransactionInfoResponse, response.resultObject);
+            }
+            else {
+                this._handleExceptionFromResponse(response);
+                return null;
+            }
+        });
+    }
     _handleExceptionFromResponse(result) {
         this._errorService.showValidationError(result);
     }
@@ -5350,6 +5362,11 @@ class TransactionConnectorService {
             return yield this._adapterService.copySalesQuotation(copyTransactionRequest);
         });
     }
+    addExternalCatalogArticlesToTransaction(uuid, catalogId, rawData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._adapterService.addExternalCatalogArticlesToTransaction(uuid, catalogId, rawData);
+        });
+    }
 }
 TransactionConnectorService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionConnectorService_Factory() { return new TransactionConnectorService(i0.ɵɵinject(TransactionConnectorAdapterService), i0.ɵɵinject(SelectSingleCacheService), i0.ɵɵinject(SelectMultipleCacheService), i0.ɵɵinject(SelectMultipleParameterizedCacheService), i0.ɵɵinject(SelectSingleParameterizedCacheService)); }, token: TransactionConnectorService, providedIn: "root" });
 TransactionConnectorService.decorators = [
@@ -8071,15 +8088,37 @@ class TransactionService extends PendingReasonService {
             yield this.addArticle(artNr, jsonArticleObject.quantity);
         });
     }
-    addIFrameArticle(request) {
+    addExternalCatalogArticle(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            const jsonArticleObject = JSON.parse(request.articleJson);
-            if (request.catalogType === IFrameCatalogType.Webshop) {
-                const response = yield this.addTransactionLine(jsonArticleObject.sku, jsonArticleObject.quantity);
-                const handled = yield this.handleLineOperationStatuses(response, true);
-                if (handled) {
-                    yield this.updatePriceTransactionLine(response.transactionInfo.uuid, response.lineOperationStatuses[0].uuid, jsonArticleObject.price);
-                }
+            if (request.catalogType === ExternalCatalogTypes.Webshop) {
+                yield this.addExternalCatalogArticleFromGoodId(request.articleJson);
+            }
+            else {
+                yield this.addExternalCatalogArticleWithRawData(request.catalogId, request.articleJson);
+            }
+        });
+    }
+    addExternalCatalogArticleFromGoodId(jsonArticleString) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const jsonArticleObject = JSON.parse(jsonArticleString);
+            const response = yield this.addTransactionLine(jsonArticleObject.sku, jsonArticleObject.quantity);
+            const handled = yield this.handleLineOperationStatuses(response, true);
+            if (handled && jsonArticleObject.price !== undefined) {
+                yield this.updatePriceTransactionLine(response.transactionInfo.uuid, response.lineOperationStatuses[0].uuid, jsonArticleObject.price);
+            }
+        });
+    }
+    addExternalCatalogArticleWithRawData(catalogId, jsonArticleString) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const created = yield this._checkAndCreateTransaction();
+            if (!created) {
+                return null;
+            }
+            const lockSuccess = yield this.tryToLockTransaction(this.currentTransaction.transactionInfo.id, this.currentTransaction.transactionInfo.version);
+            if (lockSuccess) {
+                this.transactionLineAdded = true;
+                const response = yield this.connector.addExternalCatalogArticlesToTransaction(this.currentTransaction.transactionInfo.uuid, catalogId, jsonArticleString);
+                yield this.handleLineOperationStatuses(response, true);
             }
         });
     }
@@ -15013,23 +15052,25 @@ TransactionPurchaseOverviewLineComponent.decorators = [
             <co-transaction-line-vat-button [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-vat-button>
           </div>
         </div>
-        <div class="transaction-line-totals">
-          <co-transaction-line-price class="transaction-line-totals-price price"
-                                     [transactionInfo]="transactionInfo"
-                                     [transactionLine]="transactionLine"
-                                     [showLabel]="false"
-                                     [defaultEditMode]="false"
-          ></co-transaction-line-price>
-          <co-transaction-line-discount-button [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-discount-button>
-          <div class="transaction-line-totals-amount">
-            <co-transaction-line-amount class="amount-number-picker" [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-amount>
+        <div class="transaction-line-section">
+          <div class="transaction-line-totals">
+            <co-transaction-line-price class="transaction-line-totals-price price"
+                                       [transactionInfo]="transactionInfo"
+                                       [transactionLine]="transactionLine"
+                                       [showLabel]="false"
+                                       [defaultEditMode]="false"
+            ></co-transaction-line-price>
+            <co-transaction-line-discount-button [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-discount-button>
+            <div class="transaction-line-totals-amount">
+              <co-transaction-line-amount class="amount-number-picker" [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-amount>
+            </div>
+            <co-editable-label class="transaction-line-totals-total price"
+                               [model]="transactionLine.displayNetLineTotal | coCurrency"
+                               [editModel]="transactionLine.displayNetLineTotal"
+                               [readonly]="true"
+                               [commit]="!readonly"
+            ></co-editable-label>
           </div>
-          <co-editable-label class="transaction-line-totals-total price"
-                             [model]="transactionLine.displayNetLineTotal | coCurrency"
-                             [editModel]="transactionLine.displayNetLineTotal"
-                             [readonly]="true"
-                             [commit]="!readonly"
-          ></co-editable-label>
         </div>
       </div>
     </co-transaction-base-line>
@@ -16789,7 +16830,7 @@ class TransactionMappingService {
                     { title: 'CONFIRMATION', icon: Icon.MemoCircleCheckRegular, category: TransactionTypeCategory.PurchaseOrderOrderConfirmation, component: TransactionPurchaseConfirmationButtonBarButtonComponent },
                     // {title: 'TRANSPORT', icon: Icon.TruckContainerSolid, category: TransactionTypeCategory.PurchaseOrderTransport},
                     { title: 'RECEIVED', icon: Icon.CartFlatbedBoxesSolid, category: TransactionTypeCategory.PurchaseOrderReceivedGoods, component: TransactionPurchaseReceiveGoodsButtonBarButtonComponent },
-                    { title: 'INVOICE_CHECK', icon: Icon.Tag, category: TransactionTypeCategory.PurchaseOrderInvoiceCheck, component: TransactionPurchaseInvoiceButtonBarButtonComponent }
+                    { title: 'INVOICE_CHECK', icon: Icon.Invoice, category: TransactionTypeCategory.PurchaseOrderInvoiceCheck, component: TransactionPurchaseInvoiceButtonBarButtonComponent }
                 ]],
             [TransactionKind.SalesOrder, [
                     { title: 'OVERVIEW', icon: Icon.CartShoppingRegular, category: TransactionTypeCategory.SalesOrderOverview, component: TransactionSalesOverviewButtonBarButtonComponent },
@@ -30364,7 +30405,6 @@ DialogCatalogComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-dialog-catalog",] }]
 };
 
-// import {IoneProductModule} from '@colijnit/product';
 class DialogCatalogModule {
 }
 DialogCatalogModule.decorators = [
@@ -30377,9 +30417,7 @@ DialogCatalogModule.decorators = [
                     PipeModule,
                     CatalogExternalSourceModule,
                     IconModule,
-                    IoneProductModule,
-                    /*,
-                            IoneProductModule*/
+                    IoneProductModule
                 ],
                 declarations: [
                     DialogCatalogComponent