Compare commits
No commits in common. "e5e8ef5a75bfcb8d87ce620766751d6b1391c1ba" and "9534d68b24354619f2a3274b1a74262d66d9b442" have entirely different histories.
e5e8ef5a75
...
9534d68b24
4
.env
4
.env
@ -97,7 +97,3 @@ GOOGLE_CLOUD_PROJECT_ID=midyear-acre-471109-e5
|
|||||||
# Google Maps API Configuration (距離計算用)
|
# Google Maps API Configuration (距離計算用)
|
||||||
GOOGLE_MAPS_API_KEY=AIzaSyBz0aqzyBXfZwwmXc4EpJDHqcfnmSv3_2g
|
GOOGLE_MAPS_API_KEY=AIzaSyBz0aqzyBXfZwwmXc4EpJDHqcfnmSv3_2g
|
||||||
|
|
||||||
# -----------------------------------------------
|
|
||||||
# 社員側参照用
|
|
||||||
KRGM_STORAGE_PATH=/var/www/krgm/current/storage/app/public
|
|
||||||
|
|
||||||
|
|||||||
@ -179,14 +179,6 @@ class ReceiptController extends Controller
|
|||||||
->where('management_id', $management_id)
|
->where('management_id', $management_id)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$krgmStoragePath = config('app.krgm_storage_path');
|
|
||||||
$linkPath = public_path('other-storage');
|
|
||||||
dd($linkPath);
|
|
||||||
if (!file_exists($linkPath)) {
|
|
||||||
symlink($krgmStoragePath, $linkPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ダウンロード回数をカウントアップ
|
// ダウンロード回数をカウントアップ
|
||||||
DB::table('inv_publish')
|
DB::table('inv_publish')
|
||||||
->where('contract_id', $contract_id)
|
->where('contract_id', $contract_id)
|
||||||
|
|||||||
@ -123,6 +123,4 @@ return [
|
|||||||
'store' => env('APP_MAINTENANCE_STORE', 'database'),
|
'store' => env('APP_MAINTENANCE_STORE', 'database'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'krgm_storage_path' => env('KRGM_STORAGE_PATH'),
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@ -134,19 +134,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
@php
|
@php
|
||||||
// $stamp_file = null;
|
|
||||||
// $extensions = ['png', 'jpeg', 'jpg'];
|
|
||||||
// foreach ($extensions as $ext) {
|
|
||||||
// $file_path = public_path('images/' . $inv_setting->t_name . '_stamp.' . $ext);
|
|
||||||
// if (file_exists($file_path)) {
|
|
||||||
// $stamp_file = $inv_setting->t_name . '_stamp.' . $ext;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
$stamp_file = null;
|
$stamp_file = null;
|
||||||
if (!empty($inv_setting->company_image_path)) {
|
$extensions = ['png', 'jpeg', 'jpg'];
|
||||||
// company_image_path: storage/app/public/xxx.png → other-storage/xxx.png
|
foreach ($extensions as $ext) {
|
||||||
$stamp_file = str_replace('storage/app/public/', 'other-storage/', $inv_setting->company_image_path);
|
$file_path = public_path('images/' . $inv_setting->t_name . '_stamp.' . $ext);
|
||||||
|
if (file_exists($file_path)) {
|
||||||
|
$stamp_file = $inv_setting->t_name . '_stamp.' . $ext;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
@endphp
|
@endphp
|
||||||
@if($stamp_file)
|
@if($stamp_file)
|
||||||
<td><img src="{{ str_replace('\\', '/', public_path('images/' . $stamp_file)) }}" class="stamp"></td>
|
<td><img src="{{ str_replace('\\', '/', public_path('images/' . $stamp_file)) }}" class="stamp"></td>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user