Commit Graph

142 Commits

Author SHA1 Message Date
Jagad R R 3ffdb11d3a Merge branch 'main' into branch-jagad 2025-01-10 13:40:26 +07:00
Jagad Raya 4f6690d0b2 Merge branch 'branch-jagad' into 'main'
add region on filter generate report

See merge request fiqhpratama1/xpendify!22
2025-01-10 06:40:05 +00:00
Jagad R R 7f38095a1a add region on filter generate report 2025-01-10 13:38:11 +07:00
Jagad Raya 9356c93fd5 Merge branch 'branch-jagad' into 'main'
fix bug cannot approve

See merge request fiqhpratama1/xpendify!21
2025-01-10 06:17:09 +00:00
Jagad R R 0dec9277f7 fix bug cannot approve 2025-01-10 13:16:17 +07:00
Jagad Raya d93d11439a Merge branch 'branch-jagad' into 'main'
Branch jagad

See merge request fiqhpratama1/xpendify!20
2025-01-09 07:18:32 +00:00
Jagad R R 210203f964 add pengecekan jika melebihi budget 2025-01-09 14:17:28 +07:00
Jagad R R 154b3a274b Update LoginController.php 2025-01-09 13:39:10 +07:00
Jagad Raya edd28d1c66 Merge branch 'branch-jagad' into 'main'
add notif expense created

See merge request fiqhpratama1/xpendify!19
2025-01-09 06:24:17 +00:00
Jagad R R ace9ea2c9c add notif expense created 2025-01-09 13:22:56 +07:00
Jagad Raya 568d484c22 Merge branch 'branch-jagad' into 'main'
Branch jagad

See merge request fiqhpratama1/xpendify!18
2025-01-08 08:37:05 +00:00
Jagad R R 664ff183cd revised generate report 2025-01-08 15:36:08 +07:00
Jagad R R b0c04e30b6 fix bug logout (maybe) 2025-01-08 15:04:06 +07:00
Jagad R R 4d9a17cfbd added generate reports 2025-01-08 15:01:42 +07:00
Jagad R R 314fefd52d added crud data master region & cabang 2025-01-08 14:12:45 +07:00
Jagad Raya 8df48e8917 Merge branch 'branch-jagad' into 'main'
add budgets

See merge request fiqhpratama1/xpendify!17
2025-01-07 10:24:37 +00:00
Jagad R R 1027b0dfb4 add budgets 2025-01-07 17:23:42 +07:00
Jagad Raya be76667a60 Merge branch 'branch-jagad' into 'main'
add detail view for form other

See merge request fiqhpratama1/xpendify!16
2025-01-06 09:06:36 +00:00
Jagad R R 8c62fb6a19 add detail view for form other 2025-01-06 16:05:47 +07:00
Jagad Raya 741bc2d124 Merge branch 'branch-jagad' into 'main'
revised form vehicle, entertainment and other

See merge request fiqhpratama1/xpendify!15
2025-01-06 09:02:06 +00:00
Jagad R R 6f2946cd62 revised form vehicle, entertainment and other 2025-01-06 16:00:51 +07:00
Jagad Raya a84117bdde Merge branch 'branch-jagad' into 'main'
Update LoginController.php

See merge request fiqhpratama1/xpendify!14
2025-01-04 07:15:04 +00:00
Jagad R R e56708ef93 Update LoginController.php 2025-01-04 14:14:39 +07:00
Jagad Raya fe2ed585b3 Merge branch 'branch-jagad' into 'main'
Branch jagad

See merge request fiqhpratama1/xpendify!13
2025-01-04 07:09:53 +00:00
Jagad R R 4210ab5384 added url to whatsapp notif, email soon 2025-01-04 14:09:28 +07:00
Jagad R R cb1d1bb1e3 redirect to previous page on login 2025-01-04 14:00:05 +07:00
Jagad R R fbde09292d added view detail expense for up country & meeting seminar 2025-01-04 13:53:53 +07:00
Jagad R R 2cd0ed39f9 added optional on input label 2025-01-04 13:20:08 +07:00
Jagad R R ec02c3f024 revised form meeting seminar 2025-01-04 13:16:00 +07:00
Jagad R R c584c04dcb revised form up country (again) 2025-01-03 21:37:58 +07:00
Jagad R R 7d3566deb2 fix table role 2025-01-03 20:33:32 +07:00
Jagad Raya 741307d500 Merge branch 'branch-jagad' into 'main'
Update FormUpCountryController.php

See merge request fiqhpratama1/xpendify!12
2025-01-03 12:09:07 +00:00
Jagad R R 4540323ec5 Update FormUpCountryController.php 2025-01-03 19:08:34 +07:00
Jagad Raya 94a347e106 Merge branch 'branch-jagad' into 'main'
Update FormUpCountryController.php

See merge request fiqhpratama1/xpendify!11
2025-01-03 11:58:31 +00:00
Jagad R R 30128540e6 Update FormUpCountryController.php 2025-01-03 18:56:26 +07:00
Jagad Raya be48e903b0 Merge branch 'branch-jagad' into 'main'
Update FormUpCountryController.php

See merge request fiqhpratama1/xpendify!10
2025-01-02 11:52:09 +00:00
Jagad R R 5336b81e48 Update FormUpCountryController.php 2025-01-02 18:51:48 +07:00
Jagad Raya 06ff731b74 Merge branch 'branch-jagad' into 'main'
updated bukti validation

See merge request fiqhpratama1/xpendify!9
2025-01-02 11:51:04 +00:00
Jagad R R 4b714d340b updated bukti validation 2025-01-02 18:50:24 +07:00
Jagad Raya c15ea852cc Merge branch 'branch-jagad' into 'main'
Update FormUpCountryController.php

See merge request fiqhpratama1/xpendify!8
2025-01-02 11:42:43 +00:00
Jagad R R 8e08f3eda7 Update FormUpCountryController.php 2025-01-02 18:41:20 +07:00
Jagad Raya cc30620ac7 Merge branch 'branch-jagad' into 'main'
Branch jagad

See merge request fiqhpratama1/xpendify!7
2025-01-02 11:32:54 +00:00
Jagad R R a1af309462 Update index.blade.php 2025-01-02 18:32:09 +07:00
Jagad R R 0c052f379a minor fixes 2025-01-02 18:21:03 +07:00
Jagad R R 8255a530af revised approve system and some minor fixes 2025-01-02 17:59:33 +07:00
Jagad R R ff004299c1 changed bukti 2 & 3 to accept all file 2025-01-02 15:19:43 +07:00
Jagad R R 1510a9dbcb fix some bugs 2025-01-02 13:12:42 +07:00
Jagad Raya 3ed8a4e939 Merge branch 'branch-jagad' into 'main'
Branch jagad

See merge request fiqhpratama1/xpendify!6
2025-01-01 17:02:09 +00:00
Jagad R R d305fa179e added statistic cards 2025-01-01 23:59:49 +07:00
Jagad R R 1882e7a442 fix typo 2025-01-01 17:22:17 +07:00