Merge branch 'second' into 'main'

fix arrahnpay

See merge request online-sistem1/arrahn-portal!31
This commit is contained in:
hafifie rahman
2022-05-24 05:42:46 +00:00
5 changed files with 40 additions and 16 deletions
+14 -14
View File
@@ -23,7 +23,7 @@ class BayaranController extends Controller
if(config('app.env') != 'production'){
$this->api_key = 'abecfd0c-98d8-4635-abc2-2fcba8c60c11';
$this->XSignature_Key = 'S-GWr7z03XjAhqPsFfu_H5nQ';
$this->collection_id = 'z0r4kjhi';
$this->collection_id = '5aosv2dg';
}else{
$this->api_key = 'f3e82fe1-a422-4660-97f0-65cc59ff6c47';
$this->XSignature_Key = 'S-alZUbzmD2_TF3vmrRqgehQ';
@@ -100,7 +100,7 @@ class BayaranController extends Controller
// array_push($arraybayaran,['norujukan' => $norujukan, 'kodcaw' => $request->txtkodcawhidden[$index1], 'bayaran' => $request->txtbayaranhidden[$index1]]);
// }
$arraycollection_id = array();
// $arraycollection_id = array();
$http = new HttpMethodsClient(
new GuzzleHttpClient(),
@@ -148,21 +148,21 @@ class BayaranController extends Controller
Session::put('payment_method','login');
Session::save();
foreach($request->txtkodcawhidden as $index2=>$kodcaw)
{
if(config('app.env') != 'production'){
$collection_id = $this->collection_id;
}else{
$collection_id = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/billplz/collectionid',[
'kodcaw' => $kodcaw
])->json();
}
array_push($arraycollection_id,$collection_id);
}
// foreach($request->txtkodcawhidden as $index2=>$kodcaw)
// {
// if(config('app.env') != 'production'){
// $collection_id = $this->collection_id;
// }else{
// $collection_id = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/billplz/collectionid',[
// 'kodcaw' => $kodcaw
// ])->json();
// }
// array_push($arraycollection_id,$collection_id);
// }
$response = $bill->create(
$collection_id,
$this->collection_id,
Auth::user()->email,
Auth::user()->notel,
Auth::user()->name,
Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

@@ -57,7 +57,7 @@
<div class="text-center">
<button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" style="background: #4A4E59;">Cipta Akaun</button>
<button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" style="background: #4A4E59;">Daftar Akaun</button>
</div>
+1 -1
View File
@@ -127,7 +127,7 @@
<tr>
<td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #111111; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; letter-spacing: 4px; line-height: 48px;">
<h3 style="font-size: 48px; font-weight: 400; margin: 2;">SELAMAT DATANG!</h3>
<img src="{{ asset('argon') }}/img/brand/logo_arrahn_baru.png" width="155" height="120" style="display: block; border: 0px;" />
<img src="{{ asset('argon') }}/img/brand/arrahnpay.jpg" width="155" height="120" style="display: block; border: 0px;" />
</td>
</tr>
</table>
@@ -0,0 +1,24 @@
<div class="modal animate__animated animate__bounceInDown" id="termadansyaratmodal">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h5 class="modal-title" id="ModalTitle">Terma Dan Syarat</h5>
</button>
</div>
<!-- Modal body -->
<div class="modal-body">
test
</div>
<!-- Modal footer -->
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Tutup</button>
</div>
</div>
</div>
</div>