Fix for payment buttons in HTML emails

invoiceninja · Nov 29, 2016 · 0731165 · 0731165
1 parent bbbf123
commit 0731165
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/Services/TemplateService.php b/app/Services/TemplateService.php
@@ -4,6 +4,7 @@
 use HTML;
 use Utils;
 use App\Models\Gateway;
+use App\Models\GatewayType;
 
 class TemplateService
 {
@@ -69,7 +70,10 @@ public function processVariables($template, array $data)
 
         // Add variables for available payment types
         foreach (Gateway::$gatewayTypes as $type) {
-            $camelType = Utils::toCamelCase($type);
+            if ($type == GATEWAY_TYPE_TOKEN) {
+                continue;
+            }
+            $camelType = Utils::toCamelCase(GatewayType::getAliasFromId($type));
             $variables["\${$camelType}Link"] = $invitation->getLink('payment') . "/{$type}";
             $variables["\${$camelType}Button"] = Form::emailPaymentButton($invitation->getLink('payment')  . "/{$type}");
         }

diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
@@ -299,11 +299,13 @@ function processVariables(str) {
 
             // Add any available payment method links
             @foreach (\App\Models\Gateway::$gatewayTypes as $type)
-                {!! "keys.push('" . Utils::toCamelCase($type).'Link' . "');" !!}
-                {!! "vals.push('" . URL::to('/payment/...') . "');" !!}
+                @if ($type != GATEWAY_TYPE_TOKEN)
+                    {!! "keys.push('" . Utils::toCamelCase(\App\Models\GatewayType::getAliasFromId($type)).'Link' . "');" !!}
+                    {!! "vals.push('" . URL::to('/payment/...') . "');" !!}
 
-                {!! "keys.push('" . Utils::toCamelCase($type).'Button' . "');" !!}
-                {!! "vals.push('" . Form::flatButton('pay_now', '#36c157') . "');" !!}
+                    {!! "keys.push('" . Utils::toCamelCase(\App\Models\GatewayType::getAliasFromId($type)).'Button' . "');" !!}
+                    {!! "vals.push('" . Form::flatButton('pay_now', '#36c157') . "');" !!}
+                @endif
             @endforeach
 
             var includesPasswordPlaceholder = str.indexOf('$password') != -1;