coding style..

akaunting · Sep 7, 2021 · 2a7bc48 · 2a7bc48
1 parent 0bc9fa8
commit 2a7bc48
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 179 deletions.
diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
@@ -297,11 +297,13 @@ public function pdfInvoice(Document $invoice)
 
         $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
 
-        $file_name = $this->getDocumentFileName($invoice);
-
         $pdf = app('dompdf.wrapper');
         $pdf->loadHTML($html);
 
+        //$pdf->setPaper('A4', 'portrait');
+
+        $file_name = $this->getDocumentFileName($invoice);
+
         return $pdf->download($file_name);
     }
 

diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
@@ -310,47 +310,3 @@
         </div>
     @endif
 @endif
-
-
-<?php $currency_style  = false; ?>
-
-@if (app()->getLocale() == "zh-CN" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "ja-JP" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "zh-TW" )
-<?php $currency_style  = true; ?>
-@endif
-
-
-@if ($currency_style)
-    @push('stylesheet')
-    <style type="text/css">
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'normal';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'bold';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'italic';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        body {
-            font-family: 'Firefly Sung', sans-serif !important;
-        }
-    </style>
-    @endpush
-@endif
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
@@ -293,48 +293,3 @@
         </div>
     @endif
 @endif
-
-
-<?php $currency_style  = false; ?>
-
-@if (app()->getLocale() == "zh-CN" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "ja-JP" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "zh-TW" )
-<?php $currency_style  = true; ?>
-@endif
-
-
-@if ($currency_style)
-    @push('stylesheet')
-    <style type="text/css">
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'normal';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'bold';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'italic';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        body {
-            font-family: 'Firefly Sung', sans-serif !important;
-        }
-    </style>
-    @endpush
-@endif
-
diff --git a/resources/views/components/documents/template/line-item.blade.php b/resources/views/components/documents/template/line-item.blade.php
@@ -48,47 +48,3 @@
         @endif
     @stack('total_td_end')
 </tr>
-
-
-<?php $currency_style  = false; ?>
-
-@if (app()->getLocale() == "zh-CN" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "ja-JP" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "zh-TW" )
-<?php $currency_style  = true; ?>
-@endif
-
-
-@if ($currency_style)
-    @push('stylesheet')
-    <style type="text/css">
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'normal';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'bold';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'italic';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        body {
-            font-family: 'Firefly Sung', sans-serif !important;
-        }
-    </style>
-    @endpush
-@endif
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
@@ -276,46 +276,3 @@
         </div>
     @endif
 @endif
-
-<?php $currency_style  = false; ?>
-
-@if (app()->getLocale() == "zh-CN" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "ja-JP" )
-<?php $currency_style  = true; ?>
-@endif
-
-@if (app()->getLocale() == "zh-TW" )
-<?php $currency_style  = true; ?>
-@endif
-
-
-@if ($currency_style)
-    @push('stylesheet')
-    <style type="text/css">
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'normal';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'bold';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        @font-face {
-            font-family: 'Firefly Sung';
-            font-weight: 'italic';
-            src: url("/public/css/fonts/firefly_sung_normal.ttf") format("truetype");
-        }
-
-        body {
-            font-family: 'Firefly Sung', sans-serif !important;
-        }
-    </style>
-    @endpush
-@endif
diff --git a/resources/views/partials/print/head.blade.php b/resources/views/partials/print/head.blade.php
@@ -16,11 +16,25 @@
     <!-- Css -->
     <link rel="stylesheet" href="{{ asset('public/css/print.css?v=' . version('short')) }}" type="text/css">
 
+    @if (isset($currency_style) && $currency_style && in_array(app()->getLocale(), ['zh-CN', 'ja-JP', 'zh-TW']))
+    <style type="text/css">
+        @font-face {
+            font-family: 'Firefly Sung';
+            font-weight: 'normal';
+            src: url('{{ asset("/public/css/fonts/firefly_sung_normal.ttf") }}') format("truetype");
+        }
+
+        * {
+            font-family: 'Firefly Sung', sans-serif !important;
+        }
+    </style>
+    @else
     <style type="text/css">
         * {
-            font-family: DejaVu Sans, sans-serif;
+            font-family: DejaVu Sans, sans-serif !important;
         }
     </style>
+    @endif
 
     @stack('css')