sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.mokkon.com/phyothandar/fcs.kl

Browse Source
This commit is contained in:
phyothandar
2021-09-13 11:18:12 +06:30
parent a8cbfbbcd0 6155df4d50
commit 1a22dc370f
9 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pages/carton_search/carton_search.dart
View File

@@ -31,13 +31,16 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
ThemeData appBarTheme(BuildContext context) { ThemeData appBarTheme(BuildContext context) {
final ThemeData theme = Theme.of(context); final ThemeData theme = Theme.of(context);
return theme.copyWith( return theme.copyWith(
appBarTheme: AppBarTheme(color: primaryColor),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
border: InputBorder.none, border: InputBorder.none,
hintStyle: TextStyle( hintStyle: TextStyle(
color: theme.primaryTextTheme.caption!.color, fontSize: 14)), color: theme.primaryTextTheme.caption?.color, fontSize: 14)),
textTheme: theme.textTheme.copyWith( textTheme: TextTheme(
title: theme.textTheme.title!.copyWith( headline1: TextStyle(
color: theme.primaryTextTheme.title!.color, fontSize: 16)), color: theme.primaryTextTheme.headline1?.color,
fontSize: 16,
backgroundColor: primaryColor)),
primaryColor: primaryColor, primaryColor: primaryColor,
); );
} }

2
lib/pages/delivery_address/model/delivery_address_model.dart
View File

@@ -60,7 +60,7 @@ class DeliveryAddressModel extends BaseModel {
Future<DeliveryAddress> getDeliveryAddress(String id) async { Future<DeliveryAddress> getDeliveryAddress(String id) async {
String path = "/$user_collection/${user!.id}/$delivery_address_collection"; String path = "/$user_collection/${user!.id}/$delivery_address_collection";
var snap = await FirebaseFirestore.instance.collection(path).doc(id).get(); var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
return DeliveryAddress.fromMap(snap.data as Map<String, dynamic>, snap.id); return DeliveryAddress.fromMap(snap.data()!, snap.id);
} }
void initUser(user) { void initUser(user) {

2
lib/pages/discount/discount_editor.dart
View File

@@ -80,7 +80,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
customerId = u.id ?? ""; customerId = u.id ?? "";
customerName = u.name ?? ""; customerName = u.name ?? "";
}); });
},popPage: true)), }, popPage: true)),
], ],
); );

1
lib/pages/package/package_info.dart
View File

@@ -193,7 +193,6 @@ class _PackageInfoState extends State<PackageInfo> {
} }
_changeDeliverayAddress(DeliveryAddress deliveryAddress) async { _changeDeliverayAddress(DeliveryAddress deliveryAddress) async {
if (deliveryAddress == null) return;
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });

11
lib/pages/package_search/package_serach.dart
View File

@@ -29,13 +29,16 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
ThemeData appBarTheme(BuildContext context) { ThemeData appBarTheme(BuildContext context) {
final ThemeData theme = Theme.of(context); final ThemeData theme = Theme.of(context);
return theme.copyWith( return theme.copyWith(
appBarTheme: AppBarTheme(color: primaryColor),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
border: InputBorder.none, border: InputBorder.none,
hintStyle: TextStyle( hintStyle: TextStyle(
color: theme.primaryTextTheme.caption!.color, fontSize: 14)), color: theme.primaryTextTheme.caption?.color, fontSize: 14)),
textTheme: theme.textTheme.copyWith( textTheme: TextTheme(
title: theme.textTheme.title!.copyWith( headline1: TextStyle(
color: theme.primaryTextTheme.title!.color, fontSize: 16)), color: theme.primaryTextTheme.headline1?.color,
fontSize: 16,
backgroundColor: primaryColor)),
primaryColor: primaryColor, primaryColor: primaryColor,
); );
} }

5
lib/pages/receiving/receiving_editor.dart
View File

@@ -231,6 +231,11 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
showMsgDialog(context, "Error", "Invalid tracking ID!"); showMsgDialog(context, "Error", "Invalid tracking ID!");
return; return;
} }
if (user == null) {
showMsgDialog(context, "Error", "Please select FCS ID");
return;
}
setState(() { setState(() {
_isLoading = true; _isLoading = true;
}); });

9
lib/pages/user_search/user_serach.dart
View File

@@ -29,13 +29,16 @@ class UserSearchDelegate extends SearchDelegate<User> {
ThemeData appBarTheme(BuildContext context) { ThemeData appBarTheme(BuildContext context) {
final ThemeData theme = Theme.of(context); final ThemeData theme = Theme.of(context);
return theme.copyWith( return theme.copyWith(
appBarTheme: AppBarTheme(color: primaryColor),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
border: InputBorder.none, border: InputBorder.none,
hintStyle: TextStyle( hintStyle: TextStyle(
color: theme.primaryTextTheme.caption?.color, fontSize: 14)), color: theme.primaryTextTheme.caption?.color, fontSize: 14)),
textTheme: theme.textTheme.copyWith( textTheme: TextTheme(
title: theme.textTheme.title?.copyWith( headline1: TextStyle(
color: theme.primaryTextTheme.title?.color, fontSize: 16)), color: theme.primaryTextTheme.headline1?.color,
fontSize: 16,
backgroundColor: primaryColor)),
primaryColor: primaryColor, primaryColor: primaryColor,
); );
} }

2
linux/flutter/generated_plugin_registrant.cc
View File

@@ -2,6 +2,8 @@
// Generated file. Do not edit. // Generated file. Do not edit.
// //
// clang-format off
#include "generated_plugin_registrant.h" #include "generated_plugin_registrant.h"
#include <url_launcher_linux/url_launcher_plugin.h> #include <url_launcher_linux/url_launcher_plugin.h>

2
linux/flutter/generated_plugin_registrant.h
View File

@@ -2,6 +2,8 @@
// Generated file. Do not edit. // Generated file. Do not edit.
// //
// clang-format off
#ifndef GENERATED_PLUGIN_REGISTRANT_ #ifndef GENERATED_PLUGIN_REGISTRANT_
#define GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_