@colijnit/transaction 12.1.12 → 12.1.13

package/fesm2015/colijnit-transaction.js

@@ -35,7 +35,6 @@ import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transa
 import { CashRegister } from '@colijnit/transactionapi/build/model/cash-register';
 import { PriceList } from '@colijnit/transactionapi/build/model/price-list';
 import { Vat } from '@colijnit/transactionapi/build/model/vat';
-import { SetTransactionDeliveryOptionsRequest } from '@colijnit/transactionapi/build/model/set-transaction-delivery-options-request.bo';
 import { RelationStatus } from '@colijnit/transactionapi/build/enum/relation-status.enum';
 import { ResolveLinePendingReasonRequest } from '@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo';
 import { FormMasterService, FormComponent, CoDialogModule, ButtonModule, InputComboBoxModule, InputTextModule, FormModule, InputRadioButtonModule, IconModule, InputCheckboxModule, InputListboxModule, DropDownModule, InputNumberPickerModule, PriceDisplayPipeModule, InputDatePickerModule, CoDialogPromptModule, MultiSelectListModule, PopupModule, CoSidebarModule, CoGridModule, CoRichTextEditorModule, Carousel3dModule, InputTextareaModule, CollapsibleModule, ColumnAlign, SimpleGridColumnDirective, SimpleGridModule, InputTextComponent } from '@colijnit/corecomponents_v12';
