Merge pull request #11113 from turbo124/v5-develop

v5.12.8

VERSION.txt

@@ -1 +1 @@
-5.12.7
+5.12.8

app/Console/Commands/CheckData.php

@@ -191,11 +191,18 @@ class CheckData extends Command
 
                     $this->logMessage("Task #{$task->id} has a time log with more than 4 elements");
 
+                    if($this->option('tasks') == 'true'){
+                        $log = [(int)$log[0], (int)$log[1], (string)$log[2], (bool)$log[3]];
+                    }
+                }
+                elseif(count($log) == 4){
+                 
                     if($this->option('tasks') == 'true'){
                         $log = [(int)$log[0], (int)$log[1], (string)$log[2], (bool)$log[3]];
                     }
                 }
             }
+            unset($log); // Unset the reference variable
 
             if($this->option('tasks') == 'true'){   
                 $task->time_log = json_encode($time_log);

app/Http/Controllers/ActivityController.php

@@ -247,19 +247,20 @@ class ActivityController extends BaseController
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
                 // no break
+                break;
             case Task::class:
                 $activity->task_id = $entity->id;
-                $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
                 // no break
+                break;
             case Payment::class:
                 $activity->payment_id = $entity->id;
-                $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 // no break
+                break;
             default:
                 # code...
                 break;

app/Listeners/Payment/PaymentNotification.php

@@ -110,6 +110,13 @@ class PaymentNotification implements ShouldQueue
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);
 
+                //new check, IF the payment is on a recurring invoice AND the user had notifications disabled for recurring invoices. then we disable the notification for this payment.
+                $disabled_recurring_invoice_notifications = $this->findUserEntityNotificationType($payment, $company_user,['disable_recurring_payment_notification']);
+
+                if ($payment->invoices->first()->recurring_id && (array_search('mail', $disabled_recurring_invoice_notifications) !== false)) {
+                continue;
+                }
+
                 $nmo = new NinjaMailerObject();
                 $nmo->mailable = new NinjaMailer((new EntityPaidObject($payment, $company_user->portalType()))->build());
                 $nmo->company = $event->company;

app/Services/Pdf/PdfService.php

@@ -92,7 +92,7 @@ class PdfService
         try {
 
             $html = $this->getHtml();
-            // nlog($html);
+            // nlog($html); 
             $pdf = $this->resolvePdfEngine($html);
 
             $numbered_pdf = $this->pageNumbering($pdf, $this->company);

config/ninja.php

@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.12.7'),
-    'app_tag' => env('APP_TAG', '5.12.7'),
+    'app_version' => env('APP_VERSION', '5.12.8'),
+    'app_tag' => env('APP_TAG', '5.12.8'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

lang/en/texts.php

@@ -5591,6 +5591,8 @@ $lang = array(
     'docuninja_disable_warning' => 'This will remove all access to your DocuNinja account.',
     'docuninja_downgrade_info' => 'Your user limit will automatically be reduced at the end of the current billing cycle.',
     'recurring_invoice_item' => 'Recurring Invoice Item',
+    'disable_recurring_payment_notification' => 'Disable Recurring Payment Notification',
+    'disable_recurring_payment_notification_help' => 'Successful recurring invoice payment notifications will not be sent.',
 );
 
 return $lang;