From ebaf047f7b88b7aec53344aada4989bfee2fcd09 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 11:29:40 +0530 Subject: [PATCH 1/6] System Settings Added --- packages/Webkul/Sales/src/Config/system.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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', From 538dd29ddf05aa6153ff7bc920d10f98682fb9c3 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 11:30:02 +0530 Subject: [PATCH 2/6] Tranlsations Added For System Settings --- .../Admin/src/Resources/lang/ar/app.php | 10 +++-- .../Admin/src/Resources/lang/de/app.php | 10 +++-- .../Admin/src/Resources/lang/en/app.php | 10 +++-- .../Admin/src/Resources/lang/es/app.php | 10 +++-- .../Admin/src/Resources/lang/fa/app.php | 38 ++++++++++--------- .../Admin/src/Resources/lang/it/app.php | 10 +++-- .../Admin/src/Resources/lang/nl/app.php | 10 +++-- .../Admin/src/Resources/lang/pl/app.php | 10 +++-- .../Admin/src/Resources/lang/pt_BR/app.php | 10 +++-- .../Admin/src/Resources/lang/tr/app.php | 10 +++-- 10 files changed, 74 insertions(+), 54 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index e4e08a27d..5cadee584 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -1433,20 +1433,22 @@ 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' => 'مدة الاستحقاق', + '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 bb55a305c..3deaa1b36 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -1441,20 +1441,22 @@ 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', + '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 620338e2a..b61bb151a 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1450,21 +1450,23 @@ 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', + '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 8feec0af9..ffdad1d8f 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -1445,21 +1445,23 @@ 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', + '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 24a5f0676..1a2ceea06 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -1404,15 +1404,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' => 'تصویر لوگو', @@ -1425,24 +1425,26 @@ 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' => 'مدت زمان مقرر', + '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 7b5d422bc..e451fc63e 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -1433,21 +1433,23 @@ 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', + '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 34a51407a..4317accd4 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -1427,20 +1427,22 @@ 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:', + '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 5fa91d8c1..362188d8a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -1430,21 +1430,23 @@ 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', + '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 a285e759e..41e2ec4b0 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -1431,21 +1431,23 @@ 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', + '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 8c67b77ff..932e9e627 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -1417,20 +1417,22 @@ 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', + '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', From 006046975ab5b8c8e0828e593574f0b60c9c713e Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 13:14:51 +0530 Subject: [PATCH 3/6] Payment Term Functionality Completed. Extra Translations Pending. --- .../views/sales/invoices/pdf.blade.php | 9 +++- packages/Webkul/Sales/src/Models/Invoice.php | 17 ++++++- .../src/Repositories/InvoiceRepository.php | 44 ++++++++-------- .../Webkul/Sales/src/Traits/PaymentTerm.php | 51 +++++++++++++++++++ .../customers/account/orders/pdf.blade.php | 7 +++ 5 files changed, 105 insertions(+), 23 deletions(-) create mode 100644 packages/Webkul/Sales/src/Traits/PaymentTerm.php 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..bbc474696 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 @@ -166,10 +166,17 @@
- {{ __('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/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 7dd45516e..ade10acad 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/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php index 3b13087b1..2011e1b87 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 @@ -173,6 +173,13 @@ {{ core()->formatDate($invoice->order->created_at, 'd-m-Y') }} + @if ($invoice->hasPaymentTerm()) +
+ {{ __('shop::app.customer.account.order.view.payment-terms') }} - + {{ $invoice->getFormattedPaymentTerm() }} +
+ @endif +
From cbe3b84bb8e4a85e7bcdf59c77c933645f846d46 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 13:25:29 +0530 Subject: [PATCH 4/6] Admin Translations Added --- .../Admin/src/Resources/lang/ar/app.php | 2 ++ .../Admin/src/Resources/lang/de/app.php | 2 ++ .../Admin/src/Resources/lang/en/app.php | 30 ++++++++++--------- .../Admin/src/Resources/lang/es/app.php | 2 ++ .../Admin/src/Resources/lang/fa/app.php | 2 ++ .../Admin/src/Resources/lang/it/app.php | 2 ++ .../Admin/src/Resources/lang/nl/app.php | 2 ++ .../Admin/src/Resources/lang/pl/app.php | 2 ++ .../Admin/src/Resources/lang/pt_BR/app.php | 2 ++ .../Admin/src/Resources/lang/tr/app.php | 2 ++ 10 files changed, 34 insertions(+), 14 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 5cadee584..d55d1ca35 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -1443,6 +1443,8 @@ return [ 'invoice-number-generator-class' => 'مولد رقم الفاتورة', 'payment-terms' => 'شروط الدفع', 'due-duration' => 'مدة الاستحقاق', + 'due-duration-day' => ':due-duration يوم', + 'due-duration-days' => ':due-duration أيام', 'invoice-slip-design' => 'تصميم قسيمة الفاتورة', 'logo' => 'شعار', 'default' => 'إفتراضي', diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index 3deaa1b36..32a33c56d 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -1451,6 +1451,8 @@ return [ 'invoice-number-generator-class' => 'Rechnungsnummerngenerator', '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index b61bb151a..9ce59c29c 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-date' => 'Invoice Date', 'total-qty' => 'Total Qty', 'inventory-source' => 'Inventory Source', @@ -251,7 +251,7 @@ return [ 'update-status' => 'Update Status', 'subject' => 'Subject', 'date' => 'Date', - 'transaction-id' => 'Transaction Id', + 'transaction-id' => 'Transaction ID', 'transaction-date' => 'Transaction Date', ], @@ -410,11 +410,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', @@ -438,9 +438,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', @@ -465,10 +465,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', @@ -489,13 +489,13 @@ return [ 'transactions' => [ 'title' => 'Transactions', - 'id' => 'Id', - 'transaction-id' => 'Transaction Id', + 'id' => 'ID', + 'transaction-id' => 'Transaction ID', 'payment-method' => 'Payment method', 'action' => 'Action', 'view-title' => 'Transaction #:transaction_id', 'transaction-data' => 'Transaction Data', - 'order-id' => 'Order Id', + 'order-id' => 'Order ID', 'status' => 'Status', 'created-at' => 'Created At', 'transaction-details' => 'Transaction Details' @@ -947,7 +947,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', @@ -1460,6 +1460,8 @@ return [ 'invoice-number-generator-class' => 'Invoice Number Generator', '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', @@ -1502,7 +1504,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 ffdad1d8f..e21cbe5de 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -1455,6 +1455,8 @@ return [ 'invoice-number-generator-class' => 'Generador de números de facturas', '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index 1a2ceea06..ac1c3e0f3 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -1435,6 +1435,8 @@ return [ 'invoice-number-generator-class' => 'تولید کننده شماره فاکتور', 'payment-terms' => 'شرایط پرداخت', 'due-duration' => 'مدت زمان مقرر', + 'due-duration-day' => ':due-duration روز', + 'due-duration-days' => ':due-duration روزها', 'invoice-slip-design' => 'طرح لغزش فاکتور', 'logo' => 'لوگو', 'default' => 'پیش فرض', diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index e451fc63e..9f7254419 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -1443,6 +1443,8 @@ return [ 'invoice-number-generator-class' => 'Generatore di numeri di fattura', '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index 4317accd4..7ae1f2ea5 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -1437,6 +1437,8 @@ return [ 'invoice-number-generator-class' => 'Factuurnummergenerator', '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 362188d8a..0ea8fe979 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -1440,6 +1440,8 @@ return [ 'invoice-number-generator-class' => 'Generator numerów faktur', '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', 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 41e2ec4b0..bc0599a85 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -1441,6 +1441,8 @@ return [ 'invoice-number-generator-class' => 'Gerador de número de fatura', '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', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 932e9e627..50397f57b 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -1427,6 +1427,8 @@ return [ 'invoice-number-generator-class' => 'Fatura Numarası Oluşturucu', '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', From 01c198b919c1c62ad15d38b5f172350e50dabf4a Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 13:31:42 +0530 Subject: [PATCH 5/6] Shop Translations Added --- packages/Webkul/Shop/src/Resources/lang/ar/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/de/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/en/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/es/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/fa/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/it/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/ja/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/nl/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/pl/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/tr/app.php | 1 + 11 files changed, 11 insertions(+) diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index a6824e2bb..efa714307 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -330,6 +330,7 @@ return [ 'invoice-id' => 'رقم الفاتورة', 'order-id' => 'ترتيب ', 'order-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..b339b192e 100755 --- a/packages/Webkul/Shop/src/Resources/lang/de/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php @@ -330,6 +330,7 @@ return [ 'invoice-id' => 'Rechnungsnummer', 'order-id' => 'Auftragsnummer', 'order-date' => 'Bestelldatum', + '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..dc41c0693 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -331,6 +331,7 @@ return [ 'invoice-id' => 'Invoice Id', 'order-id' => 'Order Id', 'order-date' => 'Order 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..f21771407 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -330,6 +330,7 @@ return [ 'invoice-id' => 'Factura Id', 'order-id' => 'Pedido Id', 'order-date' => 'Fecha pedido', + '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..2508dfcc1 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -327,6 +327,7 @@ return [ 'invoice-id' => 'شناسه فاکتور', 'order-id' => 'شماره سفارش', 'order-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..9072e772d 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -328,6 +328,7 @@ return [ 'invoice-id' => 'Fattura Nro', 'order-id' => 'Ordine Nro', 'order-date' => 'Ordine Data', + '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..beea044f4 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php @@ -310,6 +310,7 @@ return [ 'invoice-id' => '領収書番号', 'order-id' => '注文番号', 'order-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..b859914ea 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -335,6 +335,7 @@ return [ 'invoice-id' => 'Factuur-id', 'order-id' => 'Order ID', 'order-date' => 'Besteldatum', + '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..1b0db197a 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -328,6 +328,7 @@ return [ 'invoice-id' => 'Identyfikator faktury', 'order-id' => 'Identyfikator zamówienia', 'order-date' => 'Data zamówienia', + '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..875ecc3db 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,7 @@ return [ 'invoice-id' => 'Fatura Id', 'order-id' => 'Pedido Id', 'order-date' => 'Pedido Date', + '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..873ff9b04 100644 --- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php @@ -327,6 +327,7 @@ return [ 'invoice-id' => 'Fatura No', 'order-id' => 'Sipariş No', 'order-date' => 'Sipariş Tarihi', + 'payment-terms' => 'Ödeme şartları', 'bill-to' => 'Fatura Edilen', 'ship-to' => 'Teslim Edilen', 'contact' => 'İletişim', From 0958d9bdb7bd1edc63f4da9e37523d1e0b09cff0 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 24 Jun 2021 11:33:32 +0530 Subject: [PATCH 6/6] Invoice Date Added #4960 --- .../Admin/src/Resources/views/sales/invoices/pdf.blade.php | 5 +++++ packages/Webkul/Shop/src/Resources/lang/ar/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/de/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/en/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/es/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/fa/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/it/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/ja/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/nl/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/pl/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/tr/app.php | 1 + .../Resources/views/customers/account/orders/pdf.blade.php | 5 +++++ 13 files changed, 21 insertions(+) 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 bbc474696..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,6 +160,11 @@ #{{ $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 }} diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index efa714307..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,7 @@ return [ 'invoice-id' => 'رقم الفاتورة', 'order-id' => 'ترتيب ', 'order-date' => 'تاريخ الطلب', + 'invoice-date' => 'تاريخ الفاتورة', 'payment-terms' => 'شروط الدفع', 'bill-to' => 'الفاتورة إلى', 'ship-to' => 'يشحن إلى', diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php index b339b192e..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,7 @@ return [ 'invoice-id' => 'Rechnungsnummer', 'order-id' => 'Auftragsnummer', 'order-date' => 'Bestelldatum', + 'invoice-date' => 'Rechnungsdatum', 'payment-terms' => 'Zahlungsbedingungen', 'bill-to' => 'Rechnung an', 'ship-to' => 'Versenden an', diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index dc41c0693..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,7 @@ 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', diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index f21771407..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,7 @@ 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', diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index 2508dfcc1..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,7 @@ return [ 'invoice-id' => 'شناسه فاکتور', 'order-id' => 'شماره سفارش', 'order-date' => 'تاریخ سفارش', + 'invoice-date' => 'تاریخ فاکتور', 'payment-terms' => 'شرایط پرداخت', 'bill-to' => 'بیل به', 'ship-to' => 'حمل به', diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php index 9072e772d..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,7 @@ 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', diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php index beea044f4..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,7 @@ return [ 'invoice-id' => '領収書番号', 'order-id' => '注文番号', 'order-date' => '注文日', + 'invoice-date' => '請求書の日付', 'payment-terms' => '支払い条件', 'bill-to' => '請求先', 'ship-to' => '送り先', diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index b859914ea..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,7 @@ 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', diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php index 1b0db197a..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,7 @@ 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', 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 875ecc3db..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,7 @@ 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', diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php index 873ff9b04..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,7 @@ 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', 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 2011e1b87..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 }}