add percent for courier

Epl-Grey · Apr 18, 2024 · df7713e · df7713e
1 parent b46e664
commit df7713e
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 57 deletions.
diff --git a/lib/feature/presentation/bloc/month_salary_cubit/month_salary_cubit.dart b/lib/feature/presentation/bloc/month_salary_cubit/month_salary_cubit.dart
@@ -5,10 +5,10 @@ import 'package:iiko_delivery/feature/domain/usecases/get_order_items.dart';
 import 'package:iiko_delivery/feature/domain/usecases/get_user_orders_by_month.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/month_salary_cubit/month_salary_state.dart';
 
-class MonthOrderCubit extends Cubit<MonthSalaryState> {
+class MonthSalaryCubit extends Cubit<MonthSalaryState> {
   final GetUserOrdersByMonth getUserOrdersByMonthUseCase;
   final GetOrderItems getOrderItems;
-  MonthOrderCubit(
+  MonthSalaryCubit(
     this.getUserOrdersByMonthUseCase,
     this.getOrderItems,
   ) : super(MonthSalaryInitial());
@@ -33,7 +33,9 @@ class MonthOrderCubit extends Cubit<MonthSalaryState> {
       }
 
       for (var item in items) {
-        salaryByMonth += item.cost * Decimal.fromInt(item.count);
+        Decimal orderSalary = (item.cost / Decimal.fromInt(100)).toDecimal() *
+            Decimal.fromInt(40);
+        salaryByMonth += orderSalary * Decimal.fromInt(item.count);
       }
       emit(MonthSalarySuccess(salary: salaryByMonth));
     });

diff --git a/lib/feature/presentation/bloc/orders_cost_cubit/orders_cost_cubit.dart b/lib/feature/presentation/bloc/orders_cost_cubit/orders_cost_cubit.dart
@@ -41,7 +41,8 @@ class OrdersCostCubit extends Cubit<OrdersCostState> {
                   for(final item in itemsFromResponse){
                     orderCost += item.cost * Decimal.fromInt(item.count);
                   }
-                  return orderCost;
+                  Decimal orderSalary = (orderCost / Decimal.fromInt(100)).toDecimal() * Decimal.fromInt(40);
+                  return orderSalary;
                 });
               }
             );

diff --git a/lib/feature/presentation/bloc/statistic_cubit/statistic_cubit.dart b/lib/feature/presentation/bloc/statistic_cubit/statistic_cubit.dart
@@ -45,11 +45,13 @@ class StatisticCubit extends Cubit<StatisticState> {
           });
         }
         salaryByDates[key] = someSalary;
-
       }
-      for(int i = 1; i <= DateTime(date.year, date.month + 1, 0).day; i++) {
-        if(salaryByDates.containsKey(i)) {
-          salary.add(salaryByDates[i]!);
+      for (int i = 1; i <= DateTime(date.year, date.month + 1, 0).day; i++) {
+        if (salaryByDates.containsKey(i)) {
+          Decimal orderSalary =
+              (salaryByDates[i]! / Decimal.fromInt(100)).toDecimal() *
+                  Decimal.fromInt(40);
+          salary.add(orderSalary);
         } else {
           salary.add(Decimal.zero);
         }

diff --git a/lib/feature/presentation/pages/order_detail_screen.dart b/lib/feature/presentation/pages/order_detail_screen.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:iiko_delivery/feature/domain/entities/order_entity.dart';
@@ -77,7 +76,7 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
       body: Container(
         color: const Color(0xFFFAF7F5),
         child: Padding(
-          padding: EdgeInsets.only(right: 20, left: 20, top: 10, bottom: 20),
+          padding: const EdgeInsets.only(right: 20, left: 20, top: 10, bottom: 20),
           child: Container(
             color: const Color(0xFFFAF7F5),
             constraints: BoxConstraints(
@@ -158,7 +157,7 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
                   padding: const EdgeInsets.only(top: 10),
                   child: Container(
                     decoration: BoxDecoration(
-                        color: Color(0xFFEFEBE8),
+                        color: const Color(0xFFEFEBE8),
                         borderRadius: BorderRadius.circular(12),
                         boxShadow: const [
                           BoxShadow(

diff --git a/lib/feature/presentation/pages/order_screen.dart b/lib/feature/presentation/pages/order_screen.dart
@@ -4,7 +4,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/daily_salary_cubit/daily_salary_cubit.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/orders_cost_cubit/orders_cost_cubit.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/sign_out_cubit/sign_out_cubit.dart';
-import 'package:iiko_delivery/feature/presentation/bloc/sign_out_cubit/sign_out_state.dart';
 import 'package:intl/intl.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/order_cubit/order_cubit.dart';
 import 'package:iiko_delivery/feature/presentation/bloc/order_cubit/order_state.dart';

diff --git a/lib/feature/presentation/pages/statistics_screen.dart b/lib/feature/presentation/pages/statistics_screen.dart
@@ -33,7 +33,7 @@ class _StatisticaPageState extends State<StatisticaPage> {
   @override
   Widget build(BuildContext context) {
     context.read<StatisticCubit>().getMonthSalary(_selectedDate);
-    context.read<MonthOrderCubit>().getUserOrdersByMonth(_selectedDate);
+    context.read<MonthSalaryCubit>().getUserOrdersByMonth(_selectedDate);
     return Scaffold(
         appBar: AppBar(
           centerTitle: true,
@@ -74,7 +74,7 @@ class _StatisticaPageState extends State<StatisticaPage> {
                     dimension: 10,
                   ),
                   Expanded(
-                    child: BlocBuilder<MonthOrderCubit, MonthSalaryState>(
+                    child: BlocBuilder<MonthSalaryCubit, MonthSalaryState>(
                       builder: (context, state) {
                         if (state is MonthSalarySuccess) {
                           return Text('${state.salary}₽',

diff --git a/lib/locator_service.dart b/lib/locator_service.dart
@@ -50,7 +50,7 @@ Future<void> init() async {
       getUserOrders: sl(), getUserOrdersByDay: sl(), getOrderItems: sl()));
   sl.registerFactory<StatisticCubit>(
       () => StatisticCubit(getUserOrdersByMonth: sl(), getOrderItems: sl()));
-  sl.registerFactory<MonthOrderCubit>(() => MonthOrderCubit(sl(), sl()));
+  sl.registerFactory<MonthSalaryCubit>(() => MonthSalaryCubit(sl(), sl()));
   sl.registerFactory<DailyOrderCubit>(() => DailyOrderCubit(sl()));
   sl.registerFactory<SetDeliveredCubit>(
       () => SetDeliveredCubit(setOrderIsDeliveredUseCase: sl()));

diff --git a/lib/main.dart b/lib/main.dart
@@ -70,8 +70,8 @@ class MyApp extends StatelessWidget {
         BlocProvider<StatisticCubit>(
           create: (context) => sl<StatisticCubit>(),
         ),
-        BlocProvider<MonthOrderCubit>(
-          create: (context) => sl<MonthOrderCubit>(),
+        BlocProvider<MonthSalaryCubit>(
+          create: (context) => sl<MonthSalaryCubit>(),
         ),
         BlocProvider<DailyOrderCubit>(
           create: (context) => sl<DailyOrderCubit>(),

diff --git a/pubspec.lock b/pubspec.lock
@@ -480,30 +480,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.0"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -524,26 +500,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -572,10 +548,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.3"
   path_provider:
     dependency: transitive
     description:
@@ -957,14 +933,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
-      url: "https://pub.dev"
-    source: hosted
-    version: "13.0.0"
   watcher:
     dependency: transitive
     description: