@colijnit/transactionapi 1.1.144 → 1.1.145

package/build/enum/sequence-name.enum.d.ts

@@ -1,4 +1,5 @@
 export declare enum SequenceName {
     RelationId = "seq_relatieid",
-    TransactionId = "seq_transid"
+    TransactionId = "seq_transid",
+    PlanLine = "seq_planregel"
 }

package/build/enum/sequence-name.enum.js

@@ -5,4 +5,5 @@ var SequenceName;
 (function (SequenceName) {
     SequenceName["RelationId"] = "seq_relatieid";
     SequenceName["TransactionId"] = "seq_transid";
+    SequenceName["PlanLine"] = "seq_planregel";
 })(SequenceName = exports.SequenceName || (exports.SequenceName = {}));

package/build/enum/transaction-method.enum.d.ts

@@ -107,5 +107,7 @@ export declare enum TransactionMethod {
     ChangeHeaderProjectCodeId = "changeHeaderProjectCodeId",
     AddPaymentLineToTransaction = "addPaymentLineToTransaction",
     GetOrderLinesToPlan = "getOrderLinesToPlan",
-    GetOrderLinesPlanned = "getOrderLinesPlanned"
+    GetOrderLinesPlanned = "getOrderLinesPlanned",
+    GetTransactionMarginInfo = "getTransactionMarginInfo",
+    GetTransportOrders = "getTransportOrders"
 }

package/build/enum/transaction-method.enum.js

@@ -112,4 +112,6 @@ var TransactionMethod;
     TransactionMethod["AddPaymentLineToTransaction"] = "addPaymentLineToTransaction";
     TransactionMethod["GetOrderLinesToPlan"] = "getOrderLinesToPlan";
     TransactionMethod["GetOrderLinesPlanned"] = "getOrderLinesPlanned";
+    TransactionMethod["GetTransactionMarginInfo"] = "getTransactionMarginInfo";
+    TransactionMethod["GetTransportOrders"] = "getTransportOrders";
 })(TransactionMethod = exports.TransactionMethod || (exports.TransactionMethod = {}));

package/build/ione-api-transaction.d.ts

@@ -142,6 +142,7 @@ import { PlanningFilterObject } from "./model/planning-filter-object.bo";
 import { PlanningTransportWeek } from "./model/planning-transport-week.bo";
 import { OrderLinesPlannedRequest } from "./model/order-lines-planned-request.bo";
 import { OrderLinesToPlanRequest } from "./model/order-lines-to-plan-request.bo";
