added payment success for all include
This commit is contained in:
@@ -288,16 +288,7 @@ class BayaranController extends Controller
|
||||
|
||||
$column_updated = (Session::get('company') == 'PKB') ? 'status_pkb' : 'status_koop';
|
||||
$value_paid = 'PAID';
|
||||
|
||||
$exist_carts = PersonalCarts::where('ic_no', Auth::user()->icno)
|
||||
->where('user_id', Auth::user()->id)
|
||||
->where(function ($query) {
|
||||
$query->where('status_pkb', 'PENDING')
|
||||
->orWhere('status_koop', 'PENDING');
|
||||
})
|
||||
->update([
|
||||
$column_updated => $value_paid,
|
||||
]);
|
||||
$column_payment_updated = (Session::get('company') == 'PKB') ? 'payment_pkb' : 'payment_koop';
|
||||
|
||||
$transactionOnline = $this->CallableHttp
|
||||
->get('/api/transaction/online/login', [
|
||||
@@ -305,6 +296,17 @@ class BayaranController extends Controller
|
||||
])
|
||||
->json();
|
||||
|
||||
$exist_carts = PersonalCarts::where('ic_no', Auth::user()->icno)
|
||||
->where('user_id', Auth::user()->id)
|
||||
->where(function ($query) {
|
||||
$query->where('status_pkb', 'PENDING')
|
||||
->orWhere('status_koop', 'PENDING');
|
||||
})
|
||||
->update([
|
||||
$column_updated => $value_paid,
|
||||
$column_payment_updated => json_encode($transactionOnline)
|
||||
]);
|
||||
|
||||
return redirect()->route('pay.success', [
|
||||
'transactionOnline' => $transactionOnline,
|
||||
]);
|
||||
@@ -315,6 +317,58 @@ class BayaranController extends Controller
|
||||
$this->serviceCallHttp(Session::get('company'));
|
||||
$transactionOnline = $request->transactionOnline;
|
||||
|
||||
$exist_carts = PersonalCarts::where('ic_no', Auth::user()->icno)
|
||||
->where('user_id', Auth::user()->id)
|
||||
->where(function ($query) {
|
||||
$query->where('status_pkb', 'PENDING')
|
||||
->orWhere('status_koop', 'PENDING');
|
||||
})
|
||||
->first();
|
||||
|
||||
$exist_carts = optional($exist_carts)->toArray();
|
||||
|
||||
if(!$exist_carts){
|
||||
$paid_carts = PersonalCarts::where('ic_no', Auth::user()->icno)
|
||||
->where('user_id', Auth::user()->id)
|
||||
->where(function ($query) {
|
||||
$query->where('status_pkb', 'PAID')
|
||||
->where('status_koop', 'PAID');
|
||||
})
|
||||
->first();
|
||||
$paid_carts = optional($paid_carts)->toArray();
|
||||
if($paid_carts){
|
||||
|
||||
$trans_pkb = json_decode($paid_carts['payment_pkb'],true);
|
||||
$trans_koop = json_decode($paid_carts['payment_koop'],true);
|
||||
|
||||
$trans_pkb = array_map(function ($item) {
|
||||
$item['tag_syarikat'] = CompanyStatus::COM_PKB;
|
||||
return $item;
|
||||
}, $trans_pkb);
|
||||
|
||||
$trans_koop = array_map(function ($item) {
|
||||
$item['tag_syarikat'] = CompanyStatus::COM_KOOPPKB;
|
||||
return $item;
|
||||
}, $trans_koop);
|
||||
|
||||
$transactionOnline = array_merge($trans_pkb,$trans_koop);
|
||||
|
||||
$arraycawangan = array_map(
|
||||
fn($x) => $x['tag_syarikat'] == CompanyStatus::COM_PKB
|
||||
? Http::arrahn()
|
||||
->get('/api/cawangan/detail/' . $x['kodcaw'])
|
||||
->json()[0]
|
||||
: Http::arrahn_koop()
|
||||
->get('/api/cawangan/detail/' . $x['kodcaw'])
|
||||
->json()[0],
|
||||
$transactionOnline
|
||||
);
|
||||
|
||||
|
||||
return view('pembayaran.result.berjayaportal', compact('transactionOnline', 'arraycawangan','exist_carts'));
|
||||
}
|
||||
}
|
||||
|
||||
$arraygadai = array_map(
|
||||
fn($x) => $this->CallableHttp
|
||||
->get('/api/gadai/norujukan/' . $x['norujukan'])
|
||||
@@ -329,16 +383,6 @@ class BayaranController extends Controller
|
||||
$transactionOnline,
|
||||
);
|
||||
|
||||
$exist_carts = PersonalCarts::where('ic_no', Auth::user()->icno)
|
||||
->where('user_id', Auth::user()->id)
|
||||
->where(function ($query) {
|
||||
$query->where('status_pkb', 'PENDING')
|
||||
->orWhere('status_koop', 'PENDING');
|
||||
})
|
||||
->first();
|
||||
|
||||
$exist_carts = optional($exist_carts)->toArray();
|
||||
|
||||
return view('pembayaran.result.berjayaportal', compact('transactionOnline', 'arraycawangan', 'arraygadai','exist_carts'));
|
||||
}
|
||||
|
||||
@@ -387,7 +431,11 @@ class BayaranController extends Controller
|
||||
|
||||
$getUpahTawarruqPerPembiayaan = function ($x) use ($getJenisKeuntungan) {
|
||||
$jenisKeuntungan = $getJenisKeuntungan($x);
|
||||
$upahTawarruq = Http::arrahn()
|
||||
$CallableHttp = $x['tag_syarikat'] == CompanyStatus::COM_PKB
|
||||
? Http::arrahn()
|
||||
: Http::arrahn_koop();
|
||||
|
||||
$upahTawarruq = $CallableHttp
|
||||
->get('/api/upahtawarruq/' . $x['kodcaw'] . '/' . $x['norujukan'], ['jeniskeuntungan' => $jenisKeuntungan])
|
||||
->json();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user