Merge pull request #7556 from turbo124/v5-develop

Fixes for self updater - clean up old snappdf binaries

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
+/public/react
 /storage/*.key
 /vendor
 /.idea

app/Http/Controllers/AccountController.php

@@ -12,9 +12,11 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\Account\CreateAccountRequest;
+use App\Http\Requests\Account\UpdateAccountRequest;
 use App\Jobs\Account\CreateAccount;
 use App\Models\Account;
 use App\Models\CompanyUser;
+use App\Transformers\AccountTransformer;
 use App\Transformers\CompanyUserTransformer;
 use App\Utils\TruthSource;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -157,4 +159,17 @@ class AccountController extends BaseController
 
         return $this->listResponse($ct);
     }
+
+    public function update(UpdateAccountRequest $request, Account $account)
+    {
+
+        $account->fill($request->all());
+        $account->save();
+
+        $this->entity_type = Account::class;
+
+        $this->entity_transformer = AccountTransformer::class;
+
+        return $this->itemResponse($account);
+    }
 }

app/Http/Controllers/SelfUpdateController.php

@@ -203,22 +203,36 @@ class SelfUpdateController extends BaseController
         foreach ($iterator as $file) 
         {
 
-        if($file->isDir() && !$file->isDot() && ($current_revision_text != $file->getFileName()))
-        {
-
-            $directoryIterator = new \RecursiveDirectoryIterator(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()), \RecursiveDirectoryIterator::SKIP_DOTS);
-
-            foreach (new \RecursiveIteratorIterator($directoryIterator) as $filex) 
+            if($file->isDir() && !$file->isDot() && ($current_revision_text != $file->getFileName()))
             {
-              unlink($filex->getPathName());
-            }
 
+                $directoryIterator = new \RecursiveDirectoryIterator(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()), \RecursiveDirectoryIterator::SKIP_DOTS);
+
+                foreach (new \RecursiveIteratorIterator($directoryIterator) as $filex) 
+                {
+                  unlink($filex->getPathName());
+                }
+
+                $this->deleteDirectory(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()));
             }
 
         }
 
     }
 
+    private function deleteDirectory($dir) {
+        if (!file_exists($dir)) return true;
+    
+        if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+            foreach (scandir($dir) as $item) {
+                if ($item == '.' || $item == '..') continue;
+                if (!$this->deleteDirectory($dir . "/" . $item)) {
+                    if (!$this->deleteDirectory($dir . "/" . $item)) return false;
+                };
+            }
+            return rmdir($dir);
+    }
+
     private function postHookUpdate()
     {
         if(config('ninja.app_version') == '5.3.82')

app/Http/Controllers/VendorPortal/InvitationController.php

@@ -75,14 +75,13 @@ class InvitationController extends Controller
             auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
         }
 
-        if (auth()->guard('vendor')->user() && ! request()->has('silent') && ! $invitation->viewed_date) {
+        session()->put('is_silent', request()->has('silent'));
 
-            if(!session()->get('is_silent')){
-
-                $invitation->markViewed();
-                event(new InvitationWasViewed($invitation->purchase_order, $invitation, $invitation->company, Ninja::eventVars()));
-            }
+        if (auth()->guard('vendor')->user() && ! session()->get('is_silent') && ! $invitation->viewed_date) {
 
+            $invitation->markViewed();
+            event(new InvitationWasViewed($invitation->purchase_order, $invitation, $invitation->company, Ninja::eventVars()));
+            
         }
         else{
 

app/Http/Requests/Account/UpdateAccountRequest.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\Account;
+
+use App\Http\Requests\Request;
+use App\Http\ValidationRules\Account\BlackListRule;
+use App\Http\ValidationRules\Account\EmailBlackListRule;
+use App\Http\ValidationRules\NewUniqueUserRule;
+use App\Utils\Ninja;
+
+class UpdateAccountRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return (auth()->user()->isAdmin() || auth()->user()->isOwner()) && (int)$this->account->id === auth()->user()->account_id;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'set_react_as_default_ap' => 'required|bail|bool'
+        ];
+    }
+
+    /* Only allow single field to update account table */
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+        $cleaned_input = array_intersect_key( $input, array_flip(['set_react_as_default_ap']));
+
+        $this->replace($cleaned_input);
+
+    }
+}

