From 06a120e128b7d73acf23c22a3442b32210cb01aa Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 5 Nov 2019 10:26:15 +1100
Subject: [PATCH] Resolve conflicts (#3043)

* Request Cancellation

* Add fields to settings

* Recurring invoice cancellation request

* Stub Template controller

* Template Controller

* Fixes for git commit
---
 app/Http/Controllers/TemplateController.php   | 70 ++++++++++---------
 app/Models/User.php                           |  9 +--
 .../PayPalExpressPaymentDriver.php            | 16 ++++-
 3 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php
index ddd4ef52b401..90f1329d0c7c 100644
--- a/app/Http/Controllers/TemplateController.php
+++ b/app/Http/Controllers/TemplateController.php
@@ -34,17 +34,17 @@ class TemplateController extends BaseController
      *      description="Returns a blank HTML entity temlpate",
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
      *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
-	 *      @OA\Parameter(
-	 *          name="entity",
-	 *          in="path",
-	 *          description="The Entity (invoice,quote,recurring_invoice)",
-	 *          example="invoice",
-	 *          required=true,
-	 *          @OA\Schema(
-	 *              type="string",
-	 *              format="string",
-	 *          ),
-	 *      ),
+     *      @OA\Parameter(
+     *          name="entity",
+     *          in="path",
+     *          description="The Entity (invoice,quote,recurring_invoice)",
+     *          example="invoice",
+     *          required=true,
+     *          @OA\Schema(
+     *              type="string",
+     *              format="string",
+     *          ),
+     *      ),
      *      @OA\Response(
      *          response=200,
      *          description="The template response",
@@ -68,6 +68,7 @@ class TemplateController extends BaseController
      */
     public function create($entity)
     {
+
     	return response()->json(request()->all(), 200);
     }
 
@@ -81,31 +82,31 @@ class TemplateController extends BaseController
      *      operationId="getShowTemplate",
      *      tags={"templates"},
      *      summary="Returns a entity template with the template variables replaced with the Entities",
-     *      description="Returns a blank HTML entity temlpate",
+     *      description="Returns a entity template with the template variables replaced with the Entities",
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
      *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
-	 *      @OA\Parameter(
-	 *          name="entity",
-	 *          in="path",
-	 *          description="The Entity (invoice,quote,recurring_invoice)",
-	 *          example="invoice",
-	 *          required=true,
-	 *          @OA\Schema(
-	 *              type="string",
-	 *              format="string",
-	 *          ),
-	 *      ),
-	 *      @OA\Parameter(
-	 *          name="entity_id",
-	 *          in="path",
-	 *          description="The Entity ID",
-	 *          example="X9f87dkf",
-	 *          required=true,
-	 *          @OA\Schema(
-	 *              type="string",
-	 *              format="string",
-	 *          ),
-	 *      ),
+     *      @OA\Parameter(
+     *          name="entity",
+     *          in="path",
+     *          description="The Entity (invoice,quote,recurring_invoice)",
+     *          example="invoice",
+     *          required=true,
+     *          @OA\Schema(
+     *              type="string",
+     *              format="string",
+     *          ),
+     *      ),
+     *      @OA\Parameter(
+     *          name="entity_id",
+     *          in="path",
+     *          description="The Entity ID",
+     *          example="X9f87dkf",
+     *          required=true,
+     *          @OA\Schema(
+     *              type="string",
+     *              format="string",
+     *          ),
+     *      ),
      *      @OA\Response(
      *          response=200,
      *          description="The template response",
@@ -129,6 +130,7 @@ class TemplateController extends BaseController
      */
     public function show($entity, $entity_id)
     {
+
     	return response()->json(request()->all(), 200);
     }
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 4afd002eed2c..84610b2b228a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -344,18 +344,11 @@ class User extends Authenticatable implements MustVerifyEmail
         return config('ninja.notification.slack');
     }
 
-    public function preferredLocale()
-    {
-        \Log::error(print_r($this->company(),1));
-
-        $lang = Language::find($this->company()->settings->language_id);
-
-        return $lang->locale;
-    }
 
     public function routeNotificationForMail($notification)
     {
         return $this->email;
     }
+
 }
 
diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
index cc2027b55c68..72a25f9e0a97 100644
--- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -18,6 +18,7 @@ use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
+use App\Models\SystemLog;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Omnipay\Common\Item;
@@ -130,7 +131,20 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
 
         if ($response->isCancelled()) {
             return redirect()->route('client.invoices.index')->with('warning',ctrans('texts.status_voided'));
-        } elseif (! $response->isSuccessful()) {
+        } 
+        elseif($response->isSuccessful()){
+          
+            SystemLogger::dispatch([
+                'server_response' => $response->getData(),
+                'data' => $request->all()
+              ], 
+              SystemLog::CATEGORY_GATEWAY_RESPONSE,
+              SystemLog::EVENT_GATEWAY_SUCCESS,
+              SystemLog::TYPE_PAYPAL,
+              $this->client
+            );
+        }
+        elseif (! $response->isSuccessful()) {
             
             
             SystemLogger::dispatch([