@@ -2345,7 +2344,6 @@ class PendingReasonService {
         this.applicationUser = false;
         this.currentTransaction = new TransactionInfoResponse();
         this.relation = new CustomerFullObject();
-        this.deliveryOptions = new SetTransactionDeliveryOptionsRequest();
         this.articleAmount = 0;
     }
     init(options) {
@@ -2392,7 +2390,6 @@ class PendingReasonService {
     _rememberCurrentTransaction(value) {
         return __awaiter(this, void 0, void 0, function* () {
             this.currentTransaction = value;
-            this._setTransactionDeliveryOptions();
             this._setAmount();
             this._initializeTransaction();
             this.transactionUpdated.next(this.currentTransaction);
@@ -2449,22 +2446,6 @@ class PendingReasonService {
             this.dialogService.showInformation(reason);
         });
     }
-    _setTransactionDeliveryOptions() {
-        if (!this.deliveryOptions) {
-            this.deliveryOptions = new SetTransactionDeliveryOptionsRequest();
-        }
-        this.deliveryOptions.allowPartialDelivery = this.currentTransaction.transactionInfo.allowPartialDelivery;
-        this.deliveryOptions.deliveryDate = this.currentTransaction.transactionInfo.deliveryDate;
-        this.deliveryOptions.deliveryMethod = this.currentTransaction.transactionInfo.deliveryMethod;
-        this.deliveryOptions.deliveryOptions = this.currentTransaction.transactionInfo.deliveryOptions;
-        this.deliveryOptions.marketingCode = this.currentTransaction.transactionInfo.marketingCode;
-        this.deliveryOptions.ownReference = this.currentTransaction.transactionInfo.ownReference;
-        this.deliveryOptions.preferredDeliveryDate = this.currentTransaction.transactionInfo.preferredDeliveryDate;
-        this.deliveryOptions.preferredDeliveryDate2 = this.currentTransaction.transactionInfo.preferredDeliveryDate2;
-        this.deliveryOptions.relationReference = this.currentTransaction.transactionInfo.relationReference;
-        this.deliveryOptions.remark = this.currentTransaction.transactionInfo.remark;
-        this.deliveryOptions.transactionUuid = this.currentTransaction.transactionInfo.uuid;
-    }
     _setAmount() {
         if (this.currentTransaction && this.currentTransaction.transactionLines) {
             this.articleAmount = this.currentTransaction.transactionLines.filter(t => t.lineType === TransactionLineType.ArticleLine).length;
@@ -2475,7 +2456,6 @@ class PendingReasonService {
             this.relation = new CustomerFullObject();
             this.relation.relationStatus = RelationStatus.RegularCustomer;
             this.relation.startDate = new Date();
-            this.deliveryOptions = new SetTransactionDeliveryOptionsRequest();
         }
         if (this.currentTransaction.transactionInfo.preferredDeliveryDate2 === undefined) {
             this.currentTransaction.transactionInfo.preferredDeliveryDate2 = "=";
@@ -2507,56 +2487,6 @@ class TransactionService extends PendingReasonService {
         super(...arguments);
         this._imageCache = new Map();
     }
-    // public get currentLines(): TransactionLineInfo[] {
-    //   return this._currentLines;
-    // }
-    //
-    // public set currentLines(value: TransactionLineInfo[]) {
-    //   this._currentLines = value;
-    //   this.articleAmount = ArrayUtils.FindAll(this._currentLines, line => line.isArticle).length;
-    // }
-    //
-    // public set currentTotals(value: TransactionTotal) {
-    //   this._currentTotals = value;
-    // }
-    //
-    // public get currentTotals(): TransactionTotal {
-    //   return this._currentTotals;
-    // }
-    //
-    // public get currentRelation(): RelationAnyType {
-    //   return this._currentRelation;
-    // }
-    //
-    // public get currentTransaction(): TransactionInfo {
-    //   return this._currentTransaction;
-    // }
-    //
-    // public set currentLineOperationStatuses(values: LineOperationStatus[]) {
-    //   this._currentLineOperationStatuses = values;
-    // }
-    //
-    // public get currentLineOperationStatuses(): LineOperationStatus[] {
-    //   return this._currentLineOperationStatuses;
-    // }
-    //
-    // public set currentLineOperationStatus(value: LineOperationStatus) {
-    //   this._currentLineOperationStatus = value;
-    // }
-    //
-    // public get currentLineOperationStatus(): LineOperationStatus | undefined {
-    //   const status: LineOperationStatus = this.currentLineOperationStatuses.find(line => line.pendingReasonType !== PendingReasonType.NONE
-    //     && line.pendingReasonType !== PendingReasonType.NON_CRITICAL_DISCONTINUATION);
-    //   return status;
-    // }
-    //
-    // public articleAmount: number = 0;
-    // private _currentLines: TransactionLineInfo[] = [];
-    // private _currentTotals: TransactionTotal = new TransactionTotal();
-    // private _currentRelation: RelationAnyType; // = NULL_RELATION_OBJECT;
-    // private _currentTransaction: TransactionInfo = new TransactionInfo();
-    // private _currentLineOperationStatus: LineOperationStatus = new LineOperationStatus();
-    // private _currentLineOperationStatuses: LineOperationStatus[] = [];
     pendingLineOperationStatus(lineOperationStatuses) {
         const status = lineOperationStatuses.find(line => line.pendingReasonType !== PendingReasonType.NONE
             && line.pendingReasonType !== PendingReasonType.NON_CRITICAL_DISCONTINUATION);
@@ -2924,19 +2854,6 @@ class TransactionService extends PendingReasonService {
             return yield this.connector.getDeliveryOptions();
         });
     }
-    setTransactionDeliveryOptions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // const transactionDeliveryOptionsRequest: SetTransactionDeliveryOptionsRequest = this._getTransactionDeliveryOptions();
-            if (!this.deliveryOptions.transactionUuid) {
-                this.deliveryOptions.transactionUuid = this.currentTransaction.transactionInfo.uuid;
-            }
-            const response = yield this.connector.setTransactionDeliveryOptions(this.deliveryOptions)
-                .catch(() => {
-                return undefined;
-            });
-            return response && response.isSuccess;
-        });
-    }
     getRelationListObjects(relationRequest) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.connector.getRelationListObjects(relationRequest);
@@ -3238,7 +3155,7 @@ class CheckoutComponent {
     }
     handleSaveDelivery() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.service.setTransactionDeliveryOptions();
+            return true;
         });
     }
 }
