From b8b2ebbe46f2cc358c061f90613d73bb322c2965 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Sun, 10 Nov 2024 01:32:13 +0500
Subject: [PATCH] invoice excell import debbug

---
 .../Invoice/Actions/GenerateInvoiceExcell.php |  61 ++++++++++++++++--
 .../Invoice/Data/InvoiceExcellData.php        |  12 +++-
 public/write.xls                              | Bin 15872 -> 15872 bytes
 routes/web.php                                |  11 +++-
 4 files changed, 76 insertions(+), 8 deletions(-)

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 690c78db2d32d679a6c95b74f915dab67f89efae..389eee4d1e20500bb94ac059d7fa2faf487d94c3 100644
GIT binary patch
delta 77
zcmZpuX{gztEX;UevWl=HW9sHK;Q~fx69%)*H$`HYm^s-PCYy;b5NBXuV-RBCV2}jT
dazI)gNLw;+Y`!WksI<wdf{{^ebES1V69C)25c2>4

delta 55
zcmZpuX{gztEX=rVvWl=Hqxa@C;Q~fxBL<_*H$`HY7#Sy9h%eauL0mv-vV(=xCaVfY
LMxM=;*6mCH=k^fh

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();