diff --git a/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php b/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php index 54dc5b4..6ea2c35 100644 --- a/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php +++ b/app/Modules/Invoice/Actions/GenerateInvoiceExcell.php @@ -135,11 +135,11 @@ class GenerateInvoiceExcell 'A9' => $this->satyjy(), 'A11' => $this->satyjySalgytBelgi(), 'A12' => $this->satyjyBanky(), - 'A13' => sprintf('şäherde (etrapda) %s BAB %s bankyň kor.hasap %s', 'Aşgabat', '390101601', '21101934110100700005000'), - 'A16' => 'Satyn alyjy: Türkmenistanyň „Türkmenbaşy“ paýdarlar täjirçilik banky', - 'A18' => '744000 Aşgabat ş., Çandebil şaýoly köç., 121,', - 'A19' => sprintf('Alyjynyň bankynyň ady %s %s', 'Türkmenistanyň Merkezi Banky', 'Aşgabat ş.'), - 'A20' => sprintf('Satyn alyjynyň şahsy salgyt belgisi %s, MFO %s, Hasap № %s', '101301000408', '390101304', '21101934110100300007000'), + 'A13' => $this->satyjyBankyMaglumatlary(), + 'A16' => $this->satynAlyjy(), + 'A18' => $this->satynAlyjySalgy(), + 'A19' => $this->satynAlyjyBanky(), + 'A20' => $this->satynAlyjyBankyMaglumatlary(), ]; } @@ -204,8 +204,57 @@ class GenerateInvoiceExcell return $this->addToRichText( richText: $satyjy_banky, - text: $this->data->seller_bank_number, + text: $this->data->seller_bank_hb_1, isBold: true ); } + + /** + * Satyjy bank maglumatlary + */ + public function satyjyBankyMaglumatlary(): RichText + { + $richText = new RichText; + $city_label = $this->addToRichText($richText, 'şäherde (etrapda) '); + $city = $this->addToRichText($city_label, $this->data->seller_bank_city, isBold: true); + + $bab_label = $this->addToRichText($city, ' BAB '); + $bab = $this->addToRichText($bab_label, $this->data->seller_bank_bab, isBold: true); + + $hb_2_label = $this->addToRichText($bab, ' bankyň kor.hasap '); + + return $this->addToRichText($hb_2_label, $this->data->seller_bank_hb_2, isBold: true); + } + + /** + * Satyn alyjy + */ + public function satynAlyjy(): string + { + return 'Satyn alyjy: '.$this->data->buyer; + } + + /** + * Satyn alyjy salgy + */ + public function satynAlyjySalgy(): string + { + return $this->data->buyer_address; + } + + /** + * Satyn alyjy banky we salgysy + */ + public function satynAlyjyBanky(): string + { + return sprintf('Alyjynyň bankynyň ady %s %s', $this->data->buyer_bank, $this->data->buyer_bank_address); + } + + /** + * Satyn alyjynyň bank maglumatlary + */ + public function satynAlyjyBankyMaglumatlary(): string + { + return 'Satyn alyjynyň ' . $this->data->buyer_bank_data; + } } diff --git a/app/Modules/Invoice/Data/InvoiceExcellData.php b/app/Modules/Invoice/Data/InvoiceExcellData.php index f30dcc7..896bf43 100644 --- a/app/Modules/Invoice/Data/InvoiceExcellData.php +++ b/app/Modules/Invoice/Data/InvoiceExcellData.php @@ -9,10 +9,20 @@ class InvoiceExcellData public function __construct( public int|string $number, public Carbon $date, + public string $seller_firm_type, public string $seller_firm_name, public string $seller_ssb, public string $seller_bank_name, - public string $seller_bank_number, + public string $seller_bank_hb_1, + public string $seller_bank_hb_2, + public string $seller_bank_bab, + public string $seller_bank_city, + + public string $buyer, + public string $buyer_address, + public string $buyer_bank, + public string $buyer_bank_address, + public string $buyer_bank_data, ) {} } diff --git a/public/write.xls b/public/write.xls index 690c78d..389eee4 100644 Binary files a/public/write.xls and b/public/write.xls differ diff --git a/routes/web.php b/routes/web.php index 1559845..5dc9032 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,7 +17,16 @@ Route::get('/', function () { seller_firm_name: 'Nurmuhammet Allanov Parahatowiç', seller_ssb: '201126532321', seller_bank_name: 'Türkmenistanyň „Halkbank“ paýdarlar täjirçilik banky', - seller_bank_number: '23206934160169902250000' + seller_bank_hb_1: '23206934160169902250000', + seller_bank_hb_2: '21101934110100700005000', + seller_bank_city: 'Aşgabat', + seller_bank_bab: '390101601', + + buyer: 'Türkmenistanyň „Türkmenbaşy“ paýdarlar täjirçilik banky', + buyer_address: '744000 Aşgabat ş., Çandebil şaýoly köç., 121,', + buyer_bank: 'Türkmenistanyň Merkezi Banky', + buyer_bank_address: 'Aşgabat ş.', + buyer_bank_data: sprintf('şahsy salgyt belgisi %s, MFO %s, Hasap № %s', '101301000408', '390101304', '21101934110100300007000') )) ->handle() ->save();