Merge branch 'sindhu/history_transaksi_v2_17_01_2024_14_26'

app_petty_cash/android/app/src/main/AndroidManifest.xml

@@ -15,7 +15,9 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
+            >
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

app_petty_cash/lib/app/constant.dart

@@ -10,7 +10,10 @@ class Constant {
   static double designWidthPhone = 390;
 
   static String bearerName = "petty-cash";
-  static String version = "1.00";
+  // static String version = "1.00";
+
+  // NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
+  static String version = "1.0.0";
 
   // static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
 

app_petty_cash/lib/main.dart

@@ -8,6 +8,9 @@ import 'app/route.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   initializeDateFormatting();
+  await SystemChrome.setPreferredOrientations([
+    DeviceOrientation.portraitUp,
+  ]);
   SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
     statusBarIconBrightness:
         Brightness.dark, // this will change the brightness of the icons

app_petty_cash/lib/repository/transaksi_repository.dart

@@ -186,4 +186,33 @@ class TransaksiRepository extends BaseRepository {
 
     return resp['status'];
   }
+
+  // confirm transaksi
+  Future<String> confirmTransaksi(
+    String id,
+    String userid,
+  ) async {
+    final service =
+        "${Constant.baseUrlDevone}transaction/confirmtransaction/?id=$id&userid=$userid";
+    final resp = await get(
+      // param: {
+      //   "": "",
+      // },
+      service: service,
+    );
+
+    print("url confirm transaksi : $service");
+
+    // final result = List<ListCategory>.empty(growable: true);
+    // resp['data'].forEach((e) {
+    //   final model = ListCategory.fromJson(e);
+    //   result.add(model);
+    // });
+
+    if (resp['status'] != "OK") {
+      return resp['message'];
+    }
+
+    return resp['status'];
+  }
 }

app_petty_cash/lib/screen/home/home_screen.dart

@@ -28,6 +28,27 @@ class HomeScreen extends HookConsumerWidget {
     final listTransaksiHome = useState<List<ListTransaksiHomeModel>>(
       List.empty(growable: true),
     );
+    final M_CompanyName = useState("-");
+
+    // company name
+    Future<String> getCompanyName() async {
+      final shared = await SharedPreferences.getInstance();
+      String M_CompanyName = "-";
+
+      if (shared != null) {
+        final bearerString = shared.get(Constant.bearerName).toString();
+        final xmodel = jsonDecode(bearerString);
+        if (xmodel != null) {
+          M_CompanyName = xmodel["model"]["M_CompanyName"];
+        }
+      }
+
+      if (M_CompanyName == "0") {
+        // throw BaseRepositoryException(message: 'Invalid Company ID');
+      }
+
+      return M_CompanyName;
+    }
 
     useEffect(() {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
@@ -40,6 +61,7 @@ class HomeScreen extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
+        M_CompanyName.value = await getCompanyName();
       });
       return () {};
     }, []);
