Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/admin/providers/structure_provider.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/mypayment/class/structure.dart';

class StructureNotifier extends StateNotifier<Structure> {
StructureNotifier() : super(Structure.empty());
Expand Down
2 changes: 1 addition & 1 deletion lib/admin/tools/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class AdminTextConstants {
"Erreur lors de la modification (surement dû à une superposition de dates)";
static const String minimum = "Minimum";
static const String modifyModuleVisibility = "Visibilité des modules";
static const String myEclPay = "MyECLPay";
static const String myPayment = "MyECLPay";
static const String name = "Nom";
static const String noManager = "Aucun manager n'est sélectionné";
static const String noMember = "Aucun membre";
Expand Down
2 changes: 1 addition & 1 deletion lib/admin/ui/pages/main_page/main_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class AdminMainPage extends HookConsumerWidget {
QR.to(AdminRouter.root + AdminRouter.structures);
},
child: const MenuCardUi(
text: AdminTextConstants.myEclPay,
text: AdminTextConstants.myPayment,
icon: HeroIcons.creditCard,
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import 'package:titan/admin/tools/constants.dart';
import 'package:titan/admin/ui/admin.dart';
import 'package:titan/admin/ui/components/admin_button.dart';
import 'package:titan/admin/ui/pages/structure_page/add_edit_structure_page/search_user.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/providers/structure_list_provider.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/providers/structure_list_provider.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/functions.dart';
import 'package:titan/tools/token_expire_wrapper.dart';
Expand Down
6 changes: 3 additions & 3 deletions lib/admin/ui/pages/structure_page/structure_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import 'package:titan/admin/tools/constants.dart';
import 'package:titan/admin/ui/admin.dart';
import 'package:titan/admin/ui/components/item_card_ui.dart';
import 'package:titan/admin/ui/pages/structure_page/structure_ui.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/providers/bank_account_holder_provider.dart';
import 'package:titan/paiement/providers/structure_list_provider.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/providers/bank_account_holder_provider.dart';
import 'package:titan/mypayment/providers/structure_list_provider.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/ui/builders/async_child.dart';
import 'package:titan/tools/ui/layouts/refresher.dart';
Expand Down
6 changes: 3 additions & 3 deletions lib/admin/ui/pages/structure_page/structure_ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:titan/admin/providers/structure_provider.dart';
import 'package:titan/admin/router.dart';
import 'package:titan/admin/tools/constants.dart';
import 'package:titan/admin/ui/components/item_card_ui.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/providers/bank_account_holder_provider.dart';
import 'package:titan/paiement/providers/structure_list_provider.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/providers/bank_account_holder_provider.dart';
import 'package:titan/mypayment/providers/structure_list_provider.dart';
import 'package:titan/tools/functions.dart';
import 'package:titan/tools/token_expire_wrapper.dart';
import 'package:titan/tools/ui/layouts/bottom_modal_template.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/drawer/class/module.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ enum ModuleType {
vote,
tombola,
cinema,
paiement,
mypayment,
}

class Module {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:titan/paiement/class/history_refund.dart';
import 'package:titan/mypayment/class/history_refund.dart';
import 'package:titan/tools/functions.dart';

enum HistoryType { transfer, received, given, refundCredited, refundDebited }
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:titan/paiement/class/store.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/mypayment/class/store.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/tools/functions.dart';

class InvoiceDetail {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/mypayment/class/structure.dart';

class StoreSimple {
final String id;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:titan/paiement/class/history.dart';
import 'package:titan/mypayment/class/history.dart';
import 'package:titan/tools/functions.dart';

enum TransactionType { direct, request, refund }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:titan/paiement/tools/functions.dart';
import 'package:titan/mypayment/tools/functions.dart';

class Transfer {
final int amount;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:titan/paiement/class/store.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/mypayment/class/store.dart';
import 'package:titan/mypayment/class/structure.dart';

class UserStore extends Store {
final bool canBank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:titan/paiement/class/store.dart';
import 'package:titan/mypayment/class/store.dart';
import 'package:titan/user/class/user.dart';

enum WalletType { user, store }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/repositories/bank_account_holder_repository.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/repositories/bank_account_holder_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class BankAccountHolderNotifier extends SingleNotifier<Structure> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:convert';

import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/qr_code_data.dart';
import 'package:titan/mypayment/class/qr_code_data.dart';

class BarcodeNotifier extends StateNotifier<QrCodeData?> {
BarcodeNotifier() : super(null);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/wallet_device.dart';
import 'package:titan/paiement/repositories/devices_repository.dart';
import 'package:titan/mypayment/class/wallet_device.dart';
import 'package:titan/mypayment/repositories/devices_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class DeviceListNotifier extends ListNotifier<WalletDevice> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/create_device.dart';
import 'package:titan/paiement/class/wallet_device.dart';
import 'package:titan/paiement/repositories/devices_repository.dart';
import 'package:titan/mypayment/class/create_device.dart';
import 'package:titan/mypayment/class/wallet_device.dart';
import 'package:titan/mypayment/repositories/devices_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class DeviceListNotifier extends SingleNotifier<WalletDevice> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/funding_url.dart';
import 'package:titan/paiement/class/init_info.dart';
import 'package:titan/paiement/repositories/funding_repository.dart';
import 'package:titan/mypayment/class/funding_url.dart';
import 'package:titan/mypayment/class/init_info.dart';
import 'package:titan/mypayment/repositories/funding_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class FundingUrlNotifier extends SingleNotifier<FundingUrl> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/providers/tos_provider.dart';
import 'package:titan/mypayment/providers/tos_provider.dart';

class HasAcceptedTosNotifier extends StateNotifier<bool> {
final bool defaultValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/invoice.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/repositories/invoices_repository.dart';
import 'package:titan/mypayment/class/invoice.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/repositories/invoices_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class InvoiceListNotifier extends ListNotifier<Invoice> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:typed_data';

import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/repositories/invoice_pdf_repository.dart';
import 'package:titan/mypayment/repositories/invoice_pdf_repository.dart';

class InvoicePdfNotifier extends FamilyAsyncNotifier<Uint8List, String> {
@override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/invoice.dart';
import 'package:titan/mypayment/class/invoice.dart';

class InvoiceNotifier extends StateNotifier<Invoice> {
InvoiceNotifier() : super(Invoice.empty());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/providers/bank_account_holder_provider.dart';
import 'package:titan/paiement/providers/my_structures_provider.dart';
import 'package:titan/mypayment/providers/bank_account_holder_provider.dart';
import 'package:titan/mypayment/providers/my_structures_provider.dart';

final isStructureAdminProvider = StateProvider((ref) {
final myStructures = ref.watch(myStructuresProvider);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/tools/key_service.dart';
import 'package:titan/mypayment/tools/key_service.dart';

final keyServiceProvider = Provider((ref) => KeyService());
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/history.dart';
import 'package:titan/paiement/repositories/users_me_repository.dart';
import 'package:titan/mypayment/class/history.dart';
import 'package:titan/mypayment/repositories/users_me_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class MyHistoryNotifier extends ListNotifier<History> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/user_store.dart';
import 'package:titan/paiement/repositories/users_me_repository.dart';
import 'package:titan/mypayment/class/user_store.dart';
import 'package:titan/mypayment/repositories/users_me_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class MyStoresNotifier extends ListNotifier<UserStore> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/providers/structure_list_provider.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/providers/structure_list_provider.dart';
import 'package:titan/user/providers/user_provider.dart';

final myStructuresProvider = StateProvider<List<Structure>>((ref) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/wallet.dart';
import 'package:titan/paiement/repositories/users_me_repository.dart';
import 'package:titan/mypayment/class/wallet.dart';
import 'package:titan/mypayment/repositories/users_me_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class MyWalletNotifier extends SingleNotifier<Wallet> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/transaction.dart';
import 'package:titan/mypayment/class/transaction.dart';

class OngoingTransaction extends StateNotifier<AsyncValue<Transaction>> {
OngoingTransaction() : super(const AsyncValue.loading());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/repositories/users_me_repository.dart';
import 'package:titan/mypayment/repositories/users_me_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class RegisterNotifier extends SingleNotifier<bool> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/qr_code_data.dart';
import 'package:titan/paiement/class/transaction.dart';
import 'package:titan/paiement/repositories/stores_repository.dart';
import 'package:titan/mypayment/class/qr_code_data.dart';
import 'package:titan/mypayment/class/transaction.dart';
import 'package:titan/mypayment/repositories/stores_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class ScanNotifier extends SingleNotifier<Transaction> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/history_interval.dart';
import 'package:titan/mypayment/class/history_interval.dart';

class SelectedIntervalNotifier extends StateNotifier<HistoryInterval> {
SelectedIntervalNotifier() : super(HistoryInterval.currentMonth());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/history.dart';
import 'package:titan/paiement/class/store.dart';
import 'package:titan/paiement/providers/selected_interval_provider.dart';
import 'package:titan/paiement/providers/selected_store_provider.dart';
import 'package:titan/paiement/repositories/stores_repository.dart';
import 'package:titan/mypayment/class/history.dart';
import 'package:titan/mypayment/class/store.dart';
import 'package:titan/mypayment/providers/selected_interval_provider.dart';
import 'package:titan/mypayment/providers/selected_store_provider.dart';
import 'package:titan/mypayment/repositories/stores_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class SellerHistoryNotifier extends ListNotifier<History> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/user_store.dart';
import 'package:titan/paiement/providers/my_stores_provider.dart';
import 'package:titan/mypayment/class/user_store.dart';
import 'package:titan/mypayment/providers/my_stores_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

class SelectedStoreNotifier extends StateNotifier<UserStore> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/mypayment/class/structure.dart';

class SelectedStructureNotifier extends StateNotifier<Structure> {
SelectedStructureNotifier() : super(Structure.empty());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/history.dart';
import 'package:titan/paiement/providers/my_history_provider.dart';
import 'package:titan/mypayment/class/history.dart';
import 'package:titan/mypayment/providers/my_history_provider.dart';

class SelectedTransactionsNotifier extends StateNotifier<List<History>> {
SelectedTransactionsNotifier(super.history);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/providers/tos_provider.dart';
import 'package:titan/mypayment/providers/tos_provider.dart';

class ShouldDisplayTosDialog extends StateNotifier<bool> {
final bool defaultValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/paiement/class/store.dart';
import 'package:titan/mypayment/class/store.dart';

class StoreProvider extends StateNotifier<Store> {
StoreProvider() : super(Store.empty());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/seller.dart';
import 'package:titan/paiement/repositories/store_sellers_repository.dart';
import 'package:titan/mypayment/class/seller.dart';
import 'package:titan/mypayment/repositories/store_sellers_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class StoreSellerListNotifier extends ListNotifier<Seller> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/store.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/repositories/stores_repository.dart';
import 'package:titan/paiement/repositories/structures_repository.dart';
import 'package:titan/paiement/repositories/users_me_repository.dart';
import 'package:titan/mypayment/class/store.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/repositories/stores_repository.dart';
import 'package:titan/mypayment/repositories/structures_repository.dart';
import 'package:titan/mypayment/repositories/users_me_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class StoreListNotifier extends ListNotifier<Store> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/repositories/structures_repository.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/repositories/structures_repository.dart';
import 'package:titan/tools/providers/list_notifier.dart';

class StructureListNotifier extends ListNotifier<Structure> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/tos.dart';
import 'package:titan/paiement/repositories/tos_repository.dart';
import 'package:titan/mypayment/class/tos.dart';
import 'package:titan/mypayment/repositories/tos_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class TOSNotifier extends SingleNotifier<TOS> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/refund.dart';
import 'package:titan/paiement/repositories/transaction_repository.dart';
import 'package:titan/mypayment/class/refund.dart';
import 'package:titan/mypayment/repositories/transaction_repository.dart';
import 'package:titan/tools/providers/single_notifier.dart';

class TransactionNotifier extends SingleNotifier<bool> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:titan/paiement/class/structure.dart';
import 'package:titan/paiement/repositories/structures_repository.dart';
import 'package:titan/mypayment/class/structure.dart';
import 'package:titan/mypayment/repositories/structures_repository.dart';

class TransferStructureNotifier extends StateNotifier {
final StructuresRepository structuresRepository;
Expand Down
Loading