merge

lib/pages/discount/discount_list.dart

@@ -2,7 +2,6 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/discount/model/discount_model.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -97,7 +96,7 @@ class _DiscountListState extends State<DiscountList> {
                           Row(
                             children: <Widget>[
                               Text(
-                                discount.customer,
+                                discount.customerName,
                                 style: TextStyle(
                                     color: Colors.black,
                                     fontWeight: FontWeight.normal,