@@ -3248,12 +3165,12 @@ CheckoutComponent.decorators = [
                 template: `
     <co-stepper [finishButtonLabel]="'CHECKOUT_FINISH' | localize" (finishStep)="handleFinishStep()">
       <co-stepper-step #stepRelation [index]="1" [label]="'YOUR_DATA' | localize" (validateStep)="handleRelationValidation()">
-        <co-checkout-overview-relation-edit #checkoutRelation *ngIf="stepRelation.show" [(relation)]="service.relation" [deliveryOptionsRequest]="service.deliveryOptions"
+        <co-checkout-overview-relation-edit #checkoutRelation *ngIf="stepRelation.show" [(relation)]="service.relation"
                                             (relationChange)="service.relation = $event"
         ></co-checkout-overview-relation-edit>
       </co-stepper-step>
       <co-stepper-step #stepDelivery [index]="2" [label]="'DELIVERY' | localize" (validateStep)="handleDeliveryValidation()">
-        <co-checkout-overview-delivery-edit #checkoutDelivery *ngIf="stepDelivery.show" [deliveryOptionsRequest]="service.deliveryOptions"
+        <co-checkout-overview-delivery-edit #checkoutDelivery *ngIf="stepDelivery.show"
                                             [transaction]="service.currentTransaction"
         ></co-checkout-overview-delivery-edit>
       </co-stepper-step>
@@ -3440,26 +3357,26 @@ class CheckoutOverviewRelationEditComponent {
         this.showSelectAddressDialog = false;
     }
     selectAddress(address) {
-        if (!this.deliveryOptionsRequest) {
-            return;
-        }
-        if (!address) {
-            address = this._service.getFirstAddress(this.relation);
-        }
-        if (!address) {
-            return;
-        }
-        this._setCountryNameToAddress(address);
-        if (this.editAddressType === AddressType.DeliveryAddress) {
-            this.deliveryOptionsRequest.transactionAddress = address.nawNr;
-            this.deliveryAddress = address;
-            this.deliveryAddressIdx = this.relation.addresses.findIndex(a => a.nawNr === this.deliveryAddress.nawNr);
-        }
-        if (this.invoiceAddressSameAsDeliveryAddress || this.editAddressType !== AddressType.DeliveryAddress) {
-            this.deliveryOptionsRequest.invoiceAddress = address.nawNr;
-            this.invoiceAddress = address;
-            this.invoiceAddressIdx = this.relation.addresses.findIndex(a => a.nawNr === this.invoiceAddress.nawNr);
-        }
+        // if (!this.deliveryOptionsRequest) {
+        //   return;
+        // }
+        // if (!address) {
+        //   address = this._service.getFirstAddress(this.relation);
+        // }
+        // if (!address) {
+        //   return;
+        // }
+        // this._setCountryNameToAddress(address);
+        // if (this.editAddressType === AddressType.DeliveryAddress) {
+        //   this.deliveryOptionsRequest.transactionAddress = address.nawNr;
+        //   this.deliveryAddress = address;
+        //   this.deliveryAddressIdx = this.relation.addresses.findIndex(a => a.nawNr === this.deliveryAddress.nawNr);
+        // }
+        // if (this.invoiceAddressSameAsDeliveryAddress || this.editAddressType !== AddressType.DeliveryAddress) {
+        //   this.deliveryOptionsRequest.invoiceAddress = address.nawNr;
+        //   this.invoiceAddress = address;
+        //   this.invoiceAddressIdx = this.relation.addresses.findIndex(a => a.nawNr === this.invoiceAddress.nawNr);
+        // }
         this.showSelectAddressDialog = false;
     }
     preparePrimaryEmail() {
@@ -3835,7 +3752,6 @@ CheckoutOverviewRelationEditComponent.ctorParameters = () => [
 CheckoutOverviewRelationEditComponent.propDecorators = {
     relationForm: [{ type: ViewChild, args: [FormComponent, { static: true },] }],
     relation: [{ type: Input }],
-    deliveryOptionsRequest: [{ type: Input }],
     validSubmit: [{ type: Output }],
     invalidSubmit: [{ type: Output }],
     relationChange: [{ type: Output }],
@@ -3925,11 +3841,11 @@ class CheckoutOverviewDeliveryEditComponent {
         this.icons = Icon;
         this.validSubmit = new EventEmitter();
         this.invalidSubmit = new EventEmitter();
-        this.deliveryTypes = [
-            { code: '1', description: 'Bezorgen', icon: this.icons.DeliveryTruck, price: 89 },
-            { code: '2', description: 'Bezorgen & monteren', icon: this.icons.CalendarDay, price: 119 },
-            { code: '3', description: 'Meenemen', icon: this.icons.Truck },
-        ];
+        // public deliveryTypes: DeliveryType[] = [
+        //   {code: '1', description: 'Bezorgen', icon: this.icons.DeliveryTruck, price: 89},
+        //   {code: '2', description: 'Bezorgen & monteren', icon: this.icons.CalendarDay, price: 119},
+        //   {code: '3', description: 'Meenemen', icon: this.icons.Truck},
+        // ];
         this.deliveryOptionList = [];
         this.deliveryOptions = [];
         this.deliveryOptionFields = { text: "description", value: "code" };
@@ -3977,7 +3893,7 @@ class CheckoutOverviewDeliveryEditComponent {
             this.deliveryCosts = this.calculateDeliveryCosts();
             this.assemblyCosts = this.calculateAssemblyCosts();
             this.service.getDeliveryMethods().then((methods) => {
-                this.deliveryMethods = methods;
+                this.deliveryMethods = methods.filter(m => m.webshop);
             });
             this.service.getDeliveryOptions().then((options) => {
                 this.deliveryOptionList = options;
@@ -3990,13 +3906,13 @@ class CheckoutOverviewDeliveryEditComponent {
     submit() {
         return this._formMasterService.submitSlaves();
     }
-    handleDeliveryMethodChange(deliveryMethodId) {
+    handleDeliveryMethodChange(deliveryMethod) {
         return __awaiter(this, void 0, void 0, function* () {
-            const deliveryMethod = this.selectDeliveryMethodById(deliveryMethodId);
-            this.deliveryOptionsRequest.deliveryMethod = deliveryMethodId;
+            this.transaction.transactionLines.forEach((tl) => {
+                tl.deliveryMethodCode = deliveryMethod.code;
+            });
             if (deliveryMethod) {
                 this.deliveryOptions = this.selectDeliveryOptionsByDeliveryMethod(deliveryMethod);
-                this.deliveryOptionsRequest.deliveryOptions = [];
             }
         });
     }
@@ -4047,37 +3963,27 @@ CheckoutOverviewDeliveryEditComponent.decorators = [
                                 [tileHeight]="100"
                                 [selectedIndex]="deliveryTypeIdx"
                                 (indexSelected)="setIndexDeliveryType($event)">
-                  <co-delivery-type-tile #carouselItem *ngFor="let type of deliveryTypes; let index = index"
-                                            [type]="type"
+                  <co-delivery-type-tile #carouselItem *ngFor="let method of deliveryMethods; let index = index"
+                                            [method]="method"
                                             [selected]="deliveryTypeIdx === index"
+                                            (selectedChange)="handleDeliveryMethodChange($event)"
                   ></co-delivery-type-tile>
                 </co-carousel-3d>
               </div>
               <div class="checkout-data-row">
-                <co-input-date [(model)]="deliveryOptionsRequest.deliveryDate" [placeholder]="'DELIVERY_DATE' | localize" [required]="true"></co-input-date>
+                <co-input-date [placeholder]="'DELIVERY_DATE' | localize" [required]="true"></co-input-date>
               </div>
               <div class="checkout-data-row">
-                <co-input-date [(model)]="deliveryOptionsRequest.preferredDeliveryDate" [placeholder]="'PREFERRED_DATE' | localize"></co-input-date>
+                <co-input-date [placeholder]="'PREFERRED_DATE' | localize"></co-input-date>
               </div>
               <div class="checkout-data-row">
-                <co-input-checkbox [(model)]="deliveryOptionsRequest.allowPartialDelivery" [label]="'PART_DELIVERIES' | localize"></co-input-checkbox>
+                <co-input-checkbox [label]="'PART_DELIVERIES' | localize"></co-input-checkbox>
               </div>
               <div class="checkout-data-row">
                 <co-collapsible [headerTitle]="'ADD_DELIVERY_OPTION' | localize" [iconData]="iconService.getIcon(icons.TriangleDown)">
-                  <div class="checkout-data-row">
-                    <co-drop-down-list
-                      [collection]="deliveryMethods"
-                      [fields]="deliveryMethodFields"
-                      [required]="true"
-                      [model]="deliveryOptionsRequest.deliveryMethod"
-                      (modelChange)="handleDeliveryMethodChange($event)"
-                      [placeholder]="'DELIVERY_METHOD' | localize"></co-drop-down-list>
-                    <co-input-text [placeholder]="'TOTAL_ASSEMBLY_TIME' | localize"></co-input-text>
-                  </div>
                   <div class="checkout-data-row">
                     <co-input-listbox
                       [placeholder]="'DELIVERY_OPTIONS' | localize"
-                      [(model)]="deliveryOptionsRequest.deliveryOptions"
                       [collection]="deliveryOptions"
                       [fields]="deliveryOptionFields"
                       [showCheckbox]="true"
@@ -4088,17 +3994,17 @@ CheckoutOverviewDeliveryEditComponent.decorators = [
               <div class="checkout-data-row">
                 <co-collapsible [headerTitle]="'ADD_REMARK' | localize" [iconData]="iconService.getIcon(icons.TriangleDown)">
                   <div class="checkout-data-row">
-                    <co-input-textarea [(model)]="deliveryOptionsRequest.remark" [placeholder]="'REMARKS' | localize"></co-input-textarea>
+                    <co-input-textarea [placeholder]="'REMARKS' | localize"></co-input-textarea>
                   </div>
                 </co-collapsible>
               </div>
               <div class="checkout-data-row">
                 <co-collapsible [headerTitle]="'ADD_REFERENCE' | localize" [iconData]="iconService.getIcon(icons.TriangleDown)">
                   <div class="checkout-data-row">
-                    <co-input-text [(model)]="deliveryOptionsRequest.ownReference" [placeholder]="'REFERENCE' | localize"></co-input-text>
+                    <co-input-text [placeholder]="'REFERENCE' | localize"></co-input-text>
                   </div>
                   <div class="checkout-data-row">
-                    <co-input-text [(model)]="deliveryOptionsRequest.relationReference" [placeholder]="'REFERENCE_RELATION' | localize"></co-input-text>
+                    <co-input-text [placeholder]="'REFERENCE_RELATION' | localize"></co-input-text>
                   </div>
                 </co-collapsible>
               </div>
@@ -4139,7 +4045,6 @@ CheckoutOverviewDeliveryEditComponent.decorators = [
                 <co-drop-down-list
                   [collection]="marketing"
                   [fields]="marketingFields"
-                  [(model)]="deliveryOptionsRequest.marketingCode"
                   [placeholder]="'MARKETING' | localize"></co-drop-down-list>
               </div>
               <div class="checkout-data-row">
@@ -4174,7 +4079,6 @@ CheckoutOverviewDeliveryEditComponent.ctorParameters = () => [
     { type: IconCacheService }
 ];
 CheckoutOverviewDeliveryEditComponent.propDecorators = {
-    deliveryOptionsRequest: [{ type: Input }],
     transaction: [{ type: Input }],
     validSubmit: [{ type: Output }],
     invalidSubmit: [{ type: Output }],
@@ -6388,34 +6292,29 @@ SellerInformationModule.decorators = [
             },] }
 ];
 
-class DeliveryType {
-}
-
 class DeliveryTypeTileComponent {
     constructor() {
-        this.type = new DeliveryType();
+        this.method = new DeliveryMethod();
         this.selected = false;
         this.selectedChange = new EventEmitter();
-        this.deliveryTypeIdx = 0;
     }
     showClass() {
         return true;
     }
-    setIndexDeliveryType(index) {
-        console.log(index);
-    }
 }
 DeliveryTypeTileComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-delivery-type-tile",
                 template: `
-    <co-tile [selected]="selected" (selectedChange)="selectedChange.emit($event)">
+    <co-tile [selected]="selected" (selectedChange)="selectedChange.emit(method)">
       <div class="delivery-type-content-wrapper">
-        <div class="delivery-type-title" [textContent]="type.description"></div>
+        <div class="delivery-type-title" [textContent]="method.description"></div>
         <div class="delivery-type-icon">
-          <icon [icon]="type.icon"></icon>
+<!--
+          <icon [icon]="method.icon"></icon>
+-->
         </div>
-        <div *ngIf="type.price" class="delivery-type-price" [textContent]="type.price | priceDisplay"></div>
+        <div *ngIf="method.factor" class="delivery-type-price" [textContent]="method.factor | priceDisplay"></div>
       </div>
     </co-tile>
   `,
@@ -6423,7 +6322,7 @@ DeliveryTypeTileComponent.decorators = [
             },] }
 ];
 DeliveryTypeTileComponent.propDecorators = {
-    type: [{ type: Input }],
+    method: [{ type: Input }],
     selected: [{ type: Input }],
     selectedChange: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ["class.co-delivery-type-tile",] }]
@@ -7218,6 +7117,7 @@ TransactionLinesGridComponent.decorators = [
                 selector: "co-transaction-lines-grid",
                 template: `
     <co-simple-grid [data]="transactionLines" [extraColumns]="extraColumns" [dragDropEnabled]="true" [emitDragDrop]="true" (onDrop)="handleDrop($event)">
+      <co-simple-grid-column [field]="'text'" [singleColumn]="true"></co-simple-grid-column>
       <co-simple-grid-column [headerText]="'ARTICLE_NR' | localize" [field]="'articleNumber'" [order]="10"></co-simple-grid-column>
       <co-simple-grid-column [headerText]="'GOOD_DESCRIPTION' | localize" [field]="'goodDescription'" [order]="20"></co-simple-grid-column>
       <co-simple-grid-column [headerText]="'PRICE' | localize" [field]="'price'" [textAlign]="align.Right" [order]="30"></co-simple-grid-column>