From 04ca4fac7db43edf09a50e12f66af55f8d1bf03f Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 22 Feb 2021 15:03:38 +0530
Subject: [PATCH 1/4] Issue #4344 fixed

---
 .../Webkul/Product/src/Repositories/ProductFlatRepository.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
index 5c3347945..6ede73f17 100644
--- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
@@ -130,7 +130,8 @@ class ProductFlatRepository extends Repository
             $allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryArrributes['attributes'])));
 
             $attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->getModel()::with(['options' => function($query) use ($productCategoryArrributes) {
-                    return $query->whereIn('id', $productCategoryArrributes['attributeOptions']);
+                    return $query->whereIn('id', $productCategoryArrributes['attributeOptions'])
+                                ->orderBy('sort_order');
                 }
             ])->whereIn('id', $allFilterableAttributes)->get();
 

From fb8b0f64cab125b81882081d781333ab664afc04 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 22 Feb 2021 17:46:09 +0530
Subject: [PATCH 2/4] Messages Updated!

---
 .../Controllers/SmartButtonController.php     |  4 +-
 .../onepage/paypal-smart-button.blade.php     | 38 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php
index b3c7207d3..e63d21ad8 100755
--- a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php
+++ b/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);
         }
     }
 
diff --git a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
index 207aaf56d..0fdf64d4d 100644
--- a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
+++ b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
@@ -14,6 +14,12 @@
     </style>
 
     <script>
+        let messages = {
+            universalError: "Something went wrong!",
+            sdkValidationError: "SDK Validation Error: 'Client ID not recognized for either production or sandbox: {{ core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id') }}'",
+            authorizationError: "Client ID and Client Secret should be valid!"
+        };
+
         window.onload = (function() {
             eventBus.$on('after-payment-method-selected', function(payment) {
                 if (payment.method != 'paypal_smart_button') {
@@ -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')}}'" }];
-
-                    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();
+                    options.alertBox(messages.sdkValidationError);
 
                     return;
                 }
@@ -40,6 +42,12 @@
 
                     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 +56,13 @@
                             .then(function(orderData) {
                                 return orderData.id;
                             })
-                            .catch(function (error) {})
+                            .catch(function (error) {
+                                if (error.response.data.error === 'invalid_client') {
+                                    options.alertBox(messages.authorizationError);
+                                }
+
+                                options.alertBox(messages.universalError);
+                            });
                     },
 
                     onApprove: function(data, actions) {
@@ -72,18 +86,6 @@
                         .catch(function (error) {
                             window.location.href = "{{ route('shop.checkout.cart.index') }}";
                         })
-                    },
-
-                    onCancel: function (data) {
-                        console.log('Canceled payment...');
-                    },
-
-                    onError: function (err) {
-                        window.flashMessages = [{'type': 'alert-error', 'message': err }];
-
-                        window.flashMessages.alertMessage = err;
-
-                        app.addFlashMessages();
                     }
                 };
 

From 5388dc04dca059fa0f9e3d8bd652d1f63d2d6305 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 22 Feb 2021 18:12:41 +0530
Subject: [PATCH 3/4] Message Fixed

---
 .../checkout/onepage/paypal-smart-button.blade.php  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
index 0fdf64d4d..b4988d20b 100644
--- a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
+++ b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
@@ -21,7 +21,7 @@
         };
 
         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();
 
@@ -40,6 +40,8 @@
                         shape:   'rect',
                     },
 
+                    authorizationFailed: false,
+
                     enableStandardCardFields: false,
 
                     alertBox: function (message) {
@@ -58,10 +60,11 @@
                             })
                             .catch(function (error) {
                                 if (error.response.data.error === 'invalid_client') {
+                                    options.authorizationFailed = true;
                                     options.alertBox(messages.authorizationError);
                                 }
 
-                                options.alertBox(messages.universalError);
+                                return error;
                             });
                     },
 
@@ -86,6 +89,12 @@
                         .catch(function (error) {
                             window.location.href = "{{ route('shop.checkout.cart.index') }}";
                         })
+                    },
+
+                    onError: function (error) {
+                        if (! options.authorizationFailed) {
+                            options.alertBox(error);
+                        }
                     }
                 };
 

From d5b478fb849ea62fdb3b1cf619d5e2be7761d8c0 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 22 Feb 2021 18:33:03 +0530
Subject: [PATCH 4/4] Translation Added

---
 .../Paypal/src/Providers/PaypalServiceProvider.php       | 4 +++-
 packages/Webkul/Paypal/src/Resources/lang/ar/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/de/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/en/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/fa/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/it/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/ja/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/nl/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/pl/app.php     | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php  | 9 +++++++++
 packages/Webkul/Paypal/src/Resources/lang/tr/app.php     | 9 +++++++++
 .../views/checkout/onepage/paypal-smart-button.blade.php | 6 +++---
 12 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/ar/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/de/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/en/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/fa/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/it/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/ja/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/nl/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/pl/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php
 create mode 100644 packages/Webkul/Paypal/src/Resources/lang/tr/app.php

diff --git a/packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php b/packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php
index b815ed97b..097a817e3 100755
--- a/packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php
+++ b/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.
      *
diff --git a/packages/Webkul/Paypal/src/Resources/lang/ar/app.php b/packages/Webkul/Paypal/src/Resources/lang/ar/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/de/app.php b/packages/Webkul/Paypal/src/Resources/lang/de/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/en/app.php b/packages/Webkul/Paypal/src/Resources/lang/en/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/fa/app.php b/packages/Webkul/Paypal/src/Resources/lang/fa/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/it/app.php b/packages/Webkul/Paypal/src/Resources/lang/it/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/ja/app.php b/packages/Webkul/Paypal/src/Resources/lang/ja/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/nl/app.php b/packages/Webkul/Paypal/src/Resources/lang/nl/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/pl/app.php b/packages/Webkul/Paypal/src/Resources/lang/pl/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/lang/tr/app.php b/packages/Webkul/Paypal/src/Resources/lang/tr/app.php
new file mode 100644
index 000000000..796b54254
--- /dev/null
+++ b/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!'
+    ]
+];
diff --git a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
index b4988d20b..f94390ff3 100644
--- a/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
+++ b/packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
@@ -15,9 +15,9 @@
 
     <script>
         let messages = {
-            universalError: "Something went wrong!",
-            sdkValidationError: "SDK Validation Error: 'Client ID not recognized for either production or sandbox: {{ core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id') }}'",
-            authorizationError: "Client ID and Client Secret should be valid!"
+            universalError: "{{ __('paypal::app.error.universal-error') }}",
+            sdkValidationError: "{{ __('paypal::app.error.sdk-validation-error') }}",
+            authorizationError: "{{ __('paypal::app.error.authorization-error') }}"
         };
 
         window.onload = (function() {