Merge branch 'second' into 'main'
Second See merge request online-sistem1/arrahn-portal!20
This commit is contained in:
hafifie rahman
@@ -47,7 +47,7 @@ class HomeController extends Controller
|
||||
foreach($CustomerInfo['gadai'] as $index=>$gadai)
|
||||
{
|
||||
$bilangan++;
|
||||
$total += $gadai['pinjaman'];
|
||||
$total += $gadai['bakipjm'];
|
||||
|
||||
if($gadai['tempoh'] >= 6)
|
||||
{
|
||||
|
||||
@@ -48,11 +48,12 @@ class InformationController extends Controller
|
||||
$CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
|
||||
|
||||
$melebihi6bulan = [];
|
||||
|
||||
if(isset($CustomerInfo['gadai']))
|
||||
{
|
||||
foreach($CustomerInfo['gadai'] as $index=>$gadai)
|
||||
{
|
||||
if($gadai['jbg'] >= 6)
|
||||
if($gadai['tempoh'] >= 6)
|
||||
{
|
||||
array_push($melebihi6bulan,$gadai);
|
||||
}
|
||||
|
||||
+3
-2
@@ -9,12 +9,13 @@
|
||||
"fideloper/proxy": "^4.4",
|
||||
"fruitcake/laravel-cors": "^2.0",
|
||||
"guzzlehttp/guzzle": "^6.3",
|
||||
"jomweb/billplz": "^1.0",
|
||||
"laravel-frontend-presets/argon": "^1.1",
|
||||
"laravel/framework": "^8.40",
|
||||
"laravel/tinker": "^2.5",
|
||||
"laravel/ui": "^3.3",
|
||||
"jomweb/billplz": "^1.0",
|
||||
"php-http/guzzle6-adapter": "^1.1"
|
||||
"php-http/guzzle6-adapter": "^1.1",
|
||||
"rap2hpoutre/laravel-log-viewer": "^2.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"barryvdh/laravel-debugbar": "^3.6",
|
||||
|
||||
Generated
+65
-2
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "ee326c107dcae364fcbc84364f0649a7",
|
||||
"content-hash": "7e140517198d86fabd2ba4c048ba9d9b",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asm89/stack-cors",
|
||||
@@ -3717,6 +3717,69 @@
|
||||
],
|
||||
"time": "2021-09-25T23:10:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "rap2hpoutre/laravel-log-viewer",
|
||||
"version": "v2.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/rap2hpoutre/laravel-log-viewer.git",
|
||||
"reference": "52e7c703a1e83cdae450f406c7d8472332dfb34e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/52e7c703a1e83cdae450f406c7d8472332dfb34e",
|
||||
"reference": "52e7c703a1e83cdae450f406c7d8472332dfb34e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0|^9.0",
|
||||
"php": ">=5.4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"orchestra/testbench": "3.7.*|^7.0",
|
||||
"phpunit/phpunit": "^7|^9.5.10"
|
||||
},
|
||||
"type": "laravel-package",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Rap2hpoutre\\LaravelLogViewer\\": "src/"
|
||||
},
|
||||
"classmap": [
|
||||
"src/controllers"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "rap2hpoutre",
|
||||
"email": "raphaelht@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A Laravel log reader",
|
||||
"keywords": [
|
||||
"laravel",
|
||||
"log",
|
||||
"log-reader",
|
||||
"log-viewer",
|
||||
"logging",
|
||||
"lumen"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues",
|
||||
"source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/v2.2.0"
|
||||
},
|
||||
"time": "2022-04-06T15:15:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
"version": "v6.3.0",
|
||||
@@ -9064,5 +9127,5 @@
|
||||
"php": "^7.3|^8.0"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "2.2.0"
|
||||
"plugin-api-version": "2.0.0"
|
||||
}
|
||||
|
||||
@@ -174,6 +174,7 @@ return [
|
||||
// App\Providers\BroadcastServiceProvider::class,
|
||||
App\Providers\EventServiceProvider::class,
|
||||
App\Providers\RouteServiceProvider::class,
|
||||
Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class,
|
||||
|
||||
],
|
||||
|
||||
|
||||
@@ -281,10 +281,26 @@ var hargaemastable = $('#harga_emas').DataTable({
|
||||
var count = parseInt($('#totalsag').text());
|
||||
var fasa = $(e).data('fasa');
|
||||
if (typeof fasa !== 'undefined' || fasa !== null) {
|
||||
if(fasa == 2)
|
||||
{
|
||||
console.log(fasa);
|
||||
if(fasa == 2){
|
||||
if ($(e).is(':checked')){
|
||||
$.notify({
|
||||
newest_on_top: true,
|
||||
message: "<strong style='font-size:15px;text-align:center;margin-left:100px; color: #ffff'>Norujukan ini dalam fasa ke 2!</strong>"
|
||||
}, {
|
||||
type: 'danger',
|
||||
allow_dismiss: false,
|
||||
placement: {
|
||||
align: 'center',
|
||||
from: 'bottom'
|
||||
},
|
||||
animate: {
|
||||
enter: 'animate__animated animate__bounce',
|
||||
|
||||
exit: 'animate__animated animate__bounceOutDown'
|
||||
}
|
||||
});
|
||||
$(e).prop('checked', false);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -310,6 +326,8 @@ var hargaemastable = $('#harga_emas').DataTable({
|
||||
$('#loadertable').removeClass('d-none');
|
||||
$('#formtable').addClass('d-none');
|
||||
|
||||
$('#totalsag').text(0);
|
||||
|
||||
var empat = selepastawarruqtable.columns(3).header();
|
||||
$(empat).html('JBG');
|
||||
selepastawarruqtable.column( 4 ).visible( true );
|
||||
@@ -402,6 +420,8 @@ var hargaemastable = $('#harga_emas').DataTable({
|
||||
$('#loadertable').removeClass('d-none');
|
||||
$('#formtable').addClass('d-none');
|
||||
|
||||
$('#totalsag').text(0);
|
||||
|
||||
var empat = selepastawarruqtable.columns(3).header();
|
||||
$(empat).html('JBG');
|
||||
selepastawarruqtable.column( 4 ).visible( true );
|
||||
@@ -493,7 +513,9 @@ var hargaemastable = $('#harga_emas').DataTable({
|
||||
|
||||
$('#loadertable').removeClass('d-none');
|
||||
$('#formtable').addClass('d-none');
|
||||
|
||||
|
||||
$('#totalsag').text(0);
|
||||
|
||||
var empat = selepastawarruqtable.columns(3).header();
|
||||
|
||||
$(empat).html('T. Lelong');
|
||||
@@ -517,18 +539,53 @@ var hargaemastable = $('#harga_emas').DataTable({
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
selepastawarruqtable.clear().draw();
|
||||
var counter = 1;
|
||||
$.each(datalelong,function(index,lelong){
|
||||
|
||||
selepastawarruqtable.row.add([
|
||||
`<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" data-fasa="${ps.fasa}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
|
||||
namacawangan,
|
||||
ps.norujukan,
|
||||
ps.t_lelong,
|
||||
'',
|
||||
'',
|
||||
''
|
||||
]).draw();
|
||||
let namacawangan = '';
|
||||
$.ajax({
|
||||
url: api_url + '/api/cawangan/detail/' + lelong.kodcaw,
|
||||
method: 'get',
|
||||
async:false,
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
namacawangan = data[0].namacaw;
|
||||
namacawangan = namacawangan.toLowerCase().substring(8).replace(/\b[a-z]/g, function(value) {
|
||||
return value.toUpperCase();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
let marhun = [];
|
||||
$.ajax({
|
||||
url: api_url + '/api/marhun/' + lelong.norujukan,
|
||||
method: 'get',
|
||||
async:false,
|
||||
dataType: "json",
|
||||
success: function(response) {
|
||||
// console.log(response);
|
||||
for(i in response){
|
||||
marhun.push(response[i]);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
let marh = JSON.stringify(marhun[0]);
|
||||
|
||||
selepastawarruqtable.row.add([
|
||||
`<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${lelong.norujukan}" data-fasa="${lelong.fasa}" id="sag-${counter}" data-norujukan="${lelong.norujukan}" />`,
|
||||
namacawangan,
|
||||
// lelong.norujukan,
|
||||
`<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${lelong.nilaimarhun}" data-berat="${lelong.berat}" data-upah12="${lelong.upah12}" data-pjmnum="${lelong.pinjaman}" data-bakipjm="${lelong.bakipjm}" data-lelong="${lelong.taglel}" data-marhun='${marh}' data-pinjaman="${lelong.pinjaman}" data-norujukan="${lelong.norujukan}" data-hargajualan="${lelong.hargajualan}" data-kodcaw="${lelong.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${lelong.norujukan}</span></a>`,
|
||||
tarikhlelong = new Date(lelong.t_lelong).toLocaleDateString("en-GB"),
|
||||
'',
|
||||
'',
|
||||
''
|
||||
]).draw();
|
||||
|
||||
counter = counter + 1;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -114,6 +114,8 @@ Route::get('/bayarsag', function () {
|
||||
return view('/includes/bayaran/pembayaransag');
|
||||
});
|
||||
|
||||
Route::get('logs', [\Rap2hpoutre\LaravelLogViewer\LogViewerController::class, 'index']);
|
||||
|
||||
|
||||
// Route::get('/', function () {
|
||||
// // return view('dashboard');
|
||||
|
||||
Reference in New Issue
Block a user