From 338d4e79668c0da6774b4255078d32bbfb44db12 Mon Sep 17 00:00:00 2001
From: Adam <adamharbas.ja@gmail.com>
Date: Sun, 24 Jan 2016 23:40:26 +0100
Subject: [PATCH] Paypal notify url fix

---
 front-ui/app/components/payment/paypalButton.js | 3 ++-
 front-ui/app/globals.js                         | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/front-ui/app/components/payment/paypalButton.js b/front-ui/app/components/payment/paypalButton.js
index cfcc7f9..ee11661 100644
--- a/front-ui/app/components/payment/paypalButton.js
+++ b/front-ui/app/components/payment/paypalButton.js
@@ -17,10 +17,11 @@ var PaypalButton = React.createClass({
         });
       var amount = Globals.ConvertToEuro(this.props.amount);
       var deliveryCost = Globals.ConvertToEuro(this.props.deliveryCost);
-      var notifyUrl = Globals.ApiUrl + "/payment/confirmation";
       var root = location.protocol + '//' + location.host;
       var return_url = root + "/hvala";
       var cancel_return_url = root + "/dostava";
+      var notifyUrl = Globals.IsUrlAbsolute(Globals.ApiUrl) ? Globals.ApiUrl : root + Globals.ApiUrl;
+      notifyUrl += "/payment/confirmation";
 
       return (
             <button onClick={this._onPaypalClick} disabled={this.props.disabled} type="button" className="btn mybutton payment-btn">Pay with paypal
diff --git a/front-ui/app/globals.js b/front-ui/app/globals.js
index 90d697f..c4000ef 100644
--- a/front-ui/app/globals.js
+++ b/front-ui/app/globals.js
@@ -18,6 +18,10 @@ module.exports = {
         amount = amount_s * conversionRate;
         return amount.toFixed(2);
     },
+    IsUrlAbsolute: function(url) {
+      var r = new RegExp('^(?:[a-z]+:)?//', 'i');
+      return r.test(url);
+    },
     MaxNumberOfItemsToBeAdded: 1000,
     PaypalId: "W7GKS2Q9ZGLGY",
     PikpayFormUrl: "https://ipgtest.pikpay.ba/form",