merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax-enhancement

This commit is contained in:
devansh bawari 2021-05-06 10:47:49 +05:30
parent f4ed91fdbd 5f39280d18
commit 48ced3f866
12 changed files with 141 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
packages/Webkul/Admin/src/Config/system.php
View File

@ -30,41 +30,6 @@ return [
'channel_based' => true
],
],
], [
'key' => 'general.general.email_settings',
'name' => 'admin::app.admin.system.email-settings',
'sort' => 1,
'fields' => [
[
'name' => 'sender_name',
'title' => 'admin::app.admin.system.email-sender-name',
'type' => 'text',
'validation' => 'required|max:50',
'channel_based' => true,
'default_value' => config('mail.from.name'),
], [
'name' => 'shop_email_from',
'title' => 'admin::app.admin.system.shop-email-from',
'type' => 'text',
'validation' => 'required|email',
'channel_based' => true,
'default_value' => config('mail.from.address'),
], [
'name' => 'admin_name',
'title' => 'admin::app.admin.system.admin-name',
'type' => 'text',
'validation' => 'required|max:50',
'channel_based' => true,
'default_value' => config('mail.admin.name'),
], [
'name' => 'admin_email',
'title' => 'admin::app.admin.system.admin-email',
'type' => 'text',
'validation' => 'required|email',
'channel_based' => true,
'default_value' => config('mail.admin.address'),
],
],
], [
'key' => 'general.content',
'name' => 'admin::app.admin.system.content',
@ -429,6 +394,49 @@ return [
'key' => 'emails',
'name' => 'admin::app.admin.emails.email',
'sort' => 5,
], [
'key' => 'emails.configure',
'name' => 'admin::app.admin.system.email-settings',
'sort' => 1,
], [
'key' => 'emails.configure.email_settings',
'name' => 'admin::app.admin.system.email-settings',
'sort' => 1,
'fields' => [
[
'name' => 'sender_name',
'title' => 'admin::app.admin.system.email-sender-name',
'type' => 'text',
'info' => 'admin::app.admin.system.email-sender-name-tip',
'validation' => 'required|max:50',
'channel_based' => true,
'default_value' => config('mail.from.name'),
], [
'name' => 'shop_email_from',
'title' => 'admin::app.admin.system.shop-email-from',
'type' => 'text',
'info' => 'admin::app.admin.system.shop-email-from-tip',
'validation' => 'required|email',
'channel_based' => true,
'default_value' => config('mail.from.address'),
], [
'name' => 'admin_name',
'title' => 'admin::app.admin.system.admin-name',
'type' => 'text',
'info' => 'admin::app.admin.system.admin-name-tip',
'validation' => 'required|max:50',
'channel_based' => true,
'default_value' => config('mail.admin.name'),
], [
'name' => 'admin_email',
'title' => 'admin::app.admin.system.admin-email',
'type' => 'text',
'info' => 'admin::app.admin.system.admin-email-tip',
'validation' => 'required|email',
'channel_based' => true,
'default_value' => config('mail.admin.address'),
],
],
], [
'key' => 'emails.general',
'name' => 'admin::app.admin.emails.notification_label',
@ -490,4 +498,4 @@ return [
],
],
],
];
];

