lib/data/datasources/payment_methods_remote_datasource.dart

@@ -1,34 +1,40 @@
 import 'dart:developer';
 
 import 'package:dartz/dartz.dart';
+import 'package:dio/dio.dart';
 import 'package:enaklo_pos/core/constants/variables.dart';
+import 'package:enaklo_pos/core/network/dio_client.dart';
 import 'package:enaklo_pos/data/datasources/auth_local_datasource.dart';
 import 'package:enaklo_pos/data/models/response/payment_methods_response_model.dart';
-import 'package:http/http.dart' as http;
 
 class PaymentMethodsRemoteDatasource {
-  Future<Either<String, PaymentMethodsResponseModel>> getPaymentMethods() async {
+  final Dio dio = DioClient.instance;
+  Future<Either<String, PaymentMethodsResponseModel>>
+      getPaymentMethods() async {
     try {
       final authData = await AuthLocalDataSource().getAuthData();
-      final response = await http.get(
+      final response = await dio.get(
-        Uri.parse('${Variables.baseUrl}/api/payment-methods'),
+        '${Variables.baseUrl}/api/v1/payment-methods',
+        options: Options(
           headers: {
             'Authorization': 'Bearer ${authData.token}',
             'Accept': 'application/json',
           },
+        ),
       );
 
-      log("Payment Methods Response Status: ${response.statusCode}");
-      log("Payment Methods Response Body: ${response.body}");
-      
       if (response.statusCode == 200) {
-        return Right(PaymentMethodsResponseModel.fromJson(response.body));
+        return Right(PaymentMethodsResponseModel.fromMap(response.data));
       } else {
         return const Left('Failed to get payment methods');
       }
+    } on DioException catch (e) {
+      log("Dio error: ${e.message}");
+      return Left(
+          e.response?.data['message'] ?? 'Failed to get payment methods');
     } catch (e) {
       log("Error getting payment methods: $e");
-      return Left('Error: $e');
+      return Left('Unexpected error');
     }
   }
 }

lib/data/models/response/payment_methods_response_model.dart

@@ -1,12 +1,14 @@
 import 'dart:convert';
 
 class PaymentMethodsResponseModel {
-  final String? status;
+  final bool? success;
-  final List<PaymentMethod>? data;
+  final PaymentMethodsData? data;
+  final dynamic errors;
 
   PaymentMethodsResponseModel({
-    this.status,
+    this.success,
     this.data,
+    this.errors,
   });
 
   factory PaymentMethodsResponseModel.fromJson(String str) =>
@@ -16,51 +18,83 @@ class PaymentMethodsResponseModel {
 
   factory PaymentMethodsResponseModel.fromMap(Map<String, dynamic> json) =>
       PaymentMethodsResponseModel(
-        status: json["status"],
+        success: json["success"],
         data: json["data"] == null
-            ? []
+            ? null
-            : List<PaymentMethod>.from(
+            : PaymentMethodsData.fromMap(json["data"]),
-                json["data"]!.map((x) => PaymentMethod.fromMap(x))),
+        errors: json["errors"],
       );
 
   Map<String, dynamic> toMap() => {
-        "status": status,
+        "success": success,
-        "data": data == null
+        "data": data?.toMap(),
+        "errors": errors,
+      };
+}
+
+class PaymentMethodsData {
+  final List<PaymentMethod>? paymentMethods;
+  final int? totalCount;
+  final int? page;
+  final int? limit;
+  final int? totalPages;
+
+  PaymentMethodsData({
+    this.paymentMethods,
+    this.totalCount,
+    this.page,
+    this.limit,
+    this.totalPages,
+  });
+
+  factory PaymentMethodsData.fromMap(Map<String, dynamic> json) =>
+      PaymentMethodsData(
+        paymentMethods: json["payment_methods"] == null
             ? []
-            : List<dynamic>.from(data!.map((x) => x.toMap())),
+            : List<PaymentMethod>.from(
+                json["payment_methods"].map((x) => PaymentMethod.fromMap(x))),
+        totalCount: json["total_count"],
+        page: json["page"],
+        limit: json["limit"],
+        totalPages: json["total_pages"],
+      );
+
+  Map<String, dynamic> toMap() => {
+        "payment_methods": paymentMethods == null
+            ? []
+            : List<dynamic>.from(paymentMethods!.map((x) => x.toMap())),
+        "total_count": totalCount,
+        "page": page,
+        "limit": limit,
+        "total_pages": totalPages,
       };
 }
 
 class PaymentMethod {
-  final int? id;
+  final String? id;
+  final String? organizationId;
   final String? name;
-  final String? description;
+  final String? type;
   final bool? isActive;
-  final int? sortOrder;
   final DateTime? createdAt;
   final DateTime? updatedAt;
 
   PaymentMethod({
     this.id,
+    this.organizationId,
     this.name,
-    this.description,
+    this.type,
     this.isActive,
-    this.sortOrder,
     this.createdAt,
     this.updatedAt,
   });
 
-  factory PaymentMethod.fromJson(String str) =>
-      PaymentMethod.fromMap(json.decode(str));
-
-  String toJson() => json.encode(toMap());
-
   factory PaymentMethod.fromMap(Map<String, dynamic> json) => PaymentMethod(
         id: json["id"],
+        organizationId: json["organization_id"],
         name: json["name"],
-        description: json["description"],
+        type: json["type"],
         isActive: json["is_active"],
-        sortOrder: json["sort_order"],
         createdAt: json["created_at"] == null
             ? null
             : DateTime.parse(json["created_at"]),
@@ -71,10 +105,10 @@ class PaymentMethod {
 
   Map<String, dynamic> toMap() => {
         "id": id,
+        "organization_id": organizationId,
         "name": name,
-        "description": description,
+        "type": type,
         "is_active": isActive,
-        "sort_order": sortOrder,
         "created_at": createdAt?.toIso8601String(),
         "updated_at": updatedAt?.toIso8601String(),
       };

lib/presentation/home/bloc/payment_methods/payment_methods_bloc.dart

@@ -8,7 +8,8 @@ part 'payment_methods_event.dart';
 part 'payment_methods_state.dart';
 part 'payment_methods_bloc.freezed.dart';
 
-class PaymentMethodsBloc extends Bloc<PaymentMethodsEvent, PaymentMethodsState> {
+class PaymentMethodsBloc
+    extends Bloc<PaymentMethodsEvent, PaymentMethodsState> {
   final PaymentMethodsRemoteDatasource datasource;
 
   PaymentMethodsBloc(this.datasource) : super(const _Initial()) {
@@ -17,7 +18,7 @@ class PaymentMethodsBloc extends Bloc<PaymentMethodsEvent, PaymentMethodsState>
       final response = await datasource.getPaymentMethods();
       response.fold(
         (l) => emit(_Error(l)),
-        (r) => emit(_Loaded(r.data ?? [])),
+        (r) => emit(_Loaded(r.data?.paymentMethods ?? [])),
       );
     });
   }

lib/presentation/home/pages/confirm_payment_page-old.dart

@@ -72,11 +72,13 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
     // Set a default payment method in case API fails
     selectedPaymentMethod = PaymentMethod(
-      id: 1,
+      id: "4b1c0d21-c98a-4fc0-a2f9-8d90a0c9d905",
-      name: 'Cash',
+      organizationId: "3e8b1793-d18b-40c4-a03d-0c6480b630c7",
-      description: 'Cash payment',
+      name: "CASH",
+      type: "cash",
       isActive: true,
-      sortOrder: 1,
+      createdAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
+      updatedAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
     );
     // if (selectTable == null && widget.table != null) {
     //   selectTable = tables.firstWhere(
@@ -1041,9 +1043,6 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                             8.0),
                                                   )
                                                 : null,
-                                            child: Tooltip(
-                                              message: method.description ??
-                                                  'No description available',
                                             child: isSelected
                                                 ? Button.filled(
                                                     width: double.infinity,
@@ -1075,7 +1074,6 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                         ? method.name!
                                                         : 'Unknown',
                                                   ),
-                                            ),
                                           );
                                         }).toList(),
                                       );