app/Listeners/PurchaseOrder/PurchaseOrderAcceptedNotification.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Quote Ninja (https://quoteninja.com).
+ *
+ * @link https://github.com/quoteninja/quoteninja source repository
+ *
+ * @copyright Copyright (c) 2022. Quote Ninja LLC (https://quoteninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Listeners\PurchaseOrder;
+
+use App\Jobs\Mail\NinjaMailer;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
+use App\Libraries\MultiDB;
+use App\Mail\Admin\EntityCreatedObject;
+use App\Mail\Admin\PurchaseOrderAcceptedObject;
+use App\Notifications\Admin\EntitySentNotification;
+use App\Utils\Traits\Notifications\UserNotifies;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class PurchaseOrderAcceptedNotification implements ShouldQueue
+{
+    use UserNotifies;
+
+    public $delay = 5;
+    
+    public function __construct()
+    {
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        MultiDB::setDb($event->company->db);
+
+        $first_notification_sent = true;
+
+        $purchase_order = $event->purchase_order;
+
+        $nmo = new NinjaMailerObject;
+        $nmo->mailable = new NinjaMailer( (new PurchaseOrderAcceptedObject($purchase_order, $event->company))->build() );
+        $nmo->company = $event->company;
+        $nmo->settings = $event->company->settings;
+
+        /* We loop through each user and determine whether they need to be notified */
+        foreach ($event->company->company_users as $company_user) {
+
+            /* The User */
+            $user = $company_user->user;
+
+            if(!$user)
+                continue;
+
+            /* Returns an array of notification methods */
+            $methods = $this->findUserNotificationTypes($purchase_order->invitations()->first(), $company_user, 'purchase_order', ['all_notifications', 'purchase_order_accepted', 'purchase_order_accepted_all']);
+
+            /* If one of the methods is email then we fire the EntitySentMailer */
+            if (($key = array_search('mail', $methods)) !== false) {
+                unset($methods[$key]);
+
+                $nmo->to_user = $user;
+
+                NinjaMailerJob::dispatch($nmo);
+                
+                /* This prevents more than one notification being sent */
+                $first_notification_sent = false;
+            }
+
+        }
+    }
+}

app/Mail/Admin/PurchaseOrderAcceptedObject.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Mail\Admin;
+
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Models\PurchaseOrder;
+use App\Utils\Ninja;
+use App\Utils\Number;
+use Illuminate\Support\Facades\App;
+use stdClass;
+
+class PurchaseOrderAcceptedObject
+{
+
+    public $purchase_order;
+
+    public $company;
+
+    public $settings;
+
+    public function __construct(PurchaseOrder $purchase_order, Company $company)
+    {
+        $this->purchase_order = $purchase_order;
+        $this->company = $company;
+    }
+
+    public function build()
+    {
+        MultiDB::setDb($this->company->db);
+
+        if(!$this->purchase_order)
+            return;
+
+        App::forgetInstance('translator');
+        /* Init a new copy of the translator*/
+        $t = app('translator');
+        /* Set the locale*/
+        App::setLocale($this->company->getLocale());
+        /* Set customized translations _NOW_ */
+        $t->replace(Ninja::transformTranslations($this->company->settings));
+
+        $mail_obj = new stdClass;
+        $mail_obj->amount = $this->getAmount();
+        $mail_obj->subject = $this->getSubject();
+        $mail_obj->data = $this->getData();
+        $mail_obj->markdown = 'email.admin.generic';
+        $mail_obj->tag = $this->company->company_key;
+
+        return $mail_obj;
+    }
+
+    private function getAmount()
+    {
+        return Number::formatMoney($this->purchase_order->amount, $this->company);
+    }
+
+    private function getSubject()
+    {
+        return
+            ctrans(
+                "texts.notification_purchase_order_accepted_subject",
+                [
+                        'vendor' => $this->purchase_order->vendor->present()->name(),
+                        'purchase_order' => $this->purchase_order->number,
+                    ]
+            );
+    }
+
+    private function getData()
+    {
+        $settings = $this->company->settings;
+
+        $data = [
+            'title' => $this->getSubject(),
+            'message' => ctrans(
+                "texts.notification_purchase_order_accepted",
+                [
+                    'amount' => $this->getAmount(),
+                    'vendor' => $this->purchase_order->vendor->present()->name(),
+                    'purchase_order' => $this->purchase_order->number,
+                ]
+            ),
+            'url' => $this->purchase_order->invitations->first()->getAdminLink(),
+            'button' => ctrans("texts.view_purchase_order"),
+            'signature' => $settings->email_signature,
+            'logo' => $this->company->present()->logo(),
+            'settings' => $settings,
+            'whitelabel' => $this->company->account->isPaid() ? true : false,
+        ];
+
+        return $data;
+    }
+}

app/Models/Account.php

@@ -11,6 +11,7 @@
 
 namespace App\Models;
 
+use App\Exceptions\ModelNotFoundException;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
 use App\Mail\Ninja\EmailQuotaExceeded;
@@ -472,4 +473,14 @@ class Account extends BaseModel
 
     }
 
+    public function resolveRouteBinding($value, $field = null)
+    {
+        if (is_numeric($value)) {
+            throw new ModelNotFoundException("Record with value {$value} not found");
+        }
+
+        return $this
+            ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
+    }
+
 }

app/Providers/EventServiceProvider.php

@@ -181,6 +181,7 @@ use App\Listeners\Payment\PaymentNotification;
 use App\Listeners\Payment\PaymentRestoredActivity;
 use App\Listeners\PurchaseOrder\CreatePurchaseOrderActivity;
 use App\Listeners\PurchaseOrder\PurchaseOrderAcceptedActivity;
+use App\Listeners\PurchaseOrder\PurchaseOrderAcceptedNotification;
 use App\Listeners\PurchaseOrder\PurchaseOrderArchivedActivity;
 use App\Listeners\PurchaseOrder\PurchaseOrderDeletedActivity;
 use App\Listeners\PurchaseOrder\PurchaseOrderEmailActivity;
@@ -475,6 +476,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         PurchaseOrderWasAccepted::class => [
             PurchaseOrderAcceptedActivity::class,
+            PurchaseOrderAcceptedNotification::class
         ],
         CompanyDocumentsDeleted::class => [
             DeleteCompanyDocuments::class,

resources/lang/en/texts.php

@@ -4631,6 +4631,8 @@ $LANG = array(
     'accepted' => 'Accepted',
     'activity_137' => ':contact accepted purchase order :purchase_order',
     'vendor_information' => 'Vendor Information',
+    'notification_purchase_order_accepted_subject' => 'Purchase Order :purchase_order was accepted by :vendor',
+    'notification_purchase_order_accepted' => 'The following vendor :vendor accepted Purchase Order :purchase_order for :amount.',
 );
 
 return $LANG;

routes/api.php

@@ -24,6 +24,7 @@ Route::group(['middleware' => ['throttle:10,1','api_secret_check','email_db']],
 });
 
 Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
+    Route::put('accounts/{account}', 'AccountController@update')->name('account.update');
     Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain');
     Route::get('ping', 'PingController@index')->name('ping');
     Route::get('health_check', 'PingController@health')->name('health_check');