+import { GetTransportOrdersRequest } from "./model/get-transport-orders-request.bo";
 export declare abstract class IoneApiTransaction {
     readonly showLoader: Subject<boolean>;
     readonly connectionAborted: Subject<void>;
@@ -402,5 +403,7 @@ export declare abstract class IoneApiTransaction {
     abstract getPlanOrders(filterObject: PlanningFilterObject, planningId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     abstract getOrderLinesToPlan(request: OrderLinesToPlanRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
     abstract getOrderLinesPlanned(request: OrderLinesPlannedRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    abstract getTransportOrders(request: GetTransportOrdersRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    abstract getTransactionMarginInfo(transactionId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     protected endPoint: string;
 }

package/build/model/get-transport-orders-request.bo.d.ts

@@ -0,0 +1,6 @@
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+export declare class GetTransportOrdersRequest extends BusinessObject {
+    planningId: number;
+    date: Date;
+    transportId: number;
+}

package/build/model/get-transport-orders-request.bo.js

@@ -0,0 +1,21 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetTransportOrdersRequest = void 0;
+const business_object_1 = require("@colijnit/ioneconnector/build/model/business-object");
+const date_field_decorator_1 = require("@colijnit/ioneconnector/build/factory/decorators/date-field.decorator");
+class GetTransportOrdersRequest extends business_object_1.BusinessObject {
+}
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], GetTransportOrdersRequest.prototype, "date", void 0);
+exports.GetTransportOrdersRequest = GetTransportOrdersRequest;

package/build/model/package-lsp.bo.d.ts

@@ -6,4 +6,7 @@ export declare class PackageLSP extends BusinessObject {
     trackAndTraceUrl: string;
     deliveryMethodCode: string;
     documentId: number;
+    lineCount: number;
+    productCount: number;
+    totalWeight: number;
 }

package/build/model/plan-order.bo.d.ts

@@ -1,5 +1,6 @@
 import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
 import { PlanOrderLine } from "./plan-order-line.bo";
+import { PlanningTask } from "./planning-task-object.bo";
 export declare class PlanOrder extends BusinessObject {
     partDelivery: boolean;
     deliveryMethod: number;
@@ -13,7 +14,7 @@ export declare class PlanOrder extends BusinessObject {
     ownReference: string;
     routeAddress: string;
     internalDeliveryType: string;
-    startTime: string;
+    startTime: Date;
     isDrop: boolean;
     deliveryDate: Date;
     lines: PlanOrderLine[];
@@ -32,7 +33,12 @@ export declare class PlanOrder extends BusinessObject {
     containsLines: boolean;
     relationName: string;
     transactionNr: number;
-    endTime: string;
+    endTime: Date;
     preferredDeliveryDate: Date;
+    plannedLineId: number;
+    chained: boolean;
     remarks: string;
+    linesLoaded: boolean;
+    tasksLoaded: boolean;
+    tasks: PlanningTask[];
 }

package/build/model/plan-order.bo.js

@@ -19,6 +19,10 @@ __decorate([
     boolean_decorator_1.BooleanText("J"),
     __metadata("design:type", Boolean)
 ], PlanOrder.prototype, "partDelivery", void 0);
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], PlanOrder.prototype, "startTime", void 0);
 __decorate([
     boolean_decorator_1.BooleanText("T"),
     __metadata("design:type", Boolean)
@@ -39,8 +43,24 @@ __decorate([
     boolean_decorator_1.BooleanText("T"),
     __metadata("design:type", Boolean)
 ], PlanOrder.prototype, "containsLines", void 0);
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], PlanOrder.prototype, "endTime", void 0);
 __decorate([
     date_field_decorator_1.DateField(),
     __metadata("design:type", Date)
 ], PlanOrder.prototype, "preferredDeliveryDate", void 0);
+__decorate([
+    boolean_decorator_1.BooleanText("T"),
+    __metadata("design:type", Boolean)
+], PlanOrder.prototype, "chained", void 0);
+__decorate([
+    boolean_decorator_1.BooleanText("T"),
+    __metadata("design:type", Boolean)
+], PlanOrder.prototype, "linesLoaded", void 0);
+__decorate([
+    boolean_decorator_1.BooleanText("T"),
+    __metadata("design:type", Boolean)
+], PlanOrder.prototype, "tasksLoaded", void 0);
 exports.PlanOrder = PlanOrder;

package/build/model/planning-task-object.bo.d.ts

@@ -0,0 +1,18 @@
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+export declare class PlanningTask extends BusinessObject {
+    selected: boolean;
+    taskId: number;
+    name: string;
+    description: string;
+    state: string;
+    articleNr: number;
+    articleDescription: string;
+    creationDate: Date;
+    executionDate: Date;
+    minutes: number;
+    volume: number;
+    referenceId: number;
+    planned: boolean;
+    preferredDate: Date;
+    skills: string;
+}

package/build/model/planning-task-object.bo.js

@@ -0,0 +1,38 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlanningTask = void 0;
+const business_object_1 = require("@colijnit/ioneconnector/build/model/business-object");
+const date_field_decorator_1 = require("@colijnit/ioneconnector/build/factory/decorators/date-field.decorator");
+const boolean_decorator_1 = require("@colijnit/ioneconnector/build/factory/decorators/boolean.decorator");
+class PlanningTask extends business_object_1.BusinessObject {
+}
+__decorate([
+    boolean_decorator_1.BooleanText("T"),
+    __metadata("design:type", Boolean)
+], PlanningTask.prototype, "selected", void 0);
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], PlanningTask.prototype, "creationDate", void 0);
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], PlanningTask.prototype, "executionDate", void 0);
+__decorate([
+    boolean_decorator_1.BooleanText("T"),
+    __metadata("design:type", Boolean)
+], PlanningTask.prototype, "planned", void 0);
+__decorate([
+    date_field_decorator_1.DateField(),
+    __metadata("design:type", Date)
+], PlanningTask.prototype, "preferredDate", void 0);
+exports.PlanningTask = PlanningTask;

package/build/model/transaction-line-margin-info.bo.d.ts

@@ -0,0 +1,10 @@
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+export declare class TransactionLineMarginInfo extends BusinessObject {
+    lineNr: number;
+    lineTotal: number;
+    lineTotalVatExcluded: number;
+    purchaseLineTotal: number;
+    grossProfit: number;
+    grossProfitPercentage: number;
+    calculationFactor: number;
+}

