sosuke.iwabuchi
/
SATE-EasyReceipt
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

PDFレイアウト修正 

SATE_RECEIPT-35 領収証レイアウト修正依頼
develop
sosuke.iwabuchi 2 years ago
parent
2f315440a2
commit
1e624a01d3
4 changed files with 26 additions and 223 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php
  2. +9
    -12
      resources/views/pdf/receipt_a4.blade.php
  3. +0
    -185
      resources/views/pdf/receipt_letter.blade.php
  4. +15
    -24
      resources/views/pdf/receipt_letters.blade.php

+ 2
- 2
app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php View File

@@ -93,8 +93,8 @@ class PDFDownLoadManager extends ReceiptIssuingOrderManager
$tax = $order->receiptIssuingOrderTaxes->first() ?? new ReceiptIssuingOrderTax(); $tax = $order->receiptIssuingOrderTaxes->first() ?? new ReceiptIssuingOrderTax();
return [ return [
...$order->toArray(), ...$order->toArray(),
ReceiptIssuingOrder::COL_NAME_STATUS_RECEIPT_CONFIRM_DATETIME => $order->status_receipt_confirm_datetime->format('Y/m/d'),
ReceiptIssuingOrder::COL_NAME_RECEIPT_USE_DATE => $order->receipt_use_date->format('Y/m/d'),
ReceiptIssuingOrder::COL_NAME_STATUS_RECEIPT_CONFIRM_DATETIME => $order->status_receipt_confirm_datetime->format('Y年m月d日'),
ReceiptIssuingOrder::COL_NAME_RECEIPT_USE_DATE => $order->receipt_use_date->format('Y年m月d日'),
ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($order->receipt_amount), ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($order->receipt_amount),
'pref_name' => PrefCode::getName($order->mail_pref_code), 'pref_name' => PrefCode::getName($order->mail_pref_code),
ReceiptIssuingOrderTax::COL_NAME_TAX_RATE => data_get($tax, ReceiptIssuingOrderTax::COL_NAME_TAX_RATE, 0) ?? 0, ReceiptIssuingOrderTax::COL_NAME_TAX_RATE => data_get($tax, ReceiptIssuingOrderTax::COL_NAME_TAX_RATE, 0) ?? 0,


+ 9
- 12
resources/views/pdf/receipt_a4.blade.php View File

@@ -17,7 +17,7 @@


<section class="header"> <section class="header">
<p>発行日 {{ $status_receipt_confirm_datetime }}</p> <p>発行日 {{ $status_receipt_confirm_datetime }}</p>
<p>領収証番号 {{ $receipt_no }}</p>
<p>発行№ {{ $receipt_no }}</p>
</section> </section>
<section class="title b"> <section class="title b">
<P>領収証</P> <P>領収証</P>
@@ -31,25 +31,22 @@
￥{{ $receipt_amount }} - ￥{{ $receipt_amount }} -
</div> </div>
<div class="item tax"> <div class="item tax">
(内税 10%対象)
(消費税率 10%内税)
</div> </div>
</div> </div>
</section> </section>
<section class="amount_sub">
内消費税 ￥{{ $tax_amount }} -
</section>
<section class="description">
<P>但し {{ $receipt_purpose }}として</P>
<P>上記正に領収いたしました。</P>
<section class="description pt5">
<P>但し、{{ $receipt_purpose }}として上記正に領収いたしました。</P>
<P>利用日 : {{ $receipt_use_date }}</P> <P>利用日 : {{ $receipt_use_date }}</P>
<P>駐車場名 : {{ $parking_name }}</P> <P>駐車場名 : {{ $parking_name }}</P>
</section> </section>
@if($receipt_invoice_no)
<section class="issuer"> <section class="issuer">
<P>発行者 {{ $customer_name }}</P>
<P>インボイス登録番号 {{ $receipt_invoice_no }}</P>
<P>発行事業者及び登録番号</P>
<P>{{ $customer_name }}</P>
<P>{{ $receipt_invoice_no }}</P>
</section> </section>
@endif
</div> </div>
</body> </body>



+ 0
- 185
resources/views/pdf/receipt_letter.blade.php View File

@@ -1,185 +0,0 @@
<!DOCTYPE html>
<html lang="ja">

<head>
<meta charset="utf-8">
<title>領収証</title>
<style>

</style>
<link rel="stylesheet" href="{{ resource_path('css/receipt_common.css') }}">
<link rel="stylesheet" href="{{ resource_path('css/receipt_letter.css') }}">
</head>

<body>
<section class="page">
<div class="section-address">
<div class="address-field">

<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>
</div>
<hr />
<div class="section-receipt">
<div class="container header">
<div class="item " style="width:13mm">
<h2></h2>
</div>
<div class="item tc" style="width:40mm">
<h2>領収証</h2>
</div>
<div class="item" style="width:40mm">
<div style="font-size: 3.5mm;">
<div>発行日 {{ $status_receipt_confirm_datetime }}</div>
<div>No {{ $receipt_no }}</div>
</div>
</div>
</div>
<div class="name tc pt10 underline">{{ $receipt_name }}　様</div>
<div class="pt5 f35">利用日 {{ $receipt_use_date }}</div>
<div class="container mt5">

<div class="pt1 tc f5 b underline item ml10">
￥{{ $receipt_amount }} -&nbsp;
</div>
<div class="item ml3 f3"> 内消費税 ￥{{ $tax_amount }}- (10%対象)</div>
</div>
</div>
<div class="pt3 f35 ">
但し、{{ $parking_name }}
</div>
<div class="f35 ">
{{ $receipt_purpose }}として
</div>
<div class="pt1 f35 ">上記正に領収いたしました。</div>
<div class="pt2 f35 ">運営会社 {{ $customer_name }}</div>
<div class="pt1 f35 ">インボイス登録番号 {{ $receipt_invoice_no }}</div>
<div class="pt3 f35 ">発行元及び返送先</div>
<div class="pt1 container f35">
<div class="item vt">〒550-0014</div>
<div class="item">
<div>
大阪府大阪市西区北堀江2-2-25
</div>
<div>
久慈ビル南館5階
</div>
<div class="pt3 f5 b">ハローテクノ株式会社</div>
<div class="container">

<div class="item f3" style="padding-right: 10mm;">TEL:06-7638-6575</div>
<div class="item f3">FAX:06-6536-5600</div>
</div>
</div>
</div>
</section>




<section class="page">
<div class="section-address">
<div class="address-field">

<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>
</div>
<hr />
<div class="section-receipt">
<div class="container header">
<div class="item " style="width:13mm">
<h2></h2>
</div>
<div class="item tc" style="width:40mm">
<h2>領収証</h2>
</div>
<div class="item" style="width:40mm">
<div style="font-size: 3.5mm;">
<div>発行日 {{ $status_receipt_confirm_datetime }}</div>
<div>No {{ $receipt_no }}</div>
</div>
</div>
</div>
<div class="name tc pt10 underline">{{ $receipt_name }}　様</div>
<div class="pt5 f35">利用日 {{ $receipt_use_date }}</div>
<div class="container mt5">

<div class="pt1 tc f5 b underline item ml10">
￥{{ $receipt_amount }} -&nbsp;
</div>
<div class="item ml3 f3"> 内消費税 ￥{{ $tax_amount }}- (10%対象)</div>
</div>
</div>
<div class="pt3 f35 ">
但し、{{ $parking_name }}
</div>
<div class="f35 ">
{{ $receipt_purpose }}として
</div>
<div class="pt1 f35 ">上記正に領収いたしました。</div>
<div class="pt2 f35 ">運営会社 {{ $customer_name }}</div>
<div class="pt1 f35 ">インボイス登録番号 {{ $receipt_invoice_no }}</div>
<div class="pt3 f35 ">発行元及び返送先</div>
<div class="pt1 container f35">
<div class="item vt">〒550-0014</div>
<div class="item">
<div>
大阪府大阪市西区北堀江2-2-25
</div>
<div>
久慈ビル南館5階
</div>
<div class="pt3 f5 b">ハローテクノ株式会社</div>
<div class="container">

<div class="item f3" style="padding-right: 10mm;">TEL:06-7638-6575</div>
<div class="item f3">FAX:06-6536-5600</div>
</div>
</div>
</div>
</section>
</body>

</html>

+ 15
- 24
resources/views/pdf/receipt_letters.blade.php View File

@@ -65,36 +65,27 @@
<div class="pt1 tc f5 b underline item ml10"> <div class="pt1 tc f5 b underline item ml10">
￥{{ $order['receipt_amount'] }} -&nbsp; ￥{{ $order['receipt_amount'] }} -&nbsp;
</div> </div>
<div class="item ml3 f3"> 内消費税 ￥{{ $order['tax_amount'] }}- (10%対象)</div>
<div class="item ml3 f3">(消費税率10%内税)</div>
</div> </div>
</div> </div>
<div class="pt3 f35 "> <div class="pt3 f35 ">
但し、{{ $order['parking_name'] }}
但し、{{ $order['receipt_purpose'] }}として上記正に領収いたしました。
</div> </div>
<div class="f35 ">
{{ $order['receipt_purpose'] }}として
<div class="f35 pt5">
駐車場名
</div> </div>
<div class="pt1 f35 ">上記正に領収いたしました。</div>
<div class="pt2 f35 ">運営会社 {{ $order['customer_name'] }}</div>
<div class="pt1 f35 ">インボイス登録番号 {{ $order['receipt_invoice_no'] }}</div>
<div class="pt3 f35 ">発行元及び返送先</div>
<div class="pt1 container f35">
<div class="item vt">〒550-0014</div>
<div class="item">
<div>
大阪府大阪市西区北堀江2-2-25
</div>
<div>
久慈ビル南館5階
</div>
<div class="pt3 f5 b">ハローテクノ株式会社</div>
<div class="container">

<div class="item f3" style="padding-right: 10mm;">TEL:06-7638-6575</div>
<div class="item f3">FAX:06-6536-5600</div>
</div>
</div>
<div class="f35 ml10">
{{ $order['parking_name'] }}
</div>
<div class="f35 pt5">
発行事業者及び登録番号
</div> </div>
<div class="pt1 f35 ml10">{{ $order['customer_name'] ?? "-" }}</div>
<div class="pt1 f35 ml10">{{ $order['receipt_invoice_no'] ?? "-" }}</div>
<div class="f35 ">&nbsp;</div>
<div class="pt3 f35 ">発送元&nbsp;&nbsp;&nbsp;〒550-0014</div>
<div class="pt3 f35 ml10">大阪府大阪市西区北堀江2-2-25久我ビル南館5階</div>
<div class="pt3 f35 ml10">ハロー・テクノ株式会社&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TEL：0120-559-115</div>
</section> </section>
@endforeach @endforeach




Write Preview
Loading…
Cancel
Save