Skip to content

Commit

Permalink
Merge branch 'master' into google-captcha
Browse files Browse the repository at this point in the history
  • Loading branch information
@devansh-webkul
devansh-webkul committed Jun 28, 2021
2 parents 29e4d76 + 9c25af6 commit 93a7891
Show file tree
Hide file tree
Showing 49 changed files with 345 additions and 115 deletions.
5 changes: 5 additions & 0 deletions config/filesystems.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
'root' => storage_path('app'),
],

'private' => [
'driver' => 'local',
'root' => storage_path('app/private'),
],

'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
Expand Down
12 changes: 8 additions & 4 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1442,20 +1442,24 @@
'order-number-length' => 'طول رقم الطلب',
'order-number-suffix' => 'لاحقة رقم الطلب',
'order-number-generator-class' => 'مولد رقم الطلب',
'minimum-order' => 'الحد الأدنى من إعدادات الطلب',
'minimum-order-amount' => 'الحد الأدنى للطلب',
'invoice-settings' => 'إعدادات الفاتورة',
'invoice-number' => 'إعدادات رقم الفاتورة',
'invoice-number-prefix' => 'بادئة رقم الفاتورة',
'invoice-number-length' => 'طول رقم الفاتورة',
'invoice-number-suffix' => 'لاحقة رقم الفاتورة',
'invoice-number-generator-class' => 'مولد رقم الفاتورة',
'minimum-order' => 'الحد الأدنى من إعدادات الطلب',
'minimum-order-amount' => 'الحد الأدنى للطلب',
'payment-terms' => 'شروط الدفع',
'due-duration' => 'مدة الاستحقاق',
'due-duration-day' => ':due-duration يوم',
'due-duration-days' => ':due-duration أيام',
'invoice-slip-design' => 'تصميم قسيمة الفاتورة',
'logo' => 'شعار',
'default' => 'إفتراضي',
'sandbox' => 'صندوق الرمل',
'all-channels' => 'الكل',
'all-locales' => 'الكل',
'invoice-slip-design' => 'تصميم قسيمة الفاتورة',
'logo' => 'شعار',
'storefront' => 'واجهة المحل',
'default-list-mode' => 'وضع القائمة الافتراضي',
'grid' => 'جريد',
Expand Down
12 changes: 8 additions & 4 deletions packages/Webkul/Admin/src/Resources/lang/de/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1450,20 +1450,24 @@
'order-number-length' => 'Auftragsnummer Länge',
'order-number-suffix' => 'Auftragsnummer Suffix',
'order-number-generator-class' => 'Bestell nummern generator',
'minimum-order' => 'Einstellungen für die Mindestbestellmenge',
'minimum-order-amount' => 'Mindestbestellmenge',
'invoice-settings' => 'Rechnungseinstellungen',
'invoice-number' => 'Rechnungsnummerneinstellungen',
'invoice-number-prefix' => 'Rechnungsnummer-Präfix',
'invoice-number-length' => 'Länge der Rechnungsnummer',
'invoice-number-suffix' => 'Rechnungsnummer-Suffix',
'invoice-number-generator-class' => 'Rechnungsnummerngenerator',
'minimum-order' => 'Einstellungen für die Mindestbestellmenge',
'minimum-order-amount' => 'Mindestbestellmenge',
'payment-terms' => 'Zahlungsbedingungen',
'due-duration' => 'Fälligkeitsdauer',
'due-duration-day' => ':due-duration Tag',
'due-duration-days' => ':due-duration Tage',
'invoice-slip-design' => 'Rechnungsdesign',
'logo' => 'Logo',
'default' => 'Standard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alle',
'all-locales' => 'Alle',
'invoice-slip-design' => 'Rechnungsdesign',
'logo' => 'Logo',
'store-name' => 'Geschäftsname',
'vat-number' => 'Umsatzsteuer-Identifikationsnummer',
'contact-number' => 'Kontakt Nummer',
Expand Down
46 changes: 25 additions & 21 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
'channel-name' => 'Channel Name',
'billed-to' => 'Billed To',
'shipped-to' => 'Shipped To',
'order-id' => 'Order Id',
'order-id' => 'Order ID',
'invoice-id' => 'Invoice number',
'invoice-date' => 'Invoice Date',
'total-qty' => 'Total Qty',
Expand Down Expand Up @@ -252,7 +252,7 @@
'update-status' => 'Update Status',
'subject' => 'Subject',
'date' => 'Date',
'transaction-id' => 'Transaction Id',
'transaction-id' => 'Transaction ID',
'transaction-date' => 'Transaction Date',
],

Expand Down Expand Up @@ -411,11 +411,11 @@

