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' => '', +]) + +
+
    +
  1. Home +
  2. +
  3. +
  4. {{ $title }}
  5. +
+
diff --git a/resources/views/components/filter-card.blade.php b/resources/views/components/filter-card.blade.php new file mode 100644 index 0000000..69ab430 --- /dev/null +++ b/resources/views/components/filter-card.blade.php @@ -0,0 +1,92 @@ +@props([ + 'title' => '', + 'action' => '', + 'selectedDate' => '', + 'norujukan' => '', +]) + +
+
+
+
+
{{ $title }}
+
+
+
+ +
+ Pada + + + + Nombor Rujukan + + + + + + +
+
+
+
+
+
+
+
+ +@push('additional_scripts') + +@endpush diff --git a/resources/views/components/filter-date-card.blade.php b/resources/views/components/filter-date-card.blade.php new file mode 100644 index 0000000..9f17d58 --- /dev/null +++ b/resources/views/components/filter-date-card.blade.php @@ -0,0 +1,38 @@ +@props([ + 'title' => '', + 'action' => '', + 'selectedDate' => '', +]) + +
+
+
+
+
+ + + {{ $title }} +
+
+
+
+ +
+ Pada + + + +
+
+
+
+
+
+
+
diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php new file mode 100644 index 0000000..867dfa2 --- /dev/null +++ b/resources/views/components/table.blade.php @@ -0,0 +1,12 @@ +
+ + + + {{ $header }} + + + + {{ $body }} + +
+
diff --git a/resources/views/components/table/data.blade.php b/resources/views/components/table/data.blade.php new file mode 100644 index 0000000..b3d1135 --- /dev/null +++ b/resources/views/components/table/data.blade.php @@ -0,0 +1,13 @@ +@props(['content']) + +
+ + merge(['colspan' => '']) }}> +
+
+

+ {{ $content }}

+
+
+ +
diff --git a/resources/views/components/table/header.blade.php b/resources/views/components/table/header.blade.php new file mode 100644 index 0000000..0a34fe6 --- /dev/null +++ b/resources/views/components/table/header.blade.php @@ -0,0 +1,9 @@ +@props(['content']) + +
+ + {{ $content }} + + +
diff --git a/resources/views/components/table/horizontal-scroller.blade.php b/resources/views/components/table/horizontal-scroller.blade.php new file mode 100644 index 0000000..b6dbd8a --- /dev/null +++ b/resources/views/components/table/horizontal-scroller.blade.php @@ -0,0 +1,8 @@ +@props([ + 'tabContent' => '', + 'scrollDirection' => '', +]) + +
+ +
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 1d3c43b..8cc35e7 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -20,13 +20,10 @@ @if(Auth::user()->roles == 'admin') - +
  • - + @@ -37,38 +34,32 @@
  • - +
  • - + - + Tunai
  • - +
  • - - - + + + Peti Besi
  • +<<<<<<< HEAD {{--
  • @@ -87,12 +78,13 @@ +======= + +>>>>>>> cb7a1c06 (Update codebase :)
  • - - + + Pelanggan @@ -100,14 +92,11 @@
  • - +
  • - - + + Online
    @@ -115,28 +104,29 @@
    - +
  • - - + + Laporan
  • - +
  • +<<<<<<< HEAD Poskod +======= + + Poskod +>>>>>>> cb7a1c06 (Update codebase :)
  • @@ -144,10 +134,8 @@ {{--
  • - - + + Permissions
    @@ -157,13 +145,10 @@ @elseif(Auth::user()->roles == 'operasi') -
    +
  • - + @@ -175,59 +160,47 @@
  • - +
  • - - + + Bajet
  • - +
  • - - + + Blacklist
  • - +
  • {{-- --}} - - + + Lelong
  • - +
  • - - + + WTD
    @@ -235,6 +208,7 @@
    {{--
  • @@ -251,30 +225,41 @@ --}} >>>>>> cb7a1c06 (Update codebase :) class="rounded mb-2 mr-2 - {{ Route::is('tetapan.home') || Route::is('tetapan.home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}"> + {{ Route::is('tetapan') || Route::is('tetapan.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
  • - - + + Tetapan
  • - + --}} + + +
  • +
    + + + + + Tetapan +
    +
  • +
    {{--
  • - - + + Kelulusan
    @@ -282,41 +267,48 @@
    --}} - +
  • - - + + Laporan
  • - - +
  • - - + + Laporan Keseluruhan
  • + +
  • +
    + + Trail Transaksi Online +
    +
  • +
    + +
  • +
    + + Review Transaksi Billplz +
    +
  • +
    {{--
  • - - + + Permohonan
    @@ -325,28 +317,22 @@ @elseif(Auth::user()->roles == 'akaun') -
    +
  • - - + + Audit
  • - +
  • - - + + Laporan
    @@ -357,10 +343,8 @@ {{ Route::is('permohonan') || Route::is('permohonan.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
  • - - + + Permohonan
    @@ -368,6 +352,7 @@
    --}} @elseif(Auth::user()->roles == 'kpo') +<<<<<<< HEAD
  • +======= + +
  • +
    + + + + + + + + + + + + Dashboard +
    +
  • + + + + +>>>>>>> cb7a1c06 (Update codebase :)
  • - - + + + + Laporan +
    +
  • +
    + + + @elseif(Auth::user()->roles == 'callcenter') + +
  • +
    + + + + + + + + + + + + Dashboard +
    +
  • +
    + + + +
  • +
    + + Pelanggan
  • -
    + +<<<<<<< HEAD
  • +======= + +
  • +
    + + + + Laporan +
    +
  • +
    +>>>>>>> cb7a1c06 (Update codebase :) @endif @@ -471,16 +523,12 @@
    - +
  • - - - + + + Pengguna
    @@ -490,10 +538,8 @@
  • - - + + Arkib
    diff --git a/resources/views/online/billplz-transaction-review/index.blade.php b/resources/views/online/billplz-transaction-review/index.blade.php new file mode 100644 index 0000000..ce2a003 --- /dev/null +++ b/resources/views/online/billplz-transaction-review/index.blade.php @@ -0,0 +1,88 @@ +@extends('layouts.app') +@section('content') + + +
    + + + + @if (Session::has('errormessage')) + + @endif + +
    +
    + + + + + + + + @forelse ($billPlzTransactionReview as $data) + + + +
    +
    + @foreach ($data['arrahn_transactions'] as $transaction) +
    +
    +

    + 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'] }}
    +

    +
    +
    +
    + @endforeach +
    +
    + + +
    +
    +
    +
    +

    + 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'] ?? '' }}
    +

    +
    +
    +
    +
    +
    + + + @empty + + + + @endforelse +
    +
    +
    +@endsection diff --git a/resources/views/online/trail/index.blade.php b/resources/views/online/trail/index.blade.php new file mode 100644 index 0000000..dee15a2 --- /dev/null +++ b/resources/views/online/trail/index.blade.php @@ -0,0 +1,217 @@ +@extends('layouts.app') +@section('content') + + +
    + + + + @if (Session::has('errormessage')) + + @endif + +
    + + +
    +
    + + + + +
    + + @php + $isGroupedByNorujukan = request()->groupedByNorujukan === 'on' ? true : false; + $pageVariation = $isGroupedByNorujukan ? 'grouped-by-norujukan' : ''; + @endphp +
    +
    +
    + @include("online.trail.partials.{$pageVariation}.table-transactions-online") +
    +
    +
    + + + +
    +@endsection + +@push('additional_scripts') + + +@endpush + +@push('additional_styles') + +@endpush diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php new file mode 100644 index 0000000..3e5157a --- /dev/null +++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php @@ -0,0 +1,58 @@ +
    + + @forelse ($transactionTrail['glDetail'] as $norujukan => $transaction) + +

    {{ $norujukan }}

    +
    + + + + + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + + + + @endforeach + + + + @ @empty +
    + No data available for the date selected +
    + @endforelse +
    diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php new file mode 100644 index 0000000..a4229f4 --- /dev/null +++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php @@ -0,0 +1,60 @@ +
    + + @forelse ($transactionTrail['transactionsOnline'] as $norujukan => $transaction) + +

    {{ $norujukan }}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + + + + + @endforeach + + + @empty +
    + No data available for the date selected +
    + @endforelse + +
    diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php new file mode 100644 index 0000000..61d2ae0 --- /dev/null +++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php @@ -0,0 +1,50 @@ +
    + + @forelse ($transactionTrail['transaction'] as $norujukan => $transaction) + +

    {{ $norujukan }}

    +
    + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + @endforeach + + + @empty +
    + No data available for the date selected +
    + @endforelse + +
    diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php new file mode 100644 index 0000000..8bf64fb --- /dev/null +++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php @@ -0,0 +1,52 @@ +
    + + @forelse ($transactionTrail['transaksiKeuntungan'] as $norujukan => $transaction) + +

    {{ $norujukan }}

    +
    + + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + @endforeach + + + + @empty +
    + No data available for the date selected +
    + @endforelse +
    diff --git a/resources/views/online/trail/partials/table-gldetail.blade.php b/resources/views/online/trail/partials/table-gldetail.blade.php new file mode 100644 index 0000000..54d7b00 --- /dev/null +++ b/resources/views/online/trail/partials/table-gldetail.blade.php @@ -0,0 +1,52 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrail['glDetail'] as $data) + + + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
    diff --git a/resources/views/online/trail/partials/table-transactions-online.blade.php b/resources/views/online/trail/partials/table-transactions-online.blade.php new file mode 100644 index 0000000..b3a1239 --- /dev/null +++ b/resources/views/online/trail/partials/table-transactions-online.blade.php @@ -0,0 +1,54 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrail['transactionsOnline'] as $data) + + + + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
    diff --git a/resources/views/online/trail/partials/table-transactions.blade.php b/resources/views/online/trail/partials/table-transactions.blade.php new file mode 100644 index 0000000..483a067 --- /dev/null +++ b/resources/views/online/trail/partials/table-transactions.blade.php @@ -0,0 +1,44 @@ +
    + + + + + + + + + + + + + + + + + + + @forelse($transactionTrail['transaction'] as $data) + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
    diff --git a/resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php new file mode 100644 index 0000000..ccf2d53 --- /dev/null +++ b/resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php @@ -0,0 +1,46 @@ +
    + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrail['transaksiKeuntungan'] as $data) + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
    diff --git a/resources/views/tetapan/payable-ujrah-branches.blade.php b/resources/views/tetapan/payable-ujrah-branches.blade.php index f602b3c..b0d5824 100644 --- a/resources/views/tetapan/payable-ujrah-branches.blade.php +++ b/resources/views/tetapan/payable-ujrah-branches.blade.php @@ -44,14 +44,14 @@
    -

    {{ $cawangan->details_caw }}

    +

    {{ $cawangan['details_caw'] }}

    -

    {{ $cawangan->kodcaw }}

    +

    {{ $cawangan['kodcaw'] }}

    @@ -59,7 +59,7 @@
    - gadaian_ujrah_payable === 1 ? 'checked' : '' }} name="checkbox-gadai-ujrah-payable" data-gadai-ujrah-payable-branch="{{ $cawangan->kodcaw }}" id="checked-checkbox" type="checkbox" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"> +
    @@ -69,12 +69,12 @@
    @php - $selected = $cawangan->cawangan_information->version ?? ''; + $selected = $cawangan['cawangan_information']['version'] ?? ''; $select_color_v1 = 'bg-green-500 text-white'; $select_color_v2 = 'bg-indigo-500 text-white'; @endphp -