From b883cff8a0276e1bfcb2c6d7a4dfcf686e505861 Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Fri, 23 Jun 2023 11:21:18 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=AF=E3=81=8C=E3=81=8D=E9=A0=98=E5=8F=8E?=
 =?UTF-8?q?=E8=A8=BC=E3=81=AE=E5=AE=9B=E5=90=8D=E9=83=A8=E5=88=86=E5=AE=9F?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Codes/PrefCode.php                        |  6 ++++++
 .../PDFDownLoadManager.php                    |  4 +++-
 app/Models/ReceiptIssuingOrder.php            |  2 ++
 resources/css/receipt_letter.css              |  9 +++++++-
 resources/views/pdf/receipt_letter.blade.php  | 21 ++++++++++++++++---
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/Codes/PrefCode.php b/app/Codes/PrefCode.php
index 3b9e94c..caba7c5 100644
--- a/app/Codes/PrefCode.php
+++ b/app/Codes/PrefCode.php
@@ -120,4 +120,10 @@ enum  PrefCode: string
         }
         return $ret;
     }
+
+    static public function getName(PrefCode $code)
+    {
+        $dic = self::getDictionary();
+        return data_get($dic, $code->value, "");
+    }
 }
diff --git a/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php b/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php
index 28bbc29..bf4b8ad 100644
--- a/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php
+++ b/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Logic\ReceiptIssuingOrder;
 
+use App\Codes\PrefCode;
 use App\Events\ReceiptIssuingOrder\DownloadedEvent;
 use App\Exceptions\AppCommonException;
 use App\Models\ReceiptIssuingOrder;
@@ -62,7 +63,8 @@ class PDFDownLoadManager extends ReceiptIssuingOrderManager
             ...$this->order->toArray(),
             ReceiptIssuingOrder::COL_NAME_STATUS_RECEIPT_CONFIRM_DATETIME => $o->status_receipt_confirm_datetime->format('Y/m/d'),
             ReceiptIssuingOrder::COL_NAME_RECEIPT_USE_DATE => $o->receipt_use_date->format('Y/m/d'),
-            ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($o->receipt_amount)
+            ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($o->receipt_amount),
+            'pref_name' => PrefCode::getName($o->mail_pref_code),
         ];
     }
 }
diff --git a/app/Models/ReceiptIssuingOrder.php b/app/Models/ReceiptIssuingOrder.php
index af60654..32c4dee 100644
--- a/app/Models/ReceiptIssuingOrder.php
+++ b/app/Models/ReceiptIssuingOrder.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Codes\PrefCode;
 use App\Models\Feature\ContractFeature;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
@@ -59,6 +60,7 @@ class ReceiptIssuingOrder extends AppModel
         self::COL_NAME_STATUS_RECEIPT_DOWNLOAD_DATETIME => 'datetime',
         self::COL_NAME_STATUS_RECEIPT_EMAIL_SEND_DATETIME => 'datetime',
         self::COL_NAME_RECEIPT_USE_DATE => 'date',
+        self::COL_NAME_MAIL_PREF_CODE => PrefCode::class,
     ];
 
 
diff --git a/resources/css/receipt_letter.css b/resources/css/receipt_letter.css
index da21dde..7b60703 100644
--- a/resources/css/receipt_letter.css
+++ b/resources/css/receipt_letter.css
@@ -8,7 +8,14 @@ section.address {
 #address {
     position: absolute;
     top: 10mm;
-    left:40mm;
+    left:30mm;
+    font-size: 4mm;
+}
+
+#address div.name{
+    padding-top: 2mm;
+    padding-left: 3mm;
+    font-size: 4.5mm;
 }
 
 
diff --git a/resources/views/pdf/receipt_letter.blade.php b/resources/views/pdf/receipt_letter.blade.php
index 86a0271..62a3cef 100644
--- a/resources/views/pdf/receipt_letter.blade.php
+++ b/resources/views/pdf/receipt_letter.blade.php
@@ -15,12 +15,27 @@
     <section class="address">
         <div id="address">
 
-            <div class="zipcode">〒242-0005</div>
+            <div class="zipcode">〒{{ sprintf("%s-%s", substr($mail_zip_code, 0, 3), substr($mail_zip_code, 3) ) }}</div>
             <div class="address">
-                神奈川県
+                {{ $pref_name }}
             </div>
+            @if($mail_address1)
+            <div class="address">
+                {{ $mail_address1 }}
+            </div>
+            @endif
+            @if($mail_address2)
+            <div class="address">
+                {{ $mail_address2 }}
+            </div>
+            @endif
+            @if($mail_address3)
+            <div class="address">
+                {{ $mail_address3 }}
+            </div>
+            @endif
             <div class="name">
-                岩渕様
+                {{ $mail_name }} 様
             </div>
         </div>
     </section>