diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index fd0f45d72..835d0bd1c 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1442,20 +1442,24 @@ return [
'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' => 'جريد',
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index cab56c4ef..b767e6cd6 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -1450,20 +1450,24 @@ return [
'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',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 0dee53d70..60f68a00f 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -202,7 +202,7 @@ return [
'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',
@@ -252,7 +252,7 @@ return [
'update-status' => 'Update Status',
'subject' => 'Subject',
'date' => 'Date',
- 'transaction-id' => 'Transaction Id',
+ 'transaction-id' => 'Transaction ID',
'transaction-date' => 'Transaction Date',
],
@@ -411,11 +411,11 @@ return [
'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',
@@ -439,9 +439,9 @@ return [
'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',
@@ -466,10 +466,10 @@ return [
'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',
@@ -491,19 +491,19 @@ return [
'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'
@@ -956,7 +956,7 @@ return [
'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',
@@ -1459,21 +1459,25 @@ return [
'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',
@@ -1509,7 +1513,7 @@ return [
'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',
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index 0526c24d3..d45188a68 100644
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1454,21 +1454,25 @@ return [
'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',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 41c248f34..c828cb44e 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1413,15 +1413,15 @@ return [
'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' => 'تصویر لوگو',
@@ -1434,24 +1434,28 @@ return [
'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',
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index 5f87435bf..a71ab5ed4 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -1442,21 +1442,25 @@ return [
'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',
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index b67cf69ed..eeda1a43b 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -1436,20 +1436,24 @@ return [
'order-number-length' => 'Bestelnummer Lengte',
'order-number-suffix' => 'Achtervoegsel bestelnummer',
'order-number-generator-class' => 'Ordernummer Generator',
+ 'minimum-order' => 'Minimale bestelling instellen',
+ 'minimum-order-amount' => 'Minimaal bedrag van de bestelling',
'invoice-settings' => 'Factuurinstellingen',
'invoice-number' => 'Instellingen factuurnummer',
'invoice-number-prefix' => 'Voorvoegsel factuurnummer',
'invoice-number-length' => 'Lengte factuurnummer',
'invoice-number-suffix' => 'Achtervoegsel factuurnummer',
'invoice-number-generator-class' => 'Factuurnummergenerator',
- 'minimum-order' => 'Minimale bestelling instellen',
- 'minimum-order-amount' => 'Minimaal bedrag van de bestelling',
+ 'payment-terms' => 'Betaalvoorwaarden',
+ 'due-duration' => 'Vervaltijd:',
+ 'due-duration-day' => ':due-duration Dag',
+ 'due-duration-days' => ':due-duration dagen',
+ 'invoice-slip-design' => 'Invoice Slip Design',
+ 'logo' => 'Logo',
'default' => 'Standaard',
'sandbox' => 'Sandbox',
'all-channels' => 'Alles',
'all-locales' => 'Alles',
- 'invoice-slip-design' => 'Invoice Slip Design',
- 'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Standaard product weergavemodus',
'grid' => 'Raster',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index 8a1e12457..9279a8d3d 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -1439,21 +1439,25 @@ return [
'order-number-length' => 'Długość numeru zamówienia',
'order-number-suffix' => 'Sufiks numeru zamówienia”',
'order-number-generator-class' => 'Generator numeru zamówienia',
+ 'minimum-order' => 'Minimalne ustawienia zamówienia',
+ 'minimum-order-amount' => 'Minimalna kwota zamówienia',
'invoice-settings' => 'Ustawienia faktury',
'invoice-number' => 'Ustawienia numeru faktury',
'invoice-number-prefix' => 'Prefiks numeru faktury',
'invoice-number-length' => 'Długość numeru faktury',
'invoice-number-suffix' => 'Sufiks numeru faktury',
'invoice-number-generator-class' => 'Generator numerów faktur',
- 'minimum-order' => 'Minimalne ustawienia zamówienia',
- 'minimum-order-amount' => 'Minimalna kwota zamówienia',
+ 'payment-terms' => 'Zasady płatności',
+ 'due-duration' => 'Wymagany czas trwania',
+ 'due-duration-day' => ':due-duration Dzień',
+ 'due-duration-days' => ':due-duration Dni',
+ 'invoice-slip-design' => 'Wzór wydruku faktury',
+ 'logo' => 'Logo',
'default' => 'Domyślna',
'sandbox' => 'Piaskownica',
'all-channels' => 'Wszystkie kanały',
'all-locales' => 'Wszystkie ustawienia regionalne',
'all-customer-groups' => 'Wszystkie grupy klientów',
- 'invoice-slip-design' => 'Wzór wydruku faktury',
- 'logo' => 'Logo',
'favicon' => 'Favicon',
'seo' => 'SEO',
'rich-snippets' => 'Rich Snippets',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index 0df13520b..50173b297 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1440,21 +1440,25 @@ return [
'order-number-length' => 'Tamanho do Número do Pedido',
'order-number-suffix' => 'Sufixo do Número de Pedido',
'order-number-generator-class' => 'Gerador de número de pedido',
+ 'minimum-order' => 'Configurações de pedido mínimo ',
+ 'minimum-order-amount' => 'Quantidade Mínima do Pedido',
'invoice-settings' => 'Configurações de fatura',
'invoice-number' => 'Configurações de número de fatura',
'invoice-number-prefix' => 'Prefixo do número da fatura',
'invoice-number-length' => 'Comprimento do número da fatura',
'invoice-number-suffix' => 'Sufixo do número da fatura',
'invoice-number-generator-class' => 'Gerador de número de fatura',
- 'minimum-order' => 'Configurações de pedido mínimo ',
- 'minimum-order-amount' => 'Quantidade Mínima do Pedido',
+ 'payment-terms' => 'Termos de pagamento',
+ 'due-duration' => 'Duração devida',
+ 'due-duration-day' => ':due-duration Dia',
+ 'due-duration-days' => ':due-duration Dias',
+ 'invoice-slip-design' => 'Design da Nota do Pedido',
+ 'logo' => 'Logotipo',
'default' => 'Padrão',
'sandbox' => 'Sandbox',
'all-channels' => 'Todos',
'all-locales' => 'Todos',
'sandbox' => 'Sandbox',
- 'invoice-slip-design' => 'Design da Nota do Pedido',
- 'logo' => 'Logo',
'storefront' => 'Storefront',
'default-list-mode' => 'Default List Mode',
'grid' => 'Grid',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 131920029..0895a7ce5 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1426,20 +1426,24 @@ return [
'order-number-length' => 'Numara Uzunluğu',
'order-number-suffix' => 'Numara Son Eki',
'order-number-generator-class' => 'Sipariş Numarası Üreticisi',
+ 'minimum-order' => 'Minimum Sipariş Ayarları',
+ 'minimum-order-amount' => 'Minimum Sipariş Tutarı',
'invoice-settings' => 'Fatura Ayarları',
'invoice-number' => 'Fatura Numarası Ayarları',
'invoice-number-prefix' => 'Fatura Numarası Ön Eki',
'invoice-number-length' => 'Fatura Numarası Uzunluğu',
'invoice-number-suffix' => 'Fatura Numarası Eki',
'invoice-number-generator-class' => 'Fatura Numarası Oluşturucu',
- 'minimum-order' => 'Minimum Sipariş Ayarları',
- 'minimum-order-amount' => 'Minimum Sipariş Tutarı',
+ 'payment-terms' => 'Ödeme şartları',
+ 'due-duration' => 'Vade Süresi',
+ 'due-duration-day' => ':due-duration Gün',
+ 'due-duration-days' => ':due-duration Günler',
+ 'invoice-slip-design' => 'Fatura Tasarımı',
+ 'logo' => 'logo',
'default' => 'Varsayılan',
'sandbox' => 'Havuz',
'all-channels' => 'Tümü',
'all-locales' => 'Tümü',
- 'invoice-slip-design' => 'Fatura Tasarımı',
- 'logo' => 'logo',
'storefront' => 'Mağaza Arayüzü',
'default-list-mode' => 'Varsayılan Listeleme Modu',
'grid' => 'Tablo',
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
index 30e619ddb..2d88d2463 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
@@ -160,16 +160,28 @@
#{{ $invoice->increment_id ?? $invoice->id }}
+
+ {{ __('admin::app.sales.invoices.date') }} -
+ {{ core()->formatDate($invoice->created_at, 'd-m-Y') }}
+
+
{{ __('admin::app.sales.invoices.order-id') }} -
#{{ $invoice->order->increment_id }}
- {{ __('admin::app.sales.invoices.order-date') }}
+ {{ __('admin::app.sales.invoices.order-date') }} -
{{ $invoice->created_at->format('d-m-Y') }}
+ @if ($invoice->hasPaymentTerm())
+
+ {{ __('admin::app.admin.system.payment-terms') }} -
+ {{ $invoice->getFormattedPaymentTerm() }}
+
+ @endif
+
diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php
index b120c6bfb..3539fa35d 100644
--- a/packages/Webkul/Sales/src/Config/system.php
+++ b/packages/Webkul/Sales/src/Config/system.php
@@ -107,6 +107,19 @@ return [
'locale_based' => true,
],
]
+ ], [
+ 'key' => 'sales.invoice_setttings.payment_terms',
+ 'name' => 'admin::app.admin.system.payment-terms',
+ 'sort' => 1,
+ 'fields' => [
+ [
+ 'name' => 'due_duration',
+ 'title' => 'admin::app.admin.system.due-duration',
+ 'type' => 'text',
+ 'validation' => 'numeric',
+ 'channel_based' => true,
+ ],
+ ]
], [
'key' => 'sales.invoice_setttings.invoice_slip_design',
'name' => 'admin::app.admin.system.invoice-slip-design',
diff --git a/packages/Webkul/Sales/src/Models/Invoice.php b/packages/Webkul/Sales/src/Models/Invoice.php
index 65d9a850a..3ce7d640d 100755
--- a/packages/Webkul/Sales/src/Models/Invoice.php
+++ b/packages/Webkul/Sales/src/Models/Invoice.php
@@ -4,11 +4,24 @@ namespace Webkul\Sales\Models;
use Illuminate\Database\Eloquent\Model;
use Webkul\Sales\Contracts\Invoice as InvoiceContract;
+use Webkul\Sales\Traits\PaymentTerm;
class Invoice extends Model implements InvoiceContract
{
+ use PaymentTerm;
+
+ /**
+ * The attributes that aren't mass assignable.
+ *
+ * @var string[]|bool
+ */
protected $guarded = ['id', 'created_at', 'updated_at'];
+ /**
+ * Invoice status.
+ *
+ * @var array
+ */
protected $statusLabel = [
'pending' => 'Pending',
'paid' => 'Paid',
@@ -16,7 +29,7 @@ class Invoice extends Model implements InvoiceContract
];
/**
- * Returns the status label from status code
+ * Returns the status label from status code.
*/
public function getStatusLabelAttribute()
{
@@ -63,4 +76,4 @@ class Invoice extends Model implements InvoiceContract
return $this->belongsTo(OrderAddressProxy::modelClass(), 'order_address_id')
->where('address_type', OrderAddress::ADDRESS_TYPE_BILLING);
}
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 1aee8c25e..623d01ac9 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -3,8 +3,8 @@
namespace Webkul\Sales\Repositories;
use Illuminate\Container\Container as App;
-use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
use Webkul\Sales\Contracts\Invoice;
use Webkul\Sales\Generators\InvoiceSequencer;
@@ -12,28 +12,28 @@ use Webkul\Sales\Generators\InvoiceSequencer;
class InvoiceRepository extends Repository
{
/**
- * OrderRepository object
+ * Order repository instance.
*
* @var \Webkul\Sales\Repositories\OrderRepository
*/
protected $orderRepository;
/**
- * OrderItemRepository object
+ * Order's item repository instance.
*
* @var \Webkul\Sales\Repositories\OrderItemRepository
*/
protected $orderItemRepository;
/**
- * InvoiceItemRepository object
+ * Invoice's item repository instance.
*
* @var \Webkul\Sales\Repositories\InvoiceItemRepository
*/
protected $invoiceItemRepository;
/**
- * DownloadableLinkPurchasedRepository object
+ * Downloadable link purchased repository instance.
*
* @var \Webkul\Sales\Repositories\DownloadableLinkPurchasedRepository
*/
@@ -54,8 +54,7 @@ class InvoiceRepository extends Repository
InvoiceItemRepository $invoiceItemRepository,
DownloadableLinkPurchasedRepository $downloadableLinkPurchasedRepository,
App $app
- )
- {
+ ) {
$this->orderRepository = $orderRepository;
$this->orderItemRepository = $orderItemRepository;
@@ -70,17 +69,18 @@ class InvoiceRepository extends Repository
}
/**
- * Specify Model class name
+ * Specify model class name.
*
* @return string
*/
-
- function model()
+ public function model()
{
return Invoice::class;
}
/**
+ * Create invoice.
+ *
* @param array $data
* @param string $invoiceState
* @param string $orderState
@@ -135,10 +135,10 @@ class InvoiceRepository extends Repository
'base_price' => $orderItem->base_price,
'total' => $orderItem->price * $qty,
'base_total' => $orderItem->base_price * $qty,
- 'tax_amount' => ( ($orderItem->tax_amount / $orderItem->qty_ordered) * $qty ),
- 'base_tax_amount' => ( ($orderItem->base_tax_amount / $orderItem->qty_ordered) * $qty ),
- 'discount_amount' => ( ($orderItem->discount_amount / $orderItem->qty_ordered) * $qty ),
- 'base_discount_amount' => ( ($orderItem->base_discount_amount / $orderItem->qty_ordered) * $qty ),
+ 'tax_amount' => (($orderItem->tax_amount / $orderItem->qty_ordered) * $qty),
+ 'base_tax_amount' => (($orderItem->base_tax_amount / $orderItem->qty_ordered) * $qty),
+ 'discount_amount' => (($orderItem->discount_amount / $orderItem->qty_ordered) * $qty),
+ 'base_discount_amount' => (($orderItem->base_discount_amount / $orderItem->qty_ordered) * $qty),
'product_id' => $orderItem->product_id,
'product_type' => $orderItem->product_type,
'additional' => $orderItem->additional,
@@ -147,8 +147,8 @@ class InvoiceRepository extends Repository
if ($orderItem->getTypeInstance()->isComposite()) {
foreach ($orderItem->children as $childOrderItem) {
$finalQty = $childOrderItem->qty_ordered
- ? ($childOrderItem->qty_ordered / $orderItem->qty_ordered) * $qty
- : $orderItem->qty_ordered;
+ ? ($childOrderItem->qty_ordered / $orderItem->qty_ordered) * $qty
+ : $orderItem->qty_ordered;
$this->invoiceItemRepository->create([
'invoice_id' => $invoice->id,
@@ -170,7 +170,8 @@ class InvoiceRepository extends Repository
'additional' => $childOrderItem->additional,
]);
- if ($childOrderItem->product
+ if (
+ $childOrderItem->product
&& ! $childOrderItem->getTypeInstance()->isStockable()
&& $childOrderItem->getTypeInstance()->showQuantityBox()
) {
@@ -184,7 +185,8 @@ class InvoiceRepository extends Repository
$this->orderItemRepository->collectTotals($childOrderItem);
}
- } elseif ($orderItem->product
+ } elseif (
+ $orderItem->product
&& ! $orderItem->getTypeInstance()->isStockable()
&& $orderItem->getTypeInstance()->showQuantityBox()
) {
@@ -234,8 +236,10 @@ class InvoiceRepository extends Repository
}
/**
- * @param \Webkul\Sales\Contracts\Invoice $invoice
- * @return \Webkul\Sales\Contracts\Invoice
+ * Collect totals.
+ *
+ * @param \Webkul\Sales\Models\Invoice $invoice
+ * @return \Webkul\Sales\Models\Invoice
*/
public function collectTotals($invoice)
{
diff --git a/packages/Webkul/Sales/src/Traits/PaymentTerm.php b/packages/Webkul/Sales/src/Traits/PaymentTerm.php
new file mode 100644
index 000000000..7108bef7e
--- /dev/null
+++ b/packages/Webkul/Sales/src/Traits/PaymentTerm.php
@@ -0,0 +1,51 @@
+getPaymentTerm()
+ ? true : false;
+ }
+
+ /**
+ * Get payment term from the core config in days.
+ *
+ * @return int
+ */
+ public function getPaymentTerm()
+ {
+ static $dueDuration = 0;
+
+ if ($dueDuration) {
+ return $dueDuration;
+ }
+
+ return $dueDuration = (int) core()->getConfigData('sales.invoice_setttings.payment_terms.due_duration');
+ }
+
+ /**
+ * Formatted payment terms for invoice. Handled singular and plural case also.
+ *
+ * @return string
+ */
+ public function getFormattedPaymentTerm()
+ {
+ $dueDuration = $this->getPaymentTerm();
+
+ if ($dueDuration > 1) {
+ return __('admin::app.admin.system.due-duration-days', ['due-duration' => $dueDuration]);
+ }
+
+ return $dueDuration
+ ? __('admin::app.admin.system.due-duration-day', ['due-duration' => $dueDuration])
+ : __('admin::app.admin.system.due-duration-day', ['due-duration' => 0]);
+ }
+}
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index a6824e2bb..710362596 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -330,6 +330,8 @@ return [
'invoice-id' => 'رقم الفاتورة',
'order-id' => 'ترتيب ',
'order-date' => 'تاريخ الطلب',
+ 'invoice-date' => 'تاريخ الفاتورة',
+ 'payment-terms' => 'شروط الدفع',
'bill-to' => 'الفاتورة إلى',
'ship-to' => 'يشحن إلى',
'contact' => 'معلومات الإتصال',
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index 146a152ab..d4876679f 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -330,6 +330,8 @@ return [
'invoice-id' => 'Rechnungsnummer',
'order-id' => 'Auftragsnummer',
'order-date' => 'Bestelldatum',
+ 'invoice-date' => 'Rechnungsdatum',
+ 'payment-terms' => 'Zahlungsbedingungen',
'bill-to' => 'Rechnung an',
'ship-to' => 'Versenden an',
'contact' => 'Kontakt',
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 52e4ab52b..8c8efc73b 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -331,6 +331,8 @@ return [
'invoice-id' => 'Invoice Id',
'order-id' => 'Order Id',
'order-date' => 'Order Date',
+ 'invoice-date' => 'Invoice Date',
+ 'payment-terms' => 'Payment Terms',
'bill-to' => 'Bill to',
'ship-to' => 'Ship to',
'contact' => 'Contact',
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index ca34910ab..2c985c307 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -330,6 +330,8 @@ return [
'invoice-id' => 'Factura Id',
'order-id' => 'Pedido Id',
'order-date' => 'Fecha pedido',
+ 'invoice-date' => 'Fecha de la factura',
+ 'payment-terms' => 'Términos de pago',
'bill-to' => 'Facturar a',
'ship-to' => 'Envío a',
'contact' => 'Contacto',
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 2bdef7fce..745d6d48a 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -327,6 +327,8 @@ return [
'invoice-id' => 'شناسه فاکتور',
'order-id' => 'شماره سفارش',
'order-date' => 'تاریخ سفارش',
+ 'invoice-date' => 'تاریخ فاکتور',
+ 'payment-terms' => 'شرایط پرداخت',
'bill-to' => 'بیل به',
'ship-to' => 'حمل به',
'contact' => 'تماس',
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 06738cd55..5931ff60a 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -328,6 +328,8 @@ return [
'invoice-id' => 'Fattura Nro',
'order-id' => 'Ordine Nro',
'order-date' => 'Ordine Data',
+ 'invoice-date' => 'Data fattura',
+ 'payment-terms' => 'Termini di pagamento',
'bill-to' => 'Fatturato a',
'ship-to' => 'Spedito a',
'contact' => 'Contatto',
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 003cb5aa6..5f3cf1864 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -310,6 +310,8 @@ return [
'invoice-id' => '領収書番号',
'order-id' => '注文番号',
'order-date' => '注文日',
+ 'invoice-date' => '請求書の日付',
+ 'payment-terms' => '支払い条件',
'bill-to' => '請求先',
'ship-to' => '送り先',
'contact' => '連絡先',
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index a79545f29..931c31e26 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -335,6 +335,8 @@ return [
'invoice-id' => 'Factuur-id',
'order-id' => 'Order ID',
'order-date' => 'Besteldatum',
+ 'invoice-date' => 'Factuur datum',
+ 'payment-terms' => 'Betaalvoorwaarden',
'bill-to' => 'Rekening naar',
'ship-to' => 'Verzend naar',
'contact' => 'Contact',
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 3961f5f29..ef31896a7 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -328,6 +328,8 @@ return [
'invoice-id' => 'Identyfikator faktury',
'order-id' => 'Identyfikator zamówienia',
'order-date' => 'Data zamówienia',
+ 'invoice-date' => 'Data wystawienia faktury',
+ 'payment-terms' => 'Zasady płatności',
'bill-to' => 'Bill to',
'ship-to' => 'Dostawa do',
'contact' => 'Kontakt',
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index bdf4c69ee..71d101d23 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -323,6 +323,8 @@ return [
'invoice-id' => 'Fatura Id',
'order-id' => 'Pedido Id',
'order-date' => 'Pedido Date',
+ 'invoice-date' => 'Data da fatura',
+ 'payment-terms' => 'Termos de pagamento',
'bill-to' => 'Cobrança de',
'ship-to' => 'Enviar para',
'contact' => 'Contato',
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index 1bb48b293..21609c65f 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -327,6 +327,8 @@ return [
'invoice-id' => 'Fatura No',
'order-id' => 'Sipariş No',
'order-date' => 'Sipariş Tarihi',
+ 'invoice-date' => 'Fatura tarihi',
+ 'payment-terms' => 'Ödeme şartları',
'bill-to' => 'Fatura Edilen',
'ship-to' => 'Teslim Edilen',
'contact' => 'İletişim',
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
index 3b13087b1..bd531f15b 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
@@ -163,6 +163,11 @@
#{{ $invoice->increment_id ?? $invoice->id }}
+
+ {{ __('shop::app.customer.account.order.view.invoice-date') }} -
+ {{ core()->formatDate($invoice->created_at, 'd-m-Y') }}
+
+
{{ __('shop::app.customer.account.order.view.order-id') }} -
#{{ $invoice->order->increment_id }}
@@ -173,6 +178,13 @@
{{ core()->formatDate($invoice->order->created_at, 'd-m-Y') }}
+ @if ($invoice->hasPaymentTerm())
+
+ {{ __('shop::app.customer.account.order.view.payment-terms') }} -
+ {{ $invoice->getFormattedPaymentTerm() }}
+
+ @endif
+