From b6df4ed65057034f059fd9940d947aec3a70d3f7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 27 Apr 2018 16:10:56 +0300
Subject: [PATCH] Hide duplicate webhook URL

---
 resources/lang/en/texts.php                   |  2 +-
 .../views/accounts/account_gateway.blade.php  | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 17b01b4849..0d2bd461e8 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1269,7 +1269,7 @@ $LANG = array(
     'webhook_url' => 'Webhook URL',
     'stripe_webhook_help' => 'You must :link.',
     'stripe_webhook_help_link_text' => 'add this URL as an endpoint at Stripe',
-    'gocardless_webhook_help_link_text' => 'You must add this URL as an endpoint in GoCardless',
+    'gocardless_webhook_help_link_text' => 'add this URL as an endpoint in GoCardless',
     'payment_method_error' => 'There was an error adding your payment methd. Please try again later.',
     'notification_invoice_payment_failed_subject' => 'Payment failed for Invoice :invoice',
     'notification_invoice_payment_failed' => 'A payment made by client :client towards Invoice :invoice failed. The payment has been marked as failed and :amount has been added to the client\'s balance.',
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 471fe116db..a5cf2e9f05 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -138,10 +138,15 @@
                            ->value(1) !!}
                 @endif
 			@elseif ($gateway->id == GATEWAY_GOCARDLESS)
-				{!! Former::text('webhook_url')
-						->readonly(true)
-						->value(url(env('WEBHOOK_PREFIX','') . 'payment_hook/' . $account->account_key . '/' . GATEWAY_GOCARDLESS))
-						->help('gocardless_webhook_help_link_text') !!}
+				<div class="form-group">
+		            <label class="control-label col-lg-4 col-sm-4">{{ trans('texts.webhook_url') }}</label>
+		            <div class="col-lg-8 col-sm-8 help-block">
+		                <input type="text"  class="form-control" onfocus="$(this).select()" readonly value="{{ URL::to(env('WEBHOOK_PREFIX','').'payment_hook/'.$account->account_key.'/'.GATEWAY_GOCARDLESS) }}">
+		                <div class="help-block"><strong>{!! trans('texts.stripe_webhook_help', [
+		                'link'=>'<a href="https://manage.gocardless.com/developers" target="_blank">'.trans('texts.gocardless_webhook_help_link_text').'</a>'
+		            ]) !!}</strong></div>
+		            </div>
+		        </div>
             @endif
 
             @if ($gateway->getHelp())
@@ -263,16 +268,6 @@
                     ->help(trans('texts.plaid_environment_help')) !!}
             </div>
         </div>
-    @elseif (! $accountGateway || $accountGateway->gateway_id == GATEWAY_GOCARDLESS)
-        <div class="form-group">
-            <label class="control-label col-lg-4 col-sm-4">{{ trans('texts.webhook_url') }}</label>
-            <div class="col-lg-8 col-sm-8 help-block">
-                <input type="text"  class="form-control" onfocus="$(this).select()" readonly value="{{ URL::to(env('WEBHOOK_PREFIX','').'payment_hook/'.$account->account_key.'/'.GATEWAY_GOCARDLESS) }}">
-                <div class="help-block"><strong>{!! trans('texts.stripe_webhook_help', [
-                'link'=>'<a href="https://manage.gocardless.com/developers" target="_blank">'.trans('texts.gocardless_webhook_help_link_text').'</a>'
-            ]) !!}</strong></div>
-            </div>
-        </div>
     @elseif ($accountGateway && $accountGateway->gateway_id == GATEWAY_WEPAY)
             {!! Former::checkbox('enable_ach')
                         ->label(trans('texts.ach'))