+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see
+
+
+ A sequence number defined by the (soap-) client. The
+ sequenceNumber is
+ returned by the webservice within the result of the
+ createShipment operation, so
+ that the client is able to assign the
+ shipment information of the response to the
+ shipment data of the
+ request.
+
+
+
+
+
+
+
+
+ The version of the webservice and the version of the
+ software
+ build.
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+
+
+
+ The shipmentdata for creating a shipment.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ ShipmentOrder is the highest parent element that
+ contains all
+ data with respect to one shipment order.
+
+
+
+
+
+ Dial to determine label ouput format. Must be
+ either 'URL' or
+ 'B64' = Base64encoded: it is possible to request
+ an URL for receiving
+ the label as PDF stream, or to request the
+ label as base64encoded binary
+ data directly. If not defined by
+ client, web service defaults to
+ 'URL'.
+
+
+
+
+
+
+
+
+
+ The group profile you select defines the billing
+ numbers you can use for creating shipments. To define group
+ profiles please visit our business costumer portal.
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (A5 plain paper, 910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (A5 plain paper, 910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (A5 plain paper, 910-300-700);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (A5 plain paper, 910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (a5 plain paper, 910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (A5 plain paper, 910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (A5 plain paper, 910-300-300);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (A5 plain paper, 910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+ To get a single PDF for shipping and return label
+ select this option.
+
+
+
+
+
+
+
+
+
+
+
+
+ The shipmentdata for validating a shipment.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ ShipmentOrder is the highest parent element that
+ contains all
+ data with respect to one shipment order.
+
+
+
+
+
+
+
+
+
+ The status of the operation and the shipment
+ identifier (if
+ available).
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder
+ will be returned by one CreationState element. It is
+ identifiable via
+ SequenceNumber.
+
+
+
+
+
+
+
+
+ The status of the operation and the shipment
+ identifier (if
+ available).
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder
+ will be returned by one CreationState element. It is
+ identifiable via
+ SequenceNumber.
+
+
+
+
+
+
+
+
+ The identifier for the shipment for which the label
+ url is
+ requested.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ Dial to determine label ouput format. Must be
+ either 'URL' or
+ 'B64' = Base64encoded: it is possible to request
+ an URL for receiving
+ the label as PDF stream, or to request the
+ label as base64encoded binary
+ data directly. If not defined by
+ client, web service defaults to
+ 'URL'.
+
+
+
+
+
+
+
+
+
+ The group profile you select defines the billing
+ numbers you can use for creating shipments. To define group
+ profiles please visit our business costumer portal.
+ The group
+ profile defines the shipments you can get documents for.
+ The
+ shipment needs to have an account/billing number allocated to
+ the
+ group profile. To define group profiles please visit our
+ business
+ costumer portal.
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (910-300-700);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (910-300-700);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+ To get a single PDF for shipping and return label
+ select this option.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The status of the operation and requested urls for
+ getting the
+ label.
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ For every ShipmentNumber requested, one LabelData
+ node is
+ returned that contains the status of the label retrieval
+ operation and
+ the URL for the label (if available).
+
+
+
+
+
+
+
+
+ Manifests one ore more shipments.
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+
+
+ Contains a shipment number. Any number of a printed shipment not already manifested can be used.
+ A Request can contain the element up to 50 times.
+ Requests need to either contain at least one times shipmentNumber or allshipments.
+ Requests cannot contain shipmentNumber and allShipments at the same time.
+
+
+
+
+
+
+ Manifests all shipments. Can be used instead the element “shipmentNumber”. The element is used without a value, e.g.
+
+
+
+
+
+
+
+
+ The status of the operation
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Status of the request (value of zero means, the
+ request was
+ processed without error; value greater than zero
+ indicates that an error
+ occurred).
+
+
+
+
+
+ The status of the operation for the corresponding
+ shipment.
+
+
+
+
+
+
+
+
+ The identifier for the shipment which should be
+ deleted.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ In order to delete previously created DD shipment
+ orders,
+ ShipmentNumber. ShipmentNumber is required. This parent
+ element inherits
+ from ShipmentNumberType, therefore all following
+ subelements are valid
+ according to schema, however the web service
+ accepts shipmentNumber
+ only. Note: you can delete more than one
+ shipment by passing multiple
+ ShipmentNumber containers.
+
+
+
+
+
+
+
+
+ The status of the operation.
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ For every ShipmentNumber requested, one
+ DeletionState node
+ is returned that contains the status of the
+ respective deletion
+ operation.
+
+
+
+
+
+
+
+
+ The identifier for the shipment for which the export
+ document url is
+ requested.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ To request export documents, ShipmentNumber.
+ ShipmentNumber
+ is required. This parent element inherits from
+ ShipmentNumberType,
+ therefore all following subelements are valid
+ according to schema,
+ however the web service accepts
+ shipmentNumber only.
+
+
+
+
+
+ Dial to determine label ouput format. Must be
+ either 'URL' or
+ 'B64' = Base64encoded: it is possible to request
+ an URL for receiving
+ the label as PDF stream, or to request the
+ label as base64encoded binary
+ data directly. If not defined by
+ client, web service defaults to
+ 'URL'.
+
+
+
+
+
+
+
+
+
+ The group profile you select defines the billing
+ numbers you can use for creating shipments. To define group
+ profiles please visit our business costumer portal.
+ The group
+ profile defines the shipments you can get documents for.
+ The
+ shipment needs to have an account/billing number allocated to
+ the
+ group profile. To define group profiles please visit our
+ business
+ costumer portal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The status of the operation and requested export
+ document.
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Status of the request (value of zero means, the
+ request was
+ processed without error; value greater than zero
+ indicates that an error
+ occurred).
+
+
+
+
+
+ Contains the result of the document processing: in
+ case of no
+ errors, a base64 encoded PDF is contained; also, the
+ status of this
+ particular document generation and the passed
+ shipment number are
+ returned.
+
+
+
+
+
+
+
+
+ The request data for the manifest document
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ Date in format yyyy-mm-dd
+
+
+
+
+
+
+
+
+ The status of the operation and requested export
+ document.
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Status of the request (value of zero means, the
+ request was
+ processed without error; value greater than zero
+ indicates that an error
+ occurred).
+
+
+
+
+
+ The Base64 encoded pdf data for receiving the
+ manifest.
+
+
+
+
+
+
+
+
+ The shipmentdata for creating a shipment.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ The ShipmentNumber of the shipment, which sould be
+ updated.
+ ShipmentNumber is required. This parent element inherits
+ from
+ ShipmentNumberType, therefore all following subelements are
+ valid
+ according to schema, however the web service accepts
+ shipmentNumber
+ only.
+
+
+
+
+
+ ShipmentOrder contains an update of all data of the
+ selected
+ shipment order.
+
+
+
+
+
+ Dial to determine label ouput format. Must be
+ either 'URL' or
+ 'B64' = Base64encoded: it is possible to request
+ an URL for receiving
+ the label as PDF stream, or to request the
+ label as base64encoded binary
+ data directly. If not defined by
+ client, web service defaults to
+ 'URL'.
+
+
+
+
+
+
+
+
+
+ The group profile you select defines the billing
+ numbers you can use for creating shipments. To define group
+ profiles please visit our business costumer portal.
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (910-300-700);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+
+ In this optional section you can define the following label formats:
+ A4:common label laser printing A4 plain paper;
+ 910-300-700: common label laser printing 105 x 205 mm (910-300-700);
+ 910-300-700-oz: common label laser printing 105 x 205 mm without additional barcode labels (910-300-700);
+ 910-300-300: common label laser printing 105 x 148 mm (910-300-700);
+ 910-300-300-oz: common label laser printing 105 x 148 mm without additional barcode labels (910-300-300);
+ 910-300-710: common label laser printing 105 x 208 mm (910-300-710);
+ 910-300-600: common label thermal printing 103 x 199 mm (910-300-600, 910-300-610);
+ 910-300-400: common label thermal printing 103 x 150 mm (910-300-400, 910-300-410);
+ 100x70mm: 100 x 70 mm label (only for Warenpost and Warenpost International);
+
+
+
+
+
+
+
+
+
+ To get a single PDF for shipping and return label
+ select this option.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The status of the operation and the shipment
+ identifier (if
+ available).
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ Can contain any DHL shipmentnumber. For successful
+ and unsuccessful operations, the requested
+ ShipmentNumber to be
+ deleted is returned. This is no matter if the operation
+ could be
+ performed or not.
+
+
+
+
+
+
+
+
+
+ Can contain any DHL shipmentnumber. For successful
+ and unsuccessful operations, the requested
+ ShipmentNumber to be
+ deleted is returned. This is no matter if the operation
+ could be
+ performed or not.
+
+
+
+
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder
+ will be returned by one UpdateState element. It is
+ identifiable via
+ ShipmentNumber.
+
+
+
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder will be
+ returned by one CreationState element. It is
+ identifiable via SequenceNumber.
+
+
+
+
+
+ Identifier for ShipmentOrder set by client
+ application in
+ CreateShipment request. The defined value is looped
+ through and returned
+ unchanged by the web service within the
+ response of createShipment. The
+ client can therefore assign the
+ status information of the response to the
+ correct ShipmentOrder of
+ the request.
+
+
+
+
+
+ Can contain any DHL shipmentnumber. For successful
+ and unsuccessful operations, the requested
+ ShipmentNumber to be
+ deleted is returned. This is no matter if the operation
+ could be
+ performed or not.
+
+
+
+
+
+
+
+
+
+ Can contain any DHL shipmentnumber. For successful
+ and unsuccessful operations, the requested
+ ShipmentNumber to be
+ deleted is returned. This is no matter if the operation
+ could be
+ performed or not.
+
+
+
+
+
+
+
+
+
+ For successful operations, a shipment number is
+ created and
+ returned. Depending on the invoked product.
+
+
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder will be
+ returned by one CreationState element. It is
+ identifiable via SequenceNumber.
+
+
+
+
+
+ Identifier for ShipmentOrder set by client
+ application in
+ CreateShipment request. The defined value is looped
+ through and returned
+ unchanged by the web service within the
+ response of createShipment. The
+ client can therefore assign the
+ status information of the response to the
+ correct ShipmentOrder of
+ the request.
+
+
+
+
+
+ Success status of processing a particular shipment.
+
+
+
+
+
+
+
+ The status information used in different situations.
+
+
+
+
+
+ Overall status of the entire request: A value of
+ zero means, the
+ request was processed without error. A value
+ greater than zero indicates
+ that an error occurred. The detailed
+ mapping and explanation of returned
+ status codes is contained in
+ the list.
+
+
+
+
+
+ Explanation of the statuscode. Explains what types of errors occurred.
+
+
+
+
+
+ Detailed explanation of errors or warnings, p.e. “Invalid postal code”.
+ This element is kept for compatibility reasons only. Please use “statusType” und “errorMassage” with their subelements instead.
+
+
+
+
+
+ Explains if an error or warning occurred
+
+
+
+
+
+ Explains details of the error and where it occurred
+
+
+
+
+
+ Explains if an error or warning occurred
+
+
+
+
+
+ Explains details of the error and where it occurred
+
+
+
+
+
+
+
+
+
+ Explanation of the statusElement and potential errors.
+
+
+
+
+
+ Explanation of the statusMessage and potential errors.
+
+
+
+
+
+
+
+
+ Information about each piece (e.g. the generated
+ licence plate). For
+ every piece, a PieceInformation container holds
+ the license plate
+ number.
+
+
+
+
+
+ For every piece a piece number is created that is of
+ one of the
+ following types (mostly licensePlate).
+
+
+
+
+
+
+
+ Data for the creation of a shipment.
+
+
+
+
+ Free field to to tag multiple shipment orders
+ individually by
+ client. Essential for later mapping of response
+ data returned by webservice
+ upon createShipment operation. Allows
+ client to assign the shipment
+ information of the response to the
+ correct shipment order of the
+ request.
+
+
+
+
+
+ Is the core element of a ShipmentOrder. It contains
+ all relevant
+ information of the shipment.
+
+
+
+
+
+
+ Contains the information of the shipment product
+ code, weight and size characteristics and services to be used.
+
+
+
+
+
+
+ Contains relevant information about the
+ Shipper.
+
+
+
+
+
+ Contains a reference to the Shipper data
+ configured in GKP.
+
+
+
+
+
+
+ Contains relevant information about
+ Receiver.
+
+
+
+
+
+ To be used if a return label address shall be
+ generated.
+
+
+
+
+
+ For international shipments. This section
+ contains information about the exported goods relevant for
+ customs. For international shipments: commercial invoice and
+ customs declaration (CN23) have to be attached to the shipment.
+ Data relevant for customs also has to be transferred as
+ electronically.
+
+
+
+
+
+ Is only to be indicated by DHL partners
+
+
+
+
+
+
+
+
+
+
+
+
+ If set to true (=1), the label will be only be
+ printable, if the
+ receiver address is valid.
+
+
+
+
+
+
+
+ Data for the creation of a shipment.
+
+
+
+
+ Free field to to tag multiple shipment orders
+ individually by
+ client. Essential for later mapping of response
+ data returned by webservice
+ upon createShipment operation. Allows
+ client to assign the shipment
+ information of the response to the
+ correct shipment order of the
+ request.
+
+
+
+
+
+ Is the core element of a ShipmentOrder. It contains
+ all relevant
+ information of the shipment.
+
+
+
+
+
+
+ Contains the information of the shipment product
+ code, weight and size characteristics and services to be used.
+
+
+
+
+
+ Contains relevant information about the
+ Shipper.
+
+
+
+
+
+ Contains relevant information about
+ Receiver.
+
+
+
+
+
+ To be used if a return label address shall be
+ generated.
+
+
+
+
+
+ For international shipments. This section
+ contains information about the exported goods relevant for
+ customs. For international shipments: commercial invoice and
+ customs declaration (CN23) have to be attached to the shipment.
+ Data relevant for customs also has to be transferred as
+ electronically.
+
+
+
+
+
+ Is only to be indicated by DHL partners
+
+
+
+
+
+
+
+
+
+
+
+
+ If set to true (=1), the label will be only be
+ printable, if the
+ receiver address is valid.
+
+
+
+
+
+
+
+ The data of the shipper or return receiver.
+
+
+
+
+
+ Name of the Return Receiver
+
+
+
+
+ Contains address data.
+
+
+
+
+ Information about communication.
+
+
+
+
+
+
+ The data of the shipper of a shipment.
+
+
+
+
+
+
+
+
+ Key of reference.
+
+
+
+
+
+
+ The receiver data.
+
+
+
+
+
+ The address data of the receiver.
+
+
+
+
+ The address of the receiver is a german
+ Packstation.
+
+
+
+
+
+ The address of the receiver is a german
+ Postfiliale.
+
+
+
+
+
+
+ Information about communication.
+
+
+
+
+
+
+ The receiver data of a shipment.
+
+
+
+
+
+
+
+
+ Identity data (used for ident services).
+
+
+
+
+
+ First name of the person to be verified. Field
+ length must be
+ less than or equal to 30.
+
+
+
+
+
+ Last name of the person to be verified. Field length
+ must be less
+ than or equal to 30.
+
+
+
+
+
+ Name of the street of registered address. Field
+ length must be
+ less than or equal to 30.
+
+
+
+
+
+ House number of registered address. Field length
+ must be less
+ than or equal to 10.
+
+
+
+
+
+ Postcode of registered address. Field length must be
+ less than or
+ equal to 15.
+
+
+
+
+
+ City of registered address. Field length must be
+ less than or
+ equal to 30.
+
+
+
+
+
+ Person's date of birth. Format must be yyyy-mm-dd.
+
+
+
+
+
+ Person's nationality. Field length must be less than
+ or equal to
+ 30.
+
+
+
+
+
+
+
+ Details of a shipment.
+
+
+
+
+
+ Determines the DHL Paket product to be ordered.
+ V01PAK: DHL PAKET;
+ V53WPAK: DHL PAKET International;
+ V54EPAK: DHL Europaket;
+ V62WP: Warenpost;
+ V66WPI: Warenpost International
+
+
+
+
+
+ A reference number that the client can assign for
+ better association purposes. Appears on shipment label. To use the
+ reference number for tracking purposes, it should be at least 8
+ characters long and unique
+
+
+
+
+
+
+
+
+
+ Date of shipment should be close to current date and
+ must not be
+ in the past. Iso format required: yyyy-mm-dd.
+
+
+
+
+
+
+
+
+
+ Name of a cost center. Appears on shipment label.
+
+
+
+
+
+
+
+
+
+ DHL account number (14 digits).
+
+
+
+
+
+
+
+
+
+ A reference number that the client can assign for
+ better
+ association purposes. Appears on return shipment label. To
+ use the reference number for tracking purposes, it should be at
+ least 8 characters long and unique.
+
+
+
+
+
+
+
+
+
+
+
+ Details of a shipment.
+
+
+
+
+
+ extends the ShipmentDetailsType
+
+
+
+ For every parcel specified, contains weight in kg,
+ length
+ in cm, width in cm and height in cm.
+
+
+
+
+
+ Use one dedicated Service node for each service to
+ be
+ booked with the shipment product. Add another Service node for
+ booking a further service and so on. Successful booking of a
+ particular service depends on account permissions and product's
+ service combinatorics. I.e. not every service is allowed for
+ every
+ product, or can be combined with all other allowed
+ services. The
+ service bundles that contain all services are the
+ following.
+
+
+
+
+
+ Mechanism to send notifications by email after
+ successful
+ manifesting of shipment.
+
+
+
+
+
+ Bank data can be provided here for different
+ purposes.
+ E.g. if COD is booked as service, bank data must be
+ provided by DHL
+ customer (mandatory server logic). The collected
+ money will be
+ transferred to specified bank account.
+
+
+
+
+
+
+
+
+
+ Item/Piece data.
+
+
+
+
+ The weight of the piece in kg
+
+
+
+
+
+
+
+
+ The length of the piece in cm.
+
+
+
+
+
+
+
+
+ The width of the piece in cm.
+
+
+
+
+
+
+
+
+ The height of the piece in cm.
+
+
+
+
+
+
+
+
+
+
+ Item/Piece data of a shipment.
+
+
+
+
+
+
+
+
+ GKV shipment services.
+
+
+
+ can be
+
+
+
+
+ This service is used exclusively for shipments with
+ special delivery requirements. It is not available for our regular
+ business customers.
+
+
+
+
+
+ Service for package return. For packagingReturn you
+ also have to book a return label.
+
+
+
+
+
+ Service "Endorsement". Mandatory for shipments with
+ product DHL Paket International: V53WPAK
+
+
+
+
+
+ Service visual age check
+
+
+
+
+ Service preferred location
+
+
+
+
+ Service preferred neighbour
+ The details field should be set to the preferred
+ neighbours
+ name.
+
+
+
+
+
+ Service preferred day
+
+
+
+
+ Invoke service No Neighbour Delivery.
+
+
+
+
+
+ Invoke service Named Person Only.
+
+
+
+
+ Invoke service return receipt.
+
+
+
+
+ Premium for fast and safe delivery of international
+ shipments.
+
+
+
+
+
+ Service Cash on delivery.
+
+
+
+
+ Postal Delivery Duty Paid
+ Deutsche Post and sender handle import duties instead of consignee
+
+
+
+
+ Closest Droppoint
+
+ Delivery to the droppoint closest to the address of the recipient of the shipment. For this kind of delivery either the phone number and/or the e-mail address of the receiver is mandatory.
+
+ For shipments using DHL Paket International it is recommended that you choose one of the three delivery types:
+ Economy
+ Premium
+ CDP
+
+ Otherwise, the current default for the receiver country will be picked.
+
+
+
+
+ Standard delivery of international shipments
+
+ For shipments using DHL Paket International it is recommended that you choose one of the three delivery types:
+
+ Economy
+ Premium
+ CDP
+
+ Otherwise, the current default for the receiver country will be picked.
+
+
+
+
+ Insure shipment with higher than standard amount.
+
+
+
+
+
+ Service to ship bulky goods.
+
+
+
+
+ Service configuration for IdentCheck.
+
+
+
+
+
+ Service configuration for ParcelOutletRouting.
+ Details can be an
+ email-address, if not set receiver email will be
+ used
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ e-mail address for notification in case of
+ non-deliverability
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ Delivery Day:
+ Please enter the day (yyyy-mm-ddd) on which you would like the shipment to be delivered.
+ The requested day must be at least 2 and at most 6 working days after the shipment date.
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ e.g. garage, terrace
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ name, streetname streetnumber
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ E-mail address for notification in case of
+ non-deliverability.
+
+
+
+
+
+
+
+
+
+
+
+ Details of the Service (freetext)
+
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Type of the Service (List of Types)
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ This service defines the handling of parcels that
+ cannot be delivered. There are two options: IMMEDIATE (Sending back
+ to sender), ABANDONMENT (Abandonment of parcel at the hands of
+ sender (free of charge). The definition of undeliverability is
+ country-specific and depends on the regulations of the postal
+ company of the receiving country. Usually, if parcels cannot be
+ delivered at first try, recipients receive a notification card and
+ can pick up their shipment at a local postal office. After the
+ storage period has expired, the shipment will be handled according
+ to your choosen endorsement option. Shipments that cannot be
+ delivered due to address problems or active refusal will be either
+ returned immediately or treated as abandoned.
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Individual details for handling (freetext)
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Number of Days to hold shipment before shipment
+ will be returend
+ to sender
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ Service VisualCheckOfAge is used to specify the
+ minimum age of the recipient.
+ The following types are allowed: "A16"
+ or "A18"
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ Timeframe of delivery, if the option is used:
+ ValidValues are
+ 10001200: 10:00 until 12:00;
+ 12001400: 12:00 until
+ 14:00
+ 14001600: 14:00 until 16:00;
+ 16001800: 16:00 until 18:00
+ 18002000: 18:00 until 20:00;
+ 19002100: 19:00 until 21:00
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Day of Delivery, if the option is used: Date in
+ format
+ yyyy-mm-dd
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Please enter the Amount that should be insured
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Money amount to be collected. Mandatory if COD is
+ chosen.
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+ Mandatory if unfree is chosen. 0= cash / 1= invoice.
+
+
+
+
+
+
+
+
+
+ Paid by third party, e.g. Receiver. DHL account
+ number mandatory if
+ PaymentType 1 = invoice is selected. Field
+ length must be less than or equal to
+ 10.
+
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Surname (family name) of the person for ident
+ check.
+
+
+
+
+
+
+
+
+
+ Given name (first name) of the person for
+ ident
+ check.
+
+
+
+
+
+
+
+
+
+ date of birth (DOB) of the person for ident
+ check,
+ if the option is used: Date in format
+ yyyy-mm-dd
+ This attribute is only optional, if you set a minimum age
+
+
+
+
+
+
+
+
+
+ minimum age of the person for ident check
+ ("A16" or "A18")
+ This attribute is only optional, if you specify the date of birth
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Indicates, if the option is on/off
+
+
+
+
+
+
+
+
+
+
+ Notification type
+
+
+
+
+ Email address of the recipient. Mandatory if
+ Notification is
+ set.
+
+
+
+
+
+
+
+
+
+
+ You
+ may choose between a standard DHL e-mail text (no ID needed) or configure
+ an individual text within the section "Administration".
+
+
+
+
+
+
+
+
+
+
+ The data of the export document for a shipment.
+
+
+
+
+
+ Invoice number if applicable
+
+
+
+
+
+
+
+
+ Export type
+
+
+
+
+
+
+
+
+ Description mandatory if ExportType is OTHER.
+
+
+
+
+
+
+
+
+
+
+
+ Element provides terms of trades, incoterms codes:
+
+ DDP (Delivery Duty Paid)
+ DXV (Delivery Duty Paid (excl. VAT))
+ DAP (formerly DDU, Delivery At Place)
+ DDX (Delivery Duty Paid (excl. Duties, taxes and VAT)
+ CPT (Carriage Paid To (within EU only))
+
+ are vaild values.
+
+
+
+
+
+
+
+
+
+
+ PlaceOfCommital is a Locaton the shipment is handed
+ over to DHL
+
+
+
+
+
+
+
+
+
+ Postage costs billed in the invoice
+
+
+
+
+
+
+
+
+
+ CustomsCurrency refers to all stated goods / customs
+ values as well as postage costs. The information has to match
+ the currency of the commercial invoice or the invoice for customs
+ purposes. ISO 4217 alpha, p.E.:
+ EUR for Euro
+ USD for US Dollar
+ GBP for British Pound
+
+
+
+
+
+
+
+
+
+ The permit number.
+
+
+
+
+
+
+
+
+ The attestation number.
+
+
+
+
+
+
+
+
+ The customs reference is used by customs authorities
+ to identify
+ economics operators an/or other persons involved. With
+ the given reference,
+ granted authorizations and/or relevant
+ processes in customs
+ clearance an/or
+ taxation can be taken into
+ account.
+
+
+
+
+
+
+
+
+
+ The customs reference is used by customs authorities
+ to identify
+ economics operators an/or other persons involved. With
+ the given reference,
+ granted authorizations and/or relevant
+ processes in customs
+ clearance an/or
+ taxation can be taken into
+ account.
+
+
+
+
+
+
+
+
+
+ Sets an electronic export notification.
+
+
+
+
+
+ One or more child elements for every position to be
+ defined within the Export Document. Each one contains description,
+ country code of origin, amount, net weight, customs value.
+ Multiple positions only possible for shipments using DHL Paket
+ International (V53WPAK).
+ Shipments using DHL Europaket (V54EPAK)
+ can only contain one
+ ExportDocPosition.
+
+
+
+
+
+
+ Description of the goods
+
+
+
+
+
+
+
+
+ ISO-Code (ISO 3166-2) of country the goods were
+ manufactured
+
+
+
+
+
+
+
+
+
+ Customs tariff number of the unit / position.
+ If the service PDDP is used, customsTariffNumber is required.
+
+
+
+
+
+
+
+
+
+ Quantity of the unit / position. Only positive
+ values (> 0) are allowed.
+
+
+
+
+
+
+
+
+
+ Net weight of the unit / position. Only positive
+ values (> 0) are allowed.The total net weight must not exceed
+ the shipment weight
+
+
+
+
+
+
+
+
+
+ Customs value amount of the unit /position. Only
+ positive values (> 0) are allowed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Further address information
+The following data fields from the cis_base-types are processed/mandatory/optional:
+-------------------------------------------------------------------------------------------------------
+Salutation (optional) : cis:NameType->Person->salutation
+Company Name 1 (mandatory): cis:NameType->Company->name1
+Company Name 2 (optional) : cis:NameType->Company->name2
+Contact Name (mandatory): cis:CommunicationType->contactPerson
+Street Name (mandatory): cis:NativeAddressType->streetName
+Street Number (mandatory): cis:NativeAddressType->streetNumber
+Add. Address (optional) : cis:NativeAddressType->careOfName
+Postcode (mandatory): cis:NativeAddressType->zip
+City Name (mandatory): cis:NativeAddressType->city
+ISO Country Code (mandatory): cis:NativeAddressType->Origin->CountryType->countryISOType
+Phone Number (mandatory): cis:CommunicationType->phone
+Email Address (mandatory): cis:CommunicationType->email
+
+
+
+
+
+ Mandatory if further address is to be specified.
+
+
+
+
+
+
+ Determines whether further address is one of the
+ following types.
+
+
+
+
+
+ Extra data for name extension.
+
+
+
+
+ Contains address data.
+
+
+
+
+ Info about communication.
+
+
+
+
+
+
+
+
+
+ The status of the getLabel operation and the url for
+ requesting the label
+ (if available).
+
+
+
+
+
+ Success status of processing retrieval of particular
+ shipment
+ label.
+
+
+
+
+
+ For successful and unsuccessful operations, the
+ requested
+ ShipmentNumber of the label to be retrieved is returned.
+ This is no matter
+ if it the operation could be performed or not.
+
+
+
+
+
+
+ If label output format was requested as 'URL' via
+ LabelResponseType, this element will be returned. It contains the
+ URL to
+ access the PDF label. This is default output format if not
+ specified
+ other by client in labelResponseType. Depending on
+ setting in customer
+ profile all labels or just the shipmentlabel.
+
+
+
+
+
+ Label as base64 encoded pdf data, depending on
+ setting in
+ customer profile all labels or just the shipmentlabel.
+
+
+
+
+
+
+
+ If label output format was requested as 'URL' via
+ LabelResponseType, this element will be returned. It contains the
+ URL to
+ access the PDF label. This is default output format if not
+ specified
+ other by client in labelResponseType. Depending on
+ setting in customer
+ profile all labels or just the
+ returnshipmentlabel.
+
+
+
+
+
+ Label as base64 encoded pdf data, depending on
+ setting in
+ customer profile all labels or just the
+ returnshipmentlabel.
+
+
+
+
+
+
+
+ If label output format was requested as 'URL' via
+ LabelResponseType, this element will be returned. It contains the
+ URL to
+ access the PDF label. This is default output format if not
+ specified
+ other by client in labelResponseType. Depending on
+ setting in customer
+ profile all labels or just the export
+ documents.
+
+
+
+
+
+ Label as base64 encoded pdf data, depending on
+ setting in
+ customer profile all labels or just the export
+ documents.
+
+
+
+
+
+
+
+ If label output format was requested as 'URL' via
+ LabelResponseType, this element will be returned. It contains the
+ URL to
+ access the PDF label. This is default output format if not
+ specified
+ other by client in labelResponseType. Depending on
+ setting in customer
+ profile all labels or just the cod related
+ documents.
+
+
+
+
+
+ Label as base64 encoded pdf data, depending on
+ setting in
+ customer profile all labels or just the cod related
+ documents.
+
+
+
+
+
+
+
+
+ The status of the getLabel operation and the url for
+ requesting the label
+ (if available)
+
+
+
+
+
+ ShipmentNumber
+
+
+
+
+ Status of the request (value of zero means, the
+ request was
+ processed without error; value greater than zero
+ indicates that an error
+ occurred).
+
+
+
+
+
+
+ Export doc as base64 encoded pdf data
+
+
+
+
+
+ URL for downloading the Export doc as pdf
+
+
+
+
+
+
+
+
+ The status of a doManifest operation.
+
+
+
+
+ ShipmentNumber
+
+
+
+
+ Status of the request (value of zero means, the
+ request was
+ processed without error; value greater than zero
+ indicates that an error
+ occurred).
+
+
+
+
+
+
+
+ The status of a deleteShipment operation.
+
+
+
+
+
+ For successful and unsuccessful operations, the
+ requested
+ ShipmentNumber to be deleted is returned. This is no
+ matter if the operation
+ could be performed or not.
+
+
+
+
+
+ Success status of processing the deletion of
+ particular
+ shipment.
+
+
+
+
+
+
+
+ The data for a pickup order.
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ Contains information in further leaf elements about
+ product,
+ DHL account, pickup date and time, pickup location,
+ amount of pieces,
+ pallets, and shipments, moreover weight and
+ volume weight, size.
+
+
+
+
+
+ The pickup address.
+
+
+
+
+ The address and contact information of the
+ orderer.
+
+
+
+
+
+
+
+
+ The data for a pickup order.
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the request.
+
+
+
+
+
+ The confirmation number of the successfully created
+ pickup
+ order. It can later be used for cancelling a pickup order.
+ Confirmation
+ number is not available for each pickup type.
+
+
+
+
+
+ If available, a shipment number is returned.
+
+
+
+
+
+
+
+
+ The details of a pickup order.
+
+
+
+
+ Pickup date in format yyyy-mm-dd. Mandatory if
+ pickup is booked
+ along with shipment order.
+
+
+
+
+
+
+
+
+
+ Earliest time for pickup. Format is hh:mm.
+
+
+
+
+
+
+
+
+
+ Lates time for pickup. Format is hh:mm.
+
+
+
+
+
+
+
+
+
+ Remarks to be considered when pickup is done.
+
+
+
+
+
+ Area to further detail pickup location beyond
+ address.
+
+
+
+
+
+
+
+
+The pickup address. In the PickupType the following data fields are processed/mandatory/optional:
+----------------------------------------------------------------------------------------------
+Company Name 1 (mandatory): cis:NameType->Company->name1
+Contact Name (mandatory): cis:CommunicationType->contactPerson
+Street Name (mandatory): cis:NativeAddressType->streetName
+Street Number (mandatory): cis:NativeAddressType->streetNumber
+Add. Address (optional) : cis:NativeAddressType->careOfName
+Postcode (mandatory): cis:NativeAddressType->zip
+City Name (mandatory): cis:NativeAddressType->city
+ISO Country Code (mandatory): cis:NativeAddressType->Origin->CountryType->countryISOType
+Phone Number (mandatory): cis:CommunicationType->phone
+Email Address (mandatory): cis:CommunicationType->email
+
+
+
+
+
+ Determines whether pickup address is one of the
+ following
+ types.
+
+
+
+
+
+ Data fields for pickup address.
+
+
+
+
+ Info about communication.
+
+
+
+
+
+
+
+Information about the pickup orderer. In the PickupOrdererType the following data fields are processed/mandatory/optional:
+----------------------------------------------------------------------------------------------
+Salutation (optional) : cis:NameType->Person->salutation
+Company Name 1 (mandatory): cis:NameType->Company->name1
+Company Name 2 (optional) : cis:NameType->Company->name2
+Contact Name (mandatory): cis:CommunicationType->contactPerson
+Street Name (mandatory): cis:NativeAddressType->streetName
+Street Number (mandatory): cis:NativeAddressType->streetNumber
+Add. Address (optional) : cis:NativeAddressType->careOfName
+Postcode (mandatory): cis:NativeAddressType->zip
+City Name (mandatory): cis:NativeAddressType->city
+ISO Country Code (mandatory): cis:NativeAddressType->Origin->CountryType->countryISOType
+Phone Number (mandatory): cis:CommunicationType->phone
+Email Address (mandatory): cis:CommunicationType->email
+
+
+
+
+
+ Determines whether orderer contact address is of the
+ following
+ type.
+
+
+
+
+
+ Optional name appendix.
+
+
+
+
+ Data fields for orderer's address.
+
+
+
+
+ Info about communication.
+
+
+
+
+
+
+ The data of the pickup order.
+
+
+
+
+ Depending on whether a DD pickup or TD pickup is
+ invoked, this
+ field contains either the 10-digit EKP number (DD
+ pickups) or the 9-digit
+ accountNumberExpress (TD pickups).
+
+
+
+
+
+
+
+
+
+ Pickup date in format yyyy-mm-dd.
+
+
+
+
+
+
+
+
+ Earliest time for pickup. Format is hh:mm.
+
+
+
+
+
+
+
+
+
+ Lates time for pickup. Format is hh:mm.
+
+
+
+
+
+
+
+
+
+ Remarks to be considered when pickup is done.
+ Mandatory if 'TDI'
+ is selected.
+
+
+
+
+
+ Area to further detail pickup location beyond
+ address. Mandatory
+ for TDN and TDI, optional for DDN and DDI.
+
+
+
+
+
+ Number of pieces to be picked up.
+
+
+
+
+
+
+
+
+ Number of pallets to be picked up.
+
+
+
+
+
+
+
+
+ The weight of all shipment's pieces in kg. Field
+ length must be
+ less than or equal to 22.
+
+
+
+
+
+
+
+
+
+ Number of shipments to be picked up.
+
+
+
+
+
+
+
+
+ The total volumetric weight of all pieces in kg.
+ Calculated by
+ piece = length x width x height in centimetres /
+ 5000. Field length must be
+ less than or equal to 22.
+
+
+
+
+
+
+
+
+
+ The maximum length in cm.
+
+
+
+
+
+
+
+
+ The maximum width in cm.
+
+
+
+
+
+
+
+
+ The maximum height in cm.
+
+
+
+
+
+
+
+
+
+
+ The data for cancelling a pickup order.
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the
+ requesting client is developed.
+
+
+
+
+
+ The confirmation number of the pickup order which
+ should be
+ cancelled. Use value from pickup response attribute
+ 'ConfirmationNumber'
+ to cancel respective pickup order. Note: only
+ one pickup can be deleted
+ at a time.
+
+
+
+
+
+
+
+
+ The status of the cancel pickup operation.
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the request.
+
+
+
+
+
+
+
+
+ Identity data (used e.g. for ident services)
+
+
+
+
+
+
+ If driving license shall be used for verifying
+ identity.
+
+
+
+
+
+
+ ID number of the driving license. Mandatory if
+ DrivingLicense is chosen as identity
+ instrument.
+
+
+
+
+
+ Name of certifying authority of the driving
+ license. Mandatory if DrivingLicense is chosen as identity
+ instrument.
+
+
+
+
+
+
+
+
+ If identity card shall be used for verifying
+ identity.
+
+
+
+
+
+
+ Number of the identity card. Mandatory if
+ IdentityCard is chosen as identity instrument. Field length
+ must be less than or equal to 20.
+
+
+
+
+
+ Name of certifying card authority. Mandatory if
+ IdentityCard is chosen as identity instrument. Field length
+ must be less than or equal to 30.
+
+
+
+
+
+
+
+
+ If a bank card shall be used for verifying
+ identity.
+
+
+
+
+
+
+ Type of bank card. Mandatory if BankCard is
+ chosen as identity instrument.
+
+
+
+
+
+ Number of bank card. Mandatory if BankCard is
+ chosen as identity instrument.
+
+
+
+
+
+ Name of bank. Mandatory if BankCard is chosen as
+ identity instrument.
+
+
+
+
+
+ Bank code. Mandatory if BankCard is chosen as
+ identity instrument.
+
+
+
+
+
+
+
+
+
+
+
+ Type of Packstation (Receiver is in Germany)
+
+
+
+
+ includes
+
+
+
+ Number of the packstation
+
+
+
+
+ Post Nummer of the receiver
+
+
+
+
+ Postcode
+
+
+
+
+
+
+
+
+ City name.
+
+
+
+
+
+
+
+
+
+
+ Type of Postfiliale (Receiver is in Germany)
+
+
+
+
+ includes
+
+
+
+ Number of the postfiliale
+
+
+
+
+ Post Nummer of the receiver
+
+
+
+
+ Postcode
+
+
+
+
+
+
+
+
+ City name.
+
+
+
+
+
+
+
+
+
+
+ Type of ParcelShop (Receiver is in Europe)
+
+
+
+
+ includes
+
+
+
+ Number of the ParcelShop
+
+
+
+
+ Name of street of the ParcelShop
+
+
+
+
+
+
+
+
+
+ House number of the ParcelShop
+
+
+
+
+
+
+
+
+ Postcode
+
+
+
+
+
+
+
+
+ City name.
+
+
+
+
+
+
+
+
+
+
+ The status of the operation and the shipment
+ identifier (if
+ available).
+
+
+
+
+
+
+ The version of the webservice implementation.
+
+
+
+
+
+ Success status after processing the overall
+ request.
+
+
+
+
+
+ The operation's success status for every single
+ ShipmentOrder
+ will be returned by one CreationState element. It is
+ identifiable via
+ SequenceNumber.
+
+
+
+
+
+
+
+
+ The version of the webservice implementation for
+ which the requesting
+ client is developed.
+
+
+
+
+
+ includes
+
+
+
+ The number of the major release. E.g. the '3' in
+ version
+ "3.2.".
+
+
+
+
+
+
+
+
+
+ The number of the minor release. E.g. the '2' in version "3.2.". Please note, that if you wish to use the old error handling, you need use Version 3.2 or below
+
+
+
+
+
+
+
+
+
+ Optional build id to be addressed.
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0-schema-cis_base.xsd b/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0-schema-cis_base.xsd
new file mode 100644
index 00000000..60d8e041
--- /dev/null
+++ b/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0-schema-cis_base.xsd
@@ -0,0 +1,1126 @@
+
+
+
+
+
+
+
+ Country specific ISO code.
+
+
+
+
+
+
+ First 10 digit number extract from the 14 digit DHL Account Number. E.g. if DHL Account Number is "5000000008 72 01" then EKP is equal to 5000000008.
+
+
+
+
+
+
+
+
+ Field has the partner id. I.e. the last 2 digit number extract from the 14 digit DHL Account Number. E.g. if DHL Account Number is "5000000008 72 01" then Attendance is 01.
+
+
+
+
+
+
+
+
+ Procedure ID (part of account number).
+
+
+
+
+
+
+
+
+ DHL account number (14 digits).
+
+
+
+
+
+
+
+
+ Express AccountNumber (9 digits).
+
+
+
+
+
+
+
+
+ Ident code number.
+
+
+
+
+
+
+
+
+ License plate number.
+
+
+
+
+
+
+
+
+ Airway bill number.
+
+
+
+
+
+
+
+
+ route code (default).
+
+
+
+
+
+
+
+
+
+ The following barcode types are:
+ 1. GS1 Barcode
+ 2. ASC MH10 Barcode
+ 3. 2/5 Interleaved
+ 4. Code 128 ( UPU )
+
+
+
+
+
+
+
+
+
+ City name.
+
+
+
+
+
+
+
+
+ Province name.
+
+
+
+
+
+
+
+
+ Code for street name (part of routecode).
+
+
+
+
+
+
+
+
+ Code for street number (part of routecode).
+
+
+
+
+
+
+
+
+ Country.
+
+
+
+
+ Authentification.
+
+
+
+
+ The version of the webservice implementation for which the
+requesting client is developed.
+
+
+
+
+ includes
+
+
+
+ The number of the major release. E.g. the '3' in version "3.2.".
+
+
+
+
+
+
+
+
+ The number of the minor release. E.g. the '3' in version "3.2.".
+
+
+
+
+
+
+
+
+ Optional build id to be addressed.
+
+
+
+
+
+
+
+
+
+
+
+ Type of authentification
+
+
+
+ includes
+
+
+
+ username for the business customer portal (only lower case)
+
+
+
+
+
+
+ password for the business customer portal
+
+
+
+
+
+
+
+
+
+
+ Type of native address
+
+
+
+ includes
+
+
+
+ The name of the street. Optionally the house number can be passed in this field too.
+ In this case the field "streetNumber" must not be present.
+
+
+
+
+
+
+
+
+ The house number. This field is only optional when the house number is passed with
+ the field streetName.
+
+
+
+
+
+
+
+
+ Address addon, is only printed in the international area (V53WPAK)
+
+
+
+
+
+
+
+
+ DispatchingInformation, is only printed in the international area (V53WPAK)
+
+
+
+
+
+
+
+
+
+
+ Type of native address
+
+
+
+ includes
+
+
+
+ The name of the street. Optionally the house number can be passed in this field too.
+ In this case the field "streetNumber" must not be present.
+
+
+
+
+
+
+
+
+ The house number. This field is only optional when the house number is passed with
+ the field streetName.
+
+
+
+
+
+
+
+
+ Country.
+
+
+
+
+
+
+
+
+ The name of the street. Optionally the house number can be passed in this field too.
+ In this case the field "streetNumber" must not be present.
+
+
+
+
+
+
+
+
+ The house number. This field is only optional when the house number is passed with
+ the field streetName.
+
+
+
+
+
+
+
+
+ Address addon, is only printed in the international area (V53WPAK)
+
+
+
+
+
+
+
+
+ DispatchingInformation, is only printed in the international area (V53WPAK)
+
+
+
+
+
+
+
+
+ Country.
+
+
+
+
+
+
+ Type of pickup address
+
+
+
+ includes
+
+
+
+ can be
+
+
+
+ Default address
+
+
+
+
+ Packstation address
+
+
+
+
+
+
+
+ Type of delivery address
+
+
+
+ includes
+
+
+
+ can be
+
+
+
+ Default address
+
+
+
+
+ Postoffice address
+
+
+
+
+ Packstation address
+
+
+
+
+
+
+
+ Type of bank information
+
+
+
+ includes
+
+
+
+ Name of bank account owner.
+
+
+
+
+
+
+
+
+ Name of bank.
+
+
+
+
+
+
+
+
+ IBAN code of bank account.
+
+
+
+
+
+
+
+
+ Purpose of bank information.
+
+
+
+
+
+
+
+
+ Purpose of bank information.
+
+
+
+
+
+
+
+
+ Bank-Information-Code (BankCCL) of bank account.
+
+
+
+
+
+
+
+
+ Accountreferece to customer profile
+
+
+
+
+
+
+
+
+
+
+ Type of name
+
+
+
+ includes
+
+
+
+
+
+ Type of name
+
+
+
+ includes
+
+
+
+ Name of receiver (first part)
+
+
+
+
+
+
+
+
+
+
+ Name of receiver (first part)
+
+
+
+
+
+
+
+
+ Name of company (second part).
+
+
+
+
+
+
+
+
+ Name of company (third part).
+
+
+
+
+
+
+
+
+ Type of communication.
+
+
+
+ includes
+
+
+
+ Phone number.
+
+ If you are using delivery type CDP, the phone number and/or e-mail address are mandatory
+
+
+
+
+
+
+
+
+ Emailaddress.
+
+ If you are using delivery type CDP, the phone number and/or e-mail address are mandatory
+
+
+
+
+
+
+
+
+ First name and last name of contact person.
+
+
+
+
+
+
+
+
+
+
+ Type of contact.
+
+
+
+ includes
+
+
+
+ Contact communication information.
+
+
+
+
+ Contact address.
+
+
+
+
+ Contact name.
+
+
+
+
+
+
+ Type of packstation.
+
+
+
+ includes
+
+
+
+ Post Nummer of the receiver, if not set receiver e-mail and/or mobilephone number needs to be set. When sending to a packstation with "DHL Paket" (V01PAK), the postnumber must always be entered.
+
+
+
+
+
+
+
+
+ Number of the Packstation.
+
+
+
+
+
+
+
+
+
+
+ Type of Postfiliale
+
+
+
+ includes
+
+
+
+ Number of the postfiliale
+
+
+
+
+
+
+
+
+ Post Nummer of the receiver
+
+
+
+
+
+
+
+
+
+
+ Type of Postfiliale
+
+
+
+ includes
+
+
+
+ Number of the postfiliale
+
+
+
+
+
+
+
+
+ Post Nummer of the receiver or receiver e-mail-adress.
+
+
+
+
+
+
+
+
+ Country.
+
+
+
+
+
+
+ Type of ParcelShop (Receiver is in Europe)
+
+
+
+ includes
+
+
+
+ Number of the ParcelShop
+
+
+
+
+
+
+
+
+ Name of street of the ParcelShop
+
+
+
+
+
+
+
+
+ House number of the ParcelShop
+
+
+
+
+
+
+
+
+
+
+ Type of customer
+
+
+
+ includes
+
+
+
+ Name of customer.
+
+
+
+
+ VAT id.
+
+
+
+
+ Address of customer
+
+
+
+
+ Contact information
+
+
+
+
+ Bank information
+
+
+
+
+ Additional notes
+
+
+
+
+
+
+ Type of error
+
+
+
+ includes
+
+
+
+ Priority (e.g. error, warnung, .....)
+
+
+
+
+ Code
+
+
+
+
+ Occurence
+
+
+
+
+ Short description
+
+
+
+
+ Detailed description
+
+
+
+
+ Suggested solution
+
+
+
+
+ Name of application
+
+
+
+
+ Module name
+
+
+
+
+
+
+ Type of zip code
+
+
+
+
+
+
+ Type of country
+
+
+
+ includes
+
+
+
+ Name of country.
+
+
+
+
+
+
+
+
+ Country's ISO-Code (ISO-2-Alpha).
+
+
+
+
+ Name of state.
+
+
+
+
+
+
+
+
+
+
+ Type of shipment number
+
+
+
+ can be
+
+
+
+
+
+ part of webservice response
+
+
+
+
+ includes
+
+
+
+ statuscode value.
+
+
+
+
+
+
+
+
+ description corresponding to the statuscode
+
+
+
+
+
+
+
+
+
+
+
+ DHL product Key.
+
+
+
+
+
+
+
+
+ Package dimensions (length, width, height)
+
+
+
+
+ includes
+
+
+
+ length of package
+
+
+
+
+ width of package
+
+
+
+
+ height of package
+
+
+
+
+ unit for all measures
+
+
+
+
+
+
+
+
+
+
+
+ Time Frame in which actions should affect
+
+
+
+
+ includes
+
+
+
+ begin of timeframe
+
+
+
+
+ end of timeframe
+
+
+
+
+
+
+
+ Can contain any DHL shipmentnumber.
+
+
+
+
+
+
+
diff --git a/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0.wsdl b/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0.wsdl
new file mode 100644
index 00000000..9a0fc217
--- /dev/null
+++ b/classes/Carrier/Dhl/Wsdl/geschaeftskundenversand-api-3.4.0.wsdl
@@ -0,0 +1,340 @@
+
+
+
+
+
+
+
+ The authentication data.
+
+
+ The shipmentdata for creating a shipment.
+
+
+
+ The status of the createShipment operation and the identifier for the
+ shipment.
+
+
+
+ The shipmentdata for validating a shipment.
+
+
+
+ The status of the validateShipment operation and the identifier for the
+ shipment.
+
+
+
+ The identifier for the shipment which should be
+ deleted.
+
+
+
+ The status of the deletion operation.
+
+
+
+ The identifier for the shipment which should be
+ manifested.
+
+
+
+ The status of the manifest operation.
+
+
+
+ The identifier for the DD shipment for which the label url is
+ requested.
+
+
+
+ The status of the operation and the label url (if
+ available).
+
+
+
+ The version of webservice implementation.
+
+
+
+ The version of webservice implementation.
+
+
+
+ The identifier for the DD shipment for which the label url is
+ requested.
+
+
+
+ The status of the operation and the label url (if
+ available).
+
+
+
+ Request a manifest of the given date / date range.
+
+
+
+ The status of the operation and the manifest url (if
+ available).
+
+
+
+ Request a manifest of the given date / date range.
+
+
+
+ The status of the operation and the manifest url (if
+ available).
+
+
+
+ The status of the operation and the manifest url (if
+ available).
+
+
+
+
+ Creates shipments.
+
+ The shipment data.
+
+
+ The status of the createShipment operation and the identifier for the
+ shipment.
+
+
+
+ Creates shipments.
+
+ The shipment data.
+
+
+ The status of the validateShipment operation and the identifier for the
+ shipment.
+
+
+
+ Deletes the requested shipments.
+
+ The identifier for the shipment which should be
+ deleted.
+
+
+ The status of the deletion operation.
+
+
+
+ Manifest the requested DD shipments.
+
+ The identifier for the shipment which should be
+ manifested.
+
+
+ The status of the manifest operation.
+
+
+
+ Returns the request-url for getting a label.
+
+ The identifier for the shipment for which the label url is
+ requested.
+
+
+ The status of the operation and the label url (if
+ available).
+
+
+
+ Returns the actual version of the implementation of the whole ISService
+ webservice.
+
+ The version of webservice implementation.
+
+
+
+ Returns the request-url for getting a export
+ document.
+
+ The identifier for the shipment for which the export document url is
+ requested.
+
+
+ The status of the operation and the export document url (if
+ available).
+
+
+
+ Request the manifest.
+
+ The request data.
+
+
+ The status of the getManifest operation and the manifest
+ url.
+
+
+
+ Updates a shipment order.
+
+ The shipment data.
+
+
+ The status of the updateShipment operation and the identifier for the
+ shipment.
+
+
+
+
+
+ Creates shipments.
+
+ The authentication data and the shipment data.
+
+
+ The status of the operation and the shipment
+ identifier.
+
+
+
+ Validates shipments.
+
+ The authentication data and the shipment data.
+
+
+ The status of the operation and the shipment
+ identifier.
+
+
+
+ Deletes the requested shipments.
+
+ The authentication data and the shipment
+ identifier.
+
+
+ The status of the operation.
+
+
+
+ Manifest the requested shipments.
+
+ The authentication data and the shipment
+ identifier.
+
+
+ The status of the operation.
+
+
+
+ Returns the request-url for getting a label.
+
+ The authentication data and the shipment
+ identifier.
+
+
+ The status of the operation and the url for requesting the
+ label.
+
+
+
+ Returns the actual version of the implementation of the whole ISService
+ webservice.
+
+
+
+ The version of the implementation.
+
+
+
+ Returns the request-url for getting a export
+ document.
+
+ The authentication data and the shipment
+ identifier.
+
+
+ The status of the operation and the url for requesting the export
+ document.
+
+
+
+ Requests the manifest.
+
+ The authentication data and the shipment data.
+
+
+ The status of the operation and the manifest url.
+
+
+
+ Updates a shipment order.
+
+ The authentication data and the shipment data.
+
+
+ The status of the operation
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/Document.php b/classes/Carrier/SendCloud/Data/Document.php
new file mode 100644
index 00000000..023b6176
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/Document.php
@@ -0,0 +1,31 @@
+Type = $data->type;
+ $obj->Size = $data->size;
+ $obj->Link = $data->link;
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/ParcelBase.php b/classes/Carrier/SendCloud/Data/ParcelBase.php
new file mode 100644
index 00000000..e3c16de7
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/ParcelBase.php
@@ -0,0 +1,42 @@
+ $this->Name,
+ 'company_name' => $this->CompanyName,
+ 'address' => $this->Address,
+ 'address_2' => $this->Address2,
+ 'house_number' => $this->HouseNumber,
+ 'city' => $this->City,
+ 'postal_code' => $this->PostalCode,
+ 'telephone' => $this->Telephone,
+ 'request_label' => $this->RequestLabel,
+ 'email' => $this->EMail,
+ 'country' => $this->Country,
+ 'shipment' => ['id' => $this->ShippingMethodId],
+ 'weight' => number_format($this->Weight / 1000, 3, '.', null),
+ 'order_number' => $this->OrderNumber,
+ 'total_order_value_currency' => $this->TotalOrderValueCurrency,
+ 'total_order_value' => number_format($this->TotalOrderValue, 2, '.', null),
+ 'country_state' => $this->CountryState,
+ 'sender_address' => $this->SenderAddressId,
+ 'customs_invoice_nr' => $this->CustomsInvoiceNr,
+ 'customs_shipment_type' => $this->CustomsShipmentType,
+ 'external_reference' => $this->ExternalReference,
+ 'total_insured_value' => $this->TotalInsuredValue ?? 0,
+ 'parcel_items' => array_map(fn(ParcelItem $item)=>$item->toApiRequest(), $this->ParcelItems),
+ 'is_return' => $this->IsReturn,
+ 'length' => $this->Length,
+ 'width' => $this->Width,
+ 'height' => $this->Height,
+ ];
+ }
+
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/ParcelCreationError.php b/classes/Carrier/SendCloud/Data/ParcelCreationError.php
new file mode 100644
index 00000000..0d202b6d
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/ParcelCreationError.php
@@ -0,0 +1,16 @@
+ $this->HsCode,
+ 'weight' => number_format($this->Weight / 1000, 3, '.', null),
+ 'quantity' => $this->Quantity,
+ 'description' => $this->Description,
+ 'value' => $this->Price,
+ 'origin_country' => $this->OriginCountry,
+ 'sku' => $this->Sku ?? '',
+ 'product_id' => $this->ProductId ?? '',
+ ];
+ }
+
+ public static function fromApiResponse(object $data): ParcelItem
+ {
+ $obj = new ParcelItem();
+ $obj->HsCode = $data->hs_code;
+ $obj->Weight = intval(floatval($data->weight)*1000);
+ $obj->Quantity = $data->quantity;
+ $obj->Description = $data->description;
+ $obj->Price = $data->value;
+ $obj->OriginCountry = $data->origin_country;
+ $obj->Sku = $data->sku;
+ $obj->ProductId = $data->product_id;
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/ParcelResponse.php b/classes/Carrier/SendCloud/Data/ParcelResponse.php
new file mode 100644
index 00000000..9fbec442
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/ParcelResponse.php
@@ -0,0 +1,82 @@
+Documents as $item)
+ if ($item->Type == $type)
+ return $item;
+ return null;
+ }
+
+ /**
+ * @throws Exception
+ */
+ public static function fromApiResponse(object $data): ParcelResponse
+ {
+ $obj = new ParcelResponse();
+ $obj->Address = $data->address_divided->street;
+ $obj->Address2 = $data->address_2;
+ $obj->HouseNumber = $data->address_divided->house_number;
+ $obj->CarrierCode = $data->carrier->code;
+ $obj->City = $data->city;
+ $obj->CompanyName = $data->company_name;
+ $obj->Country = $data->country->iso_2;
+ $obj->CustomsInvoiceNr = $data->customs_invoice_nr;
+ $obj->CustomsShipmentType = $data->customs_shipment_type;
+ $obj->DateCreated = new DateTimeImmutable($data->date_created);
+ $obj->DateUpdated = new DateTimeImmutable($data->date_updated);
+ $obj->DateAnnounced = new DateTimeImmutable($data->date_announced);
+ $obj->EMail = $data->email;
+ $obj->Id = $data->id;
+ $obj->Name = $data->name;
+ $obj->OrderNumber = $data->order_number;
+ $obj->ParcelItems = array_map(fn($item)=>ParcelItem::fromApiResponse($item), $data->parcel_items);
+ $obj->PostalCode = $data->postal_code;
+ $obj->ExternalReference = $data->external_reference;
+ $obj->ShippingMethodId = $data->shipment->id;
+ $obj->ShipmentMethodName = $data->shipment->name;
+ $obj->StatusId = $data->status->id;
+ $obj->StatusMessage = $data->status->message;
+ $obj->Documents = array_map(fn($item)=>Document::fromApiResponse($item), $data->documents);
+ $obj->Telephone = $data->telephone;
+ $obj->TotalInsuredValue = $data->total_insured_value;
+ $obj->TotalOrderValue = $data->total_order_value;
+ $obj->TotalOrderValueCurrency = $data->total_order_value_currency;
+ $obj->TrackingNumber = $data->tracking_number;
+ $obj->TrackingUrl = $data->tracking_url;
+ $obj->Weight = $data->weight;
+ $obj->Length = $data->length;
+ $obj->Height = $data->height;
+ $obj->Width = $data->width;
+ $obj->IsReturn = $data->is_return;
+ $obj->Errors = $data->errors->non_field_errors;
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/SenderAddress.php b/classes/Carrier/SendCloud/Data/SenderAddress.php
new file mode 100644
index 00000000..6e249d64
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/SenderAddress.php
@@ -0,0 +1,59 @@
+CompanyName; $this->ContactName; $this->Street $this->HouseNumber; $this->PostalCode; $this->City";
+ }
+
+
+ public static function fromApiResponse(object $data): SenderAddress {
+ $obj = new SenderAddress();
+ $obj->City = $data->city;
+ $obj->CompanyName = $data->company_name;
+ $obj->ContactName = $data->contact_name;
+ $obj->Country = $data->country;
+ $obj->CountryState = $data->country_state;
+ $obj->Email = $data->email;
+ $obj->HouseNumber = $data->house_number;
+ $obj->Id = $data->id;
+ $obj->PostalBox = $data->postal_box;
+ $obj->PostalCode = $data->postal_code;
+ $obj->Street = $data->street;
+ $obj->Telephone = $data->telephone;
+ $obj->VatNumber = $data->vat_number;
+ $obj->EoriNumber = $data->eori_number;
+ $obj->BrandId = $data->brand_id;
+ $obj->Label = $data->label;
+ $obj->SignatureFullName = $data->signature_full_name;
+ $obj->SignatureInitials = $data->signature_initials;
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/ShippingMethod.php b/classes/Carrier/SendCloud/Data/ShippingMethod.php
new file mode 100644
index 00000000..53b3bfd4
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/ShippingMethod.php
@@ -0,0 +1,35 @@
+Id = $data->id;
+ $obj->Name = $data->name;
+ $obj->Carrier = $data->carrier ?? null;
+ $obj->MinWeight = $data->properties->min_weight;
+ $obj->MaxWeight = $data->properties->max_weight;
+ $obj->MaxLength = $data->properties->max_dimensions->length;
+ $obj->MaxWidth = $data->properties->max_dimensions->width;
+ $obj->MaxHeight = $data->properties->max_dimensions->height;
+ $obj->Unit = $data->properties->max_dimensions->unit;
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/Data/ShippingProduct.php b/classes/Carrier/SendCloud/Data/ShippingProduct.php
new file mode 100644
index 00000000..77d5fa98
--- /dev/null
+++ b/classes/Carrier/SendCloud/Data/ShippingProduct.php
@@ -0,0 +1,35 @@
+Name = $data->name;
+ $obj->Carrier = $data->carrier;
+ $obj->ServicePointsCarrier = $data->service_points_carrier;
+ $obj->Code = $data->code;
+ $obj->MinWeight = $data->weight_range->min_weight;
+ $obj->MaxWeight = $data->weight_range->max_weight;
+ foreach ($data->methods as $method) {
+ $child = ShippingMethod::fromApiResponse($method);
+ $child->Carrier = $obj->Carrier;
+ $obj->ShippingMethods[] = $child;
+ }
+ return $obj;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/SendCloudApi.php b/classes/Carrier/SendCloud/SendCloudApi.php
new file mode 100644
index 00000000..dc05a05a
--- /dev/null
+++ b/classes/Carrier/SendCloud/SendCloudApi.php
@@ -0,0 +1,163 @@
+public_key = $public_key;
+ $this->private_key = $private_key;
+ }
+
+ /**
+ * @throws SendcloudApiException
+ */
+ public function GetSenderAddresses(): array
+ {
+ $uri = self::PROD_BASE_URI . '/user/addresses/sender';
+ $response = $this->sendRequest($uri);
+ foreach ($response['body']->sender_addresses as $item)
+ $res[] = SenderAddress::fromApiResponse($item);
+ return $res ?? [];
+ }
+
+ /**
+ * @throws SendcloudApiException
+ */
+ public function GetShippingProducts(string $sourceCountry, ?string $targetCountry = null, ?int $weight = null,
+ ?int $height = null, ?int $length = null, ?int $width = null): array
+ {
+ $uri = self::PROD_BASE_URI . '/shipping-products';
+ $params = ['from_country' => $sourceCountry];
+ if ($targetCountry !== null)
+ $params['to_country'] = $targetCountry;
+ if ($weight !== null && $weight > 0)
+ $params['weight'] = $weight;
+ if ($height !== null && $height > 0) {
+ $params['height'] = $height;
+ $params['height_unit'] = 'centimeter';
+ }
+ if ($length !== null && $length > 0) {
+ $params['length'] = $length;
+ $params['length_unit'] = 'centimeter';
+ }
+ if ($width !== null && $width > 0) {
+ $params['width'] = $width;
+ $params['width_unit'] = 'centimeter';
+ }
+ $response = $this->sendRequest($uri, $params);
+ return array_map(fn($x) => ShippingProduct::fromApiResponse($x), $response['body'] ?? []);
+ }
+
+ /**
+ * @throws SendcloudApiException
+ */
+ public function CreateParcel(ParcelCreation $parcel): ParcelResponse|string|null
+ {
+ $uri = self::PROD_BASE_URI . '/parcels';
+ $response = $this->sendRequest($uri, null, true, ['parcel' => $parcel->toApiRequest()], [200,400]);
+ switch ($response['code']) {
+ case 200:
+ if (isset($response['body']->parcel))
+ try {
+ return ParcelResponse::fromApiResponse($response['body']->parcel);
+ } catch (Exception $e) {
+ throw new SendcloudApiException(previous: $e);
+ }
+ break;
+ case 400:
+ if (isset($response->error))
+ return $response->error->message;
+ break;
+ }
+ throw SendcloudApiException::fromResponse($response);
+ }
+
+ /**
+ * @throws SendcloudApiException
+ */
+ public function DownloadDocument(Document $document): string
+ {
+ $curl = curl_init();
+ curl_setopt_array($curl, [
+ CURLOPT_RETURNTRANSFER => 1,
+ CURLOPT_URL => $document->Link,
+ CURLOPT_HTTPHEADER => [
+ "Authorization: Basic " . base64_encode($this->public_key . ':' . $this->private_key)
+ ],
+ ]);
+ $output = curl_exec($curl);
+ $code = curl_getinfo($curl, CURLINFO_RESPONSE_CODE);
+ if ($code != 200)
+ throw SendcloudApiException::fromResponse(['code' => $code, 'body' => $output]);
+ return $output;
+ }
+
+ /**
+ * @throws SendcloudApiException
+ */
+ function sendRequest(string $uri, array $query_params = null, bool $post = false, array $postFields = null,
+ array $allowedResponseCodes = [200]): ?array
+ {
+ if (empty($this->public_key) || empty($this->private_key))
+ return null;
+
+ $curl = curl_init();
+ if (is_array($query_params)) {
+ $uri .= '?' . http_build_query($query_params);
+ }
+ curl_setopt_array($curl, [
+ CURLOPT_RETURNTRANSFER => 1,
+ CURLOPT_URL => $uri,
+ CURLOPT_HTTPHEADER => [
+ "Authorization: Basic " . base64_encode($this->public_key . ':' . $this->private_key),
+ 'Content-Type: application/json'
+ ],
+ ]);
+ if ($post === true) {
+ curl_setopt_array($curl, [
+ CURLOPT_POST => true,
+ CURLOPT_POSTFIELDS => json_encode($postFields)
+ ]);
+ }
+
+ $output = json_decode(curl_exec($curl));
+ $code = curl_getinfo($curl, CURLINFO_RESPONSE_CODE);
+ curl_close($curl);
+
+ $ret = [
+ 'code' => $code,
+ 'body' => $output,
+ ];
+
+ if (!in_array($code, $allowedResponseCodes))
+ throw SendcloudApiException::fromResponse($ret);
+
+ return $ret;
+ }
+}
\ No newline at end of file
diff --git a/classes/Carrier/SendCloud/SendcloudApiException.php b/classes/Carrier/SendCloud/SendcloudApiException.php
new file mode 100644
index 00000000..effcc1a1
--- /dev/null
+++ b/classes/Carrier/SendCloud/SendcloudApiException.php
@@ -0,0 +1,24 @@
+Id = $id;
+ $obj->Name = $name;
+ return $obj;
+ }
+
+ public function WithLength(float $min, float $max): Product {
+ $this->LengthMin = $min;
+ $this->LengthMax = $max;
+ return $this;
+ }
+
+ public function WithWidth(float $min, float $max): Product {
+ $this->WidthMin = $min;
+ $this->WidthMax = $max;
+ return $this;
+ }
+
+ public function WithHeight(float $min, float $max): Product {
+ $this->HeightMin = $min;
+ $this->HeightMax = $max;
+ return $this;
+ }
+
+ public function WithWeight(float $min, float $max): Product {
+ $this->WeightMin = $min;
+ $this->WeightMax = $max;
+ return $this;
+ }
+
+ public function WithServices(array $services): Product {
+ $this->AvailableServices = $services;
+ return $this;
+ }
+}
\ No newline at end of file
diff --git a/classes/Modules/ShippingMethod/www/js/shipping_method_create.js b/classes/Modules/ShippingMethod/www/js/shipping_method_create.js
index a7b6a50e..7654263a 100644
--- a/classes/Modules/ShippingMethod/www/js/shipping_method_create.js
+++ b/classes/Modules/ShippingMethod/www/js/shipping_method_create.js
@@ -1,3 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Andreas Palm
+ * SPDX-FileCopyrightText: 2019 Xentral (c) Xentral ERP Software GmbH, Fuggerstrasse 11, D-86150 Augsburg, Germany
+ *
+ * SPDX-License-Identifier: LicenseRef-EGPL-3.1
+ */
+
var ShippingMethodCreate = function ($) {
'use strict';
@@ -11,35 +18,14 @@ var ShippingMethodCreate = function ($) {
vueElementId: '#shipment-create',
},
search: function (el) {
- $.ajax({
- url: 'index.php?module=versandarten&action=create&cmd=suche',
- type: 'POST',
- dataType: 'json',
- data: {
- val: $(el).val()
- }
+ let val = $(el).val().toLowerCase();
+ $('.createbutton').each(function() {
+ let desc = $(this).find('.tilegrid-tile-title').text();
+ if (desc.toLowerCase().indexOf(val)>=0)
+ $(this).show();
+ else
+ $(this).hide();
})
- .done(function (data) {
- if (typeof data != 'undefined' && data != null) {
- if (typeof data.ausblenden != 'undefined' && data.ausblenden != null) {
- me.storage.hideElements = data.ausblenden.split(';');
- $.each(me.storage.hideElements, function (k, v) {
- if (v != '') {
- $('#' + v).hide();
- }
- });
-
- }
- if (typeof data.anzeigen != 'undefined' && data.anzeigen != null) {
- me.storage.showElements = data.anzeigen.split(';');
- $.each(me.storage.showElements, function (k, v) {
- if (v != '') {
- $('#' + v).show();
- }
- });
- }
- }
- });
},
init: function () {
if ($(me.selector.vueElementId).length === 0) {
diff --git a/classes/Modules/SubscriptionCycle/Bootstrap.php b/classes/Modules/SubscriptionCycle/Bootstrap.php
index 8e5fdb0b..9e1cd737 100644
--- a/classes/Modules/SubscriptionCycle/Bootstrap.php
+++ b/classes/Modules/SubscriptionCycle/Bootstrap.php
@@ -1,10 +1,17 @@
'onInitSubscriptionCycleJobService',
'SubscriptionCycleFullTask' => 'onInitSubscriptionCycleFullTask',
'TaskMutexService' => 'onInitTaskMutexService',
+ 'SubscriptionModule' => 'onInitSubscriptionModule'
];
}
@@ -60,20 +68,12 @@ final class Bootstrap
*/
public static function onInitSubscriptionCycleManualJobTask(ContainerInterface $container
): SubscriptionCycleManualJobTask {
- $legacyApp = $container->get('LegacyApplication');
-
- $subscriptionCycleModule = $legacyApp->loadModule('rechnungslauf');
- $subscriptionModule = new Aboabrechnung($legacyApp);
- $subscriptionModule->cronjob = true;
-
return new SubscriptionCycleManualJobTask(
- $legacyApp,
+ $container->get('LegacyApplication'),
$container->get('Database'),
$container->get('TaskMutexService'),
$container->get('SubscriptionCycleJobService'),
- $subscriptionCycleModule,
- $subscriptionModule,
- !empty($legacyApp->erp->GetKonfiguration('rechnungslauf_gruppen'))
+ $container->get('SubscriptionModule')
);
}
@@ -210,22 +210,10 @@ final class Bootstrap
);
}
- /**
- * @param SchemaCollection $collection
- *
- * @return void
- */
- public static function registerTableSchemas(SchemaCollection $collection): void
- {
- $subscriptionCycleJob = new TableSchema('subscription_cycle_job');
- $subscriptionCycleJob->addColumn(Type\Integer::asAutoIncrement('id'));
- $subscriptionCycleJob->addColumn(new Type\Integer('address_id'));
- $subscriptionCycleJob->addColumn(new Type\Varchar('document_type', 32));
- $subscriptionCycleJob->addColumn(new Type\Varchar('job_type', 32));
- $subscriptionCycleJob->addColumn(new Type\Integer('printer_id'));
- $subscriptionCycleJob->addColumn(new Type\Timestamp('created_at', 'CURRENT_TIMESTAMP'));
- $subscriptionCycleJob->addIndex(new Index\Primary(['id']));
- $subscriptionCycleJob->addIndex(new Index\Index(['address_id']));
- $collection->add($subscriptionCycleJob);
+ public static function onInitSubscriptionModule(ContainerInterface $container): SubscriptionModule {
+ return new SubscriptionModule(
+ $container->get('LegacyApplication'),
+ $container->get('Database')
+ );
}
}
diff --git a/classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php b/classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php
index b7b4b03a..89064062 100644
--- a/classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php
+++ b/classes/Modules/SubscriptionCycle/Scheduler/SubscriptionCycleManualJobTask.php
@@ -1,4 +1,9 @@
app = $app;
$this->db = $db;
$this->taskMutexService = $taskMutexService;
$this->cycleJobService = $cycleJobService;
- $this->subscriptionCycleModule = $subscriptionCycleModule;
$this->subscriptionModule = $subscriptionModule;
- $this->useGroups = $useGroups;
}
public function execute(): void
@@ -71,77 +57,16 @@ final class SubscriptionCycleManualJobTask
}
$this->taskMutexService->setMutex('rechnungslauf_manual');
$jobs = $this->cycleJobService->listAll(100);
- $simulatedDays = $this->getSimulatedDates($jobs);
- if (empty($jobs)) {
- return;
- }
- foreach (['auftrag', 'rechnung'] as $doctype) {
- foreach ($simulatedDays as $simulatedDay) {
- if ($simulatedDay === '') {
- $simulatedDay = null;
- } else {
- try {
- $simulatedDay = new DateTimeImmutable($simulatedDay);
- } catch (Exception $exception) {
- $simulatedDay = null;
- }
- }
- $addresses = $this->getAddressesByTypeFromJobs($jobs, $doctype, $simulatedDay);
- foreach ($jobs as $job) {
- $job = $this->cycleJobService->getJob((int)$job['id']);
- if (empty($job)) {
- continue;
- }
- if ($job['document_type'] !== $doctype) {
- continue;
- }
- if ($job['simulated_day'] === null && $simulatedDay !== null) {
- continue;
- }
- if (
- $job['simulated_day'] !== null
- && ($simulatedDay === null || $simulatedDay->format('Y-m-d') !== $job['simulated_day'])
- ) {
- continue;
- }
- if (!in_array($job['address_id'], $addresses, false)) {
- $this->cycleJobService->delete((int)$job['id']);
- continue;
- }
- $simulatedDay = null;
- if ($job['simulated_day'] !== null) {
- try {
- $simulatedDay = new DateTimeImmutable($job['simulated_day']);
- } catch (Exception $exception) {
- $simulatedDay = null;
- }
- }
- if ($this->useGroups) {
- $this->subscriptionCycleModule->generateAndSendSubscriptionCycleGroups(
- $this->subscriptionModule,
- [$job['address_id']],
- $doctype,
- $job['job_type'],
- $job['printer_id'],
- $simulatedDay
- );
- } else {
- $this->subscriptionCycleModule->generateAndSendSubscriptionCycle(
- $this->subscriptionModule,
- [$job['address_id']],
- $doctype,
- $job['printer_id'],
- $job['job_type'],
- $simulatedDay
- );
- }
- $this->cycleJobService->delete((int)$job['id']);
- if ($this->taskMutexService->isTaskInstanceRunning('rechnungslauf')) {
- return;
- }
- $this->taskMutexService->setMutex('rechnungslauf_manual');
- }
- }
+ foreach ($jobs as $job) {
+ switch ($job['document_type']) {
+ case 'rechnung':
+ $this->subscriptionModule->CreateInvoice((int)$job['address_id']);
+ break;
+ case 'auftrag':
+ $this->subscriptionModule->CreateOrder((int)$job['address_id']);
+ break;
+ }
+ $this->cycleJobService->delete((int)$job['id']);
}
}
@@ -149,52 +74,4 @@ final class SubscriptionCycleManualJobTask
{
$this->taskMutexService->setMutex('rechnungslauf_manual', false);
}
-
- /**
- * @param array $jobs
- * @param string $documentType
- * @param DateTimeInterface|null $simulatedDay
- *
- * @return array
- */
- private function getAddressesByTypeFromJobs(
- array $jobs,
- string $documentType,
- ?DateTimeInterface $simulatedDay = null
- ): array {
- $addresses = [];
- foreach ($jobs as $job) {
- if ($job['document_type'] === $documentType) {
- $addresses[] = (int)$job['address_id'];
- }
- }
-
- if (empty($addresses)) {
- return [];
- }
-
- $addressesWithSubscriptions = array_keys(
- (array)$this->subscriptionModule->GetRechnungsArray($documentType, true)
- );
-
- return array_intersect($addresses, $addressesWithSubscriptions);
- }
-
- /**
- * get all Dates from Setting "Vergangenes Datum für Abrechnungserstellung" to calc old Subscription cycles
- *
- * @param array $jobs
- *
- * @return array
- */
- private function getSimulatedDates(array $jobs): array
- {
- $simulatedDates = [];
- foreach ($jobs as $job) {
- $simulatedDates[] = (string)$job['simulated_day'];
- }
-
- return array_unique($simulatedDates);
- }
-
}
diff --git a/classes/Modules/SubscriptionCycle/Service/SubscriptionCycleJobService.php b/classes/Modules/SubscriptionCycle/Service/SubscriptionCycleJobService.php
index 802d138f..a115c768 100644
--- a/classes/Modules/SubscriptionCycle/Service/SubscriptionCycleJobService.php
+++ b/classes/Modules/SubscriptionCycle/Service/SubscriptionCycleJobService.php
@@ -1,4 +1,9 @@
ensureDocumentType($documentType);
$this->db->perform(
'INSERT INTO `subscription_cycle_job`
- (`address_id`, `document_type`, `job_type`, `printer_id`, `created_at`, `simulated_day`)
- VALUES (:address_id, :document_type, :job_type, :printer_id, NOW(), :simulated_day)',
+ (`address_id`, `document_type`, `job_type`, `printer_id`, `created_at`)
+ VALUES (:address_id, :document_type, :job_type, :printer_id, NOW())',
[
'address_id' => $addressId,
'document_type' => $documentType,
'job_type' => $jobType,
'printer_id' => $printerId,
- 'simulated_day' => $simulatedDay === null ? null : $simulatedDay->format('Y-m-d'),
]
);
- return (int)$this->db->lastInsertId();
+ return $this->db->lastInsertId();
}
/**
diff --git a/classes/Modules/SubscriptionCycle/SubscriptionModule.php b/classes/Modules/SubscriptionCycle/SubscriptionModule.php
new file mode 100644
index 00000000..ef31098a
--- /dev/null
+++ b/classes/Modules/SubscriptionCycle/SubscriptionModule.php
@@ -0,0 +1,115 @@
+app = $app;
+ $this->db = $db;
+ }
+
+ public function GetPositions(int $address, string $documentType, DateTimeInterface $calculationDate = null): array
+ {
+ if ($calculationDate === null)
+ $calculationDate = new DateTimeImmutable('today');
+
+ $sql = "SELECT
+ aa.id,
+ @start := GREATEST(aa.startdatum, aa.abgerechnetbis) as start,
+ @end := IF(aa.enddatum = '0000-00-00' OR aa.enddatum > :calcdate, :calcdate, aa.enddatum) as end,
+ @cycles := CASE
+ WHEN aa.preisart = 'monat' THEN
+ TIMESTAMPDIFF(MONTH, @start, @end)
+ WHEN aa.preisart = 'jahr' THEN
+ TIMESTAMPDIFF(YEAR, @start, @end)
+ WHEN aa.preisart = '30tage' THEN
+ FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
+ END+1 as cycles,
+ CASE
+ WHEN aa.preisart = 'monat' THEN
+ DATE_ADD(@start, INTERVAL @cycles MONTH)
+ WHEN aa.preisart = 'jahr' THEN
+ DATE_ADD(@start, INTERVAL @cycles YEAR)
+ WHEN aa.preisart = '30tage' THEN
+ DATE_ADD(@start, INTERVAL @cycles*30 DAY )
+ END as newend,
+ aa.preisart,
+ aa.adresse,
+ aa.preis,
+ aa.rabatt,
+ aa.bezeichnung,
+ aa.beschreibung,
+ aa.artikel,
+ aa.menge,
+ aa.waehrung
+ FROM abrechnungsartikel aa
+ JOIN artikel a on aa.artikel = a.id
+ WHERE aa.dokument = :doctype
+ AND greatest(aa.startdatum, aa.abgerechnetbis) <= :calcdate
+ AND (aa.enddatum = '0000-00-00' OR aa.abgerechnetbis < aa.enddatum)
+ AND aa.adresse = :address";
+
+ return $this->db->fetchAll($sql, [
+ 'doctype' => $documentType,
+ 'calcdate' => $calculationDate->format('Y-m-d'),
+ 'address' => $address]);
+ }
+
+ public function CreateInvoice(int $address, DateTimeInterface $calculationDate = null) {
+ $positions = $this->GetPositions($address, 'rechnung', $calculationDate);
+ if(empty($positions))
+ return;
+
+ $invoice = $this->app->erp->CreateRechnung($address);
+ $this->app->erp->LoadRechnungStandardwerte($invoice, $address);
+ foreach ($positions as $pos) {
+ $beschreibung = $pos['beschreibung'];
+
+ $starts = DateTimeImmutable::createFromFormat('Y-m-d', $pos['start'])->format('d.m.Y');
+ $newends = DateTimeImmutable::createFromFormat('Y-m-d', $pos['newend'])->format('d.m.Y');
+ $beschreibung .= "'.$text.'
';
+ $ret = sprintf('%s
', $class, $text);
if($_var === 'return')
- {
return $ret;
- }
- return $this->app->Tpl->Add($_var, $ret);
+
+ $this->app->Tpl->Add($_var, $ret);
}
public function addSelect($_var, $id, $name, $options, $selected = '', $class = '')
diff --git a/upgrade/data/db_schema.json b/upgrade/data/db_schema.json
index 6686ad5c..f241296a 100644
--- a/upgrade/data/db_schema.json
+++ b/upgrade/data/db_schema.json
@@ -98692,6 +98692,92 @@
}
]
},
+ {
+ "name": "subscription_cycle_job",
+ "type": "BASE TABLE",
+ "columns": [
+ {
+ "Field": "id",
+ "Type": "int(11)",
+ "Collation": null,
+ "Null": "NO",
+ "Key": "PRI",
+ "Default": "",
+ "Extra": "auto_increment",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ },
+ {
+ "Field": "address_id",
+ "Type": "int(11)",
+ "Collation": null,
+ "Null": "NO",
+ "Key": "MUL",
+ "Default": "",
+ "Extra": "",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ },
+ {
+ "Field": "document_type",
+ "Type": "varchar(32)",
+ "Collation": "utf8mb3_general_ci",
+ "Null": "NO",
+ "Key": "",
+ "Default": "",
+ "Extra": "",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ },
+ {
+ "Field": "job_type",
+ "Type": "varchar(32)",
+ "Collation": "utf8mb3_general_ci",
+ "Null": "YES",
+ "Key": "",
+ "Default": "",
+ "Extra": "",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ },
+ {
+ "Field": "printer_id",
+ "Type": "int(11)",
+ "Collation": "",
+ "Null": "YES",
+ "Key": "",
+ "Default": "",
+ "Extra": "",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ },
+ {
+ "Field": "created_at",
+ "Type": "timestamp",
+ "Collation": "",
+ "Null": "NO",
+ "Key": "",
+ "Default": "current_timestamp()",
+ "Extra": "",
+ "Privileges": "select,insert,update,references",
+ "Commant": ""
+ }
+ ],
+ "keys": [
+ {
+ "Key_name": "PRIMARY",
+ "columns": [
+ "id"
+ ]
+ },
+ {
+ "Key_name": "address",
+ "columns": [
+ "address_id"
+ ]
+ }
+ ]
+ },
{
"name": "supersearch_index_group",
"type": "BASE TABLE",
diff --git a/version.php b/version.php
index f31dc0eb..d08606eb 100755
--- a/version.php
+++ b/version.php
@@ -1,7 +1,7 @@
Firmendaten("bezeichnungstornorechnung"),'gutschrift','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Proformarechnung','proformarechnung','list');
- $navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','rechnungslauf');
+ $navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Mahnwesen','mahnwesen','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Dokumenten Scanner','docscan','list');
@@ -15205,33 +15212,11 @@ if($id > 0)
}
//@refactor ApplicationCore
-function LoadVersandModul($modul, $id)
+function LoadVersandModul(string $modul, int $id): Versanddienstleister
{
- if(empty($modul) ||
- strpos($modul,'..') !== false ||
- !@is_file(__DIR__.'/versandarten/'.$modul.'.php')
- )
- {
- return;
- }
- $class_name = 'Versandart_'.$modul;
- $class_name_custom = 'Versandart_'.$modul.'Custom';
- if(!class_exists($class_name))
- {
- if(@is_file(__DIR__.'/versandarten/'.$modul.'_custom.php'))
- {
- include_once(__DIR__.'/versandarten/'.$modul.'_custom.php');
- }else{
- include_once(__DIR__.'/versandarten/'.$modul.'.php');
- }
- }
- if(class_exists($class_name_custom))
- {
- return new $class_name_custom($this->app, $id);
- }elseif(class_exists($class_name))
- {
- return new $class_name($this->app, $id);
- }
+ /** @var Versandarten $versandarten */
+ $versandarten = $this->app->loadModule('versandarten');
+ return $versandarten->loadModule($modul, $id);
}
//@refactor versanddiestleister Modul
@@ -15304,131 +15289,131 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
}
}
- if($sid=="versand")
- {
- // falche tracingnummer bei DHL da wir in der Funktion PaketmarkeDHLEmbedded sind
- if((strlen($tracking) < 12 || strlen($tracking) > 21) && $trackingsubmitcancel=="" && ($typ=="DHL" || $typ=="Intraship"))
+ if($sid=="versand")
{
- header("Location: index.php?module=versanderzeugen&action=frankieren&id=$id&land=$land&tracking_again=1");
- exit;
- }
- else
- {
-/* $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul,bezeichnung FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND type = '".$this->app->DB->real_escape_string($typ)."' AND modul != '' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
- if($versandartenmodul && @is_file(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
+ // falche tracingnummer bei DHL da wir in der Funktion PaketmarkeDHLEmbedded sind
+ if((strlen($tracking) < 12 || strlen($tracking) > 21) && $trackingsubmitcancel=="" && ($typ=="DHL" || $typ=="Intraship"))
{
- $obj = $this->LoadVersandModul($versandartenmodul[0]['modul'], $versandartenmodul[0]['id']);
- if(!empty($obj) && method_exists($obj, 'TrackingReplace'))
- {
- $tracking = $obj->TrackingReplace($tracking);
- }
+ header("Location: index.php?module=versanderzeugen&action=frankieren&id=$id&land=$land&tracking_again=1");
+ exit;
}
+ else
+ {
+ /* $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul,bezeichnung FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND type = '".$this->app->DB->real_escape_string($typ)."' AND modul != '' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
+ if($versandartenmodul && @is_file(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
+ {
+ $obj = $this->LoadVersandModul($versandartenmodul[0]['modul'], $versandartenmodul[0]['id']);
+ if(!empty($obj) && method_exists($obj, 'TrackingReplace'))
+ {
+ $tracking = $obj->TrackingReplace($tracking);
+ }
+ }
*/
- $trackingUser = !empty($this->app->User) && method_exists($this->app->User,'GetParameter')?
- $this->app->User->GetParameter('versand_lasttracking'):'';
+ $trackingUser = !empty($this->app->User) && method_exists($this->app->User,'GetParameter')?
+ $this->app->User->GetParameter('versand_lasttracking'):'';
- if(!empty($trackingUser) && in_array($trackingUser,[$trackingBefore,$tracking])) {
- $this->app->User->SetParameter('versand_lasttracking','');
- $this->app->User->SetParameter('versand_lasttracking_link','');
- $this->app->User->SetParameter('versand_lasttracking_versand', '');
- $this->app->User->SetParameter('versand_lasttracking_lieferschein', '');
- }
+ if(!empty($trackingUser) && in_array($trackingUser,[$trackingBefore,$tracking])) {
+ $this->app->User->SetParameter('versand_lasttracking','');
+ $this->app->User->SetParameter('versand_lasttracking_link','');
+ $this->app->User->SetParameter('versand_lasttracking_versand', '');
+ $this->app->User->SetParameter('versand_lasttracking_lieferschein', '');
+ }
- $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versand', tracking='$tracking',
- versendet_am=NOW(),versendet_am_zeitstempel=NOW(), abgeschlossen='1',logdatei=NOW() WHERE id='$id' LIMIT 1");
- if($lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id = '$id' LIMIT 1")) {
- $this->app->erp->LieferscheinProtokoll($lieferschein,'Verarbeitung im Versandzentrum');
- }
- $rechnung = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id = '$id' LIMIT 1");
- if($lieferschein && ($auftrag = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$lieferschein'"))) {
- $this->app->erp->AuftragProtokoll($auftrag,'Verarbeitung im Versandzentrum');
+ $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versand', tracking='$tracking',
+ versendet_am=NOW(),versendet_am_zeitstempel=NOW(), abgeschlossen='1',logdatei=NOW() WHERE id='$id' LIMIT 1");
+ if($lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id = '$id' LIMIT 1")) {
+ $this->app->erp->LieferscheinProtokoll($lieferschein,'Verarbeitung im Versandzentrum');
+ }
+ $rechnung = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id = '$id' LIMIT 1");
+ if($lieferschein && ($auftrag = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$lieferschein'"))) {
+ $this->app->erp->AuftragProtokoll($auftrag,'Verarbeitung im Versandzentrum');
- if(empty($rechnung)) {
- $rechnung = $this->app->DB->Select(
- sprintf(
- "SELECT id FROM rechnung WHERE auftragid = %d AND status <> 'storniert' AND belegnr <> '' LIMIT 1",
- $auftrag
- )
- );
- if($rechnung) {
- $this->app->DB->Update(
+ if(empty($rechnung)) {
+ $rechnung = $this->app->DB->Select(
sprintf(
- 'UPDATE versand SET rechnung = %d WHERE id = %d AND rechnung = 0',
- $rechnung, $id
+ "SELECT id FROM rechnung WHERE auftragid = %d AND status <> 'storniert' AND belegnr <> '' LIMIT 1",
+ $auftrag
)
);
+ if($rechnung) {
+ $this->app->DB->Update(
+ sprintf(
+ 'UPDATE versand SET rechnung = %d WHERE id = %d AND rechnung = 0',
+ $rechnung, $id
+ )
+ );
+ }
}
}
- }
- $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id = '$lieferschein' LIMIT 1");
- if($lieferschein) {
+ $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id = '$lieferschein' LIMIT 1");
+ if($lieferschein) {
- $this->PDFArchivieren('lieferschein', $lieferschein, true);
- }
- $proformaPrinted = false;
- $druckennachtracking = $this->app->erp->Projektdaten($projekt,'druckennachtracking');
- if($druckennachtracking
- && !($proformarechnung = $this->app->DB->Select(
- sprintf(
- 'SELECT id FROM proformarechnung WHERE lieferschein = %d LIMIT 1',
- $lieferschein
+ $this->PDFArchivieren('lieferschein', $lieferschein, true);
+ }
+ $proformaPrinted = false;
+ $druckennachtracking = $this->app->erp->Projektdaten($projekt,'druckennachtracking');
+ if($druckennachtracking
+ && !($proformarechnung = $this->app->DB->Select(
+ sprintf(
+ 'SELECT id FROM proformarechnung WHERE lieferschein = %d LIMIT 1',
+ $lieferschein
+ )
)
- )
- )
- ) {
- /** @var Versanderzeugen $versandObj */
- $versandObj = $this->LoadModul('versanderzeugen');
- if($versandObj !== null && method_exists($versandObj, 'checkPrintCreateProformaInvoice')) {
- $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
+ )
+ ) {
+ /** @var Versanderzeugen $versandObj */
+ $versandObj = $this->LoadModul('versanderzeugen');
+ if($versandObj !== null && method_exists($versandObj, 'checkPrintCreateProformaInvoice')) {
+ $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
- if($druckercode <=0) {
- $druckercode = $this->app->erp->Firmendaten('standardversanddrucker'); // standard = 3 // 2 buchhaltung // 1 empfang
+ if($druckercode <=0) {
+ $druckercode = $this->app->erp->Firmendaten('standardversanddrucker'); // standard = 3 // 2 buchhaltung // 1 empfang
+ }
+ $userversanddrucker = $this->app->DB->Select("SELECT standardversanddrucker FROM user WHERE id='".$this->app->User->GetID()."'");
+ if($userversanddrucker>0) {
+ $druckercode = $userversanddrucker;
+ }
+ $deliveryArr = $this->app->DB->SelectRow(
+ sprintf('SELECT land FROM lieferschein WHERE id = %d', $lieferschein)
+ );
+ $country = $deliveryArr['land'];
+ $versandObj->checkPrintCreateProformaInvoice($lieferschein,$country,$projekt,$druckercode,true);
+ $proformaPrinted = $druckercode > 0;
}
- $userversanddrucker = $this->app->DB->Select("SELECT standardversanddrucker FROM user WHERE id='".$this->app->User->GetID()."'");
- if($userversanddrucker>0) {
- $druckercode = $userversanddrucker;
- }
- $deliveryArr = $this->app->DB->SelectRow(
- sprintf('SELECT land FROM lieferschein WHERE id = %d', $lieferschein)
+ }
+ if($rechnung) {
+ $this->PDFArchivieren('rechnung', $rechnung, true);
+ }
+ elseif($auftrag && $druckennachtracking
+ && $this->app->DB->Select(
+ sprintf(
+ "SELECT id FROM auftrag WHERE id = %d AND art <> 'lieferung'",
+ $auftrag
+ )
+ )
+ ) {
+ $rechnung = $this->WeiterfuehrenAuftragZuRechnung($auftrag);
+ $this->BelegFreigabe('rechnung', $rechnung);
+ $this->app->DB->Update(
+ sprintf(
+ 'UPDATE versand SET rechnung = %d WHERE id = %d LIMIT 1',
+ $rechnung, $id
+ )
);
- $country = $deliveryArr['land'];
- $versandObj->checkPrintCreateProformaInvoice($lieferschein,$country,$projekt,$druckercode,true);
- $proformaPrinted = $druckercode > 0;
+ $this->app->DB->Update(
+ sprintf(
+ "UPDATE rechnung SET schreibschutz = 1, status = 'versendet' WHERE id = %d",
+ $rechnung
+ )
+ );
+ $this->PDFArchivieren('rechnung', $rechnung, true);
}
- }
- if($rechnung) {
- $this->PDFArchivieren('rechnung', $rechnung, true);
- }
- elseif($auftrag && $druckennachtracking
- && $this->app->DB->Select(
- sprintf(
- "SELECT id FROM auftrag WHERE id = %d AND art <> 'lieferung'",
- $auftrag
- )
- )
- ) {
- $rechnung = $this->WeiterfuehrenAuftragZuRechnung($auftrag);
- $this->BelegFreigabe('rechnung', $rechnung);
- $this->app->DB->Update(
- sprintf(
- 'UPDATE versand SET rechnung = %d WHERE id = %d LIMIT 1',
- $rechnung, $id
- )
- );
- $this->app->DB->Update(
- sprintf(
- "UPDATE rechnung SET schreibschutz = 1, status = 'versendet' WHERE id = %d",
- $rechnung
- )
- );
- $this->PDFArchivieren('rechnung', $rechnung, true);
- }
- if($rechnung > 0 && $druckennachtracking
- && $this->app->DB->Select("SELECT count(id) FROM versand WHERE lieferschein = '$lieferschein'") <= 1) {
- $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
+ if($rechnung > 0 && $druckennachtracking
+ && $this->app->DB->Select("SELECT count(id) FROM versand WHERE lieferschein = '$lieferschein'") <= 1) {
+ $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
if($druckercode <=0)
$druckercode = $this->app->erp->Firmendaten("standardversanddrucker"); // standard = 3 // 2 buchhaltung // 1 empfang
@@ -15437,32 +15422,12 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
if($userversanddrucker>0)
$druckercode = $userversanddrucker;
- $this->app->erp->BriefpapierHintergrundDisable($druckercode);
+ $this->app->erp->BriefpapierHintergrundDisable($druckercode);
- $addressId = $this->app->DB->Select("SELECT `adresse` FROM `rechnung` WHERE `id` = '{$rechnung}' LIMIT 1");
- $printInvoice = $this->app->DB->Select("SELECT `rechnung_papier` FROM `adresse` WHERE `id` = '{$addressId}' LIMIT 1");
- $amountPrintedInvoices = $this->app->DB->Select("SELECT `rechnung_anzahlpapier` FROM `adresse` WHERE `id` = '{$addressId}' LIMIT 1");
- if($printInvoice === '1' && $amountPrintedInvoices > 0){
- if(class_exists('RechnungPDFCustom'))
- {
- $Brief = new RechnungPDFCustom($this->app,$projekt);
- }else{
- $Brief = new RechnungPDF($this->app,$projekt);
- }
- $Brief->GetRechnung($rechnung);
- $tmpfile = $Brief->displayTMP();
-
- for($i = 1; $i <= $amountPrintedInvoices; $i++) {
- $this->app->printer->Drucken($druckercode,$tmpfile);
- }
- } else {
- $autodruckrechnungmenge = $this->app->erp->Projektdaten($projekt,"autodruckrechnungmenge");
- $autodruckrechnung= $this->app->erp->Projektdaten($projekt,"autodruckrechnung");
-
- if($autodruckrechnungmenge < 0)$autodruckrechnungmenge = 1;
-
- if($autodruckrechnung > 0)
- {
+ $addressId = $this->app->DB->Select("SELECT `adresse` FROM `rechnung` WHERE `id` = '{$rechnung}' LIMIT 1");
+ $printInvoice = $this->app->DB->Select("SELECT `rechnung_papier` FROM `adresse` WHERE `id` = '{$addressId}' LIMIT 1");
+ $amountPrintedInvoices = $this->app->DB->Select("SELECT `rechnung_anzahlpapier` FROM `adresse` WHERE `id` = '{$addressId}' LIMIT 1");
+ if($printInvoice === '1' && $amountPrintedInvoices > 0){
if(class_exists('RechnungPDFCustom'))
{
$Brief = new RechnungPDFCustom($this->app,$projekt);
@@ -15472,88 +15437,108 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
$Brief->GetRechnung($rechnung);
$tmpfile = $Brief->displayTMP();
- for($i = 1; $i <= $autodruckrechnungmenge; $i++) {
+ for($i = 1; $i <= $amountPrintedInvoices; $i++) {
$this->app->printer->Drucken($druckercode,$tmpfile);
}
+ } else {
+ $autodruckrechnungmenge = $this->app->erp->Projektdaten($projekt,"autodruckrechnungmenge");
+ $autodruckrechnung= $this->app->erp->Projektdaten($projekt,"autodruckrechnung");
+
+ if($autodruckrechnungmenge < 0)$autodruckrechnungmenge = 1;
+
+ if($autodruckrechnung > 0)
+ {
+ if(class_exists('RechnungPDFCustom'))
+ {
+ $Brief = new RechnungPDFCustom($this->app,$projekt);
+ }else{
+ $Brief = new RechnungPDF($this->app,$projekt);
+ }
+ $Brief->GetRechnung($rechnung);
+ $tmpfile = $Brief->displayTMP();
+
+ for($i = 1; $i <= $autodruckrechnungmenge; $i++) {
+ $this->app->printer->Drucken($druckercode,$tmpfile);
+ }
+ }
}
- }
- // Print additional invoices for export
- $exportdruckrechnung = $this->app->erp->Projektdaten($projekt,"exportdruckrechnung");
- if($exportdruckrechnung)
- {
- $exportland = $this->app->DB->Select("SELECT land FROM rechnung WHERE id = '$rechnung' LIMIT 1");
- $exportdruckrechnung = $this->app->erp->Export($exportland);
+ // Print additional invoices for export
+ $exportdruckrechnung = $this->app->erp->Projektdaten($projekt,"exportdruckrechnung");
if($exportdruckrechnung)
{
- $mengedruck = $this->app->erp->Projektdaten($projekt,"exportdruckrechnungmenge");
- for($mengedruck;$mengedruck > 0;$mengedruck--)
+ $exportland = $this->app->DB->Select("SELECT land FROM rechnung WHERE id = '$rechnung' LIMIT 1");
+ $exportdruckrechnung = $this->app->erp->Export($exportland);
+ if($exportdruckrechnung)
{
- $this->app->printer->Drucken($druckercode,$tmpfile);
+ $mengedruck = $this->app->erp->Projektdaten($projekt,"exportdruckrechnungmenge");
+ for($mengedruck;$mengedruck > 0;$mengedruck--)
+ {
+ $this->app->printer->Drucken($druckercode,$tmpfile);
+ }
}
}
- }
- unlink($tmpfile);
- if($this->app->erp->Projektdaten($projekt,"automailrechnung")=="1")
- {
- // aber nur das erste mal also wenn es einen eintrag in der versand tabelle gibt
- $rechnungbereitsversendet = $this->app->DB->Select("SELECT versendet FROM rechnung WHERE id = '$rechnung' LIMIT 1");
- if($rechnungbereitsversendet!="1")
+ unlink($tmpfile);
+ if($this->app->erp->Projektdaten($projekt,"automailrechnung")=="1")
{
- $this->app->erp->Rechnungsmail($rechnung);
- }
- }
- $this->BriefpapierHintergrundEnable();
- }
-
- if($druckennachtracking && $lieferschein && $this->Export($land)
- && $this->Projektdaten($projekt, 'proformainvoice_amount') && $proformaRechnungId = $this->app->DB->Select(
- sprintf(
- "SELECT id FROM proformarechnung WHERE lieferschein = %d AND status <> 'storniert' LIMIT 1",
- $lieferschein
- ))
- ) {
- /** @var Versanderzeugen $objProforma */
- $objVersand = $this->LoadModul('versanderzeugen');
- if($objVersand && method_exists($objVersand,'checkPrintCreateProformaInvoice')){
- if(empty($druckercode)) {
- $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
-
- if($druckercode <= 0) {
- $druckercode = $this->app->erp->Firmendaten('standardversanddrucker'); // standard = 3 // 2 buchhaltung // 1 empfang
- }
- $userversanddrucker = $this->app->DB->Select("SELECT standardversanddrucker FROM user WHERE id='" . $this->app->User->GetID() . "'");
- if($userversanddrucker > 0) {
- $druckercode = $userversanddrucker;
+ // aber nur das erste mal also wenn es einen eintrag in der versand tabelle gibt
+ $rechnungbereitsversendet = $this->app->DB->Select("SELECT versendet FROM rechnung WHERE id = '$rechnung' LIMIT 1");
+ if($rechnungbereitsversendet!="1")
+ {
+ $this->app->erp->Rechnungsmail($rechnung);
}
}
- $objVersand->checkPrintCreateProformaInvoice($lieferschein, $land, $projekt, $druckercode, empty($proformaPrinted));
+ $this->BriefpapierHintergrundEnable();
}
- }
- if(!$this->app->erp->Firmendaten('versandmail_zwischenspeichern') || !$this->app->DB->Select("SELECT id FROM prozessstarter WHERE parameter = 'versandmailsundrueckmeldung' AND aktiv = 1"))
- {
- $this->VersandAbschluss($id);
- $this->RunHook('versanderzeugen_frankieren_hook1', 1, $id);
- //versand mail an kunden
- $this->Versandmail($id);
- }else{
- $this->app->DB->Update("UPDATE versand SET cronjob = 1 WHERE id = '$id' LIMIT 1");
- }
- $weiterespaket=$this->app->Secure->GetPOST("weiterespaket");
- $lieferscheinkopie=$this->app->Secure->GetPOST("lieferscheinkopie");
- if($weiterespaket=="1")
- {
- if($lieferscheinkopie=="1") $lieferscheinkopie=0; else $lieferscheinkopie=1;
- //$this->app->erp->LogFile("Lieferscheinkopie $lieferscheinkopie");
- $all = $this->app->DB->SelectArr("SELECT * FROM versand WHERE id='$id' LIMIT 1");
- $this->app->DB->Insert("INSERT INTO versand (id,adresse,rechnung,lieferschein,versandart,projekt,bearbeiter,versender,versandunternehmen,firma,
- keinetrackingmail,gelesen,paketmarkegedruckt,papieregedruckt,weitererlieferschein)
- VALUES ('','{$all[0]['adresse']}','{$all[0]['rechnung']}','{$all[0]['lieferschein']}','{$all[0]['versandart']}','{$all[0]['projekt']}',
- '{$all[0]['bearbeiter']}','{$all[0]['versender']}','{$all[0]['versandunternehmen']}',
- '{$all[0]['firma']}','{$all[0]['keinetrackingmail']}','{$all[0]['gelesen']}',0,$lieferscheinkopie,1)");
+ if($druckennachtracking && $lieferschein && $this->Export($land)
+ && $this->Projektdaten($projekt, 'proformainvoice_amount') && $proformaRechnungId = $this->app->DB->Select(
+ sprintf(
+ "SELECT id FROM proformarechnung WHERE lieferschein = %d AND status <> 'storniert' LIMIT 1",
+ $lieferschein
+ ))
+ ) {
+ /** @var Versanderzeugen $objProforma */
+ $objVersand = $this->LoadModul('versanderzeugen');
+ if($objVersand && method_exists($objVersand,'checkPrintCreateProformaInvoice')){
+ if(empty($druckercode)) {
+ $druckercode = $this->app->DB->Select("SELECT druckerlogistikstufe2 FROM projekt WHERE id='$projekt' LIMIT 1");
+
+ if($druckercode <= 0) {
+ $druckercode = $this->app->erp->Firmendaten('standardversanddrucker'); // standard = 3 // 2 buchhaltung // 1 empfang
+ }
+ $userversanddrucker = $this->app->DB->Select("SELECT standardversanddrucker FROM user WHERE id='" . $this->app->User->GetID() . "'");
+ if($userversanddrucker > 0) {
+ $druckercode = $userversanddrucker;
+ }
+ }
+ $objVersand->checkPrintCreateProformaInvoice($lieferschein, $land, $projekt, $druckercode, empty($proformaPrinted));
+ }
+ }
+
+ if(!$this->app->erp->Firmendaten('versandmail_zwischenspeichern') || !$this->app->DB->Select("SELECT id FROM prozessstarter WHERE parameter = 'versandmailsundrueckmeldung' AND aktiv = 1"))
+ {
+ $this->VersandAbschluss($id);
+ $this->RunHook('versanderzeugen_frankieren_hook1', 1, $id);
+ //versand mail an kunden
+ $this->Versandmail($id);
+ }else{
+ $this->app->DB->Update("UPDATE versand SET cronjob = 1 WHERE id = '$id' LIMIT 1");
+ }
+ $weiterespaket=$this->app->Secure->GetPOST("weiterespaket");
+ $lieferscheinkopie=$this->app->Secure->GetPOST("lieferscheinkopie");
+ if($weiterespaket=="1")
+ {
+ if($lieferscheinkopie=="1") $lieferscheinkopie=0; else $lieferscheinkopie=1;
+ //$this->app->erp->LogFile("Lieferscheinkopie $lieferscheinkopie");
+ $all = $this->app->DB->SelectArr("SELECT * FROM versand WHERE id='$id' LIMIT 1");
+ $this->app->DB->Insert("INSERT INTO versand (id,adresse,rechnung,lieferschein,versandart,projekt,bearbeiter,versender,versandunternehmen,firma,
+ keinetrackingmail,gelesen,paketmarkegedruckt,papieregedruckt,weitererlieferschein)
+ VALUES ('','{$all[0]['adresse']}','{$all[0]['rechnung']}','{$all[0]['lieferschein']}','{$all[0]['versandart']}','{$all[0]['projekt']}',
+ '{$all[0]['bearbeiter']}','{$all[0]['versender']}','{$all[0]['versandunternehmen']}',
+ '{$all[0]['firma']}','{$all[0]['keinetrackingmail']}','{$all[0]['gelesen']}',0,$lieferscheinkopie,1)");
$newid = $this->app->DB->GetInsertID();
@@ -15591,7 +15576,7 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
$this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking,
versendet_am,abgeschlossen,retoure,
freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
- VALUES ('','$versand','$tracking',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."','$adresse','$projekt','$kg','1','1') ");
+ VALUES ('','$versand','$tracking',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."','$adresse','$projekt','$kg','1','1') ");
$versandid = $this->app->DB->GetInsertID();
if($this->app->DB->Select("SELECT automailversandbestaetigung FROM projekt WHERE id = '$projekt' LIMIT 1"))$this->Versandmail($versandid);
@@ -15620,23 +15605,6 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
if($kg=="") {
$kg = $this->VersandartMindestgewicht($id);
}
-/*
- //Brauchen wir nicht
- $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul,bezeichnung FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND type = '".$this->app->DB->real_escape_string($versand)."' AND modul != '' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
- if($versandartenmodul && @is_file(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
- {
- $class_name = 'Versandart_'.$versandartenmodul[0]['modul'];
- if(!class_exists($class_name))include_once(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php');
- if(class_exists($class_name))
- {
- $obj = new $class_name($this->app, $versandartenmodul[0]['id']);
- if(method_exists($obj, 'TrackingReplace')){
- $tracking = $obj->TrackingReplace($tracking);
- }
- }
- }
-*/
-
$trackingUser = !empty($this->app->User) && method_exists($this->app->User,'GetParameter')?
$this->app->User->GetParameter('versand_lasttracking'):'';
@@ -15647,9 +15615,9 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
$this->app->User->SetParameter('versand_lasttracking_lieferschein', '');
}
- $this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking, tracking_link,
- versendet_am,abgeschlossen,lieferschein,
- freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
+ $this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking, tracking_link,
+ versendet_am,abgeschlossen,lieferschein,
+ freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
VALUES ('','$versand','$tracking', '{$trackingLink}',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."','$adresse','$projekt','$kg','1','1') ");
$versandid = $this->app->DB->GetInsertID();
@@ -15670,8 +15638,7 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
'SELECT zahlweise FROM rechnung WHERE id = %d', $rechnung
)
);
- }
- else{
+ } else {
$rechnung_projekt = $this->app->DB->Select(
sprintf(
'SELECT projekt FROM auftrag WHERE id = %d', $auftrag
@@ -15806,176 +15773,17 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
if($kg=="") $kg=$this->VersandartMindestgewicht($lieferschein);
- //$versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul FROM versanddienstleister WHERE aktiv = 1 AND modul = '".$this->app->DB->real_escape_string($typ)."' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
- $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul,bezeichnung, einstellungen_json FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND type = '".$this->app->DB->real_escape_string($typ)."' AND modul != '' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
- if($versandartenmodul && @is_file(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
- {
- $obj = $this->LoadVersandModul($versandartenmodul[0]['modul'], $versandartenmodul[0]['id']);
- $this->app->Tpl->Set("ZUSATZ",$versandartenmodul[0]['bezeichnung']);
-
- if(!empty($obj) && method_exists($obj, 'Paketmarke'))
+ $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul,bezeichnung, einstellungen_json FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND type = '".$this->app->DB->real_escape_string($typ)."' AND modul != '' AND (projekt = 0 OR projekt = '$projekt') ORDER BY projekt DESC LIMIT 1");
+ if($versandartenmodul && @is_file(dirname(__FILE__).'/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
{
- $error = $obj->Paketmarke($sid!=''?$sid:'lieferschein',$id);
- }else $error[] = 'Versandmodul '.$typ.' fehlerhaft!';
- }else{
- switch($typ)
- {
- case "DHL":
- if($nachnahme=="" && $versichert=="" && $extraversichert=="")
- {
- $this->EasylogPaketmarkeStandard($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg);
- } else if ($nachnahme=="1" && $versichert=="" && $extraversichert=="")
- {
- $this->EasylogPaketmarkeNachnahme($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer);
- } else if ($versichert=="1" && $extraversichert=="" && $nachnahme=="")
- {
- $this->EasylogPaketmarke2500($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg);
- } else if ($versichert=="1" && $extraversichert=="" && $nachnahme=="1")
- {
- $this->EasylogPaketmarkeNachnahme2500($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer);
- } else if ($versichert=="" && $extraversichert=="1" && $nachnahme=="1")
- {
- $this->EasylogPaketmarkeNachnahme25000($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer);
- } else if ($extraversichert=="1" && $versichert=="" && $nachnahme=="")
- {
- $this->EasylogPaketmarke25000($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg);
- }
- break;
- case "Intraship":
- $kg = (float)str_replace(',','.',$kg);
+ $obj = $this->LoadVersandModul($versandartenmodul[0]['modul'], $versandartenmodul[0]['id']);
+ $this->app->Tpl->Set("ZUSATZ",$versandartenmodul[0]['bezeichnung']);
- $abholdatum = $this->app->Secure->GetPOST("abholdatum");
- $retourenlabel= $this->app->Secure->GetPOST("retourenlabel");
- if($retourenlabel)
- {
- $this->app->Tpl->Set('RETOURENLABEL', ' checked="checked" ');
- $zusaetzlich['retourenlabel'] = 1;
- }
- if($abholdatum){
- $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
- $zusaetzlich['abholdatum'] = date('Y-m-d', strtotime($abholdatum));
- $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
- }
- if($altersfreigabe)$zusaetzlich['altersfreigabe'] = 1;
- if($nachnahme=="1")
- $error = $this->IntrashipPaketmarkeNachnahme($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer,$zusaetzlich);
- else
- $error = $this->IntrashipPaketmarkeStandard($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,"",$rechnungsnummer,$zusaetzlich);
- break;
- case "UPS":
- $error = $this->UPSPaketmarke($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer);
- break;
- case "FEDEX":
- $error = $this->FEDEXPaketmarke($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer);
- break;
- case 'Go':
- if($name && $strasse && $plz && $ort && (($hausnummer && (!$land || $land == 'DE') || ($land && $land != 'DE'))))
- {
- $kg = $this->app->Secure->GetPOST("kg");
- if($kg=="") $kg=$this->VersandartMindestgewicht($lieferschein);
- $kg = str_replace(',','.',$kg);
- $frei = $this->app->Secure->GetPOST("frei")==1?1:0;
- $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein where id = ".(int)$lieferschein." limit 1");
-
- if($frei){
- $this->app->Tpl->Set('FREI',' checked="checked" ');
- $zusaetzlich['frei'] = 1;
- }
- $selbstabholung = $this->app->Secure->GetPOST("selbstabholung");
- if($selbstabholung){
- $this->app->Tpl->Set('SELBSTABHOLUNG',' checked="checked" ');
- $zusaetzlich['selbstabholung'] = 1;
- }
- $landesvorwahl = $this->app->Secure->GetPOST("landesvorwahl");
- if($landesvorwahl){
- $this->app->Tpl->Set('LANDESVORWAHL',$landesvorwahl);
- $zusaetzlich['landesvorwahl'] = $landesvorwahl;
- }
- $ortsvorwahl = $this->app->Secure->GetPOST("ortsvorwahl");
- if($ortsvorwahl){
- $this->app->Tpl->Set('ORTSVORWAHL',$ortsvorwahl);
- $zusaetzlich['ortsvorwahl'] = $ortsvorwahl;
- }
- if($telefon)
- {
- $this->app->Tpl->Set('TELEFON',$telefon);
- $zusaetzlich['telefon'] = $telefon;
- }
- if($email)
- {
- $this->app->Tpl->Set('EMAIL',trim($email));
- $zusaetzlich['email'] = trim($email);
- }
-
-
- $selbstanlieferung = $this->app->Secure->GetPOST("selbstanlieferung");
- if($selbstanlieferung){
- $this->app->Tpl->Set('SELBSTANLIEFERUNG',' checked="checked" ');
- $zusaetzlich['selbstanlieferung'] = 1;
- }
- $abholdatum = $this->app->Secure->GetPOST("abholdatum");
- if($abholdatum){
- $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
- $zusaetzlich['abholdatum'] = $abholdatum;
- $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
- }
- $zustelldatum = $this->app->Secure->GetPOST("zustelldatum");
- if(!$zustelldatum)
- {
- //$zustelldatum = $this->app->DB->Select("SELECT lieferdatum FROM rechnung where id = ".(int)$rechnungid." and lieferdatum > now() limit 1");
- $zustelldatum = $this->app->DB->Select("SELECT lieferdatum FROM auftrag where id = ".(int)$auftragid." limit 1");
- }
- if($zustelldatum){
- $this->app->Tpl->Set('ZUSTELLDATUM',$zustelldatum);
- $zusaetzlich['zustelldatum'] = $zustelldatum;
- }
-
- if(!$abholdatum)
- {
- //$abholdatum = $this->app->DB->Select("SELECT tatsaechlicheslieferdatum FROM rechnung where id = ".(int)$rechnungid." and tatsaechlicheslieferdatum > now() limit 1");
- $abholdatum = $this->app->DB->Select("SELECT date_format(now(),'%d.%m.%Y')");
- /*if(!$abholdatum)
- {
- $projekt = $this->app->DB->Select("SELECT projekt FROM auftrag WHERE id='$auftragid' LIMIT 1");
- $differenztage = $this->Projektdaten($projekt,"differenz_auslieferung_tage");
- if($differenztage<0) $differenztage=2;
- $abholdatum = $this->app->DB->Select("SELECT DATE_SUB(lieferdatum, INTERVAL $differenztage DAY) from auftrag WHERE id='$auftragid' and DATE_SUB(lieferdatum, INTERVAL $differenztage DAY) > now() LIMIT 1");
- }*/
- if($abholdatum)
- {
- $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
- $zusaetzlich['abholdatum'] = $abholdatum;
- $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
- }
- }
-
-
- $Zustellhinweise = $this->app->Secure->GetPOST("Zustellhinweise");
- if($Zustellhinweise){
- $this->app->Tpl->Set('ZUSTELLHINWEISE',$Zustellhinweise);
- $zusaetzlich['Zustellhinweise'] = $Zustellhinweise;
- }
- $Abholhinweise = $this->app->Secure->GetPOST("Abholhinweise");
- if($Abholhinweise){
- $this->app->Tpl->Set('ABHOLHINWEISE',$Abholhinweise);
- $zusaetzlich['Abholhinweise'] = $Abholhinweise;
- }
-
-
- if($anzahl)$zusaetzlich['menge'] = $anzahl;
- $inhalt = $this->app->Secure->GetPOST("inhalt");
- if($inhalt){
- $this->app->Tpl->Set('INHALT',$inhalt);
- $zusaetzlich['inhalt'] = $inhalt;
- }
- if(isset($nachnahme))$zusaetzlich['nachnahme'] = $nachnahme;
- $this->GoPaketmarke($id,$name,$name2,$name3,$strasse,$hausnummer,$plz,$ort,$land,$kg,$betrag,$rechnungsnummer, $zusaetzlich);
- } else header("Location: index.php?module=lieferschein&action=paketmarke&id=$id");
- break;
-
- }
+ if(!empty($obj) && method_exists($obj, 'Paketmarke'))
+ {
+ $error = $obj->Paketmarke($sid!=''?$sid:'lieferschein',$id);
+ }else $error[] = 'Versandmodul '.$typ.' fehlerhaft!';
}
-
if(!isset($error) || !$error)$this->app->DB->Update("UPDATE versand SET gewicht='$kg',paketmarkegedruckt=1,anzahlpakete='$anzahl' WHERE id='$id' LIMIT 1");
}
if(!$error)
@@ -16008,8 +15816,7 @@ function Paketmarke($parsetarget,$sid="",$zusatz="",$typ="DHL")
break;
}
- $this->app->DB->Insert("INSERT INTO versandpakete (id,versand,gewicht,nr,versender) VALUES ('','$id','$kg','$anzahli','".$this->app->User->GetName()."')");
- }
+ $this->app->DB->Insert("INSERT INTO versandpakete (id,versand,gewicht,nr,versender) VALUES ('','$id','$kg','$anzahli','".$this->app->User->GetName()."')"); }
}
@@ -29436,11 +29243,23 @@ function Firmendaten($field,$projekt="")
$process_lock = $this->app->erp->ProzessLock("erpapi_getnextnummer");
- $eigenernummernkreis = 0;
+ $eigenernummernkreis = $this->app->DB->Select("SELECT eigenernummernkreis FROM projekt WHERE id='$projekt' LIMIT 1");
+ $belegnr = '';
if($eigenernummernkreis=='1')
{
+ $allowedtypes = ['angebot', 'auftrag', 'rechnung', 'lieferschein', 'arbeitsnachweis', 'reisekosten',
+ 'bestellung', 'gutschrift', 'kundennummer', 'lieferantennummer', 'mitarbeiternummer', 'waren',
+ 'produktion', 'sonstiges', 'anfrage', 'artikelnummer', 'kalkulation', 'preisanfrage', 'proformarechnung',
+ 'retoure', 'verbindlichkeit', 'goodspostingdocument', 'receiptdocument'];
- } else {
+ $dbfield = "next_$type";
+ $belegnr = $this->app->DB->Select("SELECT $dbfield FROM projekt WHERE id='$projekt' LIMIT 1");
+ if (!empty($belegnr)) {
+ $newbelegnr = $this->CalcNextNummer($belegnr);
+ $this->app->DB->Update("UPDATE projekt SET $dbfield='$newbelegnr' WHERE id='$projekt' LIMIT 1");
+ }
+ }
+ if (empty($belegnr)) {
// naechste
switch($type)
{
diff --git a/www/lib/class.remote.php b/www/lib/class.remote.php
index 8fa23b2c..9dbfd069 100644
--- a/www/lib/class.remote.php
+++ b/www/lib/class.remote.php
@@ -1,4 +1,11 @@
-
+*/
+?>
app->erp->CreateDatei($path_parts['basename'], 'Shopbild', '', '', base64_decode($v['content']), 'Cronjob');
+ $tmpfilename = tempnam($this->app->erp->GetTMP(), 'img');
+ file_put_contents($tmpfilename, base64_decode($v['content']));
+ $fileid = $this->app->erp->CreateDatei($path_parts['basename'], 'Shopbild', '', '', $tmpfilename, 'Cronjob');
$this->app->erp->AddDateiStichwort($fileid, 'Shopbild', 'artikel', $articleid);
+ if (@is_file($tmpfilename))
+ unlink($tmpfilename);
}
}
}elseif($dateien[0]['subjekt'] === 'shopbild'){
@@ -766,12 +777,16 @@ class Remote
if($v['path'] != '' && $v['content'] != '')
{
$path_parts = pathinfo($v['path']);
- $fileid = $this->app->erp->CreateDatei($path_parts['basename'], 'Shopbild', '', '', base64_decode($v['content']), 'Cronjob');
+ $tmpfilename = tempnam($this->app->erp->GetTMP(), 'img');
+ file_put_contents($tmpfilename, base64_decode($v['content']));
+ $fileid = $this->app->erp->CreateDatei($path_parts['basename'], 'Shopbild', '', '', $tmpfilename, 'Cronjob');
if(isset($v['id']))
{
$this->ShopexportMappingSet($id, 'datei', $fileid, $v['id'], $articleid);
}
$this->app->erp->AddDateiStichwort($fileid, 'Shopbild', 'artikel', $articleid);
+ if (@is_file($tmpfilename))
+ unlink($tmpfilename);
}
}
}
diff --git a/www/lib/class.versanddienstleister.php b/www/lib/class.versanddienstleister.php
index 9ebae57e..e2e5afcd 100644
--- a/www/lib/class.versanddienstleister.php
+++ b/www/lib/class.versanddienstleister.php
@@ -1,371 +1,324 @@
-app = $app;
+ if ($id === null || $id === 0)
+ return;
+ $this->id = $id;
+ $row = $this->app->DB->SelectRow("SELECT * FROM versandarten WHERE id=$this->id");
+ $this->type = $row['type'];
+ $this->projectId = $row['projekt'];
+ $this->labelPrinterId = $row['paketmarke_drucker'];
+ $this->documentPrinterId = $row['export_drucker'];
+ $this->shippingMail = $row['versandmail'];
+ $this->businessLetterTemplateId = $row['geschaeftsbrief_vorlage'];
+ $this->settings = json_decode($row['einstellungen_json']);
+ }
- if($sid==='versand')
- {
- $tid = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
- $rechnung = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id='$id' LIMIT 1");
+ public function isEtikettenDrucker(): bool
+ {
+ return false;
+ }
+
+ public abstract function GetName(): string;
+
+ public function GetAdressdaten($id, $sid): array
+ {
+ $auftragId = $lieferscheinId = $rechnungId = $versandId = 0;
+ if ($sid === 'rechnung')
+ $rechnungId = $id;
+ if ($sid === 'lieferschein') {
+ $lieferscheinId = $id;
+ $auftragId = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id=$lieferscheinId LIMIT 1");
+ $rechnungId = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein = '$lieferscheinId' LIMIT 1");
+ if ($rechnungId <= 0)
+ $rechnungId = $this->app->DB->Select("SELECT rechnungid FROM lieferschein WHERE id='$lieferscheinId' LIMIT 1");
+ }
+ if ($sid === 'versand') {
+ $versandId = $id;
+ $lieferscheinId = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$versandId' LIMIT 1");
+ $rechnungId = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id='$versandId' LIMIT 1");
$sid = 'lieferschein';
- } else {
- $tid = $id;
- if($sid === 'lieferschein'){
- $rechnung = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein = '$tid' LIMIT 1");
- }
- if($rechnung<=0) {
- $rechnung = $this->app->DB->Select("SELECT rechnungid FROM lieferschein WHERE id='$tid' LIMIT 1");
- }
- }
- $ret['tid'] = $tid;
- $ret['rechnung'] = $rechnung;
-
- if($rechnung){
- $artikel_positionen = $this->app->DB->SelectArr("SELECT * FROM rechnung_position WHERE rechnung='$rechnung'");
- } else {
- $artikel_positionen = $this->app->DB->SelectArr(sprintf('SELECT * FROM `%s` WHERE `%s` = %d',$sid.'_position',$sid,$tid));
}
- if($sid==='rechnung' || $sid==='lieferschein' || $sid==='adresse')
- {
- $docArr = $this->app->DB->SelectRow(sprintf('SELECT * FROM `%s` WHERE id = %d LIMIT 1',$sid, $tid));
+ if ($auftragId <= 0 && $rechnungId > 0)
+ $auftragId = $this->app->DB->Select("SELECT auftragid FROM rechnung WHERE id=$rechnungId LIMIT 1");
- $name = trim($docArr['name']);//trim($this->app->DB->Select("SELECT name FROM $sid WHERE id='$tid' LIMIT 1"));
- $name2 = trim($docArr['adresszusatz']);//trim($this->app->DB->Select("SELECT adresszusatz FROM $sid WHERE id='$tid' LIMIT 1"));
- $abt = 0;
- if($name2==='')
- {
- $name2 = trim($docArr['abteilung']);//trim($this->app->DB->Select("SELECT abteilung FROM $sid WHERE id='$tid' LIMIT 1"));
- $abt=1;
- }
- $name3 = trim($docArr['ansprechpartner']);//trim($this->app->DB->Select("SELECT ansprechpartner FROM $sid WHERE id='$tid' LIMIT 1"));
- if($name3==='' && $abt!==1){
- $name3 = trim($docArr['abteilung']);//trim($this->app->DB->Select("SELECT abteilung FROM $sid WHERE id='$tid' LIMIT 1"));
- }
+ if ($sid === 'rechnung' || $sid === 'lieferschein' || $sid === 'adresse') {
+ $docArr = $this->app->DB->SelectRow("SELECT * FROM `$sid` WHERE id = $id LIMIT 1");
+ $ret['addressId'] = $docArr['adresse'];
+ $ret['auftragId'] = $auftragId;
+ $ret['rechnungId'] = $rechnungId;
+ $ret['lieferscheinId'] = $lieferscheinId;
- //unterabteilung versuchen einzublenden
- if($name2==='') {
- $name2 = trim($docArr['unterabteilung']);//trim($this->app->DB->Select("SELECT unterabteilung FROM $sid WHERE id='$tid' LIMIT 1"));
- } else if ($name3==='') {
- $name3 = trim($docArr['unterabteilung']);//trim($this->app->DB->Select("SELECT unterabteilung FROM $sid WHERE id='$tid' LIMIT 1"));
- }
+ $addressfields = ['name', 'adresszusatz', 'abteilung', 'ansprechpartner', 'unterabteilung', 'ort', 'plz',
+ 'strasse', 'land'];
+ $ret['original'] = array_filter($docArr, fn($key) => in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
- if($name3!=='' && $name2==='') {
- $name2=$name3;
- $name3='';
- }
+ $ret['name'] = empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : trim($docArr['ansprechpartner']);
+ $ret['name2'] = !empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : '';
+ $ret['name3'] = join(';', array_filter([
+ $docArr['abteilung'],
+ $docArr['unterabteilung']
+ ], fn(string $item) => !empty(trim($item))));
+ $ret['address2'] = $docArr['adresszusatz'];
- $ort = trim($docArr['ort']);//trim($this->app->DB->Select("SELECT ort FROM $sid WHERE id='$tid' LIMIT 1"));
- $plz = trim($docArr['plz']);//trim($this->app->DB->Select("SELECT plz FROM $sid WHERE id='$tid' LIMIT 1"));
- $land = trim($docArr['land']);//trim($this->app->DB->Select("SELECT land FROM $sid WHERE id='$tid' LIMIT 1"));
- $strasse = trim($docArr['strasse']);//trim($this->app->DB->Select("SELECT strasse FROM $sid WHERE id='$tid' LIMIT 1"));
- $strassekomplett = $strasse;
+ $ret['city'] = $docArr['ort'];
+ $ret['zip'] = $docArr['plz'];
+ $ret['country'] = $docArr['land'];
+ $ret['phone'] = $docArr['telefon'];
+ $ret['email'] = $docArr['email'];
+ $ret['addresstype'] = 0;
+
+ $strasse = trim($docArr['strasse']);
+ $ret['streetwithnumber'] = $strasse;
$hausnummer = trim($this->app->erp->ExtractStreetnumber($strasse));
+ $strasse = trim(str_replace($hausnummer, '', $strasse));
+ $strasse = str_replace('.', '', $strasse);
- $strasse = trim(str_replace($hausnummer,'',$strasse));
- $strasse = str_replace('.','',$strasse);
-
- if($strasse=='')
- {
+ if ($strasse == '') {
$strasse = trim($hausnummer);
$hausnummer = '';
}
- $telefon = trim($docArr['telefon']);//trim($this->app->DB->Select("SELECT telefon FROM $sid WHERE id='$tid' LIMIT 1"));
- $email = trim($docArr['email']);//trim($this->app->DB->Select("SELECT email FROM $sid WHERE id='$tid' LIMIT 1"));
+ $ret['street'] = $strasse;
+ $ret['streetnumber'] = $hausnummer;
+ if (str_contains($docArr['strasse'], 'Packstation')) {
+ $ret['addresstype'] = 1;
+ $ret['parcelstationNumber'] = $hausnummer;
+ } else if (str_contains($docArr['strasse'], 'Postfiliale')) {
+ $ret['addresstype'] = 2;
+ $ret['postofficeNumber'] = $hausnummer;
+ }
+
+ $tmp = join(' ', [$docArr['ansprechpartner'], $docArr['abteilung'], $docArr['unterabteilung']]);
+ if (preg_match("/\d{6,10}/", $tmp, $match)) {
+ $ret['postnumber'] = $match[0];
+ }
+
+ if ($auftragId > 0) {
+ $internet = $this->app->DB->Select("SELECT internet FROM auftrag WHERE id = $auftragId LIMIT 1");
+ if (!empty($internet))
+ $orderNumberParts[] = $internet;
+ }
+ if (!empty($docArr['ihrebestellnummer'])) {
+ $orderNumberParts[] = $docArr['ihrebestellnummer'];
+ }
+ $orderNumberParts[] = $docArr['belegnr'];
+ $ret['order_number'] = implode(' / ', $orderNumberParts);
}
+
// wenn rechnung im spiel entweder durch versand oder direkt rechnung
- if($rechnung >0)
- {
- $zahlungsweise = $this->app->DB->Select("SELECT zahlungsweise FROM rechnung WHERE id='$rechnung' LIMIT 1");
- $soll = $this->app->DB->Select("SELECT soll FROM rechnung WHERE id='$rechnung' LIMIT 1");
+ if ($rechnungId > 0) {
+ $invoice_data = $this->app->DB->SelectRow("SELECT zahlungsweise, soll, belegnr FROM rechnung WHERE id='$rechnungId' LIMIT 1");
+ $ret['zahlungsweise'] = $invoice_data['zahlungsweise'];
+ $ret['betrag'] = $invoice_data['soll'];
+ $ret['invoice_number'] = $invoice_data['belegnr'];
- if($zahlungsweise==='nachnahme'){
- $nachnahme = true;
- }
-
- if($soll >= 500 && $soll <= 2500){
- $versichert = true;
- }
-
- if($soll > 2500) {
- $extraversichert = true;
+ if ($invoice_data['zahlungsweise'] === 'nachnahme') {
+ $ret['nachnahme'] = true;
}
}
- if(isset($frei))$ret['frei'] = $frei;
- if(isset($inhalt))$ret['inhalt'] = $inhalt;
- if(isset($keinealtersabfrage))$ret['keinealtersabfrage'] = $keinealtersabfrage;
- if(isset($altersfreigabe))$ret['altersfreigabe'] = $altersfreigabe;
- if(isset($zahlungsweise))$ret['zahlungsweise'] = $zahlungsweise;
- if(isset($versichert))$ret['versichert'] = $versichert;
- if(isset($soll))$ret['betrag'] = $soll;
- if(isset($extraversichert))$ret['extraversichert'] = $extraversichert;
- if(isset($nachnahme))$ret['nachnahme'] = $nachnahme;
- $ret['name'] = $name;
- $ret['name2'] = $name2;
- $ret['name3'] = $name3;
- $ret['ort'] = $ort;
- $ret['plz'] = $plz;
- $ret['strasse'] = $strasse;
- $ret['strassekomplett'] = $strassekomplett;
- $ret['hausnummer'] = $hausnummer;
- $ret['land'] = $land;
- $ret['telefon'] = $telefon;
- $ret['phone'] = $telefon;
- $ret['email'] = trim($email," \t\n\r\0\x0B\xc2\xa0");
+ $sql = "SELECT
+ lp.bezeichnung,
+ lp.menge,
+ coalesce(nullif(lp.zolltarifnummer, '0'), nullif(rp.zolltarifnummer, '0'), nullif(a.zolltarifnummer, '')) as zolltarifnummer,
+ coalesce(nullif(lp.herkunftsland, '0'), nullif(rp.herkunftsland, '0'), nullif(a.herkunftsland, '')) as herkunftsland,
+ coalesce(nullif(lp.zolleinzelwert, '0'), rp.preis *(1-rp.rabatt/100), 0) as zolleinzelwert,
+ coalesce(nullif(lp.zolleinzelgewicht, 0), a.gewicht) as zolleinzelgewicht,
+ lp.zollwaehrung
+ FROM lieferschein_position lp
+ JOIN artikel a on lp.artikel = a.id
+ LEFT JOIN auftrag_position ap on lp.auftrag_position_id = ap.id
+ LEFT JOIN rechnung_position rp on ap.id = rp.auftrag_position_id
+ LEFT JOIN rechnung r on rp.rechnung = r.id
+ WHERE lp.lieferschein = $lieferscheinId
+ AND a.lagerartikel = 1
+ AND r.status != 'storniert'
+ ORDER BY lp.sort";
+ $ret['positions'] = $this->app->DB->SelectArr($sql);
- $check_date = $this->app->DB->Select("SELECT date_format(now(),'%Y-%m-%d')");
-
- $ret['abholdaumt'] = date('d.m.Y', strtotime($check_date));
-
- $anzahl = $this->app->Secure->GetGET("anzahl");
-
- if($anzahl <= 0)
- {
- $anzahl=1;
- }
-
- if($sid==="lieferschein"){
- $standardkg = $this->app->erp->VersandartMindestgewicht($tid);
- }
- else{
+ if ($sid === "lieferschein") {
+ $standardkg = $this->app->erp->VersandartMindestgewicht($lieferscheinId);
+ } else {
$standardkg = $this->app->erp->VersandartMindestgewicht();
}
- //$this->app->erp->PaketmarkeGewichtForm($anzahl, $standardkg, $this->VersandartMindestgewicht());
- $ret['standardkg'] = $standardkg;
- $ret['anzahl'] = $anzahl;
+ $ret['weight'] = $standardkg;
return $ret;
}
/**
- * @param string $target
+ * Returns an array of additional field definitions to be stored for this module:
+ * [
+ * 'field_name' => [
+ * 'typ' => text(default)|textarea|checkbox|select
+ * 'default' => default value
+ * 'optionen' => just for selects [key=>value]
+ * 'size' => size attribute for text fields
+ * 'placeholder' => placeholder attribute for text fields
+ * ]
+ * ]
*
- * @return string
+ * @return array
*/
- public function Einstellungen($target = 'return')
+ public function AdditionalSettings(): array
{
- if(!$this->id)
- {
- return '';
- }
- //$id = $this->id;
- $struktur = $this->EinstellungenStruktur();
- if($this->app->Secure->GetPOST('speichern'))
- {
- $json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '".$this->id."' LIMIT 1");
- $modul = $this->app->DB->Select("SELECT modul FROM versandarten WHERE id = '".$this->id."' LIMIT 1");
- if(!empty($json))
- {
+ return [];
+ }
+
+ /**
+ * Renders all additional settings as fields into $target
+ * @param string $target template placeholder for rendered output
+ * @param array $form data for form values (from database or form submit)
+ * @return void
+ */
+ public function RenderAdditionalSettings(string $target, array $form): void
+ {
+ $fields = $this->AdditionalSettings();
+ if ($this->app->Secure->GetPOST('speichern')) {
+ $json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '" . $this->id . "' LIMIT 1");
+ $modul = $this->app->DB->Select("SELECT modul FROM versandarten WHERE id = '" . $this->id . "' LIMIT 1");
+ if (!empty($json)) {
$json = @json_decode($json, true);
- }else{
+ } else {
$json = array();
- foreach($struktur as $name => $val)
- {
- if(isset($val['default']))
- {
+ foreach ($fields as $name => $val) {
+ if (isset($val['default'])) {
$json[$name] = $val['default'];
}
}
}
- if(empty($json))
- {
+ if (empty($json)) {
$json = null;
}
- foreach($struktur as $name => $val)
- {
+ foreach ($fields as $name => $val) {
- if($modul === $this->app->Secure->GetPOST('modul_name'))
- {
- $json[$name] = $this->app->Secure->GetPOST($name, '','', 1);
+ if ($modul === $this->app->Secure->GetPOST('modul_name')) {
+ $json[$name] = $this->app->Secure->GetPOST($name, '', '', 1);
}
-
- if(isset($val['replace']))
- {
- switch($val['replace'])
- {
+
+ if (isset($val['replace'])) {
+ switch ($val['replace']) {
case 'lieferantennummer':
- $json[$name] = $this->app->erp->ReplaceLieferantennummer(1,$json[$name],1);
- break;
+ $json[$name] = $this->app->erp->ReplaceLieferantennummer(1, $json[$name], 1);
+ break;
}
}
}
$json_str = $this->app->DB->real_escape_string(json_encode($json));
- $this->app->DB->Update("UPDATE versandarten SET einstellungen_json = '$json_str' WHERE id = '".$this->id."' LIMIT 1");
+ $this->app->DB->Update("UPDATE versandarten SET einstellungen_json = '$json_str' WHERE id = '" . $this->id . "' LIMIT 1");
}
- $id = $this->id;
$html = '';
-
- $json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '$id' LIMIT 1");
- if($json)
- {
- $json = json_decode($json, true);
- }else{
- $json = null;
- }
- $changed = false;
- foreach($struktur as $name => $val)
+ foreach ($fields as $name => $val) // set missing default values
{
- if(isset($val['default']) && !isset($json[$name]))
- {
- $changed = true;
- $json[$name] = $val['default'];
+ if (isset($val['default']) && !isset($form[$name])) {
+ $form[$name] = $val['default'];
}
}
- if($changed)
- {
- $json_str = $this->app->DB->real_escape_string(json_encode($json));
- $this->app->DB->Update("UPDATE versandarten SET einstellungen_json = '$json_str' WHERE id = '".$this->id."' LIMIT 1");
- }
- $first = true;
- foreach($struktur as $name => $val)
- {
- if(isset($val['heading']))
- {
- $html .= ''.html_entity_decode($val['heading']).' '.($first?' ';
- $typ = 'text';
- if(!empty($val['typ']))
- {
- $typ = $val['typ'];
- }
- if(isset($val['replace']))
- {
- switch($val['replace'])
- {
+ foreach ($fields as $name => $val) {
+ if (isset($val['heading']))
+ $html .= ' ' . html_entity_decode($val['heading']) . ' ' . ($val['bezeichnung'] ?? $name) . ' ';
+ if (isset($val['replace'])) {
+ switch ($val['replace']) {
case 'lieferantennummer':
- $json[$name] = $this->app->erp->ReplaceLieferantennummer(0,$json[$name],0);
- if($target !== 'return')
- {
- $this->app->YUI->AutoComplete($name, 'lieferant', 1);
- }
- break;
+ $form[$name] = $this->app->erp->ReplaceLieferantennummer(0, $form[$name], 0);
+ $this->app->YUI->AutoComplete($name, 'lieferant', 1);
+ break;
case 'shop':
- $json[$name] .= ($json[$name]?' '.$this->app->DB->Select("SELECT bezeichnung FROM shopexport WHERE id = '".(int)$json[$name]."'"):'');
- if($target !== 'return')
- {
- $this->app->YUI->AutoComplete($name, 'shopnameid');
- }
- break;
+ $form[$name] .= ($form[$name] ? ' ' . $this->app->DB->Select("SELECT bezeichnung FROM shopexport WHERE id = '" . (int)$form[$name] . "'") : '');
+ $this->app->YUI->AutoComplete($name, 'shopnameid');
+ break;
case 'etiketten':
- //$json[$name] = $this->app->erp->ReplaceLieferantennummer(0,$json[$name],0);
- if($target !== 'return')
- {
- $this->app->YUI->AutoComplete($name, 'etiketten');
- }
- break;
-
+ $this->app->YUI->AutoComplete($name, 'etiketten');
+ break;
}
}
- /*if(!isset($json[$name]) && isset($val['default']))
- {
- $json[$name] = $val['default'];
- }*/
- switch($typ)
- {
+ switch ($val['typ'] ?? 'text') {
case 'textarea':
- $html .= '';
- break;
+ $html .= '';
+ break;
case 'checkbox':
- $html .= '';
- if(isset($val['optionen']) && is_array($val['optionen']))
- {
- foreach($val['optionen'] as $k => $v)
- {
- $html .= ''.$v.' ';
- }
- }
- $html .= ' ';
- break;
+ $html .= $this->app->Tpl->addSelect('return', $name, $name, $val['optionen'], $form[$name]);
+ break;
case 'submit':
- if(isset($val['text']))
- {
- $html .= '';
- }
- break;
+ if (isset($val['text']))
+ $html .= '';
+ break;
case 'custom':
- if(isset($val['function']))
- {
+ if (isset($val['function'])) {
$tmpfunction = $val['function'];
- if(method_exists($this, $tmpfunction))
- {
+ if (method_exists($this, $tmpfunction)) {
$html .= $this->$tmpfunction();
}
}
- break;
+ break;
default:
-
- $html .= ''.$val['info'].' ';
-
+ if (isset($val['info']) && $val['info'])
+ $html .= ' ' . $val['info'] . ' ';
+
$html .= ' Pflichtfeld! ');
- }
- if (trim($this->app->Secure->GetPOST('typ')) === '') {
- $error = 'Bitte alle Pflichtfelder ausfüllen!';
- $this->app->Tpl->Set('MSGTYP','Pflichtfeld! ');
- }
-
- if ($error !== '') {
- $this->app->Tpl->Add($target, sprintf('%s
', $error));
-
- return false;
- }
-
- return true;
+ return [];
}
-
/**
* @param string $tracking
- * @param int $versand
- * @param int $lieferschein
+ * @param int $versand
+ * @param int $lieferschein
*/
- public function SetTracking($tracking,$versand=0,$lieferschein=0, $trackingLink = '')
+ public function SetTracking($tracking, $versand = 0, $lieferschein = 0, $trackingLink = '')
{
//if($versand > 0) $this->app->DB->Update("UPDATE versand SET tracking=CONCAT(tracking,if(tracking!='',';',''),'".$tracking."') WHERE id='$versand' LIMIT 1");
- $this->app->User->SetParameter('versand_lasttracking',$tracking);
- $this->app->User->SetParameter('versand_lasttracking_link',$trackingLink);
+ $this->app->User->SetParameter('versand_lasttracking', $tracking);
+ $this->app->User->SetParameter('versand_lasttracking_link', $trackingLink);
$this->app->User->SetParameter('versand_lasttracking_versand', $versand);
$this->app->User->SetParameter('versand_lasttracking_lieferschein', $lieferschein);
}
@@ -375,17 +328,17 @@ class Versanddienstleister {
*/
public function deleteTrackingFromUserdata($tracking)
{
- if(empty($tracking)) {
+ if (empty($tracking)) {
return;
}
- $trackingUser = !empty($this->app->User) && method_exists($this->app->User,'GetParameter')?
- $this->app->User->GetParameter('versand_lasttracking'):'';
- if(empty($trackingUser) || $trackingUser !== $tracking) {
+ $trackingUser = !empty($this->app->User) && method_exists($this->app->User, 'GetParameter') ?
+ $this->app->User->GetParameter('versand_lasttracking') : '';
+ if (empty($trackingUser) || $trackingUser !== $tracking) {
return;
}
- $this->app->User->SetParameter('versand_lasttracking','');
- $this->app->User->SetParameter('versand_lasttracking_link','');
+ $this->app->User->SetParameter('versand_lasttracking', '');
+ $this->app->User->SetParameter('versand_lasttracking_link', '');
$this->app->User->SetParameter('versand_lasttracking_versand', '');
$this->app->User->SetParameter('versand_lasttracking_lieferschein', '');
}
@@ -402,17 +355,83 @@ class Versanddienstleister {
/**
* @param string $tracking
- * @param int $notsend
+ * @param int $notsend
* @param string $link
* @param string $rawlink
*
* @return bool
*/
- public function Trackinglink($tracking, &$notsend, &$link, &$rawlink) {
+ public function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
+ {
$notsend = 0;
$rawlink = '';
$link = '';
return true;
}
-
+
+ public function Paketmarke(string $target, string $docType, int $docId): void
+ {
+ $address = $this->GetAdressdaten($docId, $docType);
+ if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
+ $json = json_decode(file_get_contents('php://input'));
+ $ret = [];
+ if ($json->submit == 'print') {
+ $result = $this->CreateShipment($json, $address);
+ if ($result->Success) {
+ $sql = "INSERT INTO versand
+ (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete)
+ VALUES
+ ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
+ '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
+ $this->app->DB->Insert($sql);
+
+ $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
+ file_put_contents($filename, $result->Label);
+ $this->app->printer->Drucken($this->labelPrinterId, $filename);
+
+ if (isset($result->ExportDocuments)) {
+ $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
+ file_put_contents($filename, $result->ExportDocuments);
+ $this->app->printer->Drucken($this->documentPrinterId, $filename);
+ }
+ $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
+ } else {
+ $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
+ }
+ }
+ header('Content-Type: application/json');
+ echo json_encode($ret);
+ $this->app->ExitXentral();
+ }
+
+ $address['shipment_type'] = CustomsInfo::CUSTOMS_TYPE_GOODS;
+ $products = $this->GetShippingProducts();
+ $products = array_combine(array_column($products, 'Id'), $products);
+ $address['product'] = $products[0]->Id ?? '';
+
+ $json['form'] = $address;
+ $json['countries'] = $this->app->erp->GetSelectLaenderliste();
+ $json['products'] = $products;
+ $json['customs_shipment_types'] = [
+ CustomsInfo::CUSTOMS_TYPE_GIFT => 'Geschenk',
+ CustomsInfo::CUSTOMS_TYPE_DOCUMENTS => 'Dokumente',
+ CustomsInfo::CUSTOMS_TYPE_GOODS => 'Handelswaren',
+ CustomsInfo::CUSTOMS_TYPE_SAMPLE => 'Erprobungswaren',
+ CustomsInfo::CUSTOMS_TYPE_RETURN => 'Rücksendung'
+ ];
+ $json['messages'] = [];
+ $json['form']['services'] = [
+ Product::SERVICE_PREMIUM => false
+ ];
+ $this->app->Tpl->Set('JSON', json_encode($json));
+ $this->app->Tpl->Set('CARRIERNAME', $this->GetName());
+ $this->app->Tpl->Parse($target, 'createshipment.tpl');
+ }
+
+ public abstract function CreateShipment(object $json, array $address): CreateShipmentResult;
+
+ /**
+ * @return Product[]
+ */
+ public abstract function GetShippingProducts(): array;
}
diff --git a/www/lib/intraship.php b/www/lib/intraship.php
deleted file mode 100644
index 916d7e14..00000000
--- a/www/lib/intraship.php
+++ /dev/null
@@ -1,1501 +0,0 @@
-id = $id;
- $this->app = &$app;
- $einstellungen_json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '$id' LIMIT 1");
- $this->paketmarke_drucker = $this->app->DB->Select("SELECT paketmarke_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
- $this->export_drucker = $this->app->DB->Select("SELECT export_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
- if($einstellungen_json)
- {
- $this->einstellungen = json_decode($einstellungen_json,true);
- }else{
- $this->einstellungen = array();
- }
- $this->einstellungen = $this->einstellungen;
- if(isset($this->einstellungen['intraship_partnerid']) && $this->einstellungen['intraship_partnerid'] )$this->einstellungen['partnerid'] = $this->einstellungen['intraship_partnerid'];
- if(!isset($this->einstellungen['partnerid']))
- {
- $this->einstellungen['partnerid'] = '01';
- }
- if(!isset($this->einstellungen['partnerid']) || $this->einstellungen['partnerid']=="")
- {
- $this->einstellungen['partnerid'] = '01';
- }
-
- $this->errors = array();
- $data = $this->einstellungen;
- $this->info = array(
- 'company_name' => $data['intraship_company_name'],
- 'street_name' => $data['intraship_street_name'],
- 'street_number' => $data['intraship_street_number'],
- 'zip' => $data['intraship_zip'],
- 'country' => $data['intraship_country'],
- 'city' => $data['intraship_city'],
- 'email' => $data['intraship_email'],
- 'phone' => $data['intraship_phone'],
- 'internet' => $data['intraship_internet'],
- 'contact_person' => $data['intraship_contact_person'],
- 'export_reason' => $data['intraship_exportgrund']
- );
- //function __construct($api_einstellungen, $customer_info) {
-
-
-
- if($land!=$this->app->erp->Firmendaten("land"))
- {
- if(!empty($data['intraship_partnerid_welt']) && !empty($data['intraship_partnerid_welt']))$einstellungen['partnerid'] = $data['intraship_partnerid_welt'];
- }
-
- if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
-
- /*
-
- $this->einstellungen = $api_einstellungen;
- $this->info = $customer_info;
-
- if($this->einstellungen['partnerid']=="") $this->einstellungen['partnerid'] = '01';
-
- $this->errors = array();
- */
- }
-
- public function GetBezeichnung()
- {
- return 'DHL Instrahship';
- }
-
- function EinstellungenStruktur()
- {
- return array(
-
-
- 'user' => array('typ'=>'text','bezeichnung'=>'Benutzer:','info'=>'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
- 'signature' => array('typ'=>'text','bezeichnung'=>'Signature:','info'=>'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
- 'ekp' => array('typ'=>'text','bezeichnung'=>'EKP','info'=>'5000000000 (gültige DHL Kundennummer)'),
- 'partnerid' => array('typ'=>'text','bezeichnung'=>'Partner ID Inland:','info'=>'meist 01, manchmal 02, 03 etc.'),
- 'partnerid_welt' => array('typ'=>'text','bezeichnung'=>'Partner ID Welt:','info'=>'falls leer wird die inländische Partner ID verwendet.'),
- 'api_user' => array('typ'=>'text','bezeichnung'=>'API User:','info'=>'Bitte anfragen beim Support'),
- 'api_password' => array('typ'=>'text','bezeichnung'=>'API Passwort:','info'=>'Bitte anfragen beim Support'),
- 'intraship_retourenaccount' => array('typ'=>'text','bezeichnung'=>'Retouren Account:','info'=>'14 Stellige DHL-Retoure Abrechnungsnummer'),
- 'intraship_retourenlabel'=>array('typ'=>'checkbox','bezeichnung'=>'Vorauswahl Retourenlabel:','info'=>'Druckt Retourenlabel mit'),
-
- 'intraship_company_name' => array('typ'=>'text','bezeichnung'=>'Versender Firma:'),
- 'intraship_street_name' => array('typ'=>'text','bezeichnung'=>'Versender Strasse:'),
- 'intraship_street_number' => array('typ'=>'text','bezeichnung'=>'Versender Strasse Nr.:'),
- //'intraship_name' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
- 'intraship_zip' => array('typ'=>'text','bezeichnung'=>'Versender PLZ:'),
- 'intraship_city' => array('typ'=>'text','bezeichnung'=>'Versender Stadt:'),
- 'intraship_country' => array('typ'=>'text','bezeichnung'=>'Versender Land:','info'=>'germany'),
- 'intraship_email' => array('typ'=>'text','bezeichnung'=>'Versender E-Mail:'),
- 'intraship_phone' => array('typ'=>'text','bezeichnung'=>'Versender Telefon:'),
- 'intraship_internet' => array('typ'=>'text','bezeichnung'=>'Versender Web:'),
- 'intraship_contact_person' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-
-
- 'intraship_account_owner' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Inhaber:'),
- 'intraship_account_number' => array('typ'=>'text','bezeichnung'=>'Nachnahme Kontonummer:'),
- 'intraship_code' => array('typ'=>'text','bezeichnung'=>'Nachnahme BLZ:'),
- 'intraship_bank_name' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Name:'),
- 'intraship_iban' => array('typ'=>'text','bezeichnung'=>'Nachnahme IBAN:'),
-
- 'intraship_bic' => array('typ'=>'text','bezeichnung'=>'Nachnahme BIC:'),
-
- 'intraship_exportgrund' => array('typ'=>'text','bezeichnung'=>'Export:','info'=>'z.B. Computer Zubehör'),
-
- 'intraship_WeightInKG' => array('typ'=>'text','bezeichnung'=>'Standard Gewicht:','info'=>'in KG'),
- 'intraship_LengthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Länge:','info'=>'in cm'),
- 'intraship_WidthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Breite:','info'=>'in cm'),
- 'intraship_HeightInCM' => array('typ'=>'text','bezeichnung'=>'Standard Höhe:','info'=>'in cm'),
- 'intraship_PackageType' => array('typ'=>'text','bezeichnung'=>'Standard Paket:','info'=>'z.B. PL'),
-
- 'log'=>array('typ'=>'checkbox','bezeichnung'=>'Logging')
- );
-
- }
-
-
- public function Paketmarke($doctyp, $docid, $target = '', $error = false)
- {
- $id = $docid;
- $drucken = $this->app->Secure->GetPOST("drucken");
- $anders = $this->app->Secure->GetPOST("anders");
- $land = $this->app->Secure->GetPOST("land");
- $tracking_again = $this->app->Secure->GetGET("tracking_again");
-
-
- $versandmit= $this->app->Secure->GetPOST("versandmit");
- $trackingsubmit= $this->app->Secure->GetPOST("trackingsubmit");
- $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
- $tracking= $this->app->Secure->GetPOST("tracking");
- $trackingsubmitcancel= $this->app->Secure->GetPOST("trackingsubmitcancel");
- $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");
-
- $kg= $this->app->Secure->GetPOST("kg1");
- $name= $this->app->Secure->GetPOST("name");
- $name2= $this->app->Secure->GetPOST("name2");
- $name3= $this->app->Secure->GetPOST("name3");
- $strasse= $this->app->Secure->GetPOST("strasse");
- $hausnummer= $this->app->Secure->GetPOST("hausnummer");
- $plz= $this->app->Secure->GetPOST("plz");
- $ort= $this->app->Secure->GetPOST("ort");
- $email= $this->app->Secure->GetPOST("email");
- $phone= $this->app->Secure->GetPOST("phone");
- $nummeraufbeleg= $this->app->Secure->GetPOST("nummeraufbeleg");
-
- if($sid=="")
- $sid= $this->app->Secure->GetGET("sid");
-
- if($zusatz=="express")
- $this->app->Tpl->Set('ZUSATZ',"Express");
-
- if($zusatz=="export")
- $this->app->Tpl->Set('ZUSATZ',"Export");
-
- $id = $this->app->Secure->GetGET("id");
- $drucken = $this->app->Secure->GetPOST("drucken");
- $anders = $this->app->Secure->GetPOST("anders");
- $land = $this->app->Secure->GetGET("land");
- if($land=="") $land = $this->app->Secure->GetPOST("land");
- $tracking_again = $this->app->Secure->GetGET("tracking_again");
-
-
- $versandmit= $this->app->Secure->GetPOST("versandmit");
- $trackingsubmit= $this->app->Secure->GetPOST("trackingsubmit");
- $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
- $tracking= $this->app->Secure->GetPOST("tracking");
- $trackingsubmitcancel= $this->app->Secure->GetPOST("trackingsubmitcancel");
- $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");
- if($typ=="DHL" || $typ=="dhl")
- $versand = "dhl";
- else if($typ=="Intraship")
- $versand = "intraship";
- else $versand = $typ;
-
- if($sid == "versand")
- {
- $projekt = $this->app->DB->Select("SELECT projekt FROM versand WHERE id='$id' LIMIT 1");
- }else{
- $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
- }
- $intraship_weightinkg = $this->app->DB->Select("SELECT intraship_weightinkg FROM projekt WHERE id='$projekt' LIMIT 1");
-
-
- if($trackingsubmit!="" || $trackingsubmitcancel!="")
- {
-
- if($sid=="versand")
- {
- // falche tracingnummer bei DHL da wir in der Funktion PaketmarkeDHLEmbedded sind
- if((strlen($tracking) < 12 || strlen($tracking) > 20) && $trackingsubmitcancel=="" && ($typ=="DHL" || $typ=="Intraship"))
- {
- header("Location: index.php?module=versanderzeugen&action=frankieren&id=$id&land=$land&tracking_again=1");
- exit;
- }
- else
- {
- $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versand', tracking='$tracking',
- versendet_am=NOW(),versendet_am_zeitstempel=NOW(), abgeschlossen='1',logdatei=NOW() WHERE id='$id' LIMIT 1");
-
- $this->app->erp->VersandAbschluss($id);
- //versand mail an kunden
- $this->app->erp->Versandmail($id);
-
- $weiterespaket=$this->app->Secure->GetPOST("weiterespaket");
- $lieferscheinkopie=$this->app->Secure->GetPOST("lieferscheinkopie");
- if($weiterespaket=="1")
- {
- if($lieferscheinkopie=="1") $lieferscheinkopie=0; else $lieferscheinkopie=1;
- //$this->app->erp->LogFile("Lieferscheinkopie $lieferscheinkopie");
- $all = $this->app->DB->SelectArr("SELECT * FROM versand WHERE id='$id' LIMIT 1");
- $this->app->DB->Insert("INSERT INTO versand (id,adresse,rechnung,lieferschein,versandart,projekt,bearbeiter,versender,versandunternehmen,firma,
- keinetrackingmail,gelesen,paketmarkegedruckt,papieregedruckt,weitererlieferschein)
- VALUES ('','{$all[0]['adresse']}','{$all[0]['rechnung']}','{$all[0]['lieferschein']}','{$all[0]['versandart']}','{$all[0]['projekt']}',
- '{$all[0]['bearbeiter']}','{$all[0]['versender']}','{$all[0]['versandunternehmen']}',
- '{$all[0]['firma']}','{$all[0]['keinetrackingmail']}','{$all[0]['gelesen']}',0,$lieferscheinkopie,1)");
-
- $newid = $this->app->DB->GetInsertID();
- header("Location: index.php?module=versanderzeugen&action=einzel&id=$newid");
- } else {
- header("Location: index.php?module=versanderzeugen&action=offene");
- }
- }
- exit;
- } else {
- //direkt aus dem Lieferschein
- if($id > 0)
- {
- $adresse = $this->app->DB->Select("SELECT adresse FROM lieferschein WHERE id='$id' LIMIT 1");
- $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
- $kg = $this->app->Secure->GetPOST("kg1");
- if($kg=="") {
- $kg = $this->app->erp->VersandartMindestgewicht($id);
- }
- $auftrag = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$id'");
- $this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking,
- versendet_am,abgeschlossen,lieferschein,
- freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
- VALUES ('','$versand','$tracking',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."',
- '$adresse','$projekt','$kg','1','1') ");
- $versandId = $this->app->DB->GetInsertID();
- $shop = $this->app->DB->Select("SELECT shop FROM auftrag WHERE id = '$auftrag' LIMIT 1");
- $auftragabgleich=$this->app->DB->Select("SELECT auftragabgleich FROM shopexport WHERE id='$shop' LIMIT 1");
-
- if($shop > 0 && $auftragabgleich=="1")
- {
- //$this->LogFile("Tracking gescannt");
- $this->app->remote->RemoteUpdateAuftrag($shop,$auftrag);
- }
- $this->app->erp->sendPaymentStatus($versandId);
- $this->app->Location->execute('index.php?module=lieferschein&action=paketmarke&id='.$id);
- }
- }
- }
-
-
- if($versandmitbutton!="")
- {
-
- if($sid=="versand")
- {
- $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versandmit',
- versendet_am=NOW(),versendet_am_zeitstempel=NOW(),abgeschlossen='1' WHERE id='$id' LIMIT 1");
-
- $this->VersandAbschluss($id);
- //versand mail an kunden
- $this->Versandmail($id);
-
- header("Location: index.php?module=versanderzeugen&action=offene");
- exit;
- }
- }
-
- if($sid=="versand")
- {
- // wenn paketmarke bereits gedruckt nur tracking scannen
- $paketmarkegedruckt = $this->app->DB->Select("SELECT paketmarkegedruckt FROM versand WHERE id='$id' LIMIT 1");
-
- if($paketmarkegedruckt>=1)
- $tracking_again=1;
- }
-
- if($anders!="")
- {
-
- }
- else if(($drucken!="" || $tracking_again=="1") && !$error)
- {
-
-
-
- if($tracking_again!="1")
- {
- $kg = (float)str_replace(',','.',$kg);
-
- $abholdatum = $this->app->Secure->GetPOST("abholdatum");
- $retourenlabel= $this->app->Secure->GetPOST("retourenlabel");
- if($retourenlabel)
- {
- $this->app->Tpl->Set('RETOURENLABEL', ' checked="checked" ');
- $zusaetzlich['retourenlabel'] = 1;
- }
- if($abholdatum){
- $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
- $zusaetzlich['abholdatum'] = date('Y-m-d', strtotime($abholdatum));
- $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
- }
-
- $kg = (float)(str_replace(',','.',$kg));
- $kg = round($kg,2);
- $name = substr($this->app->erp->ReadyForPDF($name),0,30);
- $name2 = $this->app->erp->ReadyForPDF($name2);
- $name3 = $this->app->erp->ReadyForPDF($name3);
- $strasse = $this->app->erp->ReadyForPDF($strasse);
- $hausnummer = $this->app->erp->ReadyForPDF($hausnummer);
- $plz = $this->app->erp->ReadyForPDF($plz);
- $ort = $this->app->erp->ReadyForPDF(html_entity_decode($ort));
- $land = $this->app->erp->ReadyForPDF($land);
-
- //SetKonfigurationValue($name,$value)
-
- $module = $this->app->Secure->GetGET("module");
- //TODO Workarrond fuer lieferschein
- if($module=="lieferschein")
- {
- $lieferschein = $id;
- }
- else {
- $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
- if($lieferschein <=0) $lieferschein=$id;
- }
-
- $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
- $lieferscheinnummer = "LS".$this->app->DB->Select("SELECT belegnr FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-
- //pruefe ob es auftragsnummer gibt dann nehmen diese
- $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
- if($auftragid > 0)
- {
- $nummeraufbeleg = "AB".$this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftragid' LIMIT 1");
- } else {
- $nummeraufbeleg = $lieferscheinnummer;
- }
-
- $rechnung = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$lieferschein' LIMIT 1");
-
- $rechnung_data = $this->app->DB->SelectArr("SELECT * FROM rechnung WHERE id='$rechnung' LIMIT 1");
-
- // fuer export
- $email = $rechnung_data[0]['email']; //XXX
- $phone = $rechnung_data[0]['telefon']; //XXX
- $rechnungssumme = $rechnung_data[0]['soll']; //XXX
-
- if($rechnung){
- $artikel_positionen = $this->app->DB->SelectArr("SELECT * FROM rechnung_position WHERE rechnung='$rechnung'");
- } else {
- $artikel_positionen = $this->app->DB->SelectArr("SELECT * FROM lieferschein_position WHERE lieferschein='$lieferschein'");
-
- }
- $altersfreigabe = 0;
- for($i=0;$i<(!empty($artikel_positionen)?count($artikel_positionen):0);$i++)
- {
- $artikelaltersfreigabe = (int)$this->app->DB->Select("SELECT altersfreigabe FROM artikel WHERE id = '".$artikel_positionen[$i]['artikel']."' LIMIT 1");
- if($artikelaltersfreigabe > $altersfreigabe)$altersfreigabe = $artikelaltersfreigabe;
- //$lagerartikel = $this->app->DB->Select("SELECT lagerartikel FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-
- //if($lagerartikel=="1")
- {
- if($artikel_positionen[$i]['waehrung']=="") {
- $artikel_positionen[$i]['waehrung']="EUR";
- }
- $gewicht = $this->app->DB->Select("SELECT gewicht FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
- $porto = $this->app->DB->Select("SELECT porto FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-
- if($gewicht <=0) $gewicht=0;
-
- //if($gewicht > 0) $gewicht = $artikel_positionen[$i]['menge']*$gewicht;
- //else $gewicht = 1.1*$artikel_positionen[$i]['menge'];
-
- if($porto!="1")
- {
- $artikel[] = array( 'description'=>substr($artikel_positionen[$i]['bezeichnung'],0,40),
- 'countrycode'=>'DE',
- 'commodity_code'=>'95061110', // zoll nummer?
- 'amount'=>round($artikel_positionen[$i]['menge']),
- 'netweightinkg'=>$gewicht,
- 'grossweightinkg'=>$gewicht,
- 'value'=>$artikel_positionen[$i]['preis'],
- 'currency'=>$artikel_positionen[$i]['waehrung']);
- }
- }
- }
-
- $data = $this->einstellungen;
-
- if($phone=="") $phone=$data['intraship_phone'];
-
-
-
- if($land!=$this->app->erp->Firmendaten("land"))
- {
- if(!empty($data['partnerid_welt']) && !empty($data['partnerid_welt']))$this->einstellungen['partnerid'] = $data['partnerid_welt'];
- }
-
- if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
- // your company info
- $info = array(
- 'company_name' => $data['intraship_company_name'],
- 'street_name' => $data['intraship_street_name'],
- 'street_number' => $data['intraship_street_number'],
- 'zip' => $data['intraship_zip'],
- 'country' => $data['intraship_country'],
- 'city' => $data['intraship_city'],
- 'email' => $data['intraship_email'],
- 'phone' => $data['intraship_phone'],
- 'internet' => $data['intraship_internet'],
- 'contact_person' => $data['intraship_contact_person'],
- 'export_reason' => $data['intraship_exportgrund']
- );
-
- // receiver details
- $customer_details = array(
- 'name1' => $name,
- 'name2' => $name2,
- 'c/o' => $name3,
- 'name3' => $name3,
- 'street_name' => $strasse,
- 'street_number' => $hausnummer,
- // 'country' => 'germany',
- 'country_code' => $land,
- 'zip' => $plz,
- 'city' => $ort,
- 'email' => $email,
- 'phone' => $phone,
- 'ordernumber' => $nummeraufbeleg,
- 'weight' => $kg,
- 'amount' => str_replace(",",".",$rechnungssumme),
- 'currency' => 'EUR'
- );
- if(!is_null($zusatz) && isset($zusatz['abholdatum']))$customer_details['abholdatum'] = $zusatz['abholdatum'];
- if(!is_null($zusatz) && isset($zusatz['retourenlabel']))$customer_details['intraship_retourenlabel'] = $zusatz['retourenlabel'];
- if($altersfreigabe > 0)$customer_details['altersfreigabe'] = $altersfreigabe;
- //$dhl = new DHLBusinessShipment($einstellungen, $info);
-
- $shipment_details['WeightInKG'] = $data['intraship_WeightInKG'];
- $shipment_details['LengthInCM'] = $data['intraship_LengthInCM'];
- $shipment_details['WidthInCM'] = $data['intraship_WidthInCM'];
- $shipment_details['HeightInCM'] = $data['intraship_HeightInCM'];
- $shipment_details['PackageType'] = $data['intraship_PackageType'];
-
- if($data['intraship_note']=="") $data['intraship_note'] = $rechnungsnummer;
-
- if($land==$this->app->erp->Firmendaten("land"))
- {
- if($nachnahme && $betrag > 0)
- {
- $bank_details = array(
- 'account_owner' => $data['intraship_account_owner'],
- 'account_number' => $data['intraship_account_number'],
- 'bank_code' => $data['intraship_bank_code'],
- 'bank_name' => $data['intraship_bank_name'],
- 'note' => $data['intraship_note'],
- 'iban' => $data['intraship_iban'],
- 'bic' => $data['intraship_bic']
- );
-
- $cod_details = array(
- 'amount'=>str_replace(",",".",$betrag),
- 'currency'=>'EUR'
- );
-
- $response = $this->createNationalShipment($customer_details,$shipment_details,$bank_details,$cod_details,$rechnungsnummer);
- } else {
- //$customer_details['ordernumber']="";
- $response = $this->createNationalShipment($customer_details,$shipment_details);
- }
- } else {
- $customer_details['EU'] = $this->app->erp->IstEU($land)?1:0;
- $response = $this->createWeltShipment($customer_details,null,$bank_details,$cod_details,$artikel);
- if($response)
- {
- // Zoll Papiere
- //$dhl = new DHLBusinessShipment($einstellungen, $info);
- $response_export = $this->GetExportDocDD($response['shipment_number']);
- }else{
- $dump = $this->app->erp->VarAsString($this->errors);
- $this->app->erp->Protokoll("Fehler Intraship API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
- }
- }
-
- $data['intraship_drucker'] = $this->paketmarke_drucker;
- $data['druckerlogistikstufe2'] = $this->export_drucker;
-
- if(!$data['intraship_drucker'])
- {
- if($this->app->erp->GetStandardPaketmarkendrucker()>0)
- $data['intraship_drucker'] = $this->app->erp->GetStandardPaketmarkendrucker();
- }
-
- if(!$data['druckerlogistikstufe2'])
- {
- if($this->app->erp->GetInstrashipExport($projekt)>0)
- $data['druckerlogistikstufe2'] = $this->app->erp->GetInstrashipExport($projekt);
- }
-
-
-
- if($response)
- {
- //$response['label_url']
- //$response['shipment_number']
- $tmppdf = $this->app->erp->DownloadFile($response['label_url'],"Intraship_Versand_".$id."_","pdf");
- $this->app->erp->Protokoll("Erfolg Paketmarke Drucker ".$data['intraship_drucker']," Datei: $tmppdf URL: ".$response['label_url']);
- $this->app->printer->Drucken($data['intraship_drucker'],$tmppdf);
- unlink($tmppdf);
- } else {
- $dump = $this->app->erp->VarAsString($this->errors);
- $this->app->erp->Protokoll("Fehler Intraship API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
- }
-
- if($response_export)
- {
- $tmppdf = $this->app->erp->DownloadFile($response_export['export_url'],"Export_Intraship_Versand_".$id."_");
- $this->app->erp->Protokoll("Erfolg Export Dokumente Drucker ".$data['druckerlogistikstufe2']," Datei: $tmppdf URL: ".$response_export['export_url']);
- $this->app->printer->Drucken($data['druckerlogistikstufe2'],$tmppdf);
- unlink($tmppdf);
- } else {
- $dump = $this->app->erp->VarAsString($this->errors);
- $this->app->erp->Protokoll("Fehler Intraship Export Dokument API beim Erstellen fuer Versand $id LS $lieferschein",$dump);
- }
-
- if($response)return false;
- return $this->errors;
-
- }
-
-
- if($this->app->Secure->GetPOST('drucken') || $this->app->Secure->GetPOST('anders'))
- {
-
-
- }else{
- if(empty($this->Eintellungen['retourenaccount']) || !$this->Eintellungen['retourenaccount'])
- {
- $this->app->Tpl->Add('VORRETOURENLABEL', '');
- }
- if(isset($this->Eintellungen['retourenlabel']) && $this->Eintellungen['retourenlabel'])$this->app->Tpl->Add('RETOURENLABEL',' checked="checked" ');
- }
- }
-
- //$this->info = $customer_info;
- if($target)$this->app->Tpl->Parse($target,'versandarten_intraship.tpl');
- }
-
- public function Export($daten)
- {
-
- }
-
- function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
- {
- $notsend = 0;
- $rawlink = 'http://nolp.dhl.de/nextt-online-public/set_identcodes.do?lang=de&idc='.$tracking;
- $link = 'DHL Versand: '.$tracking.' ('.$rawlink.')';
- return true;
- }
-
- private function log($message) {
-
- if (isset($this->einstellungen['log'])) {
-
- if (is_array($message) || is_object($message)) {
-
- error_log(print_r($message, true));
-
- } else {
-
- error_log($message);
-
- }
-
- }
-
- }
-
- function buildClient($retoure, $altersfreigabe = false) {
-
- $header = $this->buildAuthHeader();
-
- $location = self::PRODUCTION_URL;
- //$location = self::SANDBOX_URL;
-
- $auth_params = array(
- 'login' => $this->einstellungen['api_user'],
- 'password' => $this->einstellungen['api_password'],
- 'location' => $location,
- 'trace' => 1,
- 'connection_timeout' => 30
- );
-
- $this->log($auth_params);
- try {
- $this->client = new SoapClient($altersfreigabe?self::API_URL22:($retoure?self::API_URL2:self::API_URL), $auth_params);
- } catch(SoapFault $exception)
- {
- die("Verbindungsfehler: ".$exception->getMessage());
- $this->errors[] = "Verbindungsfehler: ".$exception->getMessage();
- return;
- }
- try {
- $this->client->__setSoapHeaders($header);
- } catch(SoapFault $exception)
- {
- die("Verbindungsfehler: ".$exception->getMessage());
- $this->errors[] = "Verbindungsfehler: ".$exception->getMessage();
- return;
- }
-
- $this->log($this->client);
-
- }
-
- function createNationalShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null) {
- $api2 = false;
- $api22 = isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe'];
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
-
- if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])$api22 = true;
-
- $this->buildClient($api2, $api22);
-
- $shipment = array();
-
- // Version
- $shipment['Version'] = array('majorRelease' => '1', 'minorRelease' => '0');
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $shipment['Version']['minorRelease'] = '1';
- }
- if($api22)
- {
- $shipment['Version'] = array('majorRelease' => '2', 'minorRelease' => '0');
- }
-
- if($customer_details['country_code']=="" || $customer_details['country_code']=="DE")
- {
- $customer_details['country_code']="DE";
- $customer_details['country_zip']="germany";
- } else if ($customer_details['country_code']=="UK"){
- $customer_details['country_zip']="england";
- } else {
- $customer_details['country_zip']="other";
- }
-
- // Order
- $shipment['ShipmentOrder'] = array();
-
- // Fixme
- if($api22)
- {
- $shipment['ShipmentOrder']['sequenceNumber'] = '01';
- }else{
- $shipment['ShipmentOrder']['SequenceNumber'] = '1';
- }
- // Shipment
- $s = array();
- if($api22)
- {
- $s['product'] = "V01PAK";
- }else{
- $s['ProductCode'] = 'EPN';
- }
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
- }
-
- if($api22)
- {
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['shipmentDate'] = $customer_details['abholdatum'];
- else
- $s['shipmentDate'] = date('Y-m-d');
- }else{
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['ShipmentDate'] = $customer_details['abholdatum'];
- else
- $s['ShipmentDate'] = date('Y-m-d');
- }
-
- if($api22)
- {
- $s['accountNumber'] = $this->einstellungen['ekp'].(strlen($this->einstellungen['partnerid'] <= 2)?$this->einstellungen['partnerid']."01":$this->einstellungen['partnerid']);
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = '5';
- $s['ShipmentItem']['lengthInCM'] = '50';
- $s['ShipmentItem']['widthInCM'] = '50';
- $s['ShipmentItem']['heightInCM'] = '50';
- } else {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
- $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
- $s['ShipmentItem']['widthInCM'] = $shipment_details['WidthInCM'];
- $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
- }
-
- // Falls ein Gewicht angegeben worden ist
- if($customer_details['weight']!="")
- $s['ShipmentItem']['weightInKG'] = $customer_details['weight'];
-
-
- }else{
- $s['EKP'] = $this->einstellungen['ekp'];
-
- $s['Attendance'] = array();
- $s['Attendance']['partnerID'] = substr($this->einstellungen['partnerid'],0,2);
-
-
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['WeightInKG'] = '5';
- $s['ShipmentItem']['LengthInCM'] = '50';
- $s['ShipmentItem']['WidthInCM'] = '50';
- $s['ShipmentItem']['HeightInCM'] = '50';
- // FIXME: What is this
- $s['ShipmentItem']['PackageType'] = 'PL';
- } else {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['WeightInKG'] = $shipment_details['WeightInKG'];
- $s['ShipmentItem']['LengthInCM'] = $shipment_details['LengthInCM'];
- $s['ShipmentItem']['WidthInCM'] = $shipment_details['WidthInCM'];
- $s['ShipmentItem']['HeightInCM'] = $shipment_details['HeightInCM'];
- // FIXME: What is this
- $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
- }
-
- // Falls ein Gewicht angegeben worden ist
- if($customer_details['weight']!="")
- $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
-
- }
-
-
- if($bank_details != null)
- {
- $s['BankData'] = array();
- $s['BankData']['accountOwner'] = $bank_details['account_owner'];
- $s['BankData']['accountNumber'] = $bank_details['account_number'];
- $s['BankData']['bankCode'] = $bank_details['bank_code'];
- $s['BankData']['bankName'] = $bank_details['bank_name'];
- $s['BankData']['iban'] = $bank_details['iban'];
- $s['BankData']['bic'] = $bank_details['bic'];
- $s['BankData']['note'] = $bank_details['note'];
- }
-
- if($cod_details != null)
- {
- //$s['Service'] = array();
- //$s['Service']['ServiceGroupOther'] = array();
- $s['Service']['ServiceGroupOther']['COD'] = array();
- $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
- $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
- }
-
- // Auftragnummer auf Label
- if($api22)
- {
- $s['customerReference']=$customer_details['ordernumber'];
- if($customer_details['altersfreigabe'] >= 16)
- {
- $s['Service']['VisualCheckOfAge'] = array();
- $s['Service']['VisualCheckOfAge']['active'] = 1;
- $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
- }
-
- }else{
- $s['CustomerReference']=$customer_details['ordernumber'];
- }
-
- $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
- //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
- $shipper = array();
- if($api22)
- {
- $shipper['Name'] = array();
- $shipper['Name']['name1'] = $this->info['company_name'];
- }else{
- $shipper['Company'] = array();
- $shipper['Company']['Company'] = array();
- $shipper['Company']['Company']['name1'] = $this->info['company_name'];
- }
- $shipper['Address'] = array();
- $shipper['Address']['streetName'] = $this->info['street_name'];
- $shipper['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $shipper['Address']['zip'] = $this->info['zip'];
- }else{
- $shipper['Address']['Zip'] = array();
- $shipper['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $shipper['Address']['city'] = $this->info['city'];
-
- $shipper['Address']['Origin'] = array('countryISOCode' => 'DE');
-
- $shipper['Communication'] = array();
- if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
- $shipper['Communication']['email'] = $this->info['email'];
- }
- $shipper['Communication']['phone'] = $this->info['phone'];
- $shipper['Communication']['internet'] = $this->info['internet'];
- $shipper['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
- if($api22)
- {
- $receiver = array();
- $receiver['name1'] = $customer_details['name1'];
- if($customer_details['name2']!="")
- $receiver['name2'] = $customer_details['name2'];
- if($customer_details['name3']!="")
- $receiver['name3'] = $customer_details['name3'];
-
-
-
-
- $receiver['Address'] = array();
- if($customer_details['name2']!="")
- $receiver['Address']['addressAddition'] = $customer_details['name2'];
- $receiver['Address']['streetName'] = $customer_details['street_name'];
- $receiver['Address']['streetNumber'] = $customer_details['street_number'];
- $receiver['Address']['zip'] = $customer_details['zip'];
- $receiver['Address']['city'] = $customer_details['city'];
- $receiver['Communication'] = array();
-
- if($customer_details['c/o']!="")
- $receiver['Communication']['contactPerson'] = $customer_details['c/o'];
-
- $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-
-
- }else{
- $receiver = array();
-
- $receiver['Company'] = array();
-
- /*
- $receiver['Company']['Person'] = array();
- $receiver['Company']['Person']['firstname'] = $customer_details['first_name'];
- $receiver['Company']['Person']['lastname'] = $customer_details['last_name'];
- */
-
- $receiver['Company']['Company'] = array();
- $receiver['Company']['Company']['name1'] = $customer_details['name1'];
- $receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-
- $receiver['Address'] = array();
- $receiver['Address']['streetName'] = $customer_details['street_name'];
- $receiver['Address']['streetNumber'] = $customer_details['street_number'];
- $receiver['Address']['Zip'] = array();
- $receiver['Address']['Zip'][strtolower($customer_details['country_zip'])] = $customer_details['zip'];
- $receiver['Address']['city'] = $customer_details['city'];
- $receiver['Communication'] = array();
- $receiver['Communication']['contactPerson'] = $customer_details['c/o'];
-
- $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-
- $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
- }
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $ReturnReceiver = array();
- $ReturnReceiver['Company'] = array();
- $ReturnReceiver['Company']['Company'] = array();
- $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
- $ReturnReceiver['Address'] = array();
- $ReturnReceiver['Address']['streetName'] = $this->info['street_name'];
- $ReturnReceiver['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $ReturnReceiver['Address']['zip'] = $this->info['zip'];
- }else{
- $ReturnReceiver['Address']['Zip'] = array();
- $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $ReturnReceiver['Address']['city'] = $this->info['city'];
-
- $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => 'DE');
-
- $ReturnReceiver['Communication'] = array();
- if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
- $shipper['Communication']['email'] = $this->info['email'];
- }
- $ReturnReceiver['Communication']['phone'] = $this->info['phone'];
- $ReturnReceiver['Communication']['internet'] = $this->info['internet'];
- $ReturnReceiver['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
- }
- try {
- if($api22)
- {
- $response = $this->client->createShipmentOrder($shipment);
- }
- else{
- $response = $this->client->CreateShipmentDD($shipment);
- }
-
- } catch(SoapFault $exception)
- {
- if(trim($exception->getMessage()) == 'Authorization Required')
- {
- $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
- return false;
- }
- $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
- return;
- }
- if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
- $this->errors[] = "Fehlermeldung von DHL: ";
-
- if (is_soap_fault($response)) {
-
- $this->errors[] = $response->faultstring;
-
- } else {
-
- $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-
- }
- if($response->CreationState->StatusMessage)
- {
- foreach($response->CreationState->StatusMessage as $v)
- {
- $found = false;
- if($this->errors && is_array($this->errors))
- {
- foreach($this->errors as $err)
- {
- if($err == $v)$found = true;
- }
- }
- if(!$found)$this->errors[] = $v;
- }
- }
- return false;
- } else {
- $r = array();
- if($api22)
- {
- $r['shipment_number'] = (String) $response->CreationState->LabelData->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->LabelData->licensePlate;
- $r['label_url'] = (String) $response->CreationState->LabelData->labelUrl;
- $r['gesamt'] = $response;
- }else{
- $r['shipment_number'] = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
- $r['label_url'] = (String) $response->CreationState->Labelurl;
- }
- return $r;
- }
-
- }
-
-
- function createWeltShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null,$artikel=null) {
- $api2 = false;
- $api22 = isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe'];
- //if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
- $api22 = false;
- $this->buildClient($api2);
-
- $shipment = array();
-
- if($customer_details['country_code']=="DE")
- {
- $customer_details['country']="germany";
- } else if ($customer_details['country_code']=="UK")
- {
- $customer_details['country']="england";
- } else {
- $customer_details['country']="other";
- }
-
- // Version
- if($api22)
- {
- $shipment['Version'] = array('majorRelease' => '2', 'minorRelease' => '0');
- }else{
- $shipment['Version'] = array('majorRelease' => '1', 'minorRelease' => '0');
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $shipment['Version']['minorRelease'] = '1';
- }
- }
-
- // Order
- $shipment['ShipmentOrder'] = array();
- $s = array();
- // Fixme
- if($api22)
- {
- $shipment['ShipmentOrder']['sequenceNumber'] = '01';
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['shipmentDate'] = $customer_details['abholdatum'];
- else
- $s['shipmentDate'] = date('Y-m-d');
- $s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V54EPAK": "V53WPAK";
- $s['accountNumber'] =$this->einstellungen['ekp'].$this->einstellungen['partnerid']."01";
- }else{
- $shipment['ShipmentOrder']['SequenceNumber'] = '1';
- $s['ProductCode'] = 'BPI';
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['ShipmentDate'] = $customer_details['abholdatum'];
- else
- $s['ShipmentDate'] = date('Y-m-d');
- $s['EKP'] = $this->einstellungen['ekp'];
-
- $s['Attendance'] = array();
- $s['Attendance']['partnerID'] = $this->einstellungen['partnerid'];
- }
-
-
-
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
- }
-
- if($api22)
- {
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = '3';
- $s['ShipmentItem']['lengthInCM'] = '50';
- $s['ShipmentItem']['widthInCM'] = '30';
- $s['ShipmentItem']['heightInCM'] = '15';
- }
- }else{
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['WeightInKG'] = '3';
- $s['ShipmentItem']['LengthInCM'] = '50';
- $s['ShipmentItem']['WidthInCM'] = '30';
- $s['ShipmentItem']['HeightInCM'] = '15';
- // FIXME: What is this
- $s['ShipmentItem']['PackageType'] = 'PK';
- }
-
- // Falls ein Gewicht angegeben worden ist
- if($customer_details['weight']!="")
- $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
- }
- //$s['Service']['ServiceGroupBusinessPackInternational']['Economy'] = 'true';
- $s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
- if($bank_details != null)
- {
- $s['BankData'] = array();
- $s['BankData']['accountOwner'] = $bank_details['account_owner'];
- $s['BankData']['accountNumber'] = $bank_details['account_number'];
- $s['BankData']['bankCode'] = $bank_details['bank_code'];
- $s['BankData']['bankName'] = $bank_details['bank_name'];
- $s['BankData']['iban'] = $bank_details['iban'];
- $s['BankData']['bic'] = $bank_details['bic'];
- $s['BankData']['note'] = $bank_details['note'];
- }
-
-
-
- if($cod_details != null)
- {
- //$s['Service'] = array();
- //$s['Service']['ServiceGroupOther'] = array();
- $s['Service']['ServiceGroupOther']['COD'] = array();
- $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
- $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
- }
-
- // Auftragnummer auf Label
- if($api22)
- {
- $s['customerReference']=$customer_details['ordernumber'];
- if($customer_details['altersfreigabe'] >= 16)
- {
- $s['Service']['VisualCheckOfAge'] = array();
- $s['Service']['VisualCheckOfAge']['active'] = 1;
- $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
- }
- }else{
- $s['CustomerReference']=$customer_details['ordernumber'];
- }
- $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
- //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-
- $shipper = array();
- $shipper['Company'] = array();
- $shipper['Company']['Company'] = array();
- $shipper['Company']['Company']['name1'] = $this->info['company_name'];
-
- $shipper['Address'] = array();
- $shipper['Address']['streetName'] = $this->info['street_name'];
- $shipper['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $shipper['Address']['zip'] = $this->info['zip'];
- }else{
- $shipper['Address']['Zip'] = array();
-
- $shipper['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $shipper['Address']['city'] = $this->info['city'];
-
- $shipper['Address']['Origin'] = array('countryISOCode' => 'DE');
-
-
-
- $shipper['Communication'] = array();
- if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
- $shipper['Communication']['email'] = $this->info['email'];
- }
- if(empty($this->info['phone']))$this->info['phone'] = '0';
- $this->info['phone'] = str_replace('+','00',trim($this->info['phone']));
- $this->info['phone'] = preg_replace('![^0-9]!', '', $this->info['phone']);
- if(empty($this->info['phone']))$this->info['phone'] = '0';
-
- $shipper['Communication']['phone'] = $this->info['phone'];
- $shipper['Communication']['internet'] = $this->info['internet'];
-
- $shipper['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
- $receiver = array();
-
-
-
- $receiver['Company']['Company'] = array();
- $receiver['Company']['Company']['name1'] = $customer_details['name1'];
- if($customer_details['name2'])$receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
- if($customer_details['name2']!="")
- $tmp_name = explode(' ',$customer_details['name2'],2);
- else
- $tmp_name = explode(' ',$customer_details['name1'],2);
-
- if(isset($tmp_name[2]) && $tmp_name[2]){
- $receiver['Company']['Person'] = array();
- $receiver['Company']['Person']['firstname'] = $tmp_name[0];
- $receiver['Company']['Person']['lastname'] = $tmp_name[1];
- }
- /*
- $receiver['Company'] = array();
- $receiver['Company']['Person'] = array();
- $receiver['Company']['Person']['firstname'] = $customer_details['first_name'];
- $receiver['Company']['Person']['lastname'] = $customer_details['last_name'];
- */
- $receiver['Address'] = array();
- $receiver['Address']['streetName'] = $customer_details['street_name'];
- $receiver['Address']['streetNumber'] = $customer_details['street_number'];
- if($api22)
- {
- $receiver['Address']['zip'] = $customer_details['zip'];
- }else{
- $receiver['Address']['Zip'] = array();
- $receiver['Address']['Zip'][strtolower($customer_details['country'])] = $customer_details['zip'];
- }
- $receiver['Address']['city'] = $customer_details['city'];
- $receiver['Communication'] = array();
- if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $customer_details['email'])) {
- $receiver['Communication']['email'] = $customer_details['email'];
- }
-
- if(empty($customer_details['phone']))$customer_details['phone'] = '0';
- $customer_details['phone'] = str_replace('+','00',trim($customer_details['phone']));
- $customer_details['phone'] = preg_replace('![^0-9]!', '', $customer_details['phone']);
- if(empty($customer_details['phone']))$customer_details['phone'] = '0';
- $receiver['Communication']['phone'] = $customer_details['phone'];
-
- if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name2'];
- if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name1'];
- $receiver['Communication']['contactPerson'] = $customer_details['c/o'];
-
- $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-
-
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $ReturnReceiver = array();
- $ReturnReceiver['Company'] = array();
- $ReturnReceiver['Company']['Company'] = array();
- $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
- $ReturnReceiver['Address'] = array();
- $ReturnReceiver['Address']['streetName'] = $this->info['street_name'];
- $ReturnReceiver['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $ReturnReceiver['Address']['zip'] = $this->info['zip'];
- }else{
- $ReturnReceiver['Address']['Zip'] = array();
- $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $ReturnReceiver['Address']['city'] = $this->info['city'];
-
- $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- $ReturnReceiver['Communication'] = array();
- if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
- $shipper['Communication']['email'] = $this->info['email'];
- }
- $ReturnReceiver['Communication']['phone'] = $this->info['phone'];
- $ReturnReceiver['Communication']['internet'] = $this->info['internet'];
- $ReturnReceiver['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
- }
-
- if($api22)
- {
- //$export['invoiceType'] = "commercial";
- //$export['invoiceDate'] = date('Y-m-d');
- $export['invoiceNumber'] = $customer_details['ordernumber'];
- $export['exportType'] = 0;
- $export['exportTypeDescription'] = $this->info['export_reason'];
- $export['commodityCode'] = "";
- $export['termsOfTrade'] = "DDP";
- $export['amount'] = (!empty($artikel)?count($artikel):0);
- //$export['Description'] = $this->info['export_reason'];
- //$export['CountryCodeOrigin'] = "DE";
- $export['additionalFee'] = "10";
- $export['customsValue'] = number_format($customer_details['amount'],2,".","");
- $export['customsCurrency'] = $customer_details['currency'];
- //$export['permitNumber'] = "";
-
- }else{
- $export['InvoiceType'] = "commercial";
- $export['InvoiceDate'] = date('Y-m-d');
- $export['InvoiceNumber'] = $customer_details['ordernumber'];
- $export['ExportType'] = 0;
- $export['ExportTypeDescription'] = $this->info['export_reason'];
- $export['CommodityCode'] = "";
- $export['TermsOfTrade'] = "DDP";
- $export['Amount'] = (!empty($artikel)?count($artikel):0);
- $export['Description'] = $this->info['export_reason'];
- $export['CountryCodeOrigin'] = "DE";
- $export['AdditionalFee'] = "10";
- $export['CustomsValue'] = number_format($customer_details['amount'],2,".","");
- $export['CustomsCurrency'] = $customer_details['currency'];
- $export['PermitNumber'] = "";
- }
-
- $p=0;
- for($i=0;$i<(!empty($artikel)?count($artikel):0);$i++)
- {
- if($p>4 && (($export['ExportDocPosition'][4]['CustomsValue'] + $artikel[$i]['value']*$artikel[$i]['amount']) > 0)) {
- if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
- if($api22)
- {
- $export['ExportDocPosition'][4]['description'] = "Additional Positions";
- $export['ExportDocPosition'][4]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][4]['commodityCode'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][4]['amount'] += $artikel[$i]['amount'];
- $export['ExportDocPosition'][4]['netWeightInKG'] += $artikel[$i]['netweightinkg'];
- $export['ExportDocPosition'][4]['grossWeightInKG'] += $artikel[$i]['grossweightinkg'];
- $export['ExportDocPosition'][4]['customsValue'] += number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
- $export['ExportDocPosition'][4]['customsCurrency'] = $artikel[$i]['currency'];
-
- }else{
- $export['ExportDocPosition'][4]['Description'] = "Additional Positions";
- $export['ExportDocPosition'][4]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][4]['CommodityCode'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][4]['Amount'] += $artikel[$i]['amount'];
- $export['ExportDocPosition'][4]['NetWeightInKG'] += $artikel[$i]['netweightinkg'];
- $export['ExportDocPosition'][4]['GrossWeightInKG'] += $artikel[$i]['grossweightinkg'];
- $export['ExportDocPosition'][4]['CustomsValue'] += number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
- $export['ExportDocPosition'][4]['CustomsCurrency'] = $artikel[$i]['currency'];
- }
- } else {
-
- if($artikel[$i]['value']*$artikel[$i]['amount'] > 0)
- {
- if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
- if($api22)
- {
- $export['ExportDocPosition'][$p]['description'] = preg_replace("/[^a-z0-9-.\ \]\[\)\(]/i",'',str_replace(array('ä','Ä','ö','Ö','ü','Ü','ß'),array('ae','Ae','oe','Oe','ue','Ue','ss'),$artikel[$i]['description']));
- $export['ExportDocPosition'][$p]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][$p]['commodityCode'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][$p]['amount'] = round($artikel[$i]['amount']);
- $export['ExportDocPosition'][$p]['netWeightInKG'] = $artikel[$i]['netweightinkg'];
- $export['ExportDocPosition'][$p]['grossWeightInKG'] = $artikel[$i]['grossweightinkg'];
-
- }else{
- $export['ExportDocPosition'][$p]['Description'] = preg_replace("/[^a-z0-9-.\ \]\[\)\(]/i",'',str_replace(array('ä','Ä','ö','Ö','ü','Ü','ß'),array('ae','Ae','oe','Oe','ue','Ue','ss'),$artikel[$i]['description']));
- $export['ExportDocPosition'][$p]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][$p]['CommodityCode'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][$p]['Amount'] = round($artikel[$i]['amount']);
- $export['ExportDocPosition'][$p]['NetWeightInKG'] = $artikel[$i]['netweightinkg'];
- $export['ExportDocPosition'][$p]['GrossWeightInKG'] = $artikel[$i]['grossweightinkg'];
- }
-
- if($artikel[$i]['value']*$artikel[$i]['amount'] > 0)
- $export['ExportDocPosition'][$p]['CustomsValue'] = number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
- $export['ExportDocPosition'][$p]['CustomsCurrency'] = $artikel[$i]['currency'];
- $p++;
- }
- }
- }
-
- $shipment['ShipmentOrder']['Shipment']['ExportDocument'] = $export;
- try {
-
- if($api22)
- {
- $response = $this->client->createShipmentOrder($shipment);
- }else{
- $response = $this->client->CreateShipmentDD($shipment);
- }
- } catch(SoapFault $exception)
- {
- if(trim($exception->getMessage()) == 'Authorization Required')
- {
- $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
- return false;
- }
- $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
- return;
- }
-
-
-
-
- file_put_contents("request.xml",$this->client->__getLastRequest());
- file_put_contents("response.xml",$this->client->__getLastResponse());
-
- if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
- $this->errors[] = "Fehlermeldung von DHL: ";
-
- if (is_soap_fault($response)) {
-
- $this->errors[] = $response->faultstring;
- } else {
-
- $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-
- }
- if($response->CreationState->StatusMessage)
- {
- foreach($response->CreationState->StatusMessage as $v)
- {
- $found = false;
- if($this->errors && is_array($this->errors))
- {
- foreach($this->errors as $err)
- {
- if($err == $v)$found = true;
- }
- }
- if(!$found)$this->errors[] = $v;
- }
- }
-
- return false;
-
- } else {
-
- $r = array();
- $r['shipment_number'] = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
- $r['label_url'] = (String) $response->CreationState->Labelurl;
- return $r;
- }
- }
-
- function GetExportDocDD($shippment_number, $api22 = false) {
-
- $this->buildClient();
-
- $shipment = array();
-
- // Version
- if($api22)
- {
- $shipment['Version'] = array('majorRelease' => '2', 'minorRelease' => '0');
- }else{
- $shipment['Version'] = array('majorRelease' => '1', 'minorRelease' => '0');
- }
-
- // Order
- $shipment['ShipmentNumber'] = array('shipmentNumber'=>$shippment_number);
- //$shipment['DocType'] = 'PDF';
- $shipment['DocType'] = 'URL';
-
- // Fixme
- try {
- $response = $this->client->GetExportDocDD($shipment);
- } catch(SoapFault $exception)
- {
- if(trim($exception->getMessage()) == 'Authorization Required')
- {
- $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
- return false;
- }
-
- $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
- return false;
- }
-
- if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
- $this->errors[] = "Fehlermeldung von DHL: ";
- if (is_soap_fault($response)) {
- $this->errors[] = $response->faultstring;
- } else {
- $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
- }
- return false;
- } else {
- $r = array();
- $r['export_pdf'] = (String) $response->ExportDocData->ExportDocPDFData;
- $r['export_url'] = (String) $response->ExportDocData->ExportDocURL;
- return $r;
- }
- }
-
- private function buildAuthHeader() {
-
- $head = $this->einstellungen;
-
- $auth_params = array(
- 'user' => $this->einstellungen['user'],
- 'signature' => $this->einstellungen['signature'],
- 'type' => 0
-
- );
- try{
- $erg = new SoapHeader('http://dhl.de/webservice/cisbase','Authentification', $auth_params);
- } catch(SoapFault $exception)
- {
- $erg = false;
- $this->errors[] = "Authentifizierungsfehler: ".$exception->getMessage();
- }
- return $erg;
-
-
- }
-
-
-}
-
-?>
diff --git a/www/lib/versandarten/content/createshipment.tpl b/www/lib/versandarten/content/createshipment.tpl
new file mode 100644
index 00000000..04d3f8e1
--- /dev/null
+++ b/www/lib/versandarten/content/createshipment.tpl
@@ -0,0 +1,279 @@
+
+
+
+
\ No newline at end of file
diff --git a/www/lib/versandarten/content/versandarten_dhlversenden.tpl b/www/lib/versandarten/content/versandarten_dhlversenden.tpl
deleted file mode 100644
index a0b10c35..00000000
--- a/www/lib/versandarten/content/versandarten_dhlversenden.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-Datei ' . $parameter1 . 'wawision_test.txt' . ' wurde erstellt!
');
- }else{
- $this->app->Tpl->Add('MESSAGE', 'Datei konnte nicht angelegt werden!
');
- }
- }else{
- $this->app->Tpl->Add('MESSAGE',
- 'Speicherort existiert nicht oder ist nicht erreichbar!
');
- }
- }else{
- $this->app->Tpl->Add('MESSAGE', 'Bitte einen Speicherort angeben!
');
- }
- }
-
- parent::Einstellungen($target);
- }
-
- //TODO ....
-
- /*function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
- {
- $notsend = 0;
- //$rawlink = 'https://tracking.dpd.de/parcelstatus/?locale=de_DE&query='.$tracking;
- $rawlink = ' https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DE03/DE/5004.htm?txtRefNo='.$tracking.'&txtAction=71000';
- $link = 'GLS Versand: '.$tracking.' ('.$rawlink.')';
- }*/
-
- public function GetBezeichnung()
- {
- return 'DHL 3.0';
- }
-
- /**
- * @return array[]
- */
- public function getCreateForm()
+ public function AdditionalSettings(): array
{
return [
- [
- 'id' => 0,
- 'name' => 'usernameGroup',
- 'inputs' => [
- [
- 'label' => 'Benutzername',
- 'type' => 'text',
- 'name' => 'dhl_username',
- 'validation' => true,
- ],
- ],
- ],
- [
- 'id' => 1,
- 'name' => 'passwordGroup',
- 'inputs' => [
- [
- 'label' => 'Passwort',
- 'type' => 'text',
- 'name' => 'dhl_password',
- 'validation' => true,
- ]
- ],
- ],
- [
- 'id' => 2,
- 'name' => 'accountNumberGroup',
- 'inputs' => [
- [
- 'label' => 'Abrechnungsnummer',
- 'type' => 'text',
- 'name' => 'dhl_accountnumber',
- 'validation' => true,
- ]
- ],
- ]
+ 'user' => array('typ' => 'text', 'bezeichnung' => 'Benutzer:', 'info' => 'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
+ 'signature' => array('typ' => 'text', 'bezeichnung' => 'Signature:', 'info' => 'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
+ 'ekp' => array('typ' => 'text', 'bezeichnung' => 'EKP', 'info' => '5000000000 (gültige DHL Kundennummer)'),
+ 'accountnumber' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket:'),
+ 'accountnumber_int' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket International:'),
+ 'accountnumber_euro' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Europaket:'),
+ 'accountnumber_connect' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket Connect:'),
+ 'accountnumber_wp' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Warenpost:'),
+ 'accountnumber_wpint' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Warenpost International:'),
+// 'intraship_retourenaccount' => array('typ' => 'text', 'bezeichnung' => 'Retouren Account:', 'info' => '14 Stellige DHL-Retoure Abrechnungsnummer'),
+// 'intraship_retourenlabel' => array('typ' => 'checkbox', 'bezeichnung' => 'Vorauswahl Retourenlabel:', 'info' => 'Druckt Retourenlabel mit'),
+
+ 'sender_name1' => array('typ' => 'text', 'bezeichnung' => 'Versender Firma:'),
+ 'sender_street' => array('typ' => 'text', 'bezeichnung' => 'Versender Strasse:'),
+ 'sender_streetnumber' => array('typ' => 'text', 'bezeichnung' => 'Versender Strasse Nr.:'),
+ 'sender_zip' => array('typ' => 'text', 'bezeichnung' => 'Versender PLZ:'),
+ 'sender_city' => array('typ' => 'text', 'bezeichnung' => 'Versender Stadt:'),
+ 'sender_country' => array('typ' => 'text', 'bezeichnung' => 'Versender ISO Code:', 'info' => 'DE'),
+ 'sender_email' => array('typ' => 'text', 'bezeichnung' => 'Versender E-Mail:'),
+ 'sender_phone' => array('typ' => 'text', 'bezeichnung' => 'Versender Telefon:'),
+ 'sender_web' => array('typ' => 'text', 'bezeichnung' => 'Versender Web:'),
+ 'sender_contact_person' => array('typ' => 'text', 'bezeichnung' => 'Versender Ansprechpartner:'),
+
+ 'cod_account_owner' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Kontoinhaber:'),
+ 'cod_bank_name' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Bank Name:'),
+ 'cod_account_iban' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme IBAN:'),
+ 'cod_account_bic' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme BIC:'),
+ 'cod_extra_fee' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Gebühr:', 'info' => 'z.B. 2,00 wird auf Rechnungsbetrag addiert, da DHL dies als extra Gebühr für sich behält'),
+
+ 'weight' => array('typ' => 'text', 'bezeichnung' => 'Standard Gewicht:', 'info' => 'in KG'),
+ 'length' => array('typ' => 'text', 'bezeichnung' => 'Standard Länge:', 'info' => 'in cm'),
+ 'width' => array('typ' => 'text', 'bezeichnung' => 'Standard Breite:', 'info' => 'in cm'),
+ 'height' => array('typ' => 'text', 'bezeichnung' => 'Standard Höhe:', 'info' => 'in cm'),
+
+ 'product' => array('typ' => 'text', 'bezeichnung' => 'Standard Produkt:', 'info' => 'z.B. in DE: V01PAK oder AT: V86PARCEL'),
+ 'use_premium' => array('typ' => 'checkbox', 'bezeichnung' => 'Premiumversand verwenden:'),
+/*
+ 'intraship_vorausverfuegung' => array('typ' => 'select', 'bezeichnung' => 'Vorausverfügung: ', 'optionen' => array('-' => 'keine Vorausverfügung', 'IMMEDIATE' => 'Sofortige Rücksendung an den Absender', 'AFTER_DEADLINE' => 'Rücksenden an den Absender nach Ablauf der Frist', 'ABANDONMENT' => 'Preisgabe des Pakets durch den Absender (entgeltfrei)')),
+
+ 'sperrgut' => array('typ' => 'checkbox', 'bezeichnung' => 'Sperrgut:'),
+ 'keineversicherung' => array('typ' => 'checkbox', 'bezeichnung' => 'Extra Versicherung ausschalten:', 'info' => 'Option muss von Hand im Paketmarkendialog gesetzt werden.'),
+ 'leitcodierung' => array('typ' => 'checkbox', 'bezeichnung' => 'Leitcodierung aktivieren:'),
+ 'use_shipping_article_from_order_on_export' => ['typ' => 'checkbox', 'bezeichnung' => 'Bei Export Porto aus Auftrag senden:'],
+ 'autotracking' => array('typ' => 'checkbox', 'bezeichnung' => 'Tracking übernehmen:'),
+ 'log' => array('typ' => 'checkbox', 'bezeichnung' => 'Logging')*/
];
}
- /**
- * @param array $postData
- *
- * @return array
- */
- public function updatePostDataForAssistent($postData): array
+ public function CreateShipment(object $json, array $address): CreateShipmentResult
{
- $name = $this->app->erp->Firmendaten('name');
- $street = $this->app->erp->Firmendaten('strasse');
- $zip = $this->app->erp->Firmendaten('plz');
- $city = $this->app->erp->Firmendaten('ort');
- $country = $this->app->erp->Firmendaten('land');
- $houseNo = '';
-
- $streetParts = explode(' ', $street);
- $partsCount = count($streetParts);
-
- if($partsCount >= 2){
- $street = implode(' ', array_slice($streetParts, 0, $partsCount - 1));
- $houseNo = $streetParts[$partsCount - 1];
+ $shipment = new Shipment();
+ $shipment->ShipmentDetails->product = $json->product;
+ $shipment->ShipmentDetails->accountNumber = $this->GetAccountNumber($json->product);
+ $shipment->ShipmentDetails->SetShipmentDate(new DateTimeImmutable('today'));
+ $shipment->ShipmentDetails->ShipmentItem = new ShipmentItem();
+ $shipment->ShipmentDetails->ShipmentItem->weightInKG = $json->weight ?? 0;
+ $shipment->ShipmentDetails->ShipmentItem->lengthInCM = $json->length;
+ $shipment->ShipmentDetails->ShipmentItem->widthInCM = $json->width;
+ $shipment->ShipmentDetails->ShipmentItem->heightInCM = $json->height;
+ $shipment->Shipper->Name->name1 = $this->settings->sender_name1 ?? '';
+ $shipment->Shipper->Address->streetName = $this->settings->sender_street ?? '';
+ $shipment->Shipper->Address->streetNumber = $this->settings->sender_streetnumber;
+ $shipment->Shipper->Address->zip = $this->settings->sender_zip ?? '';
+ $shipment->Shipper->Address->city = $this->settings->sender_city ?? '';
+ $shipment->Shipper->Address->Origin = Country::Create($this->settings->sender_country ?? 'DE');
+ $shipment->Shipper->Communication = new Communication();
+ $shipment->Shipper->Communication->phone = $this->settings->sender_phone;
+ $shipment->Shipper->Communication->email = $this->settings->sender_email;
+ $shipment->Shipper->Communication->contactPerson = $this->settings->sender_contact_person;
+ $shipment->Receiver->name1 = $json->name;
+ switch ($json->addresstype) {
+ case 0:
+ $shipment->Receiver->Address = new ReceiverNativeAddress();
+ $shipment->Receiver->Address->name2 = $json->name2;
+ $shipment->Receiver->Address->streetName = $json->street ?? '';
+ $shipment->Receiver->Address->streetNumber = $json->streetnumber;
+ $shipment->Receiver->Address->city = $json->city ?? '';
+ $shipment->Receiver->Address->zip = $json->zip ?? '';
+ $shipment->Receiver->Address->Origin = Country::Create($json->country ?? 'DE', $json->state);
+ if (isset($json->address2) && !empty($json->address2))
+ $shipment->Receiver->Address->addressAddition[] = $json->address2;
+ break;
+ case 1:
+ $shipment->Receiver->Packstation = new PackStation();
+ $shipment->Receiver->Packstation->postNumber = $json->postnumber;
+ $shipment->Receiver->Packstation->packstationNumber = $json->parcelstationNumber;
+ $shipment->Receiver->Packstation->city = $json->city ?? '';
+ $shipment->Receiver->Packstation->zip = $json->zip ?? '';
+ $shipment->Receiver->Packstation->Origin = Country::Create($json->country ?? 'DE', $json->state);
+ break;
+ case 2:
+ $shipment->Receiver->Postfiliale = new Postfiliale();
+ $shipment->Receiver->Postfiliale->postNumber = $json->postnumber;
+ $shipment->Receiver->Postfiliale->postfilialeNumber = $json->postofficeNumber;
+ $shipment->Receiver->Postfiliale->city = $json->city ?? '';
+ $shipment->Receiver->Postfiliale->zip = $json->zip ?? '';
+ $shipment->Receiver->Postfiliale->Origin = Country::Create($json->country ?? 'DE', $json->state);
+ break;
}
+ $shipment->Receiver->Communication = new Communication();
+ $shipment->Receiver->Communication->email = $json->email;
+ $shipment->Receiver->Communication->phone = $json->phone;
+ $api = new DhlApi($this->settings->user, $this->settings->signature);
- $postData['dhl_origin_name'] = $name;
- $postData['dhl_origin_street'] = $street;
- $postData['dhl_origin_houseno'] = $houseNo;
- $postData['dhl_origin_zip'] = $zip;
- $postData['dhl_origin_city'] = $city;
- $postData['dhl_origin_country'] = $country;
-
- return $postData;
- }
-
- /**
- * @return JsonResponse|null
- */
- public function AuthByAssistent()
- {
- $step = (int)$this->app->Secure->GetPOST('step');
- if($step == 0){
- $username = $this->app->Secure->GetPOST('dhl_username');
- $password = $this->app->Secure->GetPOST('dhl_password');
- $accountnumber = $this->app->Secure->GetPOST('dhl_accountnumber');
-
- $error = null;
- if(empty($username)){
- $error = 'Bitte Nutzernamen eingeben';
- }else if(empty($password)){
- $error = 'Bitte Passwort eingeben';
- }else if(empty($accountnumber)){
- $error = 'Bitte Abrechnungsnummer eingeben';
- }
-
- if($error != null) {
- return new JsonResponse(
- ['error' => $error],
- JsonResponse::HTTP_BAD_REQUEST
- );
- }
-
- try{
- $this->testCredentials($username, $password, $accountnumber);
- }catch (DhlBaseException $e){
- return new JsonResponse(
- ['error' => $e->getMessage()],
- JsonResponse::HTTP_BAD_REQUEST
- );
- }
+ $ret = new CreateShipmentResult();
+ $result = $api->CreateShipment($shipment);
+ if (!$result instanceof CreateShipmentOrderResponse) {
+ $ret->Errors[] = $result;
+ return $ret;
}
-
- return null;
- }
-
-
- /**
- * @return array
- */
- public function getStructureDataForClickByClickSave(): array
- {
- return $this->updatePostDataForAssistent([]);
- }
-
- function EinstellungenStruktur()
- {
- if(!empty($this->einstellungen['dhl_username']) && !empty($this->einstellungen['dhl_password'])){
- try{
- $this->testCredentials($this->einstellungen['dhl_username'], $this->einstellungen['dhl_password'], $this->einstellungen['dhl_accountnumber']);
- $this->app->Tpl->Set('MESSAGE', 'Zugangsdaten erfolgreich überprüft
');
- }catch (DhlBaseException $e){
- $this->app->Tpl->Set('MESSAGE', '' . $e->getMessage() . '
');
- }
+ if ($result->Status->statusCode === 0) {
+ $ret->Success = true;
+ $ret->TrackingNumber = $result->CreationState->shipmentNumber;
+ $ret->TrackingUrl = sprintf('https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s', $ret->TrackingNumber);
+ if (isset($result->CreationState->LabelData->labelData))
+ $ret->Label = base64_decode($result->CreationState->LabelData->labelData);
+ if (isset($result->CreationState->LabelData->exportLabelData))
+ $ret->ExportDocuments = base64_decode($result->CreationState->LabelData->exportLabelData);
+ } else if (isset($result->CreationState)) {
+ if (is_array($result->CreationState->LabelData->Status->statusMessage))
+ $ret->Errors = $result->CreationState->LabelData->Status->statusMessage;
+ else
+ $ret->Errors[] = $result->CreationState->LabelData->Status->statusMessage;
+ } else {
+ $ret->Errors[] = $result->Status->statusText;
}
-
-
-
- return [
- 'dhl_username' => ['typ' => 'text', 'bezeichnung' => 'Benutzername:'],
- 'dhl_password' => ['typ' => 'text', 'bezeichnung' => 'Passwort:'],
- 'dhl_accountnumber' => ['typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer:'],
- 'dhl_origin_name' => ['typ' => 'text', 'bezeichnung' => 'Versender Name:'],
- 'dhl_origin_street' => ['typ' => 'text', 'bezeichnung' => 'Versender Strasse:'],
- 'dhl_origin_houseno' => ['typ' => 'text', 'bezeichnung' => 'Versender Hausnummer:'],
- 'dhl_origin_city' => ['typ' => 'text', 'bezeichnung' => 'Versender Ort:'],
- 'dhl_origin_zip' => ['typ' => 'text', 'bezeichnung' => 'Versender PLZ:'],
- 'dhl_origin_country' => ['typ' => 'text', 'bezeichnung' => 'Versender Land (2-stellig):'],
- 'dhl_origin_email' => ['typ' => 'text', 'bezeichnung' => 'Versender Email:'],
-
- 'dhl_height' => ['typ' => 'text', 'bezeichnung' => 'Standardhöhe'],
- 'dhl_width' => ['typ' => 'text', 'bezeichnung' => 'Standardbreite'],
- 'dhl_length' => ['typ' => 'text', 'bezeichnung' => 'Standardlänge'],
-
- 'dhl_export_product_type' => [
- 'typ' => 'select',
- 'bezeichnung' => 'Export Producttyp',
- 'optionen' => [
- 'PRESENT' => 'Geschenke',
- 'COMMERCIAL_SAMPLE' => 'Kommerzielle Probe',
- 'DOCUMENT' => 'Dokumente',
- 'RETURN_OF_GOODS' => 'Rücksendungen',
- 'OTHER' => 'Andere',
- ]
- ],
- 'dhl_export_product_type_description' => [
- 'typ' => 'text',
- 'bezeichnung' => 'Beschreibung im Falle von "Andere"'
- ],
-
- 'dhl_product' => [
- 'typ' => 'select',
- 'bezeichnung' => 'Produkt:',
- 'optionen' => [
- 'V01PAK' => 'Paket national',
- 'V53WPAK' => 'Paket international'
- ],
- ],
- 'dhl_coding' => ['typ' => 'checkbox', 'bezeichnung' => 'Leitcodierung aktivieren'],
- 'autotracking' => ['typ' => 'checkbox', 'bezeichnung' => 'Tracking übernehmen:'],
- ];
- }
-
- public function testCredentials($username, $password, $accountNumber){
- /** @var DhlApiFactory $dhlApiFactory */
- $dhlApiFactory = $this->app->Container->get('DhlApiFactory');
-
- /** @var DhlApi $dhlApi */
- $dhlApi = $dhlApiFactory->createProductionInstance(
- $username,
- $password,
- $accountNumber,
- '',
- '',
- '',
- '',
- '',
- '',
- ''
- );
-
- try {
- $dhlApi->validateShipment(new CreateNationalShipmentRequest(
- date("Y-m-d"),
- 1.0,
- 10,
- 20,
- 30,
- "Max muster",
- '',
- '',
- 'Teststr. 1',
- '11',
- '86153',
- 'Augsburg',
- 'DE',
- 'max.muster@xentral.com',
- false
- ));
- }catch (InvalidRequestDataException $e){
- // do nothing, test data is invalid
- }
- }
-
- public function PaketmarkeDrucken($id, $sid)
- {
- $adressdaten = $this->GetAdressdaten($id, $sid);
- $ret = $this->Paketmarke($sid, $id, '', false, $adressdaten);
- if($sid === 'lieferschein'){
- $deliveryNoteArr = $this->app->DB->SelectRow("SELECT adresse,projekt,versandart,auftragid FROM lieferschein WHERE id = '$id' LIMIT 1");
- $adresse = $deliveryNoteArr['adresse'];
- $projekt = $deliveryNoteArr['projekt'];
- $versandart = $deliveryNoteArr['versandart'];
- $adressvalidation = 2;
- if($ret){
- $adressvalidation = 1;
- }
- $tracking = '';
- if(isset($adressdaten['tracking'])){
- $tracking = $adressdaten['tracking'];
- }
- if(!isset($adressdaten['versandid'])){
- $adressdaten['versandid'] = $this->app->DB->Select("SELECT id FROM versand WHERE abgeschlossen = 0 AND tracking = '' AND lieferschein = '$id' LIMIT 1");
- }
- if(!isset($adressdaten['versandid'])){
- $this->app->DB->Insert("INSERT INTO versand (versandunternehmen, tracking,
- versendet_am,abgeschlossen,lieferschein,freigegeben,firma,adresse,projekt,paketmarkegedruckt,adressvalidation)
- VALUES ($versandart','$tracking',NOW(),1,'$id',1,'1','$adresse','$projekt',1,'$adressvalidation') ");
- $adressdaten['versandid'] = $this->app->DB->GetInsertID();
- }elseif($tracking){
- $this->app->DB->Update("UPDATE versand SET freigegeben = 1, abgeschlossen = 1, tracking =1, paketmarkegedruckt = 1, tracking= '$tracking',adressvalidation = '$adressvalidation', versendet_am = now() WHERE id = '" . $adressdaten['versandid'] . "' LIMIT 1");
- $this->app->DB->Update("UPDATE versand SET versandunternehmen = versandart WHERE id = '" . $adressdaten['versandid'] . "' AND versandunternehmen = '' LIMIT 1");
- $this->app->DB->Update("UPDATE versand SET versandunternehmen = '$versandart' WHERE id = '" . $adressdaten['versandid'] . "' AND versandunternehmen = '' LIMIT 1");
- }
- $auftragid = $deliveryNoteArr['auftragid'];
- if($auftragid){
- $this->app->DB->Update("UPDATE auftrag SET schreibschutz = 1, status = 'abgeschlossen' WHERE id = '$auftragid' AND status = 'freigegeben' LIMIT 1");
- }
- if($adressvalidation == 1){
- $this->app->erp->LieferscheinProtokoll($id, 'Paketmarke automatisch gedruckt');
- if($adressdaten['versandid']){
- return $adressdaten['versandid'];
- }
- }elseif($adressvalidation == 2){
- $this->app->erp->LieferscheinProtokoll($id, 'automatisches Paketmarke Drucken fehlgeschlagen');
- }
- }
-
return $ret;
}
- public function Paketmarke($doctyp, $docid, $target = '', $error = false, &$adressdaten = null)
+ public function GetShippingProducts(): array
{
- $id = $docid;
- $sid = $doctyp;
- if($adressdaten === null){
- $drucken = $this->app->Secure->GetPOST('drucken');
- $anders = $this->app->Secure->GetPOST('anders');
- $tracking_again = $this->app->Secure->GetGET('tracking_again');
- $module = $this->app->Secure->GetPOST('module');
- if(empty($module)){
- $module = $doctyp;
- }
- }else{
- $drucken = 1;
- $anders = '';
- $tracking_again = '';
- $module = $doctyp;
+ $result = [];
+ if ($this->settings->accountnumber) {
+ $result[] = Product::Create('V01PAK', 'DHL Paket')
+ ->WithLength(15, 120)
+ ->WithWidth(11, 60)
+ ->WithHeight(1, 60)
+ ->WithWeight(0.01, 31.5);
}
-
-
- /** @var DhlApiFactory $dhlApiFactory */
- $dhlApiFactory = $this->app->Container->get('DhlApiFactory');
-
- /** @var DhlApi $dhlApi */
- $dhlApi = $dhlApiFactory->createProductionInstance(
- $this->einstellungen['dhl_username'],
- $this->einstellungen['dhl_password'],
- $this->einstellungen['dhl_accountnumber'],
- $this->einstellungen['dhl_origin_name'],
- $this->einstellungen['dhl_origin_street'],
- $this->einstellungen['dhl_origin_houseno'],
- $this->einstellungen['dhl_origin_zip'],
- $this->einstellungen['dhl_origin_city'],
- $this->einstellungen['dhl_origin_country'],
- $this->einstellungen['dhl_origin_email']
- );
-
- if($drucken != '' || $tracking_again == '1'){
-
- if($tracking_again != "1"){
- $versandId = 0;
- if($module === 'retoure'){
- $Query = $this->app->DB->SelectRow("SELECT * FROM retoure where id='$id'");
- }elseif($module === 'versand'){
- $versandId = $id;
- $lieferschein = $this->app->DB->Select("SELECT lieferschein WHERE id = '$id' LIMIT 1");
- $Query = $this->app->DB->SelectRow("SELECT * FROM lieferschein where id='$lieferschein'");
- }else{
- $Query = $this->app->DB->SelectRow("SELECT * FROM lieferschein where id='$id'");
- }
- $projekt = $Query['projekt'];
- $Adresse = $this->app->DB->SelectRow("SELECT * FROM adresse WHERE id='" . $Query['adresse'] . "'");
- $product = '';
- $Country = $Query['land'];
- if($adressdaten === null){
- $versandmit = $this->app->Secure->GetPOST("versandmit");
- $trackingsubmit = $this->app->Secure->GetPOST("trackingsubmit");
- $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
- $tracking = $this->app->Secure->GetPOST("tracking");
- $trackingsubmitcancel = $this->app->Secure->GetPOST("trackingsubmitcancel");
- $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");
-
- //$Weight = $this->app->Secure->GetPOST("kg1");
- $Name = $this->app->Secure->GetPOST("name");
- $Name2 = $this->app->Secure->GetPOST("name2");
- $Name3 = $this->app->Secure->GetPOST("name3");
- $Street = $this->app->Secure->GetPOST("strasse");
- $HouseNo = $this->app->Secure->GetPOST("hausnummer");
- $ZipCode = $this->app->Secure->GetPOST("plz");
- $City = $this->app->Secure->GetPOST("ort");
- $Mail = $this->app->Secure->GetPOST("email");
- $Phone = $this->app->Secure->GetPOST("phone");
- $Country = $this->app->Secure->GetPOST("land");
- $Weight = $this->app->Secure->GetPOST('kg1');
-
- $height = $this->app->Secure->GetPOST('height');
- $wigth = $this->app->Secure->GetPOST('width');
- $length = $this->app->Secure->GetPOST('length');
-
- $coding = $this->app->Secure->GetPOST('coding') == '1';
- }else{
- $versandmit = '';//$this->app->Secure->GetPOST("versandmit");
- $trackingsubmit = '';//$this->app->Secure->GetPOST("trackingsubmit");
- $versandmitbutton = '';//$this->app->Secure->GetPOST("versandmitbutton");
- $tracking = '';//$this->app->Secure->GetPOST("tracking");
- $trackingsubmitcancel = '';//$this->app->Secure->GetPOST("trackingsubmitcancel");
- $retourenlabel = '';// $this->app->Secure->GetPOST("retourenlabel");
-
- $Name = $adressdaten["name"];
- $Name2 = $adressdaten["name2"];
- $Name3 = $adressdaten["name3"];
- $Street = $adressdaten["strasse"];
- $HouseNo = $adressdaten["hausnummer"];
- $ZipCode = $adressdaten['plz'];
- $City = $adressdaten['ort'];
- $Mail = $adressdaten['email'];
- $Phone = $adressdaten["telefon"];
- $Country = $adressdaten["land"];
- $Company = "Company";
- $Weight = $adressdaten["standardkg"];
- $coding = $this->einstellungen['dhl_coding'] == 1;
-
- $height = $this->einstellungen('dhl_height');
- $wigth = $this->einstellungen('dhl_width');
- $length = $this->einstellungen('dhl_length');
-
- }
-
- try {
- $shipmentDate = date("Y-m-d");
-
- switch ($this->einstellungen['dhl_product']) {
- case 'V01PAK':
- {
- $shipmentData = new CreateNationalShipmentRequest(
- $shipmentDate,
- $Weight,
- $length,
- $wigth,
- $height,
- $Name,
- $Name2,
- $Name3,
- $Street,
- $HouseNo,
- $ZipCode,
- $City,
- $Country,
- $Mail,
- $coding
- );
- break;
- }
- case 'V53WPAK':
- {
- $shipmentData = new CreateInterationalShipmentRequest(
- $shipmentDate,
- $Weight,
- $length,
- $wigth,
- $height,
- $Name,
- $Name2,
- $Name3,
- $Street,
- $HouseNo,
- $ZipCode,
- $City,
- $Country,
- $Mail,
- $coding,
- $this->einstellungen['dhl_export_product_type'],
- $this->einstellungen['dhl_export_product_type_description'],
- $this->getPackageContents($Query['id'])
- );
- break;
- }
- default:
- {
- throw new UnknownProductException();
- }
- }
-
- $createResponse = $dhlApi->createShipment($shipmentData);
-
- if($this->einstellungen['autotracking'] == "1")
- $this->SetTracking($createResponse->getShipmentNumber(), $sid === 'versand' ? $id : 0, $lieferschein);
-
-
- $data['drucker'] = $this->paketmarke_drucker;
- $data['druckerlogistikstufe2'] = $this->export_drucker;
-
- if(!$data['drucker']){
- if($this->app->erp->GetStandardPaketmarkendrucker() > 0){
- $data['drucker'] = $this->app->erp->GetStandardPaketmarkendrucker();
- }
- }
-
- if(!$data['druckerlogistikstufe2']){
- if($this->app->erp->GetStandardVersanddrucker($projekt) > 0){
- $data['druckerlogistikstufe2'] = $this->app->erp->GetStandardVersanddrucker($projekt);
- }
- }
- $pdf = $createResponse->getLabelAsPdf();
- $datei = $this->app->erp->GetTMP() . 'DhlLabel_' . $createResponse->getShipmentNumber() . '.pdf';
-
- file_put_contents($datei, $pdf);
-
- $spoolerId = $this->app->printer->Drucken($data['drucker'], $datei);
- if($spoolerId > 0 && $versandId > 0){
- $this->app->DB->Update(
- sprintf(
- 'UPDATE versand SET lastspooler_id = %d, lastprinter = %d WHERE id = %d',
- $spoolerId, $data['drucker'], $versandId
- )
- );
- }
- if($module === 'retoure'){
- if(@is_file($datei) && @filesize($datei)){
- $fileid = $this->app->erp->CreateDatei('DhlMarkeLabel_' . $this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1") . '.pdf',
- 'Anhang', '', "", $datei,
- $this->app->DB->real_escape_string($this->app->User->GetName()));
- $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
- }
- }
-
- unlink($datei);
- if($adressdaten !== null){
- return true;
- }
-
- if($createResponse->containsExportDocuments()){
- $tmppdf = $this->app->erp->GetTMP() . 'DhlExport_' . $createResponse->getShipmentNumber() . '.pdf';
- file_put_contents($tmppdf, $createResponse->getExportPaperAsPdf());
- $spoolerId = $this->app->printer->Drucken($data['druckerlogistikstufe2'], $tmppdf);
- if($versandId && $spoolerId){
- $this->app->DB->Update(
- sprintf(
- 'UPDATE versand SET lastexportspooler_id = %d, lastexportprinter = %d WHERE id = %d',
- $spoolerId, $data['druckerlogistikstufe2'], $versandId
- )
- );
- }
- if($module === 'retoure'){
- if(@is_file($tmppdf) && @filesize($tmppdf)){
- $fileid = $this->app->erp->CreateDatei('Export_' . $this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1") . '.pdf', 'Anhang', '', "", $tmppdf, $this->app->DB->real_escape_string($this->app->User->GetName()));
- $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
- }
- }
-
- unlink($tmppdf);
- }
-
-
- } catch (DhlBaseException $e) {
- $this->errors[] = $e->getMessage();
- }
- }
+ if ($this->settings->accountnumber_int) {
+ $result[] = Product::Create('V53WPAK', 'DHL Paket International')
+ ->WithLength(15, 120)
+ ->WithWidth(11, 60)
+ ->WithHeight(1, 60)
+ ->WithWeight(0.01, 31.5)
+ ->WithServices([Product::SERVICE_PREMIUM]);
}
- if($adressdaten !== null){
- return false;
+ if ($this->settings->accountnumber_euro) {
+ $result[] = Product::Create('V54EPAK', 'DHL Europaket')
+ ->WithLength(15, 120)
+ ->WithWidth(11, 60)
+ ->WithHeight(3.5, 60)
+ ->WithWeight(0.01, 31.5);
}
- if($target){
- if($this->einstellungen['dhl_coding'] == '1'){
- $this->app->Tpl->Set('DHL_CODING_CHECKED', 'checked="checked"');
- }
-
- $this->app->Tpl->Add("HEIGHT", $this->einstellungen['dhl_height']);
- $this->app->Tpl->Add("WIDTH", $this->einstellungen['dhl_width']);
- $this->app->Tpl->Add("LENGTH", $this->einstellungen['dhl_length']);
- $this->app->Tpl->Parse($target, 'versandarten_dhl.tpl');
+ if ($this->settings->accountnumber_connect) {
+ $result[] = Product::Create('V55PAK', 'DHL Paket Connect')
+ ->WithLength(15, 120)
+ ->WithWidth(11, 60)
+ ->WithHeight(3.5, 60)
+ ->WithWeight(0.01, 31.5);
}
- if(count($this->errors) > 0){
- return $this->errors;
+ if ($this->settings->accountnumber_wp) {
+ $result[] = Product::Create('V62WP', 'DHL Warenpost')
+ ->WithLength(10, 35)
+ ->WithWidth(7, 25)
+ ->WithHeight(0.1, 5)
+ ->WithWeight(0.01, 1);
}
+ if ($this->settings->accountnumber_wpint) {
+ $result[] = Product::Create('V66WPI', 'DHL Warenpost International')
+ ->WithLength(10, 35)
+ ->WithWidth(7, 25)
+ ->WithHeight(0.1, 10)
+ ->WithWeight(0.01, 1)
+ ->WithServices([Product::SERVICE_PREMIUM]);
+ }
+ return $result;
}
- private function getPackageContents($deliveryNoteId)
- {
- $contents = [];
- /** @var Database $db */
- $db = $this->app->Container->get('Database');
-
- $select = $db->select()
- ->from('lieferschein_position AS l')
- ->cols([
- 'l.bezeichnung',
- 'l.menge',
- 'l.zolltarifnummer',
- 'l.herkunftsland',
- 'a.umsatz_netto_einzeln',
- 'g.gewicht'
- ])
- ->leftJoin('auftrag_position AS a', 'l.auftrag_position_id = a.id')
- ->leftJoin('artikel AS g', 'l.artikel = g.id')
- ->where('l.lieferschein=:id')
- ->bindValue('id', $deliveryNoteId);
-
- $positions = $db->fetchAll($select->getStatement(), $select->getBindValues());
-
- foreach ($positions as $position) {
- $contents[] = new PackageContent(
- (int)$position['menge'],
- $position['bezeichnung'],
- $position['umsatz_netto_einzeln'],
- $position['herkunftsland'],
- $position['zolltarifnummer'],
- $position['gewicht']
- );
+ private function GetAccountNumber(string $product):?string {
+ switch ($product) {
+ case 'V01PAK': return $this->settings->accountnumber;
+ case 'V53WPAK': return $this->settings->accountnumber_int;
+ case 'V54EPAK': return $this->settings->accountnumber_euro;
+ case 'V55PAK': return $this->settings->accountnumber_connect;
+ case 'V62WP': return $this->settings->accountnumber_wp;
+ case 'V66WPI': return $this->settings->accountnumber_wpint;
}
-
- return $contents;
+ return null;
}
-
- public function Export($daten)
- {
-
- }
-
-
- private function log($message)
- {
- if(isset($this->einstellungen['log'])){
- if(is_array($message) || is_object($message)){
- error_log(print_r($message, true));
- }else{
- error_log($message);
- }
- }
- }
-
}
diff --git a/www/lib/versandarten/dhl.php_ b/www/lib/versandarten/dhl.php_
new file mode 100644
index 00000000..69bdb360
--- /dev/null
+++ b/www/lib/versandarten/dhl.php_
@@ -0,0 +1,691 @@
+id = $id;
+ $this->app = $app;
+ $einstellungenArr = $this->app->DB->SelectRow("SELECT einstellungen_json,paketmarke_drucker,export_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
+ $einstellungen_json = $einstellungenArr['einstellungen_json'];
+ $this->paketmarke_drucker = $einstellungenArr['paketmarke_drucker'];
+ $this->export_drucker = $einstellungenArr['export_drucker'];
+
+ $this->name = 'DHL 3.0';
+ if($einstellungen_json){
+ $this->einstellungen = json_decode($einstellungen_json, true);
+ }else{
+ $this->einstellungen = [];
+ }
+ $this->errors = [];
+ }
+
+ function ShowUserdata()
+ {
+ if(isset($this->app->Conf->WFuserdata)){
+ return 'Userdata-Ordner: ' . $this->app->Conf->WFuserdata;
+ }
+ }
+
+ public function Einstellungen($target = 'return')
+ {
+ if($this->app->Secure->GetPOST('testen')){
+ $parameter1 = $this->einstellungen['pfad'];
+ if($parameter1){
+ if(is_dir($parameter1)){
+ if(substr($parameter1, -1) !== '/'){
+ $parameter1 .= '/';
+ }
+
+ if(file_put_contents($parameter1 . 'wawision_test.txt', 'TEST')){
+ $this->app->Tpl->Add('MESSAGE',
+ 'Datei ' . $parameter1 . 'wawision_test.txt' . ' wurde erstellt!
');
+ }else{
+ $this->app->Tpl->Add('MESSAGE', 'Datei konnte nicht angelegt werden!
');
+ }
+ }else{
+ $this->app->Tpl->Add('MESSAGE',
+ 'Speicherort existiert nicht oder ist nicht erreichbar!
');
+ }
+ }else{
+ $this->app->Tpl->Add('MESSAGE', 'Bitte einen Speicherort angeben!
');
+ }
+ }
+
+ parent::Einstellungen($target);
+ }
+
+ //TODO ....
+
+ /*function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
+ {
+ $notsend = 0;
+ //$rawlink = 'https://tracking.dpd.de/parcelstatus/?locale=de_DE&query='.$tracking;
+ $rawlink = ' https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DE03/DE/5004.htm?txtRefNo='.$tracking.'&txtAction=71000';
+ $link = 'GLS Versand: '.$tracking.' ('.$rawlink.')';
+ }*/
+
+ public function GetBezeichnung()
+ {
+ return 'DHL 3.0';
+ }
+
+ /**
+ * @return array[]
+ */
+ public function getCreateForm()
+ {
+ return [
+ [
+ 'id' => 0,
+ 'name' => 'usernameGroup',
+ 'inputs' => [
+ [
+ 'label' => 'Benutzername',
+ 'type' => 'text',
+ 'name' => 'dhl_username',
+ 'validation' => true,
+ ],
+ ],
+ ],
+ [
+ 'id' => 1,
+ 'name' => 'passwordGroup',
+ 'inputs' => [
+ [
+ 'label' => 'Passwort',
+ 'type' => 'text',
+ 'name' => 'dhl_password',
+ 'validation' => true,
+ ]
+ ],
+ ],
+ [
+ 'id' => 2,
+ 'name' => 'accountNumberGroup',
+ 'inputs' => [
+ [
+ 'label' => 'Abrechnungsnummer',
+ 'type' => 'text',
+ 'name' => 'dhl_accountnumber',
+ 'validation' => true,
+ ]
+ ],
+ ]
+ ];
+ }
+
+ /**
+ * @param array $postData
+ *
+ * @return array
+ */
+ public function updatePostDataForAssistent($postData): array
+ {
+ $name = $this->app->erp->Firmendaten('name');
+ $street = $this->app->erp->Firmendaten('strasse');
+ $zip = $this->app->erp->Firmendaten('plz');
+ $city = $this->app->erp->Firmendaten('ort');
+ $country = $this->app->erp->Firmendaten('land');
+ $houseNo = '';
+
+ $streetParts = explode(' ', $street);
+ $partsCount = count($streetParts);
+
+ if($partsCount >= 2){
+ $street = implode(' ', array_slice($streetParts, 0, $partsCount - 1));
+ $houseNo = $streetParts[$partsCount - 1];
+ }
+
+ $postData['dhl_origin_name'] = $name;
+ $postData['dhl_origin_street'] = $street;
+ $postData['dhl_origin_houseno'] = $houseNo;
+ $postData['dhl_origin_zip'] = $zip;
+ $postData['dhl_origin_city'] = $city;
+ $postData['dhl_origin_country'] = $country;
+
+ return $postData;
+ }
+
+ /**
+ * @return JsonResponse|null
+ */
+ public function AuthByAssistent()
+ {
+ $step = (int)$this->app->Secure->GetPOST('step');
+ if($step == 0){
+ $username = $this->app->Secure->GetPOST('dhl_username');
+ $password = $this->app->Secure->GetPOST('dhl_password');
+ $accountnumber = $this->app->Secure->GetPOST('dhl_accountnumber');
+
+ $error = null;
+ if(empty($username)){
+ $error = 'Bitte Nutzernamen eingeben';
+ }else if(empty($password)){
+ $error = 'Bitte Passwort eingeben';
+ }else if(empty($accountnumber)){
+ $error = 'Bitte Abrechnungsnummer eingeben';
+ }
+
+ if($error != null) {
+ return new JsonResponse(
+ ['error' => $error],
+ JsonResponse::HTTP_BAD_REQUEST
+ );
+ }
+
+ try{
+ $this->testCredentials($username, $password, $accountnumber);
+ }catch (DhlBaseException $e){
+ return new JsonResponse(
+ ['error' => $e->getMessage()],
+ JsonResponse::HTTP_BAD_REQUEST
+ );
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * @return array
+ */
+ public function getStructureDataForClickByClickSave(): array
+ {
+ return $this->updatePostDataForAssistent([]);
+ }
+
+ function EinstellungenStruktur()
+ {
+ if(!empty($this->einstellungen['dhl_username']) && !empty($this->einstellungen['dhl_password'])){
+ try{
+ $this->testCredentials($this->einstellungen['dhl_username'], $this->einstellungen['dhl_password'], $this->einstellungen['dhl_accountnumber']);
+ $this->app->Tpl->Set('MESSAGE', 'Zugangsdaten erfolgreich überprüft
');
+ }catch (DhlBaseException $e){
+ $this->app->Tpl->Set('MESSAGE', '' . $e->getMessage() . '
');
+ }
+ }
+
+
+
+ return [
+ 'dhl_username' => ['typ' => 'text', 'bezeichnung' => 'Benutzername:'],
+ 'dhl_password' => ['typ' => 'text', 'bezeichnung' => 'Passwort:'],
+ 'dhl_accountnumber' => ['typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer:'],
+ 'dhl_origin_name' => ['typ' => 'text', 'bezeichnung' => 'Versender Name:'],
+ 'dhl_origin_street' => ['typ' => 'text', 'bezeichnung' => 'Versender Strasse:'],
+ 'dhl_origin_houseno' => ['typ' => 'text', 'bezeichnung' => 'Versender Hausnummer:'],
+ 'dhl_origin_city' => ['typ' => 'text', 'bezeichnung' => 'Versender Ort:'],
+ 'dhl_origin_zip' => ['typ' => 'text', 'bezeichnung' => 'Versender PLZ:'],
+ 'dhl_origin_country' => ['typ' => 'text', 'bezeichnung' => 'Versender Land (2-stellig):'],
+ 'dhl_origin_email' => ['typ' => 'text', 'bezeichnung' => 'Versender Email:'],
+
+ 'dhl_height' => ['typ' => 'text', 'bezeichnung' => 'Standardhöhe'],
+ 'dhl_width' => ['typ' => 'text', 'bezeichnung' => 'Standardbreite'],
+ 'dhl_length' => ['typ' => 'text', 'bezeichnung' => 'Standardlänge'],
+
+ 'dhl_export_product_type' => [
+ 'typ' => 'select',
+ 'bezeichnung' => 'Export Producttyp',
+ 'optionen' => [
+ 'PRESENT' => 'Geschenke',
+ 'COMMERCIAL_SAMPLE' => 'Kommerzielle Probe',
+ 'DOCUMENT' => 'Dokumente',
+ 'RETURN_OF_GOODS' => 'Rücksendungen',
+ 'OTHER' => 'Andere',
+ ]
+ ],
+ 'dhl_export_product_type_description' => [
+ 'typ' => 'text',
+ 'bezeichnung' => 'Beschreibung im Falle von "Andere"'
+ ],
+
+ 'dhl_product' => [
+ 'typ' => 'select',
+ 'bezeichnung' => 'Produkt:',
+ 'optionen' => [
+ 'V01PAK' => 'Paket national',
+ 'V53WPAK' => 'Paket international'
+ ],
+ ],
+ 'dhl_coding' => ['typ' => 'checkbox', 'bezeichnung' => 'Leitcodierung aktivieren'],
+ 'autotracking' => ['typ' => 'checkbox', 'bezeichnung' => 'Tracking übernehmen:'],
+ ];
+ }
+
+ public function testCredentials($username, $password, $accountNumber){
+ /** @var DhlApiFactory $dhlApiFactory */
+ $dhlApiFactory = $this->app->Container->get('DhlApiFactory');
+
+ /** @var DhlApi $dhlApi */
+ $dhlApi = $dhlApiFactory->createProductionInstance(
+ $username,
+ $password,
+ $accountNumber,
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ ''
+ );
+
+ try {
+ $dhlApi->validateShipment(new CreateNationalShipmentRequest(
+ date("Y-m-d"),
+ 1.0,
+ 10,
+ 20,
+ 30,
+ "Max muster",
+ '',
+ '',
+ 'Teststr. 1',
+ '11',
+ '86153',
+ 'Augsburg',
+ 'DE',
+ 'max.muster@xentral.com',
+ false
+ ));
+ }catch (InvalidRequestDataException $e){
+ // do nothing, test data is invalid
+ }
+ }
+
+ public function PaketmarkeDrucken($id, $sid)
+ {
+ $adressdaten = $this->GetAdressdaten($id, $sid);
+ $ret = $this->Paketmarke($sid, $id, '', false, $adressdaten);
+ if($sid === 'lieferschein'){
+ $deliveryNoteArr = $this->app->DB->SelectRow("SELECT adresse,projekt,versandart,auftragid FROM lieferschein WHERE id = '$id' LIMIT 1");
+ $adresse = $deliveryNoteArr['adresse'];
+ $projekt = $deliveryNoteArr['projekt'];
+ $versandart = $deliveryNoteArr['versandart'];
+ $adressvalidation = 2;
+ if($ret){
+ $adressvalidation = 1;
+ }
+ $tracking = '';
+ if(isset($adressdaten['tracking'])){
+ $tracking = $adressdaten['tracking'];
+ }
+ if(!isset($adressdaten['versandid'])){
+ $adressdaten['versandid'] = $this->app->DB->Select("SELECT id FROM versand WHERE abgeschlossen = 0 AND tracking = '' AND lieferschein = '$id' LIMIT 1");
+ }
+ if(!isset($adressdaten['versandid'])){
+ $this->app->DB->Insert("INSERT INTO versand (versandunternehmen, tracking,
+ versendet_am,abgeschlossen,lieferschein,freigegeben,firma,adresse,projekt,paketmarkegedruckt,adressvalidation)
+ VALUES ($versandart','$tracking',NOW(),1,'$id',1,'1','$adresse','$projekt',1,'$adressvalidation') ");
+ $adressdaten['versandid'] = $this->app->DB->GetInsertID();
+ }elseif($tracking){
+ $this->app->DB->Update("UPDATE versand SET freigegeben = 1, abgeschlossen = 1, tracking =1, paketmarkegedruckt = 1, tracking= '$tracking',adressvalidation = '$adressvalidation', versendet_am = now() WHERE id = '" . $adressdaten['versandid'] . "' LIMIT 1");
+ $this->app->DB->Update("UPDATE versand SET versandunternehmen = versandart WHERE id = '" . $adressdaten['versandid'] . "' AND versandunternehmen = '' LIMIT 1");
+ $this->app->DB->Update("UPDATE versand SET versandunternehmen = '$versandart' WHERE id = '" . $adressdaten['versandid'] . "' AND versandunternehmen = '' LIMIT 1");
+ }
+ $auftragid = $deliveryNoteArr['auftragid'];
+ if($auftragid){
+ $this->app->DB->Update("UPDATE auftrag SET schreibschutz = 1, status = 'abgeschlossen' WHERE id = '$auftragid' AND status = 'freigegeben' LIMIT 1");
+ }
+ if($adressvalidation == 1){
+ $this->app->erp->LieferscheinProtokoll($id, 'Paketmarke automatisch gedruckt');
+ if($adressdaten['versandid']){
+ return $adressdaten['versandid'];
+ }
+ }elseif($adressvalidation == 2){
+ $this->app->erp->LieferscheinProtokoll($id, 'automatisches Paketmarke Drucken fehlgeschlagen');
+ }
+ }
+
+ return $ret;
+ }
+
+ public function Paketmarke($doctyp, $docid, $target = '', $error = false, &$adressdaten = null)
+ {
+ $id = $docid;
+ $sid = $doctyp;
+ if($adressdaten === null){
+ $drucken = $this->app->Secure->GetPOST('drucken');
+ $anders = $this->app->Secure->GetPOST('anders');
+ $tracking_again = $this->app->Secure->GetGET('tracking_again');
+ $module = $this->app->Secure->GetPOST('module');
+ if(empty($module)){
+ $module = $doctyp;
+ }
+ }else{
+ $drucken = 1;
+ $anders = '';
+ $tracking_again = '';
+ $module = $doctyp;
+ }
+
+
+ /** @var DhlApiFactory $dhlApiFactory */
+ $dhlApiFactory = $this->app->Container->get('DhlApiFactory');
+
+ /** @var DhlApi $dhlApi */
+ $dhlApi = $dhlApiFactory->createProductionInstance(
+ $this->einstellungen['dhl_username'],
+ $this->einstellungen['dhl_password'],
+ $this->einstellungen['dhl_accountnumber'],
+ $this->einstellungen['dhl_origin_name'],
+ $this->einstellungen['dhl_origin_street'],
+ $this->einstellungen['dhl_origin_houseno'],
+ $this->einstellungen['dhl_origin_zip'],
+ $this->einstellungen['dhl_origin_city'],
+ $this->einstellungen['dhl_origin_country'],
+ $this->einstellungen['dhl_origin_email']
+ );
+
+ if($drucken != '' || $tracking_again == '1'){
+
+ if($tracking_again != "1"){
+ $versandId = 0;
+ if($module === 'retoure'){
+ $Query = $this->app->DB->SelectRow("SELECT * FROM retoure where id='$id'");
+ }elseif($module === 'versand'){
+ $versandId = $id;
+ $lieferschein = $this->app->DB->Select("SELECT lieferschein WHERE id = '$id' LIMIT 1");
+ $Query = $this->app->DB->SelectRow("SELECT * FROM lieferschein where id='$lieferschein'");
+ }else{
+ $Query = $this->app->DB->SelectRow("SELECT * FROM lieferschein where id='$id'");
+ }
+ $projekt = $Query['projekt'];
+ $Adresse = $this->app->DB->SelectRow("SELECT * FROM adresse WHERE id='" . $Query['adresse'] . "'");
+ $product = '';
+ $Country = $Query['land'];
+ if($adressdaten === null){
+ $versandmit = $this->app->Secure->GetPOST("versandmit");
+ $trackingsubmit = $this->app->Secure->GetPOST("trackingsubmit");
+ $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
+ $tracking = $this->app->Secure->GetPOST("tracking");
+ $trackingsubmitcancel = $this->app->Secure->GetPOST("trackingsubmitcancel");
+ $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");
+
+ //$Weight = $this->app->Secure->GetPOST("kg1");
+ $Name = $this->app->Secure->GetPOST("name");
+ $Name2 = $this->app->Secure->GetPOST("name2");
+ $Name3 = $this->app->Secure->GetPOST("name3");
+ $Street = $this->app->Secure->GetPOST("strasse");
+ $HouseNo = $this->app->Secure->GetPOST("hausnummer");
+ $ZipCode = $this->app->Secure->GetPOST("plz");
+ $City = $this->app->Secure->GetPOST("ort");
+ $Mail = $this->app->Secure->GetPOST("email");
+ $Phone = $this->app->Secure->GetPOST("phone");
+ $Country = $this->app->Secure->GetPOST("land");
+ $Weight = $this->app->Secure->GetPOST('kg1');
+
+ $height = $this->app->Secure->GetPOST('height');
+ $wigth = $this->app->Secure->GetPOST('width');
+ $length = $this->app->Secure->GetPOST('length');
+
+ $coding = $this->app->Secure->GetPOST('coding') == '1';
+ }else{
+ $versandmit = '';//$this->app->Secure->GetPOST("versandmit");
+ $trackingsubmit = '';//$this->app->Secure->GetPOST("trackingsubmit");
+ $versandmitbutton = '';//$this->app->Secure->GetPOST("versandmitbutton");
+ $tracking = '';//$this->app->Secure->GetPOST("tracking");
+ $trackingsubmitcancel = '';//$this->app->Secure->GetPOST("trackingsubmitcancel");
+ $retourenlabel = '';// $this->app->Secure->GetPOST("retourenlabel");
+
+ $Name = $adressdaten["name"];
+ $Name2 = $adressdaten["name2"];
+ $Name3 = $adressdaten["name3"];
+ $Street = $adressdaten["strasse"];
+ $HouseNo = $adressdaten["hausnummer"];
+ $ZipCode = $adressdaten['plz'];
+ $City = $adressdaten['ort'];
+ $Mail = $adressdaten['email'];
+ $Phone = $adressdaten["telefon"];
+ $Country = $adressdaten["land"];
+ $Company = "Company";
+ $Weight = $adressdaten["standardkg"];
+ $coding = $this->einstellungen['dhl_coding'] == 1;
+
+ $height = $this->einstellungen('dhl_height');
+ $wigth = $this->einstellungen('dhl_width');
+ $length = $this->einstellungen('dhl_length');
+
+ }
+
+ try {
+ $shipmentDate = date("Y-m-d");
+
+ switch ($this->einstellungen['dhl_product']) {
+ case 'V01PAK':
+ {
+ $shipmentData = new CreateNationalShipmentRequest(
+ $shipmentDate,
+ $Weight,
+ $length,
+ $wigth,
+ $height,
+ $Name,
+ $Name2,
+ $Name3,
+ $Street,
+ $HouseNo,
+ $ZipCode,
+ $City,
+ $Country,
+ $Mail,
+ $coding
+ );
+ break;
+ }
+ case 'V53WPAK':
+ {
+ $shipmentData = new CreateInterationalShipmentRequest(
+ $shipmentDate,
+ $Weight,
+ $length,
+ $wigth,
+ $height,
+ $Name,
+ $Name2,
+ $Name3,
+ $Street,
+ $HouseNo,
+ $ZipCode,
+ $City,
+ $Country,
+ $Mail,
+ $coding,
+ $this->einstellungen['dhl_export_product_type'],
+ $this->einstellungen['dhl_export_product_type_description'],
+ $this->getPackageContents($Query['id'])
+ );
+ break;
+ }
+ default:
+ {
+ throw new UnknownProductException();
+ }
+ }
+
+ $createResponse = $dhlApi->createShipment($shipmentData);
+
+ if($this->einstellungen['autotracking'] == "1")
+ $this->SetTracking($createResponse->getShipmentNumber(), $sid === 'versand' ? $id : 0, $lieferschein);
+
+
+ $data['drucker'] = $this->paketmarke_drucker;
+ $data['druckerlogistikstufe2'] = $this->export_drucker;
+
+ if(!$data['drucker']){
+ if($this->app->erp->GetStandardPaketmarkendrucker() > 0){
+ $data['drucker'] = $this->app->erp->GetStandardPaketmarkendrucker();
+ }
+ }
+
+ if(!$data['druckerlogistikstufe2']){
+ if($this->app->erp->GetStandardVersanddrucker($projekt) > 0){
+ $data['druckerlogistikstufe2'] = $this->app->erp->GetStandardVersanddrucker($projekt);
+ }
+ }
+ $pdf = $createResponse->getLabelAsPdf();
+ $datei = $this->app->erp->GetTMP() . 'DhlLabel_' . $createResponse->getShipmentNumber() . '.pdf';
+
+ file_put_contents($datei, $pdf);
+
+ $spoolerId = $this->app->printer->Drucken($data['drucker'], $datei);
+ if($spoolerId > 0 && $versandId > 0){
+ $this->app->DB->Update(
+ sprintf(
+ 'UPDATE versand SET lastspooler_id = %d, lastprinter = %d WHERE id = %d',
+ $spoolerId, $data['drucker'], $versandId
+ )
+ );
+ }
+ if($module === 'retoure'){
+ if(@is_file($datei) && @filesize($datei)){
+ $fileid = $this->app->erp->CreateDatei('DhlMarkeLabel_' . $this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1") . '.pdf',
+ 'Anhang', '', "", $datei,
+ $this->app->DB->real_escape_string($this->app->User->GetName()));
+ $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
+ }
+ }
+
+ unlink($datei);
+ if($adressdaten !== null){
+ return true;
+ }
+
+ if($createResponse->containsExportDocuments()){
+ $tmppdf = $this->app->erp->GetTMP() . 'DhlExport_' . $createResponse->getShipmentNumber() . '.pdf';
+ file_put_contents($tmppdf, $createResponse->getExportPaperAsPdf());
+ $spoolerId = $this->app->printer->Drucken($data['druckerlogistikstufe2'], $tmppdf);
+ if($versandId && $spoolerId){
+ $this->app->DB->Update(
+ sprintf(
+ 'UPDATE versand SET lastexportspooler_id = %d, lastexportprinter = %d WHERE id = %d',
+ $spoolerId, $data['druckerlogistikstufe2'], $versandId
+ )
+ );
+ }
+ if($module === 'retoure'){
+ if(@is_file($tmppdf) && @filesize($tmppdf)){
+ $fileid = $this->app->erp->CreateDatei('Export_' . $this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1") . '.pdf', 'Anhang', '', "", $tmppdf, $this->app->DB->real_escape_string($this->app->User->GetName()));
+ $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
+ }
+ }
+
+ unlink($tmppdf);
+ }
+
+
+ } catch (DhlBaseException $e) {
+ $this->errors[] = $e->getMessage();
+ }
+ }
+ }
+ if($adressdaten !== null){
+ return false;
+ }
+ if($target){
+ if($this->einstellungen['dhl_coding'] == '1'){
+ $this->app->Tpl->Set('DHL_CODING_CHECKED', 'checked="checked"');
+ }
+
+ $this->app->Tpl->Add("HEIGHT", $this->einstellungen['dhl_height']);
+ $this->app->Tpl->Add("WIDTH", $this->einstellungen['dhl_width']);
+ $this->app->Tpl->Add("LENGTH", $this->einstellungen['dhl_length']);
+ $this->app->Tpl->Parse($target, 'versandarten_dhl.tpl');
+ }
+ if(count($this->errors) > 0){
+ return $this->errors;
+ }
+ }
+
+ private function getPackageContents($deliveryNoteId)
+ {
+ $contents = [];
+ /** @var Database $db */
+ $db = $this->app->Container->get('Database');
+
+ $select = $db->select()
+ ->from('lieferschein_position AS l')
+ ->cols([
+ 'l.bezeichnung',
+ 'l.menge',
+ 'l.zolltarifnummer',
+ 'l.herkunftsland',
+ 'a.umsatz_netto_einzeln',
+ 'g.gewicht'
+ ])
+ ->leftJoin('auftrag_position AS a', 'l.auftrag_position_id = a.id')
+ ->leftJoin('artikel AS g', 'l.artikel = g.id')
+ ->where('l.lieferschein=:id')
+ ->bindValue('id', $deliveryNoteId);
+
+ $positions = $db->fetchAll($select->getStatement(), $select->getBindValues());
+
+ foreach ($positions as $position) {
+ $contents[] = new PackageContent(
+ (int)$position['menge'],
+ $position['bezeichnung'],
+ $position['umsatz_netto_einzeln'],
+ $position['herkunftsland'],
+ $position['zolltarifnummer'],
+ $position['gewicht']
+ );
+ }
+
+ return $contents;
+ }
+
+ public function Export($daten)
+ {
+
+ }
+
+
+ private function log($message)
+ {
+ if(isset($this->einstellungen['log'])){
+ if(is_array($message) || is_object($message)){
+ error_log(print_r($message, true));
+ }else{
+ error_log($message);
+ }
+ }
+ }
+
+}
diff --git a/www/lib/versandarten/dhlversenden.php b/www/lib/versandarten/dhlversenden.php
deleted file mode 100644
index 540b0aca..00000000
--- a/www/lib/versandarten/dhlversenden.php
+++ /dev/null
@@ -1,2423 +0,0 @@
-id = $id;
- $this->app = $app;
- $einstellungenArr = $this->app->DB->SelectRow("SELECT einstellungen_json,paketmarke_drucker,export_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
- $einstellungen_json = $einstellungenArr['einstellungen_json'];
- $this->paketmarke_drucker = $einstellungenArr['paketmarke_drucker'];
- $this->export_drucker = $einstellungenArr['export_drucker'];
- $this->name="DHL Versenden";
-
- $this->logger = $app->Container->get('Logger');
-
- if($einstellungen_json)
- {
- $this->einstellungen = json_decode($einstellungen_json,true);
- }else{
- $this->einstellungen = array();
- }
- $this->einstellungen = $this->einstellungen;
- if(isset($this->einstellungen['intraship_partnerid']) && $this->einstellungen['intraship_partnerid'] )$this->einstellungen['partnerid'] = $this->einstellungen['intraship_partnerid'];
- if(!isset($this->einstellungen['partnerid']))
- {
- $this->einstellungen['partnerid'] = '01';
- }
- if(!isset($this->einstellungen['partnerid']) || $this->einstellungen['partnerid']=="")
- {
- $this->einstellungen['partnerid'] = '01';
- }
-
- if($this->einstellungen['intraship_countryISOCode']=="") $this->einstellungen['intraship_countryISOCode'] = "DE";
-
- $this->errors = array();
- $data = $this->einstellungen;
- $this->info = array(
- 'company_name' => $data['intraship_company_name'],
- 'street_name' => $data['intraship_street_name'],
- 'street_number' => $data['intraship_street_number'],
- 'zip' => $data['intraship_zip'],
- 'country' => $data['intraship_country'],
- 'countryISOCode' => $data['intraship_countryISOCode'],
- 'city' => $data['intraship_city'],
- 'email' => trim($data['intraship_email']),
- 'phone' => $data['intraship_phone'],
- 'internet' => $data['intraship_internet'],
- 'contact_person' => $data['intraship_contact_person'],
- 'export_reason' => $data['intraship_exportgrund']
- );
-
-
-
- if($land!=$this->einstellungen['intraship_countryISOCode'])
- {
- if(!empty($data['intraship_partnerid_welt']) && !empty($data['intraship_partnerid_welt']))$einstellungen['partnerid'] = $data['intraship_partnerid_welt'];
- }
-
- if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
-
- /*
-
- $this->einstellungen = $api_einstellungen;
- $this->info = $customer_info;
-
- if($this->einstellungen['partnerid']=="") $this->einstellungen['partnerid'] = '01';
-
- $this->errors = array();
- */
- }
-
- public function GetBezeichnung()
- {
- return 'DHL Instrahship';
- }
-
- function EinstellungenStruktur()
- {
- return array(
-
-
- 'user' => array('typ'=>'text','bezeichnung'=>'Benutzer:','info'=>'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
- 'signature' => array('typ'=>'text','bezeichnung'=>'Signature:','info'=>'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
- 'ekp' => array('typ'=>'text','bezeichnung'=>'EKP','info'=>'5000000000 (gültige DHL Kundennummer)'),
- 'partnerid' => array('typ'=>'text','bezeichnung'=>'Partner ID Inland:','info'=>'meist 01, manchmal 02, 03 etc. bzw. wenn vier- und drittletzte Stelle anders hier 4-stellig angeben z.B. 8601'),
- 'partnerid_welt' => array('typ'=>'text','bezeichnung'=>'Partner ID Welt:','info'=>'Versand Welt (vierstellig meist 5301)'),
- 'partnerid_connect' => array('typ'=>'text','bezeichnung'=>'Partner ID EU oder Connect:','info'=>'Versand von DE nach EU oder von AT in ausgewählte Länder Europas (Komplette EKP mit Endung 5401 in DE oder 8701 in AT)'),
- 'euistwelt'=>array('typ'=>'checkbox','bezeichnung'=>'Bei EU immer Welt verwenden:'),
- 'premiumversand'=>array('typ'=>'checkbox','bezeichnung'=>'Premiumversand verwenden:'),
- 'intraship_retourenaccount' => array('typ'=>'text','bezeichnung'=>'Retouren Account:','info'=>'14 Stellige DHL-Retoure Abrechnungsnummer'),
- 'intraship_retourenlabel'=>array('typ'=>'checkbox','bezeichnung'=>'Vorauswahl Retourenlabel:','info'=>'Druckt Retourenlabel mit'),
-
- 'intraship_company_name' => array('typ'=>'text','bezeichnung'=>'Versender Firma:'),
- 'intraship_street_name' => array('typ'=>'text','bezeichnung'=>'Versender Strasse:'),
- 'intraship_street_number' => array('typ'=>'text','bezeichnung'=>'Versender Strasse Nr.:'),
- //'intraship_name' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
- 'intraship_zip' => array('typ'=>'text','bezeichnung'=>'Versender PLZ:'),
- 'intraship_city' => array('typ'=>'text','bezeichnung'=>'Versender Stadt:'),
- 'intraship_country' => array('typ'=>'text','bezeichnung'=>'Versender Land:','info'=>'germany'),
- 'intraship_countryISOCode' => array('typ'=>'text','bezeichnung'=>'Versender ISO Code:','info'=>'DE'),
- 'intraship_email' => array('typ'=>'text','bezeichnung'=>'Versender E-Mail:'),
- 'intraship_phone' => array('typ'=>'text','bezeichnung'=>'Versender Telefon:'),
- 'intraship_internet' => array('typ'=>'text','bezeichnung'=>'Versender Web:'),
- 'intraship_contact_person' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-
-
- 'intraship_account_owner' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Inhaber:'),
- 'intraship_account_number' => array('typ'=>'text','bezeichnung'=>'Nachnahme Kontonummer:'),
- 'intraship_code' => array('typ'=>'text','bezeichnung'=>'Nachnahme BLZ:'),
- 'intraship_bank_name' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Name:'),
- 'intraship_iban' => array('typ'=>'text','bezeichnung'=>'Nachnahme IBAN:'),
-
- 'intraship_bic' => array('typ'=>'text','bezeichnung'=>'Nachnahme BIC:'),
- 'nachnahmeextra' => array('typ'=>'checkbox','bezeichnung'=>'Nachnahme Gebühr aktivieren:'),
- 'nachnahmegebuehr' => array('typ'=>'text','bezeichnung'=>'Nachnahme Gebühr:','info'=>'z.B. 2,00 wird auf Rechnungsbetrag addiert, da DHL dies als extra Gebühr für sich behält'),
-
- 'intraship_exportgrund' => array('typ'=>'text','bezeichnung'=>'Export bzw. Sonstiges:','info'=>'z.B. Computer Zubehör'),
-
- 'intraship_WeightInKG' => array('typ'=>'text','bezeichnung'=>'Standard Gewicht:','info'=>'in KG'),
- 'runden' => array('typ'=>'checkbox','bezeichnung'=>'Gewicht runden auf Ganzzahl:'),
- 'intraship_LengthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Länge:','info'=>'in cm'),
- 'intraship_WidthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Breite:','info'=>'in cm'),
- 'intraship_HeightInCM' => array('typ'=>'text','bezeichnung'=>'Standard Höhe:','info'=>'in cm'),
- 'intraship_PackageType' => array('typ'=>'text','bezeichnung'=>'Standard Paket:','info'=>'z.B. PL'),
-
- 'intraship_Product' => array('typ'=>'text','bezeichnung'=>'Standard Produkt:','info'=>'z.B. in DE: V01PAK oder AT: V86PARCEL'),
-
- 'intraship_vorausverfuegung'=>array('typ'=>'select','bezeichnung'=>'Vorausverfügung: ', 'optionen' => array('-' => 'keine Vorausverfügung', 'IMMEDIATE' => 'Sofortige Rücksendung an den Absender', 'AFTER_DEADLINE' => 'Rücksenden an den Absender nach Ablauf der Frist', 'ABANDONMENT' => 'Preisgabe des Pakets durch den Absender (entgeltfrei)')),
-
- 'sperrgut' => array('typ'=>'checkbox','bezeichnung'=>'Sperrgut:'),
- 'keineversicherung' => array('typ'=>'checkbox','bezeichnung'=>'Extra Versicherung ausschalten:','info'=>'Option muss von Hand im Paketmarkendialog gesetzt werden.'),
- 'leitcodierung' => array('typ'=>'checkbox','bezeichnung'=>'Leitcodierung aktivieren:'),
- 'use_shipping_article_from_order_on_export' => ['typ' => 'checkbox', 'bezeichnung' => 'Bei Export Porto aus Auftrag senden:'],
- 'autotracking'=>array('typ'=>'checkbox','bezeichnung'=>'Tracking übernehmen:'),
- 'log'=>array('typ'=>'checkbox','bezeichnung'=>'Logging')
- );
-
- }
-
- public function VersandartMindestgewicht()
- {
- if(!isset($this->einstellungen['intraship_WeightInKG']))return 2;
- if($this->einstellungen['intraship_WeightInKG'] === '')return 2;
- return str_replace(',','.',$this->einstellungen['intraship_WeightInKG']);
- }
-
- public function PaketmarkeDrucken($id, $sid)
- {
- $adressdaten = $this->GetAdressdaten($id, $sid);
- $ret = $this->Paketmarke($sid, $id, '', false, $adressdaten);
- if($sid === 'lieferschein'){
- $deliverNoteRow = $this->app->DB->SelectRow(
- sprintf('SELECT adresse, projekt, versandart FROM lieferschein WHERE id = %d LIMIT 1',
- (int)$id
- )
- );
- $adresse = $deliverNoteRow['adresse'];
- $projekt = $deliverNoteRow['projekt'];
- $versandart = $deliverNoteRow['versandart'];
- $adressvalidation = 2;
- if($ret) {
- $adressvalidation = 1;
- }
- $tracking = '';
- if(isset($adressdaten['tracking'])) {
- $tracking = $adressdaten['tracking'];
- }
- if(!isset($adressdaten['versandid'])) {
- $adressdaten['versandid'] = $this->app->DB->Select("SELECT id FROM versand WHERE abgeschlossen = 0 AND tracking = '' AND lieferschein = '$id' LIMIT 1");
- }
-
- if(method_exists($this,'deleteTrackingFromUserdata')) {
- $this->deleteTrackingFromUserdata($tracking);
- }
-
- if(!isset($adressdaten['versandid']))
- {
- $this->app->DB->Insert("INSERT INTO versand (versandunternehmen, tracking,
- versendet_am,abgeschlossen,lieferschein,freigegeben,firma,adresse,projekt,paketmarkegedruckt,adressvalidation)
- VALUES ('$versandart','$tracking',NOW(),1,'$id',1,'1','$adresse','$projekt',1,'$adressvalidation') ");
- $adressdaten['versandid'] = $this->app->DB->GetInsertID();
- }elseif($tracking){
- $this->app->DB->Update("UPDATE versand SET freigegeben = 1, abgeschlossen = 1, tracking =1, paketmarkegedruckt = 1, tracking= '$tracking',adressvalidation = '$adressvalidation', versendet_am = now() WHERE id = '".$adressdaten['versandid']."' LIMIT 1");
- $this->app->DB->Update("UPDATE versand SET versandunternehmen = versandart WHERE id = '".$adressdaten['versandid']."' AND versandunternehmen = '' LIMIT 1");
- $this->app->DB->Update("UPDATE versand SET versandunternehmen = '$versandart' WHERE id = '".$adressdaten['versandid']."' AND versandunternehmen = '' LIMIT 1");
- }
- $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$id' LIMIT 1");
- if($auftragid) {
- $this->app->DB->Update("UPDATE auftrag SET schreibschutz = 1, status = 'abgeschlossen' WHERE id = '$auftragid' AND status = 'freigegeben' LIMIT 1");
- }
- if($adressvalidation == 1)
- {
- $this->app->erp->LieferscheinProtokoll($id, 'Paketmarke automatisch gedruckt');
- if($adressdaten['versandid']) {
- return $adressdaten['versandid'];
- }
- }elseif($adressvalidation == 2)
- {
- $this->app->erp->LieferscheinProtokoll($id, 'automatisches Paketmarke Drucken fehlgeschlagen');
- }
- }
- return $ret;
- }
-
- public function GetName3($adressdaten = null)
- {
- if($adressdaten === null){
- return $this->app->Secure->GetPOST('name3');
- }
- return !empty($adressdaten['name3'])?$adressdaten['name3']:'';
- }
-
- public function Paketmarke($doctyp, $docid, $target = '', $error = false, &$adressdaten = null)
- {
- $zusatz = '';
- $typ = '';
- $id = $docid;
- $sid = $doctyp;
- if($adressdaten === null) {
- $drucken = $this->app->Secure->GetPOST('drucken');
- $anders = $this->app->Secure->GetPOST('anders');
- $land = $this->app->Secure->GetPOST('land');
- $tracking_again = $this->app->Secure->GetGET('tracking_again');
-
- $versandmit = $this->app->Secure->GetPOST('versandmit');
- $trackingsubmit = $this->app->Secure->GetPOST('trackingsubmit');
- $versandmitbutton = $this->app->Secure->GetPOST('versandmitbutton');
- $tracking = $this->app->Secure->GetPOST('tracking');
- $trackingsubmitcancel = $this->app->Secure->GetPOST('trackingsubmitcancel');
- //$retourenlabel = $this->app->Secure->GetPOST('retourenlabel');
-
- $kg = $this->app->Secure->GetPOST('kg1');
- $name = $this->app->Secure->GetPOST('name');
- $name2 = $this->app->Secure->GetPOST('name2');
- $strasse = $this->app->Secure->GetPOST('strasse');
- $hausnummer = $this->app->Secure->GetPOST('hausnummer');
- $plz = $this->app->Secure->GetPOST('plz');
- $ort = $this->app->Secure->GetPOST('ort');
- $email = $this->app->Secure->GetPOST('email');
- $phone = $this->app->Secure->GetPOST('telefon');
- //$nummeraufbeleg = $this->app->Secure->GetPOST('nummeraufbeleg');
- $sid= $this->app->Secure->GetGET('sid');
- }else{
- $drucken = 1;
- $anders = '';
- $land = $adressdaten['land'];
- $tracking_again = '';
-
- $versandmit = '';
- $trackingsubmit = '';
- $versandmitbutton = '';
- $tracking = '';
- $trackingsubmitcancel = '';
- //$retourenlabel = '';
-
- $kg = $adressdaten['standardkg'];
- $name = $adressdaten['name'];
- $name2 = $adressdaten['name2'];
- $strasse = $adressdaten['strasse'];
- $hausnummer = $adressdaten['hausnummer'];
- $plz = $adressdaten['plz'];
- $ort = $adressdaten['ort'];
- $email = $adressdaten['email'];
- $phone = $adressdaten['phone'];
- //$nummeraufbeleg = 1;//$this->app->Secure->GetPOST('nummeraufbeleg');
- }
- $name3 = $this->GetName3($adressdaten);
-
-
- if($adressdaten === null) {
-
- if ($zusatz === 'express')
- $this->app->Tpl->Set('ZUSATZ', 'Express');
-
- if ($zusatz === 'export'){
- $this->app->Tpl->Set('ZUSATZ', 'Export');
- }
-
- if ($this->einstellungen['keineversicherung'] == '1') {
- $this->app->Tpl->Set('VERSICHERT', '');
- $this->app->Tpl->Set('EXTRAVERSICHERT', '');
- }
- if ($this->einstellungen['leitcodierung'] == '1') {
- $this->app->Tpl->Set('LEITCODIERUNG', ' checked="checked" ');
- }
-
- if ($this->einstellungen['intraship_retourenlabel'] == '1'){
- $this->app->Tpl->Add('RETOURENLABEL', ' checked="checked" ');
- }
-
-
- $id = $this->app->Secure->GetGET('id');
-
- $betrag = $this->app->Secure->GetPOST('betrag');
- $nachnahme = $this->app->Secure->GetPOST('nachnahme');
- $_altersfreigabe = $this->app->Secure->GetPOST('altersfreigabe');
- $versichert = $this->app->Secure->GetPOST('versichert');
- $leitcodierung = $this->app->Secure->GetPOST('leitcodierung');
- $wunschtermin = $this->app->Secure->GetPOST('wunschtermin');
- $wunschzeitraum = $this->app->Secure->GetPOST('wunschzeitraum');
- $wunschlieferdatum = $this->app->Secure->GetPOST('wunschlieferdatum');
- $versicherungssumme = $this->app->Secure->GetPOST('versicherungssumme');
- if($leitcodierung!='1') {
- $this->einstellungen['leitcodierung']=false;
- }
- }else{
- $betrag = isset($adressdaten['betrag'])?$adressdaten['betrag']:'';
- $nachnahme = isset($adressdaten['nachnahme'])?$adressdaten['nachnahme']:'';
- $_altersfreigabe = isset($adressdaten['altersfreigabe'])?$adressdaten['altersfreigabe']:'';
- $versichert = isset($adressdaten['altersfreigabe'])?$adressdaten['altersfreigabe']:'';
-
- $wunschtermin = isset($adressdaten['wunschtermin'])?$adressdaten['wunschtermin']:'';
- $wunschzeitraum = isset($adressdaten['wunschzeitraum'])?$adressdaten['wunschzeitraum']:'';
- $wunschlieferdatum = isset($adressdaten['wunschlieferdatum'])?$adressdaten['wunschlieferdatum']:'';
- $versicherungssumme = isset($adressdaten['versicherungssumme'])?$adressdaten['versicherungssumme']:'';
- }
-
-
- if($typ==='DHL' || $typ==='dhl'){
- $versand = 'dhl';
- }
- else if($typ==='Intraship'){
- $versand = 'intraship';
- }
- else {
- $versand = $typ;
- }
-
- if($sid === 'versand')
- {
- if($adressdaten === null) {
- $this->app->Tpl->Set("TRACKINGMANUELL",' Fehlermeldung von DHL: ";
-
- if (is_soap_fault($response)) {
-
- $this->errors[] = $response->faultstring;
-
- } else {
-
- $responsetext = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
- if($responsetext=='In der Sendung trat mindestens ein harter Fehler auf.'){
- $responsetext = 'Fehler bei der Leitcodierung in Adresse. Bitte korrekte Adresse angeben. ';
- }
- if($responsetext=='Die Gewichtsangabe ist kleiner als im CN23-Formular'){
- $responsetext = 'Es müssen für alle Artikel das Gewicht in den Stammdaten gepflegt sein. Es fehlt bei Artikeln das Gewicht. ';
- }
-
-
-
- if($responsetext=='Der Nutzer des Webservice konnte nicht authentifiziert werden.'){
- $responsetext = "DHL Login Failed. Das könnte an einem abgelaufenen Passwort liegen, da DHL in regelmäßigen Abständen ein neues Passwort für den DHL API-User vorschreibt. Mehr Informationen, wie Sie ein neues DHL Passwort vergeben können, finden Sie hier .";
- }
-
- if($responsetext===$response->CreationState->LabelData->Status->statusMessage[1] && $responsetext!=''){
- } else {
- $responsetext .= ' '.$response->CreationState->LabelData->Status->statusMessage[1];
- }
-
- if($this->einstellungen['log'])
- {
- $this->dumpRequest('request.xml',$this->client->__getLastRequest());
- $this->dumpRequest('response.xml',$this->client->__getLastResponse());
- }
-
- $this->errors[] = $responsetext;
- }
- if($response->CreationState->StatusMessage)
- {
- foreach($response->CreationState->StatusMessage as $v)
- {
- $found = false;
- if($this->errors && is_array($this->errors))
- {
- foreach($this->errors as $err)
- {
- if($err == $v)$found = true;
- }
- }
- if(!$found)$this->errors[] = $v;
- }
- }
- return false;
- }
- $r = array();
- if($api22)
- {
- $r['shipment_number'] = (String) $response->CreationState->LabelData->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->LabelData->licensePlate;
- $r['label_url'] = (String) $response->CreationState->LabelData->labelUrl;
- $r['gesamt'] = $response;
- }else{
- $r['shipment_number'] = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
- $r['label_url'] = (String) $response->CreationState->Labelurl;
- }
- return $r;
-
- }
-
-
- function createWeltShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null,$artikel=null) {
- $api2 = false;
- if(isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe']) $api22 = true;
-
- if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])$api22 = true;
- //if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
-
- // TODO HACK
- if($this->einstellungen['intraship_countryISOCode']=='AT') {
- $api22 = true;
- }
- $api22 = true; // immer 26.05.2019 BS
-
- $this->buildClient($api2, $api22);
-
-
- $shipment = array();
-
- if($customer_details['country_code']=='DE')
- {
- $customer_details['country']='germany';
- } else if ($customer_details['country_code']=='UK')
- {
- $customer_details['country']='england';
- } else {
- $customer_details['country']='other';
- }
-
- // Version
- if($api22)
- {
- $shipment['Version'] = array('majorRelease' => '2', 'minorRelease' => '0');
- }else{
- $shipment['Version'] = array('majorRelease' => '1', 'minorRelease' => '0');
-/* if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $shipment['Version']['minorRelease'] = '1';
- }
-*/
- }
-
- // Order
- $shipment['ShipmentOrder'] = array();
- $s = array();
- // Fixme
- if($api22)
- {
- $shipment['ShipmentOrder']['sequenceNumber'] = '01';
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['shipmentDate'] = $customer_details['abholdatum'];
- else
- $s['shipmentDate'] = date('Y-m-d');
-
- if($this->einstellungen['intraship_countryISOCode']=='AT')
- {
- //$s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V87PARCEL": "V82PARCEL";
- $s['product'] = ($customer_details['country_code']=="DE"||$customer_details['country_code']=="BE"||$customer_details['country_code']=="NL"||$customer_details['country_code']=="LU"||$customer_details['country_code']=="PL"||$customer_details['country_code']=="SK"||$customer_details['country_code']=="CZ")?"V87PARCEL": "V82PARCEL";
- $s['accountNumber']= ($customer_details['country_code']=="DE"||$customer_details['country_code']=="BE"||$customer_details['country_code']=="NL"||$customer_details['country_code']=="LU"||$customer_details['country_code']=="PL"||$customer_details['country_code']=="SK"||$customer_details['country_code']=="CZ")?$this->einstellungen['ekp'].$this->einstellungen['partnerid_connect']:$this->einstellungen['ekp'].$this->einstellungen['partnerid_welt'];
- }
- else {
- if($this->einstellungen['euistwelt'])
- {
- $s['product'] = "V53WPAK";
- $s['accountNumber'] =$this->einstellungen['ekp'].(strlen($this->einstellungen['partnerid_welt'])<=2?"01".$this->einstellungen['partnerid_welt']:$this->einstellungen['partnerid_welt']);
- }
- else
- {
- if(substr($this->einstellungen['partnerid_connect'], -4)=="5501") $s['product'] = "V55PAK";
- else $s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V54EPAK": "V53WPAK";
- $s['accountNumber'] =$this->einstellungen['ekp'].(isset($customer_details['EU'])&&$customer_details['EU']?$this->einstellungen['partnerid_connect']:$this->einstellungen['partnerid_welt']);
- }
- }
-
-
- }else{
- $shipment['ShipmentOrder']['SequenceNumber'] = '1';
- $s['ProductCode'] = 'BPI';
- if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
- $s['ShipmentDate'] = $customer_details['abholdatum'];
- else
- $s['ShipmentDate'] = date('Y-m-d');
- $s['EKP'] = $this->einstellungen['ekp'];
-
- $s['Attendance'] = array();
- $s['Attendance']['partnerID'] = $this->einstellungen['partnerid'];
- }
-
-
-
- if($customer_details['intraship_retourenlabel']=="1")
- {
- if($api22) {
- // $s['Service']['ReturnReceipt'] = array();
-// $s['Service']['ReturnReceipt']['active'] = 1;
- $s['returnShipmentAccountNumber'] = $this->einstellungen['intraship_retourenaccount'];
- $s['returnShipmentReference'] = $customer_details['ordernumber'];
- } else {
- $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
- }
- }
-
- if($this->einstellungen['runden'])$customer_details['weight'] = round($customer_details['weight']);
-
- if($api22)
- {
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = '3';
- $s['ShipmentItem']['lengthInCM'] = '50';
- $s['ShipmentItem']['widthInCM'] = '30';
- $s['ShipmentItem']['heightInCM'] = '15';
- }
- else {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
- $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
- $s['ShipmentItem']['widthInCM'] = $shipment_details['WidthInCM'];
- $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
- $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
- }
- // Falls ein Gewicht angegeben worden ist
- if($customer_details['weight']!="")
- $s['ShipmentItem']['weightInKG'] = $customer_details['weight'];
-
- }else{
- if ($shipment_details == null) {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['WeightInKG'] = '3';
- $s['ShipmentItem']['LengthInCM'] = '50';
- $s['ShipmentItem']['WidthInCM'] = '30';
- $s['ShipmentItem']['HeightInCM'] = '15';
- // FIXME: What is this
- $s['ShipmentItem']['PackageType'] = 'PK';
- }
- else {
- $s['ShipmentItem'] = array();
- $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
- $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
- $s['ShipmentItem']['widthInCM'] = $shipment_details['WidthInCM'];
- $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
- $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
- }
-
- // Falls ein Gewicht angegeben worden ist
- if($customer_details['weight']!="")
- $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
- }
- //$s['Service']['ServiceGroupBusinessPackInternational']['Economy'] = 'true';
- $s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
- if($bank_details != null)
- {
- $s['BankData'] = array();
- $s['BankData']['accountOwner'] = $bank_details['account_owner'];
- $s['BankData']['accountNumber'] = $bank_details['account_number'];
- $s['BankData']['bankCode'] = $bank_details['bank_code'];
- $s['BankData']['bankName'] = $bank_details['bank_name'];
- $s['BankData']['iban'] = $bank_details['iban'];
- $s['BankData']['bic'] = $bank_details['bic'];
- $s['BankData']['note'] = $bank_details['note'];
- }
-
-
-
- if($cod_details != null)
- {
- //$s['Service'] = array();
- //$s['Service']['ServiceGroupOther'] = array();
-
- if($this->einstellungen['nachnahmeextra']=='1') $cod_details['amount'] = $cod_details['amount'] + str_replace(',','.',$this->einstellungen['nachnahmegebuehr']);
- if($api22)
- {
- if($this->einstellungen['intraship_countryISOCode']=='AT')
- {
- if($customer_details['country']=='DE') $s['product']='V87PARCEL.V87COD';
- if($customer_details['country']=='AT') $s['product']='V86PARCEL.V86BLNN';
- }
- $s['Service']['CashOnDelivery'] = array();
- $s['Service']['CashOnDelivery']['codAmount'] = $cod_details['amount'];
- $s['Service']['CashOnDelivery']['active'] = 1;
- } else {
- $s['Service']['ServiceGroupOther']['COD'] = array();
- $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
- $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
- }
- }
- // Auftragnummer auf Label
- if($api22)
- {
- $s['customerReference']=$customer_details['ordernumber'];
- if($customer_details['altersfreigabe'] >= 16)
- {
- $s['Service']['VisualCheckOfAge'] = array();
- $s['Service']['VisualCheckOfAge']['active'] = 1;
- $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
- }
- }else{
- $s['CustomerReference']=$customer_details['ordernumber'];
- }
-
- if($this->einstellungen['premiumversand']=='1')
- {
- $s['Service']['Premium'] = array();
- $s['Service']['Premium']['active'] = 1;
- }
-
- if($this->einstellungen['sperrgut'] == '1') {
- $s['Service']['BulkyGoods'] = array();
- $s['Service']['BulkyGoods']['active'] = 1;
- }
- //$s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
- $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
- //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-
- $shipper = array();
-
-
- if($api22)
- {
- $shipper['Name'] = array();
- $shipper['Name']['name1'] = $this->info['company_name'];
- }else{
- $shipper['Company'] = array();
- $shipper['Company']['Company'] = array();
- $shipper['Company']['Company']['name1'] = $this->info['company_name'];
- }
-
- $shipper['Address'] = array();
- $shipper['Address']['streetName'] = $this->info['street_name'];
- $shipper['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $shipper['Address']['zip'] = $this->info['zip'];
- }else{
- $shipper['Address']['Zip'] = array();
-
- $shipper['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $shipper['Address']['city'] = $this->info['city'];
-
- $shipper['Address']['Origin'] = array('countryISOCode' => $this->info['countryISOCode']);
-
-
- $shipper['Communication'] = array();
-
-
- if ($this->info['email']!='') {
- $shipper['Communication']['email'] = $this->info['email'];
- }
-
- if(empty($this->info['phone'])) {
- $this->info['phone'] = '0';
- }
- $this->info['phone'] = str_replace('+','00',trim($this->info['phone']));
- $this->info['phone'] = preg_replace('![^0-9]!', '', $this->info['phone']);
- if(empty($this->info['phone'])) {
- $this->info['phone'] = '0';
- }
-
- $shipper['Communication']['phone'] = $this->info['phone'];
- $shipper['Communication']['internet'] = $this->info['internet'];
-
- $shipper['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
-
- if($api22)
- {
-
- if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])
- {
- $shipment['ShipmentOrder']['PrintOnlyIfCodeable'] = array();
- $shipment['ShipmentOrder']['PrintOnlyIfCodeable']['active'] = "1";
- }
-
- $receiver = array();
- $receiver['name1'] = $customer_details['name1'];
-
- if(stripos($customer_details['street_name'], 'packstation') !== false) {
- if(is_numeric($customer_details['name1']))
- $receiver['Packstation']['postNumber']=$customer_details['name1'];
- else if(is_numeric($customer_details['name2']) && $receiver['Packstation']['postNumber']=="")
- $receiver['Packstation']['postNumber']=$customer_details['name2'];
-
- $receiver['Packstation']['packstationNumber']=$customer_details['street_number'];
- $receiver['Packstation']['zip']=$customer_details['zip'];
- $receiver['Packstation']['city']=$customer_details['city'];
- $receiver['Packstation']['Origin']=array('countryISOCode' => $customer_details['country_code']);
- } else {
-
- $receiver['Address'] = array();
- if($customer_details['name2']!="")
- $receiver['Address']['addressAddition'] = $customer_details['name2'];
- $receiver['Address']['streetName'] = $customer_details['street_name'];
- $receiver['Address']['streetNumber'] = $customer_details['street_number'];
- $receiver['Address']['zip'] = $customer_details['zip'];
- $receiver['Address']['city'] = $customer_details['city'];
-
- if($customer_details['country_code']==='AT' && strpos($customer_details['street_number'], '/') !== false )
- {
- $customer_details['street_number'] = str_replace(' ','',$customer_details['street_number']);
- $tmpstiege = explode('/',$customer_details['street_number']);
- //if(isset($tmpstiege[0]))
- // $customer_details['street_number'] = $tmpstiege[0];
-
- if(isset($tmpstiege[1]))
- $receiver['Address']['addressAddition']=$tmpstiege[1];
-
- if(isset($tmpstiege[2]))
- $receiver['Address']['addressAddition2']=$tmpstiege[2];
-
- //$customer_details['street_number'] = strstr ($customer_details['street_number'], '/',true);
- //$receiver['Address']['streetNumber'] = strstr ($receiver['Address']['streetNumber'], '/',true);
- }
-
- $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- }
- $receiver['Communication'] = array();
- if($customer_details['c/o']=='') $customer_details['c/o'] = $customer_details['name2'];
- if($customer_details['c/o']=='') $customer_details['c/o'] = $customer_details['name1'];
- $receiver['Communication']['contactPerson'] = $customer_details['c/o'];
-
- if ($customer_details['email']!='') {
- $receiver['Communication']['email'] = $customer_details['email'];
- }
-
- if ($customer_details['phone']!='') {
- $receiver['Communication']['phone'] = $customer_details['phone'];
- }
-
- $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-
- }else{
- $receiver = array();
-
- $receiver['Company'] = array();
-
- $receiver['Company']['Company'] = array();
- $receiver['Company']['Company']['name1'] = $customer_details['name1'];
- $receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-
- if($customer_details['name2']!="")
- $tmp_name = explode(' ',$customer_details['name2'],2);
- else
- $tmp_name = explode(' ',$customer_details['name1'],2);
-
- if(isset($tmp_name[2]) && $tmp_name[2]){
- $receiver['Company']['Person'] = array();
- $receiver['Company']['Person']['firstname'] = $tmp_name[0];
- $receiver['Company']['Person']['lastname'] = $tmp_name[1];
- }
- $receiver['Address'] = array();
- $receiver['Address']['streetName'] = $customer_details['street_name'];
- $receiver['Address']['streetNumber'] = $customer_details['street_number'];
- $receiver['Address']['Zip'] = array();
- $receiver['Address']['Zip'][strtolower($customer_details['country_zip'])] = $customer_details['zip'];
- $receiver['Address']['city'] = $customer_details['city'];
- $receiver['Communication'] = array();
- if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name2'];
- if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name1'];
- $receiver['Communication']['contactPerson'] = $customer_details['c/o'];
-
-
- if ($customer_details['email']!="") {
- $receiver['Communication']['email'] = $customer_details['email'];
- }
- if(empty($customer_details['phone']))$customer_details['phone'] = '0';
- $customer_details['phone'] = str_replace('+','00',trim($customer_details['phone']));
- $customer_details['phone'] = preg_replace('![^0-9]!', '', $customer_details['phone']);
- if(empty($customer_details['phone']))$customer_details['phone'] = '0';
- $receiver['Communication']['phone'] = $customer_details['phone'];
- $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
- }
-
-
- if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
- {
- $ReturnReceiver = array();
- $ReturnReceiver['Company'] = array();
- $ReturnReceiver['Company']['Company'] = array();
- $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
- $ReturnReceiver['Address'] = array();
- $ReturnReceiver['Address']['streetName'] = $this->info['street_name'];
- $ReturnReceiver['Address']['streetNumber'] = $this->info['street_number'];
- if($api22)
- {
- $ReturnReceiver['Address']['zip'] = $this->info['zip'];
- }else{
- $ReturnReceiver['Address']['Zip'] = array();
- $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])] = $this->info['zip'];
- }
- $ReturnReceiver['Address']['city'] = $this->info['city'];
-
- $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
- $ReturnReceiver['Communication'] = array();
- if ($this->info['email']!="") {
- $shipper['Communication']['email'] = $this->info['email'];
- }
- $ReturnReceiver['Communication']['phone'] = $this->info['phone'];
- $ReturnReceiver['Communication']['internet'] = $this->info['internet'];
- $ReturnReceiver['Communication']['contactPerson'] = $this->info['contact_person'];
-
-
- $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
- }
-
- $proformarechnungsnummer = $customer_details['proformanumber'];
-
- if($proformarechnungsnummer=="")
- {
- $proformarechnungsnummer = ($customer_details['invoicenumber']!=""?$customer_details['invoicenumber']:$customer_details['ordernumber']);
- }
- if($api22)
- {
- //$export['invoiceType'] = "commercial";
- //$export['invoiceDate'] = date('Y-m-d');
-
- $export['invoiceNumber'] = $proformarechnungsnummer;
- $export['exportType'] = "OTHER";
- $export['exportTypeDescription'] = $this->info['export_reason'];
- $export['commodityCode'] = "";
- $export['termsOfTrade'] = "DDP";
- $export['amount'] = count($artikel);
- $export['placeOfCommital'] = $customer_details['city'];
- //$export['Description'] = $this->info['export_reason'];
- //$export['CountryCodeOrigin'] = "DE";
- $export['additionalFee'] = number_format((float)$customer_details['shippingFee'],2,".","");
- $export['customsValue'] = number_format($customer_details['amount'],2,".","");
- $export['customsCurrency'] = $customer_details['currency'];
- //$export['permitNumber'] = "";
-
- }else{
- $export['InvoiceType'] = "commercial";
- $export['InvoiceDate'] = date('Y-m-d');
- $export['InvoiceNumber'] = $proformarechnungsnummer;
- $export['ExportType'] = 0;
- $export['ExportTypeDescription'] = $this->info['export_reason'];
- $export['CommodityCode'] = "";
- $export['TermsOfTrade'] = "DDP";
- $export['Amount'] = count($artikel);
- $export['Description'] = $this->info['export_reason'];
- $export['CountryCodeOrigin'] = "DE";
- $export['AdditionalFee'] = number_format((float)$customer_details['shippingFee'],2,".","");
- $export['CustomsValue'] = number_format($customer_details['value'],2,".","");
- $export['CustomsCurrency'] = $customer_details['currency'];
- $export['PermitNumber'] = "";
- }
-
- $p=0;
- $cartikel = !empty($artikel)?count($artikel):0;
- for($i=0;$i<$cartikel;$i++)
- {
- if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
- if($api22)
- {
- if($this->info['export_reason']!="")
- $export['ExportDocPosition'][0]['description'] = $this->info['export_reason'];
- else
- $export['ExportDocPosition'][0]['description'] = "Additional Positions";
-
- $export['ExportDocPosition'][0]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][0]['customsTariffNumber'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][0]['amount'] = 1;//+= intval($artikel[$i]['amount']);
- if(!isset($export['ExportDocPosition'][0]['netWeightInKG'])){
- $export['ExportDocPosition'][0]['netWeightInKG'] = number_format($artikel[$i]['netweightinkg'], 2, ".", "");
- $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format($artikel[$i]['grossweightinkg'], 2, ".", "");
- }else{
- $export['ExportDocPosition'][0]['netWeightInKG'] = number_format(
- (float)$export['ExportDocPosition'][0]['netWeightInKG'] + (float)$artikel[$i]['netweightinkg'], 2, ".", ""
- );
- $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format(
- (float)$export['ExportDocPosition'][0]['grossWeightInKG'] + (float)$artikel[$i]['grossweightinkg'], 2, ".", ""
- );
- }
- $export['ExportDocPosition'][0]['customsValue'] = number_format($customer_details['amount'],2,".","");
- $export['ExportDocPosition'][0]['customsCurrency'] = $customer_details['currency'];
- $export['ExportDocPosition'][0]['Currency'] = $customer_details['currency'];
-
- }else{
- if($this->info['export_reason']!="")
- $export['ExportDocPosition'][0]['Description'] = $this->info['export_reason'];
- else
- $export['ExportDocPosition'][0]['Description'] = "Additional Positions";
-
- $export['ExportDocPosition'][0]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
- $export['ExportDocPosition'][0]['CommodityCode'] = $artikel[$i]['commodity_code'];
- $export['ExportDocPosition'][0]['Amount'] = 1;//+= intval($artikel[$i]['amount']);
- if(!isset($export['ExportDocPosition'][0]['netWeightInKG'])){
- $export['ExportDocPosition'][0]['netWeightInKG'] = number_format($artikel[$i]['netweightinkg'], 2, ".", "");
- $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format($artikel[$i]['grossweightinkg'], 2, ".", "");
- }else{
- $export['ExportDocPosition'][0]['netWeightInKG'] = number_format(
- (float)$export['ExportDocPosition'][0]['netWeightInKG'] + (float)$artikel[$i]['netweightinkg'], 2, ".", ""
- );
- $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format(
- (float)$export['ExportDocPosition'][0]['grossWeightInKG'] + (float)$artikel[$i]['grossweightinkg'], 2, ".", ""
- );
- }
- $export['ExportDocPosition'][0]['CustomsValue'] = number_format($customer_details['amount'],2,".","");
- $export['ExportDocPosition'][0]['CustomsCurrency'] = $customer_details['currency'];
- $export['ExportDocPosition'][0]['Currency'] = $customer_details['currency'];
- }
- }
-
-
-
- if(count($artikel)<=0)$this->errors[]="Bei den Artikel fehlen die Gewichte in den Stammdaten!";
-
- $shipment['ShipmentOrder']['Shipment']['ExportDocument'] = $export;
- try {
- if(empty($this->client)) {
- return;
- }
- if($api22)
- {
- $response = $this->client->createShipmentOrder($shipment);
- }else{
- $response = $this->client->CreateShipmentDD($shipment);
- }
- } catch(SoapFault $exception)
- {
-
- if($this->einstellungen['log'])
- {
- $this->dumpRequest("request.xml",$this->client->__getLastRequest());
- $this->dumpRequest("response.xml",$this->client->__getLastResponse());
- }
-
- if(trim($exception->getMessage()) == 'Authorization Required')
- {
- $this->errors[] = 'Fehlerhafte DHL Versenden Zugangsdaten';
- return false;
- }
- $this->errors[] = "Fehler von DHL Versenden: ".$exception->getMessage();
- return;
- }
-
- if($this->einstellungen['log'])
- {
- $this->dumpRequest("request.xml",$this->client->__getLastRequest());
- $this->dumpRequest("response.xml",$this->client->__getLastResponse());
- }
-
-
-
- if (((isset($response->status) && $response->status->StatusCode != 0)
- || (isset($response->Status) && $response->Status->statusCode != 0)) || is_soap_fault($response)) {
- $this->errors[] = "Fehlermeldung von DHL: ";
-
- if (is_soap_fault($response)) {
- $this->errors[] = $response->faultstring;
- } else {
-
- $responsetext = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
- if($responsetext=='In der Sendung trat mindestens ein harter Fehler auf.')
- $responsetext = 'Fehler bei der Leitcodierung in Adresse. Bitte korrekte Adresse angeben. ';
-
- if($responsetext=='Der Nutzer des Webservice konnte nicht authentifiziert werden.')
- $responsetext = "DHL Login Failed. Das könnte an einem abgelaufenen Passwort liegen, da DHL in regelmäßigen Abständen ein neues Passwort für den DHL API-User vorschreibt. Mehr Informationen, wie Sie ein neues DHL Passwort vergeben können, finden Sie hier .";
-
-
-
- if($responsetext=='Exception in extension function java.util.MissingResourceException: Couldnt find 3-letter country code for GERMANY')
- $responsetext = 'Bitte prüfen Sie die Herkunftsländer der Artikel in den Stammdaten. Es müssen 2-stellige ISO Codes angegeben sein.';
-
- $secondMessage = (String)$response->CreationState->LabelData->Status->statusMessage[1];
- if($secondMessage!="" && $secondMessage!=$responsetext)
- {
- $responsetext .= " ".$response->CreationState->LabelData->Status->statusMessage[1];
- }
-
- $this->errors[] = $responsetext;
- }
- if($response->CreationState->StatusMessage)
- {
- foreach($response->CreationState->StatusMessage as $v)
- {
- $found = false;
- if($this->errors && is_array($this->errors))
- {
- foreach($this->errors as $err)
- {
- if($err == $v)$found = true;
- }
- }
- if(!$found) {
- $this->errors[] = $v;
- }
- }
- }
-
- return false;
-
- }
-
- if($api22)
- {
- $r['shipment_number'] = (String) $response->CreationState->LabelData->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->LabelData->licensePlate;
- $r['label_url'] = (String) $response->CreationState->LabelData->labelUrl;
- $r['gesamt'] = $response;
- }else{
- $r['shipment_number'] = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
- $r['piece_number'] = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
- $r['label_url'] = (String) $response->CreationState->Labelurl;
- }
- return $r;
- }
-
- function dumpRequest($fileName, $contents){
- $dir = $this->app->getTmpFolder();
- file_put_contents("{$dir}$fileName", $contents);
- }
-
- function GetExportDocDD($shippment_number, $api22 = false) {
-
- $this->buildClient();
-
- $shipment = array();
-
- // Version
- if($api22)
- {
- $shipment['Version'] = array('majorRelease' => '2', 'minorRelease' => '0');
- }else{
- $shipment['Version'] = array('majorRelease' => '1', 'minorRelease' => '0');
- }
-
- // Order
- $shipment['ShipmentNumber'] = array('shipmentNumber'=>$shippment_number);
- //$shipment['DocType'] = 'PDF';
- $shipment['DocType'] = 'URL';
- if(empty($this->client))return false;
- // Fixme
- try {
- if($api22)
- $response = $this->client->getExportDoc($shipment);
- else
- $response = $this->client->GetExportDocDD($shipment);
- } catch(SoapFault $exception)
- {
- if(trim($exception->getMessage()) === 'Authorization Required')
- {
- $this->errors[] = 'Fehlerhafte DHL Versenden Zugangsdaten';
- return false;
- }
-
- $this->errors[] = 'Fehler von DHL Versenden: '.$exception->getMessage();
- return false;
- }
-
- if (((isset($response->status) && $response->status->StatusCode != 0) ||
- (isset($response->Status) && $response->Status->statusCode != 0)) ||
- is_soap_fault($response)
- ) {
- $this->errors[] = "Fehlermeldung von DHL: ";
- if (is_soap_fault($response)) {
- $this->errors[] = $response->faultstring;
- } else {
-
- $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
- }
- return false;
- }
- $r = array();
- if($api22)
- {
- $r['export_pdf'] = (String) $response->ExportDocData->exportDocData;
- $r['export_url'] = (String) $response->ExportDocData->exportDocURL;
- } else {
- $r['export_pdf'] = (String) $response->ExportDocData->ExportDocPDFData;
- $r['export_url'] = (String) $response->ExportDocData->ExportDocURL;
- }
- return $r;
- }
-
- private function buildAuthHeader() {
-
- $head = $this->einstellungen;
-
- $auth_params = array(
- 'user' => $this->einstellungen['user'],
- 'signature' => $this->einstellungen['signature'],
- 'type' => 0
-
- );
- try{
- $erg = new SoapHeader('http://dhl.de/webservice/cisbase','Authentification', $auth_params);
- } catch(SoapFault $exception)
- {
- $erg = false;
- $this->errors[] = "Authentifizierungsfehler: ".$exception->getMessage();
- }
- return $erg;
- }
-}
diff --git a/www/lib/versandarten/internetmarke.php b/www/lib/versandarten/internetmarke.php_
similarity index 100%
rename from www/lib/versandarten/internetmarke.php
rename to www/lib/versandarten/internetmarke.php_
diff --git a/www/lib/versandarten/parcelone.php b/www/lib/versandarten/parcelone.php_
similarity index 100%
rename from www/lib/versandarten/parcelone.php
rename to www/lib/versandarten/parcelone.php_
diff --git a/www/lib/versandarten/sendcloud.php b/www/lib/versandarten/sendcloud.php
new file mode 100644
index 00000000..2216cb83
--- /dev/null
+++ b/www/lib/versandarten/sendcloud.php
@@ -0,0 +1,163 @@
+id))
+ return;
+ $this->api = new SendCloudApi($this->settings->public_key, $this->settings->private_key);
+ }
+
+ public function GetName(): string
+ {
+ return "SendCloud";
+ }
+
+ protected function FetchOptionsFromApi()
+ {
+ if (isset($this->options))
+ return;
+ try {
+ $list = $this->api->GetSenderAddresses();
+ foreach ($list as $item) {
+ /* @var SenderAddress $item */
+ $senderAddresses[$item->Id] = $item;
+ }
+ $senderCountry = $senderAddresses[$this->settings->sender_address]->Country ?? 'DE';
+ $list = $this->api->GetShippingProducts($senderCountry);
+ foreach ($list as $item) {
+ /* @var ShippingProduct $item */
+ $shippingProducts[$item->Code] = $item;
+ }
+ } catch (SendcloudApiException $e) {
+ $this->app->Tpl->addMessage('error', $e->getMessage());
+ }
+ $this->options['senders'] = array_map(fn(SenderAddress $x) => strval($x), $senderAddresses ?? []);
+ $this->options['products'] = array_map(fn(ShippingProduct $x) => $x->Name, $shippingProducts ?? []);
+ $this->options['products'][0] = '';
+ $this->options['selectedProduct'] = $shippingProducts[$this->settings->shipping_product] ?? [];
+ natcasesort($this->options['products']);
+ }
+
+ public function AdditionalSettings(): array
+ {
+ $this->FetchOptionsFromApi();
+ return [
+ 'public_key' => ['typ' => 'text', 'bezeichnung' => 'API Public Key:'],
+ 'private_key' => ['typ' => 'text', 'bezeichnung' => 'API Private Key:'],
+ 'sender_address' => ['typ' => 'select', 'bezeichnung' => 'Absender-Adresse:', 'optionen' => $this->options['senders']],
+ 'shipping_product' => ['typ' => 'select', 'bezeichnung' => 'Versand-Produkt:', 'optionen' => $this->options['products']],
+ ];
+ }
+
+ public function CreateShipment(object $json, array $address): CreateShipmentResult
+ {
+ $parcel = new ParcelCreation();
+ $parcel->SenderAddressId = $this->settings->sender_address;
+ $parcel->ShippingMethodId = $json->product;
+ $parcel->Name = $json->name;
+ switch ($json->addresstype) {
+ case 0:
+ $parcel->CompanyName = trim("$json->name2 $json->name3");
+ $parcel->Address = $json->street;
+ $parcel->Address2 = $json->address2;
+ $parcel->HouseNumber = $json->streetnumber;
+ break;
+ case 1:
+ $parcel->CompanyName = $json->postnumber;
+ $parcel->Address = "Packstation";
+ $parcel->HouseNumber = $json->parcelstationNumber;
+ break;
+ case 2:
+ $parcel->CompanyName = $json->postnumber;
+ $parcel->Address = "Postfiliale";
+ $parcel->HouseNumber = $json->postofficeNumber;
+ break;
+ }
+ $parcel->Country = $json->country;
+ $parcel->PostalCode = $json->zip;
+ $parcel->City = $json->city;
+ $parcel->EMail = $json->email;
+ $parcel->Telephone = $json->phone;
+ $parcel->CountryState = $json->state;
+ $parcel->CustomsInvoiceNr = $json->invoice_number;
+ $parcel->CustomsShipmentType = $json->shipment_type;
+ $parcel->TotalInsuredValue = $json->total_insured_value;
+ $parcel->OrderNumber = $json->order_number;
+ foreach ($json->positions as $pos) {
+ $item = new ParcelItem();
+ $item->HsCode = $pos->zolltarifnummer;
+ $item->Description = $pos->bezeichnung;
+ $item->Quantity = $pos->menge;
+ $item->OriginCountry = $pos->herkunftsland;
+ $item->Price = $pos->zolleinzelwert;
+ $item->Weight = $pos->zolleinzelgewicht * 1000;
+ $parcel->ParcelItems[] = $item;
+ }
+ $parcel->Weight = floatval($json->weight) * 1000;
+ $ret = new CreateShipmentResult();
+ try {
+ $result = $this->api->CreateParcel($parcel);
+ if ($result instanceof ParcelResponse) {
+ $ret->Success = true;
+ $ret->TrackingNumber = $result->TrackingNumber;
+ $ret->TrackingUrl = $result->TrackingUrl;
+
+ $doc = $result->GetDocumentByType(Document::TYPE_LABEL);
+ $ret->Label = $this->api->DownloadDocument($doc);
+
+ $doc = $result->GetDocumentByType(Document::TYPE_CN23);
+ if ($doc)
+ $ret->ExportDocuments = $this->api->DownloadDocument($doc);
+ } else {
+ $ret->Errors[] = $result;
+ }
+ } catch (SendcloudApiException $e) {
+ $ret->Errors[] = strval($e);
+ }
+ return $ret;
+ }
+
+ public function GetShippingProducts(): array
+ {
+ $this->FetchOptionsFromApi();
+ /** @var ShippingProduct $product */
+ $product = $this->options['selectedProduct'];
+ $result = [];
+ /** @var ShippingMethod $item */
+ foreach ($product->ShippingMethods as $item) {
+ $p = new Product();
+ $p->Id = $item->Id;
+ $p->Name = $item->Name;
+ $result[] = $p;
+ }
+ return $result;
+ }
+
+
+}
\ No newline at end of file
diff --git a/www/lib/versandarten/sonstiges.php b/www/lib/versandarten/sonstiges.php_
similarity index 100%
rename from www/lib/versandarten/sonstiges.php
rename to www/lib/versandarten/sonstiges.php_
diff --git a/www/pages/appstore.php b/www/pages/appstore.php
index ad3f857b..6c9c7c89 100644
--- a/www/pages/appstore.php
+++ b/www/pages/appstore.php
@@ -1,4 +1,11 @@
-
+*/
+?>
array('Bezeichnung'=>'Presta',
'Link'=>'index.php?module=onlineshops&action=create&cmd=shopimporter_presta',
'Icon'=>'Icons_dunkel_1.gif',
- 'Versionen'=>'ENT','install'=>true, 'beta' => false,'kategorie'=>'{|Shop Schnittstelle|}')
+ 'Versionen'=>'ALL','install'=>true, 'beta' => false,'kategorie'=>'{|Shop Schnittstelle|}')
,'shopimporter_shopify'=>array(
'Bezeichnung'=>'Shopify API Advanced',
'Link'=>'index.php?module=onlineshops&action=create&cmd=shopimporter_shopify',
diff --git a/www/pages/content/rechnungslauf_abos.tpl b/www/pages/content/rechnungslauf_abos.tpl
new file mode 100644
index 00000000..e7f1363a
--- /dev/null
+++ b/www/pages/content/rechnungslauf_abos.tpl
@@ -0,0 +1,12 @@
+
+
diff --git a/www/pages/content/rechnungslauf_list.tpl b/www/pages/content/rechnungslauf_list.tpl
new file mode 100644
index 00000000..c0a0f53e
--- /dev/null
+++ b/www/pages/content/rechnungslauf_list.tpl
@@ -0,0 +1,40 @@
+
+
+
+
+ [MESSAGE_INVOICES]
+
+
+
+ [MESSAGE_ORDERS]
+
+
+
[SUBHEADING]
@@ -8,7 +13,7 @@
{|Menge|}
{|Einzelpreis (netto)|}
{|Rabatt|}
- {|UST|}
+ {|Zyklen|}
{|Gesamtpreis (netto)|}
{|Währung|}
diff --git a/www/pages/content/versandarten_edit.tpl b/www/pages/content/versandarten_edit.tpl
index 1af4eafb..1673db70 100644
--- a/www/pages/content/versandarten_edit.tpl
+++ b/www/pages/content/versandarten_edit.tpl
@@ -1,46 +1,90 @@
+
diff --git a/www/pages/content/versandarten_neu.tpl b/www/pages/content/versandarten_neu.tpl
index 716f14ab..67c59ca7 100644
--- a/www/pages/content/versandarten_neu.tpl
+++ b/www/pages/content/versandarten_neu.tpl
@@ -1,3 +1,9 @@
+
diff --git a/www/pages/lieferschein.php b/www/pages/lieferschein.php
index 74a42eb2..6c7fdaf2 100644
--- a/www/pages/lieferschein.php
+++ b/www/pages/lieferschein.php
@@ -1,4 +1,12 @@
app->Secure->GetGET("id");
+ $id = (int)$this->app->Secure->GetGET("id");
- $versandart = $this->app->DB->Select("SELECT versandart FROM lieferschein WHERE id='$id' LIMIT 1");
- $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id = '$id' LIMIT 1");
$this->LieferscheinMenu();
$this->app->Tpl->Set('TABTEXT',"Paketmarke");
- $versandart = strtolower($versandart);
- $versandartenmodul = $this->app->DB->SelectArr("SELECT id, modul FROM versandarten WHERE aktiv = 1 AND ausprojekt = 0 AND modul != '' AND type = '".$this->app->DB->real_escape_string($versandart)."' AND (projekt = '$projekt' || projekt = 0) ORDER BY projekt DESC LIMIT 1");
- if($versandartenmodul && is_file(dirname(__DIR__).'/lib/versandarten/'.$versandartenmodul[0]['modul'].'.php'))
- {
- $this->app->erp->Paketmarke('TAB1','lieferschein',"",$versandart);
- }else{
- if($versandart=="dpd")
- $this->app->erp->PaketmarkeDPDEmbedded('TAB1',"lieferschein");
- else if($versandart=="express_dpd")
- $this->app->erp->PaketmarkeDPDEmbedded('TAB1',"lieferschein","express");
- else if($versandart=="export_dpd")
- $this->app->erp->PaketmarkeDPDEmbedded('TAB1',"lieferschein","export");
- else if($versandart=="ups")
- $this->app->erp->PaketmarkeUPSEmbedded('TAB1',"lieferschein");
- else if($versandart=="fedex")
- $this->app->erp->PaketmarkeFEDEXEmbedded('TAB1',"lieferschein");
- else if($versandart=="go")
- $this->app->erp->PaketmarkeGo('TAB1',"lieferschein");
- else {
- $this->app->erp->Paketmarke('TAB1','lieferschein',"","");
- }
- //$this->app->erp->PaketmarkeDHLEmbedded('TAB1',"lieferschein");
+ $result = $this->app->DB->SelectRow(
+ "SELECT v.id, v.modul
+ FROM lieferschein l
+ LEFT JOIN versandarten v ON (l.versandart=v.type AND v.projekt in (l.projekt, 0))
+ WHERE l.id=$id
+ AND v.aktiv = 1 AND v.ausprojekt = 0 AND v.modul != ''
+ ORDER BY v.projekt DESC LIMIT 1");
+ if (empty($result['modul']) || empty($result['id'])) {
+ $this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
+ return;
}
+ $versandmodul = $this->app->erp->LoadVersandModul($result['modul'], $result['id']);
+ $versandmodul->Paketmarke('TAB1', 'lieferschein', $id);
$this->app->Tpl->Parse('PAGE',"tabview.tpl");
}
diff --git a/www/pages/rechnungslauf.php b/www/pages/rechnungslauf.php
new file mode 100644
index 00000000..dcb0313a
--- /dev/null
+++ b/www/pages/rechnungslauf.php
@@ -0,0 +1,283 @@
+';
+ $menu .= '';
+ $menu .= '';
+ $menu .= '';
+ $menu .= ' ';
+ $menu .= ' ';
+ $menu .= ' ';
+ $menu .= '';
+
+ $calcdate = new \DateTimeImmutable('today');
+ $scalcdate = $calcdate->format('Y-m-d');
+ $where = " aa.id > 0
+ AND aa.dokument = '$doctype'
+ AND greatest(aa.startdatum, aa.abgerechnetbis) < '$scalcdate'
+ AND (aa.enddatum = '0000-00-00' OR aa.abgerechnetbis < aa.enddatum)";
+
+ $sql = "SELECT SQL_CALC_FOUND_ROWS
+ adr.id,
+ '';
+ $row .= sprintf('%s ', $p['bezeichnung']);
+ $row .= sprintf('%s ', $p['menge']);
+ $row .= sprintf('%s ',
+ $this->app->erp->number_format_variable($p['preis'], 2));
+ $row .= sprintf('%s ', $p['rabatt']);
+ $row .= sprintf('%s ', $p['cycles']);
+ $row .= sprintf('%s ',
+ $this->app->erp->number_format_variable($p['preis']*$p['menge']*$p['cycles'], 2));
+ $row .= sprintf('%s ', $p['waehrung']);
+ $row .= ' ';
+ $this->app->Tpl->Add('INHALT', $row);
+ }
+ $this->app->Tpl->Set('SUBHEADING', 'Kunde');
+ $this->app->Tpl->Output('rechnungslauf_minidetail.tpl');
+ $this->app->ExitXentral();
+ }
+}
\ No newline at end of file
diff --git a/www/pages/shopimport.php b/www/pages/shopimport.php
index 397b7a89..e80f83dd 100644
--- a/www/pages/shopimport.php
+++ b/www/pages/shopimport.php
@@ -1,4 +1,11 @@
-
+*/
+?>
app->erp->KundeAnlegen($typ,$name,$abteilung,
// $unterabteilung,$ansprechpartner,$adresszusatz,$strasse,$land,$plz,$ort,$email,$telefon,$telefax,$ustid,$partner,$projekt);
- if(strlen($warenkorb['kundennummer'])!=''){
+ if(!empty($warenkorb['kundennummer'])){
$adresse = $this->app->DB->Select("SELECT id FROM adresse WHERE kundennummer='{$warenkorb['kundennummer']}' $adresseprojekt AND geloescht!=1 LIMIT 1");
}
diff --git a/www/pages/shopimporter_presta.php b/www/pages/shopimporter_presta.php
new file mode 100644
index 00000000..f02a8114
--- /dev/null
+++ b/www/pages/shopimporter_presta.php
@@ -0,0 +1,436 @@
+ 'de', 1 => 'en'];
+ private $taxationByDestinationCountry;
+
+
+ public function __construct($app, $intern = false)
+ {
+ $this->app = $app;
+ $this->intern = $intern;
+ if ($intern)
+ return;
+
+ }
+
+ public function EinstellungenStruktur()
+ {
+ return [
+ 'ausblenden' => ['abholmodus' => ['ab_nummer', 'zeitbereich']],
+ 'functions' => ['getarticlelist'],
+ 'felder' => [
+ 'protokoll' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Protokollierung im Logfile|}:'
+ ],
+ 'textekuerzen' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Texte bei Artikelexport auf Maximallänge kürzen|}:'
+ ],
+ 'useKeyAsParameter' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Shop Version ist mindestens 1.6.1.1|}:'
+ ],
+ 'apikey' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|API Key|}:',
+ 'size' => 40,
+ ],
+ 'shopurl' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|Shop URL|}:',
+ 'size' => 40,
+ ],
+ 'shopidpresta' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|Shop ID des Shops|}:',
+ 'size' => 40,
+ ],
+ 'steuergruppen' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|Steuergruppenmapping|}:',
+ 'size' => 40,
+ ],
+ 'zustand' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|Freifeld Zustand|}:',
+ 'size' => 40,
+ ],
+ 'abholen' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|\'Abholen\' Status IDs|}:',
+ 'size' => 40,
+ ],
+ 'bearbeitung' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|\'In Bearbeitung\' Status IDs|}:',
+ 'size' => 40,
+ ],
+ 'abgeschlossen' => [
+ 'typ' => 'text',
+ 'bezeichnung' => '{|\'Abgeschlossen\' Status IDs|}:',
+ 'size' => 40,
+ ],
+ 'autoerstellehersteller' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Fehlende Hersteller automatisch anlegen|}:',
+ 'col' => 2
+ ],
+ 'zeigezustand' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Artikelzustand im Shop anzeigen|}:',
+ 'col' => 2
+ ],
+ 'zeigepreis' => [
+ 'typ' => 'checkbox',
+ 'bezeichnung' => '{|Artikelpreis im Shop anzeigen|}:',
+ 'col' => 2
+ ],
+ ]
+ ];
+ }
+
+ public function getKonfig($shopid, $data)
+ {
+ $this->shopid = $shopid;
+ $this->data = $data;
+ $importerSettings = $this->app->DB->SelectArr("SELECT `einstellungen_json` FROM `shopexport` WHERE `id` = '$shopid' LIMIT 1");
+ $importerSettings = reset($importerSettings);
+
+ $einstellungen = [];
+ if (!empty($importerSettings['einstellungen_json'])) {
+ $einstellungen = json_decode($importerSettings['einstellungen_json'], true);
+ }
+ $this->protocol = $einstellungen['felder']['protokoll'];
+ $this->apiKey = $einstellungen['felder']['apikey'];
+ $this->shopUrl = rtrim($einstellungen['felder']['shopurl'], '/') . '/';
+ if ($einstellungen['felder']['autoerstellehersteller'] === '1') {
+ $this->createManufacturerAllowed = true;
+ }
+ $this->idsabholen = $einstellungen['felder']['abholen'];
+ $this->idbearbeitung = $einstellungen['felder']['bearbeitung'];
+ $this->idabgeschlossen = $einstellungen['felder']['abgeschlossen'];
+ $query = sprintf('SELECT `steuerfreilieferlandexport` FROM `shopexport` WHERE `id` = %d', $this->shopid);
+ $this->taxationByDestinationCountry = !empty($this->app->DB->Select($query));
+ }
+
+ public function ImportAuth() {
+ $ch = curl_init($this->shopUrl);
+ curl_setopt($ch, CURLOPT_USERNAME, $this->apiKey);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $response = curl_exec($ch);
+ $code = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+ if ($code == 200)
+ return 'success';
+
+ return $response;
+ }
+
+ public function ImportDeleteAuftrag()
+ {
+ $auftrag = $this->data['auftrag'];
+
+ $obj = $this->prestaRequest('GET', 'order_histories?schema=blank');
+ $obj->order_history->id_order = $auftrag;
+ $obj->order_history->id_order_state = $this->idbearbeitung;
+
+ $this->prestaRequest('POST', 'order_histories', $obj->asXML());
+ }
+
+ public function ImportUpdateAuftrag()
+ {
+ $auftrag = $this->data['auftrag'];
+
+ $obj = $this->prestaRequest('GET', 'order_histories?schema=blank');
+ $obj->order_history->id_order = $auftrag;
+ $obj->order_history->id_order_state = $this->idabgeschlossen;
+
+ $this->prestaRequest('POST', 'order_histories', $obj->asXML());
+
+ $req = $this->prestaRequest('GET', "order_carriers?filter[id_order]=$auftrag&display=[id]");
+ $orderCarrierId = strval($req->order_carriers->order_carrier[0]->id);
+ $req = $this->prestaRequest('GET', "order_carriers/$orderCarrierId");
+ $req->order_carrier->tracking_number = $this->data['tracking'];
+ $this->prestaRequest('PUT', "order_carriers/$orderCarrierId", $req->asXML());
+ }
+
+ public function ImportGetAuftraegeAnzahl()
+ {
+ $ordersToProcess = $this->getOrdersToProcess($this->getOrderSearchLimit());
+ return count($ordersToProcess);
+ }
+
+ public function ImportGetAuftrag()
+ {
+ $voucherArticleId = $this->app->DB->Select("SELECT s.artikelrabatt FROM `shopexport` AS `s` WHERE s.id='$this->shopid' LIMIT 1");
+ $voucherArticleNumber = $this->app->DB->Select("SELECT a.nummer FROM `artikel` AS `a` WHERE a.id='$voucherArticleId' LIMIT 1");
+
+ if (empty($this->idsabholen)) {
+ return false;
+ }
+ $expectOrderArray = !empty($this->data['anzgleichzeitig']) && (int)$this->data['anzgleichzeitig'] > 1;
+ $expectNumber = !empty($this->data['nummer']);
+ if ($expectNumber) {
+ $ordersToProcess = [$this->data['nummer']];
+ } elseif (!$expectOrderArray) {
+ $ordersToProcess = $this->getOrdersToProcess(1);
+ } else {
+ $ordersToProcess = $this->getOrdersToProcess($this->getOrderSearchLimit());
+ }
+
+ $fetchedOrders = [];
+ foreach ($ordersToProcess as $currentOrderId) {
+ $order = $this->prestaRequest('GET', "orders/$currentOrderId");
+ $order = $order->order;
+ $cart = [];
+ $cart['zeitstempel'] = strval($order->date_add);
+ $cart['auftrag'] = strval($order->id);
+ $cart['onlinebestellnummer'] = strval($order->reference);
+ $cart['gesamtsumme'] = strval($order->total_paid);
+ $cart['versandkostennetto'] = strval($order->total_shipping_tax_excl);
+ $cart['bestelldatum'] = strval($order->date_add);
+
+ $carrier = $this->prestaRequest('GET', "carriers/$order->id_carrier");
+ $cart['lieferung'] = strval($carrier->carrier->name);
+
+ $customer = $this->prestaRequest('GET', "customers/$order->id_customer");
+ $cart['email'] = strval($customer->customer->email);
+
+ $language = $this->prestaRequest('GET', "languages/{$customer->customer->id_lang}");
+ if ($language->language->iso_code == "en") {
+ $cart['kunde_sprache'] = 'englisch';
+ }
+
+ $invoiceAddress = $this->prestaRequest('GET', "addresses/$order->id_address_invoice");
+ $invoiceAddress = $invoiceAddress->address;
+ $invoiceCountry = $this->prestaRequest('GET', "countries/$invoiceAddress->id_country");
+ $invoiceCountry = $invoiceCountry->country;
+ $cart['name'] = "$invoiceAddress->firstname $invoiceAddress->lastname";
+ if (!empty(strval($invoiceAddress->company))) {
+ $cart['ansprechpartner'] = $cart['name'];
+ $cart['name'] = strval($invoiceAddress->company);
+ }
+ $cart['strasse'] = strval($invoiceAddress->address1);
+ $cart['adresszusatz'] = strval($invoiceAddress->address2);
+ $cart['telefon'] = strval($invoiceAddress->phone_mobile);
+ if (empty($cart['telefon']))
+ $cart['telefon'] = strval($invoiceAddress->phone);
+ $cart['plz'] = strval($invoiceAddress->postcode);
+ $cart['ort'] = strval($invoiceAddress->city);
+ $cart['ustid'] = strval($invoiceAddress->vat_number);
+ $cart['land'] = strval($invoiceCountry->iso_code);
+
+ if (strval($order->id_address_invoice) != strval($order->id_address_delivery)) {
+ $deliveryAddress = $this->prestaRequest('GET', "addresses/$order->id_address_delivery");
+ $deliveryAddress = $deliveryAddress->address;
+ $deliveryCountry = $this->prestaRequest('GET', "countries/$deliveryAddress->id_country");
+ $deliveryCountry = $deliveryCountry->country;
+ $cart['abweichendelieferadresse'] = 1;
+ $cart['lieferadresse_name'] = "$deliveryAddress->firstname $deliveryAddress->lastname";
+ if (!empty(strval($deliveryAddress->company))) {
+ $cart['lieferadresse_ansprechpartner'] = $cart['lieferadresse_name'];
+ $cart['lieferadresse_name'] = strval($deliveryAddress->company);
+ }
+ $cart['lieferadresse_strasse'] = strval($deliveryAddress->address1);
+ $cart['lieferadresse_adresszusatz'] = strval($deliveryAddress->address2);
+ $cart['lieferadresse_plz'] = strval($deliveryAddress->postcode);
+ $cart['lieferadresse_ort'] = strval($deliveryAddress->city);
+ $cart['lieferadresse_land'] = strval($deliveryCountry->iso_code);
+ }
+
+ //TODO
+ //$cart['transaktionsnummer']
+ $cart['zahlungsweise'] = strval($order->payment);
+
+ $taxedCountry = $cart['land'];
+ if (!empty($cart['lieferadresse_land']) && $this->taxationByDestinationCountry) {
+ $taxedCountry = $cart['lieferadresse_land'];
+ }
+ $lieferschwelle = $this->app->DB->SelectArr("SELECT * FROM lieferschwelle WHERE empfaengerland='$taxedCountry' LIMIT 1");
+ if ($this->app->erp->IstEU($taxedCountry) || !empty($lieferschwelle['ueberschreitungsdatum'])) {
+ $cart['ust_befreit'] = 1;
+ } elseif ($this->app->erp->Export($taxedCountry)) {
+ $cart['ust_befreit'] = 2;
+ }
+
+ $taxes = [];
+ $this->app->erp->RunHook('getTaxRatesFromShopOrder', 2, $taxedCountry, $taxes);
+
+ if (isset($taxes['normal']) && $taxes['normal'] > 0)
+ $cart['steuersatz_normal'] = $taxes['normal'];
+ if (isset($taxes['ermaessigt']) && $taxes['ermaessigt'] > 0)
+ $cart['steuersatz_ermaessigt'] = $taxes['ermaessigt'];
+
+ $cart['articlelist'] = [];
+ foreach ($order->associations->order_rows->order_row as $order_row) {
+
+ $steuersatz = (strval($order_row->unit_price_tax_incl) / strval($order_row->unit_price_tax_excl)) - 1;
+ $steuersatz = round($steuersatz, 1);
+
+ $cart['articlelist'][] = [
+ 'articleid' => strval($order_row->product_reference),
+ 'name' => strval($order_row->product_name),
+ 'quantity' => strval($order_row->product_quantity),
+ 'price_netto' => strval($order_row->unit_price_tax_excl),
+ 'steuersatz' => $steuersatz
+ ];
+ }
+
+ $fetchedOrders[] = [
+ 'id' => $cart['auftrag'],
+ 'sessionid' => '',
+ 'logdatei' => '',
+ 'warenkorb' => base64_encode(serialize($cart)),
+ 'warenkorbjson' => base64_encode(json_encode($cart)),
+ ];
+ }
+ $this->Log('Precessed order from presta', $fetchedOrders);
+
+ return $fetchedOrders;
+ }
+
+ public function ImportGetArticleList()
+ {
+ $result = [];
+ $response = $this->prestaRequest('GET', 'products?display=[reference]');
+ foreach ($response->products->product as $product) {
+ $result[] = $product->reference;
+ }
+
+ array_unique($result);
+ return $result;
+ }
+
+ public function ImportGetArticle()
+ {
+ $nummer = $this->data['nummer'];
+ if (isset($this->data['nummerintern'])) {
+ $nummer = $this->data['nummerintern'];
+ }
+ $nummer = trim($nummer);
+
+ if (empty($nummer))
+ return;
+
+ $searchresult = $this->prestaRequest('GET', 'products?filter[reference]='.$nummer);
+ if (empty($searchresult)) {
+ $this->Log('No product found in Shop', $this->data);
+ return;
+ }
+ if (count($searchresult->products->product) > 1) {
+ $this->Log('Got multiple results from Shop', $this->data);
+ }
+
+ $productid = $searchresult->products->product->attributes()->id;
+ $product = $this->prestaRequest('GET', "products/$productid");
+ $res = [];
+ $res['nummer'] = strval($product->product->reference);
+ $res['artikelnummerausshop'] = strval($product->product->reference);
+ $names = $this->toMultilangArray($product->product->name->language);
+ $descriptions = $this->toMultilangArray($product->product->description->language);
+ $shortdescriptions = $this->toMultilangArray($product->product->description_short->language);
+ $res['name'] = $names['de'];
+ $res['name_en'] = $names['en'];
+ $res['uebersicht_de'] = $descriptions['de'];
+ $res['uebersicht_en'] = $descriptions['en'];
+ $res['preis_netto'] = strval($product->product->price);
+ $res['hersteller'] = strval($product->product->manufacturer_name);
+ $res['ean'] = strval($product->product->ean13);
+
+ $images = [];
+ foreach ($product->product->associations->images->image as $img) {
+ $endpoint = "images/products/$productid/$img->id";
+ $imgdata = $this->prestaRequest('GET', $endpoint, '', true);
+ $images[] = [
+ 'content' => base64_encode($imgdata),
+ 'path' => "$img->id.jpg",
+ 'id' => $img->id
+ ];
+ }
+ $res['bilder'] = $images;
+ return $res;
+ }
+
+ private function toMultilangArray($xmlnode) {
+ $res = [];
+ foreach ($xmlnode as $item) {
+ $iso = $this->langidToIso[strval($item->attributes()->id)];
+ $res[$iso] = strval($item);
+ }
+ return $res;
+ }
+
+ private function getOrdersToProcess(int $limit)
+ {
+ $states = implode('|', explode(',', $this->idsabholen));
+ $response = $this->prestaRequest('GET', "orders?display=[id]&limit=$limit&filter[current_state]=[$states]");
+ $result = [];
+ foreach ($response->orders->order as $order) {
+ $result[] = strval($order->id);
+ }
+ return $result;
+ }
+
+ public function getOrderSearchLimit(): int
+ {
+ if(in_array($this->orderSearchLimit, ['50', '75', '100'])) {
+ return (int)$this->orderSearchLimit;
+ }
+
+ return 25;
+ }
+
+ private function Log($message, $dump = '')
+ {
+ if ($this->protocol) {
+ $this->app->erp->Logfile($message, print_r($dump, true));
+ }
+ }
+
+ private function prestaRequest($method, $endpoint, $data = '', $raw = false)
+ {
+ $url = $this->shopUrl . $endpoint;
+ $url = str_replace('[', '%5b', $url);
+ $url = str_replace(']', '%5d', $url);
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ if (!empty($data)) {
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+ }
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+ curl_setopt($ch, CURLOPT_USERNAME, $this->apiKey);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $response = curl_exec($ch);
+ if (curl_error($ch)) {
+ $this->error[] = curl_error($ch);
+ }
+ curl_close($ch);
+
+ if ($raw)
+ return $response;
+
+ return simplexml_load_string($response);
+ }
+}
\ No newline at end of file
diff --git a/www/pages/steuersaetze.php b/www/pages/steuersaetze.php
index 88830761..f9d1a06b 100644
--- a/www/pages/steuersaetze.php
+++ b/www/pages/steuersaetze.php
@@ -1,4 +1,11 @@
-
+*/
+?>
app->DB->SelectArr(
sprintf(
- "SELECT DISTINCT `satz`
+ "SELECT DISTINCT `type`, `satz`
FROM `steuersaetze`
WHERE `aktiv` = 1
AND (`country_code` = '%s' OR (`bezeichnung` = '%s' AND `country_code` = ''))",
@@ -163,7 +170,7 @@ class Steuersaetze {
);
if(!empty($taxes)) {
foreach($taxes as $rates) {
- $ret[] = $rates['satz'];
+ $ret[$rates['type']] = $rates['satz'];
}
}
diff --git a/www/pages/versandarten.php b/www/pages/versandarten.php
index 890ac976..6ab5cad0 100644
--- a/www/pages/versandarten.php
+++ b/www/pages/versandarten.php
@@ -1,4 +1,12 @@
-
+*/
+?>
app=$app;
+ if($intern) {
+ return;
+ }
+ $this->app->ActionHandlerInit($this);
+
+ // ab hier alle Action Handler definieren die das Modul hat
+ $this->app->ActionHandler("create", "VersandartenCreate");
+ $this->app->ActionHandler("edit", "VersandartenEdit");
+ $this->app->ActionHandler("list", "VersandartenList");
+ $this->app->ActionHandler("delete", "VersandartenDelete");
+ $this->app->ActionHandler("copy", 'VersandartenCopy');
+ $this->app->ActionHandler('createShipment', 'CreateShipment');
+
+ $this->app->ActionHandlerListen($app);
+ }
+
+ public function Install(): void
+ {
+ $this->app->erp->GetVersandartAuftrag();
+ }
+
+ /** @noinspection PhpUnused */
+ public function VersandartenCopy():void
+ {
+ $id = (int)$this->app->Secure->GetGET('id');
+ $id = $this->app->DB->Select("SELECT `id` FROM `versandarten` WHERE `id` = $id LIMIT 1");
+ if(!$id) {
+ $this->app->Location->execute('index.php?module=versandarten&action=list');
+ }
+ $newId = $this->app->DB->MysqlCopyRow('versandarten', 'id', $id);
+ if($newId) {
+ $this->app->DB->Update(
+ "UPDATE `versandarten` set `aktiv` = 0, `ausprojekt` = 0 WHERE `id` = $newId LIMIT 1"
+ );
+ }
+ $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$newId);
+ }
+
+ /** @noinspection PhpUnused */
+ public function VersandartenList(): void
+ {
+ $this->app->erp->MenuEintrag('index.php?module=versandarten&action=create','Neue Versandart anlegen');
+ $this->app->erp->MenuEintrag('index.php?module=versandarten&action=list','Übersicht');
+ $this->app->YUI->TableSearch('TAB1','versandarten_list', 'show','','',basename(__FILE__), __CLASS__);
+ $this->app->Tpl->Parse('PAGE','versandarten_list.tpl');
+ }
+
+ public static function TableSearch(Application $app, string $name, array $erlaubtevars): array
{
// in dieses switch alle lokalen Tabellen (diese Live Tabellen mit Suche etc.) für dieses Modul
switch($name) {
case 'versandarten_list':
- $allowed['versandarten'] = array('list');
- $allowed['einstellungen'] = array('category');
- $isSettingAction = $app->Secure->GetGET('module') === 'einstellungen'
+ $allowed['versandarten'] = array('list');
+ $allowed['einstellungen'] = array('category');
+ $isSettingAction = $app->Secure->GetGET('module') === 'einstellungen'
|| $app->Secure->GetGET('smodule') === 'einstellungen';
- if($isSettingAction) {
- $maxrows = 10;
- }
- $heading = array('Bezeichnung', 'Typ','Modul', 'Projekt', 'Menü');
- $width = array('39%', '20%', '20%','20%','5%');
+ if($isSettingAction) {
+ $maxrows = 10;
+ }
+ $heading = array('Bezeichnung', 'Typ','Modul', 'Projekt', 'Menü');
+ $width = array('39%', '20%', '20%','20%','5%');
- $findcols = array('v.bezeichnung', 'v.type','v.modul', "if(v.projekt, (SELECT `abkuerzung` FROM `projekt` WHERE `id` = v.projekt), '')",'v.id');
- $searchsql = array('v.bezeichnung', 'v.type','v.modul', 'v.projekt');
+ $findcols = array('v.bezeichnung', 'v.type','v.modul', "if(v.projekt, (SELECT `abkuerzung` FROM `projekt` WHERE `id` = v.projekt), '')",'v.id');
+ $searchsql = array('v.bezeichnung', 'v.type','v.modul', 'v.projekt');
- $defaultorder = 1;
- $defaultorderdesc = 0;
+ $defaultorder = 1;
+ $defaultorderdesc = 0;
- $menu = "";
- $where = " v.id > 0 ";
+ $where = " v.id > 0 ";
- $sql = "SELECT SQL_CALC_FOUND_ROWS v.id, if(v.aktiv, v.bezeichnung, CONCAT('',v.bezeichnung,' ')),
- if(v.aktiv, v.type, CONCAT('',v.type,' ')),
- if(v.aktiv, v.modul, CONCAT('',v.modul,' ')),
- if(v.projekt, (SELECT `abkuerzung` FROM `projekt` WHERE `id` = v.projekt), ''), v.id
- FROM `versandarten` AS `v`";
+ $sql = "SELECT SQL_CALC_FOUND_ROWS v.id, if(v.aktiv, v.bezeichnung, CONCAT('',v.bezeichnung,' ')),
+ if(v.aktiv, v.type, CONCAT('',v.type,' ')),
+ if(v.aktiv, v.modul, CONCAT('',v.modul,' ')),
+ if(v.projekt, (SELECT `abkuerzung` FROM `projekt` WHERE `id` = v.projekt), ''), v.id
+ FROM `versandarten` AS `v`";
- $count = "SELECT count(v.id) FROM `versandarten` AS `v` WHERE $where";
+ $count = "SELECT count(v.id) FROM `versandarten` AS `v` WHERE $where";
break;
}
@@ -98,494 +153,140 @@ class Versandarten {
return $erg;
}
- /**
- * Versandarten constructor.
- *
- * @param Application $app
- * @param bool $intern
- */
- public function __construct($app, $intern = false)
+ /** @noinspection PhpUnused */
+ public function VersandartenEdit(): void
{
- $this->app=$app;
- if($intern) {
+ $id = (int)$this->app->Secure->GetGET('id');
+ $submit = $this->app->Secure->GetPOST('speichern');
+
+ if (!$id)
return;
- }
- $this->app->ActionHandlerInit($this);
-
- // ab hier alle Action Handler definieren die das Modul hat
- $this->app->ActionHandler("create", "VersandartenCreate");
- $this->app->ActionHandler("edit", "VersandartenEdit");
- $this->app->ActionHandler("list", "VersandartenList");
- $this->app->ActionHandler("delete", "VersandartenDelete");
- $this->app->ActionHandler("copy", "VersandartenCopy");
-
- $this->app->ActionHandlerListen($app);
- }
-
- /**
- * @return array
- */
- public function getBetaShippingModules(): array
- {
- /** @var Appstore $appStore */
- $appStore = $this->app->erp->LoadModul('appstore');
-
- return $appStore->getBetaModulesByPrefix('versandarten_');
- }
-
- public function Install(): void
- {
- $this->app->erp->GetVersandartAuftrag();
- }
-
- public function VersandartenCopy()
- {
- $id = (int)$this->app->Secure->GetGET('id');
- $id = $this->app->DB->Select(sprintf('SELECT `id` FROM `versandarten` WHERE `id` = %d LIMIT 1', $id));
- if(!$id) {
- $this->app->Location->execute('index.php?module=versandarten&action=list');
- }
- $newid = $this->app->DB->MysqlCopyRow('versandarten', 'id', $id);
- if($newid) {
- $this->app->DB->Update(
- sprintf(
- 'UPDATE `versandarten` set `aktiv` = 0, `ausprojekt` = 0 WHERE `id` = %d LIMIT 1',
- $newid
- )
- );
- }
- $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$newid);
- }
- public function VersandartenMenu()
- {
-
- }
-
- public function VersandartenList(): void
- {
- $this->app->erp->MenuEintrag('index.php?module=versandarten&action=create','Neue Versandart anlegen');
- $this->app->erp->MenuEintrag('index.php?module=versandarten&action=list','Übersicht');
- $this->app->YUI->TableSearch('TAB1','versandarten_list', 'show','','',basename(__FILE__), __CLASS__);
- $this->app->Tpl->Parse('PAGE','versandarten_list.tpl');
- }
-
- /**
- * @param string $value
- * @param bool $retarr
- *
- * @return string|array|null
- */
- function VersandartenSelModul($value = '', $retarr = false)
- {
- $array = null;
- $ret = ''
- .(isset($obj->name)?$obj->name:ucfirst($modul))
- .(in_array($modulKey, $beta)?' (Beta)':'')
- .' ';
- unset($obj);
- }
- }
- closedir($handle);
- }
- }
- if($retarr){
- return $array;
- }
-
- return $ret;
- }
-
- /**
- * @param string $module
- * @param int $moduleId
- *
- * @return mixed|null
- */
- public function loadModule($module, $moduleId = 0)
- {
- if(empty($module)) {
- return null;
- }
- if(strpos($module,'versandarten_') === 0) {
- $module = substr($module, 13);
- if(empty($module)) {
- return null;
- }
- }
- if(strpos($module, '.') !== false || strpos($module, '/') !== false || strpos($module, '\\')) {
- return null;
- }
- $path = dirname(__DIR__).'/lib/versandarten/'.$module.'.php';
- if(!is_file($path)) {
- return null;
- }
-
- include_once $path ;
- $classname = 'Versandart_'.$module;
- if(!class_exists($classname)) {
- return null;
- }
-
- return new $classname($this->app, $moduleId);
- }
-
- public function VersandartenEdit()
- {
- $id = (int)$this->app->Secure->GetGET('id');
- $speichern = $this->app->Secure->GetPOST('speichern');
$this->app->erp->MenuEintrag('index.php?module=versandarten&action=edit&id='.$id,'Details');
$this->app->erp->MenuEintrag('index.php?module=versandarten&action=list','Zurück zur Übersicht');
- $input = $this->GetInput();
+ $error = [];
+ if($submit != '') { // handle form submit
+ $form = $this->GetInput();
+ $obj = $this->loadModule($form['modul'], $id);
+ if ($obj === null)
+ $error[] = sprintf('Versandart "%s" existiert nicht.', $form['selmodul']);
- $error = '';
- if(is_numeric($id) && $speichern != ''){
- $modulepath = dirname(__DIR__).'/lib/versandarten/'.$input['selmodul'].'.php';
- if (!empty($input['selmodul']) && is_file($modulepath)) {
- include_once($modulepath);
- $classname = 'Versandart_'.$input['selmodul'];
- if(class_exists($classname)) {
- $moduleObject = new $classname($this->app, $id);
- }
- if(!empty($moduleObject) && method_exists($moduleObject, 'checkInputParameters')) {
- if (false === $moduleObject->checkInputParameters('MESSAGE')) {
- $error = 'error';
- }
- }
- } else {
- $error = sprintf('Versandart "%s" existiert nicht.', $input['selmodul']);
- }
+ if(trim($form['bezeichnung']) == '')
+ $error[] = 'Bitte eine Bezeichnung angeben!';
- if($id) {
- if($error === '') {
- $projektid = 0;
- if(!empty($input['projekt'])){
- $projektid = $this->app->DB->Select(
- sprintf(
- "SELECT `id` FROM `projekt` WHERE `abkuerzung` = '%s' LIMIT 1",
- $input['projekt']
- )
- );
- }
+ if(trim($form['type']) == '')
+ $error[] = 'Bitte einen Typ angeben!';
- $oldtype = $this->app->DB->Select(
- sprintf('SELECT `id` FROM `versandarten` WHERE `id` = %d LIMIT 1', $id)
- );
- if($oldtype != $input['typ'])
- {
- while($this->app->DB->Select(
- sprintf(
- "SELECT `id` FROM `versandarten` WHERE `type` = '%s' AND `id` <> %d LIMIT 1",
- $input['typ'], $id
- )
- ))
- {
- $typa = explode('_', $input['typ']);
- if((!empty($typa)?(!empty($typa)?count($typa):0):0) == 1 || !is_numeric($typa[count($typa)-1]))
- {
- $input['typ'] .= '_1';
- }else{
- $counter = $typa[(!empty($typa)?count($typa):0)-1]+1;
- unset($typa[(!empty($typa)?count($typa):0)-1]);
- $input['typ'] = implode('_', $typa).'_'.$counter;
- }
- }
- }
-
- $this->app->DB->Update(
- sprintf(
- "UPDATE `versandarten`
- SET `bezeichnung`='%s', `type` ='%s',
- `projekt`=%d, `aktiv`=%d, `modul`='%s',
- `export_drucker` = %d,
- `paketmarke_drucker` = %d,
- `ausprojekt` = %d, `versandmail` = %d,
- `geschaeftsbrief_vorlage` = %d,
- `keinportocheck`=%d
- WHERE `id` = %d LIMIT 1",
- $input['bezeichnung'], $input['typ'], $projektid,$input['aktiv'],$input['selmodul'],
- $input['export_drucker'], $input['paketmarke_drucker'],$input['ausprojekt'], $input['versandmail'],
- $input['geschaeftsbrief_vorlage'], $input['keinportocheck'], $id
- )
- );
- if($input['aktiv'] == 1){
- $this->app->Tpl->Set('AKTIV', "checked");
- }
- if($input['keinportocheck'] == 1){
- $this->app->Tpl->Set('KEINPORTOCHECK', "checked");
- }
- $this->app->Tpl->Set('MESSAGE', "Die Daten wurden erfolgreich gespeichert!
");
- }
- }
- else {
- $error = '';
-
- if(trim($input['bezeichnung']) == '')
- {
- $error = 'Bitte alle Pflichtfelder ausfüllen!';
- $this->app->Tpl->Set('MSGBEZEICHNUNG',' Pflichtfeld! ');
- }
- if(trim($input['typ']) == '')
- {
- $error = 'Bitte alle Pflichtfelder ausfüllen!';
- $this->app->Tpl->Set('MSGTYP',' Pflichtfeld! ');
- }
-
- if($error!=''){
- $this->app->Tpl->Set('MESSAGE', "$error
");
- }else {
-
- if(trim($input['projekt']) == ''){
- $projektid = 0;
- }else{
- $projektid = $this->app->DB->Select(
- sprintf(
- "SELECT `id` FROM `projekt` WHERE `abkuerzung` = '%s' LIMIT 1",
- $input['projekt']
- )
- );
- }
-
- while($this->app->DB->Select(sprintf("SELECT `id` FROM `versandarten` WHERE `type` = '%s' LIMIT 1", $input['typ']))) {
- $typa = explode('_', $input['typ']);
- if((!empty($typa)?(!empty($typa)?count($typa):0):0) == 1 || !is_numeric($typa[count($typa)-1]))
- {
- $input['typ'] .= '_1';
- }else{
- $counter = $typa[(!empty($typa)?count($typa):0)-1]+1;
- unset($typa[(!empty($typa)?count($typa):0)-1]);
- $input['typ'] = implode('_', $typa).'_'.$counter;
- }
- }
-
- $this->app->DB->Insert(
- sprintf(
- "INSERT INTO `versandarten`
- (`bezeichnung`, `type`, `projekt`, `aktiv`, `keinportocheck`,
- `modul`,`export_drucker`, `paketmarke_drucker`,
- `ausprojekt`,`versandmail`, `geschaeftsbrief_vorlage`)
- VALUES ('%s', '%s', %d, %d,%d,
- '%s',%d,%d,
- %d,%d,%d)",
- $input['bezeichnung'], $input['typ'],$projektid, $input['aktiv'], $input['keinportocheck'],
- $input['selmodul'],$input['export_drucker'],$input['paketmarke_drucker'],
- $input['ausprojekt'], $input['versandmail'], $input['geschaeftsbrief_vorlage']
- )
- );
-
- $newid = $this->app->DB->GetInsertID();
- $msg = $this->app->erp->base64_url_encode("Die Daten wurden erfolgreich gespeichert!
");
- $this->app->Location->execute("index.php?module=versandarten&action=edit&id=$newid&msg=$msg");
- }
- }
- }
- $ausprojekt = 0;
-
- $daten = $this->app->DB->SelectRow(
- sprintf('SELECT * FROM `versandarten` WHERE `id` = %d LIMIT 1', $id)
- );
- if(!empty($daten)) {
- $this->app->erp->Headlines('', $daten['bezeichnung']);
- $this->app->Tpl->Set('AKTMODUL', $daten['modul']);
- /** @var Versanddienstleister $obj */
- $obj = $this->loadModule($daten['modul'], $daten['id']);
- $bezeichnung = $daten['bezeichnung'];
- $typ = $daten['type'];
- $projekt = $daten['projekt'];
- $aktiv = $daten['aktiv'];
- $keinportocheck = $daten['keinportocheck'];
- $ausprojekt = $daten['ausprojekt'];
- $projektname = $this->app->DB->Select(sprintf('SELECT `abkuerzung` FROM `projekt` WHERE `id` = %d', $projekt));
- if(!empty($obj) && method_exists($obj, 'Einstellungen')) {
- $obj->Einstellungen('JSON');
- }
- if(!empty($obj) && method_exists($obj, 'isEtikettenDrucker')) {
- $etikettendrucker = $obj->isEtikettenDrucker();
- }
- }
- else {
- $this->app->Tpl->Set('AKTMODUL','');
- }
-
- $drucker_export = $this->app->erp->GetDrucker();
- $this->app->Tpl->Set('EXPORT_DRUCKER',''
- .$v.' '
+ $projektId = 0;
+ if(!empty($form['projekt'])){
+ $projektId = $this->app->DB->Select(
+ "SELECT `id` FROM `projekt` WHERE `abkuerzung` = '{$form['projekt']}' LIMIT 1"
);
}
+
+ if ($this->app->DB->Select(
+ "SELECT `id` FROM `versandarten` WHERE `type` = '{$form['type']}' AND `id` <> $id LIMIT 1"
+ ))
+ $error[] = 'Typ ist bereits für eine andere Versandart vergeben';
+
+ foreach ($obj->AdditionalSettings() as $k => $v) {
+ $form[$k] = $this->app->Secure->GetPOST($k);
+ }
+ $error = array_merge($error, $obj->ValidateSettings($form));
+ foreach ($obj->AdditionalSettings() as $k => $v) {
+ $json[$k] = $form[$k];
+ }
+ $json = json_encode($json ?? null);
+
+ foreach ($error as $e) {
+ $this->app->Tpl->addMessage('error', $e);
+ }
+
+ if (empty($error)) {
+ $this->app->DB->Update(
+ "UPDATE `versandarten`
+ SET `bezeichnung`='{$form['bezeichnung']}', `type` ='{$form['type']}',
+ `projekt`=$projektId, `aktiv`={$form['aktiv']}, `modul`='{$form['modul']}',
+ `export_drucker` = {$form['export_drucker']},
+ `paketmarke_drucker` = {$form['paketmarke_drucker']},
+ `ausprojekt` = {$form['ausprojekt']}, `versandmail` = {$form['versandmail']},
+ `geschaeftsbrief_vorlage` = {$form['geschaeftsbrief_vorlage']},
+ `keinportocheck`={$form['keinportocheck']},
+ einstellungen_json='$json'
+ WHERE `id` = $id LIMIT 1"
+ );
+
+ $this->app->Tpl->Set('MESSAGE', '');
+ $this->app->Tpl->addMessage('success', "Die Daten wurden erfolgreich gespeichert!");
+ }
+ }
+ $daten = $this->app->DB->SelectRow("SELECT * FROM `versandarten` WHERE `id` = $id LIMIT 1");
+ if (empty($daten))
+ $this->app->Location->execute('index.php?module=versandarten&action=list');
+
+ $this->app->erp->Headlines('', $daten['bezeichnung']);
+ $this->app->Tpl->Set('AKTMODUL', $daten['modul']);
+ $obj = $this->loadModule($daten['modul'], $daten['id']);
+
+ if (empty($error) || !isset($form)) { //overwrite form data from database if no validation error is present
+ $form = json_decode($daten['einstellungen_json'],true);
+ $form['bezeichnung'] = $daten['bezeichnung'];
+ $form['type'] = $daten['type'];
+ $form['projekt'] = $this->app->erp->Projektdaten($daten['projekt'], 'abkuerzung');
+ $form['aktiv'] = $daten['aktiv'];
+ $form['keinportocheck'] = $daten['keinportocheck'];
+ $form['modul'] = $daten['modul'];
+ $form['export_drucker'] = $daten['export_drucker'];
+ $form['paketmarke_drucker'] = $daten['paketmarke_drucker'];
}
- $drucker_paketmarke = $this->app->erp->GetDrucker();
-
- if($etikettendrucker) {
- $etikettendruckerarr = $this->app->erp->GetEtikettendrucker();
- if($etikettendruckerarr) {
- foreach($etikettendruckerarr as $k => $v) {
- $drucker_paketmarke[$k] = $v;
- }
- }
- }
- $this->app->Tpl->Set('PAKETMARKE_DRUCKER',''
- .$v.' '
- );
- }
- }
+ $obj->RenderAdditionalSettings('MODULESETTINGS', $form);
+
+ $this->app->Tpl->addSelect('EXPORT_DRUCKER', 'export_drucker', 'export_drucker',
+ $this->getPrinterByModule($obj, false), $form['export_drucker']);
+
+ $this->app->Tpl->addSelect('PAKETMARKE_DRUCKER', 'paketmarke_drucker', 'paketmarke_drucker',
+ $this->getPrinterByModule($obj), $form['paketmarke_drucker']);
+
$this->app->YUI->HideFormular('versandmail', array('0'=>'versandbetreff','1'=>'dummy'));
- $this->app->Tpl->Add(
- 'SELVERSANDMAIL',
- 'Standardverhalten ');
- $this->app->Tpl->Add(
- 'SELVERSANDMAIL',
- 'Keine Versandmail '
- );
- $this->app->Tpl->Add(
- 'SELVERSANDMAIL',
- 'Eigene Textvorlage '
- );
-
- $geschaeftsbrief_vorlagen = $this->app->DB->SelectArr(
- "SELECT gv.id, gv.subjekt, p.abkuerzung
+ $this->app->Tpl->addSelect('SELVERSANDMAIL', 'versandmail', 'versandmail', [
+ 0 => 'Standardverhalten',
+ -1 => 'Keine Versandmail',
+ 1 => 'Eigene Textvorlage'
+ ], $daten['versandmail']);
+
+ $geschaeftsbrief_vorlagen = $this->app->DB->SelectPairs(
+ "SELECT gv.id, CONCAT_WS(' - ', gv.subjekt, p.abkuerzung) as val
FROM `geschaeftsbrief_vorlagen` AS `gv`
LEFT JOIN `projekt` AS `p` ON gv.projekt = p.id
ORDER by gv.subjekt"
);
- if($geschaeftsbrief_vorlagen) {
- foreach($geschaeftsbrief_vorlagen as $k => $v) {
- $this->app->Tpl->Add(
- 'SELGESCHAEFTSBRIEF_VORLAGE',
- ''
- .$v['subjekt'].($v['abkuerzung']?' - '.$v['abkuerzung']:'')
- .' '
- );
- }
- }
- if($error === ''){
- $selectedModule = isset($daten['modul'])?$daten['modul']:'';
- }
- else {
- $selectedModule = $input['selmodul'];
- }
- $this->app->Tpl->Set('SELMODUL', $this->VersandartenSelModul($selectedModule));
+ $this->app->Tpl->addSelect('SELGESCHAEFTSBRIEF_VORLAGE', 'geschaeftsbrief_vorlage',
+ 'geschaeftsbrief_vorlage', $geschaeftsbrief_vorlagen, $daten['geschaeftsbrief_vorlage']);
- $this->app->Tpl->Set('BEZEICHNUNG', $error == ''?$bezeichnung:$input['bezeichnung']);
- $this->app->Tpl->Set('TYP', $error == ''?$typ:$input['typ']);
- $this->app->Tpl->Set('PROJEKT', $error == ''?$projektname:$input['projekt']);
- if(($error == '' && $aktiv == 1) || ($error != '' && $input['aktiv'])){
- $this->app->Tpl->Set('AKTIV', 'checked');
- }
- if(($error == '' && $keinportocheck == 1) || ($error != '' && $input['keinportocheck'])){
- $this->app->Tpl->Set('KEINPORTOCHECK', 'checked');
- }
+ $this->app->Tpl->addSelect('SELMODUL', 'modul', 'modul',
+ $this->VersandartenSelModul(), $form['modul']);
+ $this->app->Tpl->Set('BEZEICHNUNG', $form['bezeichnung']);
+ $this->app->Tpl->Set('TYPE', $form['type']);
+ $this->app->Tpl->Set('PROJEKT', $form['projekt']);
$this->app->YUI->AutoComplete('projekt', 'projektname', 1);
- if(!empty($daten['modul'])) {
- $beta = $this->getBetaShippingModules();
- if(in_array('versandarten_'.$daten['modul'], $beta)) {
- $this->app->Tpl->Add('MESSAGE','Dieses Modul ist noch im Beta Stadium.
');
- /** @var Appstore $appstore */
- $appstore = $this->app->erp->LoadModul('appstore');
- if($appstore !== null){
- $appstore->addBetaToHeadline();
- }
- }
- }
+ if($form['aktiv']) $this->app->Tpl->Set('AKTIV', 'checked');
+ if($form['keinportocheck']) $this->app->Tpl->Set('KEINPORTOCHECK', 'checked');
+ if ($obj->Beta ?? false)
+ $this->app->Tpl->addMessage('warning','Dieses Modul ist noch im Beta Stadium');
$this->app->Tpl->Parse('PAGE', 'versandarten_edit.tpl');
}
- /**
- * @param string $shippingModule
- *
- * @return array
- */
- public function getPrinterByModule($shippingModule = '')
+ protected function getPrinterByModule(Versanddienstleister $obj, bool $includeLabelPrinter = true): array
{
- /** @var Versanddienstleister $obj */
- $obj = empty($shippingModule)?null:$this->loadModule($shippingModule);
- $isLabelPrinter = $obj !== null
- && method_exists($obj, 'isEtikettenDrucker')
- && $obj->isEtikettenDrucker();
$printer = $this->app->erp->GetDrucker();
- if(!is_array($printer)) {
- $printer = [];
- }
- if(!$isLabelPrinter) {
- return $printer;
- }
- $labelPrinter = $this->app->erp->GetEtikettendrucker();
- if(empty($labelPrinter)) {
- return $printer;
+ if ($includeLabelPrinter && $obj->isEtikettenDrucker()) {
+ $labelPrinter = $this->app->erp->GetEtikettendrucker();
+ $printer = array_merge($printer ?? [], $labelPrinter ?? []);
}
-
- foreach($labelPrinter as $k => $v) {
- $printer[$k] = $v;
- }
-
+ natcasesort($printer);
return $printer;
}
@@ -594,55 +295,44 @@ class Versandarten {
*
* @return array
*/
- public function getVuePrinterOptions($shippingModule = '')
+ protected function getVuePrinterOptions(string $shippingModule = ''): array
{
try{
- return VueUtil::keyValueArrayToVueOptions($this->getPrinterByModule($shippingModule));
+ $obj = $this->loadModule($shippingModule);
+ return VueUtil::keyValueArrayToVueOptions($this->getPrinterByModule($obj));
}
- catch(Exception $e) {
+ catch(Exception) {
return [];
}
}
- /**
- * @return array
- */
- public function getVueExportPrinterOptions()
+ public function getVueExportPrinterOptions(): array
{
$printer = $this->app->erp->GetDrucker();
- if(empty($printer)) {
- return [];
- }
try{
- return VueUtil::keyValueArrayToVueOptions($printer);
+ return VueUtil::keyValueArrayToVueOptions($printer ?? []);
}
- catch(Exception $e) {
+ catch(Exception) {
return [];
}
}
- /**
- * @return array
- */
public function getVueProjects(): array
{
$projects = array_merge(
[ 0 => '', ],
$this->app->DB->SelectPairs(
- sprintf(
- 'SELECT p.id, p.abkuerzung
+ "SELECT p.id, p.abkuerzung
FROM `projekt` AS `p`
- WHERE p.geloescht = 0 %s
- ORDER BY p.abkuerzung',
- $this->app->erp->ProjektRechte()
- )
+ WHERE p.geloescht = 0 {$this->app->erp->ProjektRechte()}
+ ORDER BY p.abkuerzung"
)
);
try{
return VueUtil::keyValueArrayToVueOptions($projects);
}
- catch(Exception $e) {
+ catch(Exception) {
return [];
}
}
@@ -656,7 +346,7 @@ class Versandarten {
*
* @return JsonResponse
*/
- public function getStep2Page($shippingModule, $shippingModuleName, $requiredForSubmit = null): JsonResponse
+ public function getStep2Page(string $shippingModule, string $shippingModuleName, ?array $requiredForSubmit = null): JsonResponse
{
if($requiredForSubmit === null) {
$requiredForSubmit = $this->app->Secure->POST;
@@ -688,12 +378,9 @@ class Versandarten {
);
}
- /**
- * @return array
- */
- public function getFeatureForm($shippingModule): array
+ public function getFeatureForm(string $shippingModule): array
{
- $ret = [
+ return [
[
'id' => 0,
'name' => 'projectGroup',
@@ -734,59 +421,28 @@ class Versandarten {
],
],
];
-
- return $ret;
}
+ /** @noinspection PhpUnused */
public function VersandartenDelete(): void
{
- $id = $this->app->Secure->GetGET('id');
- $this->app->DB->Delete(sprintf('DELETE FROM `versandarten` WHERE `id` = %d LIMIT 1', $id));
+ $id = (int)$this->app->Secure->GetGET('id');
+ $this->app->DB->Delete("DELETE FROM `versandarten` WHERE `id` = $id LIMIT 1");
$msg = $this->app->erp->base64_url_encode("Die Versandart wurde gelöscht!
");
$this->app->Location->execute("index.php?module=versandarten&action=list&msg=$msg");
}
- /**
- * @param string $val
- *
- * @return array|null
- */
- public function getApps($val = ''): ?array
+ public function getApps(): ?array
{
- $val = (string)$val;
- /** @var Appstore $appstore */
- $appstore = $this->app->loadModule('appstore');
- $module = $appstore->getAppsListWithPrefix('versandarten_');
- $modularr = $this->VersandartenSelModul('', true);
- if($module) {
- if(!empty($module['installiert'])) {
- foreach($module['installiert'] as $k => $v) {
- $module['installiert'][$k]['match'] = $appstore->match($v['Bezeichnung'], $val);
- $module['installiert'][$k]['md5'] = md5($v['Bezeichnung']);
- $found[] = $v['key'];
- }
- }
- if(!empty($module['kauf'])) {
- foreach($module['kauf'] as $k => $v) {
- $module['kauf'][$k]['match'] = $appstore->match($v['Bezeichnung'], $val);
- $module['kauf'][$k]['md5'] = md5($v['Bezeichnung']);
- $found[] = $v['key'];
- }
- }
- }
- if($modularr) {
- foreach($modularr as $k => $v) {
- if(!isset($found) || !in_array('versandarten_'.$k,$found)) {
- $found[] = 'versandarten_'.$k;
- $module['installiert'][] = [
- 'md5'=>md5($v),
- 'Bezeichnung'=>$v,
- 'key'=>'versandarten_'.$k,
- 'match'=>$appstore->match($v, $val),
- 'Icon'=>'Icons_dunkel_9.gif'
- ];
- }
- }
+ $module = [];
+ $modularr = $this->VersandartenSelModul();
+ foreach($modularr as $k => $v) {
+ $module['installiert'][$k] = [
+ 'md5'=>md5($v),
+ 'Bezeichnung'=>$v,
+ 'key'=> $k,
+ 'Icon'=>'Icons_dunkel_9.gif'
+ ];
}
if(!empty($module['installiert']) && count($module['installiert']) > 0) {
$sort = null;
@@ -800,14 +456,9 @@ class Versandarten {
}
- /**
- * @var int $shippingMethodId
- *
- * @return JsonResponse
- */
- public function getVueShippingMethodSuccessPage($shippingMethodId): JsonResponse
+ public function getVueShippingMethodSuccessPage(int $shippingMethodId): JsonResponse
{
- $succespage = [
+ $successpage = [
'type' => 'defaultPage',
'icon' => 'add-person-icon',
'headline'=> 'Versandart angelegt',
@@ -822,7 +473,7 @@ class Versandarten {
];
return new JsonResponse(
- ['page'=>$succespage]
+ ['page'=>$successpage]
);
}
@@ -839,7 +490,7 @@ class Versandarten {
}
$form = $obj->getCreateForm();
if(!empty($form)) {
- $form[(!empty($form)?count($form):0) - 1]['link'] = [
+ $form[(count($form)) - 1]['link'] = [
'link' => 'index.php?module=versandarten&action=create&auswahl=' . $module,
'title' => 'Expertenmodus',
];
@@ -908,7 +559,7 @@ class Versandarten {
}
if($step < 2) {
$shippingModuleName = $shippingModule;
- if(strpos($shippingModuleName, 'versandarten_') === 0) {
+ if(str_starts_with($shippingModuleName, 'versandarten_')) {
$shippingModuleName = substr($shippingModuleName, 13);
}
$shippingModuleName = str_replace('_', ' ', ucfirst($shippingModuleName));
@@ -946,7 +597,7 @@ class Versandarten {
);
}
elseif(!empty($createShippingResult['error'])) {
- return new JsonResponse($createShippingResult, JsonResponse::HTTP_BAD_REQUEST);
+ return new JsonResponse($createShippingResult, Response::HTTP_BAD_REQUEST);
}
}
@@ -955,7 +606,7 @@ class Versandarten {
return $this->getVueShippingMethodSuccessPage((int)$shippingMethodId);
}
- return new JsonResponse($data, JsonResponse::HTTP_BAD_REQUEST);
+ return new JsonResponse($data, Response::HTTP_BAD_REQUEST);
}
@@ -963,7 +614,7 @@ class Versandarten {
* @param int $shippingMethodId
* @param null|array $post
*/
- public function saveCreateData($shippingMethodId, $post = null): void
+ public function saveCreateData(int $shippingMethodId, ?array $post = null): void
{
$shippingMethod = $this->app->DB->SelectRow(
sprintf('SELECT * FROM `versandarten` WHERE `id` = %d', $shippingMethodId)
@@ -983,7 +634,7 @@ class Versandarten {
try {
$vueFields = VueUtil::getInputNamesFromVuePages($form);
}
- catch(Exception $e) {
+ catch(Exception) {
$vueFields = [];
}
foreach($vueFields as $input) {
@@ -1005,84 +656,18 @@ class Versandarten {
);
}
- /**
- * @return JsonResponse
- */
- public function HandleSearchAjaxAction(): JsonResponse
- {
- $module = $this->getApps($this->app->Secure->GetPOST('val'));
- $anzeigen = '';
- $ausblenden = '';
- if($module) {
- if(isset($module['installiert'])) {
- foreach($module['installiert'] as $k => $v) {
- if($v['match'])
- {
- if($anzeigen !== '')
- {
- $anzeigen .= ';';
- }
- $anzeigen .= 'm'.md5($v['Bezeichnung']);
- }else{
- if($ausblenden !== '')
- {
- $ausblenden .= ';';
- }
- $ausblenden .= 'm'.md5($v['Bezeichnung']);
- }
- }
- }
- if(isset($module['kauf'])) {
- foreach($module['kauf'] as $k => $v) {
- if($v['match']) {
- if($anzeigen !== '')
- {
- $anzeigen .= ';';
- }
- $anzeigen .= 'm'.md5($v['Bezeichnung']);
- }
- else{
- if($ausblenden !== '')
- {
- $ausblenden .= ';';
- }
- $ausblenden .= 'm'.md5($v['Bezeichnung']);
- }
- }
- }
- }
- $data = [
- 'anzeigen' => $anzeigen,
- 'ausblenden' => $ausblenden,
- ];
-
- return new JsonResponse($data);
- }
-
/**
* @param string $shippingMethodModule
*
* @return array
*/
- public function createShippingMethodFromModuleName($shippingMethodModule): array
+ public function createShippingMethodFromModuleName(string $shippingMethodModule): array
{
- if(!$this->app->erp->ModulVorhanden($shippingMethodModule)) {
- return [
- 'success'=>false,
- 'error'=>'Modul nicht vorhanden'
- ];
- }
- $modules = $this->getApps();
- $modul = substr($shippingMethodModule,13);
- $name = ucfirst($modul);
- if($modules['installiert']) {
- foreach($modules['installiert'] as $key => $installedModule) {
- if($installedModule['key'] === $shippingMethodModule && $installedModule['Bezeichnung'] != '') {
- $name = $installedModule['Bezeichnung'];
- }
- }
- }
- $type = $modul;
+ $obj = $this->loadModule($shippingMethodModule);
+ if ($obj === null)
+ return ['success' => false, 'error' => 'Modul nicht vorhanden'];
+ $name = $obj->name ?? ucfirst($shippingMethodModule);
+ $type = $shippingMethodModule;
$i = 1;
$originalName = $name;
while(
@@ -1094,7 +679,7 @@ class Versandarten {
)
) {
$i++;
- $type = $modul.'_'.$i;
+ $type = $shippingMethodModule.'_'.$i;
$name = $originalName.' '.$i;
}
$versandmail = 0;
@@ -1102,12 +687,9 @@ class Versandarten {
$versandmail = 1;
}
$this->app->DB->Insert(
- sprintf(
"INSERT INTO `versandarten`
(`bezeichnung`, `type`,`aktiv`, `geloescht`, `modul`,`ausprojekt`, `versandmail`, `einstellungen_json`)
- VALUES ('%s','%s','1','0','%s','0', %d,'')",
- $name, $type, $modul, $versandmail
- )
+ VALUES ('$name','$type','1','0','$shippingMethodModule','0', $versandmail,'')"
);
$id = $this->app->DB->GetInsertID();
$this->app->erp->RunHook('versandarten_create', 1, $id);
@@ -1117,6 +699,7 @@ class Versandarten {
/**
* @return JsonResponse|void
+ * @noinspection PhpUnused
*/
public function VersandartenCreate()
{
@@ -1128,81 +711,22 @@ class Versandarten {
return $this->HandleSaveAssistantAjaxAction();
}
- if($cmd === 'suche') {
- return $this->HandleSearchAjaxAction();
- }
- $module = $this->getApps($this->app->Secure->GetPOST('val'));
- if($this->app->Secure->GetGET('auswahl')) {
- //$bezeichnung = $this->app->Secure->GetPOST('bezeichnung');
- $auswahlmodul = $this->app->Secure->GetGET('auswahl');
- if($auswahlmodul === 'custom') {
- $this->app->DB->Insert(
- "INSERT INTO `versandarten`
- (`bezeichnung`, `type`,`aktiv`, `geloescht`, `modul`,`ausprojekt`,`einstellungen_json`)
- VALUES ('','','1','0','','0','')"
- );
- $id = $this->app->DB->GetInsertID();
- $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$id);
- }
- if($this->app->erp->ModulVorhanden($auswahlmodul)) {
- $ret = $this->createShippingMethodFromModuleName($auswahlmodul);
- if(!empty($ret['id'])) {
- $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$ret['id']);
- }
- $this->app->Location->execute('index.php?module=versandarten&action=create');
+ $modulelist = $this->VersandartenSelModul();
+ $auswahlmodul = $this->app->Secure->GetGET('auswahl');
+
+ if($auswahlmodul && isset($modulelist[$auswahlmodul])) {
+ $ret = $this->createShippingMethodFromModuleName($auswahlmodul);
+ if(!empty($ret['id'])) {
+ $this->app->Location->execute('index.php?module=versandarten&action=edit&id='.$ret['id']);
}
+ $this->app->Location->execute('index.php?module=versandarten&action=create');
}
- if($this->app->erp->isIoncube() && $this->app->Secure->GetPOST('testen')) {
- $modul = $this->app->Secure->GetPOST('modul');
- if($modul) {
- $testapp = $modul;
- if(is_file(dirname(__DIR__).'/update.php')) {
- $result = '';
- include_once(dirname(__DIR__).'/update.php');
- if($result === 'OK') {
- $this->app->Tpl->Add(
- 'MESSAGE',
- 'Das Modul wurde zum Testen angefragt. Bitte Updaten Sie xentral in frühestens 10 Minuten um das Modul zu laden
'
- );
- }
- else{
- $this->app->Tpl->Add(
- 'MESSAGE',
- 'Es ist ein Fehler beim Updaten aufgetreten: '.$result.'
'
- );
- }
- }
- }
- }
- elseif($this->app->erp->isIoncube()) {
- $get = $this->app->Secure->GetGET('get');
- if(!empty($get) && !empty($module) && !empty($module['kauf'])) {
- foreach($module['kauf'] as $k => $v) {
- if($v['md5'] == $get) {
- $mods = $this->app->erp->getAppList();
- foreach($mods as $k2 => $v2) {
- if(md5($v2['Bezeichnung']) == $get) {
- $this->app->Tpl->Add(
- 'MESSAGE',
- 'Bitte bestätigen:
'
- );
- break;
- }
- }
- }
- }
- }
- }
/** @var Appstore $appstore */
$appstore = $this->app->loadModule('appstore');
- $modullist = $this->GetApps();
+ $modulelist = $this->GetApps();
$appstore->AddModuleHtml(
- $modullist, 'versandarten_', 'index.php?module=versandarten&action=create&get=',
- [
- 'title' => 'Custom',
- 'link' => 'index.php?module=versandarten&action=create&auswahl=custom',
- ]
+ $modulelist, '', 'index.php?module=versandarten&action=create&get='
);
$this->app->ModuleScriptCache->IncludeWidgetNew('ClickByClickAssistant');
$this->app->Tpl->Parse('PAGE', 'versandarten_neu.tpl');
@@ -1215,9 +739,9 @@ class Versandarten {
{
$input = [];
$input['bezeichnung'] = $this->app->Secure->GetPOST('bezeichnung');
- $input['typ'] = $this->app->Secure->GetPOST('typ');
+ $input['type'] = $this->app->Secure->GetPOST('type');
$input['projekt'] = $this->app->Secure->GetPOST('projekt');
- $input['selmodul'] = $this->app->Secure->GetPOST('selmodul');
+ $input['modul'] = $this->app->Secure->GetPOST('modul');
$input['aktiv'] = (int)$this->app->Secure->GetPOST('aktiv');
$input['keinportocheck'] = (int)$this->app->Secure->GetPOST('keinportocheck');
$input['ausprojekt'] = (int)$this->app->Secure->GetPOST('ausprojekt');
@@ -1230,23 +754,77 @@ class Versandarten {
}
/**
- * @param array $input
+ * @param string $module
+ * @param int $moduleId
+ *
+ * @return mixed|null
*/
- public function SetInput($input): void
+ public function loadModule(string $module, int $moduleId = 0) : ?Versanddienstleister
{
- $this->app->Tpl->Set('BEZEICHNUNG', $input['bezeichnung']);
- $this->app->Tpl->Set('TYP', $input['typ']);
- $this->app->Tpl->Set('PROJEKT', $input['projekt']);
- if($input['aktiv']==1){
- $this->app->Tpl->Set('AKTIV', 'checked');
+ if(str_starts_with($module, 'versandarten_')) {
+ $module = substr($module, 13);
}
- if($input['keinportocheck']==1){
- $this->app->Tpl->Set('KEINPORTOCHECK', 'checked');
+ if(empty($module)) {
+ return null;
+ }
+ if(str_contains($module, '.') || str_contains($module, '/') || str_contains($module, '\\')) {
+ return null;
}
- if($input['ausprojekt']==1){
- $this->app->Tpl->Set('AUSPROJEKT', 'checked');
+ $path = dirname(__DIR__).'/lib/versandarten/'.$module.'.php';
+ if(!is_file($path)) {
+ return null;
}
+
+ include_once $path ;
+ $classname = 'Versandart_'.$module;
+ if(!class_exists($classname)) {
+ return null;
+ }
+
+ return new $classname($this->app, $moduleId);
}
-}
+ /**
+ * Retrieve all Versandarten from lib/versandarten/
+ * @return array
+ */
+ function VersandartenSelModul() : array
+ {
+ $result = [];
+ $pfad = dirname(__DIR__).'/lib/versandarten';
+ if(!is_dir($pfad))
+ return $result;
+ $handle = opendir($pfad);
+ $files = [];
+ if($handle) {
+ while (($file = readdir($handle)) !== false) {
+ $files[] = $file;
+ }
+ }
+ closedir($handle);
+
+ foreach($files as $file) {
+ if(str_starts_with($file, '.') || !str_ends_with($file, '.php') || !is_file($pfad.'/'.$file)
+ || str_ends_with($file, '.src.php'))
+ continue;
+
+ $modul = str_replace('.php','',$file);
+ if(str_ends_with($modul, '_custom')
+ && !$this->app->DB->Select(
+ "SELECT `id` FROM `versandarten` WHERE `modul` = '".$this->app->DB->real_escape_string($modul)."' LIMIT 1"
+ )
+ )
+ continue;
+
+ if($modul == '' || $modul=='rocketshipit')
+ continue;
+
+ $obj = $this->loadModule($modul);
+ $result[$modul] = $obj->name ?? ucfirst($modul);
+ unset($obj);
+ }
+
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/xentral_autoloader.php b/xentral_autoloader.php
index 468e4ded..7b0633a9 100644
--- a/xentral_autoloader.php
+++ b/xentral_autoloader.php
@@ -66,7 +66,6 @@ function xentral_autoloader($class) {
'ICS'=>__DIR__.'/www/plugins/class.ics.php',
'USTID'=>__DIR__.'/www/lib/class.ustid.php',
'phpprint'=>__DIR__.'/www/plugins/php-print.php',
- 'DHLBusinessShipment'=>__DIR__.'/www/lib/class.intraship.php',
'Navigation'=>__DIR__.'/www/lib/class.navigation_edit.php',
'GoShipment'=>__DIR__.'/www/lib/class.go.php',
'UPSShipment'=>__DIR__.'/www/lib/class.ups.php',