package/build/model/transaction-line-margin-info.bo.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionLineMarginInfo = void 0;
+const business_object_1 = require("@colijnit/ioneconnector/build/model/business-object");
+class TransactionLineMarginInfo extends business_object_1.BusinessObject {
+}
+exports.TransactionLineMarginInfo = TransactionLineMarginInfo;

package/build/model/transaction-margin-info.bo.d.ts

@@ -0,0 +1,12 @@
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+import { TransactionLineMarginInfo } from "./transaction-line-margin-info.bo";
+export declare class TransactionMarginInfo extends BusinessObject {
+    transId: number;
+    total: number;
+    totalVatExcluded: number;
+    purchaseTotal: number;
+    grossProfit: number;
+    grossProfitPercentage: number;
+    calculationFactor: number;
+    lineMarginInfos: TransactionLineMarginInfo[];
+}

package/build/model/transaction-margin-info.bo.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionMarginInfo = void 0;
+const business_object_1 = require("@colijnit/ioneconnector/build/model/business-object");
+class TransactionMarginInfo extends business_object_1.BusinessObject {
+}
+exports.TransactionMarginInfo = TransactionMarginInfo;

package/build/transaction-auth.d.ts

@@ -141,6 +141,7 @@ import { PlanningFilterObject } from "./model/planning-filter-object.bo";
 import { PlanningTransportWeek } from "./model/planning-transport-week.bo";
 import { OrderLinesPlannedRequest } from "./model/order-lines-planned-request.bo";
 import { OrderLinesToPlanRequest } from "./model/order-lines-to-plan-request.bo";