4
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -1415,9 +1415,13 @@ return [
'design' => 'التصميم',
'email-settings' => 'إعدادات البريد الإلكتروني',
'email-sender-name' => 'اسم مرسل البريد الإلكتروني',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'متجر عنوان البريد الإلكتروني [لإرسال رسائل البريد الإلكتروني]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'اسم المسؤول',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'البريد الإلكتروني للمسؤول',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-logo' => 'شعار المسؤول',
'logo-image' => 'صورة الشعار',
'credit-max' => 'الحد الأقصى لائتمان العميل',

4
packages/Webkul/Admin/src/Resources/lang/de/app.php
View File

@ -1421,9 +1421,13 @@ return [
'weight-unit' => 'Gewichtseinheit',
'email-settings' => 'E-Mail Einstellungen',
'email-sender-name' => 'E-Mail-Adresse des Absenders',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'E-Mail-Adresse des Shops (bei Bestellungen, etc.)',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Name des Admins',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'E-Mail-Adresse des Admins',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-page-limit' => 'Elemente pro Seite (Admin)',
'design' => 'Design',
'admin-logo' => 'Admin-Logo',

26
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -1361,16 +1361,16 @@ return [
'email' => 'Email',
'notification_label' => 'Notifications',
'notifications' => [
'verification' => 'Send verification E-mail',
'registration' => 'Send registration E-mail',
'customer' => 'Send customer E-mail',
'new-order' => 'Send Order Confirmation E-mail',
'new-admin' => 'Send Admin Invitation E-mail',
'new-invoice' => 'Send Invoice Confirmation E-mail',
'new-refund' => 'Send Refund Notification E-mail',
'new-shipment' => 'Send Shipment Notification E-mail',
'new-inventory-source' => 'Send Inventory Source Notification E-mail',
'cancel-order' => 'Send cancel Order Notification E-mail',
'verification' => 'Send a verification e-mail after customer registration',
'registration' => 'Send a confirmation e-mail after customer registration',
'customer' => 'Send the customer account credentials after registration',
'new-order' => 'Send a confirmation email to the customer after placing a new order',
'new-admin' => 'Send a confirmation email to the admin after placing a new order',
'new-invoice' => 'Send a notification e-mail after creating a new invoice',
'new-refund' => 'Send a notification e-mail after creating a refund',
'new-shipment' => 'Send a notification e-mail after creating a shipment',
'new-inventory-source' => 'Send a notification e-email after creating a new inventory source',
'cancel-order' => 'Send a notification after canceling an order'
],
],
@ -1431,9 +1431,13 @@ return [
'weight-unit' => 'Weight Unit',
'email-settings' => 'Email Settings',
'email-sender-name' => 'Email Sender Name',
'shop-email-from' => 'Shop Email Address [For sending emails]',
'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',
'admin-page-limit' => 'Default Items Per Page (Admin)',
'design' => 'Design',
'admin-logo' => 'Admin Logo',

4
packages/Webkul/Admin/src/Resources/lang/es/app.php
View File

@ -1425,9 +1425,13 @@ return [
'weight-unit' => 'Unidad de peso',
'email-settings' => 'Ajustes de email',
'email-sender-name' => 'Nombre de remitente',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Email de tienda [Para envío de emails]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Nombre del admin',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'Email del admin',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-page-limit' => 'Artículos por página predeterminado (Admin)',
'design' => 'Diseño',
'admin-logo' => 'Logo del admin',

12
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -1410,10 +1410,14 @@ return [
'weight-unit' => 'واحد وزن',
'admin-page-limit' => 'موارد پیش فرض در هر صفحه (مدیر)',
'email-settings' => 'Email Settings',
'email-sender-name' => 'Email Sender Name',
'shop-email-from' => 'Shop Email Address [For sending emails]',
'admin-name' => 'Admin Name',
'admin-email' => 'Admin Email',
'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',
'design' => 'طراحی',
'admin-logo' => 'لوگو مدیر',
'logo-image' => 'تصویر لوگو',

6
packages/Webkul/Admin/src/Resources/lang/it/app.php
View File

@ -1413,9 +1413,13 @@ return [
'weight-unit' => 'Unità di peso',
'email-settings' => 'Impostazioni Email',
'email-sender-name' => 'Nome Mittente Email',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Indirizzo Email Negozio [per invio email]',
'admin-name' => 'Nome Admin',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Nome Admin',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'Email Admin',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-page-limit' => 'Numero di risultati per Pagina (Admin)',
'design' => 'Design',
'admin-logo' => 'Logo Admin',

80
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -81,7 +81,7 @@ return [
'email-templates' => 'Email Templates',
'discount' => 'Korting',
'cms' => 'CMS',
'transactions' => 'Transactions'
'transactions' => 'Transacties'
],
'acl' => [
@ -392,7 +392,7 @@ return [
'comment' => 'Comment',
'submit-comment' => 'Submit Comment',
'notify-customer' => 'Notify Customer',
'transactions' => 'Transactions'
'transactions' => 'Transacties'
],
'invoices' => [
@ -475,17 +475,17 @@ return [
],
'transactions' => [
'title' => 'Transactions',
'title' => 'Transacties',
'id' => 'Id',
'transaction-id' => 'Transaction Id',
'payment-method' => 'Payment method',
'action' => 'Action',
'view-title' => 'Transaction #:transaction_id',
'transaction-data' => 'Transaction Data',
'transaction-id' => 'Transactie Id',
'payment-method' => 'Betalingswijze',
'action' => 'Actie',
'view-title' => 'Transactie #:transaction_id',
'transaction-data' => 'Transacatie data',
'order-id' => 'Order Id',
'status' => 'Status',
'created-at' => 'Created At',
'transaction-details' => 'Transaction Details'
'created-at' => 'Datum aangemaakt',
'transaction-details' => 'Transactie Details'
]
],
@ -1339,15 +1339,15 @@ return [
'email' => 'Email',
'notification_label' => 'Notificaties',
'notifications' => [
'verification' => 'Stuur verificatie E-mail',
'registration' => 'Verzend registratie E-mail',
'customer' => 'Stuur klant e-mail',
'new-order' => 'Stuur een e-mail ter bevestiging van de bestelling',
'new-admin' => 'Stuur een e-mail met de beheerdersuitnodiging',
'new-invoice' => 'Stuur een e-mail ter bevestiging van de factuur',
'new-refund' => 'Stuur een terugbetalingsmelding per e-mail',
'new-shipment' => 'Verzendbericht per e-mail verzenden',
'new-inventory-source' => 'E-mail met bronvermelding voor inventaris verzenden',
'verification' => 'Stuur een verificatie-e-mail na registratie van de klant',
'registration' => 'Stuur een bevestigingsmail na registratie van de klant',
'customer' => 'Stuur de account gegevens van de klant na registratie',
'new-order' => 'Stuur een notificatie naar de klant na het plaatsen van een nieuwe bestelling',
'new-admin' => 'Stuur een notificatie naar de beheerder na het plaatsen van een nieuwe bestelling',
'new-invoice' => 'Stuur een notificatie na het aanmaken van een nieuwe factuur',
'new-refund' => 'Stuur een notificatie nadat u een terugbetaling heeft gemaakt',
'new-shipment' => 'Stuur een notificatie na het aanmaken van een zending',
'new-inventory-source' => 'Stuur een notificatie nadat een nieuwe voorraadbron is aangemaakt',
'cancel-order' => 'Verzenden annuleren Bestellingskennisgeving E-mail',
],
@ -1405,11 +1405,15 @@ return [
'footer-toggle' => 'Voettekst in- / uitschakelen',
'locale-options' => 'Eenheid opties',
'weight-unit' => 'Gewichtseenheid',
'email-settings' => 'Email Settings',
'email-sender-name' => 'Email Sender Name',
'shop-email-from' => 'Shop Email Address [For sending emails]',
'admin-name' => 'Admin Name',
'admin-email' => 'Admin Email',
'email-settings' => 'Email configuratie',
'email-sender-name' => 'Afzender',
'email-sender-name-tip' => 'Deze naam wordt weergegeven in de inbox van de klant',
'shop-email-from' => 'Het e-mailadres van de winkel',
'shop-email-from-tip' => 'Het e-mailadres van dit kanaal om e-mails naar uw klanten te sturen',
'admin-name' => 'Naam van de beheerder',
'admin-name-tip' => 'Deze naam wordt weergegeven in alle admin e-mails',
'admin-email' => 'Het e-mailadres van de beheerder',
'admin-email-tip' => 'Het e-mailadres van de beheerder voor dit kanaal om e-mails te ontvangen',
'admin-page-limit' => 'Standaarditems per pagina (Admin)',
'design' => 'Ontwerp',
'admin-logo' => 'Admin Logo',
@ -1417,14 +1421,14 @@ return [
'credit-max' => 'Klantenkrediet Max',
'credit-max-value' => 'Maximale kredietwaarde',
'use-credit-max' => 'Gebruik krediet max',
'order-settings' => 'Bestel instellingen',
'order-settings' => 'Order instellingen',
'orderNumber' => 'Instellingen voor bestelnummers',
'order-number-prefix' => 'Bestelnummer prefix',
'order-number-length' => 'Bestelnummer Lengte',
'order-number-suffix' => 'Achtervoegsel bestelnummer',
'order-number-generator-class' => 'Ordernummer Generator',
'minimum-order' => 'Minimum Order Settings',
'minimum-order-amount' => 'Minimum Order Amount',
'minimum-order' => 'Minimale bestelling instellen',
'minimum-order-amount' => 'Minimaal bedrag van de bestelling',
'default' => 'Standaard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alles',
@ -1432,16 +1436,16 @@ return [
'invoice-slip-design' => 'Invoice Slip Design',
'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
'list' => 'List',
'products-per-page' => 'Products Per Page',
'sort-by' => 'Sort By',
'from-z-a' => 'From Z-A',
'from-a-z' => 'From A-Z',
'newest-first' => 'Newest First',
'oldest-first' => 'Oldest First',
'cheapest-first' => 'Cheapest First',
'default-list-mode' => 'Standaard product weergavemodus',
'grid' => 'Raster',
'list' => 'Lijst',
'products-per-page' => 'Producten per pagina',
'sort-by' => 'Sorteer op',
'from-z-a' => 'Van Z-A',
'from-a-z' => 'Van A-Z',
'newest-first' => 'Nieuwste eerst',
'oldest-first' => 'Oudste eerst',
'cheapest-first' => 'Goedkoopste eerst',
'expensive-first' => 'Expensive First',
'comma-seperated' => 'Comma Seperated',
'favicon' => 'Favicon',
@ -1460,7 +1464,7 @@ return [
'show-sku' => 'Show SKU',
'show-search-input-field' => 'Show Search Input Field',
'store-name' => 'Winkel naam',
'vat-number' => 'Btw-nummer',
'vat-number' => 'BTW-nummer',
'contact-number' => 'Contact nummer',
'bank-details' => 'Bankgegevens',
'mailing-address' => 'Send Check to',

4
packages/Webkul/Admin/src/Resources/lang/pl/app.php
View File

@ -1410,9 +1410,13 @@ return [
'weight-unit' => 'Jednostka wagi',
'email-settings' => 'Ustawienia e-mail',
'email-sender-name' => 'Email Sender Name',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Adres e-mail sklepu [do wysyłania wiadomości e-mail]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Nazwa administratora',
'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',
'admin-page-limit' => 'Domyślne elementy na stronę (administratora)',
'design' => 'Projekt',
'admin-logo' => 'Logo administratora',

4
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -1411,9 +1411,13 @@ return [
'design' => 'Design',
'email-settings' => 'Configurações de Email',
'email-sender-name' => 'Nome do Email da Loja',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Endereço de Email da Loja [Para enviar emails]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Admin Nome',
'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',
'admin-page-limit' => 'Quantidade Padrão de Itens por Página (Admin)',
'design' => 'Design',
'admin-logo' => 'Admin Logo',

4
packages/Webkul/Admin/src/Resources/lang/tr/app.php
View File

@ -1397,9 +1397,13 @@ return [
'weight-unit' => 'Ağırlık Birimi',
'email-settings' => 'Mail Ayarları',
'email-sender-name' => 'Mail Gönderici Adı',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'shop-email-from' => 'Mağaza Mail Adresi [Mail gönderimleri için]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'admin-name' => 'Yönetici Adı',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-email' => 'Yönetici Mail Adresi',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-page-limit' => 'Sayfa Başına Varsayılan İçerik (Yönetici)',
'design' => 'Tasarım',
'admin-logo' => 'Panel Logo',

6
packages/Webkul/Core/src/Core.php
View File

@ -1088,9 +1088,9 @@ class Core
*/
public function getSenderEmailDetails()
{
$sender_name = $this->getConfigData('general.general.email_settings.sender_name') ? $this->getConfigData('general.general.email_settings.sender_name') : config('mail.from.name');
$sender_name = $this->getConfigData('emails.configure.email_settings.sender_name') ? $this->getConfigData('emails.configure.email_settings.sender_name') : config('mail.from.name');
$sender_email = $this->getConfigData('general.general.email_settings.shop_email_from') ? $this->getConfigData('general.general.email_settings.shop_email_from') : config('mail.from.address');
$sender_email = $this->getConfigData('emails.configure.email_settings.shop_email_from') ? $this->getConfigData('emails.configure.email_settings.shop_email_from') : config('mail.from.address');
return [
'name' => $sender_name,
@ -1171,4 +1171,4 @@ class Core
return $coreConfigValue;
}
}
}