Merge pull request #4669 from devansh-webkul/issue-4641

User Friendly Messages Updated #4641

packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php

@@ -61,7 +61,7 @@ class SmartButtonController extends Controller
         try {
             return response()->json($this->smartButton->createOrder($this->buildRequestBody()));
         } catch (\Exception $e) {
-            throw $e;
+            return response()->json(json_decode($e->getMessage()), 400);
         }
     }
 
@@ -76,7 +76,7 @@ class SmartButtonController extends Controller
             $this->smartButton->captureOrder(request()->input('orderData.orderID'));
             return $this->saveOrder();
         } catch (\Exception $e) {
-            throw $e;
+            return response()->json(json_decode($e->getMessage()), 400);
         }
     }
 

packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php

@@ -15,6 +15,8 @@ class PaypalServiceProvider extends ServiceProvider
     {
         include __DIR__ . '/../Http/routes.php';
 
+        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'paypal');
+
         $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'paypal');
 
         $this->app->register(EventServiceProvider::class);
@@ -29,7 +31,7 @@ class PaypalServiceProvider extends ServiceProvider
     {
         $this->registerConfig();
     }
-    
+
     /**
      * Register package config.
      *

packages/Webkul/Paypal/src/Resources/lang/ar/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/de/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/en/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/fa/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/it/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/ja/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/nl/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/pl/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/lang/tr/app.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'error' => [
+        'universal-error' => 'Something went wrong!',
+        'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
+        'authorization-error' => 'Client ID and Client Secret should be valid!'
+    ]
+];

packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php

@@ -14,8 +14,14 @@
     </style>
 
     <script>
+        let messages = {
+            universalError: "{{ __('paypal::app.error.universal-error') }}",
+            sdkValidationError: "{{ __('paypal::app.error.sdk-validation-error') }}",
+            authorizationError: "{{ __('paypal::app.error.authorization-error') }}"
+        };
+
         window.onload = (function() {
-            eventBus.$on('after-payment-method-selected', function(payment) {
+            eventBus.$on('after-payment-method-selected', function (payment) {
                 if (payment.method != 'paypal_smart_button') {
                     $('.paypal-buttons').remove();
 
@@ -23,11 +29,7 @@
                 }
 
                 if (typeof paypal == 'undefined') {
-                    window.flashMessages = [{'type': 'alert-error', 'message': "SDK Validation error: 'client-id not recognized for either production or sandbox: {{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}'" }];
+                    options.alertBox(messages.sdkValidationError);
-
-                    window.flashMessages.alertMessage = "SDK Validation error: 'client-id not recognized for either production or sandbox: {{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}'";
-
-                    app.addFlashMessages();
 
                     return;
                 }
@@ -38,8 +40,16 @@
                         shape:   'rect',
                     },
 
+                    authorizationFailed: false,
+
                     enableStandardCardFields: false,
 
+                    alertBox: function (message) {
+                        window.flashMessages = [{'type': 'alert-error', 'message': message }];
+                        window.flashMessages.alertMessage = message;
+                        app.addFlashMessages();
+                    },
+
                     createOrder: function(data, actions) {
                         return window.axios.get("{{ route('paypal.smart-button.create-order') }}")
                             .then(function(response) {
@@ -48,7 +58,14 @@
                             .then(function(orderData) {
                                 return orderData.id;
                             })
-                            .catch(function (error) {})
+                            .catch(function (error) {
+                                if (error.response.data.error === 'invalid_client') {
+                                    options.authorizationFailed = true;
+                                    options.alertBox(messages.authorizationError);
+                                }
+
+                                return error;
+                            });
                     },
 
                     onApprove: function(data, actions) {
@@ -74,16 +91,10 @@
                         })
                     },
 
-                    onCancel: function (data) {
+                    onError: function (error) {
-                        console.log('Canceled payment...');
+                        if (! options.authorizationFailed) {
-                    },
+                            options.alertBox(error);
-
+                        }
-                    onError: function (err) {
-                        window.flashMessages = [{'type': 'alert-error', 'message': err }];
-
-                        window.flashMessages.alertMessage = err;
-
-                        app.addFlashMessages();
                     }
                 };