merge
This commit is contained in:
@@ -11,6 +11,7 @@
|
|||||||
"duitkupg/duitku-php": "dev-master",
|
"duitkupg/duitku-php": "dev-master",
|
||||||
"fruitcake/laravel-cors": "^3.0",
|
"fruitcake/laravel-cors": "^3.0",
|
||||||
"guzzlehttp/guzzle": "^7.2",
|
"guzzlehttp/guzzle": "^7.2",
|
||||||
|
"h4cc/wkhtmltoimage-amd64": "^0.12.4",
|
||||||
"h4cc/wkhtmltopdf-amd64": "0.12.x",
|
"h4cc/wkhtmltopdf-amd64": "0.12.x",
|
||||||
"laravel/framework": "^9.11",
|
"laravel/framework": "^9.11",
|
||||||
"laravel/sanctum": "^2.15",
|
"laravel/sanctum": "^2.15",
|
||||||
|
|||||||
46
composer.lock
generated
46
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "f81882bbe6fbd0202d58351a9dbf3340",
|
"content-hash": "a52c765d668149ac5dfb14e59c38bd82",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-snappy",
|
"name": "barryvdh/laravel-snappy",
|
||||||
@@ -1396,6 +1396,50 @@
|
|||||||
],
|
],
|
||||||
"time": "2021-10-07T12:57:01+00:00"
|
"time": "2021-10-07T12:57:01+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "h4cc/wkhtmltoimage-amd64",
|
||||||
|
"version": "0.12.4",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/h4cc/wkhtmltoimage-amd64.git",
|
||||||
|
"reference": "c4e33f635207af89a704205b8902fb5715ca88be"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/h4cc/wkhtmltoimage-amd64/zipball/c4e33f635207af89a704205b8902fb5715ca88be",
|
||||||
|
"reference": "c4e33f635207af89a704205b8902fb5715ca88be",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"bin": [
|
||||||
|
"bin/wkhtmltoimage-amd64"
|
||||||
|
],
|
||||||
|
"type": "library",
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"LGPL Version 3"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Julius Beckmann",
|
||||||
|
"email": "github@h4cc.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Convert html to image using webkit (qtwebkit). Static linked linux binary for amd64 systems.",
|
||||||
|
"homepage": "http://wkhtmltopdf.org/",
|
||||||
|
"keywords": [
|
||||||
|
"binary",
|
||||||
|
"convert",
|
||||||
|
"image",
|
||||||
|
"snapshot",
|
||||||
|
"thumbnail",
|
||||||
|
"wkhtmltoimage"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/h4cc/wkhtmltoimage-amd64/issues",
|
||||||
|
"source": "https://github.com/h4cc/wkhtmltoimage-amd64/tree/master"
|
||||||
|
},
|
||||||
|
"time": "2018-01-15T07:23:40+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "h4cc/wkhtmltopdf-amd64",
|
"name": "h4cc/wkhtmltopdf-amd64",
|
||||||
"version": "0.12.4",
|
"version": "0.12.4",
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ return [
|
|||||||
|
|
||||||
'pdf' => [
|
'pdf' => [
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
'binary' => env('WKHTML_PDF_BINARY', '/usr/local/bin/wkhtmltopdf'),
|
'binary' => env('WKHTML_PDF_BINARY', base_path('vendor/h4cc/wkhtmltopdf-amd64/bin/wkhtmltopdf-amd64')),
|
||||||
'timeout' => false,
|
'timeout' => false,
|
||||||
'options' => [],
|
'options' => [],
|
||||||
'env' => [],
|
'env' => [],
|
||||||
@@ -43,7 +43,7 @@ return [
|
|||||||
|
|
||||||
'image' => [
|
'image' => [
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
'binary' => env('WKHTML_IMG_BINARY', '/usr/local/bin/wkhtmltoimage'),
|
'binary' => env('WKHTML_IMG_BINARY', base_path('vendor/h4cc/wkhtmltoimage-amd64/bin/wkhtmltoimage-amd64')),
|
||||||
'timeout' => false,
|
'timeout' => false,
|
||||||
'options' => [],
|
'options' => [],
|
||||||
'env' => [],
|
'env' => [],
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
|
content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
|
||||||
<meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
|
<meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
|
||||||
<meta name="author" content="Minimal UI Kit" />
|
<meta name="author" content="Minimal UI Kit" />
|
||||||
<script type="module" crossorigin src="/assets/index.29c4d558.js"></script>
|
<script type="module" crossorigin src="/assets/index.62c7ef0a.js"></script>
|
||||||
<link rel="stylesheet" href="/assets/index.c91e36b5.css">
|
<link rel="stylesheet" href="/assets/index.c91e36b5.css">
|
||||||
<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
|
<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -24,7 +24,11 @@
|
|||||||
content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
|
content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
|
||||||
<meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
|
<meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
|
||||||
<meta name="author" content="Minimal UI Kit" />
|
<meta name="author" content="Minimal UI Kit" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<script type="module" crossorigin src="/assets/index.8da5f569.js"></script>
|
<script type="module" crossorigin src="/assets/index.8da5f569.js"></script>
|
||||||
|
=======
|
||||||
|
<script type="module" crossorigin src="/assets/index.37db8778.js"></script>
|
||||||
|
>>>>>>> bb925503f0e6dc226a555070afd79dd92c81ec34
|
||||||
<link rel="stylesheet" href="/assets/index.c91e36b5.css">
|
<link rel="stylesheet" href="/assets/index.c91e36b5.css">
|
||||||
<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
|
<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -151,9 +151,14 @@
|
|||||||
</tr> --}}
|
</tr> --}}
|
||||||
|
|
||||||
@foreach ($member->currentPlan->corporateBenefits as $corporateBenefit)
|
@foreach ($member->currentPlan->corporateBenefits as $corporateBenefit)
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ @$corporateBenefit->benefit->description ?? '' }}</td>
|
<td>{{ @$corporateBenefit->benefit->description ?? '' }}</td>
|
||||||
|
@if($corporateBenefit->limit_amount == 999999999)
|
||||||
|
<td style="align-right">As Charged</td>
|
||||||
|
@else
|
||||||
<td style="align-right">IDR {{ number_format($corporateBenefit->limit_amount, 0, ',', '.') ?? '' }}</td>
|
<td style="align-right">IDR {{ number_format($corporateBenefit->limit_amount, 0, ',', '.') ?? '' }}</td>
|
||||||
|
@endif
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
Reference in New Issue
Block a user