diff --git a/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php b/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php index 8ac1860..5d67a7c 100644 --- a/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php +++ b/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php @@ -4,6 +4,7 @@ namespace App\Modules\Invoice\Actions; use App\Modules\Excell\Excell; use App\Modules\Excell\Fonts\FONTS; +use App\Modules\Excell\Types\iRichText\RichTextWrapper; use App\Modules\Invoice\Data\InvoiceExcellData; use App\Modules\Invoice\Data\InvoiceItem; use App\Modules\Makeable; @@ -101,6 +102,16 @@ class GenerateInvoiceExcell $this->worksheet = $this->spreadsheet->getActiveSheet(); } + /** + * Return new RichTextWrapper + */ + public function richText(): RichTextWrapper + { + return Excell::richText() + ->setDefaultFont(FONTS::TIMES_NEW_ROMAN) + ->setDefaultSize(10); + } + /** * Fill the cells */ @@ -290,9 +301,7 @@ class GenerateInvoiceExcell */ public function satyjySalgytBelgi(): RichText { - return Excell::richText() - ->setDefaultFont(FONTS::TIMES_NEW_ROMAN) - ->setDefaultSize(10) + return $this->richText() ->add('Satyjynyň şahsy salgyt belgisi: ') ->add($this->data->seller_ssb, bold: true) ->toRichText(); @@ -303,9 +312,7 @@ class GenerateInvoiceExcell */ public function satyjyBanky(): RichText { - return Excell::richText() - ->setDefaultFont(FONTS::TIMES_NEW_ROMAN) - ->setDefaultSize(10) + return $this->richText() ->add(sprintf('Satyjynyň bankynyň ady %s, hasap № ', $this->data->seller_bank_name)) ->add($this->data->seller_bank_hb_1, bold: true) ->toRichText(); @@ -316,9 +323,7 @@ class GenerateInvoiceExcell */ public function satyjyBankyMaglumatlary(): RichText { - return Excell::richText() - ->setDefaultFont(FONTS::TIMES_NEW_ROMAN) - ->setDefaultSize(10) + return $this->richText() ->add('şäherde (etrapda) ') ->add($this->data->seller_bank_city, bold: true) ->add(' BAB ') diff --git a/app/Modules/Invoice/Resources/Docs/invoice.xls b/app/Modules/Invoice/Resources/Docs/invoice.xls index 793ae7e..761530b 100755 Binary files a/app/Modules/Invoice/Resources/Docs/invoice.xls and b/app/Modules/Invoice/Resources/Docs/invoice.xls differ