From 52ece5de9fedd00e2f8a2e31083326f2b5a373c3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 20 Jun 2017 21:35:01 +0300
Subject: [PATCH] Merge fixes

---
 app/Models/LookupUser.php                      | 2 +-
 resources/views/invoices/pdf.blade.php         | 6 ++++--
 resources/views/payments/credit_card.blade.php | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Models/LookupUser.php b/app/Models/LookupUser.php
index c1edd1231c17..f2305abd1d5e 100644
--- a/app/Models/LookupUser.php
+++ b/app/Models/LookupUser.php
@@ -39,7 +39,7 @@ class LookupUser extends LookupModel
                             ->firstOrFail();
 
         $lookupUser->email = $user->email;
-        $lookupUser->confirmation_code = $user->confirmation_code;
+        $lookupUser->confirmation_code = $user->confirmation_code ?: null;
         $lookupUser->oauth_user_key = ($user->oauth_provider_id && $user->oauth_user_id) ? ($user->oauth_provider_id . '-' . $user->oauth_user_id) : null;
         $lookupUser->referral_code = $user->referral_code;
         $lookupUser->save();
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index 87bea8cab634..7d675308af98 100644
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -117,12 +117,14 @@
     try {
         return getPDFString(refreshPDFCB, force);
     } catch (exception) {
-        console.warn('Failed to generate PDF');
+        console.warn('Failed to generate PDF: %s', exception.message);
         var href = location.href;
         if (href.indexOf('/view/') > 0 && href.indexOf('phantomjs') == -1) {
             var url = href.replace('/view/', '/download/') + '?base64=true';
             $.get(url, function(result) {
-                refreshPDFCB(result);
+                if (result && result.indexOf('data:application/pdf') == 0) {
+                    refreshPDFCB(result);
+                }
             })
         }
     }
diff --git a/resources/views/payments/credit_card.blade.php b/resources/views/payments/credit_card.blade.php
index e9064d7376b4..f96d5318df69 100644
--- a/resources/views/payments/credit_card.blade.php
+++ b/resources/views/payments/credit_card.blade.php
@@ -202,7 +202,7 @@
         <p>&nbsp;<br/>&nbsp;</p>
     @endif
 
-    @if ($accountGateway->isGateway(GATEWAY_WEPAY) && $account->token_billing_type_id === TOKEN_BILLING_DISABLED)
+    @if ($accountGateway->isGateway(GATEWAY_WEPAY) && $account->token_billing_type_id == TOKEN_BILLING_DISABLED)
         {{--- do nothing ---}}
     @else
         <div class="row">