+import { GetTransportOrdersRequest } from "./model/get-transport-orders-request.bo";
 export declare class TransactionAuth extends IoneApiTransaction {
     private _boSerializer;
     searchTransactions(request: TransactionSearchViewRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
@@ -394,6 +395,8 @@ export declare class TransactionAuth extends IoneApiTransaction {
     getPlanOrders(filterObject: PlanningFilterObject, planningId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesToPlan(request: OrderLinesToPlanRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesPlanned(request: OrderLinesPlannedRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransportOrders(request: GetTransportOrdersRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransactionMarginInfo(transactionId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     private _getDomainCollection;
     private _getMultipleDomainCollection;
     private callGetNodeData;

package/build/transaction-auth.js

@@ -979,13 +979,7 @@ class TransactionAuth extends ione_api_transaction_1.IoneApiTransaction {
             parameterValues: params,
             refCursorAsArray: true
         };
-        const response = await this._call(data_service_method_enum_1.DataServiceMethod.ExecuteMethod, data, backend_service_name_enum_1.BackendServiceName.DataService, showLoader);
-        if (response && response.validationResult && response.validationResult.success) {
-            return response.resultObject;
-        }
-        else {
-            return null;
-        }
+        return this._call(data_service_method_enum_1.DataServiceMethod.ExecuteMethod, data, backend_service_name_enum_1.BackendServiceName.DataService, showLoader);
     }
     async getPriceLists(code, showLoader) {
         const params = {};
@@ -2394,6 +2388,24 @@ class TransactionAuth extends ione_api_transaction_1.IoneApiTransaction {
         };
         return this._call(data_service_method_enum_1.DataServiceMethod.ExecuteMethod, data, backend_service_name_enum_1.BackendServiceName.DataService, showLoader);
     }
+    getTransportOrders(request, showLoader) {
+        const data = {
+            methodName: transaction_method_enum_1.TransactionMethod.GetTransportOrders,
+            moduleName: module_name_enum_1.ModuleName.Planning,
+            refCursorAsArray: true,
+            parameterValues: request
+        };
+        return this._call(data_service_method_enum_1.DataServiceMethod.ExecuteMethod, data, backend_service_name_enum_1.BackendServiceName.DataService, showLoader);
+    }
+    getTransactionMarginInfo(transactionId, showLoader) {
+        const data = {
+            methodName: transaction_method_enum_1.TransactionMethod.GetTransactionMarginInfo,
+            moduleName: module_name_enum_1.ModuleName.Transaction,
+            refCursorAsArray: true,
+            parameterValues: { transactionId: transactionId }
+        };
+        return this._call(data_service_method_enum_1.DataServiceMethod.ExecuteMethod, data, backend_service_name_enum_1.BackendServiceName.DataService, showLoader);
+    }
     _getDomainCollection(languageCode, domainName, showLoader) {
         const params = {
             domainName: domainName,

package/build/transaction-public.d.ts

@@ -141,6 +141,7 @@ import { PlanningFilterObject } from "./model/planning-filter-object.bo";
 import { PlanningTransportWeek } from "./model/planning-transport-week.bo";
 import { OrderLinesToPlanRequest } from "./model/order-lines-to-plan-request.bo";
 import { OrderLinesPlannedRequest } from "./model/order-lines-planned-request.bo";
+import { GetTransportOrdersRequest } from "./model/get-transport-orders-request.bo";
 export declare class TransactionPublic extends IoneApiTransaction {
     protected endPoint: string;
     searchTransactions(request: TransactionSearchViewRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
@@ -395,6 +396,8 @@ export declare class TransactionPublic extends IoneApiTransaction {
     getPlanOrders(filterObject: PlanningFilterObject, planningId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesToPlan(request: OrderLinesToPlanRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesPlanned(request: OrderLinesPlannedRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransportOrders(request: GetTransportOrdersRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransactionMarginInfo(transactionId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     private createServiceRequestData;
     private _getDomainCollection;
     private _getMultipleDomainCollection;

package/build/transaction-public.js

@@ -1142,6 +1142,14 @@ class TransactionPublic extends ione_api_transaction_1.IoneApiTransaction {
         console.warn('getOrderLinesPlanned not implemented');
         return Promise.resolve(new data_service_response_data_1.DataServiceResponseData());
     }
+    getTransportOrders(request, showLoader) {
+        console.warn('getTransportOrders not implemented');
+        return Promise.resolve(new data_service_response_data_1.DataServiceResponseData());
+    }
+    getTransactionMarginInfo(transactionId, showLoader) {
+        console.warn('getTransactionMarginInfo not implemented');
+        return Promise.resolve(new data_service_response_data_1.DataServiceResponseData());
+    }
     createServiceRequestData() {
         const data = { languageCode: this.languageCode };
         return data;

package/build/transaction.d.ts

@@ -144,6 +144,7 @@ import { PlanningTransportWeek } from "./model/planning-transport-week.bo";
 import { OrderLinesToPlanRequest } from "./model/order-lines-to-plan-request.bo";
 import { OrderLinesPlannedRequest } from "./model/order-lines-planned-request.bo";
 import { PrintPurchaseOrderForSalesOrderRequest } from "./model/print-purchase-order-for-sales-order-request";
+import { GetTransportOrdersRequest } from "./model/get-transport-orders-request.bo";
 export declare class Transaction {
     showLoader: Subject<boolean>;
     connectionAborted: Subject<void>;
@@ -414,6 +415,8 @@ export declare class Transaction {
     getPlanOrders(filterObject: PlanningFilterObject, planningId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesToPlan(request: OrderLinesToPlanRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
     getOrderLinesPlanned(request: OrderLinesPlannedRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransportOrders(request: GetTransportOrdersRequest, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getTransactionMarginInfo(transactionId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     static createConnector(options: Options, sessionExists: boolean): IoneApiTransaction;
     private _handleConnectionReset;
 }

package/build/transaction.js

@@ -797,6 +797,12 @@ class Transaction {
     getOrderLinesPlanned(request, showLoader) {
         return this.transaction.getOrderLinesPlanned(request, showLoader);
     }
+    getTransportOrders(request, showLoader) {
+        return this.transaction.getTransportOrders(request, showLoader);
+    }
+    getTransactionMarginInfo(transactionId, showLoader) {
+        return this.transaction.getTransactionMarginInfo(transactionId, showLoader);
+    }
     static createConnector(options, sessionExists) {
         if ((options.username && options.password) || sessionExists) {
             return new transaction_auth_1.TransactionAuth();

package/build/transaction.unit.test.js

@@ -543,4 +543,13 @@ describe("TransactionAPI", () => {
         const result = await transaction.getOrderLinesToPlan(request);
         expect(result).toBeDefined();
     });
+    it('getTransactionMarginInfo', async () => {
+        await transaction.connect();
+        const transactionNr = 79240;
+        const transResult = await transaction.getTransactionByNrAndKind(transaction_kind_enum_1.TransactionKind.SalesOrder, transactionNr);
+        const transactionInfoResponse = transResult.resultObject;
+        const result = await transaction.getTransactionMarginInfo(transactionInfoResponse.transactionInfo.id);
+        const info = result.resultObject;
+        expect(info).toBeDefined();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transactionapi",
-  "version": "1.1.144",
+  "version": "1.1.145",
   "scripts": {
     "build": "grunt clean && tsc",
     "browserify": "browserify build/connector.js --s colijn -o dist/out-tsc/bundle.js",