'invoices' => [
'title' => 'Invoices',
'id' => 'Id',
'id' => 'ID',
'invoice' => 'Invoice',
'invoice-id' => 'Invoice Id',
'invoice-id' => 'Invoice ID',
'date' => 'Invoice Date',
'order-id' => 'Order Id',
'order-id' => 'Order ID',
'customer-name' => 'Customer Name',
'status' => 'Status',
'amount' => 'Amount',
Expand All @@ -439,9 +439,9 @@

'shipments' => [
'title' => 'Shipments',
'id' => 'Id',
'id' => 'ID',
'date' => 'Shipment Date',
'order-id' => 'Order Id',
'order-id' => 'Order ID',
'order-date' => 'Order date',
'customer-name' => 'Customer Name',
'total-qty' => 'Total Qty',
Expand All @@ -466,10 +466,10 @@

'refunds' => [
'title' => 'Refunds',
'id' => 'Id',
'id' => 'ID',
'add-title' => 'Create Refund',
'save-btn-title' => 'Refund',
'order-id' => 'Order Id',
'order-id' => 'Order ID',
'qty-ordered' => 'Qty Ordered',
'qty-to-refund' => 'Qty To Refund',
'refund-shipping' => 'Refund Shipping',
Expand All @@ -491,19 +491,19 @@
'transactions' => [
'title' => 'Transactions',
'create-title' => 'Add transaction',
'id' => 'Id',
'transaction-id' => 'Transaction Id',
'id' => 'ID',
'transaction-id' => 'Transaction ID',
'payment-method' => 'Payment method',
'transaction-amount' => 'Transaction amount',
'transaction-amount' => 'Transaction amount',
'action' => 'Action',
'view-title' => 'Transaction #:transaction_id',
'transaction-data' => 'Transaction Data',
'order-id' => 'Order Id',
'invoice-id' => 'Invoice Id',
'order-id' => 'Order ID',
'invoice-id' => 'Invoice ID',
'status' => 'Status',
'created-at' => 'Created At',
'transaction-details' => 'Transaction Details',
'response' => [
'response' => [
'invoice-missing' => 'This invoice id does not exist',
'transaction-saved' => 'The transaction has been saved',
'already-paid' => 'This invoice has already been paid'
Expand Down Expand Up @@ -956,7 +956,7 @@

'addresses' => [
'title' => ':customer_name\'s Addresses List',
'vat_id' => 'Vat id',
'vat_id' => 'Vat ID',
'create-title' => 'Create Customer\'s Address',
'edit-title' => 'Update Customer\'s Address',
'title-orders' => ':customer_name\'s Orders List',
Expand Down Expand Up @@ -1459,21 +1459,25 @@
'order-number-length' => 'Order Number Length',
'order-number-suffix' => 'Order Number Suffix',
'order-number-generator-class' => 'Order Number Generator',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'invoice-settings' => 'Invoice Settings',
'invoice-number' => 'Invoice Number Settings',
'invoice-number-prefix' => 'Invoice Number Prefix',
'invoice-number-length' => 'Invoice Number Length',
'invoice-number-suffix' => 'Invoice Number Suffix',
'invoice-number-generator-class' => 'Invoice Number Generator',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'payment-terms' => 'Payment Terms',
'due-duration' => 'Due Duration',
'due-duration-day' => ':due-duration Day',
'due-duration-days' => ':due-duration Days',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'Logo',
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'All Channels',
'all-locales' => 'All Locales',
'all-customer-groups' => 'All Customer groups',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
Expand Down Expand Up @@ -1509,7 +1513,7 @@
'custom-css' => 'Custom CSS',
'custom-javascript' => 'Custom Javascript',
'paypal-smart-button' => 'PayPal',
'client-id' => 'Client Id',
'client-id' => 'Client ID',
'client-id-info' => 'Use "sb" for testing.',
'client-secret' => 'Client Secret',
'client-secret-info' => 'Add your secret key here',
Expand Down
12 changes: 8 additions & 4 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1454,21 +1454,25 @@
'order-number-length' => 'Largo para Pedido #',
'order-number-suffix' => 'Sufijo para Pedido #',
'order-number-generator-class' => 'Generado de Números de Pedido',
'minimum-order' => 'Configuración de Pedido Mínimo',
'minimum-order-amount' => 'Cantidad Mínima de Pedido',
'invoice-settings' => 'Configuración de facturas',
'invoice-number' => 'Configuración del número de factura',
'invoice-number-prefix' => 'Prefijo de número de factura',
'invoice-number-length' => 'Longitud del número de factura',
'invoice-number-suffix' => 'Sufijo de número de factura',
'invoice-number-generator-class' => 'Generador de números de facturas',
'minimum-order' => 'Configuración de Pedido Mínimo',
'minimum-order-amount' => 'Cantidad Mínima de Pedido',
'payment-terms' => 'Términos de pago',
'due-duration' => 'Duración debida',
'due-duration-day' => ':due-duration Día',
'due-duration-days' => ':due-duration Días',
'invoice-slip-design' => 'Diseño de Comprobande de Factura',
'logo' => 'Logo',
'default' => 'Predeterminado',
'sandbox' => 'Sandbox',
'all-channels' => 'Todos los Canales',
'all-locales' => 'Todos los Idiomas',
'all-customer-groups' => 'Todos los grupos de Clientes',
'invoice-slip-design' => 'Diseño de Comprobande de Factura',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Modo de Lista Predeterminado',
'grid' => 'Cuadrícula',
Expand Down
40 changes: 22 additions & 18 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1413,15 +1413,15 @@
'locale-options' => 'گزینه های واحد',
'weight-unit' => 'واحد وزن',
'admin-page-limit' => 'موارد پیش فرض در هر صفحه (مدیر)',
'email-settings' => 'Email Settings',
'email-sender-name' => 'Email Sender Name',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Shop Email Address',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Admin Name',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'Admin Email',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'email-settings' => 'تنظیمات ایمیل',
'email-sender-name' => 'نام فرستنده ایمیل',
'email-sender-name-tip' => 'این نام در صندوق ورودی مشتریان نمایش داده می شود',
'shop-email-from' => 'آدرس ایمیل خرید کنید',
'shop-email-from-tip' => 'آدرس ایمیل این کانال برای ارسال ایمیل به مشتریان شما',
'admin-name' => 'نام مدیر',
'admin-name-tip' => 'این نام در همه ایمیل های سرپرست نمایش داده می شود',
'admin-email' => 'ایمیل مدیر',
'admin-email-tip' => 'آدرس ایمیل مدیر این کانال برای دریافت ایمیل',
'design' => 'طراحی',
'admin-logo' => 'لوگو مدیر',
'logo-image' => 'تصویر لوگو',
Expand All @@ -1434,24 +1434,28 @@
'order-number-length' => 'طول شماره سفارش',
'order-number-suffix' => 'تعداد کافی شماره سفارش',
'order-number-generator-class' => 'تولید کننده شماره سفارش',
'minimum-order' => 'حداقل تنظیمات سفارش',
'minimum-order-amount' => 'حداقل مقدار سفارش',
'invoice-settings' => 'تنظیمات فاکتور',
'invoice-number' => 'تنظیمات شماره فاکتور',
'invoice-number-prefix' => 'پیش شماره شماره فاکتور',
'invoice-number-length' => 'طول شماره فاکتور',
'invoice-number-suffix' => 'پسوند شماره فاکتور',
'invoice-number-generator-class' => 'تولید کننده شماره فاکتور',
'minimum-order' => 'حداقل تنظیمات سفارش',
'minimum-order-amount' => 'حداقل مقدار سفارش',
'payment-terms' => 'شرایط پرداخت',
'due-duration' => 'مدت زمان مقرر',
'due-duration-day' => ':due-duration روز',
'due-duration-days' => ':due-duration روزها',
'invoice-slip-design' => 'طرح لغزش فاکتور',
'logo' => 'لوگو',
'default' => 'پیش فرض',
'sandbox' => 'Sandbox',
'sandbox' => 'جعبه شنی',
'all-channels' => 'همه',
'all-locales' => 'همه',
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'storefront' => 'ویترین',
'default-list-mode' => 'حالت لیست پیش فرض',
'grid' => 'توری',
'list' => 'لیست کنید',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
Expand Down
12 changes: 8 additions & 4 deletions packages/Webkul/Admin/src/Resources/lang/it/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1442,21 +1442,25 @@
'order-number-length' => 'Lunghezza Numero Ordine',
'order-number-suffix' => 'Suffisso Numero Ordine',
'order-number-generator-class' => 'Generatore di numeri dordine',
'minimum-order' => 'Impostazioni dell\'ordine minimo',
'minimum-order-amount' => 'Importo minimo dell\'ordine',
'invoice-settings' => 'Impostazioni fattura',
'invoice-number' => 'Impostazioni numero fattura',
'invoice-number-prefix' => 'Prefisso numero fattura',
'invoice-number-length' => 'Lunghezza numero fattura',
'invoice-number-suffix' => 'Suffisso numero fattura',
'invoice-number-generator-class' => 'Generatore di numeri di fattura',
'minimum-order' => 'Impostazioni dell\'ordine minimo',
'minimum-order-amount' => 'Importo minimo dell\'ordine',
'payment-terms' => 'Termini di pagamento',
'due-duration' => 'Durata dovuta',
'due-duration-day' => ':due-duration Giorno',
'due-duration-days' => ':due-duration giorni',
'invoice-slip-design' => 'Design della Fattura',
'logo' => 'Logo',
'default' => 'Default',
'sandbox' => 'Sandbox',
'all-channels' => 'Tutti',
'all-locales' => 'Tutti',
'all-customer-groups' => 'tutti i Gruppi di Clienti',
'invoice-slip-design' => 'Design della Fattura',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Modalità predefinita elenchiDefault List Mode',
'grid' => 'Griglia',
Expand Down
Loading

0 comments on commit 93a7891

Please sign in to comment.