KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
nishaMuhd
2023-02-26 14:24:31 +08:00
parent 03f23864fc cb01a4b18b
commit 1cb1fe92d5
7 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BayaranController.php
+5
View File
@@ -77,6 +77,11 @@ class BayaranController extends Controller
{
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $sag)->json();
//$array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $sag])->json();
//if($array_lelong['lelong'] !== null){
// return redirect()->route('home')->with('error','Barangan Sedang Dilelong.');
//}
if($gadai[0][0]['tempoh'] >= 12){
return redirect()->route('home')->with('error','SAG Yang Dipilih melebihi tempoh 12 bulan ke atas.');
}
app/Http/Controllers/HomeController.php
+1
View File
@@ -58,6 +58,7 @@ class HomeController extends Controller
$bilanganlelong = 0;
foreach($CustomerInfo['lelong'] as $index1=>$lelong)
{
$bilangan++;
$bilanganlelong += 1;
}
app/Http/Controllers/InformationController.php
+15 -4
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Models\LelongBid;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
@@ -37,6 +38,19 @@ class InformationController extends Controller
$pembiayaansemasa = $CustomerInfo['gadai'];
}
if(isset($CustomerInfo['lelong'])){
if(sizeof($CustomerInfo['lelong']) > 0){
foreach($CustomerInfo['lelong'] as $index=>$lelong){
$array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lelong['norujukan']])->json();
if($array_lelong['lelong'] !== null){
$CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray();
}
}
$pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']);
$pembiayaansemasa = $pembiayaansemasa->toArray();
}
}
return response()->json($pembiayaansemasa,200);
// return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa'));
}
@@ -71,10 +85,6 @@ class InformationController extends Controller
$CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json();
$lelong = [];
if(isset($CustomerInfo['lelong']))
{
$lelong += $CustomerInfo['lelong'];
if(isset($CustomerInfo['lelong'])){
if(sizeof($CustomerInfo['lelong']) > 0){
foreach($CustomerInfo['lelong'] as $index=>$lel){
@@ -101,3 +111,4 @@ class InformationController extends Controller
return view('auth.termasyarat', compact('termasyarat'));
}
}
app/Models/LelongBid.php
+53
View File
@@ -0,0 +1,53 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class LelongBid extends Model
{
protected $primaryKey = 'id';
protected $table = 'lelongbid';
protected $connection = 'lelong';
protected $fillable = [
'id',
'lelong_id',
'caw_id',
'kodcaw',
'norujukan',
't_lelong',
'hargaasas',
'hargajual',
't_jual',
'nopembeli',
'jbg',
'kadarupah',
'upahsimpan',
'ansuran',
'nilaimarhun',
'nmarhuns',
'pinjaman',
'bakiupah',
'cajlain',
'cajlelong',
'baki',
'berat',
'marhun',
'percent',
'status_jual',
'status_payment',
'status_semak',
'diserahkan_pada',
'mora_upah',
'fasa',
'opencash',
'created_at',
'updated_at',
];
public $timestamps = true;
}
config/database.php
+22
View File
@@ -62,6 +62,28 @@ return [
]) : [],
],
'lelong' => [
'driver' => 'mysql',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST_LELONG', '127.0.0.1'),
'port' => env('DB_PORT_LELONG', '3306'),
'database' => env('DB_DATABASE_LELONG', 'lelong'),
'username' => env('DB_USERNAME_LELONG', 'root'),
'password' => env('DB_PASSWORD_LELONG', ''),
'unix_socket' => env('DB_SOCKET_LELONG', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],
'pgsql' => [
'driver' => 'pgsql',
'url' => env('DATABASE_URL'),
resources/views/includes/home.blade.php
+3 -3
View File
@@ -440,7 +440,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var today = new Date();
var tarikhlelong = new Date(response.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
if(tarikhblock.toFixed() <= 2)
if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
@@ -586,7 +586,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var today = new Date();
var tarikhlelong = new Date(response.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
if(tarikhblock.toFixed() <= 2)
if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
@@ -729,7 +729,7 @@ var hargaemastable = $('#harga_emas').DataTable({
var tarikhlelong = new Date(lelong.t_lelong);
tarikhblock = DateDiff(tarikhlelong,today);
if(tarikhblock.toFixed() <= 2)
if(tarikhblock.toFixed() <= 3)
{
lelongblock = 'disabled';
}
resources/views/includes/login/loginportal.blade.php
+2 -2
View File
@@ -40,9 +40,9 @@
<div class="text-center">
<button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" onclick="loadingbtn();this.disabled=true;this.form.submit();" style="background: #4A4E59;">Log Masuk</button>
</div>
<div class="text-center mt-3" style="margin: 0% 10%;">
<!-- <div class="text-center mt-3" style="margin: 0% 10%;">
<a href="https://spare.arrahn.com.my/pembayaransegera" id="buttonspare" title="Pembayaran Pantas SPARE" style="color: #12B652; border: 1px solid #12B652;" class="btn my-4 mb-2" target="_blank">Bayaran Pantas (SPARE)</a href="#">
</div>
</div> -->
<p class="text-sm text-center">
<a href="{{ route('auth.registerfirst') }}">Pertama Kali</a>