From 46d342fa6349784d5fc7576296fa48f0ccbc9200 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 18 Feb 2019 16:08:16 +0200
Subject: [PATCH] Bug fixes

---
 app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php | 6 +++---
 app/Ninja/Reports/ExpenseReport.php                     | 9 ++++++++-
 resources/views/invoices/edit.blade.php                 | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
index 40a83940f852..927fc09d3599 100644
--- a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -54,13 +54,13 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
             return;
         }
 
-        $client->shipping_address1 = trim($data['SHIPTOSTREET']);
+        $client->shipping_address1 = isset($data['SHIPTOSTREET']) ? trim($data['SHIPTOSTREET']) : '';
         $client->shipping_address2 = '';
-        $client->shipping_city = trim($data['SHIPTOCITY']);
+        $client->shipping_city = isset($data['SHIPTOCITY']) ? trim($data['SHIPTOCITY']) : '';
         $client->shipping_state = isset($data['SHIPTOSTATE']) ? trim($data['SHIPTOSTATE']) : '';
         $client->shipping_postal_code = isset($data['SHIPTOZIP']) ? trim($data['SHIPTOZIP']) : '';
 
-        if ($country = cache('countries')->filter(function ($item) use ($data) {
+        if (isset($data['SHIPTOCOUNTRYCODE']) && $country = cache('countries')->filter(function ($item) use ($data) {
             return strtolower($item->iso_3166_2) == strtolower(trim($data['SHIPTOCOUNTRYCODE']));
         })->first()) {
             $client->shipping_country_id = $country->id;
diff --git a/app/Ninja/Reports/ExpenseReport.php b/app/Ninja/Reports/ExpenseReport.php
index f371dfd71a25..b28e5db2f2d7 100644
--- a/app/Ninja/Reports/ExpenseReport.php
+++ b/app/Ninja/Reports/ExpenseReport.php
@@ -22,6 +22,10 @@ class ExpenseReport extends AbstractReport
             'public_notes' => ['columnSelector-false'],
             'private_notes' => ['columnSelector-false'],
             'user' => ['columnSelector-false'],
+            'payment_date' => ['columnSelector-false'],
+            'payment_type' => ['columnSelector-false'],
+            'payment_reference' => ['columnSelector-false'],
+
         ];
 
         $user = auth()->user();
@@ -62,7 +66,7 @@ class ExpenseReport extends AbstractReport
         $expenses = Expense::scope()
                         ->orderBy('expense_date', 'desc')
                         ->withArchived()
-                        ->with('client.contacts', 'vendor', 'expense_category', 'user')
+                        ->with('client.contacts', 'vendor', 'expense_category', 'user', 'payment_type')
                         ->where('expense_date', '>=', $this->startDate)
                         ->where('expense_date', '<=', $this->endDate);
 
@@ -97,6 +101,9 @@ class ExpenseReport extends AbstractReport
                 $expense->public_notes,
                 $expense->private_notes,
                 $expense->user->getDisplayName(),
+                $expense->present()->payment_date(),
+                $expense->payment_type_id ? $expense->payment_type->name : '',
+                $expense->transaction_reference,
             ];
 
             if ($account->customLabel('expense1')) {
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 24752b7f8745..99897505140d 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -19,6 +19,7 @@
 
         #scrollable-dropdown-menu .tt-menu {
             max-height: 150px;
+            width: 300px;
             overflow-y: auto;
             overflow-x: hidden;
         }