cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.8-jenkins-vapor' into vapor/staging

Browse Source
This commit is contained in:
Dillon Ngo
2024-11-05 03:23:28 +08:00
parent 216a9b60a1 6bb478b2e1
commit d76acf15c5
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/logging.php
+4 -4
View File
@@ -145,7 +145,7 @@ return [
'secret' => env('AWS_CW_SECRET')
]
],
'retention' => 31,
'retention' => env('APP_ENV') === 'production' ? 90 : 14,
'level' => 'debug',
'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
],
@@ -163,7 +163,7 @@ return [
'secret' => env('AWS_CW_SECRET')
]
],
'retention' => 31,
'retention' => env('APP_ENV') === 'production' ? 90 : 14,
'level' => 'debug',
'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
],
@@ -181,7 +181,7 @@ return [
'secret' => env('AWS_CW_SECRET')
]
],
'retention' => 31,
'retention' => env('APP_ENV') === 'production' ? 90 : 14,
'level' => 'debug',
'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
],
@@ -199,7 +199,7 @@ return [
'secret' => env('AWS_CW_SECRET')
]
],
'retention' => 31,
'retention' => env('APP_ENV') === 'production' ? 90 : 14,
'level' => 'debug',
'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'),
],
resources/assets/vue/components/bookings/forms/EditPaymentRecipientBankDetailsComponent.vue
+2 -2
View File
@@ -76,8 +76,8 @@
<!-- Default Recipient Bank from Booking -->
<div class="row align-items-center" v-else>
<div class="col-auto p-r-0">
<img v-if="item.service.id === 4" src="/images/1688_logo.png" alt="" width="40">
<img v-else-if="item.service.id === 11" src="/images/alipay_logo.png" alt="" width="40">
<img v-if="item.service.id === 4" :src="asset('images/1688_logo.png')" alt="" width="40">
<img v-else-if="item.service.id === 11" :src="asset('images/alipay_logo.png')" alt="" width="40">
<div v-else class="padding-5 bg-master-light">
<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
width="30" height="30"
resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+1 -1
View File
@@ -100,7 +100,7 @@
<file-input-component :validator="$v.files" v-model="files">
<template slot="label">
<div class="font-heading fs-11 text-primary all-caps">Import PURCHASE ORDER CSV</div>
<div class="font-heading fs-9 all-caps muted text-underline"><a href="/template/import-po-template.xlsx" class="muted" download>Click here to download the template</a></div>
<div class="font-heading fs-9 all-caps muted text-underline"><a :href="asset('template/import-po-template.xlsx')" class="muted" download>Click here to download the template</a></div>
</template>
</file-input-component>
</div>
resources/views/vendor/head.blade.php
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/favicon/apple-touch-icon.png') }}">
<link rel="icon" type="image/png" sizes="32x32" href="{{ asset('images/favicon/favicon-32x32.png') }}">
<link rel="icon" type="image/png" sizes="16x16" href="{{ asset('images/favicon/favicon-16x16.png') }}">
<link rel="manifest" href="{{ asset('images/favicon/site.webmanifest') }}">
<link rel="manifest" href="/site.webmanifest">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<meta name="csrf-token" content="{{ csrf_token() }}">
routes/web.php
+10
View File
@@ -1246,3 +1246,13 @@ Route::get('/downloads', function () {
return view('pages.downloads.index');
})->name('admin.download');
Route::get('/site.webmanifest', function () {
$filePath = resource_path('assets/images/favicon/site.webmanifest');
if (!File::exists($filePath)) {
abort(404);
}
$contents = File::get($filePath);
return response($contents, 200)->header('Content-Type', 'application/manifest+json');
});