KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in afiqhamzah/fix/change_implementation_get_ujrah_detail (pull request #166)

Browse Source 
Change implementation get ujrah detail
This commit is contained in:
Afiq Hamzah
2024-06-09 03:23:17 +00:00
parent d9bfc72b89 8a55ced7f6
commit c565f5c8c3
1 changed files with 177 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TransactionOnlineController.php
+46 -33
View File
@@ -13,7 +13,7 @@ use App\Audit;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Carbon\Carbon; use Carbon\Carbon;
use App\Services\OnePercentServices; use App\Services\OnePercentServices;
use Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request as HttpRequest; use Illuminate\Http\Request as HttpRequest;
use App\Support\v2\GadaiV2 as Version2Gadai; use App\Support\v2\GadaiV2 as Version2Gadai;
@@ -24,12 +24,14 @@ use Illuminate\Support\Facades\Http;
class TransactionOnlineController extends Controller class TransactionOnlineController extends Controller
{ {
public function getTransactionOnline(Request $request){ public function getTransactionOnline(Request $request)
{
$transactionOnline = TransactionOnline::on('mysql7')->where('billplz_id', $request->billplz_id)->first(); $transactionOnline = TransactionOnline::on('mysql7')->where('billplz_id', $request->billplz_id)->first();
return response()->json($transactionOnline); return response()->json($transactionOnline);
} }
public function getLatestNosiri(){ public function getLatestNosiri()
{
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -38,7 +40,8 @@ class TransactionOnlineController extends Controller
return response()->json($nosiri); return response()->json($nosiri);
} }
public function create(Request $request){ public function create(Request $request)
{
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -64,7 +67,8 @@ class TransactionOnlineController extends Controller
return response()->json($transaction, 201); return response()->json($transaction, 201);
} }
public function updateStatus(Request $request){ public function updateStatus(Request $request)
{
$transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array( $transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array(
'status' => $request->status, 'status' => $request->status,
'paid_at' => $request->paid_at 'paid_at' => $request->paid_at
@@ -73,7 +77,8 @@ class TransactionOnlineController extends Controller
return response()->json($transaction, 200); return response()->json($transaction, 200);
} }
public function updateTransactionOnline(){ public function updateTransactionOnline()
{
$transactions = TransactionOnline::on('mysql7')->where([['status', '=', 'PAID'], ['update_status', 0]])->get(); $transactions = TransactionOnline::on('mysql7')->where([['status', '=', 'PAID'], ['update_status', 0]])->get();
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -110,7 +115,8 @@ class TransactionOnlineController extends Controller
return response()->json('success'); return response()->json('success');
} }
public function kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar){ public function kiraupahTawarruq($kodcaw, $norujukan, $tempohbayar)
{
$cawangan = Cawangan::on('mysql7') $cawangan = Cawangan::on('mysql7')
->where('kodcaw', '=', $kodcaw) ->where('kodcaw', '=', $kodcaw)
->first(); ->first();
@@ -132,7 +138,8 @@ class TransactionOnlineController extends Controller
return $upah_semasa; return $upah_semasa;
} }
public function kiraUpahRebet($kodcaw,$norujukan,$tempohbayar){ public function kiraUpahRebet($kodcaw, $norujukan, $tempohbayar)
{
$cawangan = Cawangan::on('mysql7') $cawangan = Cawangan::on('mysql7')
->where('kodcaw', '=', $kodcaw) ->where('kodcaw', '=', $kodcaw)
->first(); ->first();
@@ -288,7 +295,8 @@ class TransactionOnlineController extends Controller
// return response()->json("success",200); // return response()->json("success",200);
// } // }
public function updateGadaiMarhunOnline($kodcaw,$norujukan,$bayaran,$paid_at,$tempohbayar){ public function updateGadaiMarhunOnline($kodcaw, $norujukan, $bayaran, $paid_at, $tempohbayar)
{
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -434,7 +442,6 @@ class TransactionOnlineController extends Controller
DB::commit(); DB::commit();
}); });
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error("Transaction failed: " . $e->getMessage()); Log::error("Transaction failed: " . $e->getMessage());
@@ -442,10 +449,10 @@ class TransactionOnlineController extends Controller
} }
return response()->json("success", 200); return response()->json("success", 200);
} }
public function createAdvansur($kodcaw,$norujukan,$bayaran,$paid_at){ public function createAdvansur($kodcaw, $norujukan, $bayaran, $paid_at)
{
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -476,13 +483,15 @@ class TransactionOnlineController extends Controller
return response()->json($create_advansur, 201); return response()->json($create_advansur, 201);
} }
public function getTransactionOnlineLogin(Request $request){ public function getTransactionOnlineLogin(Request $request)
{
$transactionOnline = TransactionOnline::on('mysql7')->where('billplz_id', $request->billplz_id)->get(); $transactionOnline = TransactionOnline::on('mysql7')->where('billplz_id', $request->billplz_id)->get();
return response()->json($transactionOnline); return response()->json($transactionOnline);
} }
public function searchSAGOnline(Request $request){ public function searchSAGOnline(Request $request)
{
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
@@ -507,13 +516,15 @@ class TransactionOnlineController extends Controller
} }
} }
public function getListUnsuccessful(){ public function getListUnsuccessful()
{
$list = TransactionOnline::on('mysql7')->where('status', 'NOT PAID')->orderBy('id', 'desc')->take(10)->get(); $list = TransactionOnline::on('mysql7')->where('status', 'NOT PAID')->orderBy('id', 'desc')->take(10)->get();
return response()->json($list); return response()->json($list);
} }
public function updateUnsuccessfulTransaction(Request $request){ public function updateUnsuccessfulTransaction(Request $request)
{
$transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array( $transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array(
'status' => $request->status, 'status' => $request->status,
'paid_at' => $request->paid_at 'paid_at' => $request->paid_at
@@ -522,7 +533,8 @@ class TransactionOnlineController extends Controller
return response()->json($transaction, 200); return response()->json($transaction, 200);
} }
public function CustomerInfo(Request $request){ public function CustomerInfo(Request $request)
{
$cawangan_all = Cawangan::on('mysql7')->get(); $cawangan_all = Cawangan::on('mysql7')->get();
$gadai_all = []; $gadai_all = [];
@@ -536,8 +548,7 @@ class TransactionOnlineController extends Controller
->get()->toArray(); ->get()->toArray();
//dd($gadai, $cawangan); //dd($gadai, $cawangan);
if (sizeof($gadai) != 0) { if (sizeof($gadai) != 0) {
foreach($gadai as $gad) foreach ($gadai as $gad) {
{
if ($gad['tagbaru'] == 1) { if ($gad['tagbaru'] == 1) {
$jenis = 'onepercent'; $jenis = 'onepercent';
@@ -564,8 +575,7 @@ class TransactionOnlineController extends Controller
$akanlelong = Gadai::on($cawangan['mysql']) $akanlelong = Gadai::on($cawangan['mysql'])
->where([['sttebus', '=', ''], ['taglel', 1], ['nokp', '=', $request->ic]]) ->where([['sttebus', '=', ''], ['taglel', 1], ['nokp', '=', $request->ic]])
->get()->toArray(); ->get()->toArray();
} } else {
else{
$akanlelong = Gadai::on($cawangan['mysql']) $akanlelong = Gadai::on($cawangan['mysql'])
->where([['sttebus', '=', ''], ['taglel', 1], ['nokp', '=', $request->ic]]) ->where([['sttebus', '=', ''], ['taglel', 1], ['nokp', '=', $request->ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
@@ -573,8 +583,7 @@ class TransactionOnlineController extends Controller
} }
if (sizeof($akanlelong) != 0) { if (sizeof($akanlelong) != 0) {
foreach($akanlelong as $lelong) foreach ($akanlelong as $lelong) {
{
$result = (new TebusController)->kiraupahTawarruq($lelong['kodcaw'], $lelong['norujukan'], $array_utg); $result = (new TebusController)->kiraupahTawarruq($lelong['kodcaw'], $lelong['norujukan'], $array_utg);
$lelong['keuntungan'] = $result; $lelong['keuntungan'] = $result;
array_push($akanlelongarray, $lelong); array_push($akanlelongarray, $lelong);
@@ -586,10 +595,13 @@ class TransactionOnlineController extends Controller
array( array(
'gadai' => $gadai_all, 'gadai' => $gadai_all,
'lelong' => $akanlelongarray 'lelong' => $akanlelongarray
),200); ),
200
);
} }
public function updateTagPortal(Request $request){ public function updateTagPortal(Request $request)
{
$transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array( $transaction = TransactionOnline::on('mysql7')->where('billplz_id', '=', $request->billplz_id)->update(array(
'tagportal' => 1 'tagportal' => 1
)); ));
@@ -599,16 +611,18 @@ class TransactionOnlineController extends Controller
public function getUjrah($kodcaw, $norujukan) public function getUjrah($kodcaw, $norujukan)
{ {
try { try {
$base_url = config('app.url');
$gadai = Http::get($base_url . "/api/gadai/norujukan/$kodcaw/$norujukan")->json()[0]; $gadai = (new GadaiController())->showOneGadaibyRujukanAndCawangan($kodcaw, $norujukan)
$jenis_keuntungan = $gadai['tagbaru'] === 1 ? 'onepercent' : 'asal'; ->getData()[0];
$jenis_keuntungan = $gadai->tagbaru === 1 ? 'onepercent' : 'asal';
$upah_tawarruq = Http::get($base_url . "/api/upahtawarruq/$kodcaw/$norujukan", ['jeniskeuntungan' => $jenis_keuntungan])->json(); $request_upah_tawarruq = new Request(['jeniskeuntungan' => $jenis_keuntungan]);
$upah_rebet_tawarruq = Http::get($base_url . "/api/upahrebettawarruq/$kodcaw/$norujukan", ['jeniskeuntungan' => $jenis_keuntungan])->json(); $request_upah_rebet_tawarruq = new Request(['jeniskeuntungan' => $jenis_keuntungan]);
$upah_tawarruq = (new TebusController())->upahTawarruq($kodcaw, $norujukan, $request_upah_tawarruq);
$upah_rebet_tawarruq = (new TebusController())->upahRebetTawarruq($kodcaw, $norujukan, $request_upah_rebet_tawarruq);
if ($jenis_keuntungan === 'onepercent') { if ($jenis_keuntungan === 'onepercent') {
$ujrah_sebenar = (float)$upah_tawarruq['ujrah']; $ujrah_sebenar = (float)$upah_tawarruq['ujrah'];
@@ -624,10 +638,9 @@ class TransactionOnlineController extends Controller
'ujrah_sebenar' => (float)$upah_tawarruq, 'ujrah_sebenar' => (float)$upah_tawarruq,
'ujrah_rebet' => (float)$upah_rebet_tawarruq, 'ujrah_rebet' => (float)$upah_rebet_tawarruq,
]; ];
} catch (\Throwable $th) { } catch (\Throwable $th) {
Log::error($th); Log::error($th);
return $th;
} }
} }
} }