Merge remote-tracking branch 'upstream/master' into issue-4029

Merged With Master
2020-11-09 18:25:37 +05:30 · 2020-11-09 18:25:37 +05:30 · 4890420b2d
parent e47662e6a5 f1728504d5
commit 4890420b2d
13 changed files with 37 additions and 30 deletions
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@ -1355,12 +1355,19 @@ return [
            'vat-number' => 'ظريبه الشراء',
            'contact-number' => 'رقم الاتصال',
            'bank-details' => 'التفاصيل المصرفية',
+            'instructions' => 'Instructions',
+            'custom-scripts' => 'Custom Scripts',
+            'custom-css' => 'Custom CSS',
+            'custom-javascript' => 'Custom Javascript',
+            'paypal-smart-button' => 'PayPal',
+            'client-id' => 'Client Id',
+            'client-id-info' => 'Use "sb" for testing.',
            'mailing-address' => 'أرسل الشيك إلى',
            'instructions' => 'تعليمات',
            'custom-scripts' => 'البرامج النصية المخصصة',
            'custom-css' => 'لغة تنسيق ويب حسب الطلب',
            'custom-javascript' => 'جافا سكريبت مخصص',
-            'paypal-smart-button' => 'زر Paypal الذكي',
+            'paypal-smart-button' => 'زر PayPal الذكي',
            'client-id' => 'معرف العميل',
            'client-id-info' => 'استخدم "sb" للاختبار.'
        ]
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@ -1338,7 +1338,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ],
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@ -1290,7 +1290,7 @@ return [
            'payment-methods' => 'Payment Methods',
            'cash-on-delivery' => 'Cash On Delivery',
            'money-transfer' => 'Money Transfer',
-            'paypal-standard' => 'Paypal Standard',
+            'paypal-standard' => 'PayPal Standard',
            'business-account' => 'Business Account',
            'newsletter' => 'NewsLetter Subscription',
            'newsletter-subscription' => 'Allow NewsLetter Subscription',
@ -1366,7 +1366,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
       ]
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@ -1274,7 +1274,7 @@ return [
            'payment-methods' => 'Métodos de pago',
            'cash-on-delivery' => 'Pago contraentrega',
            'money-transfer' => 'Transferencia',
-            'paypal-standard' => 'Paypal',
+            'paypal-standard' => 'PayPal',
            'business-account' => 'Cuenta de negocio',
            'newsletter' => 'Suscripción a newsletter',
            'newsletter-subscription' => 'Permitir suscripciones a newsletter',
@ -1320,7 +1320,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
       ]
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@ -1356,7 +1356,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ]
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@ -1285,7 +1285,7 @@ return [
            'payment-methods' => 'Metodi di Pagamento',
            'cash-on-delivery' => 'Contrassegno',
            'money-transfer' => 'Bonifico',
-            'paypal-standard' => 'Paypal Standard',
+            'paypal-standard' => 'PayPal Standard',
            'business-account' => 'Account Business',
            'newsletter' => 'Iscrizione a NewsLetter',
            'newsletter-subscription' => 'Consenti Iscrizione a NewsLetter',
@ -1361,7 +1361,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ]
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@ -1281,7 +1281,7 @@ return [
            'payment-methods' => 'Betaalmethodes',
            'cash-on-delivery' => 'Rembours',
            'money-transfer' => 'Overschrijving',
-            'paypal-standard' => 'Paypal Standard',
+            'paypal-standard' => 'PayPal Standard',
            'business-account' => 'Zakelijk account',
            'newsletter' => 'Nieuwsbrief',
            'newsletter-subscription' => 'Abonnement op Nieuwsbrief toestaan',
@ -1356,7 +1356,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ]
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@ -1282,7 +1282,7 @@ return [
            'payment-methods' => 'Metody płatności',
            'cash-on-delivery' => 'Za pobraniem',
            'money-transfer' => 'Przekaz pieniężny',
-            'paypal-standard' => 'Paypal Standard',
+            'paypal-standard' => 'PayPal Standard',
            'business-account' => 'Konto biznesowe',
            'newsletter' => 'Subskrypcja newslettera',
            'newsletter-subscription' => 'Zezwól na subskrypcję newslettera',
@ -1345,7 +1345,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
       ]
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@ -1281,7 +1281,7 @@ return [
            'payment-methods' => 'Métodos de Pagamento',
            'cash-on-delivery' => 'Dinheiro na entrega',
            'money-transfer' => 'Transferência de dinheiro',
-            'paypal-standard' => 'Padrão Paypal',
+            'paypal-standard' => 'Padrão PayPal',
            'business-account' => 'Conta de negócios',
            'newsletter' => 'Assinatura de Newsletter',
            'newsletter-subscription' => 'Permitir assinatura do NewsLetter',
@ -1359,7 +1359,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ]
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@ -1269,7 +1269,7 @@ return [
            'payment-methods' => 'Ödeme Türleri',
            'cash-on-delivery' => 'Kapıda Ödeme',
            'money-transfer' => 'Havale/EFT',
-            'paypal-standard' => 'Paypal',
+            'paypal-standard' => 'PayPal',
            'business-account' => 'İş Hesabı',
            'newsletter' => 'Bülten Aboneliği',
            'newsletter-subscription' => 'Bülten Aboneliğine İzin Ver',
@ -1342,7 +1342,7 @@ return [
            'custom-scripts' => 'Custom Scripts',
            'custom-css' => 'Custom CSS',
            'custom-javascript' => 'Custom Javascript',
-            'paypal-smart-button' => 'Paypal Smart Button',
+            'paypal-smart-button' => 'PayPal',
            'client-id' => 'Client Id',
            'client-id-info' => 'Use "sb" for testing.'
        ]
--- a/packages/Webkul/Paypal/src/Config/paymentmethods.php
+++ b/packages/Webkul/Paypal/src/Config/paymentmethods.php
@ -1,5 +1,16 @@
 <?php
 return [
+    'paypal_smart_button' => [
+        'code'             => 'paypal_smart_button',
+        'title'            => 'PayPal',
+        'description'      => 'PayPal',
+        'client_id'        => 'sb',
+        'class'            => 'Webkul\Paypal\Payment\SmartButton',
+        'sandbox'          => true,
+        'active'           => true,
+        'sort'             => 0,
+    ],
+
    'paypal_standard' => [
        'code'             => 'paypal_standard',
        'title'            => 'PayPal Standard',
@ -10,15 +21,4 @@ return [
        'business_account' => 'test@webkul.com',
        'sort'             => 3,
    ],
-
-    'paypal_smart_button' => [
-        'code'             => 'paypal_smart_button',
-        'title'            => 'PayPal',
-        'description'      => 'PayPal',
-        'client_id'        => 'sb',
-        'class'            => 'Webkul\Paypal\Payment\SmartButton',
-        'sandbox'          => true,
-        'active'           => true,
-        'sort'             => 4,
-    ]
 ];
--- a/packages/Webkul/Paypal/src/Config/system.php
+++ b/packages/Webkul/Paypal/src/Config/system.php
@ -63,7 +63,7 @@ return [
    ], [
        'key'    => 'sales.paymentmethods.paypal_smart_button',
        'name'   => 'admin::app.admin.system.paypal-smart-button',
-        'sort'   => 3,
+        'sort'   => 0,
        'fields' => [
            [
                'name'          => 'title',
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
@ -15,7 +15,7 @@
                autoplay="true"
                slides-per-page="1"
                navigation-enabled="hide"
-                locale-direction="direction"
+                :locale-direction="direction"
                :slides-count="{{ ! empty($sliderData) ? sizeof($sliderData) : 1 }}">

                @if (! empty($sliderData))