diff --git a/.env.example b/.env.example index 078f600..c1200db 100644 --- a/.env.example +++ b/.env.example @@ -49,5 +49,5 @@ PUSHER_APP_SECRET=421b61fb5a8ecce477a6 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" -# MIX_API_URL=apiujrah.arrahn -MIX_API_URL=api.arrahn +# MIX_API_URL=http://api.arrahn +MIX_API_URL=http://apiujrah.arrahn diff --git a/resources/js/app.js b/resources/js/app.js index a2ba69f..371e3c1 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -126,21 +126,21 @@ Vue.use(require('vue-pusher'), { } }); -Vue.prototype.$api1 = process.env.MIX_API_URL +Vue.prototype.$api1 = process.env.MIX_API_URL + '/'; Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content'); Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content'); let initial = 'KB2'; -let initialhostname = process.env.MIX_API_URL; +let initialhostname = process.env.MIX_API_URL + '/'; let initialtahun = new Date().getFullYear(); const store = new Vuex.Store({ state: { $kodcaw: 'KB2', - $hostname: process.env.MIX_API_URL, + $hostname: process.env.MIX_API_URL + '/', $tahun: new Date().getFullYear() }, plugins: [createPersistedState()], diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 845301e..d43448a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -24,7 +24,7 @@ - + @@ -155,7 +155,7 @@
- {{Auth::user()->roles}} : {{Auth::user()->name}} + {{Auth::user()->roles}} : {{Auth::user()->name}}
diff --git a/resources/views/permohonan/cetakanfull.blade.php b/resources/views/permohonan/cetakanfull.blade.php index 5dc7dd1..c8e6efd 100644 --- a/resources/views/permohonan/cetakanfull.blade.php +++ b/resources/views/permohonan/cetakanfull.blade.php @@ -13,9 +13,9 @@ - + - + @@ -29,13 +29,13 @@
- +
{{ $fullname }}

{{ $cawangan_detail['namacaw'] }}

{{ $cawangan_detail['alamat1'] }}

{{ $cawangan_detail['alamat2'] }}

- +

No Tel : {{ $cawangan_detail['notel'] }}

No Faks : {{ $cawangan_detail['nofaks'] }}

@@ -85,7 +85,7 @@ PENYEDIA PERMOHONAN
- +
@@ -106,7 +106,7 @@

Tarikh

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -135,7 +135,7 @@

Tarikh mohon

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -201,14 +201,14 @@

Tarikh

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp

- +
@else @@ -219,13 +219,13 @@

Tarikh mohon

- +

Baki Peti Besi

- +

@endif @@ -265,7 +265,7 @@ Cash In Transit (CIT) -
+
@else
@@ -275,7 +275,7 @@

Tarikh bank-in ke PKB

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -303,7 +303,7 @@

Disahkan oleh - +

{{--

{{ $permohonan['nama_operasi'] }}

--}} @@ -319,7 +319,7 @@

Tarikh

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_pengesahanoperasi']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -365,7 +365,7 @@

Tarikh

- @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_pengesahanakaun']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -394,7 +394,7 @@

- +

@@ -415,7 +415,7 @@

Tarikh

- @php + @php if($permohonan['tarikh_diluluskan'] !== null) { $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_diluluskan']); @@ -436,15 +436,15 @@

Pengesahan penerima wang oleh

- + {{ ($permohonan['nama_penerima'] !== null) ? $permohonan['nama_penerima'] : '' }} - +

Tarikh serahan

- @php + @php if($permohonan['tarikh_terima'] !== null) { @@ -464,11 +464,11 @@ { $jumlah = floatval($permohonan['baki_petibesi']) + floatval($permohonan['jumlah_diluluskan']); echo 'RM ' . number_format($jumlah,2); - } + } @endphp

- + {{--

NO KP : 970403-03-5003

--}}
@@ -486,7 +486,7 @@

Tarikh kemasukan

- @php + @php if($permohonan['tarikh_terima'] !== null) { @@ -494,7 +494,7 @@ $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate); } - + @endphp

@@ -512,4 +512,4 @@ // window.onfocus=function(){ window.close();} - \ No newline at end of file + diff --git a/resources/views/permohonan/cetakanpb.blade.php b/resources/views/permohonan/cetakanpb.blade.php index 634f421..74de8e8 100644 --- a/resources/views/permohonan/cetakanpb.blade.php +++ b/resources/views/permohonan/cetakanpb.blade.php @@ -13,9 +13,9 @@ - + - + @@ -76,7 +76,7 @@ @if($permohonan['jenismohon'] === 'permohonanwang')

PERMOHONAN WANG

- @else + @else

BAYARAN BALIK

@endif @@ -93,7 +93,7 @@ Tarikh Mohon - @php + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $permohonan['tarikh_permohonan']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @@ -155,4 +155,4 @@ // window.onfocus=function(){ window.close();} - \ No newline at end of file + diff --git a/webpack.mix.js b/webpack.mix.js index 84e03c4..cf2de31 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -16,3 +16,7 @@ mix.js('resources/js/app.js', 'public/js') .postCss("resources/css/app.css", "public/css", [ require("tailwindcss"), ]); + +if( mix.inProduction() ){ + mix.version() +}