Fixed setting of notification and return urls (#9)

* Fixed setting of notfication url

* Marked old endpoint as deprecated

upload/admin/controller/extension/payment/paynow.php

@@ -113,8 +113,8 @@ private function sendShopUrlsConfiguration()
             $this->initApiClient();
             $shopConfiguration = new \Paynow\Service\ShopConfiguration($this->apiClient);
             $shopConfiguration->changeUrls(
-                $this->url->link('checkout/success', '', true),
-                $this->url->link('extension/payment/paynow/notifications', '', true)
+                $this->buildBaseUrlWithRoute('checkout/success'),
+                $this->buildBaseUrlWithRoute('extension/payment/paynow/notifications')
             );
         } catch (Paynow\Exception\PaynowException $exception) {
             $this->model_extension_payment_paynow->log($exception->getMessage() . ": " . json_encode($exception->getErrors()));
@@ -150,4 +150,11 @@ protected function validate()
 
         return !$this->error;
     }
+
+    private function buildBaseUrlWithRoute($route)
+    {
+        $context_url = parse_url($this->url->link($route, '', true));
+        $base_url = new Url($context_url['scheme'] . '://' . $context_url['host'] . '/');
+        return $base_url->link($route);
+    }
 }

upload/catalog/controller/extension/payment/paynow.php

@@ -97,7 +97,7 @@ private function sendPaymentData($orderInfo)
         return $payment->authorize($payment_data, $idempotencyKey);
     }
 
-    public function notification()
+    public function notifications()
     {
         $this->load->model("extension/payment/paynow");
         $this->load->model("checkout/order");
@@ -125,6 +125,13 @@ public function notification()
         exit;
     }
 
+    /**
+     * @deprecated
+     */
+    public function notification() {
+        $this->notifications();
+    }
+
     private function updateOrderState($payment, $notificationData)
     {
         $orderInfo = $this->model_checkout_order->getOrder($payment["id_order"]);