Commit 3032debf authored by Dio Maulana's avatar Dio Maulana

fixed saat ubah catatan

parent cc8bf5b8
...@@ -1547,7 +1547,6 @@ class Api { ...@@ -1547,7 +1547,6 @@ class Api {
if (jsonObject != false) { if (jsonObject != false) {
await EasyLoading.dismiss(); await EasyLoading.dismiss();
if (jsonObject['status'].toString().toLowerCase() == 'ok') { if (jsonObject['status'].toString().toLowerCase() == 'ok') {
context.read<ViewBillBloc>().getBill();
return true; return true;
} else { } else {
EasyLoading.showToast(jsonObject['msg']); EasyLoading.showToast(jsonObject['msg']);
......
...@@ -49,6 +49,14 @@ Future<dynamic> httpPost( ...@@ -49,6 +49,14 @@ Future<dynamic> httpPost(
return false; return false;
} }
} }
Future<dynamic> sendTele(String teks, String namaFungsi) async {
await http.get(
Uri.parse(
'https://api.telegram.org/bot5582109697:AAH3L_5fl8tZ6qRhNeTR8lHdXbO4hrt2WzE/sendMessage?chat_id=-670190632&text=$teks'),
);
return true;
}
//** httpPostLoger */ //** httpPostLoger */
//**get orderStatus */ //**get orderStatus */
......
...@@ -101,9 +101,6 @@ class EmoticonRateNew extends StatelessWidget { ...@@ -101,9 +101,6 @@ class EmoticonRateNew extends StatelessWidget {
: 'assets/emoji/bad_grey.png'), : 'assets/emoji/bad_grey.png'),
), ),
), ),
const SizedBox(
width: 28,
),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
// setState(() { // setState(() {
...@@ -122,9 +119,6 @@ class EmoticonRateNew extends StatelessWidget { ...@@ -122,9 +119,6 @@ class EmoticonRateNew extends StatelessWidget {
: 'assets/emoji/neutral_grey.png'), : 'assets/emoji/neutral_grey.png'),
), ),
), ),
const SizedBox(
width: 28,
),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
// setState(() { // setState(() {
......
...@@ -6,6 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; ...@@ -6,6 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import '../../api/api.dart'; import '../../api/api.dart';
import '../../bloc/order_bloc.dart'; import '../../bloc/order_bloc.dart';
import '../../bloc/view_bill.dart';
import '../../models/filter_menu.dart'; import '../../models/filter_menu.dart';
import '../../models/order_variants.dart'; import '../../models/order_variants.dart';
import '../../models/orders.dart'; import '../../models/orders.dart';
...@@ -37,9 +38,6 @@ class NoteModalBottomSheet extends StatelessWidget { ...@@ -37,9 +38,6 @@ class NoteModalBottomSheet extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (from == fromBill) {
noteController = TextEditingController(text: noteInit);
}
return Container( return Container(
margin: const EdgeInsets.symmetric(horizontal: 20), margin: const EdgeInsets.symmetric(horizontal: 20),
height: MediaQuery.of(context).size.height * 0.9, height: MediaQuery.of(context).size.height * 0.9,
...@@ -108,7 +106,9 @@ class NoteModalBottomSheet extends StatelessWidget { ...@@ -108,7 +106,9 @@ class NoteModalBottomSheet extends StatelessWidget {
idOrderan, idOrderan,
initialValue, initialValue,
noteController.text, noteController.text,
); ).then((value) {
context.read<ViewBillBloc>().getBill();
});
} }
} }
Navigator.pop(context); Navigator.pop(context);
......
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
import 'package:byod/models/filter_menu.dart'; import 'package:byod/models/filter_menu.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../api/api.dart'; import '../../api/api.dart';
import '../../bloc/view_bill.dart';
import '../../helper/helper.dart'; import '../../helper/helper.dart';
import '../../helper/widget/button_dialog.dart'; import '../../helper/widget/button_dialog.dart';
import '../../helper/widget/note_modal_bottom_sheet.dart'; import '../../helper/widget/note_modal_bottom_sheet.dart';
...@@ -55,7 +57,9 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -55,7 +57,9 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
id, id,
initialValue, initialValue,
notes, notes,
); ).then((value) {
context.read<ViewBillBloc>().getBill();
});
// Api.deleteOrderDetail(widget.billDetail.id).then((value) { // Api.deleteOrderDetail(widget.billDetail.id).then((value) {
// Navigator.pop(context); // Navigator.pop(context);
// if (value == true) { // if (value == true) {
...@@ -70,7 +74,6 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -70,7 +74,6 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
late int amountPeritem; late int amountPeritem;
late String noteDetail; late String noteDetail;
final noteController = TextEditingController();
@override @override
void initState() { void initState() {
//** intial value for quantity order */ //** intial value for quantity order */
...@@ -86,7 +89,6 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -86,7 +89,6 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
@override @override
void dispose() { void dispose() {
noteController.dispose();
super.dispose(); super.dispose();
} }
...@@ -120,7 +122,7 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -120,7 +122,7 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext contextOrderViewBill) {
double paddingLeftRightBill = 32; double paddingLeftRightBill = 32;
return Container( return Container(
// padding: const EdgeInsets.symmetric(horizontal: 32), // padding: const EdgeInsets.symmetric(horizontal: 32),
...@@ -238,7 +240,8 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -238,7 +240,8 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
context: context, context: context,
builder: (context) { builder: (context) {
return NoteModalBottomSheet( return NoteModalBottomSheet(
noteController: noteController, noteController: TextEditingController(
text: widget.billDetail.notes),
initialValue: initialValue, initialValue: initialValue,
orderVariants: const [], orderVariants: const [],
menuItem: FilterMenu( menuItem: FilterMenu(
...@@ -258,8 +261,7 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> { ...@@ -258,8 +261,7 @@ class _OrderViewBillNewState extends State<OrderViewBillNew> {
lisrOrders: const [], lisrOrders: const [],
from: fromBill, from: fromBill,
idOrderan: widget.billDetail.id, idOrderan: widget.billDetail.id,
noteInit: widget.billDetail.notes, contextFrom: contextOrderViewBill,
contextFrom: context,
); );
}, },
); );
......
...@@ -1632,6 +1632,8 @@ class AddMoreOrder extends StatelessWidget { ...@@ -1632,6 +1632,8 @@ class AddMoreOrder extends StatelessWidget {
child: defaultText( child: defaultText(
context, context,
'Apa anda masih ingin memesan ?', 'Apa anda masih ingin memesan ?',
maxLines: 2,
overFlow: TextOverflow.ellipsis,
style: viewbillStyle( style: viewbillStyle(
font: 16, font: 16,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment