Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Console/Commands/S3Cleanup.php

@@ -15,6 +15,8 @@ class S3Cleanup extends Command
      */
     protected $signature = 'ninja:s3-cleanup';
 
+    protected $log = '';
+
     /**
      * The console command description.
      *

app/Http/Controllers/ClientPortal/NinjaPlanController.php

@@ -18,10 +18,10 @@ use App\Libraries\MultiDB;
 use App\Models\ClientContact;
 use App\Models\Company;
 use App\Utils\Ninja;
-use Auth;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 
 class NinjaPlanController extends Controller
 {

app/Mail/SupportMessageSent.php

@@ -62,9 +62,10 @@ class SupportMessageSent extends Mailable
         $company = auth()->user()->company();
         $user = auth()->user();
         $db = str_replace("db-ninja-", "", $company->db);
+        $is_large = $company->is_large ? "L" : "";
         
         if(Ninja::isHosted())
-            $subject = "{$priority}Hosted-{$db}-[{$company->is_large}] :: {$plan} :: ".date('M jS, g:ia');
+            $subject = "{$priority}Hosted-{$db}{$is_large} :: {$plan} :: ".date('M jS, g:ia');
         else
             $subject = "{$priority}Self Hosted :: {$plan} :: ".date('M jS, g:ia');
 

app/Mail/TemplateEmail.php

@@ -126,7 +126,11 @@ class TemplateEmail extends Mailable
         if($this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
 
             $ubl_string = CreateUbl::dispatchNow($this->invitation->invoice);
-            $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
+
+            nlog($ubl_string);
+            
+            if($ubl_string)
+                $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
             
         }
 

app/Models/ClientGatewayToken.php

@@ -13,10 +13,12 @@ namespace App\Models;
 
 use App\Utils\Traits\MakesDates;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class ClientGatewayToken extends BaseModel
 {
     use MakesDates;
+    use SoftDeletes;
 
     protected $casts = [
         'meta' => 'object',

app/Notifications/BaseNotification.php

@@ -11,6 +11,8 @@
 
 namespace App\Notifications;
 
+use App\Jobs\Invoice\CreateUbl;
+use App\Models\Invoice;
 use App\Utils\TempFile;
 use App\Utils\Traits\MakesInvoiceHtml;
 use Illuminate\Bus\Queueable;

app/PaymentDrivers/BaseDriver.php

@@ -205,7 +205,6 @@ class BaseDriver extends AbstractPaymentDriver
 
         $invoices->each(function ($invoice) use ($payment) {
             event(new InvoiceWasPaid($invoice, $payment, $payment->company, Ninja::eventVars()));
-            $invoice->service()->workFlow();
         });
 
         return $payment->service()->applyNumber()->save();

app/PaymentDrivers/WePay/CreditCard.php

@@ -60,12 +60,18 @@ use WePayCommon;
           'method' => '1',
          */
 
-		$response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+        try {
-		    'client_id'          => config('ninja.wepay.client_id'),
-		    'client_secret'      => config('ninja.wepay.client_secret'),
-		    'credit_card_id'     => (int)$data['credit_card_id'],
-		));
             
+    		$response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+    		    'client_id'          => config('ninja.wepay.client_id'),
+    		    'client_secret'      => config('ninja.wepay.client_secret'),
+    		    'credit_card_id'     => (int)$data['credit_card_id'],
+    		));
+
+        }
+        catch(\Exception $e){
+            return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
+        }
 		// display the response
         // nlog($response);
         
@@ -116,11 +122,16 @@ use WePayCommon;
         {
             nlog("authorize the card first!");
 
-            $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+            try {
-                'client_id'          => config('ninja.wepay.client_id'),
+                $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
-                'client_secret'      => config('ninja.wepay.client_secret'),
+                    'client_id'          => config('ninja.wepay.client_id'),
-                'credit_card_id'     => (int)$request->input('credit_card_id'),
+                    'client_secret'      => config('ninja.wepay.client_secret'),
-            ));
+                    'credit_card_id'     => (int)$request->input('credit_card_id'),
+                ));
+            }
+            catch(\Exception $e){
+                return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
+            }
 
             $credit_card_id = (int)$response->credit_card_id;
 

app/Services/Invoice/TriggeredActions.php

@@ -63,8 +63,8 @@ class TriggeredActions extends AbstractService
     private function sendEmail()
     {
 
-        //$reminder_template = $this->invoice->calculateTemplate('invoice');
+        $reminder_template = $this->invoice->calculateTemplate('invoice');
-        $reminder_template = 'payment';
+        //$reminder_template = 'payment';
 
         $this->invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($reminder_template) {
             EmailEntity::dispatch($invitation, $this->invoice->company, $reminder_template);

app/Services/Payment/UpdateInvoicePayment.php

@@ -83,6 +83,7 @@ class UpdateInvoicePayment
                 ->updatePaidToDate($paid_amount)
                 ->updateStatus()
                 ->deletePdf()
+                ->workFlow()
                 ->save();
 
             event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

resources/views/pdf-designs/bold.html

@@ -36,7 +36,8 @@
     }
 
     .company-logo {
-        max-width: 55%;
+        height: 100%;
+        padding-right: 120px;
     }
 
     #company-details,
@@ -252,6 +253,10 @@
         white-space: nowrap;
     }
 
+    .logo-container {
+        max-height: 160px;
+    }
+    
     /** Useful snippets, uncomment to enable. **/
 
       /** Hide company logo **/
@@ -288,7 +293,9 @@
     <tr>
         <td>
             <div class="header-wrapper" id="header">
-                <img class="company-logo" src="$company.logo" alt="$company.name logo"/>
+                <div class="logo-container">
+                    <img class="company-logo" src="$company.logo" alt="$company.name logo"/>
+                </div>
                 <div id="company-details"></div>
                 <div id="company-address"></div>
             </div>