@@ -125,8 +147,12 @@ class HomeScreen extends HookConsumerWidget {
       child: Scaffold(
         appBar: AppBar(
           title: Text(
-            'Home Screen',
-            style: TextStyle(color: Constant.textWhite),
+            // 'Home Screen',
+            M_CompanyName.value,
+            overflow: TextOverflow.ellipsis,
+            style: TextStyle(
+              color: Constant.textWhite,
+            ),
           ),
           backgroundColor: Constant.pcBtnBackgroundColor,
           iconTheme: IconThemeData(

app_petty_cash/lib/screen/login/login_form.dart

@@ -114,7 +114,7 @@ class LoginFormScreen extends HookConsumerWidget {
             ),
             Container(
               width: Constant.getActualXPhone(context: context, x: 390),
-              height: Constant.getActualYPhone(context: context, y: 485),
+              // height: Constant.getActualYPhone(context: context, y: 485),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisAlignment: MainAxisAlignment.start,

app_petty_cash/lib/screen/report/report_screen.dart

@@ -82,226 +82,207 @@ class ReportScreen extends HookConsumerWidget {
         ),
         drawer: CustomDrawer(),
         body: SafeArea(
-          child: SingleChildScrollView(
-            child: Padding(
-              padding: EdgeInsets.all(20),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    'Tanggal Awal',
-                    style: Constant.body1(context: context).copyWith(
-                        fontWeight: FontWeight.w600, color: Constant.textBlack),
-                  ),
-                  SizedBox(
-                    height: Constant.getActualYPhone(context: context, y: 10),
-                  ),
-                  // Tanggal Awal
-                  Row(
-                    children: [
-                      Expanded(
-                        child: TextField(
-                          controller: ctrlTglAwal,
-                          decoration: InputDecoration(
-                            hintStyle:
-                                Constant.body2_400(context: context).copyWith(
-                              color: Colors.orange,
-                            ),
-                            labelStyle:
-                                Constant.body2_400(context: context).copyWith(
-                              color: Colors.orange,
-                            ),
-                            border: OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.orange,
-                                width: 1,
-                              ),
-                            ),
-                            focusedBorder: OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.orange,
-                                width: 1,
-                              ),
-                            ),
-                            // labelText: "Tanggal Awal",
-                            hintText: 'Tanggal Awal',
-                            // suffixIcon: isLoadingFilterScope.value
-                            //     ? SizedBox(
-                            //         width: Constant.getActualXPhone(
-                            //           context: context,
-                            //           x: 4,
-                            //         ),
-                            //         height: Constant.getActualYPhone(
-                            //           context: context,
-                            //           y: 4,
-                            //         ),
-                            //         child: CircularProgressIndicator(
-                            //           color: Constant.textRed,
-                            //         ),
-                            //       )
-                            //     : Icon(
-                            //         Icons.calendar_month_sharp,
-                            //         color: Constant.colorIconDate,
-                            //       ),
+          child: Padding(
+            padding: EdgeInsets.all(20),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  'Tanggal Awal',
+                  style: Constant.body1(context: context).copyWith(
+                      fontWeight: FontWeight.w600, color: Constant.textBlack),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 10),
+                ),
+                // Tanggal Awal
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextField(
+                        controller: ctrlTglAwal,
+                        decoration: InputDecoration(
+                          hintStyle:
+                              Constant.body2_400(context: context).copyWith(
+                            color: Colors.orange,
                           ),
-                          onTap: () async {
-                            final selectedDateAwal = await showDatePicker(
-                              // locale: const Locale("en-CA"),
-                              // locale: ,
-                              context: context,
-                              initialEntryMode:
-                                  DatePickerEntryMode.calendarOnly,
-                              firstDate: DateTime(2000),
-                              lastDate: DateTime(2100),
-
-                              initialDate: (ctrlTglAwal.text.isEmpty)
-                                  ? DateTime.now()
-                                  : tglAwal.value,
-                            );
-
-                            if (selectedDateAwal != null) {
-                              String formattedDate = DateFormat('dd-MM-yyyy')
-                                  .format(selectedDateAwal);
-                              // ctrlTglAwal.text =
-                              //     selectedDateAwal.toString().split(' ')[0];
-                              ctrlTglAwal.text = formattedDate;
-                              tglAwal.value = selectedDateAwal;
-                              tglAwalTmp.value = selectedDateAwal.toString();
-                            }
-
-                            if (selectedDateAwal == null) {
-                              print('cancel button');
-                              return;
-                            }
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-
-                  SizedBox(
-                    height: Constant.getActualYPhone(context: context, y: 20),
-                  ),
-
-                  Text(
-                    'Tanggal Akhir',
-                    style: Constant.body1(context: context).copyWith(
-                        fontWeight: FontWeight.w600, color: Constant.textBlack),
-                  ),
-                  SizedBox(
-                    height: Constant.getActualYPhone(context: context, y: 10),
-                  ),
-                  // Tanggal Akhir
-                  Row(
-                    children: [
-                      Expanded(
-                        child: TextField(
-                          controller: ctrlTglAkhir,
-                          decoration: InputDecoration(
-                            hintStyle:
-                                Constant.body2_400(context: context).copyWith(
-                              color: Colors.orange,
-                            ),
-                            labelStyle:
-                                Constant.body2_400(context: context).copyWith(
-                              color: Colors.orange,
-                            ),
-                            border: OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.orange,
-                                width: 1,
-                              ),
-                            ),
-                            focusedBorder: OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.orange,
-                                width: 1,
-                              ),
-                            ),
-                            // labelText: "Tanggal Awal",
-                            hintText: 'Tanggal Akhir',
-                            // suffixIcon: isLoadingFilterScope.value
-                            //     ? SizedBox(
-                            //         width: Constant.getActualXPhone(
-                            //           context: context,
-                            //           x: 4,
-                            //         ),
-                            //         height: Constant.getActualYPhone(
-                            //           context: context,
-                            //           y: 4,
-                            //         ),
-                            //         child: CircularProgressIndicator(
-                            //           color: Constant.textRed,
-                            //         ),
-                            //       )
-                            //     : Icon(
-                            //         Icons.calendar_month_sharp,
-                            //         color: Constant.colorIconDate,
-                            //       ),
+                          labelStyle:
+                              Constant.body2_400(context: context).copyWith(
+                            color: Colors.orange,
                           ),
-                          onTap: () async {
-                            final selectedDateAkhir = await showDatePicker(
-                              // locale: const Locale("en-CA"),
-                              // locale: ,
-                              context: context,
-                              initialEntryMode:
-                                  DatePickerEntryMode.calendarOnly,
-                              firstDate: DateTime(2000),
-                              lastDate: DateTime(2100),
-
-                              initialDate: (ctrlTglAkhir.text.isEmpty)
-                                  ? DateTime.now()
-                                  : tglAkhir.value,
-                            );
-
-                            if (selectedDateAkhir != null) {
-                              String formattedDate = DateFormat('dd-MM-yyyy')
-                                  .format(selectedDateAkhir);
-                              // ctrlTglAkhir.text =
-                              //     selectedDateAkhir.toString().split(' ')[0];
-                              ctrlTglAkhir.text = formattedDate;
-                              tglAkhir.value = selectedDateAkhir;
-                              tglAkhirTmp.value = selectedDateAkhir.toString();
-                            }
-
-                            if (selectedDateAkhir == null) {
-                              print('cancel button');
-                              return;
-                            }
-                          },
+                          border: OutlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Colors.orange,
+                              width: 1,
+                            ),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Colors.orange,
+                              width: 1,
+                            ),
+                          ),
+                          // labelText: "Tanggal Awal",
+                          hintText: 'Tanggal Awal',
+                          // suffixIcon: isLoadingFilterScope.value
+                          //     ? SizedBox(
+                          //         width: Constant.getActualXPhone(
+                          //           context: context,
+                          //           x: 4,
+                          //         ),
+                          //         height: Constant.getActualYPhone(
+                          //           context: context,
+                          //           y: 4,
+                          //         ),
+                          //         child: CircularProgressIndicator(
+                          //           color: Constant.textRed,
+                          //         ),
+                          //       )
+                          //     : Icon(
+                          //         Icons.calendar_month_sharp,
+                          //         color: Constant.colorIconDate,
+                          //       ),
                         ),
+                        onTap: () async {
+                          final selectedDateAwal = await showDatePicker(
+                            // locale: const Locale("en-CA"),
+                            // locale: ,
+                            context: context,
+                            initialEntryMode: DatePickerEntryMode.calendarOnly,
+                            firstDate: DateTime(2000),
+                            lastDate: DateTime(2100),
+
+                            initialDate: (ctrlTglAwal.text.isEmpty)
+                                ? DateTime.now()
+                                : tglAwal.value,
+                          );
+
+                          if (selectedDateAwal != null) {
+                            String formattedDate = DateFormat('dd-MM-yyyy')
+                                .format(selectedDateAwal);
+                            // ctrlTglAwal.text =
+                            //     selectedDateAwal.toString().split(' ')[0];
+                            ctrlTglAwal.text = formattedDate;
+                            tglAwal.value = selectedDateAwal;
+                            tglAwalTmp.value = selectedDateAwal.toString();
+                          }
+
+                          if (selectedDateAwal == null) {
+                            print('cancel button');
+                            return;
+                          }
+                        },
                       ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-        bottomNavigationBar: BottomAppBar(
-          height: 150,
-          child: Container(
-            child: Padding(
-              padding: EdgeInsets.only(
-                  // right: Constant.getActualXPhone(context: context, x: 27),
-                  // left: Constant.getActualXPhone(context: context, x: 27),
-                  // bottom: Constant.getActualYPhone(context: context, y: 32),
-                  // top: Constant.getActualYPhone(context: context, y: 24),
-                  ),
-              child: Column(
-                children: [
-                  // Excel
-                  Container(
-                    width: Constant.getActualXPhone(context: context, x: 336),
-                    height: Constant.getActualYPhone(context: context, y: 42),
-                    child: ElevatedButton(
+                    ),
+                  ],
+                ),
+
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 20),
+                ),
+
+                Text(
+                  'Tanggal Akhir',
+                  style: Constant.body1(context: context).copyWith(
+                      fontWeight: FontWeight.w600, color: Constant.textBlack),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 10),
+                ),
+                // Tanggal Akhir
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextField(
+                        controller: ctrlTglAkhir,
+                        decoration: InputDecoration(
+                          hintStyle:
+                              Constant.body2_400(context: context).copyWith(
+                            color: Colors.orange,
+                          ),
+                          labelStyle:
+                              Constant.body2_400(context: context).copyWith(
+                            color: Colors.orange,
+                          ),
+                          border: OutlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Colors.orange,
+                              width: 1,
+                            ),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Colors.orange,
+                              width: 1,
+                            ),
+                          ),
+                          // labelText: "Tanggal Awal",
+                          hintText: 'Tanggal Akhir',
+                          // suffixIcon: isLoadingFilterScope.value
+                          //     ? SizedBox(
+                          //         width: Constant.getActualXPhone(
+                          //           context: context,
+                          //           x: 4,
+                          //         ),
+                          //         height: Constant.getActualYPhone(
+                          //           context: context,
+                          //           y: 4,
+                          //         ),
+                          //         child: CircularProgressIndicator(
+                          //           color: Constant.textRed,
+                          //         ),
+                          //       )
+                          //     : Icon(
+                          //         Icons.calendar_month_sharp,
+                          //         color: Constant.colorIconDate,
+                          //       ),
+                        ),
+                        onTap: () async {
+                          final selectedDateAkhir = await showDatePicker(
+                            // locale: const Locale("en-CA"),
+                            // locale: ,
+                            context: context,
+                            initialEntryMode: DatePickerEntryMode.calendarOnly,
+                            firstDate: DateTime(2000),
+                            lastDate: DateTime(2100),
+
+                            initialDate: (ctrlTglAkhir.text.isEmpty)
+                                ? DateTime.now()
+                                : tglAkhir.value,
+                          );
+
+                          if (selectedDateAkhir != null) {
+                            String formattedDate = DateFormat('dd-MM-yyyy')
+                                .format(selectedDateAkhir);
+                            // ctrlTglAkhir.text =
+                            //     selectedDateAkhir.toString().split(' ')[0];
+                            ctrlTglAkhir.text = formattedDate;
+                            tglAkhir.value = selectedDateAkhir;
+                            tglAkhirTmp.value = selectedDateAkhir.toString();
+                          }
+
+                          if (selectedDateAkhir == null) {
+                            print('cancel button');
+                            return;
+                          }
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+
+                Spacer(),
+
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    ElevatedButton(
                       style: ButtonStyle(
                         backgroundColor: MaterialStateColor.resolveWith(
                             (states) => Colors.white),
                         // side: MaterialStateBorderSide.resolveWith(
                         //   (states) => BorderSide(color: Colors.green),
                         // ),
-
                         // backgroundColor: MaterialStateColor.resolveWith(
                         //     (st) => Constant.pcBtnBackgroundColor),
                         shape:
@@ -333,11 +314,11 @@ class ReportScreen extends HookConsumerWidget {
                             ),
                           ),
                           SizedBox(
-                            height: Constant.getActualXPhone(
-                                context: context, x: 8),
+                            width: Constant.getActualXPhone(
+                                context: context, x: 10),
                           ),
                           Text(
-                            'Download Report (xls) ',
+                            'Excel',
                             style: Constant.body1(context: context).copyWith(
                               fontWeight: FontWeight.w600,
                               color: Colors.green,
@@ -345,19 +326,41 @@ class ReportScreen extends HookConsumerWidget {
                           ),
                         ],
                       ),
-                      onPressed: () {},
+                      onPressed: () async {
+                        M_CompanyID = await getCompanyID();
+                        if(M_CompanyID == "0"){
+                          SanckbarWidget(context, 'Invalid Company', snackbarType.error);
+                          return;
+                        }
+                        // Awal
+                        DateTime parsedDateAwal =
+                            DateFormat('dd-MM-yyyy').parse(
+                          ctrlTglAwal.value.text.toString(),
+                        );
+                        String formattedDateAwal =
+                            DateFormat('yyyy-MM-dd').format(parsedDateAwal);
+
+                        // Akhir
+                        DateTime parsedDateAkhir =
+                            DateFormat('dd-MM-yyyy').parse(
+                          ctrlTglAwal.value.text.toString(),
+                        );
+                        String formattedDateAkhir =
+                            DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
+
+                        String url =
+                            "https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=xls&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20";
+                        if (!await launchUrl(Uri.parse(url))) {
+                          // throw Exception('Could not launch $url');
+                          SanckbarWidget(context, 'Could not launch $url',
+                              snackbarType.error);
+                        }
+                        // https://devone.aplikasi.web.id/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=pdf&PStartDate=2023-11-01&PEndDate=2023-12-30&PCompanyID=0&username=adminsas%20&tm=1701327096267
+                      },
                     ),
-                  ),
 
-                  SizedBox(
-                    height: Constant.getActualYPhone(context: context, y: 20),
-                  ),
-
-                  // PDF
-                  Container(
-                    width: Constant.getActualXPhone(context: context, x: 336),
-                    height: Constant.getActualYPhone(context: context, y: 42),
-                    child: ElevatedButton(
+                    // PDF
+                    ElevatedButton(
                       style: ButtonStyle(
                         backgroundColor: MaterialStateColor.resolveWith(
                             (st) => Constant.pcBtnBackgroundColor),
@@ -390,11 +393,11 @@ class ReportScreen extends HookConsumerWidget {
                             ),
                           ),
                           SizedBox(
-                            height: Constant.getActualXPhone(
+                            width: Constant.getActualXPhone(
                                 context: context, x: 8),
                           ),
                           Text(
-                            'Download Report (PDF)',
+                            'PDF',
                             style: Constant.body1(context: context).copyWith(
                                 fontWeight: FontWeight.w600,
                                 color: Constant.white),
@@ -402,7 +405,29 @@ class ReportScreen extends HookConsumerWidget {
                         ],
                       ),
                       onPressed: () async {
-                        String url = "https://pub.dev/packages?q=url+launcher";
+                        M_CompanyID = await getCompanyID();
+                        if(M_CompanyID == "0"){
+                          SanckbarWidget(context, 'Invalid Company', snackbarType.error);
+                          return;
+                        }
+                        // Awal
+                        DateTime parsedDateAwal =
+                            DateFormat('dd-MM-yyyy').parse(
+                          ctrlTglAwal.value.text.toString(),
+                        );
+                        String formattedDateAwal =
+                            DateFormat('yyyy-MM-dd').format(parsedDateAwal);
+
+                        // Akhir
+                        DateTime parsedDateAkhir =
+                            DateFormat('dd-MM-yyyy').parse(
+                          ctrlTglAwal.value.text.toString(),
+                        );
+                        String formattedDateAkhir =
+                            DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
+
+                        String url =
+                            "https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=pdf&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20";
                         if (!await launchUrl(Uri.parse(url))) {
                           // throw Exception('Could not launch $url');
                           SanckbarWidget(context, 'Could not launch $url',
@@ -410,9 +435,9 @@ class ReportScreen extends HookConsumerWidget {
                         }
                       },
                     ),
-                  ),
-                ],
-              ),
+                  ],
+                ),
+              ],
             ),
           ),
         ),

app_petty_cash/lib/screen/transaksi/confirm_transaksi_provider.dart

@@ -0,0 +1,84 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../repository/transaksi_repository.dart';
+import '../../provider/dio_provider.dart';
+import '../../repository/base_repository.dart';
+import 'search_history_transaksi_provider.dart';
+
+abstract class ConfirmTransaksiState extends Equatable {
+  final DateTime date;
+  const ConfirmTransaksiState(this.date);
+  @override
+  List<Object?> get props => [date];
+}
+
+class ConfirmTransaksiStateInit extends ConfirmTransaksiState {
+  ConfirmTransaksiStateInit() : super(DateTime.now());
+}
+
+class ConfirmTransaksiStateLoading extends ConfirmTransaksiState {
+  ConfirmTransaksiStateLoading() : super(DateTime.now());
+}
+
+class ConfirmTransaksiStateError extends ConfirmTransaksiState {
+  final String message;
+  ConfirmTransaksiStateError({
+    required this.message,
+  }) : super(DateTime.now());
+}
+
+class ConfirmTransaksiStateDone extends ConfirmTransaksiState {
+  // final List<ListType> model;
+  final String resp;
+  ConfirmTransaksiStateDone({
+    required this.resp,
+  }) : super(DateTime.now());
+}
+
+//notifier
+class ConfirmTransaksiNotifier extends StateNotifier<ConfirmTransaksiState> {
+  final Ref ref;
+  ConfirmTransaksiNotifier({
+    required this.ref,
+  }) : super(ConfirmTransaksiStateInit());
+
+  void confirmTransaksi(
+    String id,
+    String userid,
+    String companyid,
+    String tglAwal,
+    String tglAkhir,
+    String categoryid,
+  ) async {
+    try {
+      state = ConfirmTransaksiStateLoading();
+      final dio = ref.read(dioProvider);
+      final resp = await TransaksiRepository(dio: dio).confirmTransaksi(
+        id,
+        userid,
+      );
+      state = ConfirmTransaksiStateDone(resp: resp);
+
+      // search lagi buat get data
+      ref.read(searchHistoryTransaksiProvider.notifier).searchHistoryTransaksi(
+            companyid,
+            tglAwal,
+            tglAkhir,
+            categoryid,
+          );
+    } catch (e) {
+      if (e is BaseRepositoryException) {
+        state = ConfirmTransaksiStateError(message: e.message.toString());
+      } else {
+        state = ConfirmTransaksiStateError(message: e.toString());
+      }
+    }
+  }
+}
+
+//provider
+final confirmTransaksiProvider =
+    StateNotifierProvider<ConfirmTransaksiNotifier, ConfirmTransaksiState>(
+  (ref) => ConfirmTransaksiNotifier(ref: ref),
+);

app_petty_cash/lib/widget/custom_drawer.dart

@@ -91,235 +91,203 @@ class CustomDrawer extends HookConsumerWidget {
 
     final currentMenu = ref.read(currentPageProvider);
 
-    return Drawer(
-      elevation: 0,
-      shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(0))),
-      child: Container(
-        child: ListView(
-          // padding: EdgeInsets.only(
-          //   top: Constant.getActualYPhone(context: context, y: 10),
-          // ),
+    return Container(
+      width: Constant.getActualXPhone(context: context, x: 300),
+      height: Constant.getActualYPhone(context: context, y: 844),
+      child: Drawer(
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(0))),
+        child: Column(
           children: [
-            Container(
-              //    decoration: BoxDecoration(
-              //   border: Border(bottom: BorderSide(color: Colors.transparent)) // <--- use the global theme to change the dividerColor property
-              // ),
-              child: Image(
-                  image: AssetImage('images/logo_sismedika_landscape.png')),
-            ),
+            Expanded(
+              child: ListView(
+                children: [
+                  Container(
+                    child: Image(
+                        image:
+                            AssetImage('images/logo_sismedika_landscape.png')),
+                  ),
 
-            SizedBox(
-              height: Constant.getActualYPhone(context: context, y: 8),
-            ),
+                  SizedBox(
+                    height: Constant.getActualYPhone(context: context, y: 8),
+                  ),
 
+                  Padding(
+                    padding: EdgeInsets.only(
+                      top: Constant.getActualYPhone(context: context, y: 10),
+                      bottom: Constant.getActualYPhone(context: context, y: 10),
+                      right: Constant.getActualXPhone(context: context, x: 24),
+                      left: Constant.getActualXPhone(context: context, x: 24),
+                    ),
+                    child: Container(
+                      width: Constant.getActualXPhone(context: context, x: 300),
+                    ),
+                  ),
+
+                  //   child: Padding(
+                  //     padding: EdgeInsets.only(
+                  //       left: Constant.getActualXPhone(context: context, x: 24),
+                  //       right: Constant.getActualXPhone(context: context, x: 71),
+                  //     ),
+                  //     child: Container(
+                  //       decoration: BoxDecoration(
+                  //         borderRadius: BorderRadius.circular(6),
+                  //         color: Constant.textGrey.withOpacity(0.16),
+                  //       ),
+                  //       child: Padding(
+                  //         padding: EdgeInsets.only(
+                  //           left: Constant.getActualXPhone(context: context, x: 8),
+                  //           right: Constant.getActualXPhone(context: context, x: 8),
+                  //         ),
+                  //         child: Text(
+                  //           M_CompanyName.value,
+                  //           style: Constant.body3(context: context).copyWith(
+                  //             fontWeight: FontWeight.w700,
+                  //             color: Constant.textGreyv2,
+                  //             backgroundColor: Constant.textGrey.withOpacity(0.16),
+                  //           ),
+                  //         ),
+                  //       ),
+                  //     ),
+                  //   ),
+                  // ),
+                  Chip(
+                    backgroundColor: Constant.textGrey.withOpacity(0.16),
+                    label: Text(
+                      M_CompanyName.value,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        color: Constant.textGreyv2,
+                      ),
+                    ),
+                  ),
+
+                  ListTile(
+                    leading: Icon(
+                      Icons.home,
+                      color: (currentMenu == 0)
+                          ? Constant.pcBtnBackgroundColor
+                          : Constant.textGreyv2,
+                    ),
+                    title: Text(
+                      'Home',
+                      style: TextStyle(
+                        color: (currentMenu == 0)
+                            ? Constant.pcBtnBackgroundColor
+                            : Constant.textGreyv2,
+                      ),
+                    ),
+                    onTap: () {
+                      // Handle navigation to Home screen
+                      Navigator.pop(context);
+                      ref.read(currentPageProvider.state).update((state) => 0);
+                      Navigator.pushNamed(context, homeRoute);
+                    },
+                  ),
+                  ListTile(
+                    leading: Icon(
+                      Icons.money,
+                      color: (currentMenu == 1)
+                          ? Constant.pcBtnBackgroundColor
+                          : Constant.textGreyv2,
+                    ),
+                    title: Text(
+                      'Transaksi',
+                      style: TextStyle(
+                        color: (currentMenu == 1)
+                            ? Constant.pcBtnBackgroundColor
+                            : Constant.textGreyv2,
+                      ),
+                    ),
+                    onTap: () {
+                      // Handle navigation to Transaksi screen
+                      Navigator.pop(context);
+                      ref.read(currentPageProvider.state).update((state) => 1);
+                      Navigator.pushNamed(context, transaksiRoute);
+                    },
+                  ),
+                  ListTile(
+                    leading: Icon(
+                      Icons.history,
+                      color: (currentMenu == 2)
+                          ? Constant.pcBtnBackgroundColor
+                          : Constant.textGreyv2,
+                    ),
+                    title: Text(
+                      'History Transaksi',
+                      style: TextStyle(
+                        color: (currentMenu == 2)
+                            ? Constant.pcBtnBackgroundColor
+                            : Constant.textGreyv2,
+                      ),
+                    ),
+                    onTap: () {
+                      // Handle navigation to User screen
+                      Navigator.pop(context);
+                      ref.read(currentPageProvider.state).update((state) => 2);
+                      Navigator.pushNamed(context, historyTransaksiRoute);
+                    },
+                  ),
+                  ListTile(
+                    leading: Icon(
+                      Icons.feed,
+                      color: (currentMenu == 3)
+                          ? Constant.pcBtnBackgroundColor
+                          : Constant.textGreyv2,
+                    ),
+                    title: Text(
+                      'Report',
+                      style: TextStyle(
+                        color: (currentMenu == 3)
+                            ? Constant.pcBtnBackgroundColor
+                            : Constant.textGreyv2,
+                      ),
+                    ),
+                    onTap: () {
+                      // Handle navigation to Transaksi screen
+                      Navigator.pop(context);
+                      ref.read(currentPageProvider.state).update((state) => 3);
+                      Navigator.pushNamed(context, reportRoute);
+                    },
+                  ),
+                  ListTile(
+                    leading: Icon(
+                      Icons.logout,
+                      color: Constant.textGreyv2,
+                    ),
+                    title: Text(
+                      'Logout',
+                      style: TextStyle(color: Constant.textGreyv2),
+                    ),
+                    onTap: () {
+                      // di set ke 0 lagi
+                      ref.read(currentPageProvider.state).update((state) => 0);
+                      ref.read(logoutProvider.notifier).logout(
+                            M_UserID: selectedUser?.model.M_UserID ?? "",
+                            M_UserUsername:
+                                selectedUser?.model.M_UserUsername ?? "",
+                          );
+                    },
+                  ),
+                ],
+              ),
+            ),
+            // Versi Aplikasi
             Padding(
               padding: EdgeInsets.only(
-                top: Constant.getActualYPhone(context: context, y: 10),
+                right: Constant.getActualXPhone(context: context, x: 20),
                 bottom: Constant.getActualYPhone(context: context, y: 10),
-                right: Constant.getActualXPhone(context: context, x: 24),
-                left: Constant.getActualXPhone(context: context, x: 24),
               ),
-              child: Container(
-                width: Constant.getActualXPhone(context: context, x: 300),
-              ),
-            ),
-
-            // Expanded(
-            //   child: Padding(
-            //     padding: EdgeInsets.only(
-            //       left: Constant.getActualXPhone(context: context, x: 24),
-            //       right: Constant.getActualXPhone(context: context, x: 71),
-            //     ),
-            //     child: Container(
-            //       decoration: BoxDecoration(
-            //         borderRadius: BorderRadius.circular(6),
-            //         color: Constant.textGrey.withOpacity(0.16),
-            //       ),
-            //       child: Padding(
-            //         padding: EdgeInsets.only(
-            //           left: Constant.getActualXPhone(context: context, x: 8),
-            //           right: Constant.getActualXPhone(context: context, x: 8),
-            //         ),
-            //         child: Text(
-            //           M_CompanyName.value,
-            //           style: Constant.body3(context: context).copyWith(
-            //             fontWeight: FontWeight.w700,
-            //             color: Constant.textGreyv2,
-            //             backgroundColor: Constant.textGrey.withOpacity(0.16),
-            //           ),
-            //         ),
-            //       ),
-            //     ),
-            //   ),
-            // ),
-
-            Chip(
-              backgroundColor: Constant.textGrey.withOpacity(0.16),
-              label: Text(
-                M_CompanyName.value,
-                style: TextStyle(
-                  color: Constant.textGreyv2,
+              child: Align(
+                alignment: Alignment.bottomRight,
+                child: Text(
+                  'Versi ${Constant.version}',
+                  style: Constant.titleH4Login(context: context)
+                      .copyWith(color: Constant.textGrey),
                 ),
               ),
             ),
-
-            ListTile(
-              leading: Icon(
-                Icons.home,
-                color: (currentMenu == 0)
-                    ? Constant.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
-              ),
-              title: Text(
-                'Home',
-                style: TextStyle(
-                  color: (currentMenu == 0)
-                      ? Constant.pcBtnBackgroundColor
-                      : Constant.textGreyv2,
-                ),
-              ),
-              // tileColor: (currentMenu == 0)
-              //     ? Constant.pcBtnBackgroundColor
-              //     : Colors.transparent,
-              onTap: () {
-                // Handle navigation to Home screen
-                Navigator.pop(context);
-                ref.read(currentPageProvider.state).update((state) => 0);
-                Navigator.pushNamed(context, homeRoute);
-              },
-            ),
-            ListTile(
-              leading: Icon(
-                Icons.money,
-                color: (currentMenu == 1)
-                    ? Constant.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
-              ),
-              title: Text(
-                'Transaksi',
-                style: TextStyle(
-                  color: (currentMenu == 1)
-                      ? Constant.pcBtnBackgroundColor
-                      : Constant.textGreyv2,
-                ),
-              ),
-              // tileColor: (currentMenu == 1)
-              //     ? Constant.pcBtnBackgroundColor
-              //     : Colors.transparent,
-              onTap: () {
-                // Handle navigation to Transaksi screen
-                Navigator.pop(context);
-                ref.read(currentPageProvider.state).update((state) => 1);
-                Navigator.pushNamed(context, transaksiRoute);
-              },
-            ),
-            ListTile(
-              leading: Icon(
-                Icons.history,
-                color: (currentMenu == 2)
-                    ? Constant.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
-              ),
-              title: Text(
-                'History Transaksi',
-                style: TextStyle(
-                  color: (currentMenu == 2)
-                      ? Constant.pcBtnBackgroundColor
-                      : Constant.textGreyv2,
-                ),
-              ),
-              // tileColor: (currentMenu == 2)
-              //     ? Constant.pcBtnBackgroundColor
-              //     : Colors.transparent,
-              onTap: () {
-                // Handle navigation to User screen
-                Navigator.pop(context);
-                ref.read(currentPageProvider.state).update((state) => 2);
-                Navigator.pushNamed(context, historyTransaksiRoute);
-              },
-            ),
-            ListTile(
-              leading: Icon(
-                Icons.feed,
-                color: (currentMenu == 3)
-                    ? Constant.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
-              ),
-              title: Text(
-                'Report',
-                style: TextStyle(
-                  color: (currentMenu == 3)
-                      ? Constant.pcBtnBackgroundColor
-                      : Constant.textGreyv2,
-                ),
-              ),
-              // tileColor: (currentMenu == 3)
-              //     ? Constant.pcBtnBackgroundColor
-              //     : Colors.transparent,
-              onTap: () {
-                // Handle navigation to Transaksi screen
-                Navigator.pop(context);
-                ref.read(currentPageProvider.state).update((state) => 3);
-                Navigator.pushNamed(context, reportRoute);
-              },
-            ),
-            // ListTile(
-            //   title: Text(
-            //     'User',
-            //     style: TextStyle(
-            //       color: (currentMenu == 4)
-            //           ? Constant.textWhite
-            //           : Constant.textBlack,
-            //     ),
-            //   ),
-            //   tileColor: (currentMenu == 4)
-            //       ? Constant.pcBtnBackgroundColor
-            //       : Colors.transparent,
-            //   onTap: () {
-            //     // Handle navigation to User screen
-            //     Navigator.pop(context);
-            //     ref.read(currentPageProvider.state).update((state) => 4);
-            //     Navigator.pushNamed(context, userRoute);
-            //   },
-            // ),
-            // ListTile(
-            //   title: Text(
-            //     'Change Company',
-            //     style: TextStyle(
-            //       color: (currentMenu == 5)
-            //           ? Constant.textWhite
-            //           : Constant.textBlack,
-            //     ),
-            //   ),
-            //   tileColor: (currentMenu == 5)
-            //       ? Constant.pcBtnBackgroundColor
-            //       : Colors.transparent,
-            //   onTap: () {
-            //     // Handle navigation to User screen
-            //     Navigator.pop(context);
-            //     ref.read(currentPageProvider.state).update((state) => 5);
-            //     Navigator.pushNamed(context, changeCompanyRoute);
-            //   },
-            // ),
-            ListTile(
-              leading: Icon(
-                Icons.logout,
-                color: Constant.textGreyv2,
-              ),
-              title: Text(
-                'Logout',
-                style: TextStyle(color: Constant.textGreyv2),
-              ),
-              onTap: () {
-                // di set ke 0 lagi
-                ref.read(currentPageProvider.state).update((state) => 0);
-                ref.read(logoutProvider.notifier).logout(
-                      M_UserID: selectedUser?.model.M_UserID ?? "",
-                      M_UserUsername: selectedUser?.model.M_UserUsername ?? "",
-                    );
-              },
-            ),
           ],
         ),
       ),

app_petty_cash/lib/widget/custom_drawer_v2.dart

@@ -0,0 +1,341 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../app/constant.dart';
+import '../app/route.dart';
+import '../provider/current_menu_provider.dart';
+import '../provider/current_user_provider.dart';
+import '../screen/login/logout_provider.dart';
+
+class CustomDrawerV2 extends HookConsumerWidget {
+  // final String userCompany;
+  const CustomDrawerV2({
+    Key? key,
+    // required this.userCompany,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectedUser = ref.read(currentUserProvider);
+    final isLoading = useState(false);
+    final errorMessage = useState("");
+    final successMessage = useState("");
+    final M_CompanyName = useState("-");
+
+    Future<String> getCompanyName() async {
+      final shared = await SharedPreferences.getInstance();
+      String M_CompanyName = "-";
+
+      if (shared != null) {
+        final bearerString = shared.get(Constant.bearerName).toString();
+        final xmodel = jsonDecode(bearerString);
+        if (xmodel != null) {
+          M_CompanyName = xmodel["model"]["M_CompanyName"];
+        }
+      }
+
+      if (M_CompanyName == "0") {
+        // throw BaseRepositoryException(message: 'Invalid Company ID');
+      }
+
+      return M_CompanyName;
+    }
+
+    useEffect(() {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+        final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
+        if (userID == "0") {
+          //not login
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil(loginRoute, (route) => true);
+
+          //  Navigator.popAndPushNamed(context, loginRoute);
+          return;
+        }
+        M_CompanyName.value = await getCompanyName();
+      });
+      return () {};
+    }, []);
+
+    ref.listen(logoutProvider, (prev, next) async {
+      if (next is LogoutStateLoading) {
+        isLoading.value = true;
+      } else if (next is LogoutStateError) {
+        isLoading.value = false;
+        errorMessage.value = next.message;
+        Timer(const Duration(seconds: 3), () {
+          errorMessage.value = "";
+        });
+      } else if (next is LogoutStateDone) {
+        isLoading.value = false;
+        final shared = await SharedPreferences.getInstance();
+        final bearerString = shared.get(Constant.bearerName).toString();
+        // print(bearerString);
+        if (bearerString.isNotEmpty) {
+          shared.remove(bearerString);
+          shared.clear();
+          // Navigator.popAndPushNamed(context, loginRoute);
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil(loginRoute, (route) => false);
+        }
+        Timer(const Duration(seconds: 3), () async {
+          successMessage.value = "";
+        });
+      }
+    });
+
+    final currentMenu = ref.read(currentPageProvider);
+
+    return Drawer(
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(0))),
+      child: Container(
+        child: ListView(
+          // padding: EdgeInsets.only(
+          //   top: Constant.getActualYPhone(context: context, y: 10),
+          // ),
+          children: [
+            Container(
+              //    decoration: BoxDecoration(
+              //   border: Border(bottom: BorderSide(color: Colors.transparent)) // <--- use the global theme to change the dividerColor property
+              // ),
+              child: Image(
+                  image: AssetImage('images/logo_sismedika_landscape.png')),
+            ),
+
+            SizedBox(
+              height: Constant.getActualYPhone(context: context, y: 8),
+            ),
+
+            Padding(
+              padding: EdgeInsets.only(
+                top: Constant.getActualYPhone(context: context, y: 10),
+                bottom: Constant.getActualYPhone(context: context, y: 10),
+                right: Constant.getActualXPhone(context: context, x: 24),
+                left: Constant.getActualXPhone(context: context, x: 24),
+              ),
+              child: Container(
+                width: Constant.getActualXPhone(context: context, x: 300),
+              ),
+            ),
+
+            // Expanded(
+            //   child: Padding(
+            //     padding: EdgeInsets.only(
+            //       left: Constant.getActualXPhone(context: context, x: 24),
+            //       right: Constant.getActualXPhone(context: context, x: 71),
+            //     ),
+            //     child: Container(
+            //       decoration: BoxDecoration(
+            //         borderRadius: BorderRadius.circular(6),
+            //         color: Constant.textGrey.withOpacity(0.16),
+            //       ),
+            //       child: Padding(
+            //         padding: EdgeInsets.only(
+            //           left: Constant.getActualXPhone(context: context, x: 8),
+            //           right: Constant.getActualXPhone(context: context, x: 8),
+            //         ),
+            //         child: Text(
+            //           M_CompanyName.value,
+            //           style: Constant.body3(context: context).copyWith(
+            //             fontWeight: FontWeight.w700,
+            //             color: Constant.textGreyv2,
+            //             backgroundColor: Constant.textGrey.withOpacity(0.16),
+            //           ),
+            //         ),
+            //       ),
+            //     ),
+            //   ),
+            // ),
+
+            Chip(
+              backgroundColor: Constant.textGrey.withOpacity(0.16),
+              label: Text(
+                M_CompanyName.value,
+                overflow: TextOverflow.ellipsis,
+                style: TextStyle(
+                  color: Constant.textGreyv2,
+                ),
+              ),
+            ),
+
+            ListTile(
+              leading: Icon(
+                Icons.home,
+                color: (currentMenu == 0)
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
+              ),
+              title: Text(
+                'Home',
+                style: TextStyle(
+                  color: (currentMenu == 0)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 0)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Home screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 0);
+                Navigator.pushNamed(context, homeRoute);
+              },
+            ),
+            ListTile(
+              leading: Icon(
+                Icons.money,
+                color: (currentMenu == 1)
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
+              ),
+              title: Text(
+                'Transaksi',
+                style: TextStyle(
+                  color: (currentMenu == 1)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 1)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Transaksi screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 1);
+                Navigator.pushNamed(context, transaksiRoute);
+              },
+            ),
+            ListTile(
+              leading: Icon(
+                Icons.history,
+                color: (currentMenu == 2)
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
+              ),
+              title: Text(
+                'History Transaksi',
+                style: TextStyle(
+                  color: (currentMenu == 2)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 2)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to User screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 2);
+                Navigator.pushNamed(context, historyTransaksiRoute);
+              },
+            ),
+            ListTile(
+              leading: Icon(
+                Icons.feed,
+                color: (currentMenu == 3)
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
+              ),
+              title: Text(
+                'Report',
+                style: TextStyle(
+                  color: (currentMenu == 3)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 3)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Transaksi screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 3);
+                Navigator.pushNamed(context, reportRoute);
+              },
+            ),
+            // ListTile(
+            //   title: Text(
+            //     'User',
+            //     style: TextStyle(
+            //       color: (currentMenu == 4)
+            //           ? Constant.textWhite
+            //           : Constant.textBlack,
+            //     ),
+            //   ),
+            //   tileColor: (currentMenu == 4)
+            //       ? Constant.pcBtnBackgroundColor
+            //       : Colors.transparent,
+            //   onTap: () {
+            //     // Handle navigation to User screen
+            //     Navigator.pop(context);
+            //     ref.read(currentPageProvider.state).update((state) => 4);
+            //     Navigator.pushNamed(context, userRoute);
+            //   },
+            // ),
+            // ListTile(
+            //   title: Text(
+            //     'Change Company',
+            //     style: TextStyle(
+            //       color: (currentMenu == 5)
+            //           ? Constant.textWhite
+            //           : Constant.textBlack,
+            //     ),
+            //   ),
+            //   tileColor: (currentMenu == 5)
+            //       ? Constant.pcBtnBackgroundColor
+            //       : Colors.transparent,
+            //   onTap: () {
+            //     // Handle navigation to User screen
+            //     Navigator.pop(context);
+            //     ref.read(currentPageProvider.state).update((state) => 5);
+            //     Navigator.pushNamed(context, changeCompanyRoute);
+            //   },
+            // ),
+            ListTile(
+              leading: Icon(
+                Icons.logout,
+                color: Constant.textGreyv2,
+              ),
+              title: Text(
+                'Logout',
+                style: TextStyle(color: Constant.textGreyv2),
+              ),
+              onTap: () {
+                // di set ke 0 lagi
+                ref.read(currentPageProvider.state).update((state) => 0);
+                ref.read(logoutProvider.notifier).logout(
+                      M_UserID: selectedUser?.model.M_UserID ?? "",
+                      M_UserUsername: selectedUser?.model.M_UserUsername ?? "",
+                    );
+              },
+            ),
+
+            Spacer(),
+
+            // Versi Aplikasi
+            ListTile(
+              title: Text(
+                'Versi ${Constant.version}',
+                style: Constant.titleH4Login(context: context)
+                    .copyWith(color: Constant.textGrey),
+              ),
+              onTap: () {},
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

app_petty_cash/lib/widget/history_row_atas_widget.dart

@@ -92,7 +92,7 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
     String formatDateString(String inputDate) {
       try {
         // Parsing tanggal dari string input
-        DateTime date = DateFormat('dd-MM-yyyy','id').parse(inputDate);
+        DateTime date = DateFormat('dd-MM-yyyy', 'id').parse(inputDate);
 
         // Format tanggal ke '30 Des 2023'
         String formattedDate = DateFormat('dd MMM yyyy', 'id').format(date);
@@ -108,19 +108,71 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
 
     Widget getIconUrl(String categoryid) {
       List<Map<String, String>> iconDataList = [
-        {'categoryid': '1', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '2', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '3', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_3.svg'},
-        {'categoryid': '4', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '5', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_5.svg'},
-        {'categoryid': '6', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_6.svg'},
-        {'categoryid': '7', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '8', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '9', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '10', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '11', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '12', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_12.svg'},
-        {'categoryid': '13', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {
+          'categoryid': '1',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '2',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '3',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_3.svg'
+        },
+        {
+          'categoryid': '4',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '5',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_5.svg'
+        },
+        {
+          'categoryid': '6',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_6.svg'
+        },
+        {
+          'categoryid': '7',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '8',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '9',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '10',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '11',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
+        {
+          'categoryid': '12',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_12.svg'
+        },
+        {
+          'categoryid': '13',
+          'url':
+              'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'
+        },
       ];
 
       String urlFix = "";
@@ -130,7 +182,8 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
           // urlFix =
           //     "https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg";
 
-          urlFix = iconDataList[i]['url'] ?? "https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg";
+          urlFix = iconDataList[i]['url'] ??
+              "https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg";
         }
       }
 
@@ -271,21 +324,23 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 Container(
-                  // width: Constant.getActualXPhone(context: context, x: 32),
-                  height: Constant.getActualYPhone(context: context, y: 19),
+                  width: Constant.getActualXPhone(context: context, x: 80),
+                  height: Constant.getActualYPhone(context: context, y: 24),
                   decoration: BoxDecoration(
                     color: Constant.bgIconHistory,
                     borderRadius: BorderRadius.all(
                       Radius.circular(6.0),
                     ),
                   ),
-                  child: Padding(
-                    padding: EdgeInsets.all(2.0),
+                  child: Align(
+                    alignment: Alignment.center,
                     child: Text(
                       tipe,
                       style: Constant.body1_600(context: context).copyWith(
-                          fontWeight: FontWeight.w600,
-                          color: Constant.pcBtnBackgroundColor),
+                        fontWeight: FontWeight.w600,
+                        color: Constant.pcBtnBackgroundColor,
+                        fontSize: 14,
+                      ),
                     ),
                   ),
                 ),

app_petty_cash/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,12 +9,10 @@ import file_selector_macos
 import path_provider_foundation
 import shared_preferences_foundation
 import url_launcher_macos
-import video_player_avfoundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
 }

app_petty_cash/pubspec.lock

@@ -85,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.1"
   convert:
     dependency: transitive
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.3+7"
   crypto:
     dependency: transitive
     description:
@@ -316,10 +316,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -436,26 +436,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   mime:
     dependency: "direct main"
     description:
@@ -689,18 +689,18 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   state_notifier:
     dependency: transitive
     description:
@@ -713,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -737,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.5.1"
   top_snackbar_flutter:
     dependency: "direct main"
     description:
@@ -857,10 +857,10 @@ packages:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2
+      sha256: "74b86e63529cf5885130c639d74cd2f9232e7c8a66cbecbddd1dcb9dbd060d1e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.7.2"
   video_player_android:
     dependency: transitive
     description:
@@ -873,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed"
+      sha256: bf1a1322bf68bccd349982ba1f5a41314a3880861fb9a93d25d6d0a2345845f0
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.4.11"
   video_player_platform_interface:
     dependency: transitive
     description:
@@ -889,18 +889,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb"
+      sha256: "9c34a243785feca23148bfcd772dbb803d63c9304488177ec4f3f4463802fcb7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
+    version: "2.0.17"
   win32:
     dependency: transitive
     description:
@@ -934,5 +926,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.0.6 <4.0.0"
+  flutter: ">=3.10.0"

app_petty_cash/pubspec.yaml

@@ -76,20 +76,20 @@ dev_dependencies:
 flutter_launcher_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "images/logo_apk.png"
+  image_path: "images/logo_apk_v2.png"
   min_sdk_android: 21 # android min sdk min:16, default 21
   web:
     generate: true
-    image_path: "images/logo_apk.png"
+    image_path: "images/logo_apk_v2.png"
     background_color: "#00FFFFFF"
     theme_color: "#00FFFFFF"
   windows:
     generate: true
-    image_path: "images/logo_apk.png"
+    image_path: "images/logo_apk_v2.png"
     icon_size: 48 # min:48, max:256, default: 48
   macos:
     generate: true
-    image_path: "images/logo_apk.png"
+    image_path: "images/logo_apk_v2.png"
 
 # The following section is specific to Flutter packages.
 flutter: