update

ios/Flutter/.last_build_id

-eba39b331d7b395476ba8953e31f8092
\ No newline at end of file
+65bf9efbfad64e1b5e4b50eeaed8247f
\ No newline at end of file

lib/ui/home/home.dart

@@ -3,6 +3,7 @@ import 'package:feelverapp/ui/home/home_presenter.dart';
 import 'package:feelverapp/ui/login/login.dart';
 import 'package:feelverapp/ui/menu/menu.dart';
 import 'package:feelverapp/ui/nearme/near_me_list.dart';
+import 'package:feelverapp/ui/payment/payment_detail.dart';
 import 'package:feelverapp/ui/reserve/reserve_list.dart';
 import 'package:feelverapp/ui/shop/shop_list.dart';
 import 'package:feelverapp/util/Accout_util.dart';
@@ -130,10 +131,10 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
                       height: SizeConfig.getWidth(24),
                     ),
                     onPressed: () {
-//                      Navigator.push(
-//                        context,
-//                        MaterialPageRoute(builder: (context) => LoginPage()),
-//                      );
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(builder: (context) => Paymentdetail()),
+                      );
                     },
                   ),
                   Text(

lib/ui/reserve/reserve_date_time.dart

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 
 class ReserveDateTime extends StatefulWidget {
-  String bith = 'ปี / เดือน / วัน';
+  String bith = 'ปี / เดือน / วัน / เวลาเข้าใช้บริการ';
   DateTime day;
 
   @override
@@ -247,7 +247,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
             ),
             Container(
               width: MediaQuery.of(context).size.width / 1,
-              margin: EdgeInsets.only(
+              margin: EdgeInsets.only(top: SizeConfig.getPadding(16),
                   left: SizeConfig.getPadding(24),
                   right: SizeConfig.getPadding(24)),
               child: Card(
@@ -266,7 +266,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
                       setState(() {
                         widget.day = date;
                         widget.bith =
-                            "${widget.day.year}-${widget.day.month}-${widget.day.day} เวลา ${widget.day.timeZoneOffset.inHours.toString()}";
+                            "${widget.day.year}-${widget.day.month}-${widget.day.day} เวลา ${widget.day.hour} : ${widget.day.minute}";
                         print(
                             '${widget.day.year} / ${widget.day.month} / ${widget.day.day}');
                         print(widget.bith);
@@ -274,75 +274,27 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
                       print('confirm $date');
                     }, currentTime: DateTime.now(), locale: LocaleType.th);
                   },
-//                  {
-//                    DatePicker.showDatePicker(context,
-//                        showTitleActions: true,
-//                        minTime: DateTime(1980, 3, 5),
-//                        maxTime: DateTime(2025, 6, 7), onChanged: (date) {
-//                      print('change $date');
-//                    }, onConfirm: (date) {
-//                      setState(() {
-//                        widget.day = date;
-//                        widget.bith =
-//                            "${widget.day.year}-${widget.day.month}-${widget.day.day}";
-//
-//                        print(
-//                            '${widget.day.year} / ${widget.day.month} / ${widget.day.day}');
-//                        print(widget.bith);
-//                      });
-//                    }, currentTime: DateTime.now(), locale: LocaleType.th);
-//                  },
-                  child: widget.bith == 'ปี / เดือน / วัน'
+                  child: widget.bith == 'ปี / เดือน / วัน / เวลาเข้าใช้บริการ'
                       ? Text(
-                          'ปี / เดือน / วัน',
-                          style: TextStyle(color: Colors.black),
-                        )
+                    'ปี / เดือน / วัน / เวลาเข้าใช้บริการ',
+                          style: TextStyle(
+                              color: Colors.black,
+                              fontSize: SizeConfig.getFontSize(16),
+                              fontFamily: "SF_Pro_Text",
+                                fontWeight: FontWeight.w500),
+                  )
                       : Text(
                           '${widget.bith}',
-                          style: TextStyle(color: Colors.black),
-                        ),
-                ),
-              ),
-            ),
-            Container(
-              alignment: Alignment.topLeft,
-              padding: EdgeInsets.only(
-                  left: SizeConfig.getPadding(30),
-                  top: SizeConfig.getPadding(16)),
-              child: Text(
-                'ระบุเวลาที่เข้าใช้บริการ',
-                style: TextStyle(
-                    color: Colors.black,
-                    fontSize: SizeConfig.getFontSize(20),
-                    fontFamily: "SF_Pro_Text",
-                    fontWeight: FontWeight.w500),
-              ),
-            ),
-            Padding(
-              padding: EdgeInsets.symmetric(
-                  vertical: SizeConfig.getPadding(8.0),
-                  horizontal: SizeConfig.getPadding(24)),
-              child: Card(
-                shape: RoundedRectangleBorder(
-                  borderRadius:
-                      BorderRadius.circular(SizeConfig.getPadding(50.0)),
-                ),
-                child: TextFormField(
-//                  controller: loginBloc.passCtrl,
-//                  validator: loginBloc.validateField,
-                  decoration: InputDecoration(
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: SizeConfig.getPadding(20),
-                      horizontal: SizeConfig.getPadding(16),
-                    ),
-//                    hintText:
-//                    allTranslations.text(key2: 'password', key: 'login'),
-                    border: OutlineInputBorder(borderSide: BorderSide.none),
-                  ),
-                  obscureText: true,
+                          style:  TextStyle(
+                              color: Colors.black,
+                              fontSize: SizeConfig.getFontSize(16),
+                              fontFamily: "SF_Pro_Text",
+                              fontWeight: FontWeight.w500),
+                  )
                 ),
               ),
             ),
+
             SizedBox(
               height: SizeConfig.getWidth(30),
             ),