lib/presentation/home/pages/confirm_payment_page.dart

@@ -65,11 +65,13 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
 
     // Set a default payment method in case API fails
     selectedPaymentMethod = PaymentMethod(
-      id: 1,
+      id: "4b1c0d21-c98a-4fc0-a2f9-8d90a0c9d905",
-      name: 'Cash',
+      organizationId: "3e8b1793-d18b-40c4-a03d-0c6480b630c7",
-      description: 'Cash payment',
+      name: "CASH",
+      type: "cash",
       isActive: true,
-      sortOrder: 1,
+      createdAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
+      updatedAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
     );
     // if (selectTable == null && widget.table != null) {
     //   selectTable = tables.firstWhere(
@@ -517,6 +519,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                         subtitle: 'Silahkan lakukan pembayaran',
                       ),
                       Expanded(
+                        child: SingleChildScrollView(
                           child: Column(
                             children: [
                               Container(
@@ -604,7 +607,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                               Button.filled(
                                                 onPressed: () {
                                                   context
-                                                    .read<PaymentMethodsBloc>()
+                                                      .read<
+                                                          PaymentMethodsBloc>()
                                                       .add(PaymentMethodsEvent
                                                           .fetchPaymentMethods());
                                                 },
@@ -643,7 +647,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                             if (selectedPaymentMethod == null ||
                                                 !paymentMethods.any((method) =>
                                                     method.id ==
-                                                  selectedPaymentMethod?.id)) {
+                                                    selectedPaymentMethod
+                                                        ?.id)) {
                                               selectedPaymentMethod =
                                                   paymentMethods.first;
                                             }
@@ -656,10 +661,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                 final isSelected =
                                                     selectedPaymentMethod?.id ==
                                                         method.id;
-                                              return Tooltip(
+                                                return GestureDetector(
-                                                message: method.description ??
-                                                    'No description available',
-                                                child: GestureDetector(
                                                   onTap: () {
                                                     setState(() {
                                                       selectedPaymentMethod =
@@ -699,7 +701,6 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                           TextAlign.center,
                                                     ),
                                                   ),
-                                                ),
                                                 );
                                               }).toList(),
                                             );
@@ -710,7 +711,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                   ],
                                 ),
                               ),
-                            if (selectedPaymentMethod?.id == 1)
+                              if (selectedPaymentMethod?.type == "cash")
                                 Container(
                                   padding: const EdgeInsets.all(16),
                                   decoration: BoxDecoration(
@@ -723,7 +724,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                     ),
                                   ),
                                   child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
                                     children: [
                                       const Text(
                                         'Total Bayar',
@@ -758,7 +760,8 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                       TextPosition(
                                                           offset:
                                                               totalPriceController
-                                                                .text.length));
+                                                                  .text
+                                                                  .length));
                                             },
                                           );
                                         },
