Merge branch with resolved conflicts - restructured features and added new modules
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
import 'package:rasadyar_chicken/features/steward/buy/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/buy_in_province_all/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/buy_in_province_waiting/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/root/logic.dart';
|
||||
=
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/buy/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_all/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_waiting/logic.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/root/logic.dart';
|
||||
import 'package:rasadyar_core/core.dart';
|
||||
|
||||
class BuyInProvinceLogic extends GetxController {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/buy_in_province_all/view.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/buy_in_province_waiting/view.dart';
|
||||
=
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_all/view.dart';
|
||||
import 'package:rasadyar_chicken/features/steward/presentation/pages/buy_in_province_waiting/view.dart';
|
||||
import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
|
||||
import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
|
||||
import 'package:rasadyar_chicken/presentation/widget/inventory/inventory_widget.dart';
|
||||
|
||||
Reference in New Issue
Block a user