diff --git a/.env.example b/.env.example index c1200db..35c9c5c 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,8 @@ APP_ENV=local APP_KEY= APP_DEBUG=true APP_URL=http://localhost +API_URL=http://api.arrahn.com.my +API_ARRAHN_PORTAL_URL=http://pay.arrahn.com.my LOG_CHANNEL=stack LOG_DEPRECATIONS_CHANNEL=null diff --git a/app/Http/Controllers/BillplzTransactionReviewController.php b/app/Http/Controllers/BillplzTransactionReviewController.php new file mode 100644 index 0000000..1302d82 --- /dev/null +++ b/app/Http/Controllers/BillplzTransactionReviewController.php @@ -0,0 +1,18 @@ +selectedDate ?? Carbon::now()->toDateString(); + + $billPlzTransactionReview = Http::get(config('api.url_arrahn_portal') . '/api/billplz-transaction-review', ['date' => $date])->json(); + + return view('online.billplz-transaction-review.index', compact('billPlzTransactionReview', 'date')); + } +} diff --git a/app/Http/Controllers/OnlineTransactionTrailController.php b/app/Http/Controllers/OnlineTransactionTrailController.php new file mode 100644 index 0000000..a7c2c2d --- /dev/null +++ b/app/Http/Controllers/OnlineTransactionTrailController.php @@ -0,0 +1,30 @@ +has('selectedDate') && request()->selectedDate == null) { + return redirect()->back()->with('errormessage', 'Sila pilih tarikh!'); + } + + $date = $request->selectedDate ?? Carbon::now()->toDateString(); + $norujukan = $request->norujukan ?? ''; + $isGroupedByNorujukan = $request->groupedByNorujukan === 'on' ? true : false; + + $transactionTrail = Http::arrahn() + ->get('/api/transaction/online/trail', [ + 'date' => $date, + 'norujukan' => $norujukan, + 'isGroupedByNorujukan' => $isGroupedByNorujukan, + ]) + ->json(); + + return view('online.trail.index', compact('transactionTrail', 'date', 'norujukan')); + } +} diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index 456866b..6d18d50 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -39,7 +39,7 @@ class TetapanController extends Controller $api_url = config('api.url'); $auth_user = Auth::user(); - $payable_cawangan = json_decode(Http::get(config('api.url') . '/api/payable-ujrah-branches')->json()); + $payable_cawangan = Http::get(config('api.url') . '/api/payable-ujrah-branches')->json(); return view('tetapan.payable-ujrah-branches', compact('api_url', 'auth_user', 'payable_cawangan')); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ee8ca5b..42e7c33 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,9 @@ namespace App\Providers; +use Illuminate\Support\Facades\Http; use Illuminate\Support\ServiceProvider; +use Illuminate\Http\Client\PendingRequest; class AppServiceProvider extends ServiceProvider { @@ -23,6 +25,14 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - // + Http::macro('arrahn', function () { + return Http::withOptions(['verify' => config('app.api_verify')])->baseUrl(config('api.url')); + }); + + PendingRequest::macro('arrahn', function () { + $this->options['verify'] = config('app.api_verify'); + $this->baseUrl(config('api.url')); + return $this; + }); } } diff --git a/config/api.php b/config/api.php index e8ea7a3..a9d4da0 100644 --- a/config/api.php +++ b/config/api.php @@ -1,4 +1,5 @@ env('API_URL') -]; \ No newline at end of file + 'url' => env('API_URL'), + 'url_arrahn_portal' => env('API_ARRAHN_PORTAL_URL') +]; diff --git a/resources/views/components/breadcrumb.blade.php b/resources/views/components/breadcrumb.blade.php new file mode 100644 index 0000000..6954d2e --- /dev/null +++ b/resources/views/components/breadcrumb.blade.php @@ -0,0 +1,12 @@ +@props([ + 'title' => '', +]) + +
+ {{ $content }}
+{{ Session::get('errormessage') }}
+
+ portal: {{ $transaction['portal'] }}
+ norujukan: {{ $transaction['norujukan'] }}
+ kodcaw: {{ $transaction['kodcaw'] }}
+ customer_name: {{ $transaction['customer_name'] }}
+ nokp: {{ $transaction['nokp'] }}
+ total_payment: {{ $transaction['total_payment'] }}
+ status: {{ $transaction['status'] }}
+ paid_at: {{ $transaction['paid_at'] }}
+
+ bill_id: {{ $data['billplz_latest_transaction']['bill_id'] }}
+ id: {{ $data['billplz_latest_transaction']['id'] ?? '' }}
+ status: {{ $data['billplz_latest_transaction']['status'] ?? '' }}
+ completed_at: {{ $data['billplz_latest_transaction']['completed_at'] ?? '' }}
+ payment_channel: {{ $data['billplz_latest_transaction']['payment_channel'] ?? '' }}
+
{{ Session::get('errormessage') }}
+{{ $cawangan->details_caw }}
+{{ $cawangan['details_caw'] }}
{{ $cawangan->kodcaw }}
+{{ $cawangan['kodcaw'] }}