@@ -817,6 +820,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                             ],
                           ),
                         ),
+                      ),
                       Container(
                         padding: EdgeInsets.all(16),
                         decoration: BoxDecoration(

lib/presentation/table/pages/payment_table_page.dart

@@ -31,10 +31,10 @@ class PaymentTablePage extends StatefulWidget {
   final DraftOrderModel? draftOrder;
   final TableModel? table;
   const PaymentTablePage({
-    Key? key,
+    super.key,
     this.draftOrder,
     this.table,
-  }) : super(key: key);
+  });
 
   @override
   State<PaymentTablePage> createState() => _PaymentTablePageState();
@@ -98,11 +98,13 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
 
     // Set a default payment method in case API fails
     selectedPaymentMethod = PaymentMethod(
-      id: 1,
+      id: "4b1c0d21-c98a-4fc0-a2f9-8d90a0c9d905",
-      name: 'Cash',
+      organizationId: "3e8b1793-d18b-40c4-a03d-0c6480b630c7",
-      description: 'Cash payment',
+      name: "CASH",
+      type: "cash",
       isActive: true,
-      sortOrder: 1,
+      createdAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
+      updatedAt: DateTime.tryParse('2025-07-18T03:43:13.857048+07:00'),
     );
   }
 
@@ -444,7 +446,7 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
                             ),
                             BlocBuilder<CheckoutBloc, CheckoutState>(
                               builder: (context, state) {
-                                final tax = state.maybeWhen(
+                                state.maybeWhen(
                                   orElse: () => 0,
                                   loaded: (products,
                                           discountModel,
@@ -805,9 +807,6 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
                                                             8.0),
                                                   )
                                                 : null,
-                                            child: Tooltip(
-                                              message: method.description ??
-                                                  'No description available',
                                             child: isSelected
                                                 ? Button.filled(
                                                     width: double.infinity,
@@ -839,7 +838,6 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
                                                         ? method.name!
                                                         : 'Unknown',
                                                   ),
-                                            ),
                                           );
                                         }).toList(),
                                       );
@@ -1052,7 +1050,7 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
                                             if (discountModel == null) {
                                               return 0;
                                             }
-                                            return discountModel!.value!
+                                            return discountModel.value!
                                                 .replaceAll('.00', '')
                                                 .toIntegerFromText;
                                           });
@@ -1135,8 +1133,6 @@ class _PaymentTablePageState extends State<PaymentTablePage> {
                                             orderType,
                                       );
 
-                                      final totalPrice = subTotal + finalTax;
-
                                       return Flexible(
                                         child: Button.filled(
                                           onPressed: () async {