From 9943ec892ec62ff791b24b8c7b9d55dc75d78a16 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 15 Jul 2024 16:43:14 +0800 Subject: [PATCH 1/8] Update codebase : - Add basic blade components based on already existing element on app - Add module to view online transaction trail, serve as debugger - Add module to review arrahn transaction vs billplz transaction, serve as debugger - Fix tetapan/payable-ujrah-branches error on api response - Add arrahn pay portal api url link in config. The billplz data is query from there --- .env.example | 2 + .../BillplzTransactionReviewController.php | 18 ++ .../OnlineTransactionTrailController.php | 30 ++ app/Http/Controllers/TetapanController.php | 2 +- app/Providers/AppServiceProvider.php | 12 +- config/api.php | 5 +- .../views/components/breadcrumb.blade.php | 12 + .../views/components/filter-card.blade.php | 92 ++++++ .../components/filter-date-card.blade.php | 38 +++ resources/views/components/table.blade.php | 12 + .../views/components/table/data.blade.php | 13 + .../views/components/table/header.blade.php | 9 + .../table/horizontal-scroller.blade.php | 8 + resources/views/layouts/sidebar.blade.php | 306 ++++++++++-------- .../index.blade.php | 88 +++++ resources/views/online/trail/index.blade.php | 217 +++++++++++++ .../table-gldetail.blade.php | 58 ++++ .../table-transactions-online.blade.php | 60 ++++ .../table-transactions.blade.php | 50 +++ .../table-transaksi-keuntungan.blade.php | 52 +++ .../trail/partials/table-gldetail.blade.php | 52 +++ .../table-transactions-online.blade.php | 54 ++++ .../partials/table-transactions.blade.php | 44 +++ .../table-transaksi-keuntungan.blade.php | 46 +++ .../tetapan/payable-ujrah-branches.blade.php | 10 +- 25 files changed, 1151 insertions(+), 139 deletions(-) create mode 100644 app/Http/Controllers/BillplzTransactionReviewController.php create mode 100644 app/Http/Controllers/OnlineTransactionTrailController.php create mode 100644 resources/views/components/breadcrumb.blade.php create mode 100644 resources/views/components/filter-card.blade.php create mode 100644 resources/views/components/filter-date-card.blade.php create mode 100644 resources/views/components/table.blade.php create mode 100644 resources/views/components/table/data.blade.php create mode 100644 resources/views/components/table/header.blade.php create mode 100644 resources/views/components/table/horizontal-scroller.blade.php create mode 100644 resources/views/online/billplz-transaction-review/index.blade.php create mode 100644 resources/views/online/trail/index.blade.php create mode 100644 resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php create mode 100644 resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php create mode 100644 resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php create mode 100644 resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php create mode 100644 resources/views/online/trail/partials/table-gldetail.blade.php create mode 100644 resources/views/online/trail/partials/table-transactions-online.blade.php create mode 100644 resources/views/online/trail/partials/table-transactions.blade.php create mode 100644 resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php 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. +
  3. {{ $title }}
    4. +
+
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 - From a2f06e8d5298691d878fc624baec22a096e5fba4 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 19 Jun 2024 11:53:44 +0800 Subject: [PATCH 2/8] added akrubulananpecahan dan imbangduga range untuk tallykan --- resources/js/Akaun/Home.vue | 2 +- resources/js/ImbangDuga/index.vue | 418 +++++++-------------- resources/views/imbangduga/index.blade.php | 4 +- resources/views/layouts/sidebar.blade.php | 30 +- 4 files changed, 150 insertions(+), 304 deletions(-) diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index bb2eddf..987dd8b 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -146,7 +146,7 @@
    - +

    Akru Bulanan Pecahan
    diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue index 4a0b5e7..b0d0801 100644 --- a/resources/js/ImbangDuga/index.vue +++ b/resources/js/ImbangDuga/index.vue @@ -1,323 +1,165 @@ diff --git a/resources/views/imbangduga/index.blade.php b/resources/views/imbangduga/index.blade.php index 5cb7968..61577ac 100644 --- a/resources/views/imbangduga/index.blade.php +++ b/resources/views/imbangduga/index.blade.php @@ -6,7 +6,7 @@
    - + test
    @@ -14,4 +14,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 8cc35e7..57dbe27 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -59,28 +59,23 @@
    • -<<<<<<< HEAD - {{--
  • - - - + class="bi bi-safe2" viewBox="0 0 16 16"> + + + Tetapan
    • -     --}} + - -======= ->>>>>>> cb7a1c06 (Update codebase :)
  • @@ -120,6 +115,7 @@
    +<<<<<<< HEAD <<<<<<< HEAD Poskod @@ -127,6 +123,14 @@ Poskod >>>>>>> cb7a1c06 (Update codebase :) +======= + + Poskod +======= + + Poskod +>>>>>>> 4a083e10 (added akrubulananpecahan dan imbangduga range untuk tallykan) +>>>>>>> f976f8ed (added akrubulananpecahan dan imbangduga range untuk tallykan)
    • From a2c3a6e1a9958096220cb16f13fdc22e3b9dc28e Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Sun, 7 Jul 2024 23:45:51 +0800 Subject: [PATCH 3/8] added akru bulanan pecahan --- resources/js/Akaun/Home.vue | 2 +- resources/js/ImbangDuga/index.vue | 332 ++++++++++++++++++++-- resources/views/layouts/sidebar.blade.php | 4 +- 3 files changed, 312 insertions(+), 26 deletions(-) diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 987dd8b..bb2eddf 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -146,7 +146,7 @@
    - +

    Akru Bulanan Pecahan
    diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue index b0d0801..12436c6 100644 --- a/resources/js/ImbangDuga/index.vue +++ b/resources/js/ImbangDuga/index.vue @@ -1,42 +1,244 @@ diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 57dbe27..5928a10 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -59,7 +59,7 @@ -
  • @@ -73,7 +73,7 @@ Tetapan
    • -     + --}}
  • From 758b3708eff655830cfbb83e34db7bd0b79b4b36 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Tue, 16 Jul 2024 12:41:31 +0800 Subject: [PATCH 4/8] resolve conflicts --- resources/views/layouts/sidebar.blade.php | 118 ---------------------- 1 file changed, 118 deletions(-) diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 5928a10..f2f6abd 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -115,22 +115,10 @@
    -<<<<<<< HEAD -<<<<<<< HEAD - - Poskod -======= Poskod ->>>>>>> cb7a1c06 (Update codebase :) -======= - - Poskod -======= Poskod ->>>>>>> 4a083e10 (added akrubulananpecahan dan imbangduga range untuk tallykan) ->>>>>>> f976f8ed (added akrubulananpecahan dan imbangduga range untuk tallykan)
    • @@ -212,25 +200,6 @@ {{-- -
  • -
    - - - - - Tetapan -
    -
    • -     --}} - - >>>>>> cb7a1c06 (Update codebase :) class="rounded mb-2 mr-2 {{ Route::is('tetapan') || Route::is('tetapan.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
  • @@ -356,75 +325,6 @@ --}} @elseif(Auth::user()->roles == 'kpo') -<<<<<<< HEAD - -
  • -
    - - - - - - - - - - - - Dashboard -
    -
    • - - - - -
  • -
    - - - - Laporan -
    -
    • -     - - - @elseif(Auth::user()->roles == 'callcenter') - -
  • -
    - - - - - - - - - - - - Dashboard -
    -
    • -     - - - -=======
  • @@ -446,7 +346,6 @@ ->>>>>>> cb7a1c06 (Update codebase :)
  • @@ -492,22 +391,6 @@ -<<<<<<< HEAD - -
  • -
    - - - - Laporan -
    -
    • - -=======
  • @@ -518,7 +401,6 @@
    • ->>>>>>> cb7a1c06 (Update codebase :) @endif From a658e7c322da6fd37f478dd16d8ea693db95f35a Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Tue, 16 Jul 2024 12:45:15 +0800 Subject: [PATCH 5/8] Add missing routes --- routes/web.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/routes/web.php b/routes/web.php index 23f58cc..23544f9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,7 @@ 'tetapan.unsold-commo //Pengguna Route::get('/pengguna',['as'=>'pengguna','uses'=>'App\Http\Controllers\PenggunaController@index'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); +//Payment online trail +Route::get('/transaction/online/trail', OnlineTransactionTrailController::class)->name('transaction.online.trail'); +Route::get('/transaction/online/billplz-transaction-review', BillplzTransactionReviewController::class)->name('transaction.online.billplz-transaction-review'); + Route::get('{any}', function () { return view('home'); From e9edd3f1a2c3412e37fbdc16a40691f63a737aed Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Fri, 19 Jul 2024 11:26:45 +0800 Subject: [PATCH 6/8] Disable group by norujukan, if already filte norujukan --- .../views/components/filter-card.blade.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/resources/views/components/filter-card.blade.php b/resources/views/components/filter-card.blade.php index 69ab430..bbfb237 100644 --- a/resources/views/components/filter-card.blade.php +++ b/resources/views/components/filter-card.blade.php @@ -12,7 +12,7 @@
    {{ $title }}
    -
    +
    @@ -64,6 +64,7 @@ document.addEventListener("DOMContentLoaded", function() { const toggle = document.querySelector('#toggle'); const dot = document.querySelector('.dot'); + const form = document.querySelector('#filterOnlineTransactionForm'); // get query parameters from the url const urlParams = new URLSearchParams(window.location.search); @@ -86,7 +87,24 @@ dot.classList.add('bg-white'); } }); + + form.addEventListener('submit', function(e) { + e.preventDefault(); + const norujukanInput = document.querySelector('#norujukan').value.trim(); + + if (norujukanInput.length > 0) { + toggle.checked = false; + dot.classList.remove('transform', 'translate-x-full', 'bg-green-500'); + dot.classList.add('bg-white'); + } + + event.target.submit(); + + }); + + }); + @endpush From 07336322773644604ba3e9f0d32cbefa4b893c41 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Fri, 19 Jul 2024 11:59:15 +0800 Subject: [PATCH 7/8] Add masa attempt baya and masa attempt bayar for billplz transaction review --- .../views/online/billplz-transaction-review/index.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/online/billplz-transaction-review/index.blade.php b/resources/views/online/billplz-transaction-review/index.blade.php index ce2a003..08dd3c8 100644 --- a/resources/views/online/billplz-transaction-review/index.blade.php +++ b/resources/views/online/billplz-transaction-review/index.blade.php @@ -49,6 +49,8 @@ nokp: {{ $transaction['nokp'] }}
    total_payment: {{ $transaction['total_payment'] }}
    status: {{ $transaction['status'] }}
    + tarikh_attempt_bayar: {{ $transaction['tarikh_attempt_bayar'] }}
    + masa_attempt_bayar: {{ $transaction['masa_attempt_bayar'] }}
    paid_at: {{ $transaction['paid_at'] }}

    From 746847c67caa878d8b825ca4a28fd020b20a11f4 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Thu, 1 Aug 2024 13:56:39 +0800 Subject: [PATCH 8/8] Add online transaction log, group all the debug tool into 1 home page --- .../OnlineTransactionController.php | 17 +++ .../OnlineTransactionLogController.php | 20 +++ resources/views/layouts/sidebar.blade.php | 13 +- resources/views/online/log/index.blade.php | 131 ++++++++++++++++++ .../table-gldetail.blade.php | 2 +- .../views/onlineTransaction/home.blade.php | 65 +++++++++ routes/web.php | 4 + 7 files changed, 241 insertions(+), 11 deletions(-) create mode 100644 app/Http/Controllers/OnlineTransactionController.php create mode 100644 app/Http/Controllers/OnlineTransactionLogController.php create mode 100644 resources/views/online/log/index.blade.php create mode 100644 resources/views/onlineTransaction/home.blade.php diff --git a/app/Http/Controllers/OnlineTransactionController.php b/app/Http/Controllers/OnlineTransactionController.php new file mode 100644 index 0000000..eeabfe3 --- /dev/null +++ b/app/Http/Controllers/OnlineTransactionController.php @@ -0,0 +1,17 @@ +selectedDate ?? Carbon::now()->toDateString(); + + $transactionLog = Http::get(config('api.url') . '/api/transaction/online/log', ['date' => $date])->json(); + + $logs = collect($transactionLog)->groupBy('bill_id'); + + return view('online.log.index', compact('logs', 'date')); + } +} diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index f2f6abd..b18d644 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -260,22 +260,15 @@
    - -
  • -
    - - Trail Transaksi Online -
    -
    • -     - +
  • - Review Transaksi Billplz + Debug Transaksi Online
    • + {{--
  • diff --git a/resources/views/online/log/index.blade.php b/resources/views/online/log/index.blade.php new file mode 100644 index 0000000..4f07929 --- /dev/null +++ b/resources/views/online/log/index.blade.php @@ -0,0 +1,131 @@ +@extends('layouts.app') +@section('content') + @push('additional_styles') + + @endpush + + +
    + + + + @if (Session::has('errormessage')) + + @endif + +
    +
    + @forelse ($logs as $bill_id => $logs) +
    + + +
    + @empty +
    + No data available for the date selected +
    + @endforelse + +
    + @push('additional_scripts') + + @endpush +@endsection 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 index 3e5157a..6cabe67 100644 --- 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 @@ -50,7 +50,7 @@ - @ @empty + @empty
    No data available for the date selected
    diff --git a/resources/views/onlineTransaction/home.blade.php b/resources/views/onlineTransaction/home.blade.php new file mode 100644 index 0000000..f403175 --- /dev/null +++ b/resources/views/onlineTransaction/home.blade.php @@ -0,0 +1,65 @@ +@extends('layouts.app') + +@section('content') + +
    +
    + +
    + + + + + @if (Session::has('type')) + + @endif + + + +
    + +
    + +
    +

    Log Transaksi Online

    +     +
    + +
    + +
    + +
    +

    Trail Transaksi Online

    +     + + +
    + +
    +

    Review Transaksi Billplz

    +     + +
    + + +
    +
    + @include('layouts.footer') +@endsection diff --git a/routes/web.php b/routes/web.php index 23544f9..85cade8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,8 @@ 'tetapan.unsold-commo Route::get('/pengguna',['as'=>'pengguna','uses'=>'App\Http\Controllers\PenggunaController@index'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); //Payment online trail +Route::get('/transaction/online/home', OnlineTransactionController::class)->name('transaction.online.home'); Route::get('/transaction/online/trail', OnlineTransactionTrailController::class)->name('transaction.online.trail'); Route::get('/transaction/online/billplz-transaction-review', BillplzTransactionReviewController::class)->name('transaction.online.billplz-transaction-review'); +Route::get('/transaction/online/log', OnlineTransactionLogController::class)->name('transaction.online.log'); Route::get('{any}', function () {