Merge pull request #50 from omniva-baltic/Develop

Develop from v1.0.15
omniva-baltic · Jan 18, 2024 · 668466b · 668466b
2 parents 784f1cb + 84169d5
commit 668466b
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.0.16] - Fixes
+- fixed server URl change
+- improved server URL management
+
 ## [1.0.15] - Improvements
 - changed to use local envelope scheme
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "mijora/omniva-api",
     "description": "Omniva API wrapper",
     "type": "library",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "authors": [
         {
             "name": "Modestas",

diff --git a/src/Request.php b/src/Request.php
@@ -26,7 +26,12 @@ class Request
     /*
      * @var string
      */
-    private $api_url = 'https://edixml.post.ee';
+    private $api_url_domain = 'https://edixml.post.ee';
+
+    /*
+     * @var string
+     */
+    private $api_url_path = '/epmx/services/messagesService.wsdl';
 
     /*
      * Debuging
@@ -47,7 +52,7 @@ public function __construct($username, $password, $api_url = 'https://edixml.pos
         $this->helper = new Helper();
         $this->username = $username;
         $this->password = $password;
-        $this->api_url = $api_url;
+        $this->setApiUrlDomain($api_url);
         $this->debug = $debug;
     }
 
@@ -59,15 +64,61 @@ public function getUsername()
         return $this->username;
     }
 
+    /*
+     * @return string
+     */
+    private function getPassword()
+    {
+        return $this->password;
+    }
+
+    /*
+     * @param string $urlDomain
+     */
+    public function setApiUrlDomain($urlDomain)
+    {
+        $this->api_url_domain = $urlDomain;
+        return $this;
+    }
+
+    /*
+     * @return string
+     */
+    public function getApiUrlDomain()
+    {
+        return $this->api_url_domain;
+    }
+
+    /*
+     * @param string $urlPath
+     */
+    public function setApiUrlPath($urlPath)
+    {
+        $this->api_url_path = $urlPath;
+        return $this;
+    }
+
     /*
      * @param string $url
      */
     public function setApiUrl($url)
     {
-        $this->api_url = $url;
+        $parsedUrl = parse_url($url);
+
+        $this->setApiUrlDomain($parsedUrl['scheme'] . '://' . $parsedUrl['host']);
+        $this->setApiUrlPath($parsedUrl['path']);
+
         return $this;
     }
 
+    /*
+     * @return string
+     */
+    public function getApiUrl()
+    {
+        return $this->api_url_domain . $this->api_url_path;
+    }
+
     /*
      * @param string $request
      * @return array
@@ -80,7 +131,7 @@ public function call($request)
         try {
             $barcodes = array();
             $errors = array();
-            $url = $this->api_url . "/epmx/services/messagesService.wsdl";
+            $url = $this->getApiUrl();
 
             $xmlResponse = $this->make_call($xml, $url);
             $xml = $this->convert_response_to_xml($xmlResponse);
@@ -175,7 +226,7 @@ private function build_request_xml($request)
             <soapenv:Header/>
             <soapenv:Body>
                 <xsd:businessToClientMsgRequest>
-                    <partner>' . $this->username . '</partner>';
+                    <partner>' . $this->getUsername() . '</partner>';
         $xml .= preg_replace("/<\\?xml.*\\?>/", '', $request, 1);
         $xml .= '
                 </xsd:businessToClientMsgRequest>
@@ -264,7 +315,7 @@ public function get_labels($barcodes)
            <soapenv:Header/>
            <soapenv:Body>
               <xsd:addrcardMsgRequest>
-                 <partner>' . $this->username . '</partner>
+                 <partner>' . $this->getUsername() . '</partner>
                  <sendAddressCardTo>response</sendAddressCardTo>
                  <barcodes>
                     ' . $barcodeXML . '
@@ -275,7 +326,7 @@ public function get_labels($barcodes)
 
         try {
             $errors = array();
-            $url = $this->api_url . "/epmx/services/messagesService.wsdl";
+            $url = $this->getApiUrl();
 
             $xmlResponse = $this->make_call($xml, $url);
 
@@ -314,7 +365,7 @@ public function get_labels($barcodes)
      */
     public function getTracking()
     {
-        $url = $this->api_url . '/epteavitus/events/from/' . date("c", strtotime("-1 week +1 day")) . '/for-client-code/' . $this->username;
+        $url = $this->getApiUrlDomain() . '/epteavitus/events/from/' . date("c", strtotime("-1 week +1 day")) . '/for-client-code/' . $this->getUsername();
 
         $xmlResponse = $this->make_call(false, $url);
 

diff --git a/src/Shipment/Shipment.php b/src/Shipment/Shipment.php
@@ -88,9 +88,9 @@ class Shipment
      */
     private $request;
 
-    public function setAuth($username, $password)
+    public function setAuth($username, $password, $api_url = 'https://edixml.post.ee', $debug = false)
     {
-        $this->request = new Request($username, $password);
+        $this->request = new Request($username, $password, $api_url, $debug);
     }
 
     /**