Merge pull request #6359 from turbo124/v5-develop

Client Contact password reset links

app/Http/Controllers/Auth/ContactForgotPasswordController.php

@@ -76,7 +76,6 @@ class ContactForgotPasswordController extends Controller
 
     public function sendResetLinkEmail(ContactPasswordResetRequest $request)
     {
-        
         $user = MultiDB::hasContact($request->input('email'));
 
         $this->validateEmail($request);

app/Http/Controllers/Auth/ContactResetPasswordController.php

@@ -71,6 +71,31 @@ class ContactResetPasswordController extends Controller
         );
     }
 
+    public function reset(Request $request)
+    {
+        $request->validate($this->rules(), $this->validationErrorMessages());
+
+        // Here we will attempt to reset the user's password. If it is successful we
+        // will update the password on an actual user model and persist it to the
+        // database. Otherwise we will parse the error and return the response.
+        $response = $this->broker()->reset(
+            $this->credentials($request), function ($user, $password) {
+                $this->resetPassword($user, $password);
+            }
+        );
+
+        // Added this because it collides the session between
+        // client & main portal giving unlimited redirects.
+        auth()->logout();
+
+        // If the password was successfully reset, we will redirect the user back to
+        // the application's home authenticated view. If there is an error we can
+        // redirect them back to where they came from with their error message.
+        return $response == Password::PASSWORD_RESET
+                    ? $this->sendResetResponse($request, $response)
+                    : $this->sendResetFailedResponse($request, $response);
+    }
+
     protected function guard()
     {
         return Auth::guard('contact');

app/Http/Controllers/PreviewController.php

@@ -31,6 +31,7 @@ use App\Repositories\InvoiceRepository;
 use App\Repositories\QuoteRepository;
 use App\Repositories\RecurringInvoiceRepository;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
+use App\Services\PdfMaker\Design as PdfDesignModel;
 use App\Services\PdfMaker\Design;
 use App\Services\PdfMaker\PdfMaker;
 use App\Utils\HostedPDF\NinjaPdf;

app/Models/ClientContact.php

@@ -198,6 +198,10 @@ class ClientContact extends Authenticatable implements HasLocalePreference
 
     public function sendPasswordResetNotification($token)
     {
+
+        $this->token = $token;
+        $this->save();
+
         $nmo = new NinjaMailerObject;
         $nmo->mailable = new NinjaMailer((new ClientContactResetPasswordObject($token, $this))->build());
         $nmo->to_user = $this;

app/PaymentDrivers/StripePaymentDriver.php

@@ -312,7 +312,7 @@ class StripePaymentDriver extends BaseDriver
 
             $data['name'] = $this->client->present()->name();
             $data['phone'] = $this->client->present()->phone();
-
+            
             if (filter_var($this->client->present()->email(), FILTER_VALIDATE_EMAIL)) {
                 $data['email'] = $this->client->present()->email();
             }

app/Repositories/BaseRepository.php

@@ -299,8 +299,8 @@ class BaseRepository
         if((int)$model->balance != 0 && $model->partial > $model->amount)
             $model->partial = min($model->amount, $model->balance);
 
-        /* Update product details if necessary */
+        /* Update product details if necessary - if we are inside a transaction - do nothing */
-        if ($model->company->update_products && $model->id) 
+        if ($model->company->update_products && $model->id && \DB::transactionLevel() == 0) 
             UpdateOrCreateProduct::dispatch($model->line_items, $model, $model->company);
 
         /* Perform model specific tasks */