diff --git a/asset_sources/svg/campfire/sib.svg b/asset_sources/svg/campfire/sib.svg new file mode 100644 index 0000000000..7fe9cbc569 --- /dev/null +++ b/asset_sources/svg/campfire/sib.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/asset_sources/svg/stack_duo/sib.svg b/asset_sources/svg/stack_duo/sib.svg new file mode 100644 index 0000000000..7fe9cbc569 --- /dev/null +++ b/asset_sources/svg/stack_duo/sib.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/asset_sources/svg/stack_wallet/sib.svg b/asset_sources/svg/stack_wallet/sib.svg new file mode 100644 index 0000000000..7fe9cbc569 --- /dev/null +++ b/asset_sources/svg/stack_wallet/sib.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lib/db/drift/shared_db/shared_database.dart b/lib/db/drift/shared_db/shared_database.dart index fa6f94e53e..70a9acad37 100644 --- a/lib/db/drift/shared_db/shared_database.dart +++ b/lib/db/drift/shared_db/shared_database.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:drift_flutter/drift_flutter.dart'; import 'package:path/path.dart' as path; -import '../../../models/shopinbit/shopinbit_order_model.dart' - show ShopInBitCategory, ShopInBitOrderStatus; +import "../../../models/shopinbit/shopinbit_enums.dart"; +import "../../../services/shopinbit/src/models/message.dart"; import '../../../utilities/stack_file_system.dart'; import 'tables/cakepay_orders.dart'; import 'tables/shopin_bit_settings.dart'; @@ -27,8 +27,8 @@ abstract final class SharedDrift { } @DriftDatabase( - tables: [CakepayOrders, ShopinBitSettings, ShopInBitTickets], - daos: [ShopinBitSettingsDao], + tables: [CakepayOrders, ShopInBitSettings, ShopInBitTickets], + daos: [ShopInBitSettingsDao, ShopInBitTicketsDao], ) final class SharedDatabase extends _$SharedDatabase { SharedDatabase._([QueryExecutor? executor]) @@ -41,7 +41,7 @@ final class SharedDatabase extends _$SharedDatabase { MigrationStrategy get migration => MigrationStrategy( onUpgrade: (m, from, to) async { if (from == 1 && to == 2) { - await m.createTable(shopinBitSettings); + await m.createTable(shopInBitSettings); await m.createTable(shopInBitTickets); } }, @@ -61,35 +61,176 @@ final class SharedDatabase extends _$SharedDatabase { } } -@DriftAccessor(tables: [ShopinBitSettings]) -class ShopinBitSettingsDao extends DatabaseAccessor - with _$ShopinBitSettingsDaoMixin { - ShopinBitSettingsDao(super.db); +@DriftAccessor(tables: [ShopInBitTickets]) +class ShopInBitTicketsDao extends DatabaseAccessor + with _$ShopInBitTicketsDaoMixin { + ShopInBitTicketsDao(super.db); - Future getSettings() async { - final ShopinBitSetting? row = await (select( - shopinBitSettings, - )..where((t) => t.id.equals(0))).getSingleOrNull(); - if (row != null) return row; + // -- Reads -- - return into( - shopinBitSettings, - ).insertReturning(ShopinBitSettingsCompanion.insert(id: const Value(0))); + Future getByApiId(int apiTicketId) { + return (select( + shopInBitTickets, + )..where((t) => t.apiTicketId.equals(apiTicketId))).getSingleOrNull(); } - Future setGuidelinesAccepted(bool accepted) => - _update(ShopinBitSettingsCompanion(guidelinesAccepted: Value(accepted))); + Stream watchByApiId(int apiTicketId) { + return (select( + shopInBitTickets, + )..where((t) => t.apiTicketId.equals(apiTicketId))).watchSingleOrNull(); + } + + /// All tickets for the active customer key, newest first. + Stream> watchByCustomerKey(String customerKey) { + return (select(shopInBitTickets) + ..where((t) => t.customerKey.equals(customerKey)) + ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])) + .watch(); + } + + // -- Writes -- + + /// Insert a brand-new ticket. Caller must supply every required field; + /// pass nullable fields through the companion's `Value(...)` wrappers. + Future insertTicket(ShopInBitTicketsCompanion companion) async { + await into(shopInBitTickets).insert(companion); + } + + /// Patch an existing ticket. Use `Value.absent()` (the companion default) + /// for fields you don't want to touch. Returns true if a row was updated. + Future updateTicket( + int apiTicketId, + ShopInBitTicketsCompanion patch, + ) async { + final int rows = await (update( + shopInBitTickets, + )..where((t) => t.apiTicketId.equals(apiTicketId))).write(patch); + return rows > 0; + } + + Future deleteByApiId(int apiTicketId) { + return (delete( + shopInBitTickets, + )..where((t) => t.apiTicketId.equals(apiTicketId))).go(); + } + + Future deleteByCustomerKey(String customerKey) { + return (delete( + shopInBitTickets, + )..where((t) => t.customerKey.equals(customerKey))).go(); + } +} + +@DriftAccessor(tables: [ShopInBitSettings]) +class ShopInBitSettingsDao extends DatabaseAccessor + with _$ShopInBitSettingsDaoMixin { + ShopInBitSettingsDao(super.db); + + // -- "Current" (= most-recently-used) row -- + + /// Returns the settings row for the most-recently-used customer key, + /// or null if the user has never generated/recovered one. + Future getCurrentSettings() { + return (select(shopInBitSettings) + ..orderBy([(t) => OrderingTerm.desc(t.lastUsedAt)]) + ..limit(1)) + .getSingleOrNull(); + } + + Stream watchCurrentSettings() { + return (select(shopInBitSettings) + ..orderBy([(t) => OrderingTerm.desc(t.lastUsedAt)]) + ..limit(1)) + .watchSingleOrNull(); + } + + // -- Specific row by customer key -- + + Future getByKey(String customerKey) { + return (select( + shopInBitSettings, + )..where((t) => t.customerKey.equals(customerKey))).getSingleOrNull(); + } - Future setSetupComplete(bool complete) => - _update(ShopinBitSettingsCompanion(setupComplete: Value(complete))); + Stream watchByKey(String customerKey) { + return (select( + shopInBitSettings, + )..where((t) => t.customerKey.equals(customerKey))).watchSingleOrNull(); + } + + Stream> watchAll() { + return (select( + shopInBitSettings, + )..orderBy([(t) => OrderingTerm.desc(t.lastUsedAt)])).watch(); + } + + // -- Writes -- + + /// Insert if missing, otherwise bump [lastUsedAt]. Returns the row. + Future upsert(String customerKey) { + final DateTime now = DateTime.now(); + return into(shopInBitSettings).insertReturning( + ShopInBitSettingsCompanion.insert( + customerKey: customerKey, + createdAt: Value(now), + lastUsedAt: Value(now), + ), + onConflict: DoUpdate( + (_) => ShopInBitSettingsCompanion(lastUsedAt: Value(now)), + target: [shopInBitSettings.customerKey], + ), + ); + } + + Future touch(String customerKey) => _write( + customerKey, + ShopInBitSettingsCompanion(lastUsedAt: Value(DateTime.now())), + ); - Future setDisplayName(String name) => - _update(ShopinBitSettingsCompanion(displayName: Value(name))); + Future setPrivacyAccepted(String customerKey, bool value) => _write( + customerKey, + ShopInBitSettingsCompanion(privacyAccepted: Value(value)), + ); - Future _update(ShopinBitSettingsCompanion changes) async { - await getSettings(); // ensure row exists - await (update( - shopinBitSettings, - )..where((t) => t.id.equals(0))).write(changes); + Future setGuidelinesAccepted( + String customerKey, + ShopInBitCategory category, + bool value, + ) { + final ShopInBitSettingsCompanion patch = switch (category) { + .concierge => ShopInBitSettingsCompanion( + conciergeGuidelinesAccepted: Value(value), + ), + .travel => ShopInBitSettingsCompanion( + travelGuidelinesAccepted: Value(value), + ), + .car => ShopInBitSettingsCompanion(carGuidelinesAccepted: Value(value)), + }; + return _write(customerKey, patch); } + + Future setSetupComplete(String customerKey, bool value) => _write( + customerKey, + ShopInBitSettingsCompanion(setupComplete: Value(value)), + ); + + Future deleteByKey(String customerKey) { + return (delete( + shopInBitSettings, + )..where((t) => t.customerKey.equals(customerKey))).go(); + } + + Future _write(String customerKey, ShopInBitSettingsCompanion changes) { + return (update( + shopInBitSettings, + )..where((t) => t.customerKey.equals(customerKey))).write(changes); + } +} + +extension ShopInBitSettingGuidelines on ShopInBitSetting { + bool guidelinesAcceptedFor(ShopInBitCategory category) => switch (category) { + .concierge => conciergeGuidelinesAccepted, + .travel => travelGuidelinesAccepted, + .car => carGuidelinesAccepted, + }; } diff --git a/lib/db/drift/shared_db/shared_database.g.dart b/lib/db/drift/shared_db/shared_database.g.dart index 28c4c39910..67c9b7af63 100644 --- a/lib/db/drift/shared_db/shared_database.g.dart +++ b/lib/db/drift/shared_db/shared_database.g.dart @@ -165,36 +165,83 @@ class CakepayOrdersCompanion extends UpdateCompanion { } } -class $ShopinBitSettingsTable extends ShopinBitSettings - with TableInfo<$ShopinBitSettingsTable, ShopinBitSetting> { +class $ShopInBitSettingsTable extends ShopInBitSettings + with TableInfo<$ShopInBitSettingsTable, ShopInBitSetting> { @override final GeneratedDatabase attachedDatabase; final String? _alias; - $ShopinBitSettingsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); + $ShopInBitSettingsTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _customerKeyMeta = const VerificationMeta( + 'customerKey', + ); @override - late final GeneratedColumn id = GeneratedColumn( - 'id', + late final GeneratedColumn customerKey = GeneratedColumn( + 'customer_key', aliasedName, false, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultValue: const Constant(0), + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _privacyAcceptedMeta = const VerificationMeta( + 'privacyAccepted', ); - static const VerificationMeta _guidelinesAcceptedMeta = - const VerificationMeta('guidelinesAccepted'); @override - late final GeneratedColumn guidelinesAccepted = GeneratedColumn( - 'guidelines_accepted', + late final GeneratedColumn privacyAccepted = GeneratedColumn( + 'privacy_accepted', aliasedName, false, type: DriftSqlType.bool, requiredDuringInsert: false, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("guidelines_accepted" IN (0, 1))', + 'CHECK ("privacy_accepted" IN (0, 1))', ), defaultValue: const Constant(false), ); + static const VerificationMeta _conciergeGuidelinesAcceptedMeta = + const VerificationMeta('conciergeGuidelinesAccepted'); + @override + late final GeneratedColumn conciergeGuidelinesAccepted = + GeneratedColumn( + 'concierge_guidelines_accepted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("concierge_guidelines_accepted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _travelGuidelinesAcceptedMeta = + const VerificationMeta('travelGuidelinesAccepted'); + @override + late final GeneratedColumn travelGuidelinesAccepted = + GeneratedColumn( + 'travel_guidelines_accepted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("travel_guidelines_accepted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); + static const VerificationMeta _carGuidelinesAcceptedMeta = + const VerificationMeta('carGuidelinesAccepted'); + @override + late final GeneratedColumn carGuidelinesAccepted = + GeneratedColumn( + 'car_guidelines_accepted', + aliasedName, + false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("car_guidelines_accepted" IN (0, 1))', + ), + defaultValue: const Constant(false), + ); static const VerificationMeta _setupCompleteMeta = const VerificationMeta( 'setupComplete', ); @@ -210,45 +257,97 @@ class $ShopinBitSettingsTable extends ShopinBitSettings ), defaultValue: const Constant(false), ); - static const VerificationMeta _displayNameMeta = const VerificationMeta( - 'displayName', + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', ); @override - late final GeneratedColumn displayName = GeneratedColumn( - 'display_name', + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, - true, - type: DriftSqlType.string, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: currentDateAndTime, + ); + static const VerificationMeta _lastUsedAtMeta = const VerificationMeta( + 'lastUsedAt', + ); + @override + late final GeneratedColumn lastUsedAt = GeneratedColumn( + 'last_used_at', + aliasedName, + false, + type: DriftSqlType.dateTime, requiredDuringInsert: false, + defaultValue: currentDateAndTime, ); @override List get $columns => [ - id, - guidelinesAccepted, + customerKey, + privacyAccepted, + conciergeGuidelinesAccepted, + travelGuidelinesAccepted, + carGuidelinesAccepted, setupComplete, - displayName, + createdAt, + lastUsedAt, ]; @override String get aliasedName => _alias ?? actualTableName; @override String get actualTableName => $name; - static const String $name = 'shopin_bit_settings'; + static const String $name = 'shop_in_bit_settings'; @override VerificationContext validateIntegrity( - Insertable instance, { + Insertable instance, { bool isInserting = false, }) { final context = VerificationContext(); final data = instance.toColumns(true); - if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + if (data.containsKey('customer_key')) { + context.handle( + _customerKeyMeta, + customerKey.isAcceptableOrUnknown( + data['customer_key']!, + _customerKeyMeta, + ), + ); + } else if (isInserting) { + context.missing(_customerKeyMeta); + } + if (data.containsKey('privacy_accepted')) { + context.handle( + _privacyAcceptedMeta, + privacyAccepted.isAcceptableOrUnknown( + data['privacy_accepted']!, + _privacyAcceptedMeta, + ), + ); } - if (data.containsKey('guidelines_accepted')) { + if (data.containsKey('concierge_guidelines_accepted')) { context.handle( - _guidelinesAcceptedMeta, - guidelinesAccepted.isAcceptableOrUnknown( - data['guidelines_accepted']!, - _guidelinesAcceptedMeta, + _conciergeGuidelinesAcceptedMeta, + conciergeGuidelinesAccepted.isAcceptableOrUnknown( + data['concierge_guidelines_accepted']!, + _conciergeGuidelinesAcceptedMeta, + ), + ); + } + if (data.containsKey('travel_guidelines_accepted')) { + context.handle( + _travelGuidelinesAcceptedMeta, + travelGuidelinesAccepted.isAcceptableOrUnknown( + data['travel_guidelines_accepted']!, + _travelGuidelinesAcceptedMeta, + ), + ); + } + if (data.containsKey('car_guidelines_accepted')) { + context.handle( + _carGuidelinesAcceptedMeta, + carGuidelinesAccepted.isAcceptableOrUnknown( + data['car_guidelines_accepted']!, + _carGuidelinesAcceptedMeta, ), ); } @@ -261,12 +360,18 @@ class $ShopinBitSettingsTable extends ShopinBitSettings ), ); } - if (data.containsKey('display_name')) { + if (data.containsKey('created_at')) { + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); + } + if (data.containsKey('last_used_at')) { context.handle( - _displayNameMeta, - displayName.isAcceptableOrUnknown( - data['display_name']!, - _displayNameMeta, + _lastUsedAtMeta, + lastUsedAt.isAcceptableOrUnknown( + data['last_used_at']!, + _lastUsedAtMeta, ), ); } @@ -274,214 +379,362 @@ class $ShopinBitSettingsTable extends ShopinBitSettings } @override - Set get $primaryKey => {id}; + Set get $primaryKey => {customerKey}; @override - ShopinBitSetting map(Map data, {String? tablePrefix}) { + ShopInBitSetting map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return ShopinBitSetting( - id: attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], + return ShopInBitSetting( + customerKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}customer_key'], + )!, + privacyAccepted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}privacy_accepted'], )!, - guidelinesAccepted: attachedDatabase.typeMapping.read( + conciergeGuidelinesAccepted: attachedDatabase.typeMapping.read( DriftSqlType.bool, - data['${effectivePrefix}guidelines_accepted'], + data['${effectivePrefix}concierge_guidelines_accepted'], + )!, + travelGuidelinesAccepted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}travel_guidelines_accepted'], + )!, + carGuidelinesAccepted: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}car_guidelines_accepted'], )!, setupComplete: attachedDatabase.typeMapping.read( DriftSqlType.bool, data['${effectivePrefix}setup_complete'], )!, - displayName: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}display_name'], - ), + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, + lastUsedAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_used_at'], + )!, ); } @override - $ShopinBitSettingsTable createAlias(String alias) { - return $ShopinBitSettingsTable(attachedDatabase, alias); + $ShopInBitSettingsTable createAlias(String alias) { + return $ShopInBitSettingsTable(attachedDatabase, alias); } + + @override + bool get withoutRowId => true; } -class ShopinBitSetting extends DataClass - implements Insertable { - final int id; - final bool guidelinesAccepted; +class ShopInBitSetting extends DataClass + implements Insertable { + final String customerKey; + final bool privacyAccepted; + final bool conciergeGuidelinesAccepted; + final bool travelGuidelinesAccepted; + final bool carGuidelinesAccepted; final bool setupComplete; - final String? displayName; - const ShopinBitSetting({ - required this.id, - required this.guidelinesAccepted, + final DateTime createdAt; + final DateTime lastUsedAt; + const ShopInBitSetting({ + required this.customerKey, + required this.privacyAccepted, + required this.conciergeGuidelinesAccepted, + required this.travelGuidelinesAccepted, + required this.carGuidelinesAccepted, required this.setupComplete, - this.displayName, + required this.createdAt, + required this.lastUsedAt, }); @override Map toColumns(bool nullToAbsent) { final map = {}; - map['id'] = Variable(id); - map['guidelines_accepted'] = Variable(guidelinesAccepted); + map['customer_key'] = Variable(customerKey); + map['privacy_accepted'] = Variable(privacyAccepted); + map['concierge_guidelines_accepted'] = Variable( + conciergeGuidelinesAccepted, + ); + map['travel_guidelines_accepted'] = Variable( + travelGuidelinesAccepted, + ); + map['car_guidelines_accepted'] = Variable(carGuidelinesAccepted); map['setup_complete'] = Variable(setupComplete); - if (!nullToAbsent || displayName != null) { - map['display_name'] = Variable(displayName); - } + map['created_at'] = Variable(createdAt); + map['last_used_at'] = Variable(lastUsedAt); return map; } - ShopinBitSettingsCompanion toCompanion(bool nullToAbsent) { - return ShopinBitSettingsCompanion( - id: Value(id), - guidelinesAccepted: Value(guidelinesAccepted), + ShopInBitSettingsCompanion toCompanion(bool nullToAbsent) { + return ShopInBitSettingsCompanion( + customerKey: Value(customerKey), + privacyAccepted: Value(privacyAccepted), + conciergeGuidelinesAccepted: Value(conciergeGuidelinesAccepted), + travelGuidelinesAccepted: Value(travelGuidelinesAccepted), + carGuidelinesAccepted: Value(carGuidelinesAccepted), setupComplete: Value(setupComplete), - displayName: displayName == null && nullToAbsent - ? const Value.absent() - : Value(displayName), + createdAt: Value(createdAt), + lastUsedAt: Value(lastUsedAt), ); } - factory ShopinBitSetting.fromJson( + factory ShopInBitSetting.fromJson( Map json, { ValueSerializer? serializer, }) { serializer ??= driftRuntimeOptions.defaultSerializer; - return ShopinBitSetting( - id: serializer.fromJson(json['id']), - guidelinesAccepted: serializer.fromJson(json['guidelinesAccepted']), + return ShopInBitSetting( + customerKey: serializer.fromJson(json['customerKey']), + privacyAccepted: serializer.fromJson(json['privacyAccepted']), + conciergeGuidelinesAccepted: serializer.fromJson( + json['conciergeGuidelinesAccepted'], + ), + travelGuidelinesAccepted: serializer.fromJson( + json['travelGuidelinesAccepted'], + ), + carGuidelinesAccepted: serializer.fromJson( + json['carGuidelinesAccepted'], + ), setupComplete: serializer.fromJson(json['setupComplete']), - displayName: serializer.fromJson(json['displayName']), + createdAt: serializer.fromJson(json['createdAt']), + lastUsedAt: serializer.fromJson(json['lastUsedAt']), ); } @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return { - 'id': serializer.toJson(id), - 'guidelinesAccepted': serializer.toJson(guidelinesAccepted), + 'customerKey': serializer.toJson(customerKey), + 'privacyAccepted': serializer.toJson(privacyAccepted), + 'conciergeGuidelinesAccepted': serializer.toJson( + conciergeGuidelinesAccepted, + ), + 'travelGuidelinesAccepted': serializer.toJson( + travelGuidelinesAccepted, + ), + 'carGuidelinesAccepted': serializer.toJson(carGuidelinesAccepted), 'setupComplete': serializer.toJson(setupComplete), - 'displayName': serializer.toJson(displayName), + 'createdAt': serializer.toJson(createdAt), + 'lastUsedAt': serializer.toJson(lastUsedAt), }; } - ShopinBitSetting copyWith({ - int? id, - bool? guidelinesAccepted, + ShopInBitSetting copyWith({ + String? customerKey, + bool? privacyAccepted, + bool? conciergeGuidelinesAccepted, + bool? travelGuidelinesAccepted, + bool? carGuidelinesAccepted, bool? setupComplete, - Value displayName = const Value.absent(), - }) => ShopinBitSetting( - id: id ?? this.id, - guidelinesAccepted: guidelinesAccepted ?? this.guidelinesAccepted, + DateTime? createdAt, + DateTime? lastUsedAt, + }) => ShopInBitSetting( + customerKey: customerKey ?? this.customerKey, + privacyAccepted: privacyAccepted ?? this.privacyAccepted, + conciergeGuidelinesAccepted: + conciergeGuidelinesAccepted ?? this.conciergeGuidelinesAccepted, + travelGuidelinesAccepted: + travelGuidelinesAccepted ?? this.travelGuidelinesAccepted, + carGuidelinesAccepted: carGuidelinesAccepted ?? this.carGuidelinesAccepted, setupComplete: setupComplete ?? this.setupComplete, - displayName: displayName.present ? displayName.value : this.displayName, - ); - ShopinBitSetting copyWithCompanion(ShopinBitSettingsCompanion data) { - return ShopinBitSetting( - id: data.id.present ? data.id.value : this.id, - guidelinesAccepted: data.guidelinesAccepted.present - ? data.guidelinesAccepted.value - : this.guidelinesAccepted, + createdAt: createdAt ?? this.createdAt, + lastUsedAt: lastUsedAt ?? this.lastUsedAt, + ); + ShopInBitSetting copyWithCompanion(ShopInBitSettingsCompanion data) { + return ShopInBitSetting( + customerKey: data.customerKey.present + ? data.customerKey.value + : this.customerKey, + privacyAccepted: data.privacyAccepted.present + ? data.privacyAccepted.value + : this.privacyAccepted, + conciergeGuidelinesAccepted: data.conciergeGuidelinesAccepted.present + ? data.conciergeGuidelinesAccepted.value + : this.conciergeGuidelinesAccepted, + travelGuidelinesAccepted: data.travelGuidelinesAccepted.present + ? data.travelGuidelinesAccepted.value + : this.travelGuidelinesAccepted, + carGuidelinesAccepted: data.carGuidelinesAccepted.present + ? data.carGuidelinesAccepted.value + : this.carGuidelinesAccepted, setupComplete: data.setupComplete.present ? data.setupComplete.value : this.setupComplete, - displayName: data.displayName.present - ? data.displayName.value - : this.displayName, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + lastUsedAt: data.lastUsedAt.present + ? data.lastUsedAt.value + : this.lastUsedAt, ); } @override String toString() { - return (StringBuffer('ShopinBitSetting(') - ..write('id: $id, ') - ..write('guidelinesAccepted: $guidelinesAccepted, ') + return (StringBuffer('ShopInBitSetting(') + ..write('customerKey: $customerKey, ') + ..write('privacyAccepted: $privacyAccepted, ') + ..write('conciergeGuidelinesAccepted: $conciergeGuidelinesAccepted, ') + ..write('travelGuidelinesAccepted: $travelGuidelinesAccepted, ') + ..write('carGuidelinesAccepted: $carGuidelinesAccepted, ') ..write('setupComplete: $setupComplete, ') - ..write('displayName: $displayName') + ..write('createdAt: $createdAt, ') + ..write('lastUsedAt: $lastUsedAt') ..write(')')) .toString(); } @override - int get hashCode => - Object.hash(id, guidelinesAccepted, setupComplete, displayName); + int get hashCode => Object.hash( + customerKey, + privacyAccepted, + conciergeGuidelinesAccepted, + travelGuidelinesAccepted, + carGuidelinesAccepted, + setupComplete, + createdAt, + lastUsedAt, + ); @override bool operator ==(Object other) => identical(this, other) || - (other is ShopinBitSetting && - other.id == this.id && - other.guidelinesAccepted == this.guidelinesAccepted && + (other is ShopInBitSetting && + other.customerKey == this.customerKey && + other.privacyAccepted == this.privacyAccepted && + other.conciergeGuidelinesAccepted == + this.conciergeGuidelinesAccepted && + other.travelGuidelinesAccepted == this.travelGuidelinesAccepted && + other.carGuidelinesAccepted == this.carGuidelinesAccepted && other.setupComplete == this.setupComplete && - other.displayName == this.displayName); + other.createdAt == this.createdAt && + other.lastUsedAt == this.lastUsedAt); } -class ShopinBitSettingsCompanion extends UpdateCompanion { - final Value id; - final Value guidelinesAccepted; +class ShopInBitSettingsCompanion extends UpdateCompanion { + final Value customerKey; + final Value privacyAccepted; + final Value conciergeGuidelinesAccepted; + final Value travelGuidelinesAccepted; + final Value carGuidelinesAccepted; final Value setupComplete; - final Value displayName; - const ShopinBitSettingsCompanion({ - this.id = const Value.absent(), - this.guidelinesAccepted = const Value.absent(), + final Value createdAt; + final Value lastUsedAt; + const ShopInBitSettingsCompanion({ + this.customerKey = const Value.absent(), + this.privacyAccepted = const Value.absent(), + this.conciergeGuidelinesAccepted = const Value.absent(), + this.travelGuidelinesAccepted = const Value.absent(), + this.carGuidelinesAccepted = const Value.absent(), this.setupComplete = const Value.absent(), - this.displayName = const Value.absent(), + this.createdAt = const Value.absent(), + this.lastUsedAt = const Value.absent(), }); - ShopinBitSettingsCompanion.insert({ - this.id = const Value.absent(), - this.guidelinesAccepted = const Value.absent(), + ShopInBitSettingsCompanion.insert({ + required String customerKey, + this.privacyAccepted = const Value.absent(), + this.conciergeGuidelinesAccepted = const Value.absent(), + this.travelGuidelinesAccepted = const Value.absent(), + this.carGuidelinesAccepted = const Value.absent(), this.setupComplete = const Value.absent(), - this.displayName = const Value.absent(), - }); - static Insertable custom({ - Expression? id, - Expression? guidelinesAccepted, + this.createdAt = const Value.absent(), + this.lastUsedAt = const Value.absent(), + }) : customerKey = Value(customerKey); + static Insertable custom({ + Expression? customerKey, + Expression? privacyAccepted, + Expression? conciergeGuidelinesAccepted, + Expression? travelGuidelinesAccepted, + Expression? carGuidelinesAccepted, Expression? setupComplete, - Expression? displayName, + Expression? createdAt, + Expression? lastUsedAt, }) { return RawValuesInsertable({ - if (id != null) 'id': id, - if (guidelinesAccepted != null) 'guidelines_accepted': guidelinesAccepted, + if (customerKey != null) 'customer_key': customerKey, + if (privacyAccepted != null) 'privacy_accepted': privacyAccepted, + if (conciergeGuidelinesAccepted != null) + 'concierge_guidelines_accepted': conciergeGuidelinesAccepted, + if (travelGuidelinesAccepted != null) + 'travel_guidelines_accepted': travelGuidelinesAccepted, + if (carGuidelinesAccepted != null) + 'car_guidelines_accepted': carGuidelinesAccepted, if (setupComplete != null) 'setup_complete': setupComplete, - if (displayName != null) 'display_name': displayName, + if (createdAt != null) 'created_at': createdAt, + if (lastUsedAt != null) 'last_used_at': lastUsedAt, }); } - ShopinBitSettingsCompanion copyWith({ - Value? id, - Value? guidelinesAccepted, + ShopInBitSettingsCompanion copyWith({ + Value? customerKey, + Value? privacyAccepted, + Value? conciergeGuidelinesAccepted, + Value? travelGuidelinesAccepted, + Value? carGuidelinesAccepted, Value? setupComplete, - Value? displayName, + Value? createdAt, + Value? lastUsedAt, }) { - return ShopinBitSettingsCompanion( - id: id ?? this.id, - guidelinesAccepted: guidelinesAccepted ?? this.guidelinesAccepted, + return ShopInBitSettingsCompanion( + customerKey: customerKey ?? this.customerKey, + privacyAccepted: privacyAccepted ?? this.privacyAccepted, + conciergeGuidelinesAccepted: + conciergeGuidelinesAccepted ?? this.conciergeGuidelinesAccepted, + travelGuidelinesAccepted: + travelGuidelinesAccepted ?? this.travelGuidelinesAccepted, + carGuidelinesAccepted: + carGuidelinesAccepted ?? this.carGuidelinesAccepted, setupComplete: setupComplete ?? this.setupComplete, - displayName: displayName ?? this.displayName, + createdAt: createdAt ?? this.createdAt, + lastUsedAt: lastUsedAt ?? this.lastUsedAt, ); } @override Map toColumns(bool nullToAbsent) { final map = {}; - if (id.present) { - map['id'] = Variable(id.value); + if (customerKey.present) { + map['customer_key'] = Variable(customerKey.value); + } + if (privacyAccepted.present) { + map['privacy_accepted'] = Variable(privacyAccepted.value); + } + if (conciergeGuidelinesAccepted.present) { + map['concierge_guidelines_accepted'] = Variable( + conciergeGuidelinesAccepted.value, + ); + } + if (travelGuidelinesAccepted.present) { + map['travel_guidelines_accepted'] = Variable( + travelGuidelinesAccepted.value, + ); } - if (guidelinesAccepted.present) { - map['guidelines_accepted'] = Variable(guidelinesAccepted.value); + if (carGuidelinesAccepted.present) { + map['car_guidelines_accepted'] = Variable( + carGuidelinesAccepted.value, + ); } if (setupComplete.present) { map['setup_complete'] = Variable(setupComplete.value); } - if (displayName.present) { - map['display_name'] = Variable(displayName.value); + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + if (lastUsedAt.present) { + map['last_used_at'] = Variable(lastUsedAt.value); } return map; } @override String toString() { - return (StringBuffer('ShopinBitSettingsCompanion(') - ..write('id: $id, ') - ..write('guidelinesAccepted: $guidelinesAccepted, ') + return (StringBuffer('ShopInBitSettingsCompanion(') + ..write('customerKey: $customerKey, ') + ..write('privacyAccepted: $privacyAccepted, ') + ..write('conciergeGuidelinesAccepted: $conciergeGuidelinesAccepted, ') + ..write('travelGuidelinesAccepted: $travelGuidelinesAccepted, ') + ..write('carGuidelinesAccepted: $carGuidelinesAccepted, ') ..write('setupComplete: $setupComplete, ') - ..write('displayName: $displayName') + ..write('createdAt: $createdAt, ') + ..write('lastUsedAt: $lastUsedAt') ..write(')')) .toString(); } @@ -493,62 +746,48 @@ class $ShopInBitTicketsTable extends ShopInBitTickets final GeneratedDatabase attachedDatabase; final String? _alias; $ShopInBitTicketsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _ticketIdMeta = const VerificationMeta( - 'ticketId', + static const VerificationMeta _apiTicketIdMeta = const VerificationMeta( + 'apiTicketId', ); @override - late final GeneratedColumn ticketId = GeneratedColumn( - 'ticket_id', + late final GeneratedColumn apiTicketId = GeneratedColumn( + 'api_ticket_id', aliasedName, false, - type: DriftSqlType.string, + type: DriftSqlType.int, requiredDuringInsert: true, ); - static const VerificationMeta _displayNameMeta = const VerificationMeta( - 'displayName', + static const VerificationMeta _customerKeyMeta = const VerificationMeta( + 'customerKey', ); @override - late final GeneratedColumn displayName = GeneratedColumn( - 'display_name', + late final GeneratedColumn customerKey = GeneratedColumn( + 'customer_key', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true, ); - @override - late final GeneratedColumnWithTypeConverter category = - GeneratedColumn( - 'category', - aliasedName, - false, - type: DriftSqlType.int, - requiredDuringInsert: true, - ).withConverter( - $ShopInBitTicketsTable.$convertercategory, - ); - @override - late final GeneratedColumnWithTypeConverter - status = - GeneratedColumn( - 'status', - aliasedName, - false, - type: DriftSqlType.int, - requiredDuringInsert: true, - ).withConverter( - $ShopInBitTicketsTable.$converterstatus, - ); - static const VerificationMeta _statusRawMeta = const VerificationMeta( - 'statusRaw', + static const VerificationMeta _ticketNumberMeta = const VerificationMeta( + 'ticketNumber', ); @override - late final GeneratedColumn statusRaw = GeneratedColumn( - 'status_raw', + late final GeneratedColumn ticketNumber = GeneratedColumn( + 'ticket_number', aliasedName, - true, + false, type: DriftSqlType.string, - requiredDuringInsert: false, + requiredDuringInsert: true, ); + @override + late final GeneratedColumnWithTypeConverter + category = GeneratedColumn( + 'category', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ).withConverter($ShopInBitTicketsTable.$convertercategory); static const VerificationMeta _requestDescriptionMeta = const VerificationMeta('requestDescription'); @override @@ -571,6 +810,29 @@ class $ShopInBitTicketsTable extends ShopInBitTickets type: DriftSqlType.string, requiredDuringInsert: true, ); + @override + late final GeneratedColumnWithTypeConverter + status = + GeneratedColumn( + 'status', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ).withConverter( + $ShopInBitTicketsTable.$converterstatus, + ); + static const VerificationMeta _statusRawMeta = const VerificationMeta( + 'statusRaw', + ); + @override + late final GeneratedColumn statusRaw = GeneratedColumn( + 'status_raw', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); static const VerificationMeta _offerProductNameMeta = const VerificationMeta( 'offerProductName', ); @@ -593,85 +855,61 @@ class $ShopInBitTicketsTable extends ShopInBitTickets type: DriftSqlType.string, requiredDuringInsert: false, ); - static const VerificationMeta _shippingNameMeta = const VerificationMeta( - 'shippingName', - ); - @override - late final GeneratedColumn shippingName = GeneratedColumn( - 'shipping_name', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _shippingStreetMeta = const VerificationMeta( - 'shippingStreet', - ); - @override - late final GeneratedColumn shippingStreet = GeneratedColumn( - 'shipping_street', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _shippingCityMeta = const VerificationMeta( - 'shippingCity', - ); - @override - late final GeneratedColumn shippingCity = GeneratedColumn( - 'shipping_city', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _shippingPostalCodeMeta = - const VerificationMeta('shippingPostalCode'); + static const VerificationMeta _paymentInvoiceStatusMeta = + const VerificationMeta('paymentInvoiceStatus'); @override - late final GeneratedColumn shippingPostalCode = + late final GeneratedColumn paymentInvoiceStatus = GeneratedColumn( - 'shipping_postal_code', + 'payment_invoice_status', aliasedName, - false, + true, type: DriftSqlType.string, - requiredDuringInsert: true, + requiredDuringInsert: false, ); - static const VerificationMeta _shippingCountryMeta = const VerificationMeta( - 'shippingCountry', + static const VerificationMeta _trackingLinkMeta = const VerificationMeta( + 'trackingLink', ); @override - late final GeneratedColumn shippingCountry = GeneratedColumn( - 'shipping_country', + late final GeneratedColumn trackingLink = GeneratedColumn( + 'tracking_link', aliasedName, - false, + true, type: DriftSqlType.string, - requiredDuringInsert: true, + requiredDuringInsert: false, ); - static const VerificationMeta _paymentMethodMeta = const VerificationMeta( - 'paymentMethod', + static const VerificationMeta _lastAgentMessageAtMeta = + const VerificationMeta('lastAgentMessageAt'); + @override + late final GeneratedColumn lastAgentMessageAt = + GeneratedColumn( + 'last_agent_message_at', + aliasedName, + true, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + ); + static const VerificationMeta _feeTicketNumberMeta = const VerificationMeta( + 'feeTicketNumber', ); @override - late final GeneratedColumn paymentMethod = GeneratedColumn( - 'payment_method', + late final GeneratedColumn feeTicketNumber = GeneratedColumn( + 'fee_ticket_number', aliasedName, true, type: DriftSqlType.string, requiredDuringInsert: false, ); @override - late final GeneratedColumnWithTypeConverter< - List, - String - > + late final GeneratedColumnWithTypeConverter, String> messages = GeneratedColumn( 'messages', aliasedName, false, type: DriftSqlType.string, - requiredDuringInsert: true, - ).withConverter>( + requiredDuringInsert: false, + defaultValue: const Constant("[]"), + ).withConverter>( $ShopInBitTicketsTable.$convertermessages, ); static const VerificationMeta _createdAtMeta = const VerificationMeta( @@ -683,116 +921,40 @@ class $ShopInBitTicketsTable extends ShopInBitTickets aliasedName, false, type: DriftSqlType.dateTime, - requiredDuringInsert: true, - ); - static const VerificationMeta _apiTicketIdMeta = const VerificationMeta( - 'apiTicketId', - ); - @override - late final GeneratedColumn apiTicketId = GeneratedColumn( - 'api_ticket_id', - aliasedName, - false, - type: DriftSqlType.int, - requiredDuringInsert: true, - ); - static const VerificationMeta _carResearchInvoiceIdMeta = - const VerificationMeta('carResearchInvoiceId'); - @override - late final GeneratedColumn carResearchInvoiceId = - GeneratedColumn( - 'car_research_invoice_id', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ); - static const VerificationMeta _feeTicketNumberMeta = const VerificationMeta( - 'feeTicketNumber', - ); - @override - late final GeneratedColumn feeTicketNumber = GeneratedColumn( - 'fee_ticket_number', - aliasedName, - true, - type: DriftSqlType.string, requiredDuringInsert: false, + defaultValue: currentDateAndTime, ); - static const VerificationMeta _needsCreateRequestMeta = - const VerificationMeta('needsCreateRequest'); - @override - late final GeneratedColumn needsCreateRequest = GeneratedColumn( - 'needs_create_request', - aliasedName, - false, - type: DriftSqlType.bool, - requiredDuringInsert: true, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("needs_create_request" IN (0, 1))', - ), - ); - static const VerificationMeta _isPendingPaymentMeta = const VerificationMeta( - 'isPendingPayment', + static const VerificationMeta _updatedAtMeta = const VerificationMeta( + 'updatedAt', ); @override - late final GeneratedColumn isPendingPayment = GeneratedColumn( - 'is_pending_payment', + late final GeneratedColumn updatedAt = GeneratedColumn( + 'updated_at', aliasedName, false, - type: DriftSqlType.bool, - requiredDuringInsert: true, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'CHECK ("is_pending_payment" IN (0, 1))', - ), + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: currentDateAndTime, ); - static const VerificationMeta _carResearchExpiresAtMeta = - const VerificationMeta('carResearchExpiresAt'); - @override - late final GeneratedColumn carResearchExpiresAt = - GeneratedColumn( - 'car_research_expires_at', - aliasedName, - true, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - ); - static const VerificationMeta _carResearchPaymentLinksMeta = - const VerificationMeta('carResearchPaymentLinks'); - @override - late final GeneratedColumn carResearchPaymentLinks = - GeneratedColumn( - 'car_research_payment_links', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ); @override List get $columns => [ - ticketId, - displayName, + apiTicketId, + customerKey, + ticketNumber, category, - status, - statusRaw, requestDescription, deliveryCountry, + status, + statusRaw, offerProductName, offerPrice, - shippingName, - shippingStreet, - shippingCity, - shippingPostalCode, - shippingCountry, - paymentMethod, + paymentInvoiceStatus, + trackingLink, + lastAgentMessageAt, + feeTicketNumber, messages, createdAt, - apiTicketId, - carResearchInvoiceId, - feeTicketNumber, - needsCreateRequest, - isPendingPayment, - carResearchExpiresAt, - carResearchPaymentLinks, + updatedAt, ]; @override String get aliasedName => _alias ?? actualTableName; @@ -806,30 +968,38 @@ class $ShopInBitTicketsTable extends ShopInBitTickets }) { final context = VerificationContext(); final data = instance.toColumns(true); - if (data.containsKey('ticket_id')) { + if (data.containsKey('api_ticket_id')) { context.handle( - _ticketIdMeta, - ticketId.isAcceptableOrUnknown(data['ticket_id']!, _ticketIdMeta), + _apiTicketIdMeta, + apiTicketId.isAcceptableOrUnknown( + data['api_ticket_id']!, + _apiTicketIdMeta, + ), ); } else if (isInserting) { - context.missing(_ticketIdMeta); + context.missing(_apiTicketIdMeta); } - if (data.containsKey('display_name')) { + if (data.containsKey('customer_key')) { context.handle( - _displayNameMeta, - displayName.isAcceptableOrUnknown( - data['display_name']!, - _displayNameMeta, + _customerKeyMeta, + customerKey.isAcceptableOrUnknown( + data['customer_key']!, + _customerKeyMeta, ), ); } else if (isInserting) { - context.missing(_displayNameMeta); + context.missing(_customerKeyMeta); } - if (data.containsKey('status_raw')) { + if (data.containsKey('ticket_number')) { context.handle( - _statusRawMeta, - statusRaw.isAcceptableOrUnknown(data['status_raw']!, _statusRawMeta), + _ticketNumberMeta, + ticketNumber.isAcceptableOrUnknown( + data['ticket_number']!, + _ticketNumberMeta, + ), ); + } else if (isInserting) { + context.missing(_ticketNumberMeta); } if (data.containsKey('request_description')) { context.handle( @@ -853,6 +1023,14 @@ class $ShopInBitTicketsTable extends ShopInBitTickets } else if (isInserting) { context.missing(_deliveryCountryMeta); } + if (data.containsKey('status_raw')) { + context.handle( + _statusRawMeta, + statusRaw.isAcceptableOrUnknown(data['status_raw']!, _statusRawMeta), + ); + } else if (isInserting) { + context.missing(_statusRawMeta); + } if (data.containsKey('offer_product_name')) { context.handle( _offerProductNameMeta, @@ -868,95 +1046,30 @@ class $ShopInBitTicketsTable extends ShopInBitTickets offerPrice.isAcceptableOrUnknown(data['offer_price']!, _offerPriceMeta), ); } - if (data.containsKey('shipping_name')) { + if (data.containsKey('payment_invoice_status')) { context.handle( - _shippingNameMeta, - shippingName.isAcceptableOrUnknown( - data['shipping_name']!, - _shippingNameMeta, + _paymentInvoiceStatusMeta, + paymentInvoiceStatus.isAcceptableOrUnknown( + data['payment_invoice_status']!, + _paymentInvoiceStatusMeta, ), ); - } else if (isInserting) { - context.missing(_shippingNameMeta); - } - if (data.containsKey('shipping_street')) { - context.handle( - _shippingStreetMeta, - shippingStreet.isAcceptableOrUnknown( - data['shipping_street']!, - _shippingStreetMeta, - ), - ); - } else if (isInserting) { - context.missing(_shippingStreetMeta); - } - if (data.containsKey('shipping_city')) { - context.handle( - _shippingCityMeta, - shippingCity.isAcceptableOrUnknown( - data['shipping_city']!, - _shippingCityMeta, - ), - ); - } else if (isInserting) { - context.missing(_shippingCityMeta); - } - if (data.containsKey('shipping_postal_code')) { - context.handle( - _shippingPostalCodeMeta, - shippingPostalCode.isAcceptableOrUnknown( - data['shipping_postal_code']!, - _shippingPostalCodeMeta, - ), - ); - } else if (isInserting) { - context.missing(_shippingPostalCodeMeta); - } - if (data.containsKey('shipping_country')) { - context.handle( - _shippingCountryMeta, - shippingCountry.isAcceptableOrUnknown( - data['shipping_country']!, - _shippingCountryMeta, - ), - ); - } else if (isInserting) { - context.missing(_shippingCountryMeta); - } - if (data.containsKey('payment_method')) { - context.handle( - _paymentMethodMeta, - paymentMethod.isAcceptableOrUnknown( - data['payment_method']!, - _paymentMethodMeta, - ), - ); - } - if (data.containsKey('created_at')) { - context.handle( - _createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), - ); - } else if (isInserting) { - context.missing(_createdAtMeta); } - if (data.containsKey('api_ticket_id')) { + if (data.containsKey('tracking_link')) { context.handle( - _apiTicketIdMeta, - apiTicketId.isAcceptableOrUnknown( - data['api_ticket_id']!, - _apiTicketIdMeta, + _trackingLinkMeta, + trackingLink.isAcceptableOrUnknown( + data['tracking_link']!, + _trackingLinkMeta, ), ); - } else if (isInserting) { - context.missing(_apiTicketIdMeta); } - if (data.containsKey('car_research_invoice_id')) { + if (data.containsKey('last_agent_message_at')) { context.handle( - _carResearchInvoiceIdMeta, - carResearchInvoiceId.isAcceptableOrUnknown( - data['car_research_invoice_id']!, - _carResearchInvoiceIdMeta, + _lastAgentMessageAtMeta, + lastAgentMessageAt.isAcceptableOrUnknown( + data['last_agent_message_at']!, + _lastAgentMessageAtMeta, ), ); } @@ -969,86 +1082,62 @@ class $ShopInBitTicketsTable extends ShopInBitTickets ), ); } - if (data.containsKey('needs_create_request')) { - context.handle( - _needsCreateRequestMeta, - needsCreateRequest.isAcceptableOrUnknown( - data['needs_create_request']!, - _needsCreateRequestMeta, - ), - ); - } else if (isInserting) { - context.missing(_needsCreateRequestMeta); - } - if (data.containsKey('is_pending_payment')) { - context.handle( - _isPendingPaymentMeta, - isPendingPayment.isAcceptableOrUnknown( - data['is_pending_payment']!, - _isPendingPaymentMeta, - ), - ); - } else if (isInserting) { - context.missing(_isPendingPaymentMeta); - } - if (data.containsKey('car_research_expires_at')) { + if (data.containsKey('created_at')) { context.handle( - _carResearchExpiresAtMeta, - carResearchExpiresAt.isAcceptableOrUnknown( - data['car_research_expires_at']!, - _carResearchExpiresAtMeta, - ), + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), ); } - if (data.containsKey('car_research_payment_links')) { + if (data.containsKey('updated_at')) { context.handle( - _carResearchPaymentLinksMeta, - carResearchPaymentLinks.isAcceptableOrUnknown( - data['car_research_payment_links']!, - _carResearchPaymentLinksMeta, - ), + _updatedAtMeta, + updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), ); } return context; } @override - Set get $primaryKey => {ticketId}; + Set get $primaryKey => {apiTicketId}; @override ShopInBitTicket map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ShopInBitTicket( - ticketId: attachedDatabase.typeMapping.read( + apiTicketId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}api_ticket_id'], + )!, + customerKey: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}ticket_id'], + data['${effectivePrefix}customer_key'], )!, - displayName: attachedDatabase.typeMapping.read( + ticketNumber: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}display_name'], + data['${effectivePrefix}ticket_number'], )!, category: $ShopInBitTicketsTable.$convertercategory.fromSql( attachedDatabase.typeMapping.read( - DriftSqlType.int, + DriftSqlType.string, data['${effectivePrefix}category'], )!, ), - status: $ShopInBitTicketsTable.$converterstatus.fromSql( - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}status'], - )!, - ), - statusRaw: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}status_raw'], - ), requestDescription: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}request_description'], )!, deliveryCountry: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}delivery_country'], + data['${effectivePrefix}delivery_country'], + )!, + status: $ShopInBitTicketsTable.$converterstatus.fromSql( + attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}status'], + )!, + ), + statusRaw: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}status_raw'], )!, offerProductName: attachedDatabase.typeMapping.read( DriftSqlType.string, @@ -1058,29 +1147,21 @@ class $ShopInBitTicketsTable extends ShopInBitTickets DriftSqlType.string, data['${effectivePrefix}offer_price'], ), - shippingName: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}shipping_name'], - )!, - shippingStreet: attachedDatabase.typeMapping.read( + paymentInvoiceStatus: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}shipping_street'], - )!, - shippingCity: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}shipping_city'], - )!, - shippingPostalCode: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}shipping_postal_code'], - )!, - shippingCountry: attachedDatabase.typeMapping.read( + data['${effectivePrefix}payment_invoice_status'], + ), + trackingLink: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}shipping_country'], - )!, - paymentMethod: attachedDatabase.typeMapping.read( + data['${effectivePrefix}tracking_link'], + ), + lastAgentMessageAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_agent_message_at'], + ), + feeTicketNumber: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}payment_method'], + data['${effectivePrefix}fee_ticket_number'], ), messages: $ShopInBitTicketsTable.$convertermessages.fromSql( attachedDatabase.typeMapping.read( @@ -1092,34 +1173,10 @@ class $ShopInBitTicketsTable extends ShopInBitTickets DriftSqlType.dateTime, data['${effectivePrefix}created_at'], )!, - apiTicketId: attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}api_ticket_id'], - )!, - carResearchInvoiceId: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}car_research_invoice_id'], - ), - feeTicketNumber: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}fee_ticket_number'], - ), - needsCreateRequest: attachedDatabase.typeMapping.read( - DriftSqlType.bool, - data['${effectivePrefix}needs_create_request'], - )!, - isPendingPayment: attachedDatabase.typeMapping.read( - DriftSqlType.bool, - data['${effectivePrefix}is_pending_payment'], - )!, - carResearchExpiresAt: attachedDatabase.typeMapping.read( + updatedAt: attachedDatabase.typeMapping.read( DriftSqlType.dateTime, - data['${effectivePrefix}car_research_expires_at'], - ), - carResearchPaymentLinks: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}car_research_payment_links'], - ), + data['${effectivePrefix}updated_at'], + )!, ); } @@ -1128,169 +1185,135 @@ class $ShopInBitTicketsTable extends ShopInBitTickets return $ShopInBitTicketsTable(attachedDatabase, alias); } - static JsonTypeConverter2 $convertercategory = - const EnumIndexConverter(ShopInBitCategory.values); - static JsonTypeConverter2 $converterstatus = - const EnumIndexConverter( - ShopInBitOrderStatus.values, - ); - static JsonTypeConverter2, String, List> - $convertermessages = const ShopInBitTicketMessagesConverter(); + static JsonTypeConverter2 + $convertercategory = const EnumNameConverter( + ShopInBitCategory.values, + ); + static JsonTypeConverter2 + $converterstatus = const EnumNameConverter( + ShopInBitOrderStatus.values, + ); + static TypeConverter, String> $convertermessages = + const MessagesConverter(); + @override + bool get withoutRowId => true; } class ShopInBitTicket extends DataClass implements Insertable { - final String ticketId; - final String displayName; + final int apiTicketId; + final String customerKey; + final String ticketNumber; final ShopInBitCategory category; - final ShopInBitOrderStatus status; - final String? statusRaw; final String requestDescription; final String deliveryCountry; + final ShopInBitOrderStatus status; + final String statusRaw; final String? offerProductName; final String? offerPrice; - final String shippingName; - final String shippingStreet; - final String shippingCity; - final String shippingPostalCode; - final String shippingCountry; - final String? paymentMethod; - final List messages; - final DateTime createdAt; - final int apiTicketId; - final String? carResearchInvoiceId; + final String? paymentInvoiceStatus; + final String? trackingLink; + final DateTime? lastAgentMessageAt; final String? feeTicketNumber; - final bool needsCreateRequest; - final bool isPendingPayment; - final DateTime? carResearchExpiresAt; - final String? carResearchPaymentLinks; + final List messages; + final DateTime createdAt; + final DateTime updatedAt; const ShopInBitTicket({ - required this.ticketId, - required this.displayName, + required this.apiTicketId, + required this.customerKey, + required this.ticketNumber, required this.category, - required this.status, - this.statusRaw, required this.requestDescription, required this.deliveryCountry, + required this.status, + required this.statusRaw, this.offerProductName, this.offerPrice, - required this.shippingName, - required this.shippingStreet, - required this.shippingCity, - required this.shippingPostalCode, - required this.shippingCountry, - this.paymentMethod, + this.paymentInvoiceStatus, + this.trackingLink, + this.lastAgentMessageAt, + this.feeTicketNumber, required this.messages, required this.createdAt, - required this.apiTicketId, - this.carResearchInvoiceId, - this.feeTicketNumber, - required this.needsCreateRequest, - required this.isPendingPayment, - this.carResearchExpiresAt, - this.carResearchPaymentLinks, + required this.updatedAt, }); @override Map toColumns(bool nullToAbsent) { final map = {}; - map['ticket_id'] = Variable(ticketId); - map['display_name'] = Variable(displayName); + map['api_ticket_id'] = Variable(apiTicketId); + map['customer_key'] = Variable(customerKey); + map['ticket_number'] = Variable(ticketNumber); { - map['category'] = Variable( + map['category'] = Variable( $ShopInBitTicketsTable.$convertercategory.toSql(category), ); } + map['request_description'] = Variable(requestDescription); + map['delivery_country'] = Variable(deliveryCountry); { - map['status'] = Variable( + map['status'] = Variable( $ShopInBitTicketsTable.$converterstatus.toSql(status), ); } - if (!nullToAbsent || statusRaw != null) { - map['status_raw'] = Variable(statusRaw); - } - map['request_description'] = Variable(requestDescription); - map['delivery_country'] = Variable(deliveryCountry); + map['status_raw'] = Variable(statusRaw); if (!nullToAbsent || offerProductName != null) { map['offer_product_name'] = Variable(offerProductName); } if (!nullToAbsent || offerPrice != null) { map['offer_price'] = Variable(offerPrice); } - map['shipping_name'] = Variable(shippingName); - map['shipping_street'] = Variable(shippingStreet); - map['shipping_city'] = Variable(shippingCity); - map['shipping_postal_code'] = Variable(shippingPostalCode); - map['shipping_country'] = Variable(shippingCountry); - if (!nullToAbsent || paymentMethod != null) { - map['payment_method'] = Variable(paymentMethod); + if (!nullToAbsent || paymentInvoiceStatus != null) { + map['payment_invoice_status'] = Variable(paymentInvoiceStatus); } - { - map['messages'] = Variable( - $ShopInBitTicketsTable.$convertermessages.toSql(messages), - ); + if (!nullToAbsent || trackingLink != null) { + map['tracking_link'] = Variable(trackingLink); } - map['created_at'] = Variable(createdAt); - map['api_ticket_id'] = Variable(apiTicketId); - if (!nullToAbsent || carResearchInvoiceId != null) { - map['car_research_invoice_id'] = Variable(carResearchInvoiceId); + if (!nullToAbsent || lastAgentMessageAt != null) { + map['last_agent_message_at'] = Variable(lastAgentMessageAt); } if (!nullToAbsent || feeTicketNumber != null) { map['fee_ticket_number'] = Variable(feeTicketNumber); } - map['needs_create_request'] = Variable(needsCreateRequest); - map['is_pending_payment'] = Variable(isPendingPayment); - if (!nullToAbsent || carResearchExpiresAt != null) { - map['car_research_expires_at'] = Variable(carResearchExpiresAt); - } - if (!nullToAbsent || carResearchPaymentLinks != null) { - map['car_research_payment_links'] = Variable( - carResearchPaymentLinks, + { + map['messages'] = Variable( + $ShopInBitTicketsTable.$convertermessages.toSql(messages), ); } + map['created_at'] = Variable(createdAt); + map['updated_at'] = Variable(updatedAt); return map; } ShopInBitTicketsCompanion toCompanion(bool nullToAbsent) { return ShopInBitTicketsCompanion( - ticketId: Value(ticketId), - displayName: Value(displayName), + apiTicketId: Value(apiTicketId), + customerKey: Value(customerKey), + ticketNumber: Value(ticketNumber), category: Value(category), - status: Value(status), - statusRaw: statusRaw == null && nullToAbsent - ? const Value.absent() - : Value(statusRaw), requestDescription: Value(requestDescription), deliveryCountry: Value(deliveryCountry), + status: Value(status), + statusRaw: Value(statusRaw), offerProductName: offerProductName == null && nullToAbsent ? const Value.absent() : Value(offerProductName), offerPrice: offerPrice == null && nullToAbsent ? const Value.absent() : Value(offerPrice), - shippingName: Value(shippingName), - shippingStreet: Value(shippingStreet), - shippingCity: Value(shippingCity), - shippingPostalCode: Value(shippingPostalCode), - shippingCountry: Value(shippingCountry), - paymentMethod: paymentMethod == null && nullToAbsent + paymentInvoiceStatus: paymentInvoiceStatus == null && nullToAbsent ? const Value.absent() - : Value(paymentMethod), - messages: Value(messages), - createdAt: Value(createdAt), - apiTicketId: Value(apiTicketId), - carResearchInvoiceId: carResearchInvoiceId == null && nullToAbsent + : Value(paymentInvoiceStatus), + trackingLink: trackingLink == null && nullToAbsent ? const Value.absent() - : Value(carResearchInvoiceId), + : Value(trackingLink), + lastAgentMessageAt: lastAgentMessageAt == null && nullToAbsent + ? const Value.absent() + : Value(lastAgentMessageAt), feeTicketNumber: feeTicketNumber == null && nullToAbsent ? const Value.absent() : Value(feeTicketNumber), - needsCreateRequest: Value(needsCreateRequest), - isPendingPayment: Value(isPendingPayment), - carResearchExpiresAt: carResearchExpiresAt == null && nullToAbsent - ? const Value.absent() - : Value(carResearchExpiresAt), - carResearchPaymentLinks: carResearchPaymentLinks == null && nullToAbsent - ? const Value.absent() - : Value(carResearchPaymentLinks), + messages: Value(messages), + createdAt: Value(createdAt), + updatedAt: Value(updatedAt), ); } @@ -1300,569 +1323,416 @@ class ShopInBitTicket extends DataClass implements Insertable { }) { serializer ??= driftRuntimeOptions.defaultSerializer; return ShopInBitTicket( - ticketId: serializer.fromJson(json['ticketId']), - displayName: serializer.fromJson(json['displayName']), + apiTicketId: serializer.fromJson(json['apiTicketId']), + customerKey: serializer.fromJson(json['customerKey']), + ticketNumber: serializer.fromJson(json['ticketNumber']), category: $ShopInBitTicketsTable.$convertercategory.fromJson( - serializer.fromJson(json['category']), + serializer.fromJson(json['category']), ), - status: $ShopInBitTicketsTable.$converterstatus.fromJson( - serializer.fromJson(json['status']), - ), - statusRaw: serializer.fromJson(json['statusRaw']), requestDescription: serializer.fromJson( json['requestDescription'], ), deliveryCountry: serializer.fromJson(json['deliveryCountry']), + status: $ShopInBitTicketsTable.$converterstatus.fromJson( + serializer.fromJson(json['status']), + ), + statusRaw: serializer.fromJson(json['statusRaw']), offerProductName: serializer.fromJson(json['offerProductName']), offerPrice: serializer.fromJson(json['offerPrice']), - shippingName: serializer.fromJson(json['shippingName']), - shippingStreet: serializer.fromJson(json['shippingStreet']), - shippingCity: serializer.fromJson(json['shippingCity']), - shippingPostalCode: serializer.fromJson( - json['shippingPostalCode'], + paymentInvoiceStatus: serializer.fromJson( + json['paymentInvoiceStatus'], ), - shippingCountry: serializer.fromJson(json['shippingCountry']), - paymentMethod: serializer.fromJson(json['paymentMethod']), - messages: $ShopInBitTicketsTable.$convertermessages.fromJson( - serializer.fromJson>(json['messages']), - ), - createdAt: serializer.fromJson(json['createdAt']), - apiTicketId: serializer.fromJson(json['apiTicketId']), - carResearchInvoiceId: serializer.fromJson( - json['carResearchInvoiceId'], + trackingLink: serializer.fromJson(json['trackingLink']), + lastAgentMessageAt: serializer.fromJson( + json['lastAgentMessageAt'], ), feeTicketNumber: serializer.fromJson(json['feeTicketNumber']), - needsCreateRequest: serializer.fromJson(json['needsCreateRequest']), - isPendingPayment: serializer.fromJson(json['isPendingPayment']), - carResearchExpiresAt: serializer.fromJson( - json['carResearchExpiresAt'], - ), - carResearchPaymentLinks: serializer.fromJson( - json['carResearchPaymentLinks'], - ), + messages: serializer.fromJson>(json['messages']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return { - 'ticketId': serializer.toJson(ticketId), - 'displayName': serializer.toJson(displayName), - 'category': serializer.toJson( + 'apiTicketId': serializer.toJson(apiTicketId), + 'customerKey': serializer.toJson(customerKey), + 'ticketNumber': serializer.toJson(ticketNumber), + 'category': serializer.toJson( $ShopInBitTicketsTable.$convertercategory.toJson(category), ), - 'status': serializer.toJson( - $ShopInBitTicketsTable.$converterstatus.toJson(status), - ), - 'statusRaw': serializer.toJson(statusRaw), 'requestDescription': serializer.toJson(requestDescription), 'deliveryCountry': serializer.toJson(deliveryCountry), + 'status': serializer.toJson( + $ShopInBitTicketsTable.$converterstatus.toJson(status), + ), + 'statusRaw': serializer.toJson(statusRaw), 'offerProductName': serializer.toJson(offerProductName), 'offerPrice': serializer.toJson(offerPrice), - 'shippingName': serializer.toJson(shippingName), - 'shippingStreet': serializer.toJson(shippingStreet), - 'shippingCity': serializer.toJson(shippingCity), - 'shippingPostalCode': serializer.toJson(shippingPostalCode), - 'shippingCountry': serializer.toJson(shippingCountry), - 'paymentMethod': serializer.toJson(paymentMethod), - 'messages': serializer.toJson>( - $ShopInBitTicketsTable.$convertermessages.toJson(messages), - ), - 'createdAt': serializer.toJson(createdAt), - 'apiTicketId': serializer.toJson(apiTicketId), - 'carResearchInvoiceId': serializer.toJson(carResearchInvoiceId), + 'paymentInvoiceStatus': serializer.toJson(paymentInvoiceStatus), + 'trackingLink': serializer.toJson(trackingLink), + 'lastAgentMessageAt': serializer.toJson(lastAgentMessageAt), 'feeTicketNumber': serializer.toJson(feeTicketNumber), - 'needsCreateRequest': serializer.toJson(needsCreateRequest), - 'isPendingPayment': serializer.toJson(isPendingPayment), - 'carResearchExpiresAt': serializer.toJson( - carResearchExpiresAt, - ), - 'carResearchPaymentLinks': serializer.toJson( - carResearchPaymentLinks, - ), + 'messages': serializer.toJson>(messages), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } ShopInBitTicket copyWith({ - String? ticketId, - String? displayName, + int? apiTicketId, + String? customerKey, + String? ticketNumber, ShopInBitCategory? category, - ShopInBitOrderStatus? status, - Value statusRaw = const Value.absent(), String? requestDescription, String? deliveryCountry, + ShopInBitOrderStatus? status, + String? statusRaw, Value offerProductName = const Value.absent(), Value offerPrice = const Value.absent(), - String? shippingName, - String? shippingStreet, - String? shippingCity, - String? shippingPostalCode, - String? shippingCountry, - Value paymentMethod = const Value.absent(), - List? messages, - DateTime? createdAt, - int? apiTicketId, - Value carResearchInvoiceId = const Value.absent(), + Value paymentInvoiceStatus = const Value.absent(), + Value trackingLink = const Value.absent(), + Value lastAgentMessageAt = const Value.absent(), Value feeTicketNumber = const Value.absent(), - bool? needsCreateRequest, - bool? isPendingPayment, - Value carResearchExpiresAt = const Value.absent(), - Value carResearchPaymentLinks = const Value.absent(), + List? messages, + DateTime? createdAt, + DateTime? updatedAt, }) => ShopInBitTicket( - ticketId: ticketId ?? this.ticketId, - displayName: displayName ?? this.displayName, + apiTicketId: apiTicketId ?? this.apiTicketId, + customerKey: customerKey ?? this.customerKey, + ticketNumber: ticketNumber ?? this.ticketNumber, category: category ?? this.category, - status: status ?? this.status, - statusRaw: statusRaw.present ? statusRaw.value : this.statusRaw, requestDescription: requestDescription ?? this.requestDescription, deliveryCountry: deliveryCountry ?? this.deliveryCountry, + status: status ?? this.status, + statusRaw: statusRaw ?? this.statusRaw, offerProductName: offerProductName.present ? offerProductName.value : this.offerProductName, offerPrice: offerPrice.present ? offerPrice.value : this.offerPrice, - shippingName: shippingName ?? this.shippingName, - shippingStreet: shippingStreet ?? this.shippingStreet, - shippingCity: shippingCity ?? this.shippingCity, - shippingPostalCode: shippingPostalCode ?? this.shippingPostalCode, - shippingCountry: shippingCountry ?? this.shippingCountry, - paymentMethod: paymentMethod.present - ? paymentMethod.value - : this.paymentMethod, - messages: messages ?? this.messages, - createdAt: createdAt ?? this.createdAt, - apiTicketId: apiTicketId ?? this.apiTicketId, - carResearchInvoiceId: carResearchInvoiceId.present - ? carResearchInvoiceId.value - : this.carResearchInvoiceId, + paymentInvoiceStatus: paymentInvoiceStatus.present + ? paymentInvoiceStatus.value + : this.paymentInvoiceStatus, + trackingLink: trackingLink.present ? trackingLink.value : this.trackingLink, + lastAgentMessageAt: lastAgentMessageAt.present + ? lastAgentMessageAt.value + : this.lastAgentMessageAt, feeTicketNumber: feeTicketNumber.present ? feeTicketNumber.value : this.feeTicketNumber, - needsCreateRequest: needsCreateRequest ?? this.needsCreateRequest, - isPendingPayment: isPendingPayment ?? this.isPendingPayment, - carResearchExpiresAt: carResearchExpiresAt.present - ? carResearchExpiresAt.value - : this.carResearchExpiresAt, - carResearchPaymentLinks: carResearchPaymentLinks.present - ? carResearchPaymentLinks.value - : this.carResearchPaymentLinks, + messages: messages ?? this.messages, + createdAt: createdAt ?? this.createdAt, + updatedAt: updatedAt ?? this.updatedAt, ); ShopInBitTicket copyWithCompanion(ShopInBitTicketsCompanion data) { return ShopInBitTicket( - ticketId: data.ticketId.present ? data.ticketId.value : this.ticketId, - displayName: data.displayName.present - ? data.displayName.value - : this.displayName, + apiTicketId: data.apiTicketId.present + ? data.apiTicketId.value + : this.apiTicketId, + customerKey: data.customerKey.present + ? data.customerKey.value + : this.customerKey, + ticketNumber: data.ticketNumber.present + ? data.ticketNumber.value + : this.ticketNumber, category: data.category.present ? data.category.value : this.category, - status: data.status.present ? data.status.value : this.status, - statusRaw: data.statusRaw.present ? data.statusRaw.value : this.statusRaw, requestDescription: data.requestDescription.present ? data.requestDescription.value : this.requestDescription, deliveryCountry: data.deliveryCountry.present ? data.deliveryCountry.value : this.deliveryCountry, + status: data.status.present ? data.status.value : this.status, + statusRaw: data.statusRaw.present ? data.statusRaw.value : this.statusRaw, offerProductName: data.offerProductName.present ? data.offerProductName.value : this.offerProductName, offerPrice: data.offerPrice.present ? data.offerPrice.value : this.offerPrice, - shippingName: data.shippingName.present - ? data.shippingName.value - : this.shippingName, - shippingStreet: data.shippingStreet.present - ? data.shippingStreet.value - : this.shippingStreet, - shippingCity: data.shippingCity.present - ? data.shippingCity.value - : this.shippingCity, - shippingPostalCode: data.shippingPostalCode.present - ? data.shippingPostalCode.value - : this.shippingPostalCode, - shippingCountry: data.shippingCountry.present - ? data.shippingCountry.value - : this.shippingCountry, - paymentMethod: data.paymentMethod.present - ? data.paymentMethod.value - : this.paymentMethod, - messages: data.messages.present ? data.messages.value : this.messages, - createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, - apiTicketId: data.apiTicketId.present - ? data.apiTicketId.value - : this.apiTicketId, - carResearchInvoiceId: data.carResearchInvoiceId.present - ? data.carResearchInvoiceId.value - : this.carResearchInvoiceId, + paymentInvoiceStatus: data.paymentInvoiceStatus.present + ? data.paymentInvoiceStatus.value + : this.paymentInvoiceStatus, + trackingLink: data.trackingLink.present + ? data.trackingLink.value + : this.trackingLink, + lastAgentMessageAt: data.lastAgentMessageAt.present + ? data.lastAgentMessageAt.value + : this.lastAgentMessageAt, feeTicketNumber: data.feeTicketNumber.present ? data.feeTicketNumber.value : this.feeTicketNumber, - needsCreateRequest: data.needsCreateRequest.present - ? data.needsCreateRequest.value - : this.needsCreateRequest, - isPendingPayment: data.isPendingPayment.present - ? data.isPendingPayment.value - : this.isPendingPayment, - carResearchExpiresAt: data.carResearchExpiresAt.present - ? data.carResearchExpiresAt.value - : this.carResearchExpiresAt, - carResearchPaymentLinks: data.carResearchPaymentLinks.present - ? data.carResearchPaymentLinks.value - : this.carResearchPaymentLinks, + messages: data.messages.present ? data.messages.value : this.messages, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt, ); } @override String toString() { return (StringBuffer('ShopInBitTicket(') - ..write('ticketId: $ticketId, ') - ..write('displayName: $displayName, ') + ..write('apiTicketId: $apiTicketId, ') + ..write('customerKey: $customerKey, ') + ..write('ticketNumber: $ticketNumber, ') ..write('category: $category, ') - ..write('status: $status, ') - ..write('statusRaw: $statusRaw, ') ..write('requestDescription: $requestDescription, ') ..write('deliveryCountry: $deliveryCountry, ') + ..write('status: $status, ') + ..write('statusRaw: $statusRaw, ') ..write('offerProductName: $offerProductName, ') ..write('offerPrice: $offerPrice, ') - ..write('shippingName: $shippingName, ') - ..write('shippingStreet: $shippingStreet, ') - ..write('shippingCity: $shippingCity, ') - ..write('shippingPostalCode: $shippingPostalCode, ') - ..write('shippingCountry: $shippingCountry, ') - ..write('paymentMethod: $paymentMethod, ') + ..write('paymentInvoiceStatus: $paymentInvoiceStatus, ') + ..write('trackingLink: $trackingLink, ') + ..write('lastAgentMessageAt: $lastAgentMessageAt, ') + ..write('feeTicketNumber: $feeTicketNumber, ') ..write('messages: $messages, ') ..write('createdAt: $createdAt, ') - ..write('apiTicketId: $apiTicketId, ') - ..write('carResearchInvoiceId: $carResearchInvoiceId, ') - ..write('feeTicketNumber: $feeTicketNumber, ') - ..write('needsCreateRequest: $needsCreateRequest, ') - ..write('isPendingPayment: $isPendingPayment, ') - ..write('carResearchExpiresAt: $carResearchExpiresAt, ') - ..write('carResearchPaymentLinks: $carResearchPaymentLinks') + ..write('updatedAt: $updatedAt') ..write(')')) .toString(); } @override - int get hashCode => Object.hashAll([ - ticketId, - displayName, + int get hashCode => Object.hash( + apiTicketId, + customerKey, + ticketNumber, category, - status, - statusRaw, requestDescription, deliveryCountry, + status, + statusRaw, offerProductName, offerPrice, - shippingName, - shippingStreet, - shippingCity, - shippingPostalCode, - shippingCountry, - paymentMethod, + paymentInvoiceStatus, + trackingLink, + lastAgentMessageAt, + feeTicketNumber, messages, createdAt, - apiTicketId, - carResearchInvoiceId, - feeTicketNumber, - needsCreateRequest, - isPendingPayment, - carResearchExpiresAt, - carResearchPaymentLinks, - ]); + updatedAt, + ); @override bool operator ==(Object other) => identical(this, other) || (other is ShopInBitTicket && - other.ticketId == this.ticketId && - other.displayName == this.displayName && + other.apiTicketId == this.apiTicketId && + other.customerKey == this.customerKey && + other.ticketNumber == this.ticketNumber && other.category == this.category && - other.status == this.status && - other.statusRaw == this.statusRaw && other.requestDescription == this.requestDescription && other.deliveryCountry == this.deliveryCountry && + other.status == this.status && + other.statusRaw == this.statusRaw && other.offerProductName == this.offerProductName && other.offerPrice == this.offerPrice && - other.shippingName == this.shippingName && - other.shippingStreet == this.shippingStreet && - other.shippingCity == this.shippingCity && - other.shippingPostalCode == this.shippingPostalCode && - other.shippingCountry == this.shippingCountry && - other.paymentMethod == this.paymentMethod && + other.paymentInvoiceStatus == this.paymentInvoiceStatus && + other.trackingLink == this.trackingLink && + other.lastAgentMessageAt == this.lastAgentMessageAt && + other.feeTicketNumber == this.feeTicketNumber && other.messages == this.messages && other.createdAt == this.createdAt && - other.apiTicketId == this.apiTicketId && - other.carResearchInvoiceId == this.carResearchInvoiceId && - other.feeTicketNumber == this.feeTicketNumber && - other.needsCreateRequest == this.needsCreateRequest && - other.isPendingPayment == this.isPendingPayment && - other.carResearchExpiresAt == this.carResearchExpiresAt && - other.carResearchPaymentLinks == this.carResearchPaymentLinks); + other.updatedAt == this.updatedAt); } class ShopInBitTicketsCompanion extends UpdateCompanion { - final Value ticketId; - final Value displayName; + final Value apiTicketId; + final Value customerKey; + final Value ticketNumber; final Value category; - final Value status; - final Value statusRaw; final Value requestDescription; final Value deliveryCountry; + final Value status; + final Value statusRaw; final Value offerProductName; final Value offerPrice; - final Value shippingName; - final Value shippingStreet; - final Value shippingCity; - final Value shippingPostalCode; - final Value shippingCountry; - final Value paymentMethod; - final Value> messages; - final Value createdAt; - final Value apiTicketId; - final Value carResearchInvoiceId; + final Value paymentInvoiceStatus; + final Value trackingLink; + final Value lastAgentMessageAt; final Value feeTicketNumber; - final Value needsCreateRequest; - final Value isPendingPayment; - final Value carResearchExpiresAt; - final Value carResearchPaymentLinks; - final Value rowid; + final Value> messages; + final Value createdAt; + final Value updatedAt; const ShopInBitTicketsCompanion({ - this.ticketId = const Value.absent(), - this.displayName = const Value.absent(), + this.apiTicketId = const Value.absent(), + this.customerKey = const Value.absent(), + this.ticketNumber = const Value.absent(), this.category = const Value.absent(), - this.status = const Value.absent(), - this.statusRaw = const Value.absent(), this.requestDescription = const Value.absent(), this.deliveryCountry = const Value.absent(), + this.status = const Value.absent(), + this.statusRaw = const Value.absent(), this.offerProductName = const Value.absent(), this.offerPrice = const Value.absent(), - this.shippingName = const Value.absent(), - this.shippingStreet = const Value.absent(), - this.shippingCity = const Value.absent(), - this.shippingPostalCode = const Value.absent(), - this.shippingCountry = const Value.absent(), - this.paymentMethod = const Value.absent(), + this.paymentInvoiceStatus = const Value.absent(), + this.trackingLink = const Value.absent(), + this.lastAgentMessageAt = const Value.absent(), + this.feeTicketNumber = const Value.absent(), this.messages = const Value.absent(), this.createdAt = const Value.absent(), - this.apiTicketId = const Value.absent(), - this.carResearchInvoiceId = const Value.absent(), - this.feeTicketNumber = const Value.absent(), - this.needsCreateRequest = const Value.absent(), - this.isPendingPayment = const Value.absent(), - this.carResearchExpiresAt = const Value.absent(), - this.carResearchPaymentLinks = const Value.absent(), - this.rowid = const Value.absent(), + this.updatedAt = const Value.absent(), }); ShopInBitTicketsCompanion.insert({ - required String ticketId, - required String displayName, + required int apiTicketId, + required String customerKey, + required String ticketNumber, required ShopInBitCategory category, - required ShopInBitOrderStatus status, - this.statusRaw = const Value.absent(), required String requestDescription, required String deliveryCountry, + required ShopInBitOrderStatus status, + required String statusRaw, this.offerProductName = const Value.absent(), this.offerPrice = const Value.absent(), - required String shippingName, - required String shippingStreet, - required String shippingCity, - required String shippingPostalCode, - required String shippingCountry, - this.paymentMethod = const Value.absent(), - required List messages, - required DateTime createdAt, - required int apiTicketId, - this.carResearchInvoiceId = const Value.absent(), + this.paymentInvoiceStatus = const Value.absent(), + this.trackingLink = const Value.absent(), + this.lastAgentMessageAt = const Value.absent(), this.feeTicketNumber = const Value.absent(), - required bool needsCreateRequest, - required bool isPendingPayment, - this.carResearchExpiresAt = const Value.absent(), - this.carResearchPaymentLinks = const Value.absent(), - this.rowid = const Value.absent(), - }) : ticketId = Value(ticketId), - displayName = Value(displayName), + this.messages = const Value.absent(), + this.createdAt = const Value.absent(), + this.updatedAt = const Value.absent(), + }) : apiTicketId = Value(apiTicketId), + customerKey = Value(customerKey), + ticketNumber = Value(ticketNumber), category = Value(category), - status = Value(status), requestDescription = Value(requestDescription), deliveryCountry = Value(deliveryCountry), - shippingName = Value(shippingName), - shippingStreet = Value(shippingStreet), - shippingCity = Value(shippingCity), - shippingPostalCode = Value(shippingPostalCode), - shippingCountry = Value(shippingCountry), - messages = Value(messages), - createdAt = Value(createdAt), - apiTicketId = Value(apiTicketId), - needsCreateRequest = Value(needsCreateRequest), - isPendingPayment = Value(isPendingPayment); + status = Value(status), + statusRaw = Value(statusRaw); static Insertable custom({ - Expression? ticketId, - Expression? displayName, - Expression? category, - Expression? status, - Expression? statusRaw, + Expression? apiTicketId, + Expression? customerKey, + Expression? ticketNumber, + Expression? category, Expression? requestDescription, Expression? deliveryCountry, + Expression? status, + Expression? statusRaw, Expression? offerProductName, Expression? offerPrice, - Expression? shippingName, - Expression? shippingStreet, - Expression? shippingCity, - Expression? shippingPostalCode, - Expression? shippingCountry, - Expression? paymentMethod, + Expression? paymentInvoiceStatus, + Expression? trackingLink, + Expression? lastAgentMessageAt, + Expression? feeTicketNumber, Expression? messages, Expression? createdAt, - Expression? apiTicketId, - Expression? carResearchInvoiceId, - Expression? feeTicketNumber, - Expression? needsCreateRequest, - Expression? isPendingPayment, - Expression? carResearchExpiresAt, - Expression? carResearchPaymentLinks, - Expression? rowid, + Expression? updatedAt, }) { return RawValuesInsertable({ - if (ticketId != null) 'ticket_id': ticketId, - if (displayName != null) 'display_name': displayName, + if (apiTicketId != null) 'api_ticket_id': apiTicketId, + if (customerKey != null) 'customer_key': customerKey, + if (ticketNumber != null) 'ticket_number': ticketNumber, if (category != null) 'category': category, - if (status != null) 'status': status, - if (statusRaw != null) 'status_raw': statusRaw, if (requestDescription != null) 'request_description': requestDescription, if (deliveryCountry != null) 'delivery_country': deliveryCountry, + if (status != null) 'status': status, + if (statusRaw != null) 'status_raw': statusRaw, if (offerProductName != null) 'offer_product_name': offerProductName, if (offerPrice != null) 'offer_price': offerPrice, - if (shippingName != null) 'shipping_name': shippingName, - if (shippingStreet != null) 'shipping_street': shippingStreet, - if (shippingCity != null) 'shipping_city': shippingCity, - if (shippingPostalCode != null) - 'shipping_postal_code': shippingPostalCode, - if (shippingCountry != null) 'shipping_country': shippingCountry, - if (paymentMethod != null) 'payment_method': paymentMethod, + if (paymentInvoiceStatus != null) + 'payment_invoice_status': paymentInvoiceStatus, + if (trackingLink != null) 'tracking_link': trackingLink, + if (lastAgentMessageAt != null) + 'last_agent_message_at': lastAgentMessageAt, + if (feeTicketNumber != null) 'fee_ticket_number': feeTicketNumber, if (messages != null) 'messages': messages, if (createdAt != null) 'created_at': createdAt, - if (apiTicketId != null) 'api_ticket_id': apiTicketId, - if (carResearchInvoiceId != null) - 'car_research_invoice_id': carResearchInvoiceId, - if (feeTicketNumber != null) 'fee_ticket_number': feeTicketNumber, - if (needsCreateRequest != null) - 'needs_create_request': needsCreateRequest, - if (isPendingPayment != null) 'is_pending_payment': isPendingPayment, - if (carResearchExpiresAt != null) - 'car_research_expires_at': carResearchExpiresAt, - if (carResearchPaymentLinks != null) - 'car_research_payment_links': carResearchPaymentLinks, - if (rowid != null) 'rowid': rowid, + if (updatedAt != null) 'updated_at': updatedAt, }); } ShopInBitTicketsCompanion copyWith({ - Value? ticketId, - Value? displayName, + Value? apiTicketId, + Value? customerKey, + Value? ticketNumber, Value? category, - Value? status, - Value? statusRaw, Value? requestDescription, Value? deliveryCountry, + Value? status, + Value? statusRaw, Value? offerProductName, Value? offerPrice, - Value? shippingName, - Value? shippingStreet, - Value? shippingCity, - Value? shippingPostalCode, - Value? shippingCountry, - Value? paymentMethod, - Value>? messages, - Value? createdAt, - Value? apiTicketId, - Value? carResearchInvoiceId, + Value? paymentInvoiceStatus, + Value? trackingLink, + Value? lastAgentMessageAt, Value? feeTicketNumber, - Value? needsCreateRequest, - Value? isPendingPayment, - Value? carResearchExpiresAt, - Value? carResearchPaymentLinks, - Value? rowid, + Value>? messages, + Value? createdAt, + Value? updatedAt, }) { return ShopInBitTicketsCompanion( - ticketId: ticketId ?? this.ticketId, - displayName: displayName ?? this.displayName, + apiTicketId: apiTicketId ?? this.apiTicketId, + customerKey: customerKey ?? this.customerKey, + ticketNumber: ticketNumber ?? this.ticketNumber, category: category ?? this.category, - status: status ?? this.status, - statusRaw: statusRaw ?? this.statusRaw, requestDescription: requestDescription ?? this.requestDescription, deliveryCountry: deliveryCountry ?? this.deliveryCountry, + status: status ?? this.status, + statusRaw: statusRaw ?? this.statusRaw, offerProductName: offerProductName ?? this.offerProductName, offerPrice: offerPrice ?? this.offerPrice, - shippingName: shippingName ?? this.shippingName, - shippingStreet: shippingStreet ?? this.shippingStreet, - shippingCity: shippingCity ?? this.shippingCity, - shippingPostalCode: shippingPostalCode ?? this.shippingPostalCode, - shippingCountry: shippingCountry ?? this.shippingCountry, - paymentMethod: paymentMethod ?? this.paymentMethod, + paymentInvoiceStatus: paymentInvoiceStatus ?? this.paymentInvoiceStatus, + trackingLink: trackingLink ?? this.trackingLink, + lastAgentMessageAt: lastAgentMessageAt ?? this.lastAgentMessageAt, + feeTicketNumber: feeTicketNumber ?? this.feeTicketNumber, messages: messages ?? this.messages, createdAt: createdAt ?? this.createdAt, - apiTicketId: apiTicketId ?? this.apiTicketId, - carResearchInvoiceId: carResearchInvoiceId ?? this.carResearchInvoiceId, - feeTicketNumber: feeTicketNumber ?? this.feeTicketNumber, - needsCreateRequest: needsCreateRequest ?? this.needsCreateRequest, - isPendingPayment: isPendingPayment ?? this.isPendingPayment, - carResearchExpiresAt: carResearchExpiresAt ?? this.carResearchExpiresAt, - carResearchPaymentLinks: - carResearchPaymentLinks ?? this.carResearchPaymentLinks, - rowid: rowid ?? this.rowid, + updatedAt: updatedAt ?? this.updatedAt, ); } @override Map toColumns(bool nullToAbsent) { final map = {}; - if (ticketId.present) { - map['ticket_id'] = Variable(ticketId.value); + if (apiTicketId.present) { + map['api_ticket_id'] = Variable(apiTicketId.value); + } + if (customerKey.present) { + map['customer_key'] = Variable(customerKey.value); } - if (displayName.present) { - map['display_name'] = Variable(displayName.value); + if (ticketNumber.present) { + map['ticket_number'] = Variable(ticketNumber.value); } if (category.present) { - map['category'] = Variable( + map['category'] = Variable( $ShopInBitTicketsTable.$convertercategory.toSql(category.value), ); } + if (requestDescription.present) { + map['request_description'] = Variable(requestDescription.value); + } + if (deliveryCountry.present) { + map['delivery_country'] = Variable(deliveryCountry.value); + } if (status.present) { - map['status'] = Variable( + map['status'] = Variable( $ShopInBitTicketsTable.$converterstatus.toSql(status.value), ); } if (statusRaw.present) { map['status_raw'] = Variable(statusRaw.value); } - if (requestDescription.present) { - map['request_description'] = Variable(requestDescription.value); - } - if (deliveryCountry.present) { - map['delivery_country'] = Variable(deliveryCountry.value); - } if (offerProductName.present) { map['offer_product_name'] = Variable(offerProductName.value); } if (offerPrice.present) { map['offer_price'] = Variable(offerPrice.value); } - if (shippingName.present) { - map['shipping_name'] = Variable(shippingName.value); - } - if (shippingStreet.present) { - map['shipping_street'] = Variable(shippingStreet.value); - } - if (shippingCity.present) { - map['shipping_city'] = Variable(shippingCity.value); + if (paymentInvoiceStatus.present) { + map['payment_invoice_status'] = Variable( + paymentInvoiceStatus.value, + ); } - if (shippingPostalCode.present) { - map['shipping_postal_code'] = Variable(shippingPostalCode.value); + if (trackingLink.present) { + map['tracking_link'] = Variable(trackingLink.value); } - if (shippingCountry.present) { - map['shipping_country'] = Variable(shippingCountry.value); + if (lastAgentMessageAt.present) { + map['last_agent_message_at'] = Variable( + lastAgentMessageAt.value, + ); } - if (paymentMethod.present) { - map['payment_method'] = Variable(paymentMethod.value); + if (feeTicketNumber.present) { + map['fee_ticket_number'] = Variable(feeTicketNumber.value); } if (messages.present) { map['messages'] = Variable( @@ -1872,35 +1742,8 @@ class ShopInBitTicketsCompanion extends UpdateCompanion { if (createdAt.present) { map['created_at'] = Variable(createdAt.value); } - if (apiTicketId.present) { - map['api_ticket_id'] = Variable(apiTicketId.value); - } - if (carResearchInvoiceId.present) { - map['car_research_invoice_id'] = Variable( - carResearchInvoiceId.value, - ); - } - if (feeTicketNumber.present) { - map['fee_ticket_number'] = Variable(feeTicketNumber.value); - } - if (needsCreateRequest.present) { - map['needs_create_request'] = Variable(needsCreateRequest.value); - } - if (isPendingPayment.present) { - map['is_pending_payment'] = Variable(isPendingPayment.value); - } - if (carResearchExpiresAt.present) { - map['car_research_expires_at'] = Variable( - carResearchExpiresAt.value, - ); - } - if (carResearchPaymentLinks.present) { - map['car_research_payment_links'] = Variable( - carResearchPaymentLinks.value, - ); - } - if (rowid.present) { - map['rowid'] = Variable(rowid.value); + if (updatedAt.present) { + map['updated_at'] = Variable(updatedAt.value); } return map; } @@ -1908,31 +1751,23 @@ class ShopInBitTicketsCompanion extends UpdateCompanion { @override String toString() { return (StringBuffer('ShopInBitTicketsCompanion(') - ..write('ticketId: $ticketId, ') - ..write('displayName: $displayName, ') - ..write('category: $category, ') - ..write('status: $status, ') - ..write('statusRaw: $statusRaw, ') + ..write('apiTicketId: $apiTicketId, ') + ..write('customerKey: $customerKey, ') + ..write('ticketNumber: $ticketNumber, ') + ..write('category: $category, ') ..write('requestDescription: $requestDescription, ') ..write('deliveryCountry: $deliveryCountry, ') + ..write('status: $status, ') + ..write('statusRaw: $statusRaw, ') ..write('offerProductName: $offerProductName, ') ..write('offerPrice: $offerPrice, ') - ..write('shippingName: $shippingName, ') - ..write('shippingStreet: $shippingStreet, ') - ..write('shippingCity: $shippingCity, ') - ..write('shippingPostalCode: $shippingPostalCode, ') - ..write('shippingCountry: $shippingCountry, ') - ..write('paymentMethod: $paymentMethod, ') + ..write('paymentInvoiceStatus: $paymentInvoiceStatus, ') + ..write('trackingLink: $trackingLink, ') + ..write('lastAgentMessageAt: $lastAgentMessageAt, ') + ..write('feeTicketNumber: $feeTicketNumber, ') ..write('messages: $messages, ') ..write('createdAt: $createdAt, ') - ..write('apiTicketId: $apiTicketId, ') - ..write('carResearchInvoiceId: $carResearchInvoiceId, ') - ..write('feeTicketNumber: $feeTicketNumber, ') - ..write('needsCreateRequest: $needsCreateRequest, ') - ..write('isPendingPayment: $isPendingPayment, ') - ..write('carResearchExpiresAt: $carResearchExpiresAt, ') - ..write('carResearchPaymentLinks: $carResearchPaymentLinks, ') - ..write('rowid: $rowid') + ..write('updatedAt: $updatedAt') ..write(')')) .toString(); } @@ -1942,12 +1777,15 @@ abstract class _$SharedDatabase extends GeneratedDatabase { _$SharedDatabase(QueryExecutor e) : super(e); $SharedDatabaseManager get managers => $SharedDatabaseManager(this); late final $CakepayOrdersTable cakepayOrders = $CakepayOrdersTable(this); - late final $ShopinBitSettingsTable shopinBitSettings = - $ShopinBitSettingsTable(this); + late final $ShopInBitSettingsTable shopInBitSettings = + $ShopInBitSettingsTable(this); late final $ShopInBitTicketsTable shopInBitTickets = $ShopInBitTicketsTable( this, ); - late final ShopinBitSettingsDao shopinBitSettingsDao = ShopinBitSettingsDao( + late final ShopInBitSettingsDao shopInBitSettingsDao = ShopInBitSettingsDao( + this as SharedDatabase, + ); + late final ShopInBitTicketsDao shopInBitTicketsDao = ShopInBitTicketsDao( this as SharedDatabase, ); @override @@ -1956,7 +1794,7 @@ abstract class _$SharedDatabase extends GeneratedDatabase { @override List get allSchemaEntities => [ cakepayOrders, - shopinBitSettings, + shopInBitSettings, shopInBitTickets, ]; } @@ -2079,37 +1917,60 @@ typedef $$CakepayOrdersTableProcessedTableManager = CakepayOrder, PrefetchHooks Function() >; -typedef $$ShopinBitSettingsTableCreateCompanionBuilder = - ShopinBitSettingsCompanion Function({ - Value id, - Value guidelinesAccepted, +typedef $$ShopInBitSettingsTableCreateCompanionBuilder = + ShopInBitSettingsCompanion Function({ + required String customerKey, + Value privacyAccepted, + Value conciergeGuidelinesAccepted, + Value travelGuidelinesAccepted, + Value carGuidelinesAccepted, Value setupComplete, - Value displayName, + Value createdAt, + Value lastUsedAt, }); -typedef $$ShopinBitSettingsTableUpdateCompanionBuilder = - ShopinBitSettingsCompanion Function({ - Value id, - Value guidelinesAccepted, +typedef $$ShopInBitSettingsTableUpdateCompanionBuilder = + ShopInBitSettingsCompanion Function({ + Value customerKey, + Value privacyAccepted, + Value conciergeGuidelinesAccepted, + Value travelGuidelinesAccepted, + Value carGuidelinesAccepted, Value setupComplete, - Value displayName, + Value createdAt, + Value lastUsedAt, }); -class $$ShopinBitSettingsTableFilterComposer - extends Composer<_$SharedDatabase, $ShopinBitSettingsTable> { - $$ShopinBitSettingsTableFilterComposer({ +class $$ShopInBitSettingsTableFilterComposer + extends Composer<_$SharedDatabase, $ShopInBitSettingsTable> { + $$ShopInBitSettingsTableFilterComposer({ required super.$db, required super.$table, super.joinBuilder, super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnFilters get id => $composableBuilder( - column: $table.id, + ColumnFilters get customerKey => $composableBuilder( + column: $table.customerKey, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get privacyAccepted => $composableBuilder( + column: $table.privacyAccepted, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get conciergeGuidelinesAccepted => $composableBuilder( + column: $table.conciergeGuidelinesAccepted, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get travelGuidelinesAccepted => $composableBuilder( + column: $table.travelGuidelinesAccepted, builder: (column) => ColumnFilters(column), ); - ColumnFilters get guidelinesAccepted => $composableBuilder( - column: $table.guidelinesAccepted, + ColumnFilters get carGuidelinesAccepted => $composableBuilder( + column: $table.carGuidelinesAccepted, builder: (column) => ColumnFilters(column), ); @@ -2118,28 +1979,48 @@ class $$ShopinBitSettingsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get displayName => $composableBuilder( - column: $table.displayName, + ColumnFilters get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get lastUsedAt => $composableBuilder( + column: $table.lastUsedAt, builder: (column) => ColumnFilters(column), ); } -class $$ShopinBitSettingsTableOrderingComposer - extends Composer<_$SharedDatabase, $ShopinBitSettingsTable> { - $$ShopinBitSettingsTableOrderingComposer({ +class $$ShopInBitSettingsTableOrderingComposer + extends Composer<_$SharedDatabase, $ShopInBitSettingsTable> { + $$ShopInBitSettingsTableOrderingComposer({ required super.$db, required super.$table, super.joinBuilder, super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnOrderings get id => $composableBuilder( - column: $table.id, + ColumnOrderings get customerKey => $composableBuilder( + column: $table.customerKey, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get privacyAccepted => $composableBuilder( + column: $table.privacyAccepted, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get conciergeGuidelinesAccepted => $composableBuilder( + column: $table.conciergeGuidelinesAccepted, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get travelGuidelinesAccepted => $composableBuilder( + column: $table.travelGuidelinesAccepted, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get guidelinesAccepted => $composableBuilder( - column: $table.guidelinesAccepted, + ColumnOrderings get carGuidelinesAccepted => $composableBuilder( + column: $table.carGuidelinesAccepted, builder: (column) => ColumnOrderings(column), ); @@ -2148,26 +2029,48 @@ class $$ShopinBitSettingsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get displayName => $composableBuilder( - column: $table.displayName, + ColumnOrderings get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get lastUsedAt => $composableBuilder( + column: $table.lastUsedAt, builder: (column) => ColumnOrderings(column), ); } -class $$ShopinBitSettingsTableAnnotationComposer - extends Composer<_$SharedDatabase, $ShopinBitSettingsTable> { - $$ShopinBitSettingsTableAnnotationComposer({ +class $$ShopInBitSettingsTableAnnotationComposer + extends Composer<_$SharedDatabase, $ShopInBitSettingsTable> { + $$ShopInBitSettingsTableAnnotationComposer({ required super.$db, required super.$table, super.joinBuilder, super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); + GeneratedColumn get customerKey => $composableBuilder( + column: $table.customerKey, + builder: (column) => column, + ); + + GeneratedColumn get privacyAccepted => $composableBuilder( + column: $table.privacyAccepted, + builder: (column) => column, + ); + + GeneratedColumn get conciergeGuidelinesAccepted => $composableBuilder( + column: $table.conciergeGuidelinesAccepted, + builder: (column) => column, + ); + + GeneratedColumn get travelGuidelinesAccepted => $composableBuilder( + column: $table.travelGuidelinesAccepted, + builder: (column) => column, + ); - GeneratedColumn get guidelinesAccepted => $composableBuilder( - column: $table.guidelinesAccepted, + GeneratedColumn get carGuidelinesAccepted => $composableBuilder( + column: $table.carGuidelinesAccepted, builder: (column) => column, ); @@ -2176,73 +2079,92 @@ class $$ShopinBitSettingsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get displayName => $composableBuilder( - column: $table.displayName, + GeneratedColumn get createdAt => + $composableBuilder(column: $table.createdAt, builder: (column) => column); + + GeneratedColumn get lastUsedAt => $composableBuilder( + column: $table.lastUsedAt, builder: (column) => column, ); } -class $$ShopinBitSettingsTableTableManager +class $$ShopInBitSettingsTableTableManager extends RootTableManager< _$SharedDatabase, - $ShopinBitSettingsTable, - ShopinBitSetting, - $$ShopinBitSettingsTableFilterComposer, - $$ShopinBitSettingsTableOrderingComposer, - $$ShopinBitSettingsTableAnnotationComposer, - $$ShopinBitSettingsTableCreateCompanionBuilder, - $$ShopinBitSettingsTableUpdateCompanionBuilder, + $ShopInBitSettingsTable, + ShopInBitSetting, + $$ShopInBitSettingsTableFilterComposer, + $$ShopInBitSettingsTableOrderingComposer, + $$ShopInBitSettingsTableAnnotationComposer, + $$ShopInBitSettingsTableCreateCompanionBuilder, + $$ShopInBitSettingsTableUpdateCompanionBuilder, ( - ShopinBitSetting, + ShopInBitSetting, BaseReferences< _$SharedDatabase, - $ShopinBitSettingsTable, - ShopinBitSetting + $ShopInBitSettingsTable, + ShopInBitSetting >, ), - ShopinBitSetting, + ShopInBitSetting, PrefetchHooks Function() > { - $$ShopinBitSettingsTableTableManager( + $$ShopInBitSettingsTableTableManager( _$SharedDatabase db, - $ShopinBitSettingsTable table, + $ShopInBitSettingsTable table, ) : super( TableManagerState( db: db, table: table, createFilteringComposer: () => - $$ShopinBitSettingsTableFilterComposer($db: db, $table: table), + $$ShopInBitSettingsTableFilterComposer($db: db, $table: table), createOrderingComposer: () => - $$ShopinBitSettingsTableOrderingComposer($db: db, $table: table), + $$ShopInBitSettingsTableOrderingComposer($db: db, $table: table), createComputedFieldComposer: () => - $$ShopinBitSettingsTableAnnotationComposer( + $$ShopInBitSettingsTableAnnotationComposer( $db: db, $table: table, ), updateCompanionCallback: ({ - Value id = const Value.absent(), - Value guidelinesAccepted = const Value.absent(), + Value customerKey = const Value.absent(), + Value privacyAccepted = const Value.absent(), + Value conciergeGuidelinesAccepted = const Value.absent(), + Value travelGuidelinesAccepted = const Value.absent(), + Value carGuidelinesAccepted = const Value.absent(), Value setupComplete = const Value.absent(), - Value displayName = const Value.absent(), - }) => ShopinBitSettingsCompanion( - id: id, - guidelinesAccepted: guidelinesAccepted, + Value createdAt = const Value.absent(), + Value lastUsedAt = const Value.absent(), + }) => ShopInBitSettingsCompanion( + customerKey: customerKey, + privacyAccepted: privacyAccepted, + conciergeGuidelinesAccepted: conciergeGuidelinesAccepted, + travelGuidelinesAccepted: travelGuidelinesAccepted, + carGuidelinesAccepted: carGuidelinesAccepted, setupComplete: setupComplete, - displayName: displayName, + createdAt: createdAt, + lastUsedAt: lastUsedAt, ), createCompanionCallback: ({ - Value id = const Value.absent(), - Value guidelinesAccepted = const Value.absent(), + required String customerKey, + Value privacyAccepted = const Value.absent(), + Value conciergeGuidelinesAccepted = const Value.absent(), + Value travelGuidelinesAccepted = const Value.absent(), + Value carGuidelinesAccepted = const Value.absent(), Value setupComplete = const Value.absent(), - Value displayName = const Value.absent(), - }) => ShopinBitSettingsCompanion.insert( - id: id, - guidelinesAccepted: guidelinesAccepted, + Value createdAt = const Value.absent(), + Value lastUsedAt = const Value.absent(), + }) => ShopInBitSettingsCompanion.insert( + customerKey: customerKey, + privacyAccepted: privacyAccepted, + conciergeGuidelinesAccepted: conciergeGuidelinesAccepted, + travelGuidelinesAccepted: travelGuidelinesAccepted, + carGuidelinesAccepted: carGuidelinesAccepted, setupComplete: setupComplete, - displayName: displayName, + createdAt: createdAt, + lastUsedAt: lastUsedAt, ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) @@ -2252,82 +2174,66 @@ class $$ShopinBitSettingsTableTableManager ); } -typedef $$ShopinBitSettingsTableProcessedTableManager = +typedef $$ShopInBitSettingsTableProcessedTableManager = ProcessedTableManager< _$SharedDatabase, - $ShopinBitSettingsTable, - ShopinBitSetting, - $$ShopinBitSettingsTableFilterComposer, - $$ShopinBitSettingsTableOrderingComposer, - $$ShopinBitSettingsTableAnnotationComposer, - $$ShopinBitSettingsTableCreateCompanionBuilder, - $$ShopinBitSettingsTableUpdateCompanionBuilder, + $ShopInBitSettingsTable, + ShopInBitSetting, + $$ShopInBitSettingsTableFilterComposer, + $$ShopInBitSettingsTableOrderingComposer, + $$ShopInBitSettingsTableAnnotationComposer, + $$ShopInBitSettingsTableCreateCompanionBuilder, + $$ShopInBitSettingsTableUpdateCompanionBuilder, ( - ShopinBitSetting, + ShopInBitSetting, BaseReferences< _$SharedDatabase, - $ShopinBitSettingsTable, - ShopinBitSetting + $ShopInBitSettingsTable, + ShopInBitSetting >, ), - ShopinBitSetting, + ShopInBitSetting, PrefetchHooks Function() >; typedef $$ShopInBitTicketsTableCreateCompanionBuilder = ShopInBitTicketsCompanion Function({ - required String ticketId, - required String displayName, + required int apiTicketId, + required String customerKey, + required String ticketNumber, required ShopInBitCategory category, - required ShopInBitOrderStatus status, - Value statusRaw, required String requestDescription, required String deliveryCountry, + required ShopInBitOrderStatus status, + required String statusRaw, Value offerProductName, Value offerPrice, - required String shippingName, - required String shippingStreet, - required String shippingCity, - required String shippingPostalCode, - required String shippingCountry, - Value paymentMethod, - required List messages, - required DateTime createdAt, - required int apiTicketId, - Value carResearchInvoiceId, + Value paymentInvoiceStatus, + Value trackingLink, + Value lastAgentMessageAt, Value feeTicketNumber, - required bool needsCreateRequest, - required bool isPendingPayment, - Value carResearchExpiresAt, - Value carResearchPaymentLinks, - Value rowid, + Value> messages, + Value createdAt, + Value updatedAt, }); typedef $$ShopInBitTicketsTableUpdateCompanionBuilder = ShopInBitTicketsCompanion Function({ - Value ticketId, - Value displayName, + Value apiTicketId, + Value customerKey, + Value ticketNumber, Value category, - Value status, - Value statusRaw, Value requestDescription, Value deliveryCountry, + Value status, + Value statusRaw, Value offerProductName, Value offerPrice, - Value shippingName, - Value shippingStreet, - Value shippingCity, - Value shippingPostalCode, - Value shippingCountry, - Value paymentMethod, - Value> messages, - Value createdAt, - Value apiTicketId, - Value carResearchInvoiceId, + Value paymentInvoiceStatus, + Value trackingLink, + Value lastAgentMessageAt, Value feeTicketNumber, - Value needsCreateRequest, - Value isPendingPayment, - Value carResearchExpiresAt, - Value carResearchPaymentLinks, - Value rowid, + Value> messages, + Value createdAt, + Value updatedAt, }); class $$ShopInBitTicketsTableFilterComposer @@ -2339,26 +2245,41 @@ class $$ShopInBitTicketsTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnFilters get ticketId => $composableBuilder( - column: $table.ticketId, + ColumnFilters get apiTicketId => $composableBuilder( + column: $table.apiTicketId, builder: (column) => ColumnFilters(column), ); - ColumnFilters get displayName => $composableBuilder( - column: $table.displayName, + ColumnFilters get customerKey => $composableBuilder( + column: $table.customerKey, builder: (column) => ColumnFilters(column), ); - ColumnWithTypeConverterFilters + ColumnFilters get ticketNumber => $composableBuilder( + column: $table.ticketNumber, + builder: (column) => ColumnFilters(column), + ); + + ColumnWithTypeConverterFilters get category => $composableBuilder( column: $table.category, builder: (column) => ColumnWithTypeConverterFilters(column), ); + ColumnFilters get requestDescription => $composableBuilder( + column: $table.requestDescription, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get deliveryCountry => $composableBuilder( + column: $table.deliveryCountry, + builder: (column) => ColumnFilters(column), + ); + ColumnWithTypeConverterFilters< ShopInBitOrderStatus, ShopInBitOrderStatus, - int + String > get status => $composableBuilder( column: $table.status, @@ -2370,16 +2291,6 @@ class $$ShopInBitTicketsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get requestDescription => $composableBuilder( - column: $table.requestDescription, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get deliveryCountry => $composableBuilder( - column: $table.deliveryCountry, - builder: (column) => ColumnFilters(column), - ); - ColumnFilters get offerProductName => $composableBuilder( column: $table.offerProductName, builder: (column) => ColumnFilters(column), @@ -2390,39 +2301,29 @@ class $$ShopInBitTicketsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get shippingName => $composableBuilder( - column: $table.shippingName, + ColumnFilters get paymentInvoiceStatus => $composableBuilder( + column: $table.paymentInvoiceStatus, builder: (column) => ColumnFilters(column), ); - ColumnFilters get shippingStreet => $composableBuilder( - column: $table.shippingStreet, + ColumnFilters get trackingLink => $composableBuilder( + column: $table.trackingLink, builder: (column) => ColumnFilters(column), ); - ColumnFilters get shippingCity => $composableBuilder( - column: $table.shippingCity, + ColumnFilters get lastAgentMessageAt => $composableBuilder( + column: $table.lastAgentMessageAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get shippingPostalCode => $composableBuilder( - column: $table.shippingPostalCode, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get shippingCountry => $composableBuilder( - column: $table.shippingCountry, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get paymentMethod => $composableBuilder( - column: $table.paymentMethod, + ColumnFilters get feeTicketNumber => $composableBuilder( + column: $table.feeTicketNumber, builder: (column) => ColumnFilters(column), ); ColumnWithTypeConverterFilters< - List, - List, + List, + List, String > get messages => $composableBuilder( @@ -2435,38 +2336,8 @@ class $$ShopInBitTicketsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get apiTicketId => $composableBuilder( - column: $table.apiTicketId, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get carResearchInvoiceId => $composableBuilder( - column: $table.carResearchInvoiceId, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get feeTicketNumber => $composableBuilder( - column: $table.feeTicketNumber, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get needsCreateRequest => $composableBuilder( - column: $table.needsCreateRequest, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get isPendingPayment => $composableBuilder( - column: $table.isPendingPayment, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get carResearchExpiresAt => $composableBuilder( - column: $table.carResearchExpiresAt, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get carResearchPaymentLinks => $composableBuilder( - column: $table.carResearchPaymentLinks, + ColumnFilters get updatedAt => $composableBuilder( + column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); } @@ -2480,28 +2351,23 @@ class $$ShopInBitTicketsTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnOrderings get ticketId => $composableBuilder( - column: $table.ticketId, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get displayName => $composableBuilder( - column: $table.displayName, + ColumnOrderings get apiTicketId => $composableBuilder( + column: $table.apiTicketId, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get category => $composableBuilder( - column: $table.category, + ColumnOrderings get customerKey => $composableBuilder( + column: $table.customerKey, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get status => $composableBuilder( - column: $table.status, + ColumnOrderings get ticketNumber => $composableBuilder( + column: $table.ticketNumber, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get statusRaw => $composableBuilder( - column: $table.statusRaw, + ColumnOrderings get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnOrderings(column), ); @@ -2515,43 +2381,43 @@ class $$ShopInBitTicketsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get offerProductName => $composableBuilder( - column: $table.offerProductName, + ColumnOrderings get status => $composableBuilder( + column: $table.status, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get offerPrice => $composableBuilder( - column: $table.offerPrice, + ColumnOrderings get statusRaw => $composableBuilder( + column: $table.statusRaw, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get shippingName => $composableBuilder( - column: $table.shippingName, + ColumnOrderings get offerProductName => $composableBuilder( + column: $table.offerProductName, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get shippingStreet => $composableBuilder( - column: $table.shippingStreet, + ColumnOrderings get offerPrice => $composableBuilder( + column: $table.offerPrice, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get shippingCity => $composableBuilder( - column: $table.shippingCity, + ColumnOrderings get paymentInvoiceStatus => $composableBuilder( + column: $table.paymentInvoiceStatus, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get shippingPostalCode => $composableBuilder( - column: $table.shippingPostalCode, + ColumnOrderings get trackingLink => $composableBuilder( + column: $table.trackingLink, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get shippingCountry => $composableBuilder( - column: $table.shippingCountry, + ColumnOrderings get lastAgentMessageAt => $composableBuilder( + column: $table.lastAgentMessageAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get paymentMethod => $composableBuilder( - column: $table.paymentMethod, + ColumnOrderings get feeTicketNumber => $composableBuilder( + column: $table.feeTicketNumber, builder: (column) => ColumnOrderings(column), ); @@ -2565,38 +2431,8 @@ class $$ShopInBitTicketsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get apiTicketId => $composableBuilder( - column: $table.apiTicketId, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get carResearchInvoiceId => $composableBuilder( - column: $table.carResearchInvoiceId, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get feeTicketNumber => $composableBuilder( - column: $table.feeTicketNumber, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get needsCreateRequest => $composableBuilder( - column: $table.needsCreateRequest, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get isPendingPayment => $composableBuilder( - column: $table.isPendingPayment, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get carResearchExpiresAt => $composableBuilder( - column: $table.carResearchExpiresAt, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get carResearchPaymentLinks => $composableBuilder( - column: $table.carResearchPaymentLinks, + ColumnOrderings get updatedAt => $composableBuilder( + column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); } @@ -2610,22 +2446,23 @@ class $$ShopInBitTicketsTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get ticketId => - $composableBuilder(column: $table.ticketId, builder: (column) => column); - - GeneratedColumn get displayName => $composableBuilder( - column: $table.displayName, + GeneratedColumn get apiTicketId => $composableBuilder( + column: $table.apiTicketId, builder: (column) => column, ); - GeneratedColumnWithTypeConverter get category => - $composableBuilder(column: $table.category, builder: (column) => column); + GeneratedColumn get customerKey => $composableBuilder( + column: $table.customerKey, + builder: (column) => column, + ); - GeneratedColumnWithTypeConverter get status => - $composableBuilder(column: $table.status, builder: (column) => column); + GeneratedColumn get ticketNumber => $composableBuilder( + column: $table.ticketNumber, + builder: (column) => column, + ); - GeneratedColumn get statusRaw => - $composableBuilder(column: $table.statusRaw, builder: (column) => column); + GeneratedColumnWithTypeConverter get category => + $composableBuilder(column: $table.category, builder: (column) => column); GeneratedColumn get requestDescription => $composableBuilder( column: $table.requestDescription, @@ -2637,6 +2474,12 @@ class $$ShopInBitTicketsTableAnnotationComposer builder: (column) => column, ); + GeneratedColumnWithTypeConverter get status => + $composableBuilder(column: $table.status, builder: (column) => column); + + GeneratedColumn get statusRaw => + $composableBuilder(column: $table.statusRaw, builder: (column) => column); + GeneratedColumn get offerProductName => $composableBuilder( column: $table.offerProductName, builder: (column) => column, @@ -2647,77 +2490,34 @@ class $$ShopInBitTicketsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get shippingName => $composableBuilder( - column: $table.shippingName, - builder: (column) => column, - ); - - GeneratedColumn get shippingStreet => $composableBuilder( - column: $table.shippingStreet, - builder: (column) => column, - ); - - GeneratedColumn get shippingCity => $composableBuilder( - column: $table.shippingCity, + GeneratedColumn get paymentInvoiceStatus => $composableBuilder( + column: $table.paymentInvoiceStatus, builder: (column) => column, ); - GeneratedColumn get shippingPostalCode => $composableBuilder( - column: $table.shippingPostalCode, + GeneratedColumn get trackingLink => $composableBuilder( + column: $table.trackingLink, builder: (column) => column, ); - GeneratedColumn get shippingCountry => $composableBuilder( - column: $table.shippingCountry, + GeneratedColumn get lastAgentMessageAt => $composableBuilder( + column: $table.lastAgentMessageAt, builder: (column) => column, ); - GeneratedColumn get paymentMethod => $composableBuilder( - column: $table.paymentMethod, + GeneratedColumn get feeTicketNumber => $composableBuilder( + column: $table.feeTicketNumber, builder: (column) => column, ); - GeneratedColumnWithTypeConverter, String> - get messages => + GeneratedColumnWithTypeConverter, String> get messages => $composableBuilder(column: $table.messages, builder: (column) => column); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get apiTicketId => $composableBuilder( - column: $table.apiTicketId, - builder: (column) => column, - ); - - GeneratedColumn get carResearchInvoiceId => $composableBuilder( - column: $table.carResearchInvoiceId, - builder: (column) => column, - ); - - GeneratedColumn get feeTicketNumber => $composableBuilder( - column: $table.feeTicketNumber, - builder: (column) => column, - ); - - GeneratedColumn get needsCreateRequest => $composableBuilder( - column: $table.needsCreateRequest, - builder: (column) => column, - ); - - GeneratedColumn get isPendingPayment => $composableBuilder( - column: $table.isPendingPayment, - builder: (column) => column, - ); - - GeneratedColumn get carResearchExpiresAt => $composableBuilder( - column: $table.carResearchExpiresAt, - builder: (column) => column, - ); - - GeneratedColumn get carResearchPaymentLinks => $composableBuilder( - column: $table.carResearchPaymentLinks, - builder: (column) => column, - ); + GeneratedColumn get updatedAt => + $composableBuilder(column: $table.updatedAt, builder: (column) => column); } class $$ShopInBitTicketsTableTableManager @@ -2757,112 +2557,79 @@ class $$ShopInBitTicketsTableTableManager $$ShopInBitTicketsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ - Value ticketId = const Value.absent(), - Value displayName = const Value.absent(), + Value apiTicketId = const Value.absent(), + Value customerKey = const Value.absent(), + Value ticketNumber = const Value.absent(), Value category = const Value.absent(), - Value status = const Value.absent(), - Value statusRaw = const Value.absent(), Value requestDescription = const Value.absent(), Value deliveryCountry = const Value.absent(), + Value status = const Value.absent(), + Value statusRaw = const Value.absent(), Value offerProductName = const Value.absent(), Value offerPrice = const Value.absent(), - Value shippingName = const Value.absent(), - Value shippingStreet = const Value.absent(), - Value shippingCity = const Value.absent(), - Value shippingPostalCode = const Value.absent(), - Value shippingCountry = const Value.absent(), - Value paymentMethod = const Value.absent(), - Value> messages = - const Value.absent(), - Value createdAt = const Value.absent(), - Value apiTicketId = const Value.absent(), - Value carResearchInvoiceId = const Value.absent(), + Value paymentInvoiceStatus = const Value.absent(), + Value trackingLink = const Value.absent(), + Value lastAgentMessageAt = const Value.absent(), Value feeTicketNumber = const Value.absent(), - Value needsCreateRequest = const Value.absent(), - Value isPendingPayment = const Value.absent(), - Value carResearchExpiresAt = const Value.absent(), - Value carResearchPaymentLinks = const Value.absent(), - Value rowid = const Value.absent(), + Value> messages = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), }) => ShopInBitTicketsCompanion( - ticketId: ticketId, - displayName: displayName, + apiTicketId: apiTicketId, + customerKey: customerKey, + ticketNumber: ticketNumber, category: category, - status: status, - statusRaw: statusRaw, requestDescription: requestDescription, deliveryCountry: deliveryCountry, + status: status, + statusRaw: statusRaw, offerProductName: offerProductName, offerPrice: offerPrice, - shippingName: shippingName, - shippingStreet: shippingStreet, - shippingCity: shippingCity, - shippingPostalCode: shippingPostalCode, - shippingCountry: shippingCountry, - paymentMethod: paymentMethod, + paymentInvoiceStatus: paymentInvoiceStatus, + trackingLink: trackingLink, + lastAgentMessageAt: lastAgentMessageAt, + feeTicketNumber: feeTicketNumber, messages: messages, createdAt: createdAt, - apiTicketId: apiTicketId, - carResearchInvoiceId: carResearchInvoiceId, - feeTicketNumber: feeTicketNumber, - needsCreateRequest: needsCreateRequest, - isPendingPayment: isPendingPayment, - carResearchExpiresAt: carResearchExpiresAt, - carResearchPaymentLinks: carResearchPaymentLinks, - rowid: rowid, + updatedAt: updatedAt, ), createCompanionCallback: ({ - required String ticketId, - required String displayName, + required int apiTicketId, + required String customerKey, + required String ticketNumber, required ShopInBitCategory category, - required ShopInBitOrderStatus status, - Value statusRaw = const Value.absent(), required String requestDescription, required String deliveryCountry, + required ShopInBitOrderStatus status, + required String statusRaw, Value offerProductName = const Value.absent(), Value offerPrice = const Value.absent(), - required String shippingName, - required String shippingStreet, - required String shippingCity, - required String shippingPostalCode, - required String shippingCountry, - Value paymentMethod = const Value.absent(), - required List messages, - required DateTime createdAt, - required int apiTicketId, - Value carResearchInvoiceId = const Value.absent(), + Value paymentInvoiceStatus = const Value.absent(), + Value trackingLink = const Value.absent(), + Value lastAgentMessageAt = const Value.absent(), Value feeTicketNumber = const Value.absent(), - required bool needsCreateRequest, - required bool isPendingPayment, - Value carResearchExpiresAt = const Value.absent(), - Value carResearchPaymentLinks = const Value.absent(), - Value rowid = const Value.absent(), + Value> messages = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), }) => ShopInBitTicketsCompanion.insert( - ticketId: ticketId, - displayName: displayName, + apiTicketId: apiTicketId, + customerKey: customerKey, + ticketNumber: ticketNumber, category: category, - status: status, - statusRaw: statusRaw, requestDescription: requestDescription, deliveryCountry: deliveryCountry, + status: status, + statusRaw: statusRaw, offerProductName: offerProductName, offerPrice: offerPrice, - shippingName: shippingName, - shippingStreet: shippingStreet, - shippingCity: shippingCity, - shippingPostalCode: shippingPostalCode, - shippingCountry: shippingCountry, - paymentMethod: paymentMethod, + paymentInvoiceStatus: paymentInvoiceStatus, + trackingLink: trackingLink, + lastAgentMessageAt: lastAgentMessageAt, + feeTicketNumber: feeTicketNumber, messages: messages, createdAt: createdAt, - apiTicketId: apiTicketId, - carResearchInvoiceId: carResearchInvoiceId, - feeTicketNumber: feeTicketNumber, - needsCreateRequest: needsCreateRequest, - isPendingPayment: isPendingPayment, - carResearchExpiresAt: carResearchExpiresAt, - carResearchPaymentLinks: carResearchPaymentLinks, - rowid: rowid, + updatedAt: updatedAt, ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) @@ -2899,24 +2666,40 @@ class $SharedDatabaseManager { $SharedDatabaseManager(this._db); $$CakepayOrdersTableTableManager get cakepayOrders => $$CakepayOrdersTableTableManager(_db, _db.cakepayOrders); - $$ShopinBitSettingsTableTableManager get shopinBitSettings => - $$ShopinBitSettingsTableTableManager(_db, _db.shopinBitSettings); + $$ShopInBitSettingsTableTableManager get shopInBitSettings => + $$ShopInBitSettingsTableTableManager(_db, _db.shopInBitSettings); $$ShopInBitTicketsTableTableManager get shopInBitTickets => $$ShopInBitTicketsTableTableManager(_db, _db.shopInBitTickets); } -mixin _$ShopinBitSettingsDaoMixin on DatabaseAccessor { - $ShopinBitSettingsTable get shopinBitSettings => - attachedDatabase.shopinBitSettings; - ShopinBitSettingsDaoManager get managers => ShopinBitSettingsDaoManager(this); +mixin _$ShopInBitSettingsDaoMixin on DatabaseAccessor { + $ShopInBitSettingsTable get shopInBitSettings => + attachedDatabase.shopInBitSettings; + ShopInBitSettingsDaoManager get managers => ShopInBitSettingsDaoManager(this); +} + +class ShopInBitSettingsDaoManager { + final _$ShopInBitSettingsDaoMixin _db; + ShopInBitSettingsDaoManager(this._db); + $$ShopInBitSettingsTableTableManager get shopInBitSettings => + $$ShopInBitSettingsTableTableManager( + _db.attachedDatabase, + _db.shopInBitSettings, + ); +} + +mixin _$ShopInBitTicketsDaoMixin on DatabaseAccessor { + $ShopInBitTicketsTable get shopInBitTickets => + attachedDatabase.shopInBitTickets; + ShopInBitTicketsDaoManager get managers => ShopInBitTicketsDaoManager(this); } -class ShopinBitSettingsDaoManager { - final _$ShopinBitSettingsDaoMixin _db; - ShopinBitSettingsDaoManager(this._db); - $$ShopinBitSettingsTableTableManager get shopinBitSettings => - $$ShopinBitSettingsTableTableManager( +class ShopInBitTicketsDaoManager { + final _$ShopInBitTicketsDaoMixin _db; + ShopInBitTicketsDaoManager(this._db); + $$ShopInBitTicketsTableTableManager get shopInBitTickets => + $$ShopInBitTicketsTableTableManager( _db.attachedDatabase, - _db.shopinBitSettings, + _db.shopInBitTickets, ); } diff --git a/lib/db/drift/shared_db/tables/shopin_bit_settings.dart b/lib/db/drift/shared_db/tables/shopin_bit_settings.dart index e4c32532ed..4438f90199 100644 --- a/lib/db/drift/shared_db/tables/shopin_bit_settings.dart +++ b/lib/db/drift/shared_db/tables/shopin_bit_settings.dart @@ -1,15 +1,30 @@ -import 'package:drift/drift.dart'; +import "package:drift/drift.dart"; -class ShopinBitSettings extends Table { - // Single row table - always row 0 - IntColumn get id => integer().withDefault(const Constant(0))(); +/// One row per ShopinBit customer key the user has ever generated or +/// recovered. Whichever row has the most recent `lastUsedAt` is the +/// "current" key — see `ShopInBitSettingsDao.getCurrentSettings`. +class ShopInBitSettings extends Table { + TextColumn get customerKey => text()(); - BoolColumn get guidelinesAccepted => + BoolColumn get privacyAccepted => boolean().withDefault(const Constant(false))(); + + BoolColumn get conciergeGuidelinesAccepted => + boolean().withDefault(const Constant(false))(); + BoolColumn get travelGuidelinesAccepted => + boolean().withDefault(const Constant(false))(); + BoolColumn get carGuidelinesAccepted => + boolean().withDefault(const Constant(false))(); + BoolColumn get setupComplete => boolean().withDefault(const Constant(false))(); - TextColumn get displayName => text().nullable()(); + + DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)(); + DateTimeColumn get lastUsedAt => dateTime().withDefault(currentDateAndTime)(); + + @override + Set> get primaryKey => {customerKey}; @override - Set get primaryKey => {id}; + bool get withoutRowId => true; } diff --git a/lib/db/drift/shared_db/tables/shopin_bit_tickets.dart b/lib/db/drift/shared_db/tables/shopin_bit_tickets.dart index 450053a20e..83385eb953 100644 --- a/lib/db/drift/shared_db/tables/shopin_bit_tickets.dart +++ b/lib/db/drift/shared_db/tables/shopin_bit_tickets.dart @@ -2,112 +2,71 @@ import "dart:convert"; import "package:drift/drift.dart"; -import '../../../../models/shopinbit/shopinbit_order_model.dart' - show ShopInBitCategory, ShopInBitOrderStatus; +import "../../../../models/shopinbit/shopinbit_enums.dart"; +import "../../../../services/shopinbit/src/models/message.dart"; +import "../../../../utilities/logger.dart"; class ShopInBitTickets extends Table { - TextColumn get ticketId => text()(); - - TextColumn get displayName => text()(); - - IntColumn get category => intEnum()(); - IntColumn get status => intEnum()(); - TextColumn get statusRaw => text().nullable()(); + IntColumn get apiTicketId => integer()(); + TextColumn get customerKey => text()(); + TextColumn get ticketNumber => text()(); + TextColumn get category => textEnum()(); TextColumn get requestDescription => text()(); TextColumn get deliveryCountry => text()(); + + TextColumn get status => textEnum()(); + TextColumn get statusRaw => text()(); + TextColumn get offerProductName => text().nullable()(); TextColumn get offerPrice => text().nullable()(); - TextColumn get shippingName => text()(); - TextColumn get shippingStreet => text()(); - TextColumn get shippingCity => text()(); - TextColumn get shippingPostalCode => text()(); - TextColumn get shippingCountry => text()(); + TextColumn get paymentInvoiceStatus => text().nullable()(); + TextColumn get trackingLink => text().nullable()(); + DateTimeColumn get lastAgentMessageAt => dateTime().nullable()(); - TextColumn get paymentMethod => text().nullable()(); + TextColumn get feeTicketNumber => text().nullable()(); TextColumn get messages => - text().map(const ShopInBitTicketMessagesConverter())(); + text().map(const MessagesConverter()).withDefault(const Constant("[]"))(); - DateTimeColumn get createdAt => dateTime()(); - IntColumn get apiTicketId => integer()(); - - // Car research retry support - TextColumn get carResearchInvoiceId => text().nullable()(); - TextColumn get feeTicketNumber => text().nullable()(); - BoolColumn get needsCreateRequest => boolean()(); - - // Car research resumable payment state - BoolColumn get isPendingPayment => boolean()(); - DateTimeColumn get carResearchExpiresAt => dateTime().nullable()(); - TextColumn get carResearchPaymentLinks => text().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)(); + DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)(); @override - Set> get primaryKey => {ticketId}; -} - -class ShopInBitTicketMessage { - final String text; - final DateTime timestamp; - final bool isFromUser; - - const ShopInBitTicketMessage({ - required this.text, - required this.timestamp, - required this.isFromUser, - }); - - factory ShopInBitTicketMessage.fromJson(Map json) { - return ShopInBitTicketMessage( - text: json["text"] as String, - timestamp: DateTime.parse(json["timestamp"] as String), - isFromUser: json["isFromUser"] as bool, - ); - } - - Map toMap() { - return { - "text": text, - "timestamp": timestamp.toIso8601String(), - "isFromUser": isFromUser, - }; - } + Set> get primaryKey => {apiTicketId}; @override - String toString() => toMap().toString(); + bool get withoutRowId => true; } -class ShopInBitTicketMessagesConverter - extends TypeConverter, String> - with - JsonTypeConverter2< - List, - String, - List - > { - const ShopInBitTicketMessagesConverter(); - - @override - List fromSql(String fromDb) { - final List decoded = jsonDecode(fromDb) as List; - return fromJson(decoded); - } - - @override - String toSql(List value) { - return jsonEncode(toJson(value)); - } +/// Drift TypeConverter so `messages` round-trips between a JSON column and +/// `List` on the generated data class. +class MessagesConverter extends TypeConverter, String> { + const MessagesConverter(); @override - List fromJson(List json) { - return json - .map((e) => ShopInBitTicketMessage.fromJson(e as Map)) - .toList(); + List fromSql(String fromDb) { + final List raw = jsonDecode(fromDb) as List; + // Skip any message that fails to parse rather than dropping the whole + // conversation; mirrors the tolerant parse on the network side. + final messages = []; + for (final e in raw) { + try { + messages.add(TicketMessage.fromJson(e as Map)); + } catch (err, s) { + Logging.instance.w( + "MessagesConverter skipping malformed message", + error: err, + stackTrace: s, + ); + } + } + return List.unmodifiable(messages); } @override - List toJson(List value) { - return value.map((m) => m.toMap()).toList(); + String toSql(List value) { + return jsonEncode(value.map((m) => m.toMap()).toList()); } } diff --git a/lib/models/shopinbit/shopinbit_enums.dart b/lib/models/shopinbit/shopinbit_enums.dart new file mode 100644 index 0000000000..eca8d63b3b --- /dev/null +++ b/lib/models/shopinbit/shopinbit_enums.dart @@ -0,0 +1,82 @@ +import 'dart:ui'; + +import "../../services/shopinbit/src/models/ticket.dart"; +import '../../themes/stack_colors.dart'; + +// Stable string identifiers — these names are persisted in the DB via +// `textEnum()`. Renaming any value silently corrupts existing rows; +// add new values to the end instead. + +enum ShopInBitCategory { + concierge, + travel, + car; + + /// Value used for `service_type` in `POST /requests`. Matches the API + /// spec strings exactly; equivalent to [name] for the current set. + String get apiValue => name; + + String get label => switch (this) { + .concierge => "Concierge", + .travel => "Travel", + .car => "Car", + }; +} + +enum ShopInBitOrderStatus { + pending, + reviewing, + offerAvailable, + accepted, + paymentPending, + paid, + shipping, + delivered, + closed, + cancelled, + refunded; + + String get label => switch (this) { + .pending => "Pending", + .reviewing => "Under review", + .offerAvailable => "Offer available", + .accepted => "Accepted", + .paymentPending => "Awaiting payment", + .paid => "Paid", + .shipping => "Shipping", + .delivered => "Delivered", + .closed => "Closed", + .cancelled => "Cancelled", + .refunded => "Refunded", + }; + + /// Maps a raw API ticket state to a customer-facing status. Returns null + /// for unrecognized states so the caller can decide whether to skip the + /// row entirely or keep the previous value. + static ShopInBitOrderStatus? fromTicketState(TicketState state) => + switch (state) { + .newTicket => ShopInBitOrderStatus.pending, + .checking || + .inProgress || + .replyNeeded => ShopInBitOrderStatus.reviewing, + .offerAvailable => ShopInBitOrderStatus.offerAvailable, + .clearing => ShopInBitOrderStatus.accepted, + .pendingClose => ShopInBitOrderStatus.paymentPending, + .shipped => ShopInBitOrderStatus.shipping, + .fulfilled => ShopInBitOrderStatus.delivered, + .closed || .merged => ShopInBitOrderStatus.closed, + .closedCancelled => ShopInBitOrderStatus.cancelled, + .refunded => ShopInBitOrderStatus.refunded, + .unknown => null, + }; +} + +extension ShopinbitStatusStyleExt on ShopInBitOrderStatus { + Color getColor(StackColors colors) => switch (this) { + .delivered => colors.accentColorGreen, + .offerAvailable => colors.accentColorBlue, + .pending || .reviewing => colors.accentColorYellow, + .closed || .cancelled || .refunded => colors.textSubtitle1, + _ => colors.accentColorDark, + }; +} diff --git a/lib/models/shopinbit/shopinbit_order_model.dart b/lib/models/shopinbit/shopinbit_order_model.dart deleted file mode 100644 index 14b530475d..0000000000 --- a/lib/models/shopinbit/shopinbit_order_model.dart +++ /dev/null @@ -1,382 +0,0 @@ -import 'dart:ui'; - -import 'package:drift/drift.dart'; -import 'package:flutter/foundation.dart'; - -import '../../db/drift/shared_db/shared_database.dart'; -import '../../db/drift/shared_db/tables/shopin_bit_tickets.dart'; -import '../../services/shopinbit/src/models/ticket.dart'; -import '../../themes/stack_colors.dart'; - -// these enum indexes are stored in a db. Do not edit order -enum ShopInBitCategory { concierge, travel, car } - -// these enum indexes are stored in a db. Do not edit order -enum ShopInBitOrderStatus { - pending, - reviewing, - offerAvailable, - accepted, - paymentPending, - paid, - shipping, - delivered, - closed, - cancelled, - refunded; - - String get label => switch (this) { - .pending => "Pending", - .reviewing => "Under review", - .offerAvailable => "Offer available", - .accepted => "Accepted", - .paymentPending => "Awaiting payment", - .paid => "Paid", - .shipping => "Shipping", - .delivered => "Delivered", - .closed => "Closed", - .cancelled => "Cancelled", - .refunded => "Refunded", - }; - - Color getColor(StackColors colors) => switch (this) { - .delivered => colors.accentColorGreen, - .offerAvailable => colors.accentColorBlue, - .pending || .reviewing => colors.accentColorYellow, - .closed || .cancelled || .refunded => colors.textSubtitle1, - _ => colors.accentColorDark, - }; -} - -class ShopInBitMessage { - final String text; - final DateTime timestamp; - final bool isFromUser; - - const ShopInBitMessage({ - required this.text, - required this.timestamp, - required this.isFromUser, - }); -} - -class ShopInBitOrderModel extends ChangeNotifier { - String _displayName = ""; - String get displayName => _displayName; - set displayName(String value) { - if (_displayName != value) { - _displayName = value; - notifyListeners(); - } - } - - bool _privacyAccepted = false; - bool get privacyAccepted => _privacyAccepted; - set privacyAccepted(bool value) { - if (_privacyAccepted != value) { - _privacyAccepted = value; - notifyListeners(); - } - } - - ShopInBitCategory? _category; - ShopInBitCategory? get category => _category; - set category(ShopInBitCategory? value) { - if (_category != value) { - _category = value; - notifyListeners(); - } - } - - bool _guidelinesAccepted = false; - bool get guidelinesAccepted => _guidelinesAccepted; - set guidelinesAccepted(bool value) { - if (_guidelinesAccepted != value) { - _guidelinesAccepted = value; - notifyListeners(); - } - } - - String _requestDescription = ""; - String get requestDescription => _requestDescription; - set requestDescription(String value) { - if (_requestDescription != value) { - _requestDescription = value; - notifyListeners(); - } - } - - String _deliveryCountry = ""; - String get deliveryCountry => _deliveryCountry; - set deliveryCountry(String value) { - if (_deliveryCountry != value) { - _deliveryCountry = value; - notifyListeners(); - } - } - - int _apiTicketId = 0; - int get apiTicketId => _apiTicketId; - set apiTicketId(int value) { - if (_apiTicketId != value) { - _apiTicketId = value; - notifyListeners(); - } - } - - String? _ticketId; - String? get ticketId => _ticketId; - set ticketId(String? value) { - if (_ticketId != value) { - _ticketId = value; - notifyListeners(); - } - } - - ShopInBitOrderStatus _status = ShopInBitOrderStatus.pending; - ShopInBitOrderStatus get status => _status; - set status(ShopInBitOrderStatus value) { - if (_status != value) { - _status = value; - notifyListeners(); - } - } - - // The most recent raw API state string, persisted alongside _status so that - // we can recover from contract drift (renames / new states) without losing - // history. _status is the parsed/mapped value; _statusRaw is the source of - // truth straight from the API. - String? _statusRaw; - String? get statusRaw => _statusRaw; - set statusRaw(String? value) { - if (_statusRaw != value) { - _statusRaw = value; - notifyListeners(); - } - } - - String? _offerProductName; - String? get offerProductName => _offerProductName; - - String? _offerPrice; - String? get offerPrice => _offerPrice; - - void setOffer({required String productName, required String price}) { - _offerProductName = productName; - _offerPrice = price; - _status = ShopInBitOrderStatus.offerAvailable; - notifyListeners(); - } - - String _shippingName = ""; - String get shippingName => _shippingName; - - String _shippingStreet = ""; - String get shippingStreet => _shippingStreet; - - String _shippingCity = ""; - String get shippingCity => _shippingCity; - - String _shippingPostalCode = ""; - String get shippingPostalCode => _shippingPostalCode; - - String _shippingCountry = ""; - String get shippingCountry => _shippingCountry; - - void setShippingAddress({ - required String name, - required String street, - required String city, - required String postalCode, - required String country, - }) { - _shippingName = name; - _shippingStreet = street; - _shippingCity = city; - _shippingPostalCode = postalCode; - _shippingCountry = country; - notifyListeners(); - } - - String? _paymentMethod; - String? get paymentMethod => _paymentMethod; - set paymentMethod(String? value) { - if (_paymentMethod != value) { - _paymentMethod = value; - notifyListeners(); - } - } - - String? _carResearchInvoiceId; - String? get carResearchInvoiceId => _carResearchInvoiceId; - set carResearchInvoiceId(String? value) { - if (_carResearchInvoiceId != value) { - _carResearchInvoiceId = value; - notifyListeners(); - } - } - - String? _feeTicketNumber; - String? get feeTicketNumber => _feeTicketNumber; - set feeTicketNumber(String? value) { - if (_feeTicketNumber != value) { - _feeTicketNumber = value; - notifyListeners(); - } - } - - bool _needsCreateRequest = false; - bool get needsCreateRequest => _needsCreateRequest; - set needsCreateRequest(bool value) { - if (_needsCreateRequest != value) { - _needsCreateRequest = value; - notifyListeners(); - } - } - - bool _isPendingPayment = false; - bool get isPendingPayment => _isPendingPayment; - set isPendingPayment(bool value) { - if (_isPendingPayment != value) { - _isPendingPayment = value; - notifyListeners(); - } - } - - DateTime? _carResearchExpiresAt; - DateTime? get carResearchExpiresAt => _carResearchExpiresAt; - set carResearchExpiresAt(DateTime? value) { - if (_carResearchExpiresAt != value) { - _carResearchExpiresAt = value; - notifyListeners(); - } - } - - String? _carResearchPaymentLinks; - String? get carResearchPaymentLinks => _carResearchPaymentLinks; - set carResearchPaymentLinks(String? value) { - if (_carResearchPaymentLinks != value) { - _carResearchPaymentLinks = value; - notifyListeners(); - } - } - - List _messages = []; - List get messages => List.unmodifiable(_messages); - void addMessage(ShopInBitMessage message) { - _messages.add(message); - notifyListeners(); - } - - void clearMessages() { - _messages.clear(); - } - - ShopInBitTicketsCompanion toCompanion() { - assert(_ticketId != null, "ticketId must be set before persisting"); - - final List messages = _messages - .map( - (m) => ShopInBitTicketMessage( - text: m.text, - timestamp: m.timestamp, - isFromUser: m.isFromUser, - ), - ) - .toList(); - - return ShopInBitTicketsCompanion( - ticketId: Value(_ticketId!), - displayName: Value(_displayName), - category: Value(_category ?? ShopInBitCategory.concierge), - status: Value(_status), - statusRaw: Value(_statusRaw), - requestDescription: Value(_requestDescription), - deliveryCountry: Value(_deliveryCountry), - offerProductName: Value(_offerProductName), - offerPrice: Value(_offerPrice), - shippingName: Value(_shippingName), - shippingStreet: Value(_shippingStreet), - shippingCity: Value(_shippingCity), - shippingPostalCode: Value(_shippingPostalCode), - shippingCountry: Value(_shippingCountry), - paymentMethod: Value(_paymentMethod), - apiTicketId: Value(_apiTicketId), - carResearchInvoiceId: Value(_carResearchInvoiceId), - feeTicketNumber: Value(_feeTicketNumber), - needsCreateRequest: Value(_needsCreateRequest), - isPendingPayment: Value(_isPendingPayment), - carResearchExpiresAt: Value(_carResearchExpiresAt), - carResearchPaymentLinks: Value(_carResearchPaymentLinks), - messages: Value(messages), - createdAt: Value(DateTime.now()), - ); - } - - static ShopInBitOrderModel fromDriftRow(ShopInBitTicket ticket) { - final List messages = ticket.messages - .map( - (m) => ShopInBitMessage( - text: m.text, - timestamp: m.timestamp, - isFromUser: m.isFromUser, - ), - ) - .toList(); - - return ShopInBitOrderModel() - .._displayName = ticket.displayName - .._category = ticket.category - .._apiTicketId = ticket.apiTicketId - .._ticketId = ticket.ticketId - .._status = ticket.status - .._statusRaw = ticket.statusRaw - .._requestDescription = ticket.requestDescription - .._deliveryCountry = ticket.deliveryCountry - .._offerProductName = ticket.offerProductName - .._offerPrice = ticket.offerPrice - .._shippingName = ticket.shippingName - .._shippingStreet = ticket.shippingStreet - .._shippingCity = ticket.shippingCity - .._shippingPostalCode = ticket.shippingPostalCode - .._shippingCountry = ticket.shippingCountry - .._paymentMethod = ticket.paymentMethod - .._carResearchInvoiceId = ticket.carResearchInvoiceId - .._feeTicketNumber = ticket.feeTicketNumber - .._needsCreateRequest = ticket.needsCreateRequest - .._isPendingPayment = ticket.isPendingPayment - .._carResearchExpiresAt = ticket.carResearchExpiresAt - .._carResearchPaymentLinks = ticket.carResearchPaymentLinks - .._messages = messages; - } - - static ShopInBitOrderStatus? statusFromTicketState(TicketState state) { - switch (state) { - case TicketState.newTicket: - return ShopInBitOrderStatus.pending; - case TicketState.checking: - case TicketState.inProgress: - case TicketState.replyNeeded: - return ShopInBitOrderStatus.reviewing; - case TicketState.offerAvailable: - return ShopInBitOrderStatus.offerAvailable; - case TicketState.clearing: - return ShopInBitOrderStatus.accepted; - case TicketState.pendingClose: - return ShopInBitOrderStatus.paymentPending; - case TicketState.shipped: - return ShopInBitOrderStatus.shipping; - case TicketState.fulfilled: - return ShopInBitOrderStatus.delivered; - case TicketState.closed: - case TicketState.merged: - return ShopInBitOrderStatus.closed; - case TicketState.closedCancelled: - return ShopInBitOrderStatus.cancelled; - case TicketState.refunded: - return ShopInBitOrderStatus.refunded; - case TicketState.unknown: - return null; - } - } -} diff --git a/lib/models/shopinbit/shopinbit_request_draft.dart b/lib/models/shopinbit/shopinbit_request_draft.dart new file mode 100644 index 0000000000..c4c3cdd1ba --- /dev/null +++ b/lib/models/shopinbit/shopinbit_request_draft.dart @@ -0,0 +1,36 @@ +import 'shopinbit_enums.dart'; + +class ShopinbitRequestDraft { + final ShopInBitCategory category; + final String requestDescription; + final String deliveryCountryName; + final String deliveryCountryCode; + final String? deliveryState; + final String? voucherCode; + + bool get requiresState => switch (deliveryCountryCode) { + "US" || "CA" => category != .travel, + _ => false, + }; + + ShopinbitRequestDraft({ + required this.category, + required this.requestDescription, + required this.deliveryCountryName, + required this.deliveryCountryCode, + required this.deliveryState, + required this.voucherCode, + }); + + Map toMap() => { + "category": category.apiValue, + "requestDescription": requestDescription, + "deliveryCountryName": deliveryCountryName, + "deliveryCountryCode": deliveryCountryCode, + "deliveryState": deliveryState, + "voucherCode": voucherCode, + }; + + @override + String toString() => toMap().toString(); +} diff --git a/lib/networking/http.dart b/lib/networking/http.dart index efa997e64a..370e3153b4 100644 --- a/lib/networking/http.dart +++ b/lib/networking/http.dart @@ -14,9 +14,21 @@ class Response { final int code; final List bodyBytes; + // Lower-cased response header names mapped to their (comma-joined) values. + // Empty by default so existing callers/tests don't need to supply them. + final Map headers; + String get body => utf8.decode(bodyBytes, allowMalformed: true); - Response(this.bodyBytes, this.code); + Response(this.bodyBytes, this.code, {this.headers = const {}}); +} + +Map _headerMap(HttpClientResponse response) { + final map = {}; + response.headers.forEach((name, values) { + map[name.toLowerCase()] = values.join(', '); + }); + return map; } class HTTP { @@ -46,7 +58,11 @@ class HTTP { final response = await request.close(); - return Response(await _bodyBytes(response), response.statusCode); + return Response( + await _bodyBytes(response), + response.statusCode, + headers: _headerMap(response), + ); } catch (e, s) { Logging.instance.w("HTTP.get() rethrew: ", error: e, stackTrace: s); rethrow; @@ -78,7 +94,11 @@ class HTTP { request.write(body); final response = await request.close(); - return Response(await _bodyBytes(response), response.statusCode); + return Response( + await _bodyBytes(response), + response.statusCode, + headers: _headerMap(response), + ); } catch (e, s) { Logging.instance.w("HTTP.post() rethrew: ", error: e, stackTrace: s); rethrow; @@ -87,6 +107,41 @@ class HTTP { } } + Future put({ + required Uri url, + Map? headers, + Object? body, + required ({InternetAddress host, int port})? proxyInfo, + }) async { + final httpClient = HttpClient(); + try { + if (proxyInfo != null) { + SocksTCPClient.assignToHttpClient(httpClient, [ + ProxySettings(proxyInfo.host, proxyInfo.port), + ]); + } + final HttpClientRequest request = await httpClient.putUrl(url); + + if (headers != null) { + headers.forEach((key, value) => request.headers.add(key, value)); + } + + if (body != null) request.write(body); + + final response = await request.close(); + return Response( + await _bodyBytes(response), + response.statusCode, + headers: _headerMap(response), + ); + } catch (e, s) { + Logging.instance.w("HTTP.put() rethrew: ", error: e, stackTrace: s); + rethrow; + } finally { + httpClient.close(force: true); + } + } + Future patch({ required Uri url, Map? headers, @@ -109,7 +164,11 @@ class HTTP { request.write(body); final response = await request.close(); - return Response(await _bodyBytes(response), response.statusCode); + return Response( + await _bodyBytes(response), + response.statusCode, + headers: _headerMap(response), + ); } catch (e, s) { Logging.instance.w("HTTP.patch() rethrew: ", error: e, stackTrace: s); rethrow; @@ -137,7 +196,11 @@ class HTTP { } final response = await request.close(); - return Response(await _bodyBytes(response), response.statusCode); + return Response( + await _bodyBytes(response), + response.statusCode, + headers: _headerMap(response), + ); } catch (e, s) { Logging.instance.w("HTTP.delete() rethrew: ", error: e, stackTrace: s); rethrow; diff --git a/lib/pages/cakepay/cakepay_order_view.dart b/lib/pages/cakepay/cakepay_order_view.dart index aa693c7d84..4232a4edac 100644 --- a/lib/pages/cakepay/cakepay_order_view.dart +++ b/lib/pages/cakepay/cakepay_order_view.dart @@ -4,6 +4,7 @@ import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_svg/svg.dart'; import '../../app_config.dart'; import '../../notifications/show_flush_bar.dart'; @@ -15,6 +16,7 @@ import '../../services/cakepay/src/models/order.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/amount/amount.dart'; import '../../utilities/assets.dart'; +import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../wallets/crypto_currency/crypto_currency.dart'; @@ -27,6 +29,7 @@ import '../../widgets/dialogs/s_dialog.dart'; import '../../widgets/qr.dart'; import '../../widgets/refresh_control.dart'; import '../../widgets/rounded_white_container.dart'; +import '../../widgets/stack_dialog.dart'; import '../wallet_view/transaction_views/transaction_details_view.dart'; import 'cakepay_send_from_view.dart'; @@ -173,19 +176,31 @@ class _CakePayOrderViewState extends ConsumerState { final coin = _resolveCoin(option.ticker); if (option.address.trim().isEmpty) { - showFloatingFlushBar( - type: FlushBarType.warning, - message: "No payment address available for $label", - context: context, + unawaited( + showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "No payment address available for $label", + maxWidth: Util.isDesktop ? 500 : null, + desktopPopRootNavigator: Util.isDesktop, + ), + ), ); return; } if (coin == null) { - showFloatingFlushBar( - type: FlushBarType.warning, - message: "No wallet support for $label", - context: context, + unawaited( + showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "No wallet support for $label", + maxWidth: Util.isDesktop ? 500 : null, + desktopPopRootNavigator: Util.isDesktop, + ), + ), ); return; } @@ -210,7 +225,13 @@ class _CakePayOrderViewState extends ConsumerState { Decimal.parse(option.amountFrom.toString()), fractionDigits: coin.fractionDigits, ); - } catch (_) {} + } catch (e, s) { + Logging.instance.e( + "Failed to parse CakePay order amount '${option.amountFrom}'", + error: e, + stackTrace: s, + ); + } _navigateToSendFrom( coin: coin, @@ -558,9 +579,10 @@ class _CakePayOrderViewState extends ConsumerState { children: [ Row( children: [ - Icon( - Icons.check_circle, - size: 20, + SvgPicture.asset( + Assets.svg.checkCircle, + width: 20, + height: 20, color: Theme.of( context, ).extension()!.accentColorGreen, @@ -622,9 +644,10 @@ class _CakePayOrderViewState extends ConsumerState { RoundedWhiteContainer( child: Row( children: [ - Icon( - Icons.cancel, - size: 20, + SvgPicture.asset( + Assets.svg.circleX, + width: 20, + height: 20, color: Theme.of( context, ).extension()!.textSubtitle1, diff --git a/lib/pages/cakepay/cakepay_orders_view.dart b/lib/pages/cakepay/cakepay_orders_view.dart index 0e476089fa..2db794293c 100644 --- a/lib/pages/cakepay/cakepay_orders_view.dart +++ b/lib/pages/cakepay/cakepay_orders_view.dart @@ -1,8 +1,14 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_svg/svg.dart'; +import '../../notifications/show_flush_bar.dart'; import '../../providers/global/cakepay_orders_provider.dart'; import '../../themes/stack_colors.dart'; +import '../../utilities/assets.dart'; +import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../widgets/background.dart'; @@ -24,12 +30,34 @@ class CakePayOrdersView extends ConsumerStatefulWidget { } class _CakePayOrdersViewState extends ConsumerState { + Future _refresh() async { + try { + await ref.read(pCakePayOrdersService).refreshAll(); + } catch (e, s) { + Logging.instance.e( + "$runtimeType._refresh failed", + error: e, + stackTrace: s, + ); + + if (!mounted) return; + + unawaited( + showFloatingFlushBar( + type: FlushBarType.warning, + message: "Could not refresh orders", + context: context, + ), + ); + } + } + @override void initState() { super.initState(); WidgetsBinding.instance.addPostFrameCallback((_) { if (!mounted) return; - ref.read(pCakePayOrdersService).refreshAll(); + unawaited(_refresh()); }); } @@ -135,8 +163,10 @@ class _CakePayOrdersViewState extends ConsumerState { ), ), SizedBox(width: isDesktop ? 16 : 8), - Icon( - Icons.chevron_right, + SvgPicture.asset( + Assets.svg.chevronRight, + width: 24, + height: 24, color: Theme.of( context, ).extension()!.textSubtitle1, @@ -148,10 +178,8 @@ class _CakePayOrdersViewState extends ConsumerState { } } - Future onRefresh() => ref.read(pCakePayOrdersService).refreshAll(); - final body = RefreshControl( - onRefresh: onRefresh, + onRefresh: _refresh, child: ListView( shrinkWrap: true, physics: const AlwaysScrollableScrollPhysics(), @@ -184,7 +212,7 @@ class _CakePayOrdersViewState extends ConsumerState { children: [ RefreshButton( isRefreshing: isRefreshing, - onPressed: onRefresh, + onPressed: _refresh, ), const SizedBox(width: 8), const DesktopDialogCloseButton(), diff --git a/lib/pages/home_view/home_view.dart b/lib/pages/home_view/home_view.dart index e464edb52f..fcd425973f 100644 --- a/lib/pages/home_view/home_view.dart +++ b/lib/pages/home_view/home_view.dart @@ -38,6 +38,8 @@ import '../../widgets/small_tor_icon.dart'; import '../../widgets/stack_dialog.dart'; import '../buy_view/buy_view.dart'; import '../exchange_view/exchange_view.dart'; +import '../more_view/gift_cards_view.dart'; +import '../more_view/services_view.dart'; import '../notification_views/notifications_view.dart'; import '../pinpad_views/lock_screen_view.dart'; import '../settings_views/global_settings_view/global_settings_view.dart'; @@ -227,6 +229,11 @@ class _HomeViewState extends ConsumerState { const ExchangeView(), if (AppConfig.hasFeature(AppFeature.buy) && Constants.enableExchange) const BuyView(), + if (AppConfig.hasFeature(AppFeature.cakePay) && Constants.enableExchange) + const GiftCardsView(), + if (AppConfig.hasFeature(AppFeature.shopinBit) && + Constants.enableExchange) + const ServicesView(), ]; ref.read(notificationsProvider).startCheckingWatchedNotifications(); diff --git a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart index 962b7dfb6f..2fefa8c6ce 100644 --- a/lib/pages/home_view/sub_widgets/home_view_button_bar.dart +++ b/lib/pages/home_view/sub_widgets/home_view_button_bar.dart @@ -8,64 +8,193 @@ * */ +import 'dart:ui'; + import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../app_config.dart'; import '../../../providers/providers.dart'; import '../../../themes/stack_colors.dart'; +import '../../../utilities/constants.dart'; import '../../../utilities/text_styles.dart'; -class HomeViewButtonBar extends ConsumerStatefulWidget { +const double _fadeWidth = 64; +const double _fadeRampDistance = _fadeWidth; +const Duration _fadeDuration = Duration(milliseconds: 200); + +enum _FadeEdge { left, right } + +class HomeViewButtonBar extends StatefulWidget { const HomeViewButtonBar({super.key}); @override - ConsumerState createState() => _HomeViewButtonBarState(); + State createState() => _HomeViewButtonBarState(); } -class _HomeViewButtonBarState extends ConsumerState { - // final DateTime _lastRefreshed = DateTime.now(); - // final Duration _refreshInterval = const Duration(hours: 1); +class _HomeViewButtonBarState extends State { + double _leftProximity = 0; + double _rightProximity = 0; + + void _updateEdges(ScrollMetrics metrics) { + final double leftProximity = clampDouble( + metrics.extentBefore / _fadeRampDistance, + 0, + 1, + ); + final double rightProximity = clampDouble( + metrics.extentAfter / _fadeRampDistance, + 0, + 1, + ); + if (leftProximity == _leftProximity && rightProximity == _rightProximity) { + return; + } + setState(() { + _leftProximity = leftProximity; + _rightProximity = rightProximity; + }); + } @override - void initState() { - // ref.read(exchangeFormStateProvider).setOnError( - // onError: (String message) => showDialog( - // context: context, - // barrierDismissible: true, - // builder: (_) => StackDialog( - // title: "Exchange API Call Failed", - // message: message, - // ), - // ), - // ); - super.initState(); + Widget build(BuildContext context) { + return NotificationListener( + onNotification: (notification) { + _updateEdges(notification.metrics); + return false; + }, + child: NotificationListener( + onNotification: (notification) { + _updateEdges(notification.metrics); + return false; + }, + child: Stack( + children: [ + const RepaintBoundary(child: _HomeViewButtonBarContent()), + Positioned( + left: 0, + top: 0, + bottom: 0, + child: _EdgeFadeStrip(edge: .left, proximity: _leftProximity), + ), + Positioned( + right: 0, + top: 0, + bottom: 0, + child: _EdgeFadeStrip(edge: .right, proximity: _rightProximity), + ), + ], + ), + ), + ); } +} + +class _EdgeFadeStrip extends StatelessWidget { + const _EdgeFadeStrip({required this.edge, required this.proximity}); + + static const int _rampSamples = 8; + + static final List _ramp = [ + for (int i = 0; i <= _rampSamples; i++) + 1 - Curves.easeInOutSine.transform(i / _rampSamples), + ]; + + final _FadeEdge edge; + final double proximity; @override Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - const Expanded( - child: _HomeViewTopMenuButton(index: 0, label: "Wallets"), + final Color background = Theme.of( + context, + ).extension()!.background; + final (Alignment begin, Alignment end) = switch (edge) { + .left => (.centerLeft, .centerRight), + .right => (.centerRight, .centerLeft), + }; + + return RepaintBoundary( + child: IgnorePointer( + child: TweenAnimationBuilder( + tween: Tween(end: proximity > 0 ? 1 : 0), + duration: _fadeDuration, + curve: Curves.easeOut, + builder: (context, timeStrength, _) { + final double strength = timeStrength * proximity; + if (strength == 0) { + return const SizedBox(width: _fadeWidth); + } + return SizedBox( + width: _fadeWidth, + child: DecoratedBox( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: begin, + end: end, + colors: [ + for (final double factor in _ramp) + background.withValues(alpha: strength * factor), + ], + ), + ), + ), + ); + }, ), + ), + ); + } +} - if (AppConfig.hasFeature(AppFeature.swap)) const SizedBox(width: 8), - if (AppConfig.hasFeature(AppFeature.swap)) - const Expanded( - child: _HomeViewTopMenuButton(index: 1, label: "Swap"), - ), +class _HomeViewButtonBarContent extends StatelessWidget { + const _HomeViewButtonBarContent(); - if (AppConfig.hasFeature(AppFeature.buy)) const SizedBox(width: 8), - if (AppConfig.hasFeature(AppFeature.buy)) - const Expanded(child: _HomeViewTopMenuButton(index: 2, label: "Buy")), - ], + @override + Widget build(BuildContext context) { + return LayoutBuilder( + builder: (context, constraints) => SingleChildScrollView( + scrollDirection: .horizontal, + child: ConstrainedBox( + constraints: BoxConstraints(minWidth: constraints.maxWidth), + child: IntrinsicWidth( + child: Row( + spacing: 8, + children: [ + const Expanded( + child: _HomeViewTopMenuButton(index: 0, label: "Wallets"), + ), + if (AppConfig.hasFeature(.swap) && Constants.enableExchange) + const Expanded( + child: _HomeViewTopMenuButton(index: 1, label: "Swap"), + ), + if (AppConfig.hasFeature(AppFeature.buy) && + Constants.enableExchange) + const Expanded( + child: _HomeViewTopMenuButton(index: 2, label: "Buy"), + ), + if (AppConfig.hasFeature(.cakePay) && Constants.enableExchange) + const Expanded( + child: _HomeViewTopMenuButton( + index: 3, + label: "Gift cards", + ), + ), + if (AppConfig.hasFeature(.shopinBit) && + Constants.enableExchange) + const Expanded( + child: _HomeViewTopMenuButton(index: 4, label: "Services"), + ), + ], + ), + ), + ), + ), ); } } -class _HomeViewTopMenuButton extends ConsumerWidget { +class _HomeViewTopMenuButton extends ConsumerStatefulWidget { const _HomeViewTopMenuButton({ super.key, required this.index, @@ -76,43 +205,119 @@ class _HomeViewTopMenuButton extends ConsumerWidget { final String label; @override - Widget build(BuildContext context, WidgetRef ref) { - final selectedIndex = ref.watch(homeViewPageIndexStateProvider); + ConsumerState<_HomeViewTopMenuButton> createState() => + _HomeViewTopMenuButtonState(); +} + +class _HomeViewTopMenuButtonState + extends ConsumerState<_HomeViewTopMenuButton> { + static const Duration _revealDuration = Duration(milliseconds: 250); + + void _scheduleReveal({required bool animate}) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) { + _revealIfCovered(animate: animate); + } + }); + } + + void _revealIfCovered({required bool animate}) { + final RenderObject? renderObject = context.findRenderObject(); + final ScrollableState? scrollable = Scrollable.maybeOf( + context, + axis: .horizontal, + ); + if (renderObject == null || !renderObject.attached || scrollable == null) { + return; + } + final RenderAbstractViewport? viewport = RenderAbstractViewport.maybeOf( + renderObject, + ); + final ScrollPosition position = scrollable.position; + if (viewport == null || !position.hasContentDimensions) { + return; + } + + // The window of offsets that keeps this button _fadeWidth clear + // of both viewport edges. + final double lower = + viewport.getOffsetToReveal(renderObject, 1).offset + _fadeWidth; + final double upper = + viewport.getOffsetToReveal(renderObject, 0).offset - _fadeWidth; + + double target = upper < lower + ? viewport.getOffsetToReveal(renderObject, 0.5).offset + : clampDouble(position.pixels, lower, upper); + target = clampDouble( + target, + position.minScrollExtent, + position.maxScrollExtent, + ); + + if ((target - position.pixels).abs() < 1) { + return; + } + + if (animate) { + position.animateTo( + target, + duration: _revealDuration, + curve: Curves.easeOutCubic, + ); + } else { + position.jumpTo(target); + } + } + + @override + void initState() { + super.initState(); + if (ref.read(homeViewPageIndexStateProvider) == widget.index) { + _scheduleReveal(animate: false); + } + } + + @override + Widget build(BuildContext context) { + final bool isSelected = ref.watch( + homeViewPageIndexStateProvider.select((index) => index == widget.index), + ); + + ref.listen( + homeViewPageIndexStateProvider.select((index) => index == widget.index), + (previous, next) { + if (next) { + _scheduleReveal(animate: true); + } + }, + ); + + final StackColors colors = Theme.of(context).extension()!; return TextButton( - style: selectedIndex == index - ? Theme.of(context) - .extension()! - .getPrimaryEnabledButtonStyle(context)! - .copyWith( - minimumSize: MaterialStateProperty.all( - const Size(46, 36), - ), - ) - : Theme.of(context) - .extension()! - .getSecondaryEnabledButtonStyle(context)! - .copyWith( - minimumSize: MaterialStateProperty.all( - const Size(46, 36), - ), + style: + (isSelected + ? colors.getPrimaryEnabledButtonStyle(context)! + : colors.getSecondaryEnabledButtonStyle(context)!) + .copyWith( + minimumSize: MaterialStateProperty.all( + const Size(46, 36), ), - onPressed: () async { + ), + onPressed: () { FocusScope.of(context).unfocus(); - if (selectedIndex != index) { - ref.read(homeViewPageIndexStateProvider.state).state = index; + if (!isSelected) { + ref.read(homeViewPageIndexStateProvider.state).state = widget.index; } }, child: Padding( padding: const .symmetric(horizontal: 8), child: Text( - label, + widget.label, style: STextStyles.button(context).copyWith( fontSize: 14, - color: selectedIndex == index - ? Theme.of(context).extension()!.buttonTextPrimary - : Theme.of( - context, - ).extension()!.buttonTextSecondary, + color: isSelected + ? colors.buttonTextPrimary + : colors.buttonTextSecondary, ), ), ), diff --git a/lib/pages/more_view/gift_cards_view.dart b/lib/pages/more_view/gift_cards_view.dart index 48ff0f3646..db0ecb48e0 100644 --- a/lib/pages/more_view/gift_cards_view.dart +++ b/lib/pages/more_view/gift_cards_view.dart @@ -6,8 +6,6 @@ import '../../services/event_bus/events/global/tor_connection_status_changed_eve import '../../services/tor_service.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/text_styles.dart'; -import '../../widgets/background.dart'; -import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/primary_button.dart'; import '../../widgets/desktop/secondary_button.dart'; import '../../widgets/icon_widgets/credit_card_icon.dart'; @@ -19,8 +17,6 @@ import '../cakepay/cakepay_vendors_view.dart'; class GiftCardsView extends ConsumerStatefulWidget { const GiftCardsView({super.key}); - static const String routeName = "/giftCardsView"; - @override ConsumerState createState() => _GiftCardsViewState(); } @@ -44,100 +40,88 @@ class _GiftCardsViewState extends ConsumerState { _torEnabled = status != TorConnectionStatus.disconnected; }); }, - child: Background( - child: Scaffold( - backgroundColor: Theme.of( - context, - ).extension()!.background, - appBar: AppBar( - leading: const AppBarBackButton(), - title: Text("Gift cards", style: STextStyles.navBarTitle(context)), - ), - body: SafeArea( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - children: [ - RoundedWhiteContainer( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: SafeArea( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + children: [ + RoundedWhiteContainer( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( children: [ - Row( - children: [ - const CreditCardIcon(width: 32, height: 32), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "CakePay", - style: STextStyles.titleBold12(context), - ), - const SizedBox(height: 2), - Text( - "Purchase gift cards with cryptocurrency", - style: STextStyles.itemSubtitle12(context) - .copyWith( - color: Theme.of(context) - .extension()! - .textSubtitle1, - ), - ), - ], + const CreditCardIcon(width: 32, height: 32), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "CakePay", + style: STextStyles.titleBold12(context), ), - ), - ], + const SizedBox(height: 2), + Text( + "Purchase gift cards with cryptocurrency", + style: STextStyles.itemSubtitle12(context) + .copyWith( + color: Theme.of( + context, + ).extension()!.textSubtitle1, + ), + ), + ], + ), ), - const SizedBox(height: 16), - if (_torEnabled) - Padding( - padding: const EdgeInsets.only(bottom: 12), - child: Text( - "CakePay is not available while Tor is enabled", - style: STextStyles.itemSubtitle12(context) - .copyWith( - color: Theme.of( - context, - ).extension()!.textSubtitle1, - ), - ), + ], + ), + const SizedBox(height: 16), + if (_torEnabled) + Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Text( + "CakePay is not available while Tor is enabled", + style: STextStyles.itemSubtitle12(context).copyWith( + color: Theme.of( + context, + ).extension()!.textSubtitle1, ), - Row( - children: [ - Expanded( - child: SecondaryButton( - label: "My Orders", - enabled: !_torEnabled, - onPressed: () { - Navigator.of( - context, - ).pushNamed(CakePayOrdersView.routeName); - }, - ), - ), + ), + ), + Row( + children: [ + Expanded( + child: SecondaryButton( + label: "My Orders", + enabled: !_torEnabled, + onPressed: () { + Navigator.of( + context, + ).pushNamed(CakePayOrdersView.routeName); + }, + ), + ), - const SizedBox(width: 16), - Expanded( - child: PrimaryButton( - label: "Browse", - enabled: !_torEnabled, - onPressed: () { - Navigator.of( - context, - ).pushNamed(CakePayVendorsView.routeName); - }, - ), - ), - ], + const SizedBox(width: 16), + Expanded( + child: PrimaryButton( + label: "Browse", + enabled: !_torEnabled, + onPressed: () { + Navigator.of( + context, + ).pushNamed(CakePayVendorsView.routeName); + }, + ), ), ], ), - ), - ], + ], + ), ), - ), + ], ), ), ), diff --git a/lib/pages/more_view/services_view.dart b/lib/pages/more_view/services_view.dart index f99bfa92aa..f8278f0c40 100644 --- a/lib/pages/more_view/services_view.dart +++ b/lib/pages/more_view/services_view.dart @@ -3,19 +3,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../db/drift/shared_db/shared_database.dart'; import '../../providers/providers.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/assets.dart'; import '../../utilities/text_styles.dart'; -import '../../widgets/background.dart'; -import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/primary_button.dart'; import '../../widgets/desktop/secondary_button.dart'; import '../../widgets/dialogs/request_external_link_navigation_dialog.dart'; import '../../widgets/rounded_white_container.dart'; import '../../widgets/stack_dialog.dart'; -import '../shopinbit/shopinbit_settings_view.dart'; import '../shopinbit/shopinbit_setup_view.dart'; import '../shopinbit/shopinbit_step_2.dart'; import '../shopinbit/shopinbit_tickets_view.dart'; @@ -23,256 +20,224 @@ import '../shopinbit/shopinbit_tickets_view.dart'; class ServicesView extends ConsumerStatefulWidget { const ServicesView({super.key}); - static const String routeName = "/servicesView"; - @override ConsumerState createState() => _ServicesViewState(); } class _ServicesViewState extends ConsumerState { - void _showShopDialog() { - showDialog( - context: context, - barrierDismissible: true, - builder: (dialogContext) => StackDialogBase( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("ShopinBit", style: STextStyles.pageTitleH2(dialogContext)), - const SizedBox(height: 8), - RichText( - text: TextSpan( - style: STextStyles.smallMed14(dialogContext), - children: [ - const TextSpan( - text: - "Please note the following before proceeding:" - "\n\n\u2022 Minimum order amount: 1,000 EUR" - "\n\u2022 Service fee: 10% of the order total" - "\n\nBy continuing, you agree to the ShopinBit ", - ), - TextSpan( - text: "Privacy Policy", - style: STextStyles.richLink( - dialogContext, - ).copyWith(fontSize: 16), - recognizer: TapGestureRecognizer() - ..onTap = () async { - const url = - "https://api.shopinbit.com/static/policy/privacy.html"; - - await showRequestExternalLinkAndMaybeLaunch( - context, - uri: Uri.parse(url), - ); - }, - ), - const TextSpan(text: "."), - ], - ), - ), - const SizedBox(height: 20), - Row( + Future _showShopDialog() async { + final result = + await showDialog<({ShopInBitSetting? settings, bool continuePressed})>( + context: context, + barrierDismissible: true, + builder: (context) => StackDialogBase( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded( - child: TextButton( - onPressed: () { - Navigator.of(dialogContext).pop(); - }, - child: Text( - "Cancel", - style: STextStyles.button(dialogContext).copyWith( - color: Theme.of( - dialogContext, - ).extension()!.accentColorDark, + Text("ShopinBit", style: STextStyles.pageTitleH2(context)), + const SizedBox(height: 8), + RichText( + text: TextSpan( + style: STextStyles.smallMed14(context), + children: [ + const TextSpan( + text: + "Please note the following before proceeding:" + "\n\n\u2022 Minimum order amount: 1,000 EUR" + "\n\u2022 Service fee: 10% of the order total" + "\n\nBy continuing, you agree to the ShopinBit ", ), - ), + TextSpan( + text: "Privacy Policy", + style: STextStyles.richLink( + context, + ).copyWith(fontSize: 16), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = + "https://api.shopinbit.com/static/policy/privacy.html"; + + await showRequestExternalLinkAndMaybeLaunch( + context, + uri: Uri.parse(url), + ); + }, + ), + const TextSpan(text: "."), + ], ), ), - const SizedBox(width: 8), - Expanded( - child: TextButton( - style: Theme.of(dialogContext) - .extension()! - .getPrimaryEnabledButtonStyle(dialogContext), - onPressed: () async { - Navigator.of(dialogContext).pop(); - final model = ShopInBitOrderModel(); - final settings = await ref - .read(pSharedDrift) - .shopinBitSettingsDao - .getSettings(); + const SizedBox(height: 20), + Row( + children: [ + Expanded( + child: SecondaryButton( + label: "Cancel", + onPressed: Navigator.of(context).pop, + ), + ), + const SizedBox(width: 8), + Expanded( + child: TextButton( + style: Theme.of(context) + .extension()! + .getPrimaryEnabledButtonStyle(context), + onPressed: () async { + final settings = await ref + .read(pSharedDrift) + .shopInBitSettingsDao + .getCurrentSettings(); - if (!mounted) return; + if (!context.mounted) return; - if (settings.setupComplete) { - // Returning user: pre-load display name, - // skip Step 1, go to Step 2 - final savedName = settings.displayName; - if (savedName != null && savedName.isNotEmpty) { - model.displayName = savedName; - } - await Navigator.of( - context, - ).pushNamed(ShopInBitStep2.routeName, arguments: model); - } else { - // First-time user: show setup flow - await Navigator.of(context).pushNamed( - ShopInBitSetupView.routeName, - arguments: model, - ); - } - if (mounted) setState(() {}); - }, - child: Text( - "Continue", - style: STextStyles.button(dialogContext), + Navigator.of( + context, + ).pop((settings: settings, continuePressed: true)); + }, + child: Text( + "Continue", + style: STextStyles.button(context), + ), + ), ), - ), + ], ), ], ), - ], - ), - ), - ); + ), + ); + + if (mounted && result != null && result.continuePressed == true) { + final settings = result.settings; + if (settings != null && settings.setupComplete) { + // Returning user: straight to category selection. + await Navigator.of(context).pushNamed(ShopInBitStep2.routeName); + } else { + // First-time (or incomplete) setup: show the key-backup screen. + await Navigator.of(context).pushNamed(ShopInBitSetupView.routeName); + } + } } @override Widget build(BuildContext context) { - return Background( - child: Scaffold( - backgroundColor: Theme.of(context).extension()!.background, - appBar: AppBar( - leading: AppBarBackButton( - onPressed: () { - Navigator.of(context).pop(); - }, - ), - title: Text("Services", style: STextStyles.navBarTitle(context)), - ), - body: SafeArea( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.all(16), - child: RoundedWhiteContainer( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + return SafeArea( + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.all(16), + child: RoundedWhiteContainer( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( children: [ - Row( - children: [ - SvgPicture.asset( - Assets.svg.circleSliders, - width: 32, - height: 32, - ), - const SizedBox(width: 12), - Expanded( - child: Text( - "ShopinBit", - style: STextStyles.titleBold12(context), - ), - ), - GestureDetector( - onTap: () { - Navigator.of( - context, - ).pushNamed(ShopInBitSettingsView.routeName); - }, + Container( + decoration: BoxDecoration( + color: const Color(0xFFE0E3E3), + borderRadius: .circular(20), + ), + width: 40, + height: 40, + child: Center( + child: SizedBox( + width: 27, + height: 27, child: SvgPicture.asset( - Assets.svg.gear, - width: 20, - height: 20, - color: Theme.of( - context, - ).extension()!.textDark3, + Assets.svg.sib, + colorFilter: const .mode(Colors.black, .srcIn), ), ), - ], + ), ), - const SizedBox(height: 12), - Text( - "Turn your crypto into Electronics, Flights, Hotel, " - "Cars or any other legal product or service... " - "ShopinBit is a concierge shopping service that helps " - "you 'live the good life with crypto'...", - style: STextStyles.itemSubtitle12(context).copyWith( - color: Theme.of( - context, - ).extension()!.textSubtitle1, + const SizedBox(width: 12), + Expanded( + child: Text( + "ShopinBit", + style: STextStyles.titleBold12(context), ), ), - const SizedBox(height: 12), - RichText( - text: TextSpan( - style: STextStyles.itemSubtitle12(context).copyWith( - color: Theme.of( - context, - ).extension()!.textSubtitle1, - ), - children: [ - const TextSpan( - text: - "Minimum order value of 1,000 EUR. " - "A 10% service fee applies to all orders.\n\n" - "By using ShopinBit, you agree to their ", - ), - TextSpan( - text: "Terms & Conditions", - style: STextStyles.richLink( - context, - ).copyWith(fontSize: 14), - recognizer: TapGestureRecognizer() - ..onTap = () async { - const url = - "https://api.shopinbit.com/static/policy/terms.html"; + ], + ), + const SizedBox(height: 24), + Text( + "Turn your crypto into Electronics, Flights, Hotel, " + "Cars or any other legal product or service... " + "ShopinBit is a concierge shopping service that helps " + "you 'live the good life with crypto'...", + style: STextStyles.itemSubtitle12(context).copyWith( + color: Theme.of( + context, + ).extension()!.textSubtitle1, + ), + ), + const SizedBox(height: 12), + RichText( + text: TextSpan( + style: STextStyles.itemSubtitle12(context).copyWith( + color: Theme.of( + context, + ).extension()!.textSubtitle1, + ), + children: [ + const TextSpan( + text: + "Minimum order value of 1,000 EUR. " + "A 10% service fee applies to all orders.\n\n" + "By using ShopinBit, you agree to their ", + ), + TextSpan( + text: "Terms & Conditions", + style: STextStyles.richLink( + context, + ).copyWith(fontSize: 14), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = + "https://api.shopinbit.com/static/policy/terms.html"; - await showRequestExternalLinkAndMaybeLaunch( - context, - uri: Uri.parse(url), - ); - }, - ), - const TextSpan(text: " and "), - TextSpan( - text: "Privacy Policy", - style: STextStyles.richLink( + await showRequestExternalLinkAndMaybeLaunch( context, - ).copyWith(fontSize: 14), - recognizer: TapGestureRecognizer() - ..onTap = () async { - const url = - "https://api.shopinbit.com/static/policy/privacy.html"; - - await showRequestExternalLinkAndMaybeLaunch( - context, - uri: Uri.parse(url), - ); - }, - ), - const TextSpan(text: "."), - ], + uri: Uri.parse(url), + ); + }, ), - ), - const SizedBox(height: 16), - PrimaryButton( - label: "Shop with ShopinBit", - enabled: true, - onPressed: _showShopDialog, - ), - const SizedBox(height: 12), - SecondaryButton( - label: "My requests", - onPressed: () async { - await Navigator.of( + const TextSpan(text: " and "), + TextSpan( + text: "Privacy Policy", + style: STextStyles.richLink( context, - ).pushNamed(ShopInBitTicketsView.routeName); - if (mounted) setState(() {}); - }, - ), - ], + ).copyWith(fontSize: 14), + recognizer: TapGestureRecognizer() + ..onTap = () async { + const url = + "https://api.shopinbit.com/static/policy/privacy.html"; + + await showRequestExternalLinkAndMaybeLaunch( + context, + uri: Uri.parse(url), + ); + }, + ), + const TextSpan(text: "."), + ], + ), + ), + const SizedBox(height: 24), + PrimaryButton( + label: "Shop with ShopinBit", + enabled: true, + onPressed: _showShopDialog, ), - ), + const SizedBox(height: 12), + SecondaryButton( + label: "My requests", + onPressed: () async { + await Navigator.of( + context, + ).pushNamed(ShopInBitTicketsView.routeName); + }, + ), + ], ), ), ), diff --git a/lib/pages/settings_views/global_settings_view/global_settings_view.dart b/lib/pages/settings_views/global_settings_view/global_settings_view.dart index 729709f819..754c3c2e29 100644 --- a/lib/pages/settings_views/global_settings_view/global_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/global_settings_view.dart @@ -11,13 +11,12 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../app_config.dart'; -import '../../../providers/providers.dart'; import '../../../route_generator.dart'; import '../../../themes/stack_colors.dart'; import '../../../utilities/assets.dart'; +import '../../../utilities/constants.dart'; import '../../../utilities/text_styles.dart'; import '../../../widgets/background.dart'; import '../../../widgets/custom_buttons/app_bar_icon_button.dart'; @@ -247,36 +246,24 @@ class GlobalSettingsView extends StatelessWidget { ); }, ), - if (AppConfig.hasFeature( - AppFeature.shopinBit, - )) - Consumer( - builder: (_, ref, __) { - final familiarity = ref.watch( - prefsChangeNotifierProvider.select( - (v) => v.familiarity, - ), - ); - if (familiarity < 6) { - return const SizedBox.shrink(); - } - return Column( - children: [ - const SizedBox(height: 8), - SettingsListButton( - iconAssetName: Assets.svg.key, - iconSize: 16, - title: "ShopinBit", - onPressed: () { - Navigator.of(context).pushNamed( - ShopInBitSettingsView - .routeName, - ); - }, - ), - ], - ); - }, + if (Constants.enableExchange && + AppConfig.hasFeature( + AppFeature.shopinBit, + )) + Column( + children: [ + const SizedBox(height: 8), + SettingsListButton( + iconAssetName: Assets.svg.key, + iconSize: 16, + title: "ShopinBit", + onPressed: () { + Navigator.of(context).pushNamed( + ShopInBitSettingsView.routeName, + ); + }, + ), + ], ), const SizedBox(height: 8), SettingsListButton( diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart index 675765340f..cb4ec42a6a 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart @@ -148,10 +148,11 @@ abstract class SWB { static bool _checkShouldCancel( PreRestoreState? revertToState, SecureStorageInterface secureStorageInterface, + ShopInBitService shopinbitService, ) { if (_shouldCancelRestore) { if (revertToState != null) { - _revert(revertToState, secureStorageInterface); + _revert(revertToState, secureStorageInterface, shopinbitService); } else { _cancelCompleter!.complete(); _shouldCancelRestore = false; @@ -245,21 +246,15 @@ abstract class SWB { Logging.instance.i("SWB backing up shopin bit info"); final sharedDB = SharedDrift.get(); - final shopinBitSettings = await sharedDB.shopinBitSettings.select().get(); - final shopinBitCustomerKey = - await (ShopInBitService()..ensureInitialized(_secureStore)) - .loadCustomerKey(); - final shopinBitOrders = await sharedDB.shopInBitTickets.select().get(); + final shopinBitCustomerKeys = + await (sharedDB.select(sharedDB.shopInBitSettings) + ..orderBy([(t) => OrderingTerm.desc(t.lastUsedAt)])) + .map((row) => row.customerKey) + .get(); backupJson["shopinBit"] = { - if (shopinBitCustomerKey != null) - "shopinBitCustomerKey": shopinBitCustomerKey, - if (shopinBitSettings.isNotEmpty) - "shopinBitSettings": shopinBitSettings.first.toJson(), - if (shopinBitOrders.isNotEmpty) - "shopinBitOrders": shopinBitOrders - .map((e) => e.toJson()) - .toList(growable: false), + if (shopinBitCustomerKeys.isNotEmpty) + "shopinBitCustomerKeys": shopinBitCustomerKeys, }; Logging.instance.d("SWB backing up prefs"); @@ -620,6 +615,7 @@ abstract class SWB { StackRestoringUIState? uiState, Map oldToNewWalletIdMap, SecureStorageInterface secureStorageInterface, + ShopInBitService shopinbitService, ) async { final Map prefs = validJSON["prefs"] as Map; @@ -636,7 +632,7 @@ abstract class SWB { uiState?.preferences = StackRestoringStatus.restoring; Logging.instance.d("SWB restoring cakepay order ids and shop in bit info"); - await _restoreCakepayAndShopinBitInfo(validJSON, secureStorageInterface); + await _restoreCakepayAndShopinBitInfo(validJSON, shopinbitService); Logging.instance.d("SWB restoring prefs"); await _restorePrefs(prefs); @@ -702,6 +698,7 @@ abstract class SWB { String jsonBackup, StackRestoringUIState? uiState, SecureStorageInterface secureStorageInterface, + ShopInBitService shopinbitService, ) async { if (!Platform.isLinux) await WakelockPlus.enable(); @@ -741,7 +738,7 @@ abstract class SWB { // basic cancel check here // no reverting required yet as nothing has been written to store - if (_checkShouldCancel(null, secureStorageInterface)) { + if (_checkShouldCancel(null, secureStorageInterface, shopinbitService)) { return false; } @@ -750,10 +747,15 @@ abstract class SWB { uiState, oldToNewWalletIdMap, secureStorageInterface, + shopinbitService, ); // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } @@ -770,7 +772,11 @@ abstract class SWB { for (final walletbackup in wallets) { // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } @@ -826,13 +832,21 @@ abstract class SWB { // final failovers = nodeService.failoverNodesFor(coin: coin); // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } managers.add(Tuple2(walletbackup, info)); // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } @@ -845,7 +859,11 @@ abstract class SWB { } // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } @@ -856,7 +874,11 @@ abstract class SWB { // start restoring wallets for (final tuple in managers) { // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } final bools = await _asyncRestore( @@ -870,13 +892,21 @@ abstract class SWB { } // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } for (final Future status in restoreStatuses) { // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } await status; @@ -884,7 +914,11 @@ abstract class SWB { if (!Platform.isLinux) await WakelockPlus.disable(); // check if cancel was requested and restore previous state - if (_checkShouldCancel(preRestoreState, secureStorageInterface)) { + if (_checkShouldCancel( + preRestoreState, + secureStorageInterface, + shopinbitService, + )) { return false; } @@ -902,6 +936,7 @@ abstract class SWB { static Future _revert( PreRestoreState revertToState, SecureStorageInterface secureStorageInterface, + ShopInBitService shopinbitService, ) async { final Map prefs = revertToState.validJSON["prefs"] as Map; @@ -918,7 +953,7 @@ abstract class SWB { // cakepay and shopinbit await _restoreCakepayAndShopinBitInfo( revertToState.validJSON, - secureStorageInterface, + shopinbitService, ); // prefs @@ -1122,7 +1157,7 @@ abstract class SWB { static Future _restoreCakepayAndShopinBitInfo( Map backupJson, - SecureStorageInterface _secureStore, + ShopInBitService shopinbitService, ) async { final cakepayOrderIds = (backupJson["cakepayOrderIds"] as List? ?? []) .cast(); @@ -1130,53 +1165,16 @@ abstract class SWB { await CakePayService.instance.addOrderId(orderId); } - final sharedDB = SharedDrift.get(); final json = backupJson["shopinBit"] as Map? ?? {}; if (json.isEmpty) return; - final shopinBitCustomerKey = json["shopinBitCustomerKey"] as String?; - if (shopinBitCustomerKey != null) { - final currentKey = - await (ShopInBitService()..ensureInitialized(_secureStore)) - .loadCustomerKey(); - - if (currentKey != null && currentKey != shopinBitCustomerKey) { - // TODO come back to this at some point - // for now - Logging.instance.w( - "SWB restore found mismatching shopinbit customer keys. " - "Ignoring the backup data in favor of the current data.", - ); - return; + final shopinBitCustomerKeys = json["shopinBitCustomerKeys"] as List?; + if (shopinBitCustomerKeys != null && shopinBitCustomerKeys.isNotEmpty) { + for (final key in shopinBitCustomerKeys.cast()) { + await shopinbitService.recoverCustomerKey(key); } } - - final shopinBitSettings = json["shopinBitSettings"] as Map?; - if (shopinBitSettings != null) { - final settings = ShopinBitSetting.fromJson(shopinBitSettings.cast()); - - await sharedDB.transaction(() async { - await sharedDB - .into(sharedDB.shopinBitSettings) - .insertOnConflictUpdate(settings.toCompanion(true)); - }); - } - - final shopinBitOrders = json["shopinBitOrders"] as List?; - if (shopinBitOrders != null) { - final orders = shopinBitOrders - .map((e) => ShopInBitTicket.fromJson((e as Map).cast())) - .map((e) => e.toCompanion(true)); - - await sharedDB.transaction(() async { - for (final order in orders) { - await sharedDB - .into(sharedDB.shopInBitTickets) - .insertOnConflictUpdate(order); - } - }); - } } static Future _restorePrefs(Map prefs) async { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart index 7b71dc8c64..2062ef3f9b 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart @@ -19,6 +19,7 @@ import '../../../../../pages_desktop_specific/desktop_home_view.dart'; import '../../../../../pages_desktop_specific/desktop_menu.dart'; import '../../../../../providers/desktop/current_desktop_menu_item.dart'; import '../../../../../providers/global/secure_store_provider.dart'; +import '../../../../../providers/global/shopin_bit_service_provider.dart'; import '../../../../../providers/providers.dart'; import '../../../../../providers/stack_restore/stack_restoring_ui_state_provider.dart'; import '../../../../../themes/stack_colors.dart'; @@ -69,34 +70,32 @@ class _StackRestoreProgressViewState showDialog( barrierDismissible: false, context: context, - builder: - (_) => WillPopScope( - onWillPop: () async { - return shouldPop; - }, - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Material( - color: Colors.transparent, - child: Center( - child: Text( - "Cancelling restore. Please wait.", - style: STextStyles.pageTitleH2(context).copyWith( - color: - Theme.of( - context, - ).extension()!.textWhite, - ), - ), + builder: (_) => WillPopScope( + onWillPop: () async { + return shouldPop; + }, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Material( + color: Colors.transparent, + child: Center( + child: Text( + "Cancelling restore. Please wait.", + style: STextStyles.pageTitleH2(context).copyWith( + color: Theme.of( + context, + ).extension()!.textWhite, ), ), - const SizedBox(height: 64), - const Center(child: LoadingIndicator(width: 100)), - ], + ), ), - ), + const SizedBox(height: 64), + const Center(child: LoadingIndicator(width: 100)), + ], + ), + ), ), ); @@ -108,12 +107,12 @@ class _StackRestoreProgressViewState if (mounted) { !isDesktop ? Navigator.of(context).popUntil( - ModalRoute.withName( - widget.fromFile - ? RestoreFromEncryptedStringView.routeName - : StackBackupView.routeName, - ), - ) + ModalRoute.withName( + widget.fromFile + ? RestoreFromEncryptedStringView.routeName + : StackBackupView.routeName, + ), + ) : Navigator.of(context).popUntil((_) => count++ >= 2); } } @@ -164,6 +163,7 @@ class _StackRestoreProgressViewState widget.jsonString, uiState, ref.read(secureStoreProvider), + ref.read(pShopinBitService), ); } catch (e, s) { Logging.instance.w("$e\n$s", error: e, stackTrace: s); @@ -199,8 +199,9 @@ class _StackRestoreProgressViewState case StackRestoringStatus.waiting: return SvgPicture.asset( Assets.svg.loader, - color: - Theme.of(context).extension()!.buttonBackSecondary, + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, ); case StackRestoringStatus.restoring: return SvgPicture.asset( @@ -248,8 +249,9 @@ class _StackRestoreProgressViewState return WillPopScope( onWillPop: _onWillPop, child: Scaffold( - backgroundColor: - Theme.of(context).extension()!.background, + backgroundColor: Theme.of( + context, + ).extension()!.background, appBar: AppBar( leading: AppBarBackButton( onPressed: () async { @@ -302,69 +304,22 @@ class _StackRestoreProgressViewState ); return !isDesktop ? RestoringItemCard( - left: SizedBox( - width: 32, - height: 32, - child: RoundedContainer( - padding: const EdgeInsets.all(0), - color: - Theme.of( - context, - ).extension()!.buttonBackSecondary, - child: Center( - child: SvgPicture.asset( - Assets.svg.gear, - width: 16, - height: 16, - color: - Theme.of( - context, - ).extension()!.accentColorDark, - ), - ), - ), - ), - right: SizedBox( - width: 20, - height: 20, - child: _getIconForState(state), - ), - title: "Preferences", - subTitle: - state == StackRestoringStatus.failed - ? Text( - "Something went wrong", - style: STextStyles.errorSmall(context), - ) - : null, - ) - : RoundedContainer( - padding: EdgeInsets.zero, - color: - Theme.of(context).extension()!.popupBG, - borderColor: - Theme.of( - context, - ).extension()!.background, - child: RestoringItemCard( left: SizedBox( width: 32, height: 32, child: RoundedContainer( padding: const EdgeInsets.all(0), - color: - Theme.of(context) - .extension()! - .buttonBackSecondary, + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, child: Center( child: SvgPicture.asset( Assets.svg.gear, width: 16, height: 16, - color: - Theme.of(context) - .extension()! - .accentColorDark, + color: Theme.of( + context, + ).extension()!.accentColorDark, ), ), ), @@ -375,15 +330,56 @@ class _StackRestoreProgressViewState child: _getIconForState(state), ), title: "Preferences", - subTitle: - state == StackRestoringStatus.failed - ? Text( + subTitle: state == StackRestoringStatus.failed + ? Text( + "Something went wrong", + style: STextStyles.errorSmall(context), + ) + : null, + ) + : RoundedContainer( + padding: EdgeInsets.zero, + color: Theme.of( + context, + ).extension()!.popupBG, + borderColor: Theme.of( + context, + ).extension()!.background, + child: RestoringItemCard( + left: SizedBox( + width: 32, + height: 32, + child: RoundedContainer( + padding: const EdgeInsets.all(0), + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, + child: Center( + child: SvgPicture.asset( + Assets.svg.gear, + width: 16, + height: 16, + color: Theme.of( + context, + ).extension()!.accentColorDark, + ), + ), + ), + ), + right: SizedBox( + width: 20, + height: 20, + child: _getIconForState(state), + ), + title: "Preferences", + subTitle: state == StackRestoringStatus.failed + ? Text( "Something went wrong", style: STextStyles.errorSmall(context), ) - : null, - ), - ); + : null, + ), + ); }, ), const SizedBox(height: 12), @@ -396,67 +392,21 @@ class _StackRestoreProgressViewState ); return !isDesktop ? RestoringItemCard( - left: SizedBox( - width: 32, - height: 32, - child: RoundedContainer( - padding: const EdgeInsets.all(0), - color: - Theme.of( - context, - ).extension()!.buttonBackSecondary, - child: Center( - child: AddressBookIcon( - width: 16, - height: 16, - color: - Theme.of( - context, - ).extension()!.accentColorDark, - ), - ), - ), - ), - right: SizedBox( - width: 20, - height: 20, - child: _getIconForState(state), - ), - title: "Address book", - subTitle: - state == StackRestoringStatus.failed - ? Text( - "Something went wrong", - style: STextStyles.errorSmall(context), - ) - : null, - ) - : RoundedContainer( - padding: EdgeInsets.zero, - color: - Theme.of(context).extension()!.popupBG, - borderColor: - Theme.of( - context, - ).extension()!.background, - child: RestoringItemCard( left: SizedBox( width: 32, height: 32, child: RoundedContainer( padding: const EdgeInsets.all(0), - color: - Theme.of(context) - .extension()! - .buttonBackSecondary, + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, child: Center( child: AddressBookIcon( width: 16, height: 16, - color: - Theme.of(context) - .extension()! - .accentColorDark, + color: Theme.of( + context, + ).extension()!.accentColorDark, ), ), ), @@ -467,15 +417,55 @@ class _StackRestoreProgressViewState child: _getIconForState(state), ), title: "Address book", - subTitle: - state == StackRestoringStatus.failed - ? Text( + subTitle: state == StackRestoringStatus.failed + ? Text( + "Something went wrong", + style: STextStyles.errorSmall(context), + ) + : null, + ) + : RoundedContainer( + padding: EdgeInsets.zero, + color: Theme.of( + context, + ).extension()!.popupBG, + borderColor: Theme.of( + context, + ).extension()!.background, + child: RestoringItemCard( + left: SizedBox( + width: 32, + height: 32, + child: RoundedContainer( + padding: const EdgeInsets.all(0), + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, + child: Center( + child: AddressBookIcon( + width: 16, + height: 16, + color: Theme.of( + context, + ).extension()!.accentColorDark, + ), + ), + ), + ), + right: SizedBox( + width: 20, + height: 20, + child: _getIconForState(state), + ), + title: "Address book", + subTitle: state == StackRestoringStatus.failed + ? Text( "Something went wrong", style: STextStyles.errorSmall(context), ) - : null, - ), - ); + : null, + ), + ); }, ), const SizedBox(height: 12), @@ -488,69 +478,22 @@ class _StackRestoreProgressViewState ); return !isDesktop ? RestoringItemCard( - left: SizedBox( - width: 32, - height: 32, - child: RoundedContainer( - padding: const EdgeInsets.all(0), - color: - Theme.of( - context, - ).extension()!.buttonBackSecondary, - child: Center( - child: SvgPicture.asset( - Assets.svg.node, - width: 16, - height: 16, - color: - Theme.of( - context, - ).extension()!.accentColorDark, - ), - ), - ), - ), - right: SizedBox( - width: 20, - height: 20, - child: _getIconForState(state), - ), - title: "Nodes", - subTitle: - state == StackRestoringStatus.failed - ? Text( - "Something went wrong", - style: STextStyles.errorSmall(context), - ) - : null, - ) - : RoundedContainer( - padding: EdgeInsets.zero, - color: - Theme.of(context).extension()!.popupBG, - borderColor: - Theme.of( - context, - ).extension()!.background, - child: RestoringItemCard( left: SizedBox( width: 32, height: 32, child: RoundedContainer( padding: const EdgeInsets.all(0), - color: - Theme.of(context) - .extension()! - .buttonBackSecondary, + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, child: Center( child: SvgPicture.asset( Assets.svg.node, width: 16, height: 16, - color: - Theme.of(context) - .extension()! - .accentColorDark, + color: Theme.of( + context, + ).extension()!.accentColorDark, ), ), ), @@ -561,15 +504,56 @@ class _StackRestoreProgressViewState child: _getIconForState(state), ), title: "Nodes", - subTitle: - state == StackRestoringStatus.failed - ? Text( + subTitle: state == StackRestoringStatus.failed + ? Text( + "Something went wrong", + style: STextStyles.errorSmall(context), + ) + : null, + ) + : RoundedContainer( + padding: EdgeInsets.zero, + color: Theme.of( + context, + ).extension()!.popupBG, + borderColor: Theme.of( + context, + ).extension()!.background, + child: RestoringItemCard( + left: SizedBox( + width: 32, + height: 32, + child: RoundedContainer( + padding: const EdgeInsets.all(0), + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, + child: Center( + child: SvgPicture.asset( + Assets.svg.node, + width: 16, + height: 16, + color: Theme.of( + context, + ).extension()!.accentColorDark, + ), + ), + ), + ), + right: SizedBox( + width: 20, + height: 20, + child: _getIconForState(state), + ), + title: "Nodes", + subTitle: state == StackRestoringStatus.failed + ? Text( "Something went wrong", style: STextStyles.errorSmall(context), ) - : null, - ), - ); + : null, + ), + ); }, ), const SizedBox(height: 12), @@ -582,69 +566,22 @@ class _StackRestoreProgressViewState ); return !isDesktop ? RestoringItemCard( - left: SizedBox( - width: 32, - height: 32, - child: RoundedContainer( - padding: const EdgeInsets.all(0), - color: - Theme.of( - context, - ).extension()!.buttonBackSecondary, - child: Center( - child: SvgPicture.asset( - Assets.svg.arrowsTwoWay, - width: 16, - height: 16, - color: - Theme.of( - context, - ).extension()!.accentColorDark, - ), - ), - ), - ), - right: SizedBox( - width: 20, - height: 20, - child: _getIconForState(state), - ), - title: "Exchange history", - subTitle: - state == StackRestoringStatus.failed - ? Text( - "Something went wrong", - style: STextStyles.errorSmall(context), - ) - : null, - ) - : RoundedContainer( - padding: EdgeInsets.zero, - color: - Theme.of(context).extension()!.popupBG, - borderColor: - Theme.of( - context, - ).extension()!.background, - child: RestoringItemCard( left: SizedBox( width: 32, height: 32, child: RoundedContainer( padding: const EdgeInsets.all(0), - color: - Theme.of(context) - .extension()! - .buttonBackSecondary, + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, child: Center( child: SvgPicture.asset( Assets.svg.arrowsTwoWay, width: 16, height: 16, - color: - Theme.of(context) - .extension()! - .accentColorDark, + color: Theme.of( + context, + ).extension()!.accentColorDark, ), ), ), @@ -655,15 +592,56 @@ class _StackRestoreProgressViewState child: _getIconForState(state), ), title: "Exchange history", - subTitle: - state == StackRestoringStatus.failed - ? Text( + subTitle: state == StackRestoringStatus.failed + ? Text( + "Something went wrong", + style: STextStyles.errorSmall(context), + ) + : null, + ) + : RoundedContainer( + padding: EdgeInsets.zero, + color: Theme.of( + context, + ).extension()!.popupBG, + borderColor: Theme.of( + context, + ).extension()!.background, + child: RestoringItemCard( + left: SizedBox( + width: 32, + height: 32, + child: RoundedContainer( + padding: const EdgeInsets.all(0), + color: Theme.of( + context, + ).extension()!.buttonBackSecondary, + child: Center( + child: SvgPicture.asset( + Assets.svg.arrowsTwoWay, + width: 16, + height: 16, + color: Theme.of( + context, + ).extension()!.accentColorDark, + ), + ), + ), + ), + right: SizedBox( + width: 20, + height: 20, + child: _getIconForState(state), + ), + title: "Exchange history", + subTitle: state == StackRestoringStatus.failed + ? Text( "Something went wrong", style: STextStyles.errorSmall(context), ) - : null, - ), - ); + : null, + ), + ); }, ), const SizedBox(height: 16), @@ -685,55 +663,54 @@ class _StackRestoreProgressViewState const SizedBox(height: 30), SizedBox( width: MediaQuery.of(context).size.width - 32, - child: - !isDesktop - ? TextButton( - onPressed: () async { - if (_success) { - if (widget.shouldPushToHome) { - Navigator.of(context).popUntil( - ModalRoute.withName(HomeView.routeName), - ); - } else { - Navigator.of(context).pop(); - } + child: !isDesktop + ? TextButton( + onPressed: () async { + if (_success) { + if (widget.shouldPushToHome) { + Navigator.of(context).popUntil( + ModalRoute.withName(HomeView.routeName), + ); } else { - if (await _requestCancel()) { - await _cancel(); - } + Navigator.of(context).pop(); } - }, - style: Theme.of(context) - .extension()! - .getPrimaryEnabledButtonStyle(context), - child: Text( - _success ? "OK" : "Cancel restore process", - style: STextStyles.button(context).copyWith( - color: - Theme.of( - context, - ).extension()!.buttonTextPrimary, - ), + } else { + if (await _requestCancel()) { + await _cancel(); + } + } + }, + style: Theme.of(context) + .extension()! + .getPrimaryEnabledButtonStyle(context), + child: Text( + _success ? "OK" : "Cancel restore process", + style: STextStyles.button(context).copyWith( + color: Theme.of( + context, + ).extension()!.buttonTextPrimary, ), - ) - : Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - _success - ? PrimaryButton( + ), + ) + : Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + _success + ? PrimaryButton( width: 248, buttonHeight: ButtonHeight.l, enabled: true, label: "Done", onPressed: () async { - final DesktopMenuItemId keyID = - DesktopMenuItemId.myStack; + const DesktopMenuItemId keyID = .myStack; ref - .read( - currentDesktopMenuItemProvider.state, - ) - .state = keyID; + .read( + currentDesktopMenuItemProvider + .state, + ) + .state = + keyID; if (widget.shouldPushToHome) { unawaited( @@ -756,7 +733,7 @@ class _StackRestoreProgressViewState } }, ) - : SecondaryButton( + : SecondaryButton( width: 248, buttonHeight: ButtonHeight.l, enabled: true, @@ -767,8 +744,8 @@ class _StackRestoreProgressViewState } }, ), - ], - ), + ], + ), ), ], ), diff --git a/lib/pages/shopinbit/shopinbit_car_fee_view.dart b/lib/pages/shopinbit/shopinbit_car_fee_view.dart index 8186a66585..044c862326 100644 --- a/lib/pages/shopinbit/shopinbit_car_fee_view.dart +++ b/lib/pages/shopinbit/shopinbit_car_fee_view.dart @@ -1,20 +1,14 @@ import 'dart:async'; -import 'dart:convert'; -import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_svg/svg.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; -import '../../notifications/show_flush_bar.dart'; -import '../../providers/db/drift_provider.dart'; +import '../../models/shopinbit/shopinbit_request_draft.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; +import '../../services/shopinbit/shopinbit_service.dart'; import '../../services/shopinbit/src/models/address.dart'; import '../../services/shopinbit/src/models/car_research.dart'; import '../../themes/stack_colors.dart'; -import '../../utilities/assets.dart'; -import '../../utilities/constants.dart'; import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; @@ -22,20 +16,22 @@ import '../../widgets/background.dart'; import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; +import '../../widgets/detail_item.dart'; import '../../widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog.dart'; import '../../widgets/dialogs/s_dialog.dart'; import '../../widgets/rounded_white_container.dart'; +import '../../widgets/stack_dialog.dart'; import '../../widgets/textfields/adaptive_text_field.dart'; -import '../more_view/services_view.dart'; +import '../home_view/home_view.dart'; import 'shopinbit_car_research_payment_view.dart'; import 'shopinbit_step_2.dart'; class ShopInBitCarFeeView extends ConsumerStatefulWidget { - const ShopInBitCarFeeView({super.key, required this.model}); + const ShopInBitCarFeeView({super.key, required this.draft}); static const String routeName = "/shopInBitCarFee"; - final ShopInBitOrderModel model; + final ShopinbitRequestDraft draft; @override ConsumerState createState() => @@ -43,123 +39,51 @@ class ShopInBitCarFeeView extends ConsumerStatefulWidget { } class _ShopInBitCarFeeViewState extends ConsumerState { - late final TextEditingController _nameController; - late final TextEditingController _streetController; - late final TextEditingController _cityController; - late final TextEditingController _postalCodeController; - late final FocusNode _nameFocusNode; - late final FocusNode _streetFocusNode; - late final FocusNode _cityFocusNode; - late final FocusNode _postalCodeFocusNode; - - List> _countries = []; - String? _selectedCountryIso; - bool _loadingCountries = false; - final TextEditingController _countrySearchController = - TextEditingController(); - - // Billing address (optional, separate from delivery) - bool _differentBilling = false; - late final TextEditingController _billingNameController; + late final TextEditingController _billingFirstNameController; + late final TextEditingController _billingLastNameController; late final TextEditingController _billingStreetController; late final TextEditingController _billingCityController; late final TextEditingController _billingPostalCodeController; - late final FocusNode _billingNameFocusNode; - late final FocusNode _billingStreetFocusNode; - late final FocusNode _billingCityFocusNode; - late final FocusNode _billingPostalCodeFocusNode; - String? _selectedBillingCountryIso; - final TextEditingController _billingCountrySearchController = - TextEditingController(); String _displayedFee = "223.00 EUR"; bool _submitting = false; - bool get _canContinue { - if (_nameController.text.trim().isEmpty || - _streetController.text.trim().isEmpty || - _cityController.text.trim().isEmpty || - _postalCodeController.text.trim().isEmpty || - _selectedCountryIso == null) { - return false; - } - if (_differentBilling) { - if (_billingNameController.text.trim().isEmpty || - _billingStreetController.text.trim().isEmpty || - _billingCityController.text.trim().isEmpty || - _billingPostalCodeController.text.trim().isEmpty || - _selectedBillingCountryIso == null) { - return false; - } + bool _canContinue = false; + + void _validate() { + final valid = + _billingFirstNameController.text.trim().isNotEmpty && + _billingLastNameController.text.trim().isNotEmpty && + _billingStreetController.text.trim().isNotEmpty && + _billingCityController.text.trim().isNotEmpty && + _billingPostalCodeController.text.trim().isNotEmpty && + widget.draft.deliveryCountryCode.isNotEmpty; + + if (_canContinue != valid && mounted) { + setState(() { + _canContinue = valid; + }); } - return true; } @override void initState() { super.initState(); - _nameController = TextEditingController(text: widget.model.shippingName); - _streetController = TextEditingController( - text: widget.model.shippingStreet, - ); - _cityController = TextEditingController(text: widget.model.shippingCity); - _postalCodeController = TextEditingController( - text: widget.model.shippingPostalCode, - ); - _nameFocusNode = FocusNode(); - _streetFocusNode = FocusNode(); - _cityFocusNode = FocusNode(); - _postalCodeFocusNode = FocusNode(); - _billingNameController = TextEditingController(); + + _billingFirstNameController = TextEditingController(); + _billingLastNameController = TextEditingController(); _billingStreetController = TextEditingController(); _billingCityController = TextEditingController(); _billingPostalCodeController = TextEditingController(); - _billingNameFocusNode = FocusNode(); - _billingStreetFocusNode = FocusNode(); - _billingCityFocusNode = FocusNode(); - _billingPostalCodeFocusNode = FocusNode(); - - for (final node in [ - _nameFocusNode, - _streetFocusNode, - _cityFocusNode, - _postalCodeFocusNode, - _billingNameFocusNode, - _billingStreetFocusNode, - _billingCityFocusNode, - _billingPostalCodeFocusNode, - ]) { - node.addListener(() => setState(() {})); - } - - _fetchCountries(); - - // Pre-select country on resume if model already has a shipping country. - if (widget.model.shippingCountry.isNotEmpty) { - _selectedCountryIso = widget.model.shippingCountry; - } } @override void dispose() { - _nameController.dispose(); - _streetController.dispose(); - _cityController.dispose(); - _postalCodeController.dispose(); - _nameFocusNode.dispose(); - _streetFocusNode.dispose(); - _cityFocusNode.dispose(); - _postalCodeFocusNode.dispose(); - _billingNameController.dispose(); + _billingFirstNameController.dispose(); + _billingLastNameController.dispose(); _billingStreetController.dispose(); _billingCityController.dispose(); _billingPostalCodeController.dispose(); - _billingNameFocusNode.dispose(); - _billingStreetFocusNode.dispose(); - _billingCityFocusNode.dispose(); - _billingPostalCodeFocusNode.dispose(); - _billingCountrySearchController.dispose(); - _countrySearchController.dispose(); super.dispose(); } @@ -169,98 +93,63 @@ class _ShopInBitCarFeeViewState extends ConsumerState { if (name == ShopInBitStep2.routeName) { return true; } - if (name == ServicesView.routeName) { - return true; - } - if (route.isFirst) { + if (route.isFirst || name == HomeView.routeName) { return true; } return false; }); } - Future _fetchCountries() async { - setState(() => _loadingCountries = true); - try { - final resp = await ref.read(pShopinBitService).client.getCountries(); - if (resp.hasError || resp.value == null) return; - _countries = resp.value!; - if (_selectedCountryIso != null && - !_countries.any((c) => c['iso'] == _selectedCountryIso)) { - _selectedCountryIso = null; - } - } catch (_) { - // leave list empty; user will see no items - } finally { - if (mounted) setState(() => _loadingCountries = false); - } - } - - ({String first, String last}) _splitFullName(String raw) { - final trimmed = raw.trim(); - final idx = trimmed.lastIndexOf(' '); - if (idx >= 0) { - return ( - first: trimmed.substring(0, idx).trim(), - last: trimmed.substring(idx + 1).trim(), - ); - } - return (first: trimmed, last: ""); - } - Future _createInvoice() async { if (_submitting) return; setState(() => _submitting = true); try { - await ref.read(pShopinBitService).ensureCustomerKey(); - - // Delivery address (always provided) - final deliveryName = _splitFullName(_nameController.text); - widget.model.setShippingAddress( - name: _nameController.text.trim(), - street: _streetController.text.trim(), - city: _cityController.text.trim(), - postalCode: _postalCodeController.text.trim(), - country: _selectedCountryIso!, + final customerKey = await ref.read(pShopinBitService).ensureCustomerKey(); + + final billing = Address( + firstName: _billingFirstNameController.text.trim(), + lastName: _billingLastNameController.text.trim(), + street: _billingStreetController.text.trim(), + zip: _billingPostalCodeController.text.trim(), + city: _billingCityController.text.trim(), + country: widget.draft.deliveryCountryCode, + state: widget.draft.requiresState ? widget.draft.deliveryState! : null, ); - // Billing address: use separate billing fields if different, - // else use delivery - final Address billing; - if (_differentBilling) { - final billingName = _splitFullName(_billingNameController.text); - billing = Address( - firstName: billingName.first, - lastName: billingName.last, - street: _billingStreetController.text.trim(), - zip: _billingPostalCodeController.text.trim(), - city: _billingCityController.text.trim(), - country: _selectedBillingCountryIso!, - ); - } else { - billing = Address( - firstName: deliveryName.first, - lastName: deliveryName.last, - street: _streetController.text.trim(), - zip: _postalCodeController.text.trim(), - city: _cityController.text.trim(), - country: _selectedCountryIso!, - ); - } + // Cache the car request alongside billing so the backend failsafe can + // create the real car research ticket once the fee is paid. + final request = CarResearchRequest( + customerPseudonym: kShopInBitCustomerPseudonym, + comment: widget.draft.requestDescription, + deliveryCountry: widget.draft.deliveryCountryCode, + ); final resp = await ref .read(pShopinBitService) .client - .createCarResearchInvoice(billing: billing); + .createCarResearchInvoice( + billing: billing, + request: request, + customerKey: customerKey, + ); if (resp.hasError || resp.value == null) { + Logging.instance.e( + "Failed to create invoice", + error: resp.exception, + stackTrace: StackTrace.current, + ); + if (mounted) { setState(() => _submitting = false); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: resp.exception?.message ?? "Failed to create invoice", - context: context, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to create invoice", + maxWidth: Util.isDesktop ? 500 : null, + message: resp.exception?.message, + desktopPopRootNavigator: Util.isDesktop, ), ); } @@ -269,38 +158,32 @@ class _ShopInBitCarFeeViewState extends ConsumerState { final invoice = resp.value!; - // Persist pending state so the user can resume if they close the dialog. - // Sentinel ticketId; unique-replace index ensures at most one pending - // record. - widget.model.ticketId = "pending-car-research"; - widget.model.carResearchInvoiceId = invoice.btcpayInvoice; - widget.model.isPendingPayment = true; - widget.model.carResearchExpiresAt = invoice.expiresAt; - widget.model.carResearchPaymentLinks = jsonEncode(invoice.paymentLinks); - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(widget.model.toCompanion()); + // No local persistence: an unfinished fee is recovered server-side via + // `GET /car-research/invoices/current` (see the requests list). // Best-effort fee fetch; do not block navigation on fee parse failure. - await _loadFee(invoice); + await _loadFee(invoice, customerKey); if (!mounted) return; unawaited( Navigator.of(context).pushNamed( ShopInBitCarResearchPaymentView.routeName, - arguments: (widget.model, invoice), + arguments: (invoice: invoice, customerKey: customerKey), ), ); - } catch (e) { + } catch (e, s) { + Logging.instance.e("Create invoice failed", error: e, stackTrace: s); if (mounted) { setState(() => _submitting = false); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to create invoice", + maxWidth: Util.isDesktop ? 500 : null, message: e.toString(), - context: context, + desktopPopRootNavigator: Util.isDesktop, ), ); } @@ -320,15 +203,17 @@ class _ShopInBitCarFeeViewState extends ConsumerState { } } - Future _loadFee(CarResearchInvoice invoice) async { - // Keep status call for visibility into any future API changes surfacing - // a fee field. Today the endpoint returns only {status, additional}, so - // we source the displayed amount from the BIP21 payment URIs instead. + Future _loadFee(CarResearchInvoice invoice, String customerKey) async { + // Still hit status for logging; it has no fee field, so the amount comes + // from the BIP21 payment URIs. try { final resp = await ref .read(pShopinBitService) .client - .getCarResearchInvoiceStatus(invoice.btcpayInvoice); + .getCarResearchInvoiceStatus( + invoice.btcpayInvoice, + customerKey: customerKey, + ); if (resp.hasError || resp.value == null) { Logging.instance.i( "CarResearch status response (car_fee_view): error " @@ -368,124 +253,6 @@ class _ShopInBitCarFeeViewState extends ConsumerState { // placeholder in place rather than showing "--". } - Widget _buildCountryDropdown({ - required String? value, - required ValueChanged onChanged, - required String hint, - required TextEditingController searchController, - required bool isDesktop, - }) { - return ClipRRect( - borderRadius: BorderRadius.circular(Constants.size.circularBorderRadius), - child: DropdownButtonHideUnderline( - child: DropdownButton2( - value: value, - items: _countries - .map( - (c) => DropdownMenuItem( - value: c['iso'] as String, - child: Text( - c['label'] as String, - style: isDesktop - ? STextStyles.desktopTextExtraSmall(context).copyWith( - color: Theme.of( - context, - ).extension()!.textFieldActiveText, - ) - : STextStyles.w500_14(context), - ), - ), - ) - .toList(), - onMenuStateChange: (isOpen) { - if (!isOpen) { - searchController.clear(); - } - }, - onChanged: _loadingCountries ? null : onChanged, - hint: Text( - _loadingCountries ? "Loading countries..." : hint, - style: isDesktop - ? STextStyles.desktopTextExtraSmall(context).copyWith( - color: Theme.of( - context, - ).extension()!.textFieldDefaultSearchIconLeft, - ) - : STextStyles.fieldLabel(context), - ), - isExpanded: true, - buttonStyleData: ButtonStyleData( - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - iconStyleData: IconStyleData( - icon: Padding( - padding: const EdgeInsets.only(right: 10), - child: SvgPicture.asset( - Assets.svg.chevronDown, - width: 12, - height: 6, - colorFilter: ColorFilter.mode( - Theme.of( - context, - ).extension()!.textFieldActiveSearchIconRight, - .srcIn, - ), - ), - ), - ), - dropdownStyleData: DropdownStyleData( - offset: const Offset(0, 0), - elevation: 0, - maxHeight: 300, - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - dropdownSearchData: DropdownSearchData( - searchController: searchController, - searchInnerWidgetHeight: 48, - searchInnerWidget: TextFormField( - controller: searchController, - decoration: InputDecoration( - isDense: true, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 14, - ), - hintText: "Search...", - hintStyle: STextStyles.fieldLabel(context), - border: InputBorder.none, - ), - ), - searchMatchFn: (item, searchValue) { - final label = _countries - .where((c) => c['iso'] == item.value) - .map((c) => c['label'] as String) - .firstOrNull; - return label?.toLowerCase().contains(searchValue.toLowerCase()) ?? - false; - }, - ), - menuItemStyleData: const MenuItemStyleData( - padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - ), - ), - ), - ); - } - @override Widget build(BuildContext context) { final isDesktop = Util.isDesktop; @@ -526,164 +293,71 @@ class _ShopInBitCarFeeViewState extends ConsumerState { ), SizedBox(height: isDesktop ? 24 : 16), Text( - "Delivery address", + "Billing address", style: isDesktop ? STextStyles.desktopTextSmall(context) : STextStyles.titleBold12(context), ), SizedBox(height: isDesktop ? 16 : 12), AdaptiveTextField( - controller: _nameController, - focusNode: _nameFocusNode, - labelText: "Full name", + controller: _billingFirstNameController, + labelText: "First name", + autocorrect: false, + enableSuggestions: false, + onChangedComprehensive: (_) => _validate(), + ), + spacing, + AdaptiveTextField( + controller: _billingLastNameController, + labelText: "Last name", autocorrect: false, enableSuggestions: false, - onChanged: (_) => setState(() {}), + onChangedComprehensive: (_) => _validate(), ), spacing, AdaptiveTextField( - controller: _streetController, - focusNode: _streetFocusNode, + controller: _billingStreetController, labelText: "Street address", autocorrect: false, enableSuggestions: false, - onChanged: (_) => setState(() {}), + onChangedComprehensive: (_) => _validate(), ), spacing, Row( children: [ Expanded( child: AdaptiveTextField( - controller: _cityController, - focusNode: _cityFocusNode, + controller: _billingCityController, labelText: "City", autocorrect: false, enableSuggestions: false, - onChanged: (_) => setState(() {}), + onChangedComprehensive: (_) => _validate(), ), ), SizedBox(width: isDesktop ? 16 : 12), Expanded( child: AdaptiveTextField( - controller: _postalCodeController, - focusNode: _postalCodeFocusNode, + controller: _billingPostalCodeController, labelText: "Postal code", autocorrect: false, enableSuggestions: false, - onChanged: (_) => setState(() {}), + onChangedComprehensive: (_) => _validate(), ), ), ], ), + spacing, - _buildCountryDropdown( - value: _selectedCountryIso, - onChanged: (v) => setState(() => _selectedCountryIso = v), - hint: "Country", - searchController: _countrySearchController, - isDesktop: isDesktop, - ), - spacing, - GestureDetector( - onTap: () { - setState(() { - _differentBilling = !_differentBilling; - if (!_differentBilling) { - _billingNameController.clear(); - _billingStreetController.clear(); - _billingCityController.clear(); - _billingPostalCodeController.clear(); - _selectedBillingCountryIso = null; - } - }); - }, - child: Container( - color: Colors.transparent, - child: Row( - children: [ - SizedBox( - width: 20, - height: 20, - child: IgnorePointer( - child: Checkbox( - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - value: _differentBilling, - onChanged: (_) {}, - ), - ), - ), - const SizedBox(width: 12), - Text( - "Different billing address?", - style: isDesktop - ? STextStyles.desktopTextSmall(context) - : STextStyles.w500_14(context), - ), - ], - ), - ), + DetailItem( + title: "Country", + detail: + "${widget.draft.deliveryCountryName} " + "(${widget.draft.deliveryCountryCode})", + disableSelectableText: true, ), - if (_differentBilling) ...[ - spacing, - Text( - "Billing address", - style: isDesktop - ? STextStyles.desktopTextSmall(context) - : STextStyles.titleBold12(context), - ), - SizedBox(height: isDesktop ? 16 : 12), - AdaptiveTextField( - controller: _billingNameController, - focusNode: _billingNameFocusNode, - labelText: "Full name", - autocorrect: false, - enableSuggestions: false, - onChanged: (_) => setState(() {}), - ), - spacing, - AdaptiveTextField( - controller: _billingStreetController, - focusNode: _billingStreetFocusNode, - labelText: "Street address", - autocorrect: false, - enableSuggestions: false, - onChanged: (_) => setState(() {}), - ), - spacing, - Row( - children: [ - Expanded( - child: AdaptiveTextField( - controller: _billingCityController, - focusNode: _billingCityFocusNode, - labelText: "City", - autocorrect: false, - enableSuggestions: false, - onChanged: (_) => setState(() {}), - ), - ), - SizedBox(width: isDesktop ? 16 : 12), - Expanded( - child: AdaptiveTextField( - controller: _billingPostalCodeController, - focusNode: _billingPostalCodeFocusNode, - labelText: "Postal code", - autocorrect: false, - enableSuggestions: false, - onChanged: (_) => setState(() {}), - ), - ), - ], - ), - spacing, - _buildCountryDropdown( - value: _selectedBillingCountryIso, - onChanged: (v) => setState(() => _selectedBillingCountryIso = v), - hint: "Billing country", - searchController: _billingCountrySearchController, - isDesktop: isDesktop, - ), - ], + if (widget.draft.requiresState) spacing, + if (widget.draft.requiresState) + DetailItem(title: "State", detail: widget.draft.deliveryState!), if (!isDesktop) const Spacer(), if (isDesktop) const SizedBox(height: 24), PrimaryButton( diff --git a/lib/pages/shopinbit/shopinbit_car_research_payment_view.dart b/lib/pages/shopinbit/shopinbit_car_research_payment_view.dart index 0d3d3a14a8..8846e6aea8 100644 --- a/lib/pages/shopinbit/shopinbit_car_research_payment_view.dart +++ b/lib/pages/shopinbit/shopinbit_car_research_payment_view.dart @@ -1,60 +1,48 @@ import 'dart:async'; -import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../app_config.dart'; -import '../../models/isar/models/ethereum/eth_contract.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../db/drift/shared_db/shared_database.dart'; import '../../notifications/show_flush_bar.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; import '../../providers/providers.dart'; -import '../../route_generator.dart'; +import '../../services/shopinbit/src/client.dart'; import '../../services/shopinbit/src/models/car_research.dart'; import '../../themes/stack_colors.dart'; -import '../../utilities/address_utils.dart'; -import '../../utilities/amount/amount.dart'; import '../../utilities/assets.dart'; import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; -import '../../wallets/crypto_currency/crypto_currency.dart'; -import '../../widgets/background.dart'; -import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; import '../../widgets/desktop/secondary_button.dart'; import '../../widgets/dialogs/s_dialog.dart'; +import '../../widgets/icon_widgets/copy_icon.dart'; import '../../widgets/qr.dart'; +import '../../widgets/rounded_container.dart'; import '../../widgets/rounded_white_container.dart'; import '../../widgets/stack_dialog.dart'; -import '../more_view/services_view.dart'; +import '../home_view/home_view.dart'; import 'shopinbit_order_created.dart'; -import 'shopinbit_send_from_view.dart'; +import 'shopinbit_payment_shared.dart'; import 'shopinbit_tickets_view.dart'; -enum _PaymentFlowState { - idle, - polling, - loggingPayment, - creatingRequest, - complete, - error, -} +enum _PaymentFlowState { idle, polling, finalizing, complete } class ShopInBitCarResearchPaymentView extends ConsumerStatefulWidget { const ShopInBitCarResearchPaymentView({ super.key, - required this.model, required this.invoice, + required this.customerKey, }); static const String routeName = "/shopInBitCarResearchPayment"; - final ShopInBitOrderModel model; final CarResearchInvoice invoice; + final String customerKey; @override ConsumerState createState() => @@ -62,25 +50,21 @@ class ShopInBitCarResearchPaymentView extends ConsumerStatefulWidget { } class _ShopInBitCarResearchPaymentViewState - extends ConsumerState { - static const Set _terminalStates = { - // concierge heritage - "paid", - "paid_over", - "paid_late", - "payment_processing", - // BTCPay / car research likely - "settled", - "confirmed", - "complete", - "completed", - "finalized", - }; - + extends ConsumerState + with WidgetsBindingObserver { Timer? _pollTimer; - Map? _status; + + static const Duration _kBasePollInterval = Duration(seconds: 15); + static const Duration _kMaxPollInterval = Duration(seconds: 120); + Duration _pollInterval = _kBasePollInterval; + + CarResearchInvoiceStatus? _status; _PaymentFlowState _flowState = _PaymentFlowState.idle; String _statusString = "ready_to_pay"; + String? _additional; + bool _finalized = false; + // The real car ticket id (the customer chat) from the finalized status. + int? _realTicketId; List _methods = []; List _addresses = []; int _selectedMethod = 0; @@ -88,91 +72,39 @@ class _ShopInBitCarResearchPaymentViewState String get _currentAddress => _selectedMethod < _addresses.length ? _addresses[_selectedMethod] : ""; - bool get _isTerminal { - final s = _statusString.toLowerCase().trim(); - return _terminalStates.contains(s); - } + // Trust the `finalized` flag; fall back to the status/additional heuristic. + bool get _isTerminal => + _finalized || carResearchIsFinalized(_statusString, _additional); bool get _payNowEnabled => !_isTerminal && _flowState == _PaymentFlowState.idle; - void _confirmPayment() { + Future _confirmPayment() async { // Keep polling while the user is in the send flow. final method = _methods[_selectedMethod]; final ticker = method.toUpperCase(); - final coin = AppConfig.getCryptoCurrencyForTicker(ticker); - - String address = ""; - Amount? amount; - EthContract? tokenContract; - - if (_currentAddress.isNotEmpty) { - final parsed = AddressUtils.parsePaymentUri(_currentAddress); - - if (parsed?.address != null && parsed!.address.isNotEmpty) { - address = parsed.address; - } else { - final raw = _currentAddress; - final colonIdx = raw.indexOf(':'); - if (colonIdx != -1) { - final afterScheme = raw.substring(colonIdx + 1); - final qIdx = afterScheme.indexOf('?'); - address = qIdx != -1 ? afterScheme.substring(0, qIdx) : afterScheme; - } else { - address = raw; - } - } - - String? amountStr = parsed?.amount; - if (amountStr == null || amountStr.isEmpty) { - final uri = Uri.tryParse(_currentAddress); - if (uri != null) { - amountStr = uri.queryParameters['amount']; - } - } - // Car research flow has no concierge PaymentInfo.due fallback. - - final int fractionDigits; - if (coin != null) { - fractionDigits = coin.fractionDigits; - } else if (ticker == "USDT") { - fractionDigits = 6; - } else { - fractionDigits = 8; - } - - if (amountStr != null && amountStr.isNotEmpty) { - try { - amount = Amount.fromDecimal( - Decimal.parse(amountStr), - fractionDigits: fractionDigits, - ); - } catch (_) {} - } - } + final target = parseShopInBitPaymentTarget( + paymentUri: _currentAddress, + ticker: ticker, + coin: AppConfig.getCryptoCurrencyForTicker(ticker), + ); - if (coin != null && address.isNotEmpty) { - _navigateToSendFrom(coin: coin, amount: amount, address: address); - return; - } + final navigated = await tryNavigateToShopInBitWalletSend( + ref: ref, + context: context, + ticker: ticker, + paymentUri: _currentAddress, + address: target.address, + amount: target.amount, + // The car research fee is paid before any ticket exists. + apiTicketId: 0, + // After the wallet send, pop back here so polling can continue. + routeOnSuccessName: ShopInBitCarResearchPaymentView.routeName, + ); - if (ticker == "USDT" && address.isNotEmpty) { - const usdtAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; - tokenContract = ref.read(mainDBProvider).getEthContractSync(usdtAddress); - if (tokenContract != null) { - final ethCoin = AppConfig.getCryptoCurrencyForTicker("ETH"); - if (ethCoin != null) { - _navigateToSendFrom( - coin: ethCoin, - amount: amount, - address: address, - tokenContract: tokenContract, - ); - return; - } - } - } + if (navigated) return; + if (!mounted) return; // No compatible wallet coin found: surface an info flushbar and keep // the user on this screen so they can pay externally and then use the @@ -188,53 +120,13 @@ class _ShopInBitCarResearchPaymentViewState ); } - void _navigateToSendFrom({ - required CryptoCurrency coin, - required Amount? amount, - required String address, - EthContract? tokenContract, - }) { - if (Util.isDesktop) { - // Show send-from on top of the payment dialog, not instead of it. - unawaited( - showDialog( - context: context, - builder: (_) => ShopInBitSendFromView( - coin: coin, - amount: amount, - address: address, - model: widget.model, - shouldPopRoot: true, - tokenContract: tokenContract, - ), - ), - ); - } else { - Navigator.of(context).push( - RouteGenerator.getRoute( - shouldUseMaterialRoute: RouteGenerator.useMaterialPageRoute, - builder: (_) => ShopInBitSendFromView( - coin: coin, - amount: amount, - address: address, - model: widget.model, - tokenContract: tokenContract, - // After wallet send, pop back to this view to continue polling. - routeOnSuccessName: ShopInBitCarResearchPaymentView.routeName, - ), - settings: const RouteSettings(name: ShopInBitSendFromView.routeName), - ), - ); - } - } - Future _checkForPayment() async { if (_flowState != _PaymentFlowState.idle) return; setState(() => _flowState = _PaymentFlowState.polling); try { await _pollStatus(); if (!mounted) return; - if (!_isTerminal && _flowState != _PaymentFlowState.loggingPayment) { + if (!_isTerminal && _flowState != _PaymentFlowState.finalizing) { unawaited( showFloatingFlushBar( type: FlushBarType.info, @@ -266,10 +158,9 @@ class _ShopInBitCarResearchPaymentViewState } String get _displayedFee { - // API status endpoint does not expose a fee field (confirmed: returns - // only {status, additional}). Parse the amount from the BIP21 payment - // URI for the currently-selected method, fall back to the 223.00 EUR - // business-rule value if no parse succeeds. + // The status endpoint has no fee field, so parse the amount from the + // selected method's BIP21 URI, falling back to the 223.00 EUR business + // rule. final links = widget.invoice.paymentLinks; if (_selectedMethod < _methods.length) { final methodKey = _methods[_selectedMethod]; @@ -310,45 +201,125 @@ class _ShopInBitCarResearchPaymentViewState @override void initState() { super.initState(); + WidgetsBinding.instance.addObserver(this); final links = widget.invoice.paymentLinks; _methods = links.keys.map((k) => k.toUpperCase()).toList(); _addresses = links.values.toList(); // Kick off an immediate poll then start periodic polling. unawaited(_pollStatus()); - _pollTimer = Timer.periodic( - const Duration(seconds: 15), - (_) => unawaited(_pollStatus()), - ); + _scheduleNextPoll(); } @override void dispose() { + WidgetsBinding.instance.removeObserver(this); _pollTimer?.cancel(); super.dispose(); } + @override + void didChangeAppLifecycleState(AppLifecycleState state) { + // Don't poll while backgrounded; resume fresh when we come back. + if (state == AppLifecycleState.resumed) { + if (!_isTerminal && _flowState != _PaymentFlowState.finalizing) { + _pollInterval = _kBasePollInterval; + _scheduleNextPoll(); + } + } else { + _pollTimer?.cancel(); + } + } + + void _scheduleNextPoll() { + _pollTimer?.cancel(); + _pollTimer = Timer(_pollInterval, _pollTick); + } + + /// Periodic driver: poll once, then reschedule with backoff on failure and + /// reset on success. Stops once the flow is terminal or finalizing. + Future _pollTick() async { + final bool ok = await _pollStatus(); + if (!mounted) return; + if (_isTerminal || + _flowState == _PaymentFlowState.finalizing || + _flowState == _PaymentFlowState.complete) { + return; + } + _pollInterval = ok + ? _kBasePollInterval + : ShopInBitClient.nextPollBackoff(_pollInterval, _kMaxPollInterval); + _scheduleNextPoll(); + } + void _popToTickets() { Navigator.of(context).popUntil((route) { final name = route.settings.name; if (name == ShopInBitTicketsView.routeName) { return true; } - if (name == ServicesView.routeName) { + if (route.isFirst || name == HomeView.routeName) { return true; } - if (route.isFirst) { + return false; + }); + } + + void _goToMyRequests() { + final navigator = Navigator.of(context); + bool landedOnTickets = false; + navigator.popUntil((route) { + final name = route.settings.name; + if (name == ShopInBitTicketsView.routeName) { + landedOnTickets = true; return true; } - return false; + return route.isFirst || name == HomeView.routeName; }); + if (!landedOnTickets) { + unawaited(navigator.pushNamed(ShopInBitTicketsView.routeName)); + } + } + + Future _showFinalizingFallback() async { + final goToRequests = await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackDialog( + title: "Payment received", + message: + "We're finalizing your car research request. It will appear in " + "My Requests shortly.", + width: Util.isDesktop ? 580 : null, + leftButton: SecondaryButton( + label: "Close", + buttonHeight: Util.isDesktop ? .l : null, + onPressed: () => Navigator.of(context).pop(false), + ), + rightButton: PrimaryButton( + label: "My Requests", + buttonHeight: Util.isDesktop ? .l : null, + onPressed: () => Navigator.of(context).pop(true), + ), + ), + ); + if (!mounted) return; + if (goToRequests == true) { + _goToMyRequests(); + } else { + _popToTickets(); + } } - Future _pollStatus() async { + /// Fetch invoice status once and apply it. Returns false on any failure so + /// the periodic driver can back off instead of polling at full rate. + Future _pollStatus() async { try { - final resp = await ref - .read(pShopinBitService) - .client - .getCarResearchInvoiceStatus(widget.invoice.btcpayInvoice); + final service = ref.read(pShopinBitService); + + final resp = await service.client.getCarResearchInvoiceStatus( + widget.invoice.btcpayInvoice, + customerKey: widget.customerKey, + ); if (resp.hasError || resp.value == null) { if (mounted) { unawaited( @@ -360,9 +331,63 @@ class _ShopInBitCarResearchPaymentViewState ), ); } - return; + return false; } - if (!mounted) return; + + final apiTicketId = resp.value!.realTicketId; + if (apiTicketId != null) { + // we may not have the ticket in the db yet. Lets check + final ticket = await service.db.shopInBitTicketsDao.getByApiId( + apiTicketId, + ); + + // not found, so lets fix that + if (ticket == null) { + final invoiceStatus = resp.value!; + + final response = await service.client.getTicketFull( + apiTicketId, + customerKey: invoiceStatus.externalCustomerKey, + ); + + if (response.hasError || response.value == null) { + Logging.instance.e( + "$runtimeType get full ticket for car failed", + error: response.exception, + stackTrace: .current, + ); + } else { + final fullTicket = response.value!; + + // TODO: clean this up a bit some day but for now... + await service.db.transaction(() async { + // get ticket again to ensure this is an atomic insert operation + // in the db transaction + final ticket = await service.db.shopInBitTicketsDao.getByApiId( + apiTicketId, + ); + + if (ticket == null) { + // insert bare minimum - will be updated automatically later + await service.db.shopInBitTicketsDao.insertTicket( + ShopInBitTicketsCompanion.insert( + apiTicketId: apiTicketId, + customerKey: invoiceStatus.externalCustomerKey, + ticketNumber: invoiceStatus.realTicketNumber!, + category: .car, + requestDescription: fullTicket.productName ?? "", + deliveryCountry: fullTicket.deliveryCountry, + status: .pending, + statusRaw: "NEW", + ), + ); + } + }); + } + } + } + + if (!mounted) return true; Logging.instance.i( "CarResearch status response (payment_view): ${resp.value}", ); @@ -372,13 +397,24 @@ class _ShopInBitCarResearchPaymentViewState ); setState(() { _status = resp.value!; - _statusString = _status!["status"]?.toString() ?? _statusString; + _statusString = _status!.status.isNotEmpty + ? _status!.status + : _statusString; + _additional = _status!.additional; + _finalized = _status!.finalized; + _realTicketId = _status!.realTicketId; }); if (_isTerminal) { _pollTimer?.cancel(); - await _processPaymentAndRequest(); + await _finalizePayment(); } - } catch (e) { + return true; + } catch (e, s) { + Logging.instance.e( + "ticket status polling issue", + error: e, + stackTrace: s, + ); if (mounted) { unawaited( showFloatingFlushBar( @@ -388,331 +424,36 @@ class _ShopInBitCarResearchPaymentViewState ), ); } + return false; } } - Future _processPaymentAndRequest() async { - // Guard: only one entry allowed - if (_flowState == _PaymentFlowState.loggingPayment || - _flowState == _PaymentFlowState.creatingRequest || - _flowState == _PaymentFlowState.complete || - _flowState == _PaymentFlowState.error) { + Future _finalizePayment() async { + if (_flowState == _PaymentFlowState.finalizing || + _flowState == _PaymentFlowState.complete) { return; } - // Skip logCarResearchPayment if the fee was already logged. - final existingFeeTicket = widget.model.feeTicketNumber; - if (existingFeeTicket != null) { - if (!widget.model.needsCreateRequest) { - // Both steps already done: navigate to success directly. - if (!mounted) return; - setState(() => _flowState = _PaymentFlowState.complete); - - unawaited( - Navigator.of( - context, - ).pushNamed(ShopInBitOrderCreated.routeName, arguments: widget.model), - ); - - return; - } - // Fee logged; skip to createRequest. - setState(() => _flowState = _PaymentFlowState.creatingRequest); - _pollTimer?.cancel(); - try { - final customerKey = await ref - .read(pShopinBitService) - .ensureCustomerKey(); - final comment = - "${widget.model.requestDescription}\n\n" - "The Client paid the car research fee (#$existingFeeTicket)"; - final reqResp = await ref - .read(pShopinBitService) - .client - .createRequest( - customerPseudonym: widget.model.displayName, - externalCustomerKey: customerKey, - serviceType: "car", - comment: comment, - deliveryCountry: widget.model.deliveryCountry, - ); - if (reqResp.hasError || reqResp.value == null) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => StackDialog( - title: "Request Failed", - message: - "Payment was confirmed but we couldn't submit your car " - "research request. You can retry from My Requests.\n\n" - "Error: ${reqResp.exception?.message ?? 'Unknown error'}", - leftButton: SecondaryButton( - label: "Retry Now", - onPressed: () { - Navigator.of(ctx).pop(); - _retryCreateRequest(existingFeeTicket, customerKey); - }, - ), - rightButton: PrimaryButton( - label: "My Requests", - onPressed: () { - Navigator.of(ctx).pop(); - _popToTickets(); - }, - ), - ), - ); - } - return; - } - final requestRef = reqResp.value!; - final prevTicketId = widget.model.ticketId; - widget.model.apiTicketId = requestRef.id; - widget.model.ticketId = requestRef.number; - widget.model.status = ShopInBitOrderStatus.pending; - widget.model.isPendingPayment = false; - widget.model.needsCreateRequest = false; - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(widget.model.toCompanion()); - // Remove the sentinel record. - if (prevTicketId != null && prevTicketId != widget.model.ticketId) { - await (db.delete( - db.shopInBitTickets, - )..where((t) => t.ticketId.equals(prevTicketId))).go(); - } - if (!mounted) return; - setState(() => _flowState = _PaymentFlowState.complete); - - unawaited( - Navigator.of( - context, - ).pushNamed(ShopInBitOrderCreated.routeName, arguments: widget.model), - ); - } catch (e) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: e.toString(), - context: context, - ), - ); - } - } + final int? realId = _realTicketId; + if (realId == null) { + setState(() => _flowState = _PaymentFlowState.finalizing); + await _showFinalizingFallback(); return; } - setState(() => _flowState = _PaymentFlowState.loggingPayment); - _pollTimer?.cancel(); - - try { - final logResp = await ref - .read(pShopinBitService) - .client - .logCarResearchPayment(widget.invoice.btcpayInvoice); - if (logResp.hasError || logResp.value == null) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: logResp.exception?.message ?? "Failed to log payment", - context: context, - ), - ); - } - return; - } - - final feeResult = logResp.value!; - - // Persist feeTicketNumber on the existing model (a new DB row creates a - // spurious list entry). - widget.model.feeTicketNumber = feeResult.ticketNumber; - widget.model.needsCreateRequest = true; - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(widget.model.toCompanion()); - - if (!mounted) return; - setState(() => _flowState = _PaymentFlowState.creatingRequest); - - final customerKey = await ref.read(pShopinBitService).ensureCustomerKey(); - final comment = - "${widget.model.requestDescription}\n\n" - "The Client paid the car research fee (#${feeResult.ticketNumber})"; - - final reqResp = await ref - .read(pShopinBitService) - .client - .createRequest( - customerPseudonym: widget.model.displayName, - externalCustomerKey: customerKey, - serviceType: "car", - comment: comment, - deliveryCountry: widget.model.deliveryCountry, - ); - - if (reqResp.hasError || reqResp.value == null) { - // createRequest failed: fee receipt already persisted, show retry - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => StackDialog( - title: "Request Failed", - message: - "Payment was confirmed but we couldn't submit your car " - "research request. You can retry from My Requests.\n\n" - "Error: ${reqResp.exception?.message ?? 'Unknown error'}", - leftButton: SecondaryButton( - label: "Retry Now", - onPressed: () { - Navigator.of(ctx).pop(); - _retryCreateRequest(feeResult.ticketNumber, customerKey); - }, - ), - rightButton: PrimaryButton( - label: "My Requests", - onPressed: () { - Navigator.of(ctx).pop(); - _popToTickets(); - }, - ), - ), - ); - } - return; - } - - final requestRef = reqResp.value!; - final prevTicketId = widget.model.ticketId; - widget.model.apiTicketId = requestRef.id; - widget.model.ticketId = requestRef.number; - widget.model.status = ShopInBitOrderStatus.pending; - widget.model.isPendingPayment = false; - widget.model.needsCreateRequest = false; - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(widget.model.toCompanion()); - if (prevTicketId != null && prevTicketId != widget.model.ticketId) { - await (db.delete( - db.shopInBitTickets, - )..where((t) => t.ticketId.equals(prevTicketId))).go(); - } - - if (!mounted) return; - setState(() => _flowState = _PaymentFlowState.complete); - - unawaited( - Navigator.of( - context, - ).pushNamed(ShopInBitOrderCreated.routeName, arguments: widget.model), - ); - } catch (e) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: e.toString(), - context: context, - ), - ); - } - } - } - - Future _retryCreateRequest( - String feeTicketNumber, - String customerKey, - ) async { - if (_flowState == _PaymentFlowState.creatingRequest) return; - setState(() => _flowState = _PaymentFlowState.creatingRequest); - - try { - final comment = - "${widget.model.requestDescription}\n\n" - "The Client paid the car research fee (#$feeTicketNumber)"; - - final reqResp = await ref - .read(pShopinBitService) - .client - .createRequest( - customerPseudonym: widget.model.displayName, - externalCustomerKey: customerKey, - serviceType: "car", - comment: comment, - deliveryCountry: widget.model.deliveryCountry, - ); - - if (reqResp.hasError || reqResp.value == null) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: reqResp.exception?.message ?? "Retry failed", - context: context, - ), - ); - } - return; - } - - final requestRef = reqResp.value!; - widget.model.apiTicketId = requestRef.id; - widget.model.ticketId = requestRef.number; - widget.model.status = ShopInBitOrderStatus.pending; - // Flow complete: clear the resume flag before saving. - widget.model.isPendingPayment = false; - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(widget.model.toCompanion()); - - // Update fee receipt ticket - final feeTickets = await (db.select( - db.shopInBitTickets, - )..where((t) => t.ticketId.equals(feeTicketNumber))).get(); - if (feeTickets.isNotEmpty) { - final feeTicket = feeTickets.first.copyWith(needsCreateRequest: false); - await db.into(db.shopInBitTickets).insertOnConflictUpdate(feeTicket); - } - - if (!mounted) return; - setState(() => _flowState = _PaymentFlowState.complete); - - unawaited( - Navigator.of( - context, - ).pushNamed(ShopInBitOrderCreated.routeName, arguments: widget.model), - ); - } catch (e) { - if (mounted) { - setState(() => _flowState = _PaymentFlowState.error); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: e.toString(), - context: context, - ), - ); - } - } + setState(() => _flowState = _PaymentFlowState.complete); + unawaited( + Navigator.of( + context, + ).pushNamed(ShopInBitOrderCreated.routeName, arguments: realId), + ); } - void _copyAddress(BuildContext context) { + Future _copyAddress(BuildContext context) async { final addr = _currentAddress; if (addr.isEmpty) return; - Clipboard.setData(ClipboardData(text: addr)); + await Clipboard.setData(ClipboardData(text: addr)); + if (!context.mounted) return; unawaited( showFloatingFlushBar( type: FlushBarType.info, @@ -731,26 +472,11 @@ class _ShopInBitCarResearchPaymentViewState ? _methods[_selectedMethod].toUpperCase() : ""; - bool hasWallets = false; - if (ticker == "USDT") { - const usdtAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; - hasWallets = ref - .watch(pWallets) - .wallets - .any( - (w) => - w.info.coin is Ethereum && - w.info.tokenContractAddresses.contains(usdtAddress), - ); - } else { - final coin = AppConfig.getCryptoCurrencyForTicker(ticker); - if (coin != null) { - hasWallets = ref - .watch(pWallets) - .wallets - .any((e) => e.info.coin == coin); - } - } + final hasWallets = hasShopInBitWalletForTicker( + wallets: ref.watch(pWallets), + ticker: ticker, + paymentUri: _currentAddress, + ); final methodSelector = _methods.length <= 1 ? Padding( @@ -885,6 +611,26 @@ class _ShopInBitCarResearchPaymentViewState ), ), ), + if (_currentAddress.isNotEmpty && _methods[_selectedMethod] == "USDT") + SizedBox(height: isDesktop ? 24 : 16), + if (_currentAddress.isNotEmpty && _methods[_selectedMethod] == "USDT") + RoundedContainer( + color: Theme.of( + context, + ).extension()!.warningBackground, + child: Center( + child: Text( + "IMPORTANT: Only send USDT (TRX20) to this address, not TRX", + style: (isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context).copyWith( + color: Theme.of( + context, + ).extension()!.warningForeground, + )), + ), + ), + ), SizedBox(height: isDesktop ? 16 : 12), if (_currentAddress.isNotEmpty) GestureDetector( @@ -901,12 +647,12 @@ class _ShopInBitCarResearchPaymentViewState : STextStyles.itemSubtitle12(context), ), const Spacer(), - Icon( - Icons.copy, - size: 14, + CopyIcon( + width: isDesktop ? 15 : 10, + height: isDesktop ? 15 : 10, color: Theme.of( context, - ).extension()!.accentColorBlue, + ).extension()!.infoItemIcons, ), const SizedBox(width: 4), Text("Copy", style: STextStyles.link2(context)), @@ -934,14 +680,13 @@ class _ShopInBitCarResearchPaymentViewState PrimaryButton( label: _flowState == _PaymentFlowState.polling ? "Checking..." - : (_flowState == _PaymentFlowState.loggingPayment || - _flowState == _PaymentFlowState.creatingRequest) + : _flowState == _PaymentFlowState.finalizing ? "Processing..." : (hasWallets ? "PAY NOW" : "CHECK FOR PAYMENT"), enabled: _payNowEnabled, onPressed: _payNowEnabled ? (hasWallets - ? _confirmPayment + ? () => unawaited(_confirmPayment()) : () => unawaited(_checkForPayment())) : null, ), @@ -985,41 +730,9 @@ class _ShopInBitCarResearchPaymentViewState ); } - return Background( - child: PopScope( - canPop: false, - onPopInvokedWithResult: (bool didPop, dynamic result) { - if (!didPop) { - _popToTickets(); - } - }, - child: Scaffold( - backgroundColor: Theme.of( - context, - ).extension()!.background, - appBar: AppBar( - leading: AppBarBackButton(onPressed: _popToTickets), - title: Text("ShopinBit", style: STextStyles.navBarTitle(context)), - ), - body: SafeArea( - child: LayoutBuilder( - builder: (context, constraints) { - return Padding( - padding: const EdgeInsets.all(16), - child: SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints( - minHeight: constraints.maxHeight - 32, - ), - child: IntrinsicHeight(child: content), - ), - ), - ); - }, - ), - ), - ), - ), + return ShopInBitPaymentMobileScaffold( + onBack: _popToTickets, + child: content, ); } } diff --git a/lib/pages/shopinbit/shopinbit_confirm_send_view.dart b/lib/pages/shopinbit/shopinbit_confirm_send_view.dart index a6f85da132..2587a17fe5 100644 --- a/lib/pages/shopinbit/shopinbit_confirm_send_view.dart +++ b/lib/pages/shopinbit/shopinbit_confirm_send_view.dart @@ -4,9 +4,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../models/isar/models/isar_models.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; import '../../notifications/show_flush_bar.dart'; import '../../pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_auth_send.dart'; +import '../../providers/global/shopin_bit_service_provider.dart'; import '../../providers/providers.dart'; import '../../route_generator.dart'; import '../../themes/stack_colors.dart'; @@ -40,7 +40,7 @@ class ShopInBitConfirmSendView extends ConsumerStatefulWidget { required this.txData, required this.walletId, this.routeOnSuccessName = WalletView.routeName, - required this.model, + required this.apiTicketId, this.tokenContract, }); @@ -49,7 +49,7 @@ class ShopInBitConfirmSendView extends ConsumerStatefulWidget { final TxData txData; final String walletId; final String routeOnSuccessName; - final ShopInBitOrderModel model; + final int apiTicketId; final EthContract? tokenContract; @override @@ -61,7 +61,7 @@ class _ShopInBitConfirmSendViewState extends ConsumerState { late final String walletId; late final String routeOnSuccessName; - late final ShopInBitOrderModel model; + late final int apiTicketId; final isDesktop = Util.isDesktop; @@ -118,16 +118,12 @@ class _ShopInBitConfirmSendViewState TransactionNote(walletId: walletId, txid: txid, value: note), ); - // Update model status after successful broadcast - model.status = ShopInBitOrderStatus.paymentPending; - model.paymentMethod = widget.tokenContract != null - ? widget.tokenContract!.symbol.toUpperCase() - : coin.ticker.toUpperCase(); - - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(model.toCompanion()); + // The server (and the BTCPay webhook) own ticket + payment state from + // here, so there's nothing to persist locally; just nudge a refresh so + // the ticket row reflects the new payment status promptly. + if (apiTicketId != 0) { + unawaited(ref.read(pShopinBitService).refreshOne(apiTicketId)); + } // pop back to wallet if (context.mounted) { @@ -250,12 +246,15 @@ class _ShopInBitConfirmSendViewState void initState() { walletId = widget.walletId; routeOnSuccessName = widget.routeOnSuccessName; - model = widget.model; + apiTicketId = widget.apiTicketId; super.initState(); } @override Widget build(BuildContext context) { + final ticketNumber = + ref.watch(pShopInBitTicket(apiTicketId)).asData?.value?.ticketNumber ?? + ""; return ConditionalParent( condition: !isDesktop, builder: (child) { @@ -674,7 +673,7 @@ class _ShopInBitConfirmSendViewState children: [ Text("Request ID", style: STextStyles.smallMed12(context)), Text( - model.ticketId ?? "", + ticketNumber, style: STextStyles.itemSubtitle12(context), textAlign: TextAlign.right, ), diff --git a/lib/pages/shopinbit/shopinbit_offer_view.dart b/lib/pages/shopinbit/shopinbit_offer_view.dart index 98946c14dd..b170407b73 100644 --- a/lib/pages/shopinbit/shopinbit_offer_view.dart +++ b/lib/pages/shopinbit/shopinbit_offer_view.dart @@ -1,70 +1,36 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; import '../../themes/stack_colors.dart'; +import '../../utilities/show_loading.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../widgets/background.dart'; +import '../../widgets/conditional_parent.dart'; import '../../widgets/custom_buttons/app_bar_icon_button.dart'; -import '../../widgets/desktop/desktop_dialog.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; import '../../widgets/desktop/secondary_button.dart'; -import '../../widgets/loading_indicator.dart'; +import '../../widgets/dialogs/s_dialog.dart'; import '../../widgets/rounded_white_container.dart'; +import '../../widgets/stack_dialog.dart'; import 'shopinbit_shipping_view.dart'; -class ShopInBitOfferView extends ConsumerStatefulWidget { - const ShopInBitOfferView({super.key, required this.model}); +class ShopInBitOfferView extends ConsumerWidget { + const ShopInBitOfferView({super.key, required this.apiTicketId}); static const String routeName = "/shopInBitOffer"; - final ShopInBitOrderModel model; + final int apiTicketId; @override - ConsumerState createState() => _ShopInBitOfferViewState(); -} - -class _ShopInBitOfferViewState extends ConsumerState { - bool _loading = false; - - @override - void initState() { - super.initState(); - if (widget.model.apiTicketId != 0) { - _loadOffer(); - } - } - - Future _loadOffer() async { - setState(() => _loading = true); - try { - final resp = await ref - .read(pShopinBitService) - .client - .getTicketFull(widget.model.apiTicketId); - if (!resp.hasError && resp.value != null) { - final t = resp.value!; - widget.model.setOffer( - productName: t.productName, - price: t.customerPrice, - ); - } - } catch (_) { - // Fall back to local data - } finally { - if (mounted) setState(() => _loading = false); - } - } - - @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final isDesktop = Util.isDesktop; - final model = widget.model; + final ticket = ref.watch(pShopInBitTicket(apiTicketId)).asData?.value; final content = Column( + mainAxisSize: .min, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Text( @@ -93,7 +59,7 @@ class _ShopInBitOfferViewState extends ConsumerState { ), const SizedBox(height: 4), Text( - model.offerProductName ?? (_loading ? "Loading..." : "N/A"), + ticket?.offerProductName ?? "N/A", style: isDesktop ? STextStyles.desktopTextSmall(context) : STextStyles.titleBold12(context), @@ -107,16 +73,14 @@ class _ShopInBitOfferViewState extends ConsumerState { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Price (incl. service fee)", + "Price (incl. service fee and VAT)", style: isDesktop ? STextStyles.desktopTextExtraExtraSmall(context) : STextStyles.itemSubtitle12(context), ), const SizedBox(height: 4), Text( - _loading && model.offerPrice == null - ? "Loading..." - : "${model.offerPrice ?? '0'} EUR", + "${ticket?.offerPrice ?? '0'} EUR", style: isDesktop ? STextStyles.desktopTextSmall(context) : STextStyles.titleBold12(context), @@ -124,73 +88,124 @@ class _ShopInBitOfferViewState extends ConsumerState { ], ), ), - const Spacer(), - PrimaryButton( - label: "Accept offer", - enabled: !_loading, - onPressed: () { - model.status = ShopInBitOrderStatus.accepted; - if (isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - showDialog( - context: context, - builder: (_) => ShopInBitShippingView(model: model), - ); - } else { - Navigator.of( - context, - ).pushNamed(ShopInBitShippingView.routeName, arguments: model); - } - }, - ), - SizedBox(height: isDesktop ? 16 : 12), - SecondaryButton( - label: "Decline", - onPressed: () { - if (isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - } else { - Navigator.of(context).pop(); - } - }, + isDesktop ? const SizedBox(height: 40) : const Spacer(), + BranchedParent( + condition: isDesktop, + conditionBranchBuilder: (children) => Row( + children: [ + Expanded(child: children[1]), + const SizedBox(width: 16), + Expanded(child: children[0]), + ], + ), + otherBranchBuilder: (children) => Column( + mainAxisSize: .min, + crossAxisAlignment: .stretch, + children: [children[0], const SizedBox(height: 16), children[1]], + ), + children: [ + PrimaryButton( + label: "Accept offer", + buttonHeight: Util.isDesktop ? ButtonHeight.l : null, + onPressed: () async { + final deliveryCountry = ticket?.deliveryCountry ?? ""; + + final shopinBitApi = ref.read(pShopinBitService).client; + final response = await showLoading( + context: context, + rootNavigator: true, + message: "Updating available countries", + whileFuture: shopinBitApi.getCountries(), + delay: const Duration( + seconds: 1, + ), // at least 1 sec to prevent ui flashing + ); + + if (!context.mounted) return; + + String? errorMessage; + + if (response?.value == null) { + errorMessage = + response?.exception?.toString() ?? + "Failed to fetch countries data"; + } else if (response!.value! + .where((c) => c['iso'] == deliveryCountry) + .length != + 1) { + errorMessage = + "Delivery country code \"" + "$deliveryCountry" + "\" is invalid"; + } + + if (errorMessage != null) { + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "ShopinBit API error", + maxWidth: Util.isDesktop ? 500 : null, + message: errorMessage, + desktopPopRootNavigator: Util.isDesktop, + ), + ); + return; + } + + if (context.mounted) { + await Navigator.of(context).pushNamed( + ShopInBitShippingView.routeName, + arguments: (ticket: ticket!, countries: response!.value!), + ); + } + }, + ), + SecondaryButton( + label: "Cancel", + buttonHeight: Util.isDesktop ? ButtonHeight.l : null, + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], ), ], ); if (isDesktop) { - return DesktopDialog( - maxWidth: 580, - maxHeight: 600, - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: const EdgeInsets.only(left: 32), - child: Text( - "ShopinBit", - style: STextStyles.desktopH3(context), + return SDialog( + child: SizedBox( + width: 580, + child: Column( + mainAxisSize: .min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: const EdgeInsets.only(left: 32), + child: Text( + "ShopinBit", + style: STextStyles.desktopH3(context), + ), ), - ), - const DesktopDialogCloseButton(), - ], - ), - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32, - vertical: 16, - ), - child: Stack( - children: [ - content, - if (_loading) const LoadingIndicator(width: 24, height: 24), - ], + const DesktopDialogCloseButton(), + ], + ), + Flexible( + child: Padding( + padding: const .only( + left: 32, + right: 32, + bottom: 32, + top: 16, + ), + child: content, ), ), - ), - ], + ], + ), ), ); } @@ -207,21 +222,16 @@ class _ShopInBitOfferViewState extends ConsumerState { body: SafeArea( child: LayoutBuilder( builder: (context, constraints) { - return Stack( - children: [ - Padding( - padding: const EdgeInsets.all(16), - child: SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints( - minHeight: constraints.maxHeight - 32, - ), - child: IntrinsicHeight(child: content), - ), + return Padding( + padding: const EdgeInsets.all(16), + child: SingleChildScrollView( + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: constraints.maxHeight - 32, ), + child: IntrinsicHeight(child: content), ), - if (_loading) const LoadingIndicator(width: 24, height: 24), - ], + ), ); }, ), diff --git a/lib/pages/shopinbit/shopinbit_order_created.dart b/lib/pages/shopinbit/shopinbit_order_created.dart index 9680519e0c..0e202b8a83 100644 --- a/lib/pages/shopinbit/shopinbit_order_created.dart +++ b/lib/pages/shopinbit/shopinbit_order_created.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../providers/global/shopin_bit_service_provider.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/assets.dart'; import '../../utilities/text_styles.dart'; @@ -15,19 +16,19 @@ import '../../widgets/desktop/secondary_button.dart'; import '../../widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog.dart'; import '../../widgets/dialogs/s_dialog.dart'; import '../../widgets/rounded_white_container.dart'; -import '../more_view/services_view.dart'; +import '../home_view/home_view.dart'; import 'shopinbit_ticket_detail.dart'; -class ShopInBitOrderCreated extends StatelessWidget { - const ShopInBitOrderCreated({super.key, required this.model}); +class ShopInBitOrderCreated extends ConsumerWidget { + const ShopInBitOrderCreated({super.key, required this.apiTicketId}); static const String routeName = "/shopInBitOrderCreated"; - final ShopInBitOrderModel model; + final int apiTicketId; static void _popToServices(BuildContext context) { Navigator.of(context).popUntil((route) { - if (route.settings.name == ServicesView.routeName) { + if (route.settings.name == HomeView.routeName) { return true; } if (route.isFirst) { @@ -38,8 +39,9 @@ class ShopInBitOrderCreated extends StatelessWidget { } @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final isDesktop = Util.isDesktop; + final ticket = ref.watch(pShopInBitTicket(apiTicketId)).asData?.value; return ConditionalParent( condition: isDesktop, @@ -166,7 +168,7 @@ class ShopInBitOrderCreated extends StatelessWidget { : STextStyles.itemSubtitle12(context), ), Text( - model.ticketId ?? "N/A", + ticket?.ticketNumber ?? "N/A", style: isDesktop ? STextStyles.desktopTextSmall(context) : STextStyles.titleBold12(context), @@ -216,7 +218,7 @@ class ShopInBitOrderCreated extends StatelessWidget { onPressed: () { Navigator.of(context).pushNamed( ShopInBitTicketDetail.routeName, - arguments: model, + arguments: apiTicketId, ); }, ), diff --git a/lib/pages/shopinbit/shopinbit_payment_shared.dart b/lib/pages/shopinbit/shopinbit_payment_shared.dart new file mode 100644 index 0000000000..bed7001b64 --- /dev/null +++ b/lib/pages/shopinbit/shopinbit_payment_shared.dart @@ -0,0 +1,319 @@ +import 'package:decimal/decimal.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../app_config.dart'; +import '../../models/isar/models/ethereum/eth_contract.dart'; +import '../../providers/providers.dart'; +import '../../route_generator.dart'; +import '../../services/shopinbit/src/client.dart'; +import '../../services/shopinbit/src/models/payment.dart'; +import '../../services/wallets.dart'; +import '../../themes/stack_colors.dart'; +import '../../utilities/address_utils.dart'; +import '../../utilities/amount/amount.dart'; +import '../../utilities/default_eth_tokens.dart'; +import '../../utilities/logger.dart'; +import '../../utilities/text_styles.dart'; +import '../../utilities/util.dart'; +import '../../wallets/crypto_currency/crypto_currency.dart'; +import '../../widgets/background.dart'; +import '../../widgets/custom_buttons/app_bar_icon_button.dart'; +import 'shopinbit_send_from_view.dart'; + +final String kShopInBitUsdtContractAddress = DefaultTokens.list + .firstWhere((t) => t.symbol == "USDT") + .address; + +// Address + amount pulled out of one of the API's payment_links entries. +class ShopInBitPaymentTarget { + const ShopInBitPaymentTarget({required this.address, required this.amount}); + + final String address; + final Amount? amount; +} + +// Parses a BIP21-style payment URI (or a bare address) into a destination +// address and optional Amount. `amountFallback` covers the concierge case +// where the URI itself has no amount but the API response carries one +// (PaymentInfo.due). +ShopInBitPaymentTarget parseShopInBitPaymentTarget({ + required String paymentUri, + required String ticker, + CryptoCurrency? coin, + String? amountFallback, +}) { + String address = ""; + final parsed = AddressUtils.parsePaymentUri(paymentUri); + + if (parsed?.address != null && parsed!.address.isNotEmpty) { + address = parsed.address; + } else { + final colonIdx = paymentUri.indexOf(':'); + if (colonIdx != -1) { + final afterScheme = paymentUri.substring(colonIdx + 1); + final qIdx = afterScheme.indexOf('?'); + address = qIdx != -1 ? afterScheme.substring(0, qIdx) : afterScheme; + } else { + address = paymentUri; + } + } + + String? amountStr = parsed?.amount; + if (amountStr == null || amountStr.isEmpty) { + final uri = Uri.tryParse(paymentUri); + if (uri != null) { + amountStr = uri.queryParameters['amount']; + } + } + if (amountStr == null || amountStr.isEmpty) { + amountStr = amountFallback; + } + + final int fractionDigits; + if (coin != null) { + fractionDigits = coin.fractionDigits; + } else if (ticker == "USDT") { + fractionDigits = 6; + } else { + fractionDigits = 8; + } + + Amount? amount; + if (amountStr != null && amountStr.isNotEmpty) { + try { + amount = Amount.fromDecimal( + Decimal.parse(amountStr), + fractionDigits: fractionDigits, + ); + } catch (e, s) { + Logging.instance.e( + "Failed to parse ShopInBit payment amount '$amountStr'", + error: e, + stackTrace: s, + ); + } + } + + return ShopInBitPaymentTarget(address: address, amount: amount); +} + +// USDT exists on multiple chains (ERC-20, TRC-20, BEP-20, ...) and the +// ShopInBit API just keys the payment link as "USDT". Only treat it as +// ETH-USDT when the URI scheme is `ethereum:` or the address looks like a +// bare Ethereum hex address. Anything else (Tron, etc.) we don't support +// in-app and the user has to pay externally. +final RegExp _kEthAddressRegExp = RegExp(r'^0x[0-9a-fA-F]{40}$'); + +bool _isEthereumUsdtUri(String paymentUri) { + final trimmed = paymentUri.trim(); + if (trimmed.toLowerCase().startsWith('ethereum:')) return true; + return _kEthAddressRegExp.hasMatch(trimmed); +} + +// True if any wallet in [wallets] can send the given upper-cased [ticker] +// for the given [paymentUri]. USDT is special-cased to look at Ethereum +// wallets' token contracts, gated on the URI actually being ETH-chain. +bool hasShopInBitWalletForTicker({ + required Wallets wallets, + required String ticker, + required String paymentUri, +}) { + if (ticker == "USDT") { + if (!_isEthereumUsdtUri(paymentUri)) return false; + return wallets.wallets.any( + (w) => + w.info.coin is Ethereum && + w.info.tokenContractAddresses.contains(kShopInBitUsdtContractAddress), + ); + } + final coin = AppConfig.getCryptoCurrencyForTicker(ticker); + if (coin == null) return false; + return wallets.wallets.any((e) => e.info.coin == coin); +} + +// Pushes the send-from view and awaits it. +Future _pushShopInBitSendFrom({ + required BuildContext context, + required CryptoCurrency coin, + required Amount? amount, + required String address, + required int apiTicketId, + EthContract? tokenContract, + String? routeOnSuccessName, +}) async { + if (Util.isDesktop) { + // Show the send-from dialog on top of the payment dialog. Do not pop the + // payment flow first: doing so tears down the whole nested-navigator + // dialog, so closing send-from would drop the user back to Services + // instead of returning to the payment view. + await showDialog( + context: context, + builder: (_) => ShopInBitSendFromView( + coin: coin, + amount: amount, + address: address, + apiTicketId: apiTicketId, + shouldPopRoot: true, + tokenContract: tokenContract, + ), + ); + } else { + await Navigator.of(context).push( + RouteGenerator.getRoute( + shouldUseMaterialRoute: RouteGenerator.useMaterialPageRoute, + builder: (_) => ShopInBitSendFromView( + coin: coin, + amount: amount, + address: address, + apiTicketId: apiTicketId, + tokenContract: tokenContract, + routeOnSuccessName: routeOnSuccessName, + ), + settings: const RouteSettings(name: ShopInBitSendFromView.routeName), + ), + ); + } +} + +// Tries to launch the in-wallet send flow for [ticker]/[address]. +Future tryNavigateToShopInBitWalletSend({ + required WidgetRef ref, + required BuildContext context, + required String ticker, + required String paymentUri, + required String address, + required Amount? amount, + required int apiTicketId, + String? routeOnSuccessName, +}) async { + if (address.isEmpty) return false; + + final coin = AppConfig.getCryptoCurrencyForTicker(ticker); + if (coin != null) { + await _pushShopInBitSendFrom( + context: context, + coin: coin, + amount: amount, + address: address, + apiTicketId: apiTicketId, + routeOnSuccessName: routeOnSuccessName, + ); + return true; + } + + if (ticker == "USDT") { + if (!_isEthereumUsdtUri(paymentUri)) return false; + final tokenContract = ref + .read(mainDBProvider) + .getEthContractSync(kShopInBitUsdtContractAddress); + if (tokenContract != null) { + final ethCoin = AppConfig.getCryptoCurrencyForTicker("ETH"); + if (ethCoin != null) { + await _pushShopInBitSendFrom( + context: context, + coin: ethCoin, + amount: amount, + address: address, + apiTicketId: apiTicketId, + tokenContract: tokenContract, + routeOnSuccessName: routeOnSuccessName, + ); + return true; + } + } + } + + return false; +} + +// Fetches the live payment info for a ticket so the caller can pass it into +// the payment view as an arg (rather than loading it after the view is up). +// GET first to reuse an existing invoice per the spec's "page reload +// recovery" guidance; PUT (which regenerates) only when GET shows none. +// Returns null on any failure so the view can fall back to polling. +Future fetchShopInBitPaymentInfo( + ShopInBitClient client, + int apiTicketId, + String customerKey, +) async { + try { + final getResp = await client.getPayment( + apiTicketId, + customerKey: customerKey, + ); + if (!getResp.hasError && + getResp.value != null && + getResp.value!.paymentLinks.isNotEmpty) { + return getResp.value; + } + final putResp = await client.putPayment( + apiTicketId, + customerKey: customerKey, + ); + if (!putResp.hasError && putResp.value != null) { + return putResp.value; + } + } catch (e, s) { + Logging.instance.w( + "fetchShopInBitPaymentInfo failed, degrading to polling-only", + error: e, + stackTrace: s, + ); + } + return null; +} + +// Shared mobile chrome for the two ShopInBit payment views: Background + +// PopScope (back goes through [onBack]) + AppBar + scrollable, intrinsic +// height body. +class ShopInBitPaymentMobileScaffold extends StatelessWidget { + const ShopInBitPaymentMobileScaffold({ + super.key, + required this.onBack, + required this.child, + }); + + final VoidCallback onBack; + final Widget child; + + @override + Widget build(BuildContext context) { + return Background( + child: PopScope( + canPop: false, + onPopInvokedWithResult: (bool didPop, dynamic result) { + if (!didPop) { + onBack(); + } + }, + child: Scaffold( + backgroundColor: Theme.of( + context, + ).extension()!.background, + appBar: AppBar( + leading: AppBarBackButton(onPressed: onBack), + title: Text("ShopinBit", style: STextStyles.navBarTitle(context)), + ), + body: SafeArea( + child: LayoutBuilder( + builder: (context, constraints) { + return Padding( + padding: const EdgeInsets.all(16), + child: SingleChildScrollView( + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: constraints.maxHeight - 32, + ), + child: IntrinsicHeight(child: child), + ), + ), + ); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/shopinbit/shopinbit_payment_view.dart b/lib/pages/shopinbit/shopinbit_payment_view.dart index eea1f437c8..f7e17ebeff 100644 --- a/lib/pages/shopinbit/shopinbit_payment_view.dart +++ b/lib/pages/shopinbit/shopinbit_payment_view.dart @@ -1,55 +1,69 @@ import 'dart:async'; import 'dart:io'; -import 'package:decimal/decimal.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import '../../app_config.dart'; -import '../../models/isar/models/ethereum/eth_contract.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; import '../../notifications/show_flush_bar.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; import '../../providers/providers.dart'; -import '../../route_generator.dart'; +import '../../services/shopinbit/src/client.dart'; import '../../services/shopinbit/src/models/payment.dart'; import '../../themes/coin_icon_provider.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/address_utils.dart'; -import '../../utilities/amount/amount.dart'; import '../../utilities/assets.dart'; +import '../../utilities/logger.dart'; +import '../../utilities/show_loading.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; -import '../../wallets/crypto_currency/crypto_currency.dart'; -import '../../widgets/background.dart'; -import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/desktop_dialog.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; import '../../widgets/desktop/secondary_button.dart'; -import '../../widgets/loading_indicator.dart'; +import '../../widgets/dialogs/s_dialog.dart'; +import '../../widgets/dialogs/simple_mobile_dialog.dart'; +import '../../widgets/icon_widgets/copy_icon.dart'; +import '../../widgets/qr.dart'; +import '../../widgets/rounded_container.dart'; import '../../widgets/rounded_white_container.dart'; -import 'shopinbit_send_from_view.dart'; +import '../../widgets/stack_dialog.dart'; +import '../home_view/home_view.dart'; +import 'shopinbit_payment_shared.dart'; +import 'shopinbit_ticket_detail.dart'; +import 'shopinbit_tickets_view.dart'; class ShopInBitPaymentView extends ConsumerStatefulWidget { - const ShopInBitPaymentView({super.key, required this.model}); + const ShopInBitPaymentView({ + super.key, + required this.apiTicketId, + required this.paymentInfo, + }); static const String routeName = "/shopInBitPayment"; - final ShopInBitOrderModel model; + final int apiTicketId; + + // Caller loads this before pushing, so we always open with usable addresses. + final PaymentInfo paymentInfo; @override ConsumerState createState() => _ShopInBitPaymentViewState(); } -class _ShopInBitPaymentViewState extends ConsumerState { - bool _loading = false; +class _ShopInBitPaymentViewState extends ConsumerState + with WidgetsBindingObserver { int _selectedMethod = 0; Timer? _pollTimer; + static const Duration _kBasePollInterval = Duration(seconds: 15); + static const Duration _kMaxPollInterval = Duration(seconds: 120); + Duration _pollInterval = _kBasePollInterval; + PaymentInfo? _paymentInfo; // Derived from API payment_links keys, fallback to defaults @@ -59,13 +73,15 @@ class _ShopInBitPaymentViewState extends ConsumerState { String get _currentAddress => _selectedMethod < _addresses.length ? _addresses[_selectedMethod] : ""; - String get _totalPrice => - _paymentInfo?.customerPrice ?? widget.model.offerPrice ?? "0"; + String get _totalPrice => _paymentInfo?.customerPrice ?? "0"; String get _status => _paymentInfo?.status ?? 'ready_to_pay'; bool get _isExpiredOrInvalid => _status == 'expired' || _status == 'invalid'; + // Voucher/credit fully covers the amount: no wallet options, nothing to pay. + bool get _isNoPaymentRequired => _status == 'no_payment_required'; + bool get _isTerminal => const { 'paid', 'paid_over', @@ -73,22 +89,49 @@ class _ShopInBitPaymentViewState extends ConsumerState { 'payment_processing', }.contains(_status); - bool get _payNowEnabled => !_isExpiredOrInvalid && !_isTerminal; + bool get _payNowEnabled => + !_isExpiredOrInvalid && !_isTerminal && !_isNoPaymentRequired; + + String? _customerKeyCache; + + Future get _customerKey async { + _customerKeyCache ??= + (await ref + .read(pSharedDrift) + .shopInBitTicketsDao + .getByApiId(widget.apiTicketId))! + .customerKey; + return _customerKeyCache!; + } @override void initState() { super.initState(); - if (widget.model.apiTicketId != 0) { - _loadPayment(); + WidgetsBinding.instance.addObserver(this); + _applyPaymentInfo(widget.paymentInfo); + if (widget.apiTicketId != 0) { + _startPolling(); } } @override void dispose() { + WidgetsBinding.instance.removeObserver(this); _pollTimer?.cancel(); super.dispose(); } + @override + void didChangeAppLifecycleState(AppLifecycleState state) { + if (widget.apiTicketId == 0) return; + // Don't poll while backgrounded; resume fresh when we come back. + if (state == AppLifecycleState.resumed) { + if (!_isTerminal) _startPolling(); + } else { + _pollTimer?.cancel(); + } + } + void _applyPaymentInfo(PaymentInfo info) { _paymentInfo = info; final links = info.paymentLinks; @@ -100,227 +143,180 @@ class _ShopInBitPaymentViewState extends ConsumerState { void _startPolling() { _pollTimer?.cancel(); - _pollTimer = Timer.periodic( - const Duration(seconds: 15), - (_) => _pollPayment(), - ); + _pollInterval = _kBasePollInterval; + _scheduleNextPoll(); } - Future _pollPayment() async { - try { - final resp = await ref - .read(pShopinBitService) - .client - .getPayment(widget.model.apiTicketId); - if (!resp.hasError && resp.value != null && mounted) { - setState(() => _applyPaymentInfo(resp.value!)); - if (_isTerminal) { - _pollTimer?.cancel(); - } - } - } catch (_) {} + void _scheduleNextPoll() { + _pollTimer?.cancel(); + _pollTimer = Timer(_pollInterval, _pollPayment); } - Future _loadPayment() async { - setState(() => _loading = true); + Future _pollPayment() async { + bool ok = false; try { final resp = await ref .read(pShopinBitService) .client - .getPayment(widget.model.apiTicketId); + .getPayment(widget.apiTicketId, customerKey: await _customerKey); if (!resp.hasError && resp.value != null) { - _applyPaymentInfo(resp.value!); - } - } catch (_) { - // Fall back to local/dummy data - } finally { - if (mounted) { - setState(() => _loading = false); - _startPolling(); + ok = true; + if (mounted) { + setState(() => _applyPaymentInfo(resp.value!)); + } } + } catch (e, s) { + Logging.instance.w( + "ShopInBit payment poll failed", + error: e, + stackTrace: s, + ); + } + if (!mounted) return; + if (_isTerminal) { + _pollTimer?.cancel(); + return; } + // Back off on failure (e.g. a 429), reset to base on success, so a rate + // limit slows us down instead of getting hammered every 15s. + _pollInterval = ok + ? _kBasePollInterval + : ShopInBitClient.nextPollBackoff(_pollInterval, _kMaxPollInterval); + _scheduleNextPoll(); } Future _refreshInvoice() async { - setState(() => _loading = true); - try { - final resp = await ref + _pollTimer?.cancel(); + + final customerKey = await _customerKey; + if (!mounted) return; + + final resp = await showLoading( + whileFuture: ref .read(pShopinBitService) .client - .getPayment(widget.model.apiTicketId, retry: true); - if (!resp.hasError && resp.value != null) { - _applyPaymentInfo(resp.value!); - } - } catch (_) {} - if (mounted) { - setState(() => _loading = false); - _startPolling(); + .putPayment( + widget.apiTicketId, + customerKey: customerKey, + retry: true, + ), + context: context, + message: "Refreshing invoice", + rootNavigator: true, + ); + if (!mounted) return; + if (resp != null && !resp.hasError && resp.value != null) { + setState(() => _applyPaymentInfo(resp.value!)); } + _startPolling(); } Future _checkForPayment() async { _pollTimer?.cancel(); - setState(() => _loading = true); - try { - final resp = await ref + + final customerKey = await _customerKey; + if (!mounted) return; + + final resp = await showLoading( + whileFuture: ref .read(pShopinBitService) .client - .getPayment(widget.model.apiTicketId); - if (!resp.hasError && resp.value != null && mounted) { - setState(() => _applyPaymentInfo(resp.value!)); - final status = resp.value!.status; - if (const { - 'paid', - 'paid_over', - 'paid_late', - 'payment_processing', - }.contains(status)) { - if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.success, - message: "Payment received!", - context: context, - ), - ); - } - } else if (status == 'underpaid') { - if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: "Underpaid. Remaining: ${resp.value!.due ?? '?'} EUR.", - context: context, - ), - ); - } - } else { - if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.info, - message: "No payment detected yet.", - context: context, - ), - ); - } - } - } else if (mounted) { + .getPayment(widget.apiTicketId, customerKey: customerKey), + context: context, + message: "Checking for payment", + rootNavigator: true, + ); + if (!mounted) return; + + if (resp != null && !resp.hasError && resp.value != null) { + setState(() => _applyPaymentInfo(resp.value!)); + final status = resp.value!.status; + if (const { + 'paid', + 'paid_over', + 'paid_late', + 'payment_processing', + }.contains(status)) { unawaited( showFloatingFlushBar( - type: FlushBarType.warning, - message: resp.exception?.message ?? "Failed to check payment.", + type: FlushBarType.success, + message: "Payment received!", context: context, ), ); - } - } catch (e) { - if (mounted) { + } else if (status == 'underpaid') { unawaited( showFloatingFlushBar( type: FlushBarType.warning, - message: e.toString(), + message: "Underpaid. Remaining: ${resp.value!.due ?? '?'} EUR.", + context: context, + ), + ); + } else { + unawaited( + showFloatingFlushBar( + type: FlushBarType.info, + message: "No payment detected yet.", context: context, ), ); } - } finally { - if (mounted) { - setState(() => _loading = false); - if (!_isTerminal) { - _startPolling(); - } - } + } else { + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to check payment", + maxWidth: Util.isDesktop ? 500 : null, + message: resp?.exception?.message, + desktopPopRootNavigator: Util.isDesktop, + ), + ); + if (!mounted) return; + } + + if (!_isTerminal) { + _startPolling(); } } - void _confirmPayment() { + Future _confirmPayment() async { _pollTimer?.cancel(); final method = _methods[_selectedMethod]; final ticker = method.toUpperCase(); - final coin = AppConfig.getCryptoCurrencyForTicker(ticker); - - String address = ""; - Amount? amount; - EthContract? tokenContract; - - if (_currentAddress.isNotEmpty) { - final parsed = AddressUtils.parsePaymentUri(_currentAddress); - - if (parsed?.address != null && parsed!.address.isNotEmpty) { - address = parsed.address; - } else { - final raw = _currentAddress; - final colonIdx = raw.indexOf(':'); - if (colonIdx != -1) { - final afterScheme = raw.substring(colonIdx + 1); - final qIdx = afterScheme.indexOf('?'); - address = qIdx != -1 ? afterScheme.substring(0, qIdx) : afterScheme; - } else { - address = raw; - } - } - - String? amountStr = parsed?.amount; - if (amountStr == null || amountStr.isEmpty) { - final uri = Uri.tryParse(_currentAddress); - if (uri != null) { - amountStr = uri.queryParameters['amount']; - } - } - if (amountStr == null || amountStr.isEmpty) { - amountStr = _paymentInfo?.due; - } - - final int fractionDigits; - if (coin != null) { - fractionDigits = coin.fractionDigits; - } else if (ticker == "USDT") { - fractionDigits = 6; - } else { - fractionDigits = 8; - } - - if (amountStr != null && amountStr.isNotEmpty) { - try { - amount = Amount.fromDecimal( - Decimal.parse(amountStr), - fractionDigits: fractionDigits, - ); - } catch (_) {} - } - } + final target = parseShopInBitPaymentTarget( + paymentUri: _currentAddress, + ticker: ticker, + coin: AppConfig.getCryptoCurrencyForTicker(ticker), + amountFallback: _paymentInfo?.due, + ); - if (coin != null && address.isNotEmpty) { - _navigateToSendFrom(coin: coin, amount: amount, address: address); + if (await tryNavigateToShopInBitWalletSend( + ref: ref, + context: context, + ticker: ticker, + paymentUri: _currentAddress, + address: target.address, + amount: target.amount, + apiTicketId: widget.apiTicketId, + )) { return; } - - if (ticker == "USDT" && address.isNotEmpty) { - const usdtAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; - tokenContract = ref.read(mainDBProvider).getEthContractSync(usdtAddress); - if (tokenContract != null) { - final ethCoin = AppConfig.getCryptoCurrencyForTicker("ETH"); - if (ethCoin != null) { - _navigateToSendFrom( - coin: ethCoin, - amount: amount, - address: address, - tokenContract: tokenContract, - ); - return; - } - } - } - - widget.model.status = ShopInBitOrderStatus.paymentPending; - widget.model.paymentMethod = method; - - if (Util.isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - } else { - Navigator.of(context).popUntil((route) => route.isFirst); + if (!mounted) return; + + // Couldn't launch the in-wallet send. + unawaited( + showFloatingFlushBar( + type: FlushBarType.warning, + message: + "Payment details for $ticker aren't ready yet. " + "Please wait a moment or refresh the invoice.", + context: context, + ), + ); + if (!_isTerminal) { + _startPolling(); } } @@ -328,70 +324,44 @@ class _ShopInBitPaymentViewState extends ConsumerState { Navigator.of(context).pop(); } - void _navigateToTickets() { - if (Util.isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - } else { - Navigator.of(context).popUntil((route) => route.isFirst); - } - } - - void _navigateToSendFrom({ - required CryptoCurrency coin, - required Amount? amount, - required String address, - EthContract? tokenContract, - }) { - if (Util.isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); + bool get _canReturnToRequest => widget.apiTicketId != 0; + void _backToRequest() { + final navigator = Navigator.of(context); + bool landedOnRequest = false; + navigator.popUntil((route) { + final name = route.settings.name; + if (name == ShopInBitTicketDetail.routeName) { + landedOnRequest = true; + return true; + } + return route.isFirst || + name == ShopInBitTicketsView.routeName || + name == HomeView.routeName; + }); + if (!landedOnRequest) { unawaited( - showDialog( - context: context, - builder: (_) => ShopInBitSendFromView( - coin: coin, - amount: amount, - address: address, - model: widget.model, - shouldPopRoot: true, - tokenContract: tokenContract, - ), - ), - ); - } else { - Navigator.of(context).push( - RouteGenerator.getRoute( - shouldUseMaterialRoute: RouteGenerator.useMaterialPageRoute, - builder: (_) => ShopInBitSendFromView( - coin: coin, - amount: amount, - address: address, - model: widget.model, - tokenContract: tokenContract, - ), - settings: const RouteSettings(name: ShopInBitSendFromView.routeName), + navigator.pushNamed( + ShopInBitTicketDetail.routeName, + arguments: widget.apiTicketId, ), ); } } - bool _hasWalletForTicker(String ticker) { - if (ticker == "USDT") { - const usdtAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7"; - return ref - .read(pWallets) - .wallets - .any( - (w) => - w.info.coin is Ethereum && - w.info.tokenContractAddresses.contains(usdtAddress), - ); - } else { - final coin = AppConfig.getCryptoCurrencyForTicker(ticker); - if (coin != null) { - return ref.read(pWallets).wallets.any((e) => e.info.coin == coin); + void _goToMyRequests() { + final navigator = Navigator.of(context); + bool landedOnTickets = false; + navigator.popUntil((route) { + final name = route.settings.name; + if (name == ShopInBitTicketsView.routeName) { + landedOnTickets = true; + return true; } + return route.isFirst || name == HomeView.routeName; + }); + if (!landedOnTickets) { + unawaited(navigator.pushNamed(ShopInBitTicketsView.routeName)); } - return false; } String? _parseBip21Amount(String bip21Uri) { @@ -408,65 +378,27 @@ class _ShopInBitPaymentViewState extends ConsumerState { void _onOwnedCoinTap(int methodIndex) { if (!_payNowEnabled) return; + if (_addresses[methodIndex].isEmpty) return; _selectedMethod = methodIndex; - _confirmPayment(); + unawaited(_confirmPayment()); } void _onUnownedCoinTap(int methodIndex) { - if (_isExpiredOrInvalid || _isTerminal) return; + if (!_payNowEnabled) return; final ticker = _methods[methodIndex].toUpperCase(); final address = _addresses[methodIndex]; + if (address.isEmpty) return; - showModalBottomSheet( + showDialog( context: context, - builder: (ctx) => Padding( - padding: const EdgeInsets.all(24), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text("$ticker Payment", style: STextStyles.pageTitleH2(context)), - const SizedBox(height: 16), - GestureDetector( - onTap: () { - Clipboard.setData(ClipboardData(text: address)); - showFloatingFlushBar( - type: FlushBarType.info, - message: "Copied to clipboard", - iconAsset: Assets.svg.copy, - context: context, - ); - }, - child: RoundedWhiteContainer( - child: Row( - children: [ - Expanded( - child: Text( - address, - style: STextStyles.itemSubtitle12(context), - ), - ), - const SizedBox(width: 8), - Icon( - Icons.copy, - size: 14, - color: Theme.of( - context, - ).extension()!.accentColorBlue, - ), - ], - ), - ), - ), - const SizedBox(height: 16), - PrimaryButton( - label: "CHECK FOR PAYMENT", - onPressed: () { - Navigator.of(ctx).pop(); - _checkForPayment(); - }, - ), - ], - ), + useRootNavigator: true, + builder: (ctx) => _UnownedCoinPaymentDialog( + ticker: ticker, + address: address, + onCheckForPayment: () { + Navigator.of(ctx).pop(); + _checkForPayment(); + }, ), ); } @@ -475,15 +407,20 @@ class _ShopInBitPaymentViewState extends ConsumerState { Widget build(BuildContext context) { final isDesktop = Util.isDesktop; + final wallets = ref.watch(pWallets); // Build coin rows from _methods/_addresses final coinRows = []; for (int i = 0; i < _methods.length; i++) { final ticker = _methods[i].toUpperCase(); final coin = AppConfig.getCryptoCurrencyForTicker(ticker); - final hasWallet = _hasWalletForTicker(ticker); - final amountStr = _addresses[i].isNotEmpty - ? _parseBip21Amount(_addresses[i]) - : null; + final hasAddress = _addresses[i].isNotEmpty; + final hasWallet = hasShopInBitWalletForTicker( + wallets: wallets, + ticker: ticker, + paymentUri: _addresses[i], + ); + final canPayNow = hasWallet && hasAddress; + final amountStr = hasAddress ? _parseBip21Amount(_addresses[i]) : null; if (i > 0) { coinRows.add(const SizedBox(height: 8)); @@ -492,11 +429,13 @@ class _ShopInBitPaymentViewState extends ConsumerState { coinRows.add( RoundedWhiteContainer( child: Opacity( - opacity: hasWallet ? 1.0 : 0.5, + opacity: canPayNow ? 1.0 : 0.5, child: InkWell( - onTap: hasWallet - ? () => _onOwnedCoinTap(i) - : () => _onUnownedCoinTap(i), + onTap: !hasAddress + ? null + : (hasWallet + ? () => _onOwnedCoinTap(i) + : () => _onUnownedCoinTap(i)), child: Row( children: [ if (coin != null) @@ -533,12 +472,13 @@ class _ShopInBitPaymentViewState extends ConsumerState { ], ), ), - if (hasWallet) + if (canPayNow) Text("PAY NOW", style: STextStyles.link2(context)) else - Icon( - Icons.info_outline, - size: 18, + SvgPicture.asset( + Assets.svg.circleInfo, + width: 18, + height: 18, color: Theme.of( context, ).extension()!.textSubtitle2, @@ -695,13 +635,52 @@ class _ShopInBitPaymentViewState extends ConsumerState { ), SizedBox(height: isDesktop ? 16 : 12), PrimaryButton( - label: "View My Requests", - onPressed: _navigateToTickets, + label: _canReturnToRequest ? "Back to Request" : "View My Requests", + onPressed: _canReturnToRequest ? _backToRequest : _goToMyRequests, + ), + ], + if (_isNoPaymentRequired) ...[ + SizedBox(height: isDesktop ? 16 : 8), + RoundedWhiteContainer( + child: Row( + children: [ + SvgPicture.asset( + Assets.svg.checkCircle, + width: 20, + height: 20, + color: Theme.of( + context, + ).extension()!.accentColorGreen, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + "No payment required. Your order is fully covered.", + style: + (isDesktop + ? STextStyles.desktopTextExtraExtraSmall( + context, + ) + : STextStyles.itemSubtitle12(context)) + .copyWith( + color: Theme.of( + context, + ).extension()!.accentColorGreen, + ), + ), + ), + ], + ), + ), + SizedBox(height: isDesktop ? 16 : 12), + PrimaryButton( + label: _canReturnToRequest ? "Back to Request" : "View My Requests", + onPressed: _canReturnToRequest ? _backToRequest : _goToMyRequests, ), ], SizedBox(height: isDesktop ? 24 : 16), // Coin list (replaces tab selector + QR + address + global button) - if (!_isExpiredOrInvalid) ...coinRows, + if (!_isExpiredOrInvalid && !_isNoPaymentRequired) ...coinRows, ], ); @@ -730,12 +709,7 @@ class _ShopInBitPaymentViewState extends ConsumerState { horizontal: 32, vertical: 8, ), - child: Stack( - children: [ - SingleChildScrollView(child: content), - if (_loading) const LoadingIndicator(width: 24, height: 24), - ], - ), + child: SingleChildScrollView(child: content), ), ), ], @@ -743,45 +717,154 @@ class _ShopInBitPaymentViewState extends ConsumerState { ); } - return Background( - child: PopScope( - canPop: false, - onPopInvokedWithResult: (bool didPop, dynamic result) { - if (!didPop) { - _popToTickets(); - } - }, - child: Scaffold( - backgroundColor: Theme.of( - context, - ).extension()!.background, - appBar: AppBar( - leading: AppBarBackButton(onPressed: _popToTickets), - title: Text("ShopinBit", style: STextStyles.navBarTitle(context)), + return ShopInBitPaymentMobileScaffold( + onBack: _popToTickets, + child: content, + ); + } +} + +class _UnownedCoinPaymentDialog extends StatelessWidget { + const _UnownedCoinPaymentDialog({ + required this.ticker, + required this.address, + required this.onCheckForPayment, + }); + + final String ticker; + final String address; + final VoidCallback onCheckForPayment; + + @override + Widget build(BuildContext context) { + final isDesktop = Util.isDesktop; + + final content = Column( + mainAxisSize: MainAxisSize.min, + children: [ + Center( + child: QR(data: address, size: isDesktop ? 200 : 180), + ), + if (ticker == "USDT") SizedBox(height: isDesktop ? 24 : 16), + if (ticker == "USDT") + RoundedContainer( + color: Theme.of( + context, + ).extension()!.warningBackground, + child: Center( + child: Text( + "IMPORTANT: Only send USDT (TRX20) to this address, not TRX", + style: (isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context).copyWith( + color: Theme.of( + context, + ).extension()!.warningForeground, + )), + ), + ), ), - body: SafeArea( - child: LayoutBuilder( - builder: (context, constraints) { - return Stack( + const SizedBox(height: 16), + GestureDetector( + onTap: () async { + await Clipboard.setData(ClipboardData(text: address)); + if (!context.mounted) return; + unawaited( + showFloatingFlushBar( + type: FlushBarType.info, + message: "Copied to clipboard", + iconAsset: Assets.svg.copy, + context: context, + ), + ); + }, + child: RoundedWhiteContainer( + child: Column( + children: [ + Row( children: [ - Padding( - padding: const EdgeInsets.all(16), - child: SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints( - minHeight: constraints.maxHeight - 32, - ), - child: IntrinsicHeight(child: content), - ), + Text( + "$ticker address", + style: isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context), + ), + const Spacer(), + CopyIcon( + width: isDesktop ? 15 : 10, + height: isDesktop ? 15 : 10, + color: Theme.of( + context, + ).extension()!.infoItemIcons, + ), + const SizedBox(width: 4), + Text("Copy", style: STextStyles.link2(context)), + ], + ), + const SizedBox(height: 4), + Row( + children: [ + Expanded( + child: Text( + address, + style: isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context), ), ), - if (_loading) const LoadingIndicator(width: 24, height: 24), ], - ); - }, + ), + ], ), ), ), + const SizedBox(height: 16), + PrimaryButton(label: "CHECK FOR PAYMENT", onPressed: onCheckForPayment), + ], + ); + + if (!isDesktop) { + return SimpleMobileDialog( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text("$ticker Payment", style: STextStyles.pageTitleH2(context)), + const SizedBox(height: 16), + content, + ], + ), + ); + } + + return SDialog( + child: SizedBox( + width: 480, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: const EdgeInsets.only(left: 32), + child: Text( + "$ticker Payment", + style: STextStyles.desktopH3(context), + ), + ), + const DesktopDialogCloseButton(), + ], + ), + Flexible( + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.fromLTRB(32, 8, 32, 32), + child: content, + ), + ), + ), + ], + ), ), ); } diff --git a/lib/pages/shopinbit/shopinbit_send_from_view.dart b/lib/pages/shopinbit/shopinbit_send_from_view.dart index d2c08e26b3..3e6bbeff1f 100644 --- a/lib/pages/shopinbit/shopinbit_send_from_view.dart +++ b/lib/pages/shopinbit/shopinbit_send_from_view.dart @@ -8,7 +8,6 @@ import 'package:flutter_svg/svg.dart'; import '../../app_config.dart'; import '../../models/isar/models/blockchain_data/address.dart'; import '../../models/isar/models/ethereum/eth_contract.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; import '../../pages_desktop_specific/desktop_home_view.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; import '../../providers/providers.dart'; @@ -45,7 +44,7 @@ class ShopInBitSendFromView extends ConsumerStatefulWidget { const ShopInBitSendFromView({ super.key, required this.coin, - required this.model, + required this.apiTicketId, this.amount, required this.address, this.shouldPopRoot = false, @@ -58,7 +57,7 @@ class ShopInBitSendFromView extends ConsumerStatefulWidget { final CryptoCurrency coin; final Amount? amount; final String address; - final ShopInBitOrderModel model; + final int apiTicketId; final bool shouldPopRoot; final EthContract? tokenContract; // If set, overrides the default success route (HomeView/DesktopHomeView). @@ -73,7 +72,7 @@ class _ShopInBitSendFromViewState extends ConsumerState { late final CryptoCurrency coin; late final Amount? amount; late final String address; - late final ShopInBitOrderModel model; + late final int apiTicketId; late final EthContract? tokenContract; @override @@ -81,7 +80,7 @@ class _ShopInBitSendFromViewState extends ConsumerState { coin = widget.coin; address = widget.address; amount = widget.amount; - model = widget.model; + apiTicketId = widget.apiTicketId; tokenContract = widget.tokenContract; super.initState(); } @@ -196,7 +195,7 @@ class _ShopInBitSendFromViewState extends ConsumerState { walletId: walletIds[index], amount: amount, address: address, - model: model, + apiTicketId: apiTicketId, tokenContract: tokenContract, routeOnSuccessName: widget.routeOnSuccessName, ), @@ -217,7 +216,7 @@ class ShopInBitSendFromCard extends ConsumerStatefulWidget { required this.walletId, this.amount, required this.address, - required this.model, + required this.apiTicketId, this.tokenContract, this.routeOnSuccessName, }); @@ -225,7 +224,7 @@ class ShopInBitSendFromCard extends ConsumerStatefulWidget { final String walletId; final Amount? amount; final String address; - final ShopInBitOrderModel model; + final int apiTicketId; final EthContract? tokenContract; final String? routeOnSuccessName; @@ -238,7 +237,7 @@ class _ShopInBitSendFromCardState extends ConsumerState { late final String walletId; late final Amount? amount; late final String address; - late final ShopInBitOrderModel model; + late final int apiTicketId; late final EthContract? tokenContract; Future _send() async { @@ -380,7 +379,7 @@ class _ShopInBitSendFromCardState extends ConsumerState { (Util.isDesktop ? DesktopHomeView.routeName : HomeView.routeName), - model: model, + apiTicketId: apiTicketId, tokenContract: tokenContract, ), settings: const RouteSettings( @@ -431,7 +430,7 @@ class _ShopInBitSendFromCardState extends ConsumerState { walletId = widget.walletId; amount = widget.amount; address = widget.address; - model = widget.model; + apiTicketId = widget.apiTicketId; tokenContract = widget.tokenContract; super.initState(); } diff --git a/lib/pages/shopinbit/shopinbit_settings_view.dart b/lib/pages/shopinbit/shopinbit_settings_view.dart index a4b36b2ab8..fd7833954c 100644 --- a/lib/pages/shopinbit/shopinbit_settings_view.dart +++ b/lib/pages/shopinbit/shopinbit_settings_view.dart @@ -10,6 +10,7 @@ import '../../providers/global/shopin_bit_service_provider.dart'; import '../../providers/providers.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/assets.dart'; +import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../widgets/background.dart'; @@ -37,31 +38,21 @@ class ShopInBitSettingsView extends ConsumerStatefulWidget { class _ShopInBitSettingsViewState extends ConsumerState { final _manualKeyController = TextEditingController(); - final _displayNameController = TextEditingController(); String? _currentKey; bool _loading = false; - bool _savingName = false; @override void initState() { super.initState(); - // not the greatest solution but its the least invasive with the current - // ui code impl () async { final settings = await ref .read(pSharedDrift) - .shopinBitSettingsDao - .getSettings(); + .shopInBitSettingsDao + .getCurrentSettings(); if (mounted) { - final key = await ref.read(pShopinBitService).loadCustomerKey(); - if (mounted) { - setState(() { - _currentKey = key; - _displayNameController.text = settings.displayName ?? ""; - }); - } + setState(() => _currentKey = settings?.customerKey); } }(); } @@ -69,30 +60,9 @@ class _ShopInBitSettingsViewState extends ConsumerState { @override void dispose() { _manualKeyController.dispose(); - _displayNameController.dispose(); super.dispose(); } - Future _saveDisplayName() async { - final name = _displayNameController.text.trim(); - if (name.isEmpty) return; - setState(() => _savingName = true); - try { - await ref.read(pSharedDrift).shopinBitSettingsDao.setDisplayName(name); - if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.success, - message: "Display name updated", - context: context, - ), - ); - } - } finally { - if (mounted) setState(() => _savingName = false); - } - } - Future _generate() async { if (_currentKey != null) { final proceed = await _showChangeWarning(); @@ -103,9 +73,7 @@ class _ShopInBitSettingsViewState extends ConsumerState { try { final String key; if (_currentKey != null) { - final resp = await ref.read(pShopinBitService).client.generateKey(); - key = resp.valueOrThrow; - await ref.read(pShopinBitService).setCustomerKey(key); + key = await ref.read(pShopinBitService).generateCustomerKey(); } else { key = await ref.read(pShopinBitService).ensureCustomerKey(); } @@ -119,18 +87,28 @@ class _ShopInBitSettingsViewState extends ConsumerState { ), ); } - } catch (e) { + } catch (e, s) { + Logging.instance.e( + "Failed to generate ShopInBit customer key", + error: e, + stackTrace: s, + ); if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: "Failed to generate key: $e", - context: context, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to generate key", + maxWidth: Util.isDesktop ? 500 : null, + message: e.toString(), + desktopPopRootNavigator: Util.isDesktop, ), ); } } finally { - setState(() => _loading = false); + // Awaiting the error dialog above means the widget can unmount before + // we get here. + if (mounted) setState(() => _loading = false); } } @@ -145,7 +123,7 @@ class _ShopInBitSettingsViewState extends ConsumerState { setState(() => _loading = true); try { - await ref.read(pShopinBitService).setCustomerKey(newKey); + await ref.read(pShopinBitService).recoverCustomerKey(newKey); setState(() { _currentKey = newKey; _manualKeyController.clear(); @@ -159,18 +137,28 @@ class _ShopInBitSettingsViewState extends ConsumerState { ), ); } - } catch (e) { + } catch (e, s) { + Logging.instance.e( + "Failed to set ShopInBit customer key", + error: e, + stackTrace: s, + ); if (mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: "Failed to set key: $e", - context: context, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to set key", + maxWidth: Util.isDesktop ? 500 : null, + message: e.toString(), + desktopPopRootNavigator: Util.isDesktop, ), ); } } finally { - setState(() => _loading = false); + // Awaiting the error dialog above means the widget can unmount before + // we get here. + if (mounted) setState(() => _loading = false); } } @@ -488,38 +476,6 @@ class _ShopInBitSettingsViewState extends ConsumerState { label: "Set key", onPressed: _setManualKey, ), - const SizedBox(height: 20), - Text( - "Display Name", - style: STextStyles.desktopTextSmall(context), - ), - const SizedBox(height: 8), - Text( - "The name ShopinBit staff will see " - "when communicating with you.", - style: STextStyles.desktopTextExtraExtraSmall( - context, - ), - ), - const SizedBox(height: 16), - SizedBox( - width: 512, - child: AdaptiveTextField( - labelText: "Display name", - controller: _displayNameController, - onChangedComprehensive: (_) => setState(() {}), - ), - ), - const SizedBox(height: 16), - PrimaryButton( - width: 210, - buttonHeight: ButtonHeight.m, - enabled: - !_savingName && - _displayNameController.text.trim().isNotEmpty, - label: "Save", - onPressed: _saveDisplayName, - ), ], ), ), @@ -682,43 +638,6 @@ class _ShopInBitSettingsViewState extends ConsumerState { ), ), const SizedBox(height: 12), - RoundedWhiteContainer( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Display Name", - style: STextStyles.titleBold12(context), - ), - const SizedBox(height: 8), - Text( - "The name ShopinBit staff will see " - "when communicating with you.", - style: STextStyles.itemSubtitle12( - context, - ), - ), - const SizedBox(height: 12), - AdaptiveTextField( - labelText: "Display name", - controller: _displayNameController, - onChangedComprehensive: (_) => - setState(() {}), - ), - const SizedBox(height: 12), - PrimaryButton( - label: "Save", - enabled: - !_savingName && - _displayNameController.text - .trim() - .isNotEmpty, - onPressed: _saveDisplayName, - ), - ], - ), - ), - const SizedBox(height: 12), ], ), ), @@ -790,6 +709,7 @@ class _VerifyKeyDialogState extends State<_VerifyKeyDialog> { child: ConditionalParent( condition: !Util.isDesktop, builder: (child) => StackDialogBase( + keyboardPaddingAmount: MediaQuery.of(context).viewInsets.bottom, child: Column( mainAxisSize: .min, children: [ @@ -832,7 +752,7 @@ class _VerifyKeyDialogState extends State<_VerifyKeyDialog> { Expanded( child: SecondaryButton( label: "Cancel", - buttonHeight: ButtonHeight.l, + buttonHeight: Util.isDesktop ? ButtonHeight.l : null, onPressed: () => Navigator.of( context, rootNavigator: Util.isDesktop, @@ -845,7 +765,7 @@ class _VerifyKeyDialogState extends State<_VerifyKeyDialog> { Expanded( child: PrimaryButton( label: "Confirm", - buttonHeight: ButtonHeight.l, + buttonHeight: Util.isDesktop ? ButtonHeight.l : null, enabled: _confirmEnabled, onPressed: _confirmEnabled ? () => Navigator.of( diff --git a/lib/pages/shopinbit/shopinbit_setup_view.dart b/lib/pages/shopinbit/shopinbit_setup_view.dart index 1ce525f258..6e6ba90fb6 100644 --- a/lib/pages/shopinbit/shopinbit_setup_view.dart +++ b/lib/pages/shopinbit/shopinbit_setup_view.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; import '../../notifications/show_flush_bar.dart'; import '../../providers/db/drift_provider.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; @@ -11,63 +10,45 @@ import '../../utilities/text_styles.dart'; import '../../widgets/background.dart'; import '../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../widgets/desktop/primary_button.dart'; +import '../../widgets/icon_widgets/copy_icon.dart'; import '../../widgets/rounded_white_container.dart'; -import '../../widgets/textfields/adaptive_text_field.dart'; import 'shopinbit_step_2.dart'; class ShopInBitSetupView extends ConsumerStatefulWidget { - const ShopInBitSetupView({super.key, required this.model}); + const ShopInBitSetupView({super.key}); static const String routeName = "/shopInBitSetup"; - final ShopInBitOrderModel model; - @override ConsumerState createState() => _ShopInBitSetupViewState(); } class _ShopInBitSetupViewState extends ConsumerState { late final Future _keyFuture; - final TextEditingController _nameController = TextEditingController(); - - bool get _canContinue => _nameController.text.trim().isNotEmpty; + String? _key; @override void initState() { super.initState(); _keyFuture = ref.read(pShopinBitService).ensureCustomerKey(); - - // not the greatest solution but its the least invasive with the current - // ui code impl () async { - final settings = await ref - .read(pSharedDrift) - .shopinBitSettingsDao - .getSettings(); - if (mounted) { - setState(() { - _nameController.text = settings.displayName ?? ""; - }); - } + final key = await _keyFuture; + if (mounted) setState(() => _key = key); }(); } - @override - void dispose() { - _nameController.dispose(); - super.dispose(); - } - Future _completeSetup() async { - final name = _nameController.text.trim(); - widget.model.displayName = name; - await ref.read(pSharedDrift).shopinBitSettingsDao.setDisplayName(name); - await ref.read(pSharedDrift).shopinBitSettingsDao.setSetupComplete(true); + final key = _key; + if (key == null) return; + await ref + .read(pSharedDrift) + .shopInBitSettingsDao + .setSetupComplete(key, true); if (mounted) { await Navigator.of( context, - ).pushReplacementNamed(ShopInBitStep2.routeName, arguments: widget.model); + ).pushReplacementNamed(ShopInBitStep2.routeName); } } @@ -141,7 +122,10 @@ class _ShopInBitSetupViewState extends ConsumerState { ), ), IconButton( - icon: const Icon(Icons.copy, size: 20), + icon: const CopyIcon( + width: 20, + height: 20, + ), onPressed: () { Clipboard.setData( ClipboardData(text: key), @@ -158,24 +142,11 @@ class _ShopInBitSetupViewState extends ConsumerState { ); }, ), - const SizedBox(height: 32), - Text( - "Set a Display Name to use with ShopinBit staff", - style: STextStyles.smallMed12(context), - ), - const SizedBox(height: 8), - AdaptiveTextField( - labelText: "Display name", - controller: _nameController, - autocorrect: false, - enableSuggestions: false, - onChangedComprehensive: (_) => setState(() {}), - ), const Spacer(), PrimaryButton( label: "Complete Setup", - enabled: _canContinue, - onPressed: _canContinue ? _completeSetup : null, + enabled: _key != null, + onPressed: _key != null ? _completeSetup : null, ), ], ), diff --git a/lib/pages/shopinbit/shopinbit_shipping_view.dart b/lib/pages/shopinbit/shopinbit_shipping_view.dart index ccebcb30b1..c29aa9dd60 100644 --- a/lib/pages/shopinbit/shopinbit_shipping_view.dart +++ b/lib/pages/shopinbit/shopinbit_shipping_view.dart @@ -1,32 +1,40 @@ import 'dart:async'; -import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_svg/svg.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../db/drift/shared_db/shared_database.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; import '../../services/shopinbit/src/models/address.dart'; +import '../../services/shopinbit/src/models/payment.dart'; import '../../themes/stack_colors.dart'; -import '../../utilities/assets.dart'; -import '../../utilities/constants.dart'; +import '../../utilities/logger.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../widgets/background.dart'; import '../../widgets/custom_buttons/app_bar_icon_button.dart'; -import '../../widgets/desktop/desktop_dialog.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; +import '../../widgets/detail_item.dart'; +import '../../widgets/dialogs/s_dialog.dart'; +import '../../widgets/stack_dialog.dart'; import '../../widgets/textfields/adaptive_text_field.dart'; +import 'shopinbit_payment_shared.dart'; import 'shopinbit_payment_view.dart'; +import 'step_4_components/shopinbit_country_picker.dart'; +import 'step_4_components/shopinbit_state_picker.dart'; class ShopInBitShippingView extends ConsumerStatefulWidget { - const ShopInBitShippingView({super.key, required this.model}); + const ShopInBitShippingView({ + super.key, + required this.ticket, + required this.countries, + }); static const String routeName = "/shopInBitShipping"; - final ShopInBitOrderModel model; + final ShopInBitTicket ticket; + final List> countries; @override ConsumerState createState() => @@ -34,25 +42,25 @@ class ShopInBitShippingView extends ConsumerStatefulWidget { } class _ShopInBitShippingViewState extends ConsumerState { - late final TextEditingController _nameController; + late final TextEditingController _nameFirstController; + late final TextEditingController _nameLastController; late final TextEditingController _streetController; late final TextEditingController _cityController; late final TextEditingController _postalCodeController; - final TextEditingController _countrySearchController = - TextEditingController(); - late final FocusNode _nameFocusNode; + late final FocusNode _nameFirstFocusNode; + late final FocusNode _nameLastFocusNode; late final FocusNode _streetFocusNode; late final FocusNode _cityFocusNode; late final FocusNode _postalCodeFocusNode; // Billing address controllers - late final TextEditingController _billingNameController; + late final TextEditingController _billingFirstNameController; + late final TextEditingController _billingLastNameController; late final TextEditingController _billingStreetController; late final TextEditingController _billingCityController; late final TextEditingController _billingPostalCodeController; - final TextEditingController _billingCountrySearchController = - TextEditingController(); - late final FocusNode _billingNameFocusNode; + late final FocusNode _billingFirstNameFocusNode; + late final FocusNode _billingLastNameFocusNode; late final FocusNode _billingStreetFocusNode; late final FocusNode _billingCityFocusNode; late final FocusNode _billingPostalCodeFocusNode; @@ -60,23 +68,29 @@ class _ShopInBitShippingViewState extends ConsumerState { String? _billingSelectedCountryIso; bool _differentBilling = false; - List> _countries = []; - String? _selectedCountryIso; - bool _loadingCountries = false; + late final String _selectedCountryIso; + late final String _deliveryCountryLabel; + + late final String? _selectedState; + + String? _selectedBillingState; + + late bool _requiresState; bool _submitting = false; bool get _canContinue { if (_submitting) return false; final shippingValid = - _nameController.text.trim().isNotEmpty && + _nameFirstController.text.trim().isNotEmpty && + _nameLastController.text.trim().isNotEmpty && _streetController.text.trim().isNotEmpty && _cityController.text.trim().isNotEmpty && - _postalCodeController.text.trim().isNotEmpty && - _selectedCountryIso != null; + _postalCodeController.text.trim().isNotEmpty; if (!shippingValid) return false; if (_differentBilling) { - return _billingNameController.text.trim().isNotEmpty && + return _billingFirstNameController.text.trim().isNotEmpty && + _billingLastNameController.text.trim().isNotEmpty && _billingStreetController.text.trim().isNotEmpty && _billingCityController.text.trim().isNotEmpty && _billingPostalCodeController.text.trim().isNotEmpty && @@ -88,168 +102,198 @@ class _ShopInBitShippingViewState extends ConsumerState { @override void initState() { super.initState(); - _nameController = TextEditingController(); + _nameFirstController = TextEditingController(); + _nameLastController = TextEditingController(); _streetController = TextEditingController(); _cityController = TextEditingController(); _postalCodeController = TextEditingController(); - _nameFocusNode = FocusNode(); + _nameFirstFocusNode = FocusNode(); + _nameLastFocusNode = FocusNode(); _streetFocusNode = FocusNode(); _cityFocusNode = FocusNode(); _postalCodeFocusNode = FocusNode(); - _billingNameController = TextEditingController(); + _billingFirstNameController = TextEditingController(); + _billingLastNameController = TextEditingController(); _billingStreetController = TextEditingController(); _billingCityController = TextEditingController(); _billingPostalCodeController = TextEditingController(); - _billingNameFocusNode = FocusNode(); + _billingFirstNameFocusNode = FocusNode(); + _billingLastNameFocusNode = FocusNode(); _billingStreetFocusNode = FocusNode(); _billingCityFocusNode = FocusNode(); _billingPostalCodeFocusNode = FocusNode(); - _selectedCountryIso = widget.model.deliveryCountry.isNotEmpty - ? widget.model.deliveryCountry - : null; + _selectedCountryIso = widget.ticket.deliveryCountry; + + _requiresState = switch (_selectedCountryIso) { + "US" || "CA" => widget.ticket.category != .travel, + _ => false, + }; + + if (_requiresState) { + final parts = widget.ticket.messages.firstOrNull?.content.split("\n"); + if (parts == null) { + Logging.instance.f("Missing state/province where required!"); + throw ArgumentError("Missing first ticket message"); + } + + final line = parts + .where((e) => e.startsWith("Delivery state:")) + .firstOrNull; + if (line == null) { + Logging.instance.f("Missing delivery state/province in first message!"); + throw ArgumentError("Missing state/province in first ticket message"); + } + + _selectedState = line.replaceFirst("Delivery state:", "").trim(); + } else { + _selectedState = null; + } + + // firstWhere should never fail here as the caller of this widget must + // check that countries contains the expected value. Failure here should be + // considered unrecoverable/fatal as it indicates a bug elsewhere + _deliveryCountryLabel = + widget.countries.firstWhere( + (e) => e["iso"] == _selectedCountryIso, + )["label"] + as String; for (final node in [ - _nameFocusNode, + _nameFirstFocusNode, + _nameLastFocusNode, _streetFocusNode, _cityFocusNode, _postalCodeFocusNode, - _billingNameFocusNode, + _billingFirstNameFocusNode, + _billingLastNameFocusNode, _billingStreetFocusNode, _billingCityFocusNode, _billingPostalCodeFocusNode, ]) { node.addListener(() => setState(() {})); } - - _fetchCountries(); } @override void dispose() { - _nameController.dispose(); + _nameFirstController.dispose(); + _nameLastController.dispose(); _streetController.dispose(); _cityController.dispose(); _postalCodeController.dispose(); - _countrySearchController.dispose(); - _nameFocusNode.dispose(); + _nameFirstFocusNode.dispose(); + _nameLastFocusNode.dispose(); _streetFocusNode.dispose(); _cityFocusNode.dispose(); _postalCodeFocusNode.dispose(); - _billingNameController.dispose(); + _billingFirstNameController.dispose(); + _billingLastNameController.dispose(); _billingStreetController.dispose(); _billingCityController.dispose(); _billingPostalCodeController.dispose(); - _billingCountrySearchController.dispose(); - _billingNameFocusNode.dispose(); + _billingFirstNameFocusNode.dispose(); + _billingLastNameFocusNode.dispose(); _billingStreetFocusNode.dispose(); _billingCityFocusNode.dispose(); _billingPostalCodeFocusNode.dispose(); super.dispose(); } - Future _fetchCountries() async { - setState(() => _loadingCountries = true); - try { - final resp = await ref.read(pShopinBitService).client.getCountries(); - if (resp.hasError || resp.value == null) return; - _countries = resp.value!; - if (_selectedCountryIso != null && - !_countries.any((c) => c['iso'] == _selectedCountryIso)) { - _selectedCountryIso = null; - } - } catch (_) { - // leave list empty; user will see no items - } finally { - if (mounted) setState(() => _loadingCountries = false); - } - } - Future _continue() async { - final name = _nameController.text.trim(); + final nameFirst = _nameFirstController.text.trim(); + final nameLast = _nameLastController.text.trim(); final street = _streetController.text.trim(); final city = _cityController.text.trim(); final postalCode = _postalCodeController.text.trim(); - final country = _selectedCountryIso!; - - widget.model.setShippingAddress( - name: name, - street: street, - city: city, - postalCode: postalCode, - country: country, - ); + final country = _selectedCountryIso; + + PaymentInfo? paymentInfo; + setState(() => _submitting = true); + try { + Address? billingAddress; + if (_differentBilling) { + billingAddress = Address( + firstName: _billingFirstNameController.text.trim(), + lastName: _billingLastNameController.text.trim(), + street: _billingStreetController.text.trim(), + zip: _billingPostalCodeController.text.trim(), + city: _billingCityController.text.trim(), + country: _requiresState ? country : _billingSelectedCountryIso!, + state: _requiresState ? _selectedState : _selectedBillingState, + ); + } - if (widget.model.apiTicketId != 0) { - setState(() => _submitting = true); - try { - // Split name into first/last - final parts = name.split(' '); - final firstName = parts.first; - final lastName = parts.length > 1 ? parts.sublist(1).join(' ') : ''; - - Address? billingAddress; - if (_differentBilling) { - final billingName = _billingNameController.text.trim(); - final billingParts = billingName.split(' '); - final billingFirst = billingParts.first; - final billingLast = billingParts.length > 1 - ? billingParts.sublist(1).join(' ') - : ''; - billingAddress = Address( - firstName: billingFirst, - lastName: billingLast, - street: _billingStreetController.text.trim(), - zip: _billingPostalCodeController.text.trim(), - city: _billingCityController.text.trim(), - country: _billingSelectedCountryIso!, + final resp = await ref + .read(pShopinBitService) + .client + .submitAddress( + widget.ticket.apiTicketId, + shipping: Address( + firstName: nameFirst, + lastName: nameLast, + street: street, + zip: postalCode, + city: city, + country: country, + state: _requiresState ? _selectedState! : null, + ), + billing: billingAddress, + customerKey: widget.ticket.customerKey, ); - } - - final resp = await ref - .read(pShopinBitService) - .client - .submitAddress( - widget.model.apiTicketId, - shipping: Address( - firstName: firstName, - lastName: lastName, - street: street, - zip: postalCode, - city: city, - country: country, - ), - billing: billingAddress, - ); - - if (resp.hasError) { - // Sandbox may fail here; continue anyway. - debugPrint("submitAddress failed: ${resp.exception?.message}"); - } - } catch (e) { - debugPrint("submitAddress threw: $e"); - } finally { - if (mounted) setState(() => _submitting = false); + + if (resp.hasError) { + // Sandbox may fail here; continue anyway. + Logging.instance.w("submitAddress failed", error: resp.exception); } + + paymentInfo = await fetchShopInBitPaymentInfo( + ref.read(pShopinBitService).client, + widget.ticket.apiTicketId, + widget.ticket.customerKey, + ); + } catch (e, s) { + Logging.instance.e("submitAddress threw", error: e, stackTrace: s); + } finally { + if (mounted) setState(() => _submitting = false); } if (!mounted) return; - if (Util.isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - unawaited( - showDialog( - context: context, - builder: (_) => ShopInBitPaymentView(model: widget.model), - ), - ); - } else { - unawaited( - Navigator.of( - context, - ).pushNamed(ShopInBitPaymentView.routeName, arguments: widget.model), + + // no_payment_required legitimately has empty payment_links (voucher/credit + // covers it): open the payment view, which shows a "covered" state. + if (paymentInfo == null || + (paymentInfo.paymentLinks.isEmpty && + paymentInfo.status != 'no_payment_required')) { + // No live invoice; don't open a payment view with empty addresses. + await _showPaymentLoadError( + "We couldn't load the payment details for this order. " + "Please try again in a moment.", ); + return; } + + await Navigator.of(context).pushNamed( + ShopInBitPaymentView.routeName, + arguments: ( + apiTicketId: widget.ticket.apiTicketId, + paymentInfo: paymentInfo, + ), + ); + } + + Future _showPaymentLoadError(String message) async { + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Couldn't load payment details", + maxWidth: Util.isDesktop ? 500 : null, + message: message, + desktopPopRootNavigator: Util.isDesktop, + ), + ); } @override @@ -258,6 +302,7 @@ class _ShopInBitShippingViewState extends ConsumerState { final spacing = SizedBox(height: isDesktop ? 16 : 12); final content = Column( + mainAxisSize: .min, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Text( @@ -275,9 +320,18 @@ class _ShopInBitShippingViewState extends ConsumerState { ), SizedBox(height: isDesktop ? 32 : 24), AdaptiveTextField( - controller: _nameController, - focusNode: _nameFocusNode, - labelText: "Full name", + controller: _nameFirstController, + focusNode: _nameFirstFocusNode, + labelText: "First name", + autocorrect: false, + enableSuggestions: false, + onChanged: (_) => setState(() {}), + ), + spacing, + AdaptiveTextField( + controller: _nameLastController, + focusNode: _nameLastFocusNode, + labelText: "Last name", autocorrect: false, enableSuggestions: false, onChanged: (_) => setState(() {}), @@ -317,119 +371,10 @@ class _ShopInBitShippingViewState extends ConsumerState { ), ], ), + if (_requiresState) spacing, + if (_requiresState) DetailItem(title: "State", detail: _selectedState!), spacing, - ClipRRect( - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - child: DropdownButtonHideUnderline( - child: DropdownButton2( - value: _selectedCountryIso, - items: _countries - .map( - (c) => DropdownMenuItem( - value: c['iso'] as String, - child: Text( - c['label'] as String, - style: isDesktop - ? STextStyles.desktopTextExtraSmall( - context, - ).copyWith( - color: Theme.of( - context, - ).extension()!.textFieldActiveText, - ) - : STextStyles.w500_14(context), - ), - ), - ) - .toList(), - onMenuStateChange: (isOpen) { - if (!isOpen) { - _countrySearchController.clear(); - } - }, - onChanged: null, - hint: Text( - "Country", - style: isDesktop - ? STextStyles.desktopTextExtraSmall(context).copyWith( - color: Theme.of(context) - .extension()! - .textFieldDefaultSearchIconLeft, - ) - : STextStyles.fieldLabel(context), - ), - isExpanded: true, - buttonStyleData: ButtonStyleData( - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - iconStyleData: IconStyleData( - icon: Padding( - padding: const EdgeInsets.only(right: 10), - child: SvgPicture.asset( - Assets.svg.chevronDown, - width: 12, - height: 6, - color: Theme.of( - context, - ).extension()!.textFieldActiveSearchIconRight, - ), - ), - ), - dropdownStyleData: DropdownStyleData( - offset: const Offset(0, 0), - elevation: 0, - maxHeight: 300, - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - dropdownSearchData: DropdownSearchData( - searchController: _countrySearchController, - searchInnerWidgetHeight: 48, - searchInnerWidget: TextFormField( - controller: _countrySearchController, - decoration: InputDecoration( - isDense: true, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 14, - ), - hintText: "Search...", - hintStyle: STextStyles.fieldLabel(context), - border: InputBorder.none, - ), - ), - searchMatchFn: (item, searchValue) { - final label = _countries - .where((c) => c['iso'] == item.value) - .map((c) => c['label'] as String) - .firstOrNull; - return label?.toLowerCase().contains( - searchValue.toLowerCase(), - ) ?? - false; - }, - ), - menuItemStyleData: const MenuItemStyleData( - padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - ), - ), - ), - ), + DetailItem(title: "Country", detail: _deliveryCountryLabel), spacing, // Billing address toggle. GestureDetector( @@ -438,11 +383,13 @@ class _ShopInBitShippingViewState extends ConsumerState { _differentBilling = !_differentBilling; if (!_differentBilling) { // Clear billing fields. - _billingNameController.clear(); + _billingFirstNameController.clear(); + _billingLastNameController.clear(); _billingStreetController.clear(); _billingCityController.clear(); _billingPostalCodeController.clear(); _billingSelectedCountryIso = null; + _selectedBillingState = null; } }); }, @@ -457,11 +404,13 @@ class _ShopInBitShippingViewState extends ConsumerState { setState(() { _differentBilling = v ?? false; if (!_differentBilling) { - _billingNameController.clear(); + _billingFirstNameController.clear(); + _billingLastNameController.clear(); _billingStreetController.clear(); _billingCityController.clear(); _billingPostalCodeController.clear(); _billingSelectedCountryIso = null; + _selectedBillingState = null; } }); }, @@ -493,9 +442,17 @@ class _ShopInBitShippingViewState extends ConsumerState { ), spacing, AdaptiveTextField( - controller: _billingNameController, - focusNode: _billingNameFocusNode, - labelText: "Full name", + controller: _billingFirstNameController, + labelText: "First name", + focusNode: _billingFirstNameFocusNode, + autocorrect: false, + enableSuggestions: false, + onChanged: (_) => setState(() {}), + ), + AdaptiveTextField( + controller: _billingLastNameController, + labelText: "Last name", + focusNode: _billingLastNameFocusNode, autocorrect: false, enableSuggestions: false, onChanged: (_) => setState(() {}), @@ -536,125 +493,35 @@ class _ShopInBitShippingViewState extends ConsumerState { ], ), spacing, - // Billing country dropdown. - ClipRRect( - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, + + if (_requiresState) ...[ + DetailItem(title: "Billing state", detail: _selectedState!), + spacing, + DetailItem(title: "Billing country", detail: _deliveryCountryLabel), + ], + + if (!_requiresState) ...[ + ShopInBitStatePicker( + countryIso: _billingSelectedCountryIso!, + selectedState: _selectedBillingState, + onChanged: (state) { + if (state != _selectedBillingState && mounted) { + setState(() { + _selectedBillingState = state; + }); + } + }, ), - child: DropdownButtonHideUnderline( - child: DropdownButton2( - value: _billingSelectedCountryIso, - items: _countries - .map( - (c) => DropdownMenuItem( - value: c['iso'] as String, - child: Text( - c['label'] as String, - style: isDesktop - ? STextStyles.desktopTextExtraSmall( - context, - ).copyWith( - color: Theme.of(context) - .extension()! - .textFieldActiveText, - ) - : STextStyles.w500_14(context), - ), - ), - ) - .toList(), - onMenuStateChange: (isOpen) { - if (!isOpen) { - _billingCountrySearchController.clear(); - } - }, - onChanged: _loadingCountries - ? null - : (value) { - setState(() { - _billingSelectedCountryIso = value; - }); - }, - hint: Text( - _loadingCountries ? "Loading countries..." : "Country", - style: isDesktop - ? STextStyles.desktopTextExtraSmall(context).copyWith( - color: Theme.of(context) - .extension()! - .textFieldDefaultSearchIconLeft, - ) - : STextStyles.fieldLabel(context), - ), - isExpanded: true, - buttonStyleData: ButtonStyleData( - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - iconStyleData: IconStyleData( - icon: Padding( - padding: const EdgeInsets.only(right: 10), - child: SvgPicture.asset( - Assets.svg.chevronDown, - width: 12, - height: 6, - color: Theme.of(context) - .extension()! - .textFieldActiveSearchIconRight, - ), - ), - ), - dropdownStyleData: DropdownStyleData( - offset: const Offset(0, 0), - elevation: 0, - maxHeight: 300, - decoration: BoxDecoration( - color: Theme.of( - context, - ).extension()!.textFieldDefaultBG, - borderRadius: BorderRadius.circular( - Constants.size.circularBorderRadius, - ), - ), - ), - dropdownSearchData: DropdownSearchData( - searchController: _billingCountrySearchController, - searchInnerWidgetHeight: 48, - searchInnerWidget: TextFormField( - controller: _billingCountrySearchController, - decoration: InputDecoration( - isDense: true, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 14, - ), - hintText: "Search...", - hintStyle: STextStyles.fieldLabel(context), - border: InputBorder.none, - ), - ), - searchMatchFn: (item, searchValue) { - final label = _countries - .where((c) => c['iso'] == item.value) - .map((c) => c['label'] as String) - .firstOrNull; - return label?.toLowerCase().contains( - searchValue.toLowerCase(), - ) ?? - false; - }, - ), - menuItemStyleData: const MenuItemStyleData( - padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - ), - ), + spacing, + ShopInBitCountryPicker( + hintText: "Billing country", + selectedIso: _billingSelectedCountryIso, + onChanged: (data) => setState(() { + _billingSelectedCountryIso = data?.code; + _requiresState = data?.requiresState ?? false; + }), ), - ), + ], ], const SizedBox(height: 24), PrimaryButton( @@ -666,34 +533,38 @@ class _ShopInBitShippingViewState extends ConsumerState { ); if (isDesktop) { - return DesktopDialog( - maxWidth: 580, - maxHeight: 700, - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: const EdgeInsets.only(left: 32), - child: Text( - "ShopinBit", - style: STextStyles.desktopH3(context), + return SDialog( + child: SizedBox( + width: 580, + child: Column( + mainAxisSize: .min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: const EdgeInsets.only(left: 32), + child: Text( + "ShopinBit", + style: STextStyles.desktopH3(context), + ), ), + const DesktopDialogCloseButton(), + ], + ), + Flexible( + child: Padding( + padding: const .only( + left: 32, + right: 32, + bottom: 32, + top: 16, + ), + child: SingleChildScrollView(child: content), ), - const DesktopDialogCloseButton(), - ], - ), - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32, - vertical: 16, - ), - child: SingleChildScrollView(child: content), ), - ), - ], + ], + ), ), ); } diff --git a/lib/pages/shopinbit/shopinbit_step_1.dart b/lib/pages/shopinbit/shopinbit_step_1.dart deleted file mode 100644 index a1fa23694c..0000000000 --- a/lib/pages/shopinbit/shopinbit_step_1.dart +++ /dev/null @@ -1,167 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../models/shopinbit/shopinbit_order_model.dart'; -import '../../themes/stack_colors.dart'; -import '../../utilities/text_styles.dart'; -import '../../utilities/util.dart'; -import '../../widgets/background.dart'; -import '../../widgets/conditional_parent.dart'; -import '../../widgets/custom_buttons/app_bar_icon_button.dart'; -import '../../widgets/desktop/desktop_dialog_close_button.dart'; -import '../../widgets/desktop/primary_button.dart'; -import '../../widgets/dialogs/s_dialog.dart'; -import '../../widgets/textfields/adaptive_text_field.dart'; -import '../exchange_view/sub_widgets/step_row.dart'; -import 'shopinbit_step_2.dart'; - -class ShopInBitStep1 extends StatefulWidget { - const ShopInBitStep1({super.key, required this.model}); - - static const String routeName = "/shopInBitStep1"; - - final ShopInBitOrderModel model; - - @override - State createState() => _ShopInBitStep1State(); -} - -class _ShopInBitStep1State extends State { - late final TextEditingController _nameController; - - bool _canContinue = false; - - void _continue() { - widget.model.displayName = _nameController.text.trim(); - Navigator.of( - context, - ).pushNamed(ShopInBitStep2.routeName, arguments: widget.model); - } - - @override - void initState() { - super.initState(); - _canContinue = widget.model.displayName.isNotEmpty; - _nameController = TextEditingController(text: widget.model.displayName); - } - - @override - void dispose() { - _nameController.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final isDesktop = Util.isDesktop; - - return ConditionalParent( - condition: isDesktop, - builder: (child) => SDialog( - child: SizedBox( - width: 580, - child: Column( - mainAxisSize: .min, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: const EdgeInsets.only(left: 32), - child: Text( - "ShopinBit", - style: STextStyles.desktopH3(context), - ), - ), - const DesktopDialogCloseButton(), - ], - ), - Flexible( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 32), - child: child, - ), - ), - ], - ), - ), - ), - child: ConditionalParent( - condition: !isDesktop, - builder: (child) => Background( - child: Scaffold( - backgroundColor: Theme.of( - context, - ).extension()!.background, - appBar: AppBar( - leading: AppBarBackButton( - onPressed: () => Navigator.of(context).pop(), - ), - title: Text("ShopinBit", style: STextStyles.navBarTitle(context)), - ), - body: SafeArea( - child: LayoutBuilder( - builder: (context, constraints) { - return Padding( - padding: const EdgeInsets.all(16), - child: SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints( - minHeight: constraints.maxHeight - 32, - ), - child: IntrinsicHeight(child: child), - ), - ), - ); - }, - ), - ), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - if (!isDesktop) - StepRow( - count: 4, - current: 0, - width: MediaQuery.of(context).size.width - 32, - ), - const SizedBox(height: 14), - Text( - "Create your profile", - style: isDesktop - ? STextStyles.desktopH2(context) - : STextStyles.pageTitleH1(context), - ), - SizedBox(height: isDesktop ? 16 : 8), - Text( - "Enter a display name to use with ShopinBit.", - style: isDesktop - ? STextStyles.desktopTextSmall(context) - : STextStyles.itemSubtitle(context), - ), - SizedBox(height: isDesktop ? 32 : 24), - AdaptiveTextField( - labelText: "Display name", - controller: _nameController, - autocorrect: false, - enableSuggestions: false, - onChangedComprehensive: (value) { - if (mounted && _canContinue != value.isNotEmpty) { - setState(() => _canContinue = value.isNotEmpty); - } - }, - ), - isDesktop ? const SizedBox(height: 32) : const Spacer(), - PrimaryButton( - label: "Next", - enabled: _canContinue, - onPressed: _canContinue ? _continue : null, - ), - if (isDesktop) const SizedBox(height: 32), - ], - ), - ), - ); - } -} diff --git a/lib/pages/shopinbit/shopinbit_step_2.dart b/lib/pages/shopinbit/shopinbit_step_2.dart index 2a4d9f09ff..742f198e78 100644 --- a/lib/pages/shopinbit/shopinbit_step_2.dart +++ b/lib/pages/shopinbit/shopinbit_step_2.dart @@ -2,7 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../db/drift/shared_db/shared_database.dart'; +import '../../models/shopinbit/shopinbit_enums.dart'; import '../../providers/providers.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/assets.dart'; @@ -21,15 +22,10 @@ import 'shopinbit_step_3.dart'; import 'shopinbit_step_4.dart'; class ShopInBitStep2 extends ConsumerStatefulWidget { - const ShopInBitStep2({ - super.key, - required this.model, - this.isActuallyFirstStep = false, - }); + const ShopInBitStep2({super.key, this.isActuallyFirstStep = false}); static const String routeName = "/shopInBitStep2"; - final ShopInBitOrderModel model; final bool isActuallyFirstStep; @override @@ -40,32 +36,33 @@ class _ShopInBitStep2State extends ConsumerState { ShopInBitCategory? _selected; Future _continue() async { - widget.model.category = _selected; - final skipGuidelines = - (await ref.read(pSharedDrift).shopinBitSettingsDao.getSettings()) - .guidelinesAccepted; + final category = _selected!; + + final settings = await ref + .read(pSharedDrift) + .shopInBitSettingsDao + .getCurrentSettings(); + + if (settings == null) { + throw Exception("Shopinbit settings should never be null here. Fixme"); + } + if (!mounted) return; + final skipGuidelines = settings.guidelinesAcceptedFor(category); + if (skipGuidelines) { - widget.model.guidelinesAccepted = true; await Navigator.of( context, - ).pushNamed(ShopInBitStep4.routeName, arguments: widget.model); + ).pushNamed(ShopInBitStep4.routeName, arguments: category); } else { - await Navigator.of( - context, - ).pushNamed(ShopInBitStep3.routeName, arguments: widget.model); + await Navigator.of(context).pushNamed( + ShopInBitStep3.routeName, + arguments: (category: category, customerKey: settings.customerKey), + ); } } - @override - void initState() { - super.initState(); - // Reset category selection. - widget.model.category = null; - _selected = null; - } - @override Widget build(BuildContext context) { final isDesktop = Util.isDesktop; diff --git a/lib/pages/shopinbit/shopinbit_step_3.dart b/lib/pages/shopinbit/shopinbit_step_3.dart index d5cae9d600..eb997111e8 100644 --- a/lib/pages/shopinbit/shopinbit_step_3.dart +++ b/lib/pages/shopinbit/shopinbit_step_3.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../models/shopinbit/shopinbit_enums.dart'; import '../../providers/providers.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/text_styles.dart'; @@ -17,11 +17,16 @@ import '../exchange_view/sub_widgets/step_row.dart'; import 'shopinbit_step_4.dart'; class ShopInBitStep3 extends ConsumerStatefulWidget { - const ShopInBitStep3({super.key, required this.model}); + const ShopInBitStep3({ + super.key, + required this.category, + required this.customerKey, + }); static const String routeName = "/shopInBitStep3"; - final ShopInBitOrderModel model; + final ShopInBitCategory category; + final String customerKey; @override ConsumerState createState() => _ShopInBitStep3State(); @@ -31,7 +36,7 @@ class _ShopInBitStep3State extends ConsumerState { bool _agreed = false; String _guidelinesText() { - switch (widget.model.category) { + switch (widget.category) { case ShopInBitCategory.concierge: return "Concierge Service Guidelines:\n\n" "\u2022 Minimum: fee of 100 EUR or minimum order " @@ -70,19 +75,19 @@ class _ShopInBitStep3State extends ConsumerState { "disguised as vehicle purchases.\n\n" "\u2022 Provide details about the make, model, year, " "and any specific requirements."; - case null: - return ""; } } - void _continue() { - widget.model.guidelinesAccepted = true; - // Persist acceptance. - ref.read(pSharedDrift).shopinBitSettingsDao.setGuidelinesAccepted(true); + Future _continue() async { + await ref + .read(pSharedDrift) + .shopInBitSettingsDao + .setGuidelinesAccepted(widget.customerKey, widget.category, true); - Navigator.of( + if (!mounted) return; + await Navigator.of( context, - ).pushNamed(ShopInBitStep4.routeName, arguments: widget.model); + ).pushNamed(ShopInBitStep4.routeName, arguments: widget.category); } @override @@ -176,10 +181,7 @@ class _ShopInBitStep3State extends ConsumerState { ), Expanded( child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32, - vertical: 16, - ), + padding: const .only(bottom: 32, left: 32, right: 32, top: 16), child: content, ), ), diff --git a/lib/pages/shopinbit/shopinbit_step_4.dart b/lib/pages/shopinbit/shopinbit_step_4.dart index 605d6e22c7..80cf61316b 100644 --- a/lib/pages/shopinbit/shopinbit_step_4.dart +++ b/lib/pages/shopinbit/shopinbit_step_4.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; -import "../../models/shopinbit/shopinbit_order_model.dart"; +import "../../models/shopinbit/shopinbit_enums.dart"; import "../../themes/stack_colors.dart"; import "../../utilities/text_styles.dart"; import "../../utilities/util.dart"; @@ -12,15 +12,14 @@ import "../../widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog.da import "../../widgets/dialogs/s_dialog.dart"; import "step_4_components/shopinbit_car_research_form.dart"; import "step_4_components/shopinbit_concierge_form.dart"; -import "step_4_components/shopinbit_generic_form.dart"; import "step_4_components/shopinbit_travel_form.dart"; class ShopInBitStep4 extends StatelessWidget { - const ShopInBitStep4({super.key, required this.model}); + const ShopInBitStep4({super.key, required this.category}); static const String routeName = "/shopInBitStep4"; - final ShopInBitOrderModel model; + final ShopInBitCategory category; @override Widget build(BuildContext context) { @@ -30,11 +29,10 @@ class ShopInBitStep4 extends StatelessWidget { child: ConditionalParent( condition: !Util.isDesktop, builder: (child) => _ShopInBitStep4MobileShell(content: child), - child: switch (model.category) { - ShopInBitCategory.concierge => ShopInBitConciergeForm(model: model), - ShopInBitCategory.car => ShopInBitCarResearchForm(model: model), - ShopInBitCategory.travel => ShopInBitTravelForm(model: model), - null => ShopInBitGenericForm(model: model), + child: switch (category) { + ShopInBitCategory.concierge => const ShopInBitConciergeForm(), + ShopInBitCategory.car => const ShopInBitCarResearchForm(), + ShopInBitCategory.travel => const ShopInBitTravelForm(), }, ), ); diff --git a/lib/pages/shopinbit/shopinbit_ticket_detail.dart b/lib/pages/shopinbit/shopinbit_ticket_detail.dart index dc5127c573..108edbbee2 100644 --- a/lib/pages/shopinbit/shopinbit_ticket_detail.dart +++ b/lib/pages/shopinbit/shopinbit_ticket_detail.dart @@ -1,350 +1,232 @@ import 'dart:async'; -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; +import '../../db/drift/shared_db/shared_database.dart'; +import '../../models/shopinbit/shopinbit_enums.dart'; import '../../notifications/show_flush_bar.dart'; import '../../providers/db/drift_provider.dart'; -import '../../providers/global/shopin_bit_orders_provider.dart'; import '../../providers/global/shopin_bit_service_provider.dart'; -import '../../services/shopinbit/shopinbit_orders_service.dart'; +import '../../services/shopinbit/shopinbit_service.dart'; +import '../../services/shopinbit/src/api_response.dart'; +import '../../services/shopinbit/src/client.dart'; +import '../../services/shopinbit/src/models/message.dart'; +import '../../services/shopinbit/src/models/ticket.dart'; import '../../themes/stack_colors.dart'; +import '../../utilities/assets.dart'; +import '../../utilities/logger.dart'; +import '../../utilities/show_loading.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; import '../../widgets/background.dart'; import '../../widgets/conditional_parent.dart'; import '../../widgets/custom_buttons/app_bar_icon_button.dart'; +import '../../widgets/custom_buttons/blue_text_button.dart'; import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/desktop/primary_button.dart'; +import '../../widgets/detail_item.dart'; import '../../widgets/dialogs/s_dialog.dart'; +import '../../widgets/loading_indicator.dart'; import '../../widgets/refresh_control.dart'; import '../../widgets/rounded_container.dart'; import '../../widgets/rounded_white_container.dart'; import 'shopinbit_offer_view.dart'; class ShopInBitTicketDetail extends ConsumerStatefulWidget { - const ShopInBitTicketDetail({super.key, required this.model}); + const ShopInBitTicketDetail({super.key, required this.apiTicketId}); static const String routeName = "/shopInBitTicketDetail"; - final ShopInBitOrderModel model; + final int apiTicketId; @override ConsumerState createState() => _ShopInBitTicketDetailState(); } -class _ShopInBitTicketDetailState extends ConsumerState { +class _ShopInBitTicketDetailState extends ConsumerState + with WidgetsBindingObserver { late final TextEditingController _messageController; - late final ShopInBitOrdersService _ordersService; - late final ShopInBitOrderModel _model; - bool _polling = false; + late final ShopInBitService _shopinBitService; + + static const Duration _kBasePollInterval = Duration(seconds: 5); + static const Duration _kMaxPollInterval = Duration(seconds: 120); + Duration _pollInterval = _kBasePollInterval; + + // True while a `_poll` is awaiting a refresh. `_startPolling` bails when a + // poll is already running so app-resume/lifecycle events can't start a second + // loop on top of the first. + bool _pollInFlight = false; + + // True while the app is backgrounded. A poll already in flight when we get + // backgrounded checks this before re-arming its timer, so polling actually + // stops instead of quietly continuing in the background. + bool _paused = false; + + // Optimistically-shown messages the user just sent, kept until the next + // refresh folds them into the persisted ticket row. + final List _pending = []; bool _sending = false; - bool _retrying = false; + + int get _id => widget.apiTicketId; @override void initState() { super.initState(); + + _shopinBitService = ref.read(pShopinBitService); + _messageController = TextEditingController(); - _ordersService = ref.read(pShopInBitOrdersService); - _model = _ordersService.upsert(widget.model); - if (_model.apiTicketId != 0) { - WidgetsBinding.instance.addPostFrameCallback((_) { - if (!mounted) return; - _polling = true; - _ordersService.startPolling( - _model.apiTicketId, - pollInBackground: !_isCarResearch, - ); - }); - } + WidgetsBinding.instance.addObserver(this); + + // start with a refresh right away and then start polling for updates + unawaited(_refresh().then((_) => _startPolling())); } @override void dispose() { - if (_polling) { - _ordersService.stopPolling(_model.apiTicketId); - } + WidgetsBinding.instance.removeObserver(this); + _pollingTimer?.cancel(); + _pollingTimer = null; _messageController.dispose(); super.dispose(); } - bool get _isCarResearch => _model.category == ShopInBitCategory.car; + @override + void didChangeAppLifecycleState(AppLifecycleState state) { + // Don't poll while backgrounded; resume fresh when we come back. + if (state == AppLifecycleState.resumed) { + _paused = false; + _startPolling(); + } else { + _paused = true; + _pollingTimer?.cancel(); + } + } + + Timer? _pollingTimer; + Future _poll() async { + _pollInFlight = true; + bool ok = false; + try { + await _refresh(); + ok = true; + } catch (e, s) { + Logging.instance.w( + "ShopInBit ticket poll failed", + error: e, + stackTrace: s, + ); + } + _pollInFlight = false; + if (!mounted) return; + // Backgrounded while this poll was awaiting its refresh: don't re-arm. + // Resume will restart polling (`_pollInFlight` is already cleared above, so + // `_startPolling` won't be blocked). + if (_paused) return; + + final ticket = ref.read(pShopInBitTicket(_id)).asData?.value; + final isTerminal = + ticket != null && TicketState.fromString(ticket.statusRaw).isTerminal; + // Just check terminal tickets less often. Was hitting limits in testing. + final baseInterval = isTerminal ? _kMaxPollInterval : _kBasePollInterval; + + // Back off on failure (e.g. a 429), reset to the base interval on success. + _pollInterval = ok + ? baseInterval + : ShopInBitClient.nextPollBackoff(_pollInterval, _kMaxPollInterval); + _pollingTimer = Timer(_pollInterval, _poll); + } + + void _startPolling() { + // A poll is already running and will re-arm itself; don't start a second + // loop on top of it. + if (_pollInFlight) return; + _pollingTimer?.cancel(); + _pollInterval = _kBasePollInterval; + unawaited(_poll()); + } - Future _refresh() => _ordersService.refreshOne(_model.apiTicketId); + Future _refresh() => _shopinBitService.refreshOne(_id); Future _sendMessage() async { final text = _messageController.text.trim(); if (text.isEmpty || _sending) return; - setState(() => _sending = true); - _messageController.clear(); - - // Add optimistic local message - _model.addMessage( - ShopInBitMessage(text: text, timestamp: DateTime.now(), isFromUser: true), + final optimistic = TicketMessage( + timestamp: DateTime.now(), + fromAgent: false, + content: text, ); - setState(() {}); + setState(() { + _sending = true; + _pending.add(optimistic); + }); + _messageController.clear(); + var sent = false; try { - if (_model.apiTicketId != 0) { - await ref + final thisTicket = await ref + .read(pSharedDrift) + .shopInBitTicketsDao + .getByApiId(_id); + final customerKey = thisTicket?.customerKey; + if (customerKey != null) { + sent = await ref .read(pShopinBitService) - .client - .sendMessage(_model.apiTicketId, text); - // Pull fresh state from the API via the service so the watcher updates. - await _refresh(); + .sendMessage(_id, text, customerKey); } - final db = ref.read(pSharedDrift); - unawaited( - db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(_model.toCompanion()), - ); } catch (_) { - // Keep optimistic local message - } finally { - if (mounted) setState(() => _sending = false); + sent = false; } - } - Future _retryCreateRequest() async { - if (_retrying) return; - setState(() => _retrying = true); - - try { - final model = _model; - final customerKey = await ref.read(pShopinBitService).ensureCustomerKey(); - final comment = - "${model.requestDescription}\n\n" - "The Client paid the car research fee (#${model.feeTicketNumber})"; - - final reqResp = await ref - .read(pShopinBitService) - .client - .createRequest( - customerPseudonym: model.displayName, - externalCustomerKey: customerKey, - serviceType: "car_research", - comment: comment, - deliveryCountry: model.deliveryCountry, - ); - - if (reqResp.hasError || reqResp.value == null) { - if (mounted) { - setState(() => _retrying = false); - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: reqResp.exception?.message ?? "Failed to create request", - context: context, - ), - ); - } - return; - } - - final requestRef = reqResp.value!; - final requestModel = ShopInBitOrderModel() - ..ticketId = requestRef.number - ..apiTicketId = requestRef.id - ..category = ShopInBitCategory.car - ..status = ShopInBitOrderStatus.pending - ..displayName = model.displayName - ..requestDescription = model.requestDescription - ..deliveryCountry = model.deliveryCountry; - final db = ref.read(pSharedDrift); - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(requestModel.toCompanion()); - - model.needsCreateRequest = false; - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(model.toCompanion()); - - if (!mounted) return; - setState(() => _retrying = false); - - unawaited( - showFloatingFlushBar( - type: FlushBarType.success, - message: "Car research request submitted successfully!", - context: context, - ), - ); - Navigator.of(context).pop(); - } catch (e) { + if (sent) { + // Delivered. sendMessage already scheduled its own refresh and the poll + // loop reconciles regardless, so a failure pulling the server's copy in + // here must not roll the (already sent) message back. Fold it in if we + // can; otherwise leave the optimistic bubble for the next refresh. + try { + await _refresh(); + } catch (_) {} + if (mounted) setState(() => _pending.remove(optimistic)); + } else { + // The send didn't go through: roll the optimistic message back, restore + // the text so it isn't lost, and let the user know. + _pending.remove(optimistic); if (mounted) { - setState(() => _retrying = false); + if (_messageController.text.isEmpty) _messageController.text = text; unawaited( showFloatingFlushBar( type: FlushBarType.warning, - message: e.toString(), + message: 'Message failed to send', context: context, ), ); } } - } - - String _formatTime(DateTime dt) { - final local = dt.toLocal(); - final hour = local.hour.toString().padLeft(2, '0'); - final minute = local.minute.toString().padLeft(2, '0'); - final hm = "$hour:$minute"; - final now = DateTime.now(); - final isToday = - local.year == now.year && - local.month == now.month && - local.day == now.day; - return isToday ? hm : "${DateFormat('MMM d').format(local)} $hm"; - } - - static final _imgTagRegex = RegExp( - r']+src="data:image/[^;]+;base64,([^"]+)"[^>]*/?>', - caseSensitive: false, - ); - - List _buildMessageContent( - String html, - bool isDesktop, - Color? textColor, - ) { - final textStyle = - (isDesktop - ? STextStyles.desktopTextExtraExtraSmall(context) - : STextStyles.itemSubtitle12(context)) - .copyWith(color: textColor); - - final widgets = []; - var lastEnd = 0; - - for (final match in _imgTagRegex.allMatches(html)) { - // Add any text before this - if (match.start > lastEnd) { - final textChunk = html - .substring(lastEnd, match.start) - .replaceAll(RegExp(r''), '') - .replaceAll(RegExp(r''), '\n') - .replaceAll(RegExp(r'<[^>]*>'), '') - .trim(); - if (textChunk.isNotEmpty) { - widgets.add(Text(textChunk, style: textStyle)); - } - } - - // Decode and render the image - try { - final bytes = base64Decode(match.group(1)!); - widgets.add( - Padding( - padding: const EdgeInsets.symmetric(vertical: 4), - child: Image.memory(bytes), - ), - ); - } catch (_) { - // Skip malformed images - } - - lastEnd = match.end; - } - - // Add any remaining text after the last - if (lastEnd < html.length) { - final textChunk = html - .substring(lastEnd) - .replaceAll(RegExp(r''), '') - .replaceAll(RegExp(r''), '\n') - .replaceAll(RegExp(r'<[^>]*>'), '') - .trim(); - if (textChunk.isNotEmpty) { - widgets.add(Text(textChunk, style: textStyle)); - } - } - - if (widgets.isEmpty) { - widgets.add(Text('', style: textStyle)); - } - - return widgets; - } - - Widget _chatBubble(ShopInBitMessage message, bool isDesktop) { - final textColor = message.isFromUser - ? Theme.of(context).extension()!.buttonTextPrimary - : Theme.of(context).extension()!.buttonTextSecondary; - - return Align( - alignment: message.isFromUser - ? Alignment.centerRight - : Alignment.centerLeft, - child: Container( - constraints: BoxConstraints(maxWidth: isDesktop ? 380 : 260), - margin: const EdgeInsets.symmetric(vertical: 4), - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10), - decoration: BoxDecoration( - color: message.isFromUser - ? Theme.of(context).extension()!.buttonBackPrimary - : Theme.of(context).extension()!.buttonBackSecondary, - borderRadius: BorderRadius.only( - topLeft: const Radius.circular(12), - topRight: const Radius.circular(12), - bottomLeft: message.isFromUser - ? const Radius.circular(12) - : Radius.zero, - bottomRight: message.isFromUser - ? Radius.zero - : const Radius.circular(12), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - if (message.isFromUser) - Text( - message.text, - style: - (isDesktop - ? STextStyles.desktopTextExtraExtraSmall(context) - : STextStyles.itemSubtitle12(context)) - .copyWith(color: textColor), - ) - else - ..._buildMessageContent(message.text, isDesktop, textColor), - const SizedBox(height: 4), - Text( - _formatTime(message.timestamp), - style: - (isDesktop - ? STextStyles.desktopTextExtraExtraSmall(context) - : STextStyles.itemSubtitle12(context)) - .copyWith( - fontSize: 10, - color: message.isFromUser - ? Colors.white.withOpacity(0.7) - : Theme.of(context) - .extension()! - .textSubtitle1 - .withOpacity(0.7), - ), - ), - ], - ), - ), - ); + if (mounted) setState(() => _sending = false); } @override Widget build(BuildContext context) { final isDesktop = Util.isDesktop; - final service = ref.watch(pShopInBitOrdersService); - final model = service.get(_model.apiTicketId) ?? _model; - final isRefreshing = service.isRefreshing(_model.apiTicketId); + final ShopInBitTicket? ticket = ref + .watch(pShopInBitTicket(_id)) + .asData + ?.value; + + final ticketNumber = ticket?.ticketNumber ?? "Request"; + final customerKey = ticket?.customerKey; + final status = ticket?.status ?? ShopInBitOrderStatus.pending; + final isCarResearch = ticket?.category == ShopInBitCategory.car; + final messages = [...?ticket?.messages, ..._pending]; + + final trackingLinks = splitTrackingLinks(ticket?.trackingLink).toList(); final statusBar = Padding( padding: .only(bottom: isDesktop ? 12 : 8), @@ -356,7 +238,7 @@ class _ShopInBitTicketDetailState extends ConsumerState { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ SelectableText( - model.ticketId ?? "Request", + ticketNumber, style: isDesktop ? STextStyles.desktopTextSmall(context) : STextStyles.titleBold12(context), @@ -365,18 +247,18 @@ class _ShopInBitTicketDetailState extends ConsumerState { padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: model.status + color: status .getColor(Theme.of(context).extension()!) .withOpacity(0.2), ), child: Text( - model.status.label, + status.label, style: (isDesktop ? STextStyles.desktopTextExtraExtraSmall(context) : STextStyles.itemSubtitle12(context)) .copyWith( - color: model.status.getColor( + color: status.getColor( Theme.of(context).extension()!, ), ), @@ -387,7 +269,31 @@ class _ShopInBitTicketDetailState extends ConsumerState { ), ); - final offerBanner = model.status == ShopInBitOrderStatus.offerAvailable + Future _pushOfferView() async { + if (_id != 0) { + await showLoading( + whileFutureAlt: _refresh, + context: context, + message: "Checking offer...", + rootNavigator: Util.isDesktop, + delay: const Duration(seconds: 1), + onException: (e) { + Logging.instance.w( + "Failed to refresh ShopInBit offer $_id, " + "using cached data", + error: e, + ); + }, + ); + } + if (context.mounted) { + await Navigator.of( + context, + ).pushNamed(ShopInBitOfferView.routeName, arguments: _id); + } + } + + final offerBanner = status == ShopInBitOrderStatus.offerAvailable ? Padding( padding: .only(bottom: isDesktop ? 12 : 8), child: RoundedWhiteContainer( @@ -396,43 +302,46 @@ class _ShopInBitTicketDetailState extends ConsumerState { context, ).extension()!.textFieldDefaultBG : null, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Offer available", - style: isDesktop - ? STextStyles.desktopTextSmall(context) - : STextStyles.titleBold12(context), - ), - const SizedBox(height: 4), - Text( - "${model.offerProductName ?? 'Item'} \u2014 " - "${model.offerPrice ?? '0'} EUR", - style: isDesktop - ? STextStyles.desktopTextExtraExtraSmall(context) - : STextStyles.itemSubtitle12(context), - ), - SizedBox(height: isDesktop ? 12 : 8), - PrimaryButton( - label: "Review offer", - onPressed: () { - if (isDesktop) { - Navigator.of(context, rootNavigator: true).pop(); - showDialog( - context: context, - - builder: (_) => ShopInBitOfferView(model: model), - ); - } else { - Navigator.of(context).pushNamed( - ShopInBitOfferView.routeName, - arguments: model, - ); - } - }, - ), - ], + child: ConditionalParent( + condition: Util.isDesktop, + builder: (child) => Row( + children: [ + Expanded(child: child), + PrimaryButton( + label: "Review offer", + width: 220, + buttonHeight: ButtonHeight.l, + onPressed: _pushOfferView, + ), + ], + ), + child: Column( + crossAxisAlignment: .start, + mainAxisSize: .min, + children: [ + Text( + "Offer available", + style: isDesktop + ? STextStyles.desktopTextSmall(context) + : STextStyles.titleBold12(context), + ), + const SizedBox(height: 4), + Text( + "${ticket?.offerProductName ?? 'Item'} — " + "${ticket?.offerPrice ?? '0'} EUR (incl. VAT)", + style: isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context), + ), + if (!Util.isDesktop) const SizedBox(height: 12), + if (!Util.isDesktop) + PrimaryButton( + label: "Review offer", + buttonHeight: Util.isDesktop ? ButtonHeight.l : null, + onPressed: _pushOfferView, + ), + ], + ), ), ), ) @@ -442,10 +351,27 @@ class _ShopInBitTicketDetailState extends ConsumerState { reverse: true, padding: const EdgeInsets.all(8), physics: const AlwaysScrollableScrollPhysics(), - itemCount: model.messages.length, + itemCount: messages.length, itemBuilder: (context, index) { - final message = model.messages[model.messages.length - 1 - index]; - return _chatBubble(message, isDesktop); + final message = messages[messages.length - 1 - index]; + return _ChatBubble( + // Stable per-message identity so the list (which grows/shrinks as + // optimistic and polled messages come and go) keeps each bubble's + // state (e.g. a proxy image's fetched URL) with the right message. + // Value-stable across polls (objects are rebuilt each poll) but a + // cheap hash, so we don't allocate/compare the whole content (which + // can be a multi-MB inline image) on every itemBuilder call. + key: ValueKey( + Object.hash( + message.fromAgent, + message.timestamp.microsecondsSinceEpoch, + message.content.hashCode, + ), + ), + message: message, + isDesktop: isDesktop, + customerKey: customerKey, + ); }, ); @@ -496,8 +422,10 @@ class _ShopInBitTicketDetailState extends ConsumerState { if (!Util.isDesktop) IconButton( onPressed: _sendMessage, - icon: Icon( - Icons.send, + icon: SvgPicture.asset( + Assets.svg.send, + width: 24, + height: 24, color: Theme.of( context, ).extension()!.accentColorBlue, @@ -508,7 +436,7 @@ class _ShopInBitTicketDetailState extends ConsumerState { ); final requestDetailsSection = - _isCarResearch && model.requestDescription.isNotEmpty + isCarResearch && (ticket?.requestDescription.isNotEmpty ?? false) ? Padding( padding: EdgeInsets.only(bottom: isDesktop ? 12 : 8), child: RoundedWhiteContainer( @@ -528,7 +456,7 @@ class _ShopInBitTicketDetailState extends ConsumerState { ), const SizedBox(height: 8), SelectableText( - model.requestDescription, + ticket!.requestDescription, style: isDesktop ? STextStyles.desktopTextExtraExtraSmall(context) : STextStyles.itemSubtitle12(context), @@ -539,28 +467,18 @@ class _ShopInBitTicketDetailState extends ConsumerState { ) : const SizedBox.shrink(); - final retryButton = - model.needsCreateRequest && model.category == ShopInBitCategory.car - ? Padding( - padding: const EdgeInsets.symmetric(vertical: 12), - child: PrimaryButton( - label: _retrying ? "Submitting..." : "Complete Request", - enabled: !_retrying, - onPressed: _retrying - ? null - : () => unawaited(_retryCreateRequest()), - ), - ) - : const SizedBox.shrink(); - final body = Column( mainAxisSize: .min, crossAxisAlignment: .stretch, children: [ statusBar, - retryButton, offerBanner, requestDetailsSection, + if (trackingLinks.isNotEmpty) + Padding( + padding: EdgeInsets.only(bottom: isDesktop ? 12 : 8), + child: _TrackingLinks(trackingLinks: trackingLinks), + ), chatArea, SizedBox(height: isDesktop ? 12 : 8), inputBar, @@ -588,10 +506,7 @@ class _ShopInBitTicketDetailState extends ConsumerState { Row( mainAxisSize: MainAxisSize.min, children: [ - RefreshButton( - isRefreshing: isRefreshing, - onPressed: _refresh, - ), + RefreshButton(isRefreshing: false, onPressed: _refresh), const SizedBox(width: 8), const DesktopDialogCloseButton(), ], @@ -624,7 +539,7 @@ class _ShopInBitTicketDetailState extends ConsumerState { onPressed: () => Navigator.of(context).pop(), ), title: Text( - model.ticketId ?? "Request", + ticketNumber, style: STextStyles.navBarTitle(context), ), ), @@ -638,3 +553,452 @@ class _ShopInBitTicketDetailState extends ConsumerState { ); } } + +// Chat bubble / attachment layout dimensions. +const double _kBubbleMaxWidthDesktop = 380; +const double _kBubbleMaxWidthMobile = 260; +const double _kAttachmentMaxHeight = 220; +// Decode images down to ~2x the display height to cap decode/memory cost. +const int _kAttachmentDecodeHeight = 440; +const double _kAttachmentLoaderHeight = 80; +const double _kAttachmentLoaderWidth = 40; + +/// Renders an authenticated `/attachment-proxy/` image. +/// +/// The signed URL future is built once in [initState] (and only rebuilt when +/// [proxyPath] or [customerKey] actually change) so the surrounding 30s poll +/// can't re-fire `getAttachmentUrl`/re-fetch the image on every rebuild. +class _ProxyImage extends StatefulWidget { + const _ProxyImage({ + required this.client, + required this.proxyPath, + required this.customerKey, + required this.fallback, + }); + + final ShopInBitClient client; + final String proxyPath; + final String customerKey; + final Widget Function() fallback; + + @override + State<_ProxyImage> createState() => _ProxyImageState(); +} + +class _ProxyImageState extends State<_ProxyImage> { + late Future> _urlFuture; + + Future> _buildFuture() => widget.client.getAttachmentUrl( + widget.proxyPath, + useQueryAuth: true, + customerKey: widget.customerKey, + ); + + @override + void initState() { + super.initState(); + _urlFuture = _buildFuture(); + } + + @override + void didUpdateWidget(covariant _ProxyImage oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.proxyPath != widget.proxyPath || + oldWidget.customerKey != widget.customerKey) { + _urlFuture = _buildFuture(); + } + } + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: ClipRRect( + borderRadius: BorderRadius.circular(8), + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: _kAttachmentMaxHeight), + child: FutureBuilder>( + future: _urlFuture, + builder: (context, snapshot) { + if (!snapshot.hasData) { + return const SizedBox( + height: _kAttachmentLoaderHeight, + child: LoadingIndicator(width: _kAttachmentLoaderWidth), + ); + } + final resp = snapshot.data!; + if (resp.hasError || resp.value == null) { + return widget.fallback(); + } + return Image.network( + resp.value!.toString(), + fit: BoxFit.contain, + cacheHeight: _kAttachmentDecodeHeight, + semanticLabel: "Image attachment", + errorBuilder: (_, _, _) => widget.fallback(), + ); + }, + ), + ), + ), + ); + } +} + +String _formatTime(DateTime dt) { + final local = dt.toLocal(); + final hour = local.hour.toString().padLeft(2, '0'); + final minute = local.minute.toString().padLeft(2, '0'); + final hm = "$hour:$minute"; + final now = DateTime.now(); + final isToday = + local.year == now.year && + local.month == now.month && + local.day == now.day; + return isToday ? hm : "${DateFormat('MMM d').format(local)} $hm"; +} + +/// A single chat message bubble: the message body plus its timestamp. +class _ChatBubble extends StatelessWidget { + const _ChatBubble({ + super.key, + required this.message, + required this.isDesktop, + required this.customerKey, + }); + + final TicketMessage message; + final bool isDesktop; + final String? customerKey; + + @override + Widget build(BuildContext context) { + final colors = Theme.of(context).extension()!; + final isFromUser = !message.fromAgent; + final textColor = isFromUser + ? colors.buttonTextPrimary + : colors.buttonTextSecondary; + + return Align( + alignment: isFromUser ? Alignment.centerRight : Alignment.centerLeft, + child: Container( + constraints: BoxConstraints( + maxWidth: isDesktop + ? _kBubbleMaxWidthDesktop + : _kBubbleMaxWidthMobile, + ), + margin: const EdgeInsets.symmetric(vertical: 4), + padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10), + decoration: BoxDecoration( + color: isFromUser + ? colors.buttonBackPrimary + : colors.buttonBackSecondary, + borderRadius: BorderRadius.only( + topLeft: const Radius.circular(12), + topRight: const Radius.circular(12), + bottomLeft: isFromUser ? const Radius.circular(12) : Radius.zero, + bottomRight: isFromUser ? Radius.zero : const Radius.circular(12), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + _MessageBody( + message: message, + isDesktop: isDesktop, + textColor: textColor, + customerKey: customerKey, + ), + const SizedBox(height: 4), + Text( + _formatTime(message.timestamp), + style: + (isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context)) + .copyWith( + fontSize: 10, + color: isFromUser + ? colors.buttonTextPrimary.withOpacity(0.7) + : colors.textSubtitle1.withOpacity(0.7), + ), + ), + ], + ), + ), + ); + } +} + +/// Renders a ticket message's HTML [TicketMessage.content] as a column of text, +/// inline base64 images, proxy images, and file links. +class _MessageBody extends ConsumerWidget { + const _MessageBody({ + required this.message, + required this.isDesktop, + required this.textColor, + required this.customerKey, + }); + + final TicketMessage message; + final bool isDesktop; + final Color? textColor; + final String? customerKey; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final textStyle = + (isDesktop + ? STextStyles.desktopTextExtraExtraSmall(context) + : STextStyles.itemSubtitle12(context)) + .copyWith(color: textColor); + + final widgets = []; + + // Render segments in document order. Proxy images and file links need the + // customer key to fetch; a loaded ticket always has one, so when it's null + // (e.g. an optimistic message) those segments are simply skipped. + final key = customerKey; + final client = key == null ? null : ref.read(pShopinBitService).client; + + for (final segment in message.contentSegments) { + switch (segment) { + case MessageTextSegment(:final text): + widgets.add(Text(text, style: textStyle)); + case MessageImageSegment(:final bytes): + widgets.add( + Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: ClipRRect( + borderRadius: BorderRadius.circular(8), + child: ConstrainedBox( + constraints: const BoxConstraints( + maxHeight: _kAttachmentMaxHeight, + ), + child: Image.memory( + bytes, + fit: BoxFit.contain, + cacheHeight: _kAttachmentDecodeHeight, + semanticLabel: "Image", + // The decoded bytes are cached and reused across polls, so + // the provider stays equal; keep the last frame if it ever + // does reload (e.g. cache eviction) instead of flashing. + gaplessPlayback: true, + ), + ), + ), + ), + ); + case MessageProxyImageSegment(:final proxyPath, :final filename): + if (key != null && client != null) { + widgets.add( + _ProxyImage( + client: client, + proxyPath: proxyPath, + customerKey: key, + fallback: () => _AttachmentImageFallback(filename: filename), + ), + ); + } + case MessageFileLinkSegment(:final proxyPath, :final filename): + if (key != null) { + widgets.add( + _AttachmentFileLink( + proxyPath: proxyPath, + customerKey: key, + filename: filename, + textStyle: textStyle, + ), + ); + } + } + } + + if (widgets.isEmpty) { + widgets.add(Text('', style: textStyle)); + } + + return Column( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: widgets, + ); + } +} + +/// A tappable `/attachment-proxy/` file link, opened in the browser. +class _AttachmentFileLink extends ConsumerWidget { + const _AttachmentFileLink({ + required this.proxyPath, + required this.customerKey, + required this.filename, + required this.textStyle, + }); + + final String proxyPath; + final String customerKey; + final String? filename; + final TextStyle textStyle; + + Future _open(BuildContext context, ShopInBitService service) async { + // Resolving the signed URL hits the token manager (and possibly the + // network), so show the loading overlay and surface any failure rather than + // doing nothing. + await showLoading( + whileFuture: _resolveAndLaunch(service), + context: context, + message: "Opening attachment", + rootNavigator: Util.isDesktop, + onException: (e) { + Logging.instance.w("ShopInBit open attachment failed", error: e); + showFloatingFlushBar( + type: FlushBarType.warning, + message: "Could not open attachment", + context: context, + ); + }, + ); + } + + Future _resolveAndLaunch(ShopInBitService service) async { + final resp = await service.client.getAttachmentUrl( + proxyPath, + useQueryAuth: true, + customerKey: customerKey, + ); + if (resp.hasError || resp.value == null) { + throw resp.exception ?? Exception("Could not resolve attachment URL"); + } + final launched = await launchUrl( + resp.value!, + mode: LaunchMode.externalApplication, + ); + if (!launched) throw Exception("Could not open attachment"); + } + + @override + Widget build(BuildContext context, WidgetRef ref) { + final linkStyle = textStyle.copyWith( + decoration: TextDecoration.underline, + decorationColor: textStyle.color, + ); + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: MouseRegion( + cursor: SystemMouseCursors.click, + // TODO: Make sure we warn about browsing. + child: Semantics( + button: true, + label: filename ?? 'attachment', + excludeSemantics: true, + child: GestureDetector( + onTap: () => _open(context, ref.read(pShopinBitService)), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + SvgPicture.asset( + Assets.svg.file, + width: 16, + height: 16, + color: textStyle.color, + ), + const SizedBox(width: 6), + Flexible( + child: Text( + filename ?? 'attachment', + style: linkStyle, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ), + ), + ), + ); + } +} + +/// Shown in place of a proxy image that failed to load. +class _AttachmentImageFallback extends StatelessWidget { + const _AttachmentImageFallback({required this.filename}); + + final String? filename; + + @override + Widget build(BuildContext context) { + final colors = Theme.of(context).extension()!; + return Container( + padding: const EdgeInsets.all(8), + color: colors.textFieldDefaultBG, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + SvgPicture.asset( + Assets.svg.alertCircle, + width: 16, + height: 16, + color: colors.textSubtitle1, + ), + const SizedBox(width: 6), + Flexible( + child: Text( + filename ?? 'image', + style: STextStyles.itemSubtitle12(context), + ), + ), + ], + ), + ); + } +} + +class _TrackingLinks extends StatelessWidget { + const _TrackingLinks({super.key, required this.trackingLinks}); + + final List trackingLinks; + + @override + Widget build(BuildContext context) { + return DetailItemBase( + horizontal: true, + expandDetail: true, + crossAxisAlignment: .start, + title: Text( + "Tracking link(s)", + style: Util.isDesktop + ? STextStyles.desktopTextSmall(context) + : STextStyles.titleBold12(context), + ), + detail: Column( + mainAxisSize: .min, + crossAxisAlignment: .start, + children: [ + ...trackingLinks.map( + (e) => CustomTextButton( + text: e, + overflow: .ellipsis, + onTap: () async { + try { + await launchUrl( + Uri.parse(e), + mode: LaunchMode.externalApplication, + ); + } catch (e, s) { + Logging.instance.e( + "Failed to open shipping tracking link", + error: e, + stackTrace: s, + ); + } + }, + ), + ), + ], + ), + borderColor: Util.isDesktop + ? Theme.of(context).extension()!.textFieldDefaultBG + : null, + ); + } +} diff --git a/lib/pages/shopinbit/shopinbit_tickets_view.dart b/lib/pages/shopinbit/shopinbit_tickets_view.dart index 71445aedd7..7b185f9ec9 100644 --- a/lib/pages/shopinbit/shopinbit_tickets_view.dart +++ b/lib/pages/shopinbit/shopinbit_tickets_view.dart @@ -1,17 +1,16 @@ import "dart:async"; -import "dart:convert"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_svg/flutter_svg.dart"; import "../../db/drift/shared_db/shared_database.dart"; -import "../../models/shopinbit/shopinbit_order_model.dart"; -import "../../providers/db/drift_provider.dart"; -import "../../providers/global/shopin_bit_orders_provider.dart"; +import "../../models/shopinbit/shopinbit_enums.dart"; +import "../../providers/global/shopin_bit_service_provider.dart"; import "../../services/shopinbit/src/models/car_research.dart"; import "../../themes/stack_colors.dart"; import "../../utilities/assets.dart"; +import "../../utilities/logger.dart"; import "../../utilities/text_styles.dart"; import "../../utilities/util.dart"; import "../../widgets/background.dart"; @@ -19,9 +18,9 @@ import "../../widgets/conditional_parent.dart"; import "../../widgets/custom_buttons/app_bar_icon_button.dart"; import "../../widgets/desktop/desktop_dialog_close_button.dart"; import "../../widgets/dialogs/s_dialog.dart"; +import "../../widgets/loading_indicator.dart"; import "../../widgets/refresh_control.dart"; import "../../widgets/rounded_container.dart"; -import "shopinbit_car_fee_view.dart"; import "shopinbit_car_research_payment_view.dart"; import "shopinbit_ticket_detail.dart"; @@ -36,90 +35,103 @@ class ShopInBitTicketsView extends ConsumerStatefulWidget { } class _ShopInBitTicketsViewState extends ConsumerState { - List _tickets = []; - ShopInBitTicket? _pendingTicket; - StreamSubscription>? _ticketsSub; bool _refreshing = false; + bool _resuming = false; + + // Some unfinished car research fee invoices recovered from the server, if any. + // The fee is paid before any ticket exists, so this is the only way to let + // the user resume it — there is no local "pending" row anymore. + List? _resumableInvoices; @override void initState() { super.initState(); - final db = ref.read(pSharedDrift); - _ticketsSub = db.select(db.shopInBitTickets).watch().listen((rows) { - if (!mounted) return; - setState(() { - _pendingTicket = rows.where((t) => t.isPendingPayment).firstOrNull; - _tickets = rows - .where((t) => !t.isPendingPayment) - .map(ShopInBitOrderModel.fromDriftRow) - .toList(); - }); - }); WidgetsBinding.instance.addPostFrameCallback((_) => _refresh()); } - @override - void dispose() { - _ticketsSub?.cancel(); - super.dispose(); - } - Future _refresh() async { if (_refreshing) return; if (mounted) setState(() => _refreshing = true); try { - await ref.read(pShopInBitOrdersService).refreshAll(); + await Future.wait([ + ref.read(pShopinBitService).refreshAll(), + _loadResumableInvoice(), + ]); } finally { if (mounted) setState(() => _refreshing = false); } } - void _resumeFlow(ShopInBitTicket pending) { - final model = ShopInBitOrderModel.fromDriftRow(pending); - final expiresAt = pending.carResearchExpiresAt; - final linksJson = pending.carResearchPaymentLinks; - final isDesktop = Util.isDesktop; - - if (expiresAt != null && - expiresAt.isAfter(DateTime.now()) && - linksJson != null) { - // Invoice still live: navigate directly to payment view. - final links = (jsonDecode(linksJson) as Map).map( - (k, v) => MapEntry(k, v as String), - ); - final invoice = CarResearchInvoice( - btcpayInvoice: pending.carResearchInvoiceId!, - expiresAt: expiresAt, - paymentLinks: links, - ); - - Navigator.of(context).pushNamed( - ShopInBitCarResearchPaymentView.routeName, - arguments: (model, invoice), + /// Pull the most recent still-payable car research invoice from + /// `GET /car-research/invoices/current` so we can surface a "resume" entry. + Future _loadResumableInvoice() async { + List? resumable; + try { + final customerKey = await ref.read(pShopinBitService).ensureCustomerKey(); + final resp = await ref + .read(pShopinBitService) + .client + .getCurrentCarResearchInvoices(customerKey: customerKey); + final invoices = resp.value; + if (invoices != null) { + for (final inv in invoices) { + final payable = + inv.expiresAt != null && + inv.paymentLinks.isNotEmpty && + // Spec: expired unresolved invoices stay recoverable until + // expires_at + 24h. + (inv.expiresAt! + .add(const Duration(hours: 24)) + .isAfter(DateTime.now()) || + carResearchIsFinalized(inv.status, inv.additional)); + if (payable) { + resumable ??= []; + resumable.add( + CarResearchInvoice( + btcpayInvoice: inv.invoiceId, + expiresAt: inv.expiresAt!, + paymentLinks: inv.paymentLinks, + ), + ); + break; + } + } + } + } catch (e, s) { + Logging.instance.e( + "_loadResumableInvoice failed", + error: e, + stackTrace: s, ); - } else { - // Invoice expired: navigate to fee view. - Navigator.of( - context, - ).pushNamed(ShopInBitCarFeeView.routeName, arguments: model); + // Leave _resumableInvoice unchanged on failure. + return; } + if (mounted) setState(() => _resumableInvoices = resumable); } - static String _categoryLabel(ShopInBitCategory? category) => - switch (category) { - ShopInBitCategory.concierge => "Concierge", - ShopInBitCategory.travel => "Travel", - ShopInBitCategory.car => "Car", - null => "", - }; + Future _resumeFlow(CarResearchInvoice invoice) async { + if (_resuming) return; + setState(() => _resuming = true); + try { + final customerKey = await ref.read(pShopinBitService).ensureCustomerKey(); + if (mounted) { + await Navigator.of(context).pushNamed( + ShopInBitCarResearchPaymentView.routeName, + arguments: (invoice: invoice, customerKey: customerKey), + ); + } + } finally { + if (mounted) setState(() => _resuming = false); + } + } List _buildListChildren({ required BuildContext context, required bool isDesktop, - required ShopInBitTicket? pending, - required bool hasTickets, + required List tickets, + required List? resumable, }) { - if (pending == null && !hasTickets) { + if (resumable == null && tickets.isEmpty) { return [ const SizedBox(height: 80), Center( @@ -134,25 +146,32 @@ class _ShopInBitTicketsViewState extends ConsumerState { } final children = []; - if (pending != null) { - children.add( - RoundedContainer( - color: Theme.of(context).extension()!.popupBG, - onPressed: () => _resumeFlow(pending), - child: _RequestRow( - title: "Car Research (In Progress)", - subtitle: "Tap to continue your car research payment", - badgeText: "Resume", - badgeColor: Theme.of( - context, - ).extension()!.accentColorYellow, + if (resumable != null) { + children.addAll( + resumable.map( + (e) => RoundedContainer( + color: Theme.of(context).extension()!.popupBG, + onPressed: _resuming ? null : () => unawaited(_resumeFlow(e)), + child: _RequestRow( + title: "Car Research (In Progress)", + subtitle: _resuming + ? "Opening your car research payment..." + : "Tap to continue your car research payment", + badgeText: "Resume", + badgeColor: Theme.of( + context, + ).extension()!.accentColorYellow, + loading: _resuming, + ), ), ), ); - if (hasTickets) children.add(SizedBox(height: isDesktop ? 16 : 12)); + if (tickets.isNotEmpty) { + children.add(SizedBox(height: isDesktop ? 16 : 12)); + } } - for (var i = 0; i < _tickets.length; i++) { - final ticket = _tickets[i]; + for (var i = 0; i < tickets.length; i++) { + final ticket = tickets[i]; if (i > 0) children.add(SizedBox(height: isDesktop ? 16 : 12)); children.add( RoundedContainer( @@ -161,13 +180,14 @@ class _ShopInBitTicketsViewState extends ConsumerState { ? Theme.of(context).extension()!.textFieldDefaultBG : null, color: Theme.of(context).extension()!.popupBG, - onPressed: () => Navigator.of( - context, - ).pushNamed(ShopInBitTicketDetail.routeName, arguments: ticket), + onPressed: () => Navigator.of(context).pushNamed( + ShopInBitTicketDetail.routeName, + arguments: ticket.apiTicketId, + ), child: _RequestRow( - title: ticket.ticketId ?? "N/A", + title: ticket.ticketNumber, subtitle: - "${_categoryLabel(ticket.category)} • " + "${ticket.category.label} • " "${ticket.requestDescription}", badgeText: ticket.status.label, badgeColor: ticket.status.getColor( @@ -183,8 +203,9 @@ class _ShopInBitTicketsViewState extends ConsumerState { @override Widget build(BuildContext context) { final isDesktop = Util.isDesktop; - final pending = _pendingTicket; - final hasTickets = _tickets.isNotEmpty; + final tickets = + ref.watch(pShopInBitTickets).asData?.value ?? const []; + final resumables = _resumableInvoices; return ConditionalParent( condition: isDesktop, @@ -263,8 +284,8 @@ class _ShopInBitTicketsViewState extends ConsumerState { ..._buildListChildren( context: context, isDesktop: isDesktop, - pending: pending, - hasTickets: hasTickets, + tickets: tickets, + resumable: resumables, ), ], ), @@ -280,12 +301,14 @@ class _RequestRow extends StatelessWidget { required this.subtitle, required this.badgeText, required this.badgeColor, + this.loading = false, }); final String title; final String subtitle; final String badgeText; final Color badgeColor; + final bool loading; @override Widget build(BuildContext context) { @@ -326,12 +349,17 @@ class _RequestRow extends StatelessWidget { ), ), SizedBox(width: isDesktop ? 16 : 8), - SvgPicture.asset( - Assets.svg.chevronRight, - width: 20, - height: 20, - colorFilter: ColorFilter.mode(stackColors.textSubtitle1, .srcIn), - ), + loading + ? const SizedBox(width: 20, height: 20, child: LoadingIndicator()) + : SvgPicture.asset( + Assets.svg.chevronRight, + width: 20, + height: 20, + colorFilter: ColorFilter.mode( + stackColors.textSubtitle1, + .srcIn, + ), + ), ], ); } diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_car_research_form.dart b/lib/pages/shopinbit/step_4_components/shopinbit_car_research_form.dart index 0cb6511825..d8e3fcdbec 100644 --- a/lib/pages/shopinbit/step_4_components/shopinbit_car_research_form.dart +++ b/lib/pages/shopinbit/step_4_components/shopinbit_car_research_form.dart @@ -5,22 +5,19 @@ import "package:flutter/services.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_svg/flutter_svg.dart"; -import "../../../models/shopinbit/shopinbit_order_model.dart"; -import "../../../providers/db/drift_provider.dart"; +import "../../../models/shopinbit/shopinbit_request_draft.dart"; import "../../../themes/stack_colors.dart"; import "../../../utilities/assets.dart"; import "../../../utilities/text_styles.dart"; import "../../../utilities/util.dart"; -import "../../../widgets/desktop/primary_button.dart"; -import "../../../widgets/desktop/secondary_button.dart"; +import "../../../widgets/conditional_parent.dart"; import "../../../widgets/rounded_white_container.dart"; -import "../../../widgets/stack_dialog.dart"; import "../../../widgets/textfields/adaptive_text_field.dart"; import "../shopinbit_car_fee_view.dart"; -import "../shopinbit_tickets_view.dart"; import "shopinbit_country_picker.dart"; import "shopinbit_labeled_checkbox.dart"; import "shopinbit_privacy_checkbox.dart"; +import "shopinbit_state_picker.dart"; import "shopinbit_step4_dropdown.dart"; import "shopinbit_step4_header.dart"; import "shopinbit_step4_submit_button.dart"; @@ -31,9 +28,7 @@ const int _minCarBudget = 20000; const int _minCarFieldLength = 3; class ShopInBitCarResearchForm extends ConsumerStatefulWidget { - const ShopInBitCarResearchForm({super.key, required this.model}); - - final ShopInBitOrderModel model; + const ShopInBitCarResearchForm({super.key}); @override ConsumerState createState() => @@ -61,7 +56,10 @@ class _ShopInBitCarResearchFormState String? _selectedCarCondition; bool _feeAcknowledged = false; - String? _selectedCountryIso; + String? _selectedCountryIsoCode; + String? _selectedCountryName; + String? _selectedState; + bool? _requiresState; bool _privacyAccepted = false; bool _submitting = false; @@ -75,9 +73,6 @@ class _ShopInBitCarResearchFormState () => _carDescriptionTouched = true, ); _wireTouchOnBlur(_carBudgetFocusNode, () => _carBudgetTouched = true); - if (widget.model.deliveryCountry.isNotEmpty) { - _selectedCountryIso = widget.model.deliveryCountry; - } } void _wireTouchOnBlur(FocusNode node, VoidCallback markTouched) { @@ -111,70 +106,44 @@ class _ShopInBitCarResearchFormState _selectedCarCondition != null && carBudgetValue != null && carBudgetValue >= _minCarBudget && - _selectedCountryIso != null; + _selectedCountryIsoCode != null && + _selectedCountryIsoCode!.isNotEmpty; } Future _submit() async { setState(() => _submitting = true); try { - final String countryIso = _selectedCountryIso!; - - widget.model - ..requestDescription = - "Brand: ${_brandController.text.trim()}\n" - "Model: ${_modelController.text.trim()}\n" - "Condition: $_selectedCarCondition\n" - "Description: ${_carDescriptionController.text.trim()}\n" - "Budget: ${_carBudgetController.text.trim()} EUR\n" - "Delivery country: $countryIso" - ..deliveryCountry = countryIso; - - // Block if another car research flow is already in progress. - final db = ref.read(pSharedDrift); - final existingPending = await (db.select( - db.shopInBitTickets, - )..where((t) => t.isPendingPayment.equals(true))).get(); - - if (existingPending.isNotEmpty && mounted) { - final bool? resumePrevious = await showDialog( - context: context, - barrierDismissible: false, - builder: (context) => StackDialog( - width: Util.isDesktop ? 500 : null, - title: "In-Progress Car Research", - message: - "You have an unfinished car research payment. " - "Would you like to resume it or start a new search?", - leftButton: SecondaryButton( - label: "New", - buttonHeight: Util.isDesktop ? .l : null, - onPressed: Navigator.of(context).pop, - ), - rightButton: PrimaryButton( - label: "Resume", - buttonHeight: Util.isDesktop ? .l : null, - onPressed: () => Navigator.of(context).pop(true), - ), - ), - ); - - if (resumePrevious == true && mounted) { - unawaited( - Navigator.of(context).pushNamedAndRemoveUntil( - ShopInBitTicketsView.routeName, - (route) => route.isFirst, - ), - ); - return; - } + final countryIso = _selectedCountryIsoCode!; + + final sb = StringBuffer(); + sb.writeln("Brand: ${_brandController.text.trim()}"); + sb.writeln("Model: ${_modelController.text.trim()}"); + sb.writeln("Condition: $_selectedCarCondition"); + sb.writeln("Description: ${_carDescriptionController.text.trim()}"); + sb.writeln("Budget: ${_carBudgetController.text.trim()} EUR"); + if (_requiresState == true) { + sb.writeln("Delivery state: ${_selectedState!}"); } + sb.writeln("Delivery country: $countryIso"); + + final draft = ShopinbitRequestDraft( + category: .car, + requestDescription: sb.toString(), + deliveryCountryCode: countryIso, + deliveryCountryName: _selectedCountryName!, + deliveryState: _requiresState == true ? _selectedState! : null, + voucherCode: null, + ); + // Any unfinished car research fee is recovered from the server + // (`GET /car-research/invoices/current`) by the requests list, so there + // is no local "pending payment" state to guard against here. if (!mounted) return; unawaited( Navigator.of( context, - ).pushNamed(ShopInBitCarFeeView.routeName, arguments: widget.model), + ).pushNamed(ShopInBitCarFeeView.routeName, arguments: draft), ); } finally { if (mounted) setState(() => _submitting = false); @@ -221,9 +190,34 @@ class _ShopInBitCarResearchFormState subtitle: "Tell us about the car you're looking for.", ), SizedBox(height: isDesktop ? 32 : 24), - ShopInBitCountryPicker( - selectedIso: _selectedCountryIso, - onChanged: (iso) => setState(() => _selectedCountryIso = iso), + ConditionalParent( + condition: _requiresState == true, + builder: (child) => Column( + mainAxisSize: .min, + children: [ + child, + SizedBox(height: isDesktop ? 24 : 16), + ShopInBitStatePicker( + countryIso: _selectedCountryIsoCode!, + selectedState: _selectedState, + onChanged: (state) { + if (state != _selectedState && mounted) { + setState(() { + _selectedState = state; + }); + } + }, + ), + ], + ), + child: ShopInBitCountryPicker( + selectedIso: _selectedCountryIsoCode, + onChanged: (data) => setState(() { + _selectedCountryIsoCode = data?.code; + _selectedCountryName = data?.name; + _requiresState = data?.requiresState; + }), + ), ), SizedBox(height: isDesktop ? 24 : 16), AdaptiveTextField( diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_concierge_form.dart b/lib/pages/shopinbit/step_4_components/shopinbit_concierge_form.dart index 1c191cd722..d2fe7aeca4 100644 --- a/lib/pages/shopinbit/step_4_components/shopinbit_concierge_form.dart +++ b/lib/pages/shopinbit/step_4_components/shopinbit_concierge_form.dart @@ -2,14 +2,15 @@ import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "../../../models/shopinbit/shopinbit_order_model.dart"; -import "../../../providers/db/drift_provider.dart"; +import "../../../models/shopinbit/shopinbit_request_draft.dart"; import "../../../providers/global/shopin_bit_service_provider.dart"; import "../../../utilities/util.dart"; +import "../../../widgets/conditional_parent.dart"; import "../../../widgets/textfields/adaptive_text_field.dart"; import "shopinbit_country_picker.dart"; import "shopinbit_labeled_checkbox.dart"; import "shopinbit_privacy_checkbox.dart"; +import "shopinbit_state_picker.dart"; import "shopinbit_step4_dropdown.dart"; import "shopinbit_step4_header.dart"; import "shopinbit_step4_submit.dart"; @@ -21,9 +22,7 @@ const int _minConciergeBudget = 1000; const int _maxConciergeBudget = 100000; class ShopInBitConciergeForm extends ConsumerStatefulWidget { - const ShopInBitConciergeForm({super.key, required this.model}); - - final ShopInBitOrderModel model; + const ShopInBitConciergeForm({super.key}); @override ConsumerState createState() => @@ -45,7 +44,10 @@ class _ShopInBitConciergeFormState String? _selectedCondition; bool _noLimit = false; - String? _selectedCountryIso; + String? _selectedCountryIsoCode; + String? _selectedCountryName; + String? _selectedState; + bool? _requiresState; bool _privacyAccepted = false; bool _submitting = false; @@ -60,9 +62,6 @@ class _ShopInBitConciergeFormState if (!_budgetFocusNode.hasFocus) _budgetTouched = true; setState(() {}); }); - if (widget.model.deliveryCountry.isNotEmpty) { - _selectedCountryIso = widget.model.deliveryCountry; - } } @override @@ -89,31 +88,33 @@ class _ShopInBitConciergeFormState _whatToPurchaseController.text.trim().length >= 10 && _selectedCondition != null && (_noLimit || _budgetIsValid) && - _selectedCountryIso != null; + _selectedCountryIsoCode != null; Future _submit() async { setState(() => _submitting = true); - - final String countryIso = _selectedCountryIso!; - final String budgetText = _noLimit - ? "No limit" - : "${_budgetController.text.trim()} EUR"; - - widget.model - ..requestDescription = - "What to purchase: ${_whatToPurchaseController.text.trim()}\n" - "Condition: $_selectedCondition\n" - "Budget: $budgetText\n" - "Delivery country: $countryIso" - ..deliveryCountry = countryIso; - try { - await submitShopInBitRequest( - context, - widget.model, - ref.read(pShopinBitService), - ref.read(pSharedDrift), + final String countryIso = _selectedCountryIsoCode!; + final String budgetText = _noLimit + ? "No limit" + : "${_budgetController.text.trim()} EUR"; + + final sb = StringBuffer(); + sb.writeln("What to purchase: ${_whatToPurchaseController.text.trim()}"); + sb.writeln("Condition: $_selectedCondition"); + sb.writeln("Budget: $budgetText"); + if (_requiresState == true) sb.writeln("State: ${_selectedState!}"); + sb.writeln("Delivery country: $countryIso"); + + final draft = ShopinbitRequestDraft( + category: .concierge, + requestDescription: sb.toString(), + deliveryCountryCode: countryIso, + deliveryCountryName: _selectedCountryName!, + deliveryState: _requiresState == true ? _selectedState! : null, + voucherCode: null, ); + + await submitShopInBitRequest(context, draft, ref.read(pShopinBitService)); } finally { if (mounted) setState(() => _submitting = false); } @@ -146,9 +147,7 @@ class _ShopInBitConciergeFormState AdaptiveTextField( controller: _whatToPurchaseController, focusNode: _whatToPurchaseFocusNode, - labelText: - "Describe what you'd like to purchase " - "(e.g., electronics, luxury goods, services...)", + labelText: "Describe what you need or paste a LINK here", minLines: 3, maxLines: 6, autocorrect: false, @@ -184,9 +183,34 @@ class _ShopInBitConciergeFormState label: "No budget limit", ), SizedBox(height: isDesktop ? 24 : 20), - ShopInBitCountryPicker( - selectedIso: _selectedCountryIso, - onChanged: (iso) => setState(() => _selectedCountryIso = iso), + ConditionalParent( + condition: _requiresState == true, + builder: (child) => Column( + mainAxisSize: .min, + children: [ + child, + SizedBox(height: isDesktop ? 24 : 16), + ShopInBitStatePicker( + countryIso: _selectedCountryIsoCode!, + selectedState: _selectedState, + onChanged: (state) { + if (state != _selectedState && mounted) { + setState(() { + _selectedState = state; + }); + } + }, + ), + ], + ), + child: ShopInBitCountryPicker( + selectedIso: _selectedCountryIsoCode, + onChanged: (data) => setState(() { + _selectedCountryIsoCode = data?.code; + _selectedCountryName = data?.name; + _requiresState = data?.requiresState; + }), + ), ), SizedBox(height: isDesktop ? 16 : 24), ShopInBitPrivacyCheckbox( diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_country_picker.dart b/lib/pages/shopinbit/step_4_components/shopinbit_country_picker.dart index 4f59c68697..9928ac8595 100644 --- a/lib/pages/shopinbit/step_4_components/shopinbit_country_picker.dart +++ b/lib/pages/shopinbit/step_4_components/shopinbit_country_picker.dart @@ -15,13 +15,17 @@ class ShopInBitCountryPicker extends ConsumerStatefulWidget { super.key, required this.selectedIso, required this.onChanged, - this.hintText = "Delivery country", + this.hintText = "Delivery country (Required)", + this.preLoadedCountries, }); final String? selectedIso; - final ValueChanged onChanged; + final ValueChanged<({String name, String code, bool requiresState})?> + onChanged; final String hintText; + final List>? preLoadedCountries; + @override ConsumerState createState() => _ShopInBitCountryPickerState(); @@ -36,7 +40,11 @@ class _ShopInBitCountryPickerState @override void initState() { super.initState(); - _fetchCountries(); + if (widget.preLoadedCountries != null) { + _countries = widget.preLoadedCountries!; + } else { + _fetchCountries(); + } } @override @@ -94,7 +102,19 @@ class _ShopInBitCountryPickerState _searchController.clear(); } }, - onChanged: _loading ? null : widget.onChanged, + onChanged: _loading + ? null + : (iso) { + if (iso == null) widget.onChanged(null); + + widget.onChanged(( + name: + _countries.firstWhere((e) => e["iso"] == iso)["label"] + as String, + code: iso!, + requiresState: iso == "CA" || iso == "US", + )); + }, hint: Text( _loading ? "Loading countries..." : widget.hintText, style: hintStyle, diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_generic_form.dart b/lib/pages/shopinbit/step_4_components/shopinbit_generic_form.dart deleted file mode 100644 index 82b862ea87..0000000000 --- a/lib/pages/shopinbit/step_4_components/shopinbit_generic_form.dart +++ /dev/null @@ -1,123 +0,0 @@ -import "package:flutter/material.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; - -import "../../../models/shopinbit/shopinbit_order_model.dart"; -import "../../../providers/global/shopin_bit_service_provider.dart"; -import "../../../providers/providers.dart"; -import "../../../utilities/util.dart"; -import "../../../widgets/textfields/adaptive_text_field.dart"; -import "shopinbit_country_picker.dart"; -import "shopinbit_privacy_checkbox.dart"; -import "shopinbit_step4_header.dart"; -import "shopinbit_step4_submit.dart"; -import "shopinbit_step4_submit_button.dart"; - -/// Fallback Step 4 form used when no category was selected. Collects a free -/// text description and a delivery country. -/// -/// Note: the original code used the travel copy for this fallback; that -/// behaviour is preserved here. -class ShopInBitGenericForm extends ConsumerStatefulWidget { - const ShopInBitGenericForm({super.key, required this.model}); - - final ShopInBitOrderModel model; - - @override - ConsumerState createState() => - _ShopInBitGenericFormState(); -} - -class _ShopInBitGenericFormState extends ConsumerState { - late final TextEditingController _descriptionController; - final FocusNode _descriptionFocusNode = FocusNode(); - - String? _selectedCountryIso; - bool _privacyAccepted = false; - bool _submitting = false; - - @override - void initState() { - super.initState(); - _descriptionController = TextEditingController( - text: widget.model.requestDescription, - ); - _descriptionFocusNode.addListener(() => setState(() {})); - - if (widget.model.deliveryCountry.isNotEmpty) { - _selectedCountryIso = widget.model.deliveryCountry; - } - } - - @override - void dispose() { - _descriptionController.dispose(); - _descriptionFocusNode.dispose(); - super.dispose(); - } - - bool get _canContinue => - !_submitting && - _privacyAccepted && - _descriptionController.text.trim().isNotEmpty && - _selectedCountryIso != null; - - Future _submit() async { - setState(() => _submitting = true); - widget.model - ..requestDescription = _descriptionController.text.trim() - ..deliveryCountry = _selectedCountryIso!; - try { - await submitShopInBitRequest( - context, - widget.model, - ref.read(pShopinBitService), - ref.read(pSharedDrift), - ); - } finally { - if (mounted) setState(() => _submitting = false); - } - } - - @override - Widget build(BuildContext context) { - final bool isDesktop = Util.isDesktop; - - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const ShopInBitStep4Header( - title: "Describe your travel request", - subtitle: "Provide details about your trip.", - ), - SizedBox(height: isDesktop ? 32 : 24), - AdaptiveTextField( - controller: _descriptionController, - focusNode: _descriptionFocusNode, - labelText: - "Describe your travel request (destinations, dates, passengers)", - minLines: 3, - maxLines: 6, - autocorrect: false, - enableSuggestions: false, - onChanged: (_) => setState(() {}), - ), - SizedBox(height: isDesktop ? 24 : 16), - ShopInBitCountryPicker( - selectedIso: _selectedCountryIso, - onChanged: (iso) => setState(() => _selectedCountryIso = iso), - ), - SizedBox(height: isDesktop ? 16 : 12), - ShopInBitPrivacyCheckbox( - value: _privacyAccepted, - onChanged: (v) => setState(() => _privacyAccepted = v), - ), - SizedBox(height: isDesktop ? 16 : 12), - ShopInBitStep4SubmitButton( - submitting: _submitting, - enabled: _canContinue, - onPressed: _submit, - ), - ], - ); - } -} diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_state_picker.dart b/lib/pages/shopinbit/step_4_components/shopinbit_state_picker.dart new file mode 100644 index 0000000000..84ace39199 --- /dev/null +++ b/lib/pages/shopinbit/step_4_components/shopinbit_state_picker.dart @@ -0,0 +1,234 @@ +import "package:dropdown_button2/dropdown_button2.dart"; +import "package:flutter/material.dart"; +import "package:flutter_svg/svg.dart"; + +import "../../../themes/stack_colors.dart"; +import "../../../utilities/assets.dart"; +import "../../../utilities/constants.dart"; +import "../../../utilities/text_styles.dart"; +import "../../../utilities/util.dart"; + +const List _usStates = [ + "Alabama (AL)", + "Alaska (AK)", + "Arizona (AZ)", + "Arkansas (AR)", + "California (CA)", + "Colorado (CO)", + "Connecticut (CT)", + "Delaware (DE)", + "Florida (FL)", + "Georgia (GA)", + "Hawaii (HI)", + "Idaho (ID)", + "Illinois (IL)", + "Indiana (IN)", + "Iowa (IA)", + "Kansas (KS)", + "Kentucky (KY)", + "Louisiana (LA)", + "Maine (ME)", + "Maryland (MD)", + "Massachusetts (MA)", + "Michigan (MI)", + "Minnesota (MN)", + "Mississippi (MS)", + "Missouri (MO)", + "Montana (MT)", + "Nebraska (NE)", + "Nevada (NV)", + "New Hampshire (NH)", + "New Jersey (NJ)", + "New Mexico (NM)", + "New York (NY)", + "North Carolina (NC)", + "North Dakota (ND)", + "Ohio (OH)", + "Oklahoma (OK)", + "Oregon (OR)", + "Pennsylvania (PA)", + "Rhode Island (RI)", + "South Carolina (SC)", + "South Dakota (SD)", + "Tennessee (TN)", + "Texas (TX)", + "Utah (UT)", + "Vermont (VT)", + "Virginia (VA)", + "Washington (WA)", + "West Virginia (WV)", + "Wisconsin (WI)", + + // Wyoming is now allowed as per chat with shopinbit + // "Wyoming (WY)", +]; + +const List _canadaProvinces = [ + "Alberta (AB)", + "British Columbia (BC)", + "Manitoba (MB)", + "New Brunswick (NB)", + "Newfoundland and Labrador (NL)", + "Northwest Territories (NT)", + "Nova Scotia (NS)", + "Nunavut (NU)", + "Ontario (ON)", + "Prince Edward Island (PE)", + "Quebec (QC)", + "Saskatchewan (SK)", + "Yukon (YT)", +]; + +List _statesForCountry(String countryIso) => switch (countryIso) { + "US" => _usStates, + "CA" => _canadaProvinces, + _ => throw ArgumentError.value(countryIso, "countryIso", "Must be US or CA"), +}; + +String _hintTextForCountry(String countryIso) => switch (countryIso) { + "US" => "Select state", + "CA" => "Select province / territory", + _ => throw ArgumentError.value(countryIso, "countryIso", "Must be US or CA"), +}; + +class ShopInBitStatePicker extends StatefulWidget { + const ShopInBitStatePicker({ + super.key, + required this.countryIso, + required this.selectedState, + required this.onChanged, + }); + + final String countryIso; + final String? selectedState; + final ValueChanged onChanged; + + @override + State createState() => _ShopInBitStatePickerState(); +} + +class _ShopInBitStatePickerState extends State { + final TextEditingController _searchController = TextEditingController(); + + List get _states => _statesForCountry(widget.countryIso); + + String? get _validatedSelection { + final String? selected = widget.selectedState; + if (selected == null) return null; + return _states.contains(selected) ? selected : null; + } + + @override + void didUpdateWidget(ShopInBitStatePicker oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.countryIso != widget.countryIso) { + // Invalidate selection when country changes. + if (widget.selectedState != null && + !_statesForCountry( + widget.countryIso, + ).contains(widget.selectedState)) { + WidgetsBinding.instance.addPostFrameCallback((_) { + widget.onChanged(null); + }); + } + } + } + + @override + void dispose() { + _searchController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final StackColors stackColors = Theme.of(context).extension()!; + + final TextStyle itemStyle = Util.isDesktop + ? STextStyles.desktopTextExtraSmall( + context, + ).copyWith(color: stackColors.textFieldActiveText) + : STextStyles.w500_14(context); + + final TextStyle hintStyle = Util.isDesktop + ? STextStyles.desktopTextExtraSmall( + context, + ).copyWith(color: stackColors.textFieldDefaultSearchIconLeft) + : STextStyles.fieldLabel(context); + + return DropdownButtonHideUnderline( + child: DropdownButton2( + value: _validatedSelection, + items: _states + .map( + (state) => DropdownMenuItem( + value: state, + child: Text(state, style: itemStyle), + ), + ) + .toList(), + onMenuStateChange: (isOpen) { + if (!isOpen) { + _searchController.clear(); + } + }, + onChanged: widget.onChanged, + hint: Text(_hintTextForCountry(widget.countryIso), style: hintStyle), + isExpanded: true, + buttonStyleData: ButtonStyleData( + decoration: BoxDecoration( + color: stackColors.textFieldDefaultBG, + borderRadius: BorderRadius.circular( + Constants.size.circularBorderRadius, + ), + ), + ), + iconStyleData: IconStyleData( + icon: Padding( + padding: const EdgeInsets.only(right: 10), + child: SvgPicture.asset( + Assets.svg.chevronDown, + width: 12, + height: 6, + color: stackColors.textFieldActiveSearchIconRight, + ), + ), + ), + dropdownStyleData: DropdownStyleData( + offset: const Offset(0, -10), + elevation: 0, + maxHeight: 300, + decoration: BoxDecoration( + color: stackColors.textFieldDefaultBG, + borderRadius: BorderRadius.circular( + Constants.size.circularBorderRadius, + ), + ), + ), + dropdownSearchData: DropdownSearchData( + searchController: _searchController, + searchInnerWidgetHeight: 48, + searchInnerWidget: TextFormField( + controller: _searchController, + decoration: InputDecoration( + isDense: true, + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 14, + ), + hintText: "Search...", + hintStyle: STextStyles.fieldLabel(context), + border: InputBorder.none, + ), + ), + searchMatchFn: (item, searchValue) => + item.value?.toLowerCase().contains(searchValue.toLowerCase()) ?? + false, + ), + menuItemStyleData: const MenuItemStyleData( + padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8), + ), + ), + ); + } +} diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_step4_submit.dart b/lib/pages/shopinbit/step_4_components/shopinbit_step4_submit.dart index 9e0eedae68..b4326448cb 100644 --- a/lib/pages/shopinbit/step_4_components/shopinbit_step4_submit.dart +++ b/lib/pages/shopinbit/step_4_components/shopinbit_step4_submit.dart @@ -2,10 +2,12 @@ import "dart:async"; import "package:flutter/material.dart"; -import "../../../db/drift/shared_db/shared_database.dart"; -import "../../../models/shopinbit/shopinbit_order_model.dart"; -import "../../../notifications/show_flush_bar.dart"; +import "../../../models/shopinbit/shopinbit_request_draft.dart"; import "../../../services/shopinbit/shopinbit_service.dart"; +import "../../../services/shopinbit/src/models/ticket.dart"; +import "../../../utilities/logger.dart"; +import "../../../utilities/util.dart"; +import "../../../widgets/stack_dialog.dart"; import "../shopinbit_order_created.dart"; /// Submits a ShopinBit request to the API and navigates to the order-created @@ -13,75 +15,61 @@ import "../shopinbit_order_created.dart"; /// /// Used by the concierge, travel and generic flows. The car flow has its own /// pre-payment branching (fee view) and does not call this helper. +/// +/// All persistence lives in [ShopInBitService.createRequest], which inserts +/// the fully-provenanced ticket row and kicks off a background refresh, so the +/// UI only has to hand over the [draft] and route on the returned id. Future submitShopInBitRequest( BuildContext context, - ShopInBitOrderModel model, + ShopinbitRequestDraft draft, ShopInBitService service, - SharedDatabase db, ) async { try { - final String customerKey = await service.ensureCustomerKey(); - - assert( - model.category != null, - "Step 4 reached with null category: Step 2 must set category before" - " reaching Step 4", - ); - - // API service_type: travel requests use "concierge" because the - // ShopinBit API routes both through the same concierge pipeline. - // Travel-specific details are captured in the structured comment field. - final String categoryStr = switch (model.category) { - ShopInBitCategory.concierge => "concierge", - ShopInBitCategory.travel => "concierge", - ShopInBitCategory.car => "car", - null => throw StateError("category must be non-null at Step 4 submit"), - }; - - final resp = await service.client.createRequest( - customerPseudonym: model.displayName, - externalCustomerKey: customerKey, - serviceType: categoryStr, - comment: model.requestDescription, - deliveryCountry: model.deliveryCountry, + final TicketRef? ref = await service.createRequest( + category: draft.category, + comment: draft.requestDescription, + deliveryCountry: draft.deliveryCountryCode, + voucherCode: draft.voucherCode, ); - if (resp.hasError) { + if (ref == null) { if (context.mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: resp.exception?.message ?? "Failed to create request", - context: context, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to create request", + maxWidth: Util.isDesktop ? 500 : null, + message: "Please try again in a moment.", + desktopPopRootNavigator: Util.isDesktop, ), ); } return; } - final ref = resp.value!; - model - ..apiTicketId = ref.id - ..ticketId = ref.number - ..status = ShopInBitOrderStatus.pending; - await db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(model.toCompanion()); - if (!context.mounted) return; unawaited( Navigator.of( context, - ).pushNamed(ShopInBitOrderCreated.routeName, arguments: model), + ).pushNamed(ShopInBitOrderCreated.routeName, arguments: ref.id), + ); + } catch (e, s) { + Logging.instance.e( + "Failed to create ShopInBit request", + error: e, + stackTrace: s, ); - } catch (e) { if (context.mounted) { - unawaited( - showFloatingFlushBar( - type: FlushBarType.warning, - message: "Failed to create request: $e", - context: context, + await showDialog( + context: context, + useRootNavigator: Util.isDesktop, + builder: (context) => StackOkDialog( + title: "Failed to create request", + maxWidth: Util.isDesktop ? 500 : null, + message: e.toString(), + desktopPopRootNavigator: Util.isDesktop, ), ); } diff --git a/lib/pages/shopinbit/step_4_components/shopinbit_travel_form.dart b/lib/pages/shopinbit/step_4_components/shopinbit_travel_form.dart index e110eab537..71e65d86e5 100644 --- a/lib/pages/shopinbit/step_4_components/shopinbit_travel_form.dart +++ b/lib/pages/shopinbit/step_4_components/shopinbit_travel_form.dart @@ -2,15 +2,13 @@ import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "../../../models/shopinbit/shopinbit_order_model.dart"; -import "../../../providers/db/drift_provider.dart"; +import "../../../models/shopinbit/shopinbit_request_draft.dart"; import "../../../providers/global/shopin_bit_service_provider.dart"; import "../../../utilities/text_styles.dart"; import "../../../utilities/util.dart"; import "../../../widgets/date_picker/date_picker.dart"; import "../../../widgets/textfields/adaptive_text_field.dart"; import "shopinbit_country_picker.dart"; -import "shopinbit_labeled_checkbox.dart"; import "shopinbit_privacy_checkbox.dart"; import "shopinbit_step4_dropdown.dart"; import "shopinbit_step4_header.dart"; @@ -18,40 +16,12 @@ import "shopinbit_step4_submit.dart"; import "shopinbit_step4_submit_button.dart"; import "shopinbit_traveler_counter.dart"; -const String _exactDates = "Exact dates"; -const String _flexibleDates = "Flexible dates"; - const List _arrangements = [ "Flights Only", "Hotels Only", - "Flights + Hotels", "Full Service", ]; -const List _dateModes = [_exactDates, _flexibleDates]; - -const List _flexibilities = [ - "Exact", - "\u00B1 1 day", - "\u00B1 2-3 days", - "+ 1 week", -]; - -const List _months = [ - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December", -]; - const int _minTravelBudget = 1000; const int _minArrangementDetailsLength = 10; @@ -59,9 +29,7 @@ const int _minArrangementDetailsLength = 10; /// dates (either exact or flexible), travelers and budget, then submits via /// the shared submit helper. class ShopInBitTravelForm extends ConsumerStatefulWidget { - const ShopInBitTravelForm({super.key, required this.model}); - - final ShopInBitOrderModel model; + const ShopInBitTravelForm({super.key}); @override ConsumerState createState() => @@ -86,10 +54,6 @@ class _ShopInBitTravelFormState extends ConsumerState { DateTime? _departureDate; DateTime? _returnDate; - final TextEditingController _tripLengthController = TextEditingController(); - final FocusNode _tripLengthFocusNode = FocusNode(); - bool _tripLengthTouched = false; - final TextEditingController _travelBudgetController = TextEditingController( text: "5000", ); @@ -98,11 +62,6 @@ class _ShopInBitTravelFormState extends ConsumerState { String? _selectedArrangement; String? _selectedDepartureCountryIso; - String? _selectedDateMode; - String? _selectedFlexibility; - String? _selectedYear; - String? _selectedMonthSeason; - bool _needsRecommendations = false; int _adults = 1; int _children = 0; @@ -124,7 +83,6 @@ class _ShopInBitTravelFormState extends ConsumerState { () => _departureCityTouched = true, ); _wireTouchOnBlur(_destinationsFocusNode, () => _destinationsTouched = true); - _wireTouchOnBlur(_tripLengthFocusNode, () => _tripLengthTouched = true); _wireTouchOnBlur(_travelBudgetFocusNode, () => _travelBudgetTouched = true); } @@ -143,21 +101,12 @@ class _ShopInBitTravelFormState extends ConsumerState { _departureCityFocusNode.dispose(); _destinationsController.dispose(); _destinationsFocusNode.dispose(); - _tripLengthController.dispose(); - _tripLengthFocusNode.dispose(); _travelBudgetController.dispose(); _travelBudgetFocusNode.dispose(); super.dispose(); } - bool get _hasValidDates => switch (_selectedDateMode) { - _flexibleDates => - _selectedYear != null && - _selectedMonthSeason != null && - _tripLengthController.text.trim().isNotEmpty, - _exactDates => _departureDate != null && _returnDate != null, - _ => false, - }; + bool get _hasValidDates => _departureDate != null && _returnDate != null; bool get _canContinue { final int? travelBudgetValue = int.tryParse( @@ -170,9 +119,7 @@ class _ShopInBitTravelFormState extends ConsumerState { _minArrangementDetailsLength && _selectedDepartureCountryIso != null && _departureCityController.text.trim().isNotEmpty && - (_needsRecommendations || - _destinationsController.text.trim().isNotEmpty) && - _selectedDateMode != null && + _destinationsController.text.trim().isNotEmpty && _hasValidDates && _adults >= 1 && travelBudgetValue != null && @@ -190,30 +137,15 @@ class _ShopInBitTravelFormState extends ConsumerState { "Arrangement: $_selectedArrangement", "Details: ${_arrangementDetailsController.text.trim()}", "Departure: ${_departureCityController.text.trim()}, " - "${_selectedDepartureCountryIso ?? ''}", + "${_selectedDepartureCountryIso!}", ]; - if (_needsRecommendations) { - parts.add("Destinations: Recommendations requested"); - } else { - parts.add("Destinations: ${_destinationsController.text.trim()}"); - } + parts.add("Destinations: ${_destinationsController.text.trim()}"); - if (_selectedDateMode == _exactDates) { - final String flex = - _selectedFlexibility != null && _selectedFlexibility != "Exact" - ? " ($_selectedFlexibility)" - : ""; - parts.add( - "Dates: ${_formatDate(_departureDate!)} - " - "${_formatDate(_returnDate!)}$flex", - ); - } else if (_selectedDateMode == _flexibleDates) { - parts.add( - "Dates: $_selectedMonthSeason $_selectedYear, " - "${_tripLengthController.text.trim()} nights", - ); - } + parts.add( + "Dates: ${_formatDate(_departureDate!)} - " + "${_formatDate(_returnDate!)}", + ); final List travelers = ["$_adults adult${_adults > 1 ? 's' : ''}"]; if (_children > 0) { @@ -234,19 +166,19 @@ class _ShopInBitTravelFormState extends ConsumerState { Future _submit() async { setState(() => _submitting = true); - widget.model - ..requestDescription = _buildRequestDescription() + final draft = ShopinbitRequestDraft( + category: .travel, + requestDescription: _buildRequestDescription(), // Travel doesn't collect a delivery country: default to "DE" since the // API requires the field. Travel destinations are captured in the // structured comment field. - ..deliveryCountry = "DE"; + deliveryCountryCode: "DE", + voucherCode: null, + deliveryCountryName: "Germany", + deliveryState: null, + ); try { - await submitShopInBitRequest( - context, - widget.model, - ref.read(pShopinBitService), - ref.read(pSharedDrift), - ); + await submitShopInBitRequest(context, draft, ref.read(pShopinBitService)); } finally { if (mounted) setState(() => _submitting = false); } @@ -269,14 +201,7 @@ class _ShopInBitTravelFormState extends ConsumerState { : null; final String? destinationsError = - _destinationsTouched && - !_needsRecommendations && - _destinationsController.text.trim().isEmpty - ? "Required (or check 'I need recommendations')" - : null; - - final String? tripLengthError = - _tripLengthTouched && _tripLengthController.text.trim().isEmpty + _destinationsTouched && _destinationsController.text.trim().isEmpty ? "Required" : null; @@ -290,8 +215,6 @@ class _ShopInBitTravelFormState extends ConsumerState { ? "Minimum budget is 1,000 EUR" : null; - final int currentYear = DateTime.now().year; - return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -309,28 +232,15 @@ class _ShopInBitTravelFormState extends ConsumerState { hintText: "Arrangement type", onChanged: (value) => setState(() => _selectedArrangement = value), ), - SizedBox(height: isDesktop ? 24 : 16), - AdaptiveTextField( - controller: _arrangementDetailsController, - focusNode: _arrangementDetailsFocusNode, - labelText: - "Describe your specific requirements " - "(luggage, cabin class, hotel stars, etc.)", - minLines: 3, - maxLines: 6, - autocorrect: false, - enableSuggestions: false, - errorText: arrangementDetailsError, - onChanged: (_) => setState(() {}), - ), SizedBox(height: isDesktop ? 24 : 16), _TravelSectionLabel(text: "Where", isDesktop: isDesktop), SizedBox(height: isDesktop ? 12 : 8), ShopInBitCountryPicker( selectedIso: _selectedDepartureCountryIso, - onChanged: (iso) => - setState(() => _selectedDepartureCountryIso = iso), + onChanged: (data) => setState(() { + _selectedDepartureCountryIso = data?.code; + }), hintText: "Departure country", ), SizedBox(height: isDesktop ? 24 : 16), @@ -347,80 +257,28 @@ class _ShopInBitTravelFormState extends ConsumerState { AdaptiveTextField( controller: _destinationsController, focusNode: _destinationsFocusNode, - labelText: "Destination city", - enabled: !_needsRecommendations, + labelText: "Destination (City, Country, Region)", autocorrect: false, enableSuggestions: false, errorText: destinationsError, onChanged: (_) => setState(() {}), ), - SizedBox(height: isDesktop ? 16 : 12), - ShopInBitLabeledCheckbox( - value: _needsRecommendations, - onChanged: (v) => setState(() => _needsRecommendations = v), - label: "I need recommendations", - ), SizedBox(height: isDesktop ? 24 : 16), _TravelSectionLabel(text: "When", isDesktop: isDesktop), SizedBox(height: isDesktop ? 12 : 8), - ShopInBitStep4Dropdown( - value: _selectedDateMode, - items: _dateModes, - hintText: "Date mode", - onChanged: (value) => setState(() => _selectedDateMode = value), + StackDateRangePicker( + fromDate: _departureDate, + toDate: _returnDate, + firstDate: DateTime.now(), + lastDate: DateTime.now().add(const Duration(days: 3650)), + onChanged: (from, to) { + setState(() { + _departureDate = from; + _returnDate = to; + }); + }, ), - SizedBox(height: isDesktop ? 24 : 16), - - if (_selectedDateMode == _exactDates) ...[ - StackDateRangePicker( - fromDate: _departureDate, - toDate: _returnDate, - firstDate: DateTime.now(), - lastDate: DateTime.now().add(const Duration(days: 3650)), - onChanged: (from, to) { - setState(() { - _departureDate = from; - _returnDate = to; - }); - }, - ), - SizedBox(height: isDesktop ? 24 : 16), - ShopInBitStep4Dropdown( - value: _selectedFlexibility, - items: _flexibilities, - hintText: "Flexibility", - onChanged: (value) => setState(() => _selectedFlexibility = value), - ), - ], - - if (_selectedDateMode == _flexibleDates) ...[ - ShopInBitStep4Dropdown( - value: _selectedYear, - items: ["$currentYear", "${currentYear + 1}"], - hintText: "Year", - onChanged: (value) => setState(() => _selectedYear = value), - ), - SizedBox(height: isDesktop ? 24 : 16), - ShopInBitStep4Dropdown( - value: _selectedMonthSeason, - items: _months, - hintText: "Month", - onChanged: (value) => setState(() => _selectedMonthSeason = value), - ), - SizedBox(height: isDesktop ? 24 : 16), - AdaptiveTextField( - controller: _tripLengthController, - focusNode: _tripLengthFocusNode, - labelText: "Number of nights", - keyboardType: TextInputType.number, - inputFormatters: [FilteringTextInputFormatter.digitsOnly], - autocorrect: false, - enableSuggestions: false, - errorText: tripLengthError, - onChanged: (_) => setState(() {}), - ), - ], SizedBox(height: isDesktop ? 24 : 16), _TravelSectionLabel(text: "Who", isDesktop: isDesktop), @@ -466,6 +324,19 @@ class _ShopInBitTravelFormState extends ConsumerState { onChanged: (_) => setState(() {}), ), + SizedBox(height: isDesktop ? 24 : 16), + AdaptiveTextField( + controller: _arrangementDetailsController, + focusNode: _arrangementDetailsFocusNode, + labelText: "Describe your travel needs or paste a LINK here", + minLines: 3, + maxLines: 6, + autocorrect: false, + enableSuggestions: false, + errorText: arrangementDetailsError, + onChanged: (_) => setState(() {}), + ), + // Travel doesn't collect delivery country: destinations are in the // form and the API field is set to "DE" on submit. const SizedBox(height: 24), diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index b6619f9f8d..322b8fb24a 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -72,7 +72,6 @@ import '../../widgets/custom_buttons/blue_text_button.dart'; import '../../widgets/custom_loading_overlay.dart'; import '../../widgets/desktop/secondary_button.dart'; import '../../widgets/frost_scaffold.dart'; -import '../../widgets/icon_widgets/credit_card_icon.dart'; import '../../widgets/loading_indicator.dart'; import '../../widgets/small_tor_icon.dart'; import '../../widgets/stack_dialog.dart'; @@ -97,8 +96,6 @@ import '../epic_finalize_view/epic_finalize_view.dart'; import '../exchange_view/wallet_initiated_exchange_view.dart'; import '../finalize_view/finalize_view.dart'; import '../monkey/monkey_view.dart'; -import '../more_view/gift_cards_view.dart'; -import '../more_view/services_view.dart'; import '../namecoin_names/namecoin_names_home_view.dart'; import '../notification_views/notifications_view.dart'; import '../ordinals/ordinals_view.dart'; @@ -1347,39 +1344,6 @@ class _WalletViewState extends ConsumerState { ); }, ), - if (!viewOnly && AppConfig.hasFeature(.shopinBit)) - WalletNavigationBarItemData( - label: "Services", - icon: SvgPicture.asset( - Assets.svg.solidSliders, - height: 20, - width: 20, - color: Theme.of( - context, - ).extension()!.bottomNavIconIcon, - ), - onTap: () { - Navigator.of( - context, - ).pushNamed(ServicesView.routeName); - }, - ), - if (AppConfig.hasFeature(.cakePay)) - WalletNavigationBarItemData( - label: "Gift cards", - icon: CreditCardIcon( - height: 20, - width: 20, - color: Theme.of( - context, - ).extension()!.bottomNavIconIcon, - ), - onTap: () { - Navigator.of( - context, - ).pushNamed(GiftCardsView.routeName); - }, - ), ], ), ), diff --git a/lib/pages_desktop_specific/services/shopin_bit/desktop_shopinbit_view.dart b/lib/pages_desktop_specific/services/shopin_bit/desktop_shopinbit_view.dart index d5a81094d9..7e39f1e9aa 100644 --- a/lib/pages_desktop_specific/services/shopin_bit/desktop_shopinbit_view.dart +++ b/lib/pages_desktop_specific/services/shopin_bit/desktop_shopinbit_view.dart @@ -5,7 +5,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import '../../../app_config.dart'; -import '../../../models/shopinbit/shopinbit_order_model.dart'; import '../../../notifications/show_flush_bar.dart'; import '../../../pages/shopinbit/shopinbit_step_2.dart'; import '../../../pages/shopinbit/shopinbit_tickets_view.dart'; @@ -14,6 +13,7 @@ import '../../../providers/desktop/current_desktop_menu_item.dart'; import '../../../providers/global/shopin_bit_service_provider.dart'; import '../../../themes/stack_colors.dart'; import '../../../utilities/assets.dart'; +import '../../../utilities/show_loading.dart'; import '../../../utilities/text_styles.dart'; import '../../../widgets/desktop/desktop_dialog.dart'; import '../../../widgets/desktop/desktop_dialog_close_button.dart'; @@ -23,7 +23,6 @@ import '../../../widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog import '../../../widgets/dialogs/request_external_link_navigation_dialog.dart'; import '../../../widgets/rounded_container.dart'; import '../../../widgets/rounded_white_container.dart'; -import '../../../widgets/textfields/adaptive_text_field.dart'; import '../../desktop_menu.dart'; import '../../settings/settings_menu.dart'; import 'sub_widgets/desktop_shopin_bit_first_run.dart'; @@ -40,12 +39,11 @@ class DesktopShopInBitView extends ConsumerStatefulWidget { class _DesktopServicesViewState extends ConsumerState { Future _showShopDialog() async { - final dao = ref.read(pSharedDrift).shopinBitSettingsDao; - final settings = await dao.getSettings(); - final model = ShopInBitOrderModel(); + final dao = ref.read(pSharedDrift).shopInBitSettingsDao; + final settings = await dao.getCurrentSettings(); bool isFirstRun = false; - if (!settings.setupComplete) { + if (settings == null || !settings.setupComplete) { // something went wrong if (!mounted) return; @@ -53,16 +51,10 @@ class _DesktopServicesViewState extends ConsumerState { final completed = await showDialog( context: context, barrierDismissible: false, - builder: (_) => _ShopInBitDesktopSetupDialog(model: model), + builder: (_) => const _ShopInBitDesktopSetupDialog(), ); if (completed != true) return; // user cancelled isFirstRun = true; - } else { - // Returning user: restore display name. - final savedName = settings.displayName; - if (savedName != null && savedName.isNotEmpty) { - model.displayName = savedName; - } } if (!mounted) return; @@ -73,9 +65,8 @@ class _DesktopServicesViewState extends ConsumerState { await showDialog( context: context, barrierDismissible: false, - builder: (_) => NestedNavigatorDialog( + builder: (_) => const NestedNavigatorDialog( initialRoute: DesktopShopinBitFirstRun.routeName, - initialRouteArgs: model, ), ); } else { @@ -85,9 +76,9 @@ class _DesktopServicesViewState extends ConsumerState { await showDialog( context: context, barrierDismissible: false, - builder: (_) => NestedNavigatorDialog( + builder: (_) => const NestedNavigatorDialog( initialRoute: ShopInBitStep2.routeName, - initialRouteArgs: (model: model, isActuallyFirstStep: true), + initialRouteArgs: true, ), ); @@ -109,10 +100,23 @@ class _DesktopServicesViewState extends ConsumerState { children: [ Padding( padding: const EdgeInsets.all(8.0), - child: SvgPicture.asset( - Assets.svg.circleSliders, - width: 48, - height: 48, + child: Container( + decoration: BoxDecoration( + color: const Color(0xFFE0E3E3), + borderRadius: .circular(54), + ), + width: 54, + height: 54, + child: Center( + child: SizedBox( + width: 38, + height: 38, + child: SvgPicture.asset( + Assets.svg.sib, + colorFilter: const .mode(Colors.black, .srcIn), + ), + ), + ), ), ), Padding( @@ -234,9 +238,7 @@ class _DesktopServicesViewState extends ConsumerState { } class _ShopInBitDesktopSetupDialog extends ConsumerStatefulWidget { - const _ShopInBitDesktopSetupDialog({required this.model}); - - final ShopInBitOrderModel model; + const _ShopInBitDesktopSetupDialog(); @override ConsumerState<_ShopInBitDesktopSetupDialog> createState() => @@ -246,42 +248,33 @@ class _ShopInBitDesktopSetupDialog extends ConsumerStatefulWidget { class _ShopInBitDesktopSetupDialogState extends ConsumerState<_ShopInBitDesktopSetupDialog> { late final Future _keyFuture; - final TextEditingController _nameController = TextEditingController(); - - bool get _canContinue => _nameController.text.trim().isNotEmpty; + String? _key; @override void initState() { super.initState(); _keyFuture = ref.read(pShopinBitService).ensureCustomerKey(); - - // not the greatest solution but its the least invasive with the current - // ui code impl () async { - final settings = await ref - .read(pSharedDrift) - .shopinBitSettingsDao - .getSettings(); - if (mounted) { - setState(() { - _nameController.text = settings.displayName ?? ""; - }); - } + final key = await _keyFuture; + if (mounted) setState(() => _key = key); }(); } - @override - void dispose() { - _nameController.dispose(); - super.dispose(); - } - Future _completeSetup() async { - final name = _nameController.text.trim(); - widget.model.displayName = name; - final dao = ref.read(pSharedDrift).shopinBitSettingsDao; - await dao.setDisplayName(name); - await dao.setSetupComplete(true); + final dao = ref.read(pSharedDrift).shopInBitSettingsDao; + await showLoading( + context: context, + message: "Saving...", + whileFuture: () async { + final settings = await dao.getCurrentSettings(); + if (settings == null) { + throw Exception("Devs pls clean this up"); + } + + await dao.setSetupComplete(settings.customerKey, true); + }(), + ); + if (mounted) { Navigator.of(context, rootNavigator: true).pop(true); } @@ -384,31 +377,14 @@ class _ShopInBitDesktopSetupDialogState ); }, ), - const SizedBox(height: 24), - Text( - "Display Name", - style: STextStyles.desktopTextExtraExtraSmall(context) - .copyWith( - color: Theme.of(context) - .extension()! - .textFieldActiveSearchIconRight, - ), - ), - const SizedBox(height: 8), - AdaptiveTextField( - controller: _nameController, - showPasteClearButton: true, - maxLines: 1, - onChangedComprehensive: (_) => setState(() {}), - ), const SizedBox(height: 40), Row( mainAxisAlignment: .end, children: [ PrimaryButton( label: "Complete Setup", - enabled: _canContinue, - onPressed: _canContinue ? _completeSetup : null, + enabled: _key != null, + onPressed: _key != null ? _completeSetup : null, horizontalContentPadding: 20, ), ], diff --git a/lib/pages_desktop_specific/services/shopin_bit/sub_widgets/desktop_shopin_bit_first_run.dart b/lib/pages_desktop_specific/services/shopin_bit/sub_widgets/desktop_shopin_bit_first_run.dart index 16e791d923..ba16219323 100644 --- a/lib/pages_desktop_specific/services/shopin_bit/sub_widgets/desktop_shopin_bit_first_run.dart +++ b/lib/pages_desktop_specific/services/shopin_bit/sub_widgets/desktop_shopin_bit_first_run.dart @@ -1,24 +1,20 @@ import 'package:flutter/material.dart'; -import '../../../../models/shopinbit/shopinbit_order_model.dart'; import '../../../../pages/shopinbit/shopinbit_step_2.dart'; import '../../../../utilities/text_styles.dart'; import '../../../../widgets/desktop/primary_button.dart'; -import '../../../../widgets/desktop/secondary_button.dart'; import '../../../../widgets/dialogs/s_dialog.dart'; class DesktopShopinBitFirstRun extends StatelessWidget { - const DesktopShopinBitFirstRun({super.key, required this.model}); + const DesktopShopinBitFirstRun({super.key}); static const routeName = "/desktopShopinBitFirstRun"; - final ShopInBitOrderModel model; - @override Widget build(BuildContext context) { return SDialog( child: SizedBox( - width: 580, + width: 500, child: Padding( padding: const EdgeInsets.all(32), child: Column( @@ -33,29 +29,24 @@ class DesktopShopinBitFirstRun extends StatelessWidget { TextSpan( text: "Please note the following before proceeding:" - "\n\n\u2022 Minimum order amount: 1,000 EUR" - "\n\u2022 Service fee: 10% of the order total", + "\n\n \u2022 Minimum order amount: 1,000 EUR" + "\n \u2022 Service fee: 10% of the order total", ), ], ), ), - const SizedBox(height: 32), + const SizedBox(height: 48), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - SecondaryButton( - width: 220, - buttonHeight: ButtonHeight.l, - label: "Cancel", - onPressed: Navigator.of(context).pop, - ), - PrimaryButton( - width: 220, - buttonHeight: ButtonHeight.l, - label: "Continue", - onPressed: () => Navigator.of(context).pushReplacementNamed( - ShopInBitStep2.routeName, - arguments: model, + const Spacer(), + Expanded( + child: PrimaryButton( + buttonHeight: ButtonHeight.l, + label: "Continue", + onPressed: () => Navigator.of( + context, + ).pushReplacementNamed(ShopInBitStep2.routeName), ), ), ], diff --git a/lib/pages_desktop_specific/settings/desktop_settings_view.dart b/lib/pages_desktop_specific/settings/desktop_settings_view.dart index 65569890d1..f60952ec20 100644 --- a/lib/pages_desktop_specific/settings/desktop_settings_view.dart +++ b/lib/pages_desktop_specific/settings/desktop_settings_view.dart @@ -13,9 +13,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../app_config.dart'; import '../../pages/shopinbit/shopinbit_settings_view.dart'; -import '../../providers/providers.dart'; import '../../route_generator.dart'; import '../../themes/stack_colors.dart'; +import '../../utilities/constants.dart'; import '../../utilities/text_styles.dart'; import '../../widgets/desktop/desktop_app_bar.dart'; import '../../widgets/desktop/desktop_scaffold.dart'; @@ -43,10 +43,6 @@ class DesktopSettingsView extends ConsumerStatefulWidget { class _DesktopSettingsViewState extends ConsumerState { @override Widget build(BuildContext context) { - final familiarity = ref.watch( - prefsChangeNotifierProvider.select((v) => v.familiarity), - ); - final List contentViews = [ const Navigator( key: Key("settingsBackupRestoreDesktopKey"), @@ -94,7 +90,7 @@ class _DesktopSettingsViewState extends ConsumerState { onGenerateRoute: RouteGenerator.generateRoute, initialRoute: AdvancedSettings.routeName, ), //advanced - if (AppConfig.hasFeature(.shopinBit) && familiarity >= 6) + if (Constants.enableExchange && AppConfig.hasFeature(.shopinBit)) const Navigator( key: Key("settingsShopInBitDesktopKey"), onGenerateRoute: RouteGenerator.generateRoute, diff --git a/lib/pages_desktop_specific/settings/settings_menu.dart b/lib/pages_desktop_specific/settings/settings_menu.dart index be49fc2a2a..619c97f9ec 100644 --- a/lib/pages_desktop_specific/settings/settings_menu.dart +++ b/lib/pages_desktop_specific/settings/settings_menu.dart @@ -13,9 +13,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import '../../app_config.dart'; -import '../../providers/providers.dart'; import '../../themes/stack_colors.dart'; import '../../utilities/assets.dart'; +import '../../utilities/constants.dart'; import 'settings_menu_item.dart'; final selectedSettingsMenuItemStateProvider = StateProvider((_) => 0); @@ -32,10 +32,6 @@ class _SettingsMenuState extends ConsumerState { Widget build(BuildContext context) { debugPrint("BUILD: $runtimeType"); - final familiarity = ref.watch( - prefsChangeNotifierProvider.select((v) => v.familiarity), - ); - final List labels = [ "Backup and restore", "Security", @@ -46,7 +42,8 @@ class _SettingsMenuState extends ConsumerState { "Syncing preferences", if (AppConfig.hasFeature(AppFeature.themeSelection)) "Appearance", "Advanced", - if (AppConfig.hasFeature(.shopinBit) && familiarity >= 6) "ShopinBit", + if (Constants.enableExchange && AppConfig.hasFeature(.shopinBit)) + "ShopinBit", ]; return Column( diff --git a/lib/providers/global/shopin_bit_orders_provider.dart b/lib/providers/global/shopin_bit_orders_provider.dart deleted file mode 100644 index 2e46a7e76e..0000000000 --- a/lib/providers/global/shopin_bit_orders_provider.dart +++ /dev/null @@ -1,9 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../../services/shopinbit/shopinbit_orders_service.dart'; -import 'shopin_bit_service_provider.dart'; - -final pShopInBitOrdersService = ChangeNotifierProvider( - (ref) => - ShopInBitOrdersService(shopInBitService: ref.read(pShopinBitService)), -); diff --git a/lib/providers/global/shopin_bit_service_provider.dart b/lib/providers/global/shopin_bit_service_provider.dart index 9f9c422e69..102a59f043 100644 --- a/lib/providers/global/shopin_bit_service_provider.dart +++ b/lib/providers/global/shopin_bit_service_provider.dart @@ -1,8 +1,42 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../../db/drift/shared_db/shared_database.dart'; +import '../../external_api_keys.dart'; +import '../../services/shopinbit/shopinbit_api.dart'; import '../../services/shopinbit/shopinbit_service.dart'; -import 'secure_store_provider.dart'; +import '../db/drift_provider.dart'; final pShopinBitService = Provider( - (ref) => ShopInBitService()..ensureInitialized(ref.read(secureStoreProvider)), + (ref) => ShopInBitService( + client: ShopInBitClient( + accessKey: kShopInBitAccessKey, + partnerSecret: kShopInBitPartnerSecret, + sandbox: false, + ), + db: ref.watch(pSharedDrift), + ), ); + +/// The active customer key's settings row (or null if none yet). +final pShopInBitSettings = StreamProvider.autoDispose( + (ref) => ref.watch(pSharedDrift).shopInBitSettingsDao.watchCurrentSettings(), +); + +/// All tickets for the active customer key, newest first. +final pShopInBitTickets = StreamProvider.autoDispose>(( + ref, +) async* { + final db = ref.watch(pSharedDrift); + final settings = await db.shopInBitSettingsDao.getCurrentSettings(); + if (settings == null) { + yield const []; + return; + } + yield* db.shopInBitTicketsDao.watchByCustomerKey(settings.customerKey); +}); + +final pShopInBitTicket = StreamProvider.autoDispose + .family( + (ref, apiTicketId) => + ref.watch(pSharedDrift).shopInBitTicketsDao.watchByApiId(apiTicketId), + ); diff --git a/lib/route_generator.dart b/lib/route_generator.dart index 2a42a8af7c..6197874811 100644 --- a/lib/route_generator.dart +++ b/lib/route_generator.dart @@ -15,6 +15,7 @@ import 'package:tuple/tuple.dart'; import 'app_config.dart'; import 'db/drift/database.dart'; +import 'db/drift/shared_db/shared_database.dart'; import 'models/add_wallet_list_entity/add_wallet_list_entity.dart'; import 'models/add_wallet_list_entity/sub_classes/eth_token_entity.dart'; import 'models/add_wallet_list_entity/sub_classes/sol_token_entity.dart'; @@ -29,7 +30,8 @@ import 'models/keys/key_data_interface.dart'; import 'models/keys/view_only_wallet_data.dart'; import 'models/paynym/paynym_account_lite.dart'; import 'models/send_view_auto_fill_data.dart'; -import 'models/shopinbit/shopinbit_order_model.dart'; +import 'models/shopinbit/shopinbit_enums.dart'; +import 'models/shopinbit/shopinbit_request_draft.dart'; import 'pages/add_wallet_views/add_token_view/add_custom_solana_token_view.dart'; import 'pages/add_wallet_views/add_token_view/add_custom_token_view.dart'; import 'pages/add_wallet_views/add_token_view/edit_wallet_tokens_view.dart'; @@ -89,8 +91,6 @@ import 'pages/masternodes/create_masternode_view.dart'; import 'pages/masternodes/masternode_details_view.dart'; import 'pages/masternodes/masternodes_home_view.dart'; import 'pages/monkey/monkey_view.dart'; -import 'pages/more_view/gift_cards_view.dart'; -import 'pages/more_view/services_view.dart'; import 'pages/namecoin_names/buy_domain_view.dart'; import 'pages/namecoin_names/confirm_name_transaction_view.dart'; import 'pages/namecoin_names/manage_domain_view.dart'; @@ -182,7 +182,6 @@ import 'pages/shopinbit/shopinbit_send_from_view.dart'; import 'pages/shopinbit/shopinbit_settings_view.dart'; import 'pages/shopinbit/shopinbit_setup_view.dart'; import 'pages/shopinbit/shopinbit_shipping_view.dart'; -import 'pages/shopinbit/shopinbit_step_1.dart'; import 'pages/shopinbit/shopinbit_step_2.dart'; import 'pages/shopinbit/shopinbit_step_3.dart'; import 'pages/shopinbit/shopinbit_step_4.dart'; @@ -262,6 +261,7 @@ import 'services/cakepay/src/models/order.dart'; import 'services/event_bus/events/global/node_connection_status_changed_event.dart'; import 'services/event_bus/events/global/wallet_sync_status_changed_event.dart'; import 'services/shopinbit/src/models/car_research.dart'; +import 'services/shopinbit/src/models/payment.dart'; import 'utilities/amount/amount.dart'; import 'utilities/enums/add_wallet_type_enum.dart'; import 'wallets/crypto_currency/crypto_currency.dart'; @@ -1064,30 +1064,13 @@ class RouteGenerator { } return _routeError("${settings.name} invalid args: ${args.toString()}"); - case ServicesView.routeName: - return getRoute( - shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => const ServicesView(), - settings: RouteSettings(name: settings.name), - ); - - case GiftCardsView.routeName: + case ShopInBitSetupView.routeName: return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => const GiftCardsView(), + builder: (_) => const ShopInBitSetupView(), settings: RouteSettings(name: settings.name), ); - case ShopInBitSetupView.routeName: - if (args is ShopInBitOrderModel) { - return getRoute( - shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitSetupView(model: args), - settings: RouteSettings(name: settings.name), - ); - } - return _routeError("${settings.name} invalid args: ${args.toString()}"); - case CakePayVendorsView.routeName: return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, @@ -1140,51 +1123,41 @@ class RouteGenerator { case CakePayConfirmSendView.routeName: return _routeError("${settings.name} should be pushed directly"); - case ShopInBitStep1.routeName: - if (args is ShopInBitOrderModel) { - return getRoute( - shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitStep1(model: args), - settings: RouteSettings(name: settings.name), - ); - } - return _routeError("${settings.name} invalid args: ${args.toString()}"); - case ShopInBitStep2.routeName: - if (args is ShopInBitOrderModel) { - return getRoute( - shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitStep2(model: args), - settings: RouteSettings(name: settings.name), - ); - } - return _routeError("${settings.name} invalid args: ${args.toString()}"); + return getRoute( + shouldUseMaterialRoute: useMaterialPageRoute, + builder: (_) => const ShopInBitStep2(), + settings: RouteSettings(name: settings.name), + ); case ShopInBitStep3.routeName: - if (args is ShopInBitOrderModel) { + if (args is ({ShopInBitCategory category, String customerKey})) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitStep3(model: args), + builder: (_) => ShopInBitStep3( + category: args.category, + customerKey: args.customerKey, + ), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitStep4.routeName: - if (args is ShopInBitOrderModel) { + if (args is ShopInBitCategory) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitStep4(model: args), + builder: (_) => ShopInBitStep4(category: args), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitOrderCreated.routeName: - if (args is ShopInBitOrderModel) { + if (args is int) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitOrderCreated(model: args), + builder: (_) => ShopInBitOrderCreated(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } @@ -1205,52 +1178,59 @@ class RouteGenerator { ); case ShopInBitTicketDetail.routeName: - if (args is ShopInBitOrderModel) { + if (args is int) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitTicketDetail(model: args), + builder: (_) => ShopInBitTicketDetail(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitOfferView.routeName: - if (args is ShopInBitOrderModel) { + if (args is int) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitOfferView(model: args), + builder: (_) => ShopInBitOfferView(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitShippingView.routeName: - if (args is ShopInBitOrderModel) { + if (args + is ({ + ShopInBitTicket ticket, + List> countries, + })) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitShippingView(model: args), + builder: (_) => ShopInBitShippingView( + ticket: args.ticket, + countries: args.countries, + ), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitCarFeeView.routeName: - if (args is ShopInBitOrderModel) { + if (args is ShopinbitRequestDraft) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitCarFeeView(model: args), + builder: (_) => ShopInBitCarFeeView(draft: args), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitCarResearchPaymentView.routeName: - if (args is (ShopInBitOrderModel, CarResearchInvoice)) { + if (args is ({CarResearchInvoice invoice, String customerKey})) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, builder: (_) => ShopInBitCarResearchPaymentView( - model: args.$1, - invoice: args.$2, + invoice: args.invoice, + customerKey: args.customerKey, ), settings: RouteSettings(name: settings.name), ); @@ -1258,25 +1238,27 @@ class RouteGenerator { return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitPaymentView.routeName: - if (args is ShopInBitOrderModel) { + if (args is ({int apiTicketId, PaymentInfo paymentInfo})) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, - builder: (_) => ShopInBitPaymentView(model: args), + builder: (_) => ShopInBitPaymentView( + apiTicketId: args.apiTicketId, + paymentInfo: args.paymentInfo, + ), settings: RouteSettings(name: settings.name), ); } return _routeError("${settings.name} invalid args: ${args.toString()}"); case ShopInBitSendFromView.routeName: - if (args - is Tuple4) { + if (args is Tuple4) { return getRoute( shouldUseMaterialRoute: useMaterialPageRoute, builder: (_) => ShopInBitSendFromView( coin: args.item1, amount: args.item2, address: args.item3, - model: args.item4, + apiTicketId: args.item4, ), settings: RouteSettings(name: settings.name), ); diff --git a/lib/services/cakepay/cakepay_orders_service.dart b/lib/services/cakepay/cakepay_orders_service.dart index 625850a0aa..fd9083bd46 100644 --- a/lib/services/cakepay/cakepay_orders_service.dart +++ b/lib/services/cakepay/cakepay_orders_service.dart @@ -13,9 +13,9 @@ class CakePayOrdersService extends ChangeNotifier { static const Duration defaultPollInterval = Duration(seconds: 15); final Map _orders = {}; - final Set _inflight = {}; + final Map> _inFlight = {}; final Map _polls = {}; - bool _refreshingAll = false; + Completer? _refreshAllCompleter; /// Current cached value for [orderId], or null if not yet fetched. CakePayOrder? get(String orderId) => _orders[orderId]; @@ -34,42 +34,61 @@ class CakePayOrdersService extends ChangeNotifier { return list; } - bool isRefreshing(String orderId) => _inflight.contains(orderId); - bool get isRefreshingAll => _refreshingAll; + bool isRefreshing(String orderId) => _inFlight.containsKey(orderId); + bool get isRefreshingAll => _refreshAllCompleter != null; - /// Fetch a single order. No-ops if a fetch for [orderId] is already in - /// flight. + /// returns existing future if already in flight Future refreshOne(String orderId) async { - if (_inflight.contains(orderId)) return; - _inflight.add(orderId); + final Completer? pending = _inFlight[orderId]; + if (pending != null) return pending.future; + + final Completer completer = Completer(); + _inFlight[orderId] = completer; notifyListeners(); - try { - final resp = await CakePayService.instance.client.getOrder(orderId); - if (!resp.hasError && resp.value != null) { - _putIfChanged(resp.value!); + + unawaited(() async { + try { + final resp = await CakePayService.instance.client.getOrder(orderId); + if (!resp.hasError && resp.value != null) { + _putIfChanged(resp.value!); + } + completer.complete(); + } catch (e, s) { + completer.completeError(e, s); + } finally { + _inFlight.remove(orderId); + notifyListeners(); } - } catch (_) { - // Silently leave the cached value in place. - } finally { - _inflight.remove(orderId); - notifyListeners(); - } + }()); + + return completer.future; } - /// Fetch every locally-tracked order in parallel. + /// Fetch every locally-tracked order in parallel. Returns the existing + /// future if a refresh-all is already in flight, so awaiters can be sure a + /// refresh has actually occurred. Future refreshAll() async { - if (_refreshingAll) return; - _refreshingAll = true; + final Completer? pending = _refreshAllCompleter; + if (pending != null) return pending.future; + + final Completer completer = Completer(); + _refreshAllCompleter = completer; notifyListeners(); - try { - final ids = await CakePayService.instance.getOrderIds(); - await Future.wait(ids.map(refreshOne)); - } catch (_) { - // Listeners still hold whatever was cached. - } finally { - _refreshingAll = false; - notifyListeners(); - } + + unawaited(() async { + try { + final ids = await CakePayService.instance.getOrderIds(); + await Future.wait(ids.map(refreshOne)); + completer.complete(); + } catch (e, s) { + completer.completeError(e, s); + } finally { + _refreshAllCompleter = null; + notifyListeners(); + } + }()); + + return completer.future; } /// Start (or join) a refcounted poll for [orderId]. The first call kicks off diff --git a/lib/services/shopinbit/shopinbit_orders_service.dart b/lib/services/shopinbit/shopinbit_orders_service.dart deleted file mode 100644 index 204bb25c3c..0000000000 --- a/lib/services/shopinbit/shopinbit_orders_service.dart +++ /dev/null @@ -1,197 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/foundation.dart'; - -import '../../db/drift/shared_db/shared_database.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; -import 'shopinbit_service.dart'; - -/// Holds canonical [ShopInBitOrderModel] instances keyed by `apiTicketId`, -/// refreshes them in the background, and notifies listeners only when -/// something actually changed. -/// -/// Modelled on `PriceService`, see `lib/services/price_service.dart`. -class ShopInBitOrdersService extends ChangeNotifier { - ShopInBitOrdersService({required this.shopInBitService}); - - static const Duration defaultPollInterval = Duration(seconds: 30); - - final ShopInBitService shopInBitService; - - final Map _tickets = {}; - final Set _inflight = {}; - final Map _polls = {}; - - /// Register [model] as the canonical instance for its `apiTicketId`. If a - /// canonical instance already exists, returns it; otherwise stores and - /// returns [model]. Callers should use the returned instance. - ShopInBitOrderModel upsert(ShopInBitOrderModel model) { - final existing = _tickets[model.apiTicketId]; - if (existing != null) return existing; - _tickets[model.apiTicketId] = model; - return model; - } - - ShopInBitOrderModel? get(int apiTicketId) => _tickets[apiTicketId]; - - bool isRefreshing(int apiTicketId) => _inflight.contains(apiTicketId); - - /// Fetch latest status + messages (+ offer details if applicable) for the - /// given ticket. No-ops if a fetch for this ticket is already in flight. - Future refreshOne(int apiTicketId) async { - if (apiTicketId == 0) return; - if (_inflight.contains(apiTicketId)) return; - final model = _tickets[apiTicketId]; - if (model == null) return; - - _inflight.add(apiTicketId); - notifyListeners(); - try { - final client = shopInBitService.client; - - // Fire both off concurrently, then await individually for typed access. - final messagesFuture = client.getMessages(apiTicketId); - final statusFuture = client.getTicketStatus(apiTicketId); - final messagesResp = await messagesFuture; - final statusResp = await statusFuture; - - bool changed = false; - - if (!messagesResp.hasError && messagesResp.value != null) { - final apiMessages = messagesResp.value!; - final last = model.messages.isEmpty ? null : model.messages.last; - final apiLast = apiMessages.isEmpty ? null : apiMessages.last; - final lengthsDiffer = model.messages.length != apiMessages.length; - final lastTimestampDiffers = last?.timestamp != apiLast?.timestamp; - if (lengthsDiffer || lastTimestampDiffers) { - model.clearMessages(); - for (final m in apiMessages) { - model.addMessage( - ShopInBitMessage( - text: m.content, - timestamp: m.timestamp, - isFromUser: !m.fromAgent, - ), - ); - } - changed = true; - } - } - - if (!statusResp.hasError && statusResp.value != null) { - final newStatus = ShopInBitOrderModel.statusFromTicketState( - statusResp.value!.state, - ); - model.statusRaw = statusResp.value!.stateRaw; - if (model.status != newStatus && newStatus != null) { - model.status = newStatus; - changed = true; - } - } - - if (model.status == ShopInBitOrderStatus.offerAvailable && - (model.offerProductName == null || model.offerPrice == null)) { - final offerResp = await client.getTicketFull(apiTicketId); - if (!offerResp.hasError && offerResp.value != null) { - final t = offerResp.value!; - model.setOffer(productName: t.productName, price: t.customerPrice); - changed = true; - } - } - - if (changed && model.ticketId != null) { - final db = SharedDrift.get(); - unawaited( - db - .into(db.shopInBitTickets) - .insertOnConflictUpdate(model.toCompanion()), - ); - } - } catch (_) { - // Silently leave the cached model in place. - } finally { - _inflight.remove(apiTicketId); - notifyListeners(); - } - } - - /// Start (or join) a refcounted poll for [apiTicketId]. The first call - /// kicks off an immediate refresh and creates the timer; subsequent calls - /// just bump the refcount. Pair each call with [stopPolling]. - /// - /// If [pollInBackground] is false, the immediate refresh still runs but no - /// timer is created (matches the existing behavior for car-research - /// tickets). - void startPolling( - int apiTicketId, { - Duration interval = defaultPollInterval, - bool pollInBackground = true, - }) { - if (apiTicketId == 0) return; - final existing = _polls[apiTicketId]; - if (existing != null) { - existing.refs += 1; - return; - } - final poll = _Poll(refs: 1, timer: null); - _polls[apiTicketId] = poll; - unawaited(refreshOne(apiTicketId)); - if (pollInBackground) { - poll.timer = Timer.periodic(interval, (_) { - unawaited(refreshOne(apiTicketId)); - }); - } - } - - void stopPolling(int apiTicketId) { - final poll = _polls[apiTicketId]; - if (poll == null) return; - poll.refs -= 1; - if (poll.refs <= 0) { - _polls.remove(apiTicketId)?.timer?.cancel(); - } - } - - /// Sync the customer's full ticket list from the API, walking each one to - /// refresh status / messages / offer in parallel. Used by the requests - /// list view. - Future refreshAll() async { - try { - final customerKey = await shopInBitService.ensureCustomerKey(); - final resp = await shopInBitService.client.getTicketsByCustomer( - customerKey, - ); - if (resp.hasError || resp.value == null) return; - - final db = SharedDrift.get(); - final localRows = await db.select(db.shopInBitTickets).get(); - final byApiId = {for (final r in localRows) r.apiTicketId: r}; - - final List> tasks = []; - for (final ticketRef in resp.value!) { - final row = byApiId[ticketRef.id]; - if (row == null) continue; - final model = upsert(ShopInBitOrderModel.fromDriftRow(row)); - tasks.add(refreshOne(model.apiTicketId)); - } - await Future.wait(tasks); - } catch (_) { - // Listeners still see whatever Drift / cache held before. - } - } - - @override - void dispose() { - for (final p in _polls.values) { - p.timer?.cancel(); - } - _polls.clear(); - super.dispose(); - } -} - -class _Poll { - _Poll({required this.refs, required this.timer}); - int refs; - Timer? timer; -} diff --git a/lib/services/shopinbit/shopinbit_service.dart b/lib/services/shopinbit/shopinbit_service.dart index af9825e2f3..09f6d73d48 100644 --- a/lib/services/shopinbit/shopinbit_service.dart +++ b/lib/services/shopinbit/shopinbit_service.dart @@ -1,203 +1,365 @@ -import 'package:drift/drift.dart'; +import "dart:async"; -import '../../db/drift/shared_db/shared_database.dart'; -import '../../db/drift/shared_db/tables/shopin_bit_tickets.dart'; -import '../../external_api_keys.dart'; -import '../../models/shopinbit/shopinbit_order_model.dart'; -import '../../utilities/flutter_secure_storage_interface.dart'; -import '../../utilities/logger.dart'; -import 'src/client.dart'; -import 'src/models/message.dart'; -import 'src/models/ticket.dart'; +import "package:drift/drift.dart"; -const _kShopinBitCustomerKeyKeySecureStore = "shopinBitSecStoreCustomerKeyKey"; +import "../../db/drift/shared_db/shared_database.dart"; +import "../../models/shopinbit/shopinbit_enums.dart"; +import "../../utilities/logger.dart"; +import "src/api_response.dart"; +import "src/client.dart"; +import "src/models/message.dart"; +import "src/models/ticket.dart"; + +/// Display name sent to ShopinBit as `customer_pseudonym`. +const String kShopInBitCustomerPseudonym = "Satoshi"; class ShopInBitService { - SecureStorageInterface? _secureStorageInterface; + ShopInBitService({required this.client, required this.db}); - SecureStorageInterface get _secure { - if (_secureStorageInterface == null) { - throw Exception( - "Did you forget to call ShopInBitService.ensureInitialized()?", - ); + final ShopInBitClient client; + final SharedDatabase db; + + final Map> _inFlight = {}; + + // -- Customer key -- + + /// Returns the most-recently-used customer key. Generates a new one if + /// the DB has no settings yet. Always leaves [client] pointing at the + /// returned key. + Future ensureCustomerKey() async { + final ShopInBitSetting? current = await db.shopInBitSettingsDao + .getCurrentSettings(); + if (current != null) { + await db.shopInBitSettingsDao.touch(current.customerKey); + return current.customerKey; } - return _secureStorageInterface!; + return generateCustomerKey(); } - /// If secure storage was already set, this function will do nothing - void ensureInitialized(SecureStorageInterface secureStore) { - _secureStorageInterface ??= secureStore; + Future generateCustomerKey() async { + final ApiResponse resp = await client.generateKey(); + return useCustomerKey(resp.valueOrThrow); } - ShopInBitClient? _client; - ShopInBitClient get client { - _client ??= ShopInBitClient( - accessKey: kShopInBitAccessKey, - partnerSecret: kShopInBitPartnerSecret, - sandbox: true, - ); - return _client!; - } + Future recoverCustomerKey(String key) => useCustomerKey(key); - Future loadCustomerKey() => - _secure.read(key: _kShopinBitCustomerKeyKeySecureStore); + /// Switch the active customer key. Tickets for OTHER customer keys stay + /// in the DB — switching is just a header change plus an upsert into + /// settings. The UI filters tickets by the active key. + Future useCustomerKey(String key) async { + await db.shopInBitSettingsDao.upsert(key); + return key; + } - Future ensureCustomerKey() async { - final currentKey = await loadCustomerKey(); + // -- Refresh -- - if (currentKey != null) { - Logging.instance.t("ShopInBitService: loaded customer key from DB"); - client.externalCustomerKey = currentKey; - return currentKey; + /// Refresh every ticket the API reports for the current customer key. + /// New tickets are hydrated and inserted; existing tickets are patched. + Future refreshAll() async { + final String key = await ensureCustomerKey(); + final ApiResponse> resp = await client.getTicketsByCustomer( + key, + ); + if (resp.hasError || resp.value == null) { + Logging.instance.w( + "ShopInBitService.refreshAll: failed to fetch ticket list", + error: resp.exception, + ); + return; } - Logging.instance.i("ShopInBitService: generating new customer key"); - final resp = await client.generateKey(); - final customerKey = resp.valueOrThrow; - await setCustomerKey(customerKey); - Logging.instance.i("ShopInBitService: customer key stored"); - return customerKey; + await Future.wait( + resp.value! + .where((e) => !e.isKnownReceipt) + .map((ref) => _refreshRef(ref, key)), + ); } - Future setCustomerKey(String key) async { - await _secure.write(key: _kShopinBitCustomerKeyKeySecureStore, value: key); - client.externalCustomerKey = key; - Logging.instance.i("ShopInBitService: customer key stored"); + /// Refresh a single ticket. The row must already exist; use this for + /// polling and post-action refreshes. For an unknown ticket id, call + /// [refreshAll] (which has the customer-key context needed to insert). + Future refreshOne(int apiTicketId) async { + final ShopInBitTicket? existing = await db.shopInBitTicketsDao.getByApiId( + apiTicketId, + ); + if (existing == null) return; + await _refreshRef( + TicketRef(id: existing.apiTicketId, number: existing.ticketNumber), + existing.customerKey, + ); } - Future clearCustomerKey() async { - client.externalCustomerKey = null; - await _secure.delete(key: _kShopinBitCustomerKeyKeySecureStore); - Logging.instance.i("ShopInBitService: customer key cleared"); + // -- Actions -- + + /// Create a new ticket. We know every required field at this point + /// (they're the inputs we just sent), so the DB row is inserted + /// synchronously with full provenance data and an empty conversation; + /// dynamic fields are then patched in by a background refresh. + Future createRequest({ + required ShopInBitCategory category, + required String comment, + required String deliveryCountry, + String? voucherCode, + }) async { + final String key = await ensureCustomerKey(); + final ApiResponse resp = await client.createRequest( + customerPseudonym: kShopInBitCustomerPseudonym, + externalCustomerKey: key, + serviceType: category.apiValue, + comment: comment, + deliveryCountry: deliveryCountry, + voucherCode: voucherCode, + ); + if (resp.hasError || resp.value == null) return null; + final TicketRef ref = resp.value!; + + await db.shopInBitTicketsDao.insertTicket( + ShopInBitTicketsCompanion.insert( + apiTicketId: ref.id, + customerKey: key, + ticketNumber: ref.number, + category: category, + requestDescription: comment, + deliveryCountry: deliveryCountry, + status: ShopInBitOrderStatus.pending, + statusRaw: "NEW", + ), + ); + + unawaited(refreshOne(ref.id)); + return ref; } - /// Fetch the customer's tickets from the API and build companions for any - /// that aren't already in the local database. Used to backfill rows for - /// tickets created out-of-band (other devices, web dashboard, etc.). - Future> fetchAllForCustomerKey( + Future sendMessage( + int apiTicketId, + String message, String customerKey, ) async { - final resp = await client.getTicketsByCustomer(customerKey); - if (resp.hasError || resp.value == null) { - Logging.instance.w( - "ShopInBitService.fetchAllForCustomerKey: getTicketsByCustomer failed: " - "${resp.exception?.message}", - ); - return const []; - } + final ApiResponse> resp = await client.sendMessage( + apiTicketId, + message, + customerKey: customerKey, + ); + if (resp.hasError) return false; + unawaited(refreshOne(apiTicketId)); + return true; + } + + // -- Internals -- - final db = SharedDrift.get(); - final localRows = await db.select(db.shopInBitTickets).get(); - final knownApiIds = localRows.map((r) => r.apiTicketId).toSet(); + /// Hydrate-or-update one ticket. Branches on whether the row already + /// exists: existing rows get a partial patch, brand-new rows are only + /// inserted if /full, /status, and /messages all succeed (no empty + /// placeholder rows). + /// + /// Concurrent calls for the same ticket id are coalesced onto the + /// in-flight refresh — later callers await the same completer rather + /// than kicking off a second round-trip. + Future _refreshRef(TicketRef ref, String customerKey) { + final int id = ref.id; - final newRefs = resp.value! - .where((r) => !knownApiIds.contains(r.id)) - .toList(); - if (newRefs.isEmpty) return const []; + final Completer? pending = _inFlight[id]; + if (pending != null) return pending.future; - // Hydrate per-ticket in parallel. status + messages are exempt from the - // 60 req/min rate limit per the API spec; getTicketFull is only called - // for tickets whose state maps to offerAvailable. - final results = await Future.wait(newRefs.map(_hydrateNewTicket)); - return results.whereType().toList(); + final Completer completer = Completer(); + _inFlight[id] = completer; + + // Fire-and-forget: _runRefresh should never throw (it routes errors through + // the completer), so the unawaited future is safe. Every caller — + // including the first — awaits the completer, guaranteeing there's a + // listener for any error. + unawaited(_refreshRefBody(ref, customerKey, completer)); + return completer.future; } - Future _hydrateNewTicket(TicketRef ref) async { + Future _refreshRefBody( + TicketRef ref, + String customerKey, + Completer completer, + ) async { + final int id = ref.id; try { - final statusFuture = client.getTicketStatus(ref.id); - final messagesFuture = client.getMessages(ref.id); - final statusResp = await statusFuture; - final messagesResp = await messagesFuture; + final ShopInBitTicket? existing = await db.shopInBitTicketsDao.getByApiId( + id, + ); - if (statusResp.hasError || statusResp.value == null) { + // get status first. If it fails there is no reason to make the remaining + // two API calls + final statusResp = await client.getTicketStatus( + id, + customerKey: customerKey, + ); + + if (statusResp.exception?.statusCode == 403) { Logging.instance.w( - "ShopInBitService.fetchAllForCustomerKey: status failed for " - "${ref.id}: ${statusResp.exception?.message}", + "$runtimeType._refreshBody status call permission denied. " + "Ignoring ticket.", ); - return null; - } - - final apiMessages = messagesResp.value ?? const []; + } else { + final ApiResponse? fullResp; + final ApiResponse> messagesResp; + (fullResp, messagesResp) = await ( + existing == null + ? client.getTicketFull(id, customerKey: customerKey) + : (() async => null)(), + client.getMessages(id, customerKey: customerKey), + ).wait; - final mappedStatus = - ShopInBitOrderModel.statusFromTicketState(statusResp.value!.state) ?? - ShopInBitOrderStatus.pending; - - String? offerProductName; - String? offerPrice; - if (mappedStatus == ShopInBitOrderStatus.offerAvailable) { - final fullResp = await client.getTicketFull(ref.id); - if (!fullResp.hasError && fullResp.value != null) { - offerProductName = fullResp.value!.productName; - offerPrice = fullResp.value!.customerPrice; + if (existing == null) { + await _insertHydrated( + ref: ref, + customerKey: customerKey, + full: fullResp?.value, + status: statusResp.value, + messages: messagesResp.value, + ); + } else { + await _patchExisting( + existing: existing, + full: fullResp?.value, + status: statusResp.value, + messages: messagesResp.value, + ); } } - final category = _inferCategoryFromMessages(apiMessages); - final feeTicketNumber = category == ShopInBitCategory.car - ? _extractFeeTicketNumber(apiMessages) - : null; - final requestDescription = _extractRequestDescription(apiMessages); - - final messages = apiMessages - .map( - (m) => ShopInBitTicketMessage( - text: m.content, - timestamp: m.timestamp, - isFromUser: !m.fromAgent, - ), - ) - .toList(); - - return ShopInBitTicketsCompanion( - ticketId: Value(ref.number), - displayName: const Value(""), - category: Value(category), - status: Value(mappedStatus), - statusRaw: Value(statusResp.value!.stateRaw), - requestDescription: Value(requestDescription), - deliveryCountry: const Value(""), - offerProductName: Value(offerProductName), - offerPrice: Value(offerPrice), - shippingName: const Value(""), - shippingStreet: const Value(""), - shippingCity: const Value(""), - shippingPostalCode: const Value(""), - shippingCountry: const Value(""), - messages: Value(messages), - createdAt: Value(DateTime.now()), - apiTicketId: Value(ref.id), - feeTicketNumber: Value(feeTicketNumber), - needsCreateRequest: const Value(false), - isPendingPayment: const Value(false), - ); + completer.complete(); } catch (e, s) { - Logging.instance.e( - "ShopInBitService.fetchAllForCustomerKey: hydrate failed for ${ref.id}", - error: e, - stackTrace: s, - ); - return null; + completer.completeError(e, s); + } finally { + _inFlight.remove(id); } } + + /// Insert path: every required field must resolve to a real value. If + /// any of /full, /status, or /messages failed we bail rather than write + /// a half-populated row. + Future _insertHydrated({ + required TicketRef ref, + required String customerKey, + required TicketFull? full, + required TicketStatus? status, + required List? messages, + }) async { + if (full == null || status == null || messages == null) return; + + final ShopInBitOrderStatus? mappedStatus = + ShopInBitOrderStatus.fromTicketState(status.state); + if (mappedStatus == null) return; + + final ShopInBitCategory category = _inferCategory(messages); + + await db.shopInBitTicketsDao.insertTicket( + ShopInBitTicketsCompanion.insert( + apiTicketId: ref.id, + customerKey: customerKey, + ticketNumber: ref.number, + category: category, + requestDescription: _extractRequestDescription(messages), + deliveryCountry: full.deliveryCountry, + status: mappedStatus, + statusRaw: status.stateRaw, + offerProductName: Value(full.productName), + offerPrice: Value(full.customerPrice), + paymentInvoiceStatus: Value(status.paymentInvoiceStatus), + trackingLink: Value(status.trackingLink), + lastAgentMessageAt: Value(status.lastAgentMessageAt), + feeTicketNumber: Value( + category == ShopInBitCategory.car + ? _extractFeeTicketNumber(messages) + : null, + ), + messages: Value(messages), + updatedAt: Value(DateTime.now()), + ), + ); + } + + /// Patch path: only touches columns the API actually returned. Stable + /// provenance fields (category, requestDescription, ticketNumber) are + /// never overwritten on update — they were authoritative at insert time. + Future _patchExisting({ + required ShopInBitTicket existing, + required TicketFull? full, + required TicketStatus? status, + required List? messages, + }) async { + final ShopInBitOrderStatus? mappedStatus = status == null + ? null + : ShopInBitOrderStatus.fromTicketState(status.state); + + await db.shopInBitTicketsDao.updateTicket( + existing.apiTicketId, + ShopInBitTicketsCompanion( + // From /status — only patch when we got a recognised state. + status: mappedStatus == null + ? const Value.absent() + : Value(mappedStatus), + statusRaw: status == null + ? const Value.absent() + : Value(status.stateRaw), + paymentInvoiceStatus: status == null + ? const Value.absent() + : Value(status.paymentInvoiceStatus), + trackingLink: status == null + ? const Value.absent() + : Value(status.trackingLink), + lastAgentMessageAt: status == null + ? const Value.absent() + : Value(status.lastAgentMessageAt), + deliveryCountry: full == null + ? const Value.absent() + : Value(full.deliveryCountry), + offerProductName: full == null + ? const Value.absent() + : Value(full.productName), + offerPrice: full == null + ? const Value.absent() + : Value(full.customerPrice), + + // From /messages. + messages: messages == null ? const Value.absent() : Value(messages), + feeTicketNumber: messages == null + ? const Value.absent() + : Value( + existing.category == ShopInBitCategory.car + ? _extractFeeTicketNumber(messages) + : null, + ), + + updatedAt: Value(DateTime.now()), + ), + ); + } } -// Infer category from the first user message. The car flow always seeds -// the comment with the "car research fee" line; travel requests built by -// _buildRequestDescription always start with "Arrangement: " followed by -// structured labels. Both are fragile against template changes in the form. -final RegExp _kCarResearchFeeRegex = RegExp(r'car research fee \(#([^)]+)\)'); +// -- Message parsers -- +// +// All "rich" fields the API doesn't surface directly are parsed from the +// first user message. The car flow seeds the comment with the standard +// "car research fee (#XYZ)" line; travel requests start with +// "Arrangement:" followed by structured labels. If either format changes +// server-side, update these regexes. + +final RegExp _kCarResearchFeeRegex = RegExp(r"car research fee \(#([^)]+)\)"); final RegExp _kTravelArrangementRegex = RegExp( - r'^Arrangement:\s', + r"^Arrangement:\s", multiLine: true, ); +final RegExp _kHtmlBrRegex = RegExp(r"", caseSensitive: false); +final RegExp _kHtmlTagRegex = RegExp(r"<[^>]+>"); -ShopInBitCategory _inferCategoryFromMessages(List messages) { - final firstUser = messages.where((m) => !m.fromAgent).firstOrNull; - if (firstUser == null) return ShopInBitCategory.concierge; - final content = firstUser.content; - if (_kCarResearchFeeRegex.hasMatch(content)) { - return ShopInBitCategory.car; +TicketMessage? _firstUserMessage(List messages) { + for (final TicketMessage m in messages) { + if (!m.fromAgent) return m; } + return null; +} + +ShopInBitCategory _inferCategory(List messages) { + final TicketMessage? first = _firstUserMessage(messages); + if (first == null) return ShopInBitCategory.concierge; + final String content = first.content; + if (_kCarResearchFeeRegex.hasMatch(content)) return ShopInBitCategory.car; if (_kTravelArrangementRegex.hasMatch(content)) { return ShopInBitCategory.travel; } @@ -205,19 +367,16 @@ ShopInBitCategory _inferCategoryFromMessages(List messages) { } String? _extractFeeTicketNumber(List messages) { - final firstUser = messages.where((m) => !m.fromAgent).firstOrNull; - if (firstUser == null) return null; - return _kCarResearchFeeRegex.firstMatch(firstUser.content)?.group(1); + final TicketMessage? first = _firstUserMessage(messages); + if (first == null) return null; + return _kCarResearchFeeRegex.firstMatch(first.content)?.group(1); } -// The original `comment` passed to POST /requests becomes the first user message. -final RegExp _kHtmlTagRegex = RegExp(r'<[^>]+>'); - String _extractRequestDescription(List messages) { - final firstUser = messages.where((m) => !m.fromAgent).firstOrNull; - if (firstUser == null) return ""; - return firstUser.content - .replaceAll(RegExp(r'', caseSensitive: false), '\n') - .replaceAll(_kHtmlTagRegex, '') + final TicketMessage? first = _firstUserMessage(messages); + if (first == null) return ""; + return first.content + .replaceAll(_kHtmlBrRegex, "\n") + .replaceAll(_kHtmlTagRegex, "") .trim(); } diff --git a/lib/services/shopinbit/src/client.dart b/lib/services/shopinbit/src/client.dart index fe48184129..a457254f9b 100644 --- a/lib/services/shopinbit/src/client.dart +++ b/lib/services/shopinbit/src/client.dart @@ -1,5 +1,8 @@ import 'dart:convert'; import 'dart:io'; +import 'dart:math'; + +import 'package:flutter/foundation.dart'; import '../../../app_config.dart'; import '../../../networking/http.dart'; @@ -9,16 +12,25 @@ import '../../tor_service.dart'; import 'api_exception.dart'; import 'api_response.dart'; import 'endpoints.dart'; -import 'token_manager.dart'; import 'models/address.dart'; import 'models/car_research.dart'; import 'models/message.dart'; import 'models/payment.dart'; import 'models/ticket.dart'; import 'models/voucher.dart'; +import 'token_manager.dart'; const _kTag = "ShopInBitClient"; +// 429 retry policy: up to 3 retries, backoff capped at 30s. +const int _kMaxRetries = 3; +const Duration _kMaxBackoff = Duration(seconds: 30); + +// Per-request ceiling so a stalled socket (common on a sleeping/backgrounded +// device) can't hang a request forever. A hung poll would otherwise latch the +// caller's in-flight guard and silently stop all further polling. +const Duration _kRequestTimeout = Duration(seconds: 30); + class ShopInBitClient { final String accessKey; final String partnerSecret; @@ -26,11 +38,7 @@ class ShopInBitClient { final bool sandbox; final HTTP _httpClient; final TokenManager _tokenManager; - - String? _externalCustomerKey; - - String? get externalCustomerKey => _externalCustomerKey; - set externalCustomerKey(String? key) => _externalCustomerKey = key; + final Random _rng = Random(); ShopInBitClient({ required this.accessKey, @@ -39,8 +47,7 @@ class ShopInBitClient { this.sandbox = false, String? externalCustomerKey, HTTP? httpClient, - }) : _externalCustomerKey = externalCustomerKey, - _httpClient = httpClient ?? const HTTP(), + }) : _httpClient = httpClient ?? const HTTP(), _tokenManager = TokenManager( accessKey: accessKey, partnerSecret: partnerSecret, @@ -67,7 +74,7 @@ class ShopInBitClient { return _request( 'GET', '/generate-key', - needsCustomerKey: false, + customerKey: null, parse: (json) { return json['external_customer_key'] as String; }, @@ -75,19 +82,14 @@ class ShopInBitClient { } Future>> getHealth() async { - return _request( - 'GET', - '/health', - needsCustomerKey: false, - parse: (json) => json, - ); + return _request('GET', '/health', customerKey: null, parse: (json) => json); } Future>>> getCountries() async { return _requestRaw( 'GET', '/meta/countries', - needsCustomerKey: false, + customerKey: null, needsAuth: false, parse: (body) { final decoded = jsonDecode(body); @@ -125,25 +127,34 @@ class ShopInBitClient { id: json['ticket_id'] is int ? json['ticket_id'] as int : int.parse(json['ticket_id'].toString()), - number: json['ticket_number'].toString(), + number: json['ticket_number'] as String, ); }, + customerKey: externalCustomerKey, ); } - Future> getTicketStatus(int ticketId) async { + Future> getTicketStatus( + int ticketId, { + required String customerKey, + }) async { return _request( 'GET', '/tickets/$ticketId/status', parse: TicketStatus.fromJson, + customerKey: customerKey, ); } - Future> getTicketFull(int ticketId) async { + Future> getTicketFull( + int ticketId, { + required String customerKey, + }) async { return _request( 'GET', '/tickets/$ticketId/full', parse: TicketFull.fromJson, + customerKey: customerKey, ); } @@ -159,6 +170,7 @@ class ShopInBitClient { .map((e) => TicketRef.fromJson(e as Map)) .toList(); }, + customerKey: customerKey, ); } @@ -166,26 +178,45 @@ class ShopInBitClient { Future>> sendMessage( int ticketId, - String message, - ) async { + String message, { + required String customerKey, + }) async { return _request( 'POST', '/tickets/$ticketId/messages', body: {'message': message}, parse: (json) => json, + customerKey: customerKey, ); } - Future>> getMessages(int ticketId) async { + Future>> getMessages( + int ticketId, { + required String customerKey, + }) async { return _request( 'GET', '/tickets/$ticketId/messages', parse: (json) { final list = json['messages'] as List; - return list - .map((e) => TicketMessage.fromJson(e as Map)) - .toList(); + // Tolerate a single malformed message: skip it rather than throwing, + // which would discard the entire conversation for this (and every + // subsequent) poll and silently stall the chat. + final messages = []; + for (final raw in list) { + try { + messages.add(TicketMessage.fromJson(raw as Map)); + } catch (e, s) { + Logging.instance.w( + "$_kTag skipping malformed ticket message", + error: e, + stackTrace: s, + ); + } + } + return messages; }, + customerKey: customerKey, ); } @@ -195,12 +226,14 @@ class ShopInBitClient { int ticketId, { required String message, required List> attachments, + required String customerKey, }) async { return _request( 'POST', '/tickets/$ticketId/attachments', body: {'message': message, 'attachments': attachments}, parse: (json) => json, + customerKey: customerKey, ); } @@ -212,6 +245,7 @@ class ShopInBitClient { /// [useQueryAuth] = true to append token and customer_key as query params. Future> getAttachmentUrl( String attachmentPath, { + String? customerKey, bool useQueryAuth = false, }) async { try { @@ -222,8 +256,7 @@ class ShopInBitClient { uri = uri.replace( queryParameters: { 'token': token, - if (_externalCustomerKey != null) - 'customer_key': _externalCustomerKey!, + if (customerKey != null) 'customer_key': customerKey, }, ); } @@ -236,18 +269,19 @@ class ShopInBitClient { } /// Download an attachment from `/attachment-proxy/`. - Future> getAttachment(String attachmentPath) async { + Future> getAttachment( + String attachmentPath, { + String? customerKey, + }) async { try { final token = await _tokenManager.getValidToken(); final resolved = _resolvePath('/attachment-proxy/$attachmentPath'); final uri = Uri.parse('$baseUrl$resolved'); Logging.instance.t("$_kTag GET $uri"); - final headers = _headers(token); - final response = await _httpClient.get( - url: uri, - headers: headers, - proxyInfo: _proxyInfo, - ); + final headers = _headers(token, customerKey: customerKey); + final response = await _httpClient + .get(url: uri, headers: headers, proxyInfo: _proxyInfo) + .timeout(_kRequestTimeout); if (response.code >= 200 && response.code < 300) { return ApiResponse(value: response); } else { @@ -280,6 +314,7 @@ class ShopInBitClient { Future>> submitAddress( int ticketId, { required Address shipping, + required String customerKey, Address? billing, }) async { return _request( @@ -287,29 +322,62 @@ class ShopInBitClient { '/tickets/$ticketId/address', body: {'shipping': shipping.toJson(), 'billing': billing?.toJson()}, parse: (json) => json, + customerKey: customerKey, ); } // -- Payment -- + /// Read existing invoice state. Use this for polling, page-reload recovery, + /// and any view that just wants to show the current invoice; per ShopinBit + /// 1.0.4 this endpoint is read-only and will not create or regenerate the + /// invoice. Call [putPayment] for that. Future> getPayment( int ticketId, { + required String customerKey, + }) async { + return _request( + 'GET', + '/tickets/$ticketId/payment', + parse: PaymentInfo.fromJson, + customerKey: customerKey, + ); + } + + /// Create or regenerate the BTCPay invoice for [ticketId]. Per the 1.0.4 + /// spec call this only after the customer has accepted the offer, submitted + /// shipping/billing, seen the Terms & Conditions, and explicitly clicked + /// PAY NOW. Repeated calls regenerate the invoice and invalidate any in- + /// flight payment. + /// Create a payment invoice, or regenerate an expired/invalid one with + /// [retry] = true (spec: PUT ...?retry=true). + Future> putPayment( + int ticketId, { + required String customerKey, bool retry = false, }) async { - final path = '/tickets/$ticketId/payment'; - final query = retry ? {'retry': 'true'} : null; - return _request('GET', path, query: query, parse: PaymentInfo.fromJson); + return _request( + 'PUT', + '/tickets/$ticketId/payment', + query: retry ? const {'retry': 'true'} : null, + parse: PaymentInfo.fromJson, + customerKey: customerKey, + ); } // -- Vouchers -- /// Pre-check a voucher code (does not consume usage or create a ticket). - Future> checkVoucher(String code) async { + Future> checkVoucher( + String code, { + required String customerKey, + }) async { return _request( 'GET', '/vouchers/validate', query: {'code': code}, parse: VoucherInfo.fromJson, + customerKey: customerKey, ); } @@ -319,6 +387,7 @@ class ShopInBitClient { required String customerPseudonym, required String serviceType, required String comment, + required String customerKey, String? deliveryCountry, }) async { return _request( @@ -332,48 +401,71 @@ class ShopInBitClient { if (deliveryCountry != null) 'delivery_country': deliveryCountry, }, parse: VipRedemptionResult.fromJson, + customerKey: customerKey, ); } // -- Car Research Fee -- + /// Create the car research fee invoice. Both [billing] and [request] are + /// required; without a request the server returns 422 and creates nothing. + /// The stored request lets the backend build the customer-facing car ticket + /// once the fee is paid. Future> createCarResearchInvoice({ required Address billing, + required CarResearchRequest request, + required String customerKey, }) async { return _request( 'POST', '/car-research/invoice', body: { 'billing': billing.toJson(), - if (_externalCustomerKey != null) - 'external_customer_key': _externalCustomerKey, + 'request': request.toJson(), + 'external_customer_key': customerKey, }, parse: CarResearchInvoice.fromJson, + customerKey: customerKey, ); } - Future>> getCarResearchInvoiceStatus( - String invoiceId, - ) async { - return _request( + /// Unresolved car research invoices for the current partner/customer pair. + /// Used to recover a fee payment the user started but did not finish. + Future>> + getCurrentCarResearchInvoices({required String customerKey}) async { + return _requestRaw( 'GET', - '/car-research/invoice/$invoiceId/status', - parse: (json) => json, + '/car-research/invoices/current', + parse: (body) { + if (body.isEmpty) return []; + final decoded = jsonDecode(body); + final list = decoded is List + ? decoded + : (decoded as Map)['invoices'] as List? ?? + const []; + return list + .map( + (e) => + CarResearchCurrentInvoice.fromJson(e as Map), + ) + .toList(); + }, + customerKey: customerKey, ); } - Future> logCarResearchPayment( - String invoiceId, - ) async { + /// Poll the car research invoice status. Read-only: it never confirms + /// payment. Once [CarResearchInvoiceStatus.finalized] is true the response + /// carries the receipt and real ticket references. + Future> getCarResearchInvoiceStatus( + String invoiceId, { + required String customerKey, + }) async { return _request( - 'POST', - '/car-research/log-payment', - body: { - 'invoice_id': invoiceId, - if (_externalCustomerKey != null) - 'external_customer_key': _externalCustomerKey, - }, - parse: CarResearchPaymentResult.fromJson, + 'GET', + '/car-research/invoice/$invoiceId/status', + parse: CarResearchInvoiceStatus.fromJson, + customerKey: customerKey, ); } @@ -387,6 +479,8 @@ class ShopInBitClient { String? environment, String? expirationTime, int? ticketId, + + required String customerKey, }) async { return _request( 'POST', @@ -401,6 +495,7 @@ class ShopInBitClient { if (ticketId != null) 'ticketId': ticketId, }, parse: (json) => json, + customerKey: customerKey, ); } @@ -410,7 +505,7 @@ class ShopInBitClient { return _request( 'GET', '/partners/webhooks', - needsCustomerKey: false, + customerKey: null, parse: (json) { if (json.containsKey('webhooks')) { return (json['webhooks'] as List) @@ -428,7 +523,7 @@ class ShopInBitClient { return _request( 'POST', '/partners/webhooks', - needsCustomerKey: false, + customerKey: null, body: {'webhook_url': webhookUrl, 'event_types': eventTypes}, parse: (json) => json, ); @@ -440,7 +535,7 @@ class ShopInBitClient { return _request( 'POST', '/partners/webhooks/$webhookId/rotate', - needsCustomerKey: false, + customerKey: null, parse: (json) => json, ); } @@ -449,8 +544,8 @@ class ShopInBitClient { return _request( 'DELETE', '/partners/webhooks/$webhookId', - needsCustomerKey: false, - parse: (_) => null, + customerKey: null, + parse: (_) {}, ); } @@ -458,23 +553,27 @@ class ShopInBitClient { Future>> sandboxSetState( int ticketId, - String state, - ) async { + String state, { + required String customerKey, + }) async { return _request( 'POST', '/sandbox/state/$ticketId/$state', parse: (json) => json, + customerKey: customerKey, ); } Future>> sandboxSetPayment( int ticketId, - String status, - ) async { + String status, { + required String customerKey, + }) async { return _request( 'POST', '/sandbox/payment/$ticketId/$status', parse: (json) => json, + customerKey: customerKey, ); } @@ -501,14 +600,14 @@ class ShopInBitClient { return '/sandbox$path'; } - Map _headers(String token, {bool needsCustomerKey = true}) { + Map _headers(String token, {String? customerKey}) { final h = { 'Authorization': 'Bearer $token', 'Content-Type': 'application/json', 'Accept': 'application/json', }; - if (needsCustomerKey && _externalCustomerKey != null) { - h['External-Customer-Key'] = _externalCustomerKey!; + if (customerKey != null) { + h['External-Customer-Key'] = customerKey; } return h; } @@ -518,7 +617,7 @@ class ShopInBitClient { String path, { Map? body, Map? query, - bool needsCustomerKey = true, + required String? customerKey, bool needsAuth = true, }) async { final resolved = _resolvePath(path); @@ -526,10 +625,10 @@ class ShopInBitClient { if (query != null && query.isNotEmpty) { uri = uri.replace(queryParameters: query); } - final Map headers; + Map headers; if (needsAuth) { final token = await _tokenManager.getValidToken(); - headers = _headers(token, needsCustomerKey: needsCustomerKey); + headers = _headers(token, customerKey: customerKey); } else { headers = {'Accept': 'application/json'}; } @@ -537,28 +636,128 @@ class ShopInBitClient { Logging.instance.t("$_kTag $method $uri"); - switch (method) { - case 'GET': - return _httpClient.get(url: uri, headers: headers, proxyInfo: proxy); - case 'POST': - return _httpClient.post( - url: uri, - headers: headers, - body: body != null ? jsonEncode(body) : null, - proxyInfo: proxy, - ); - case 'PATCH': - return _httpClient.patch( - url: uri, - headers: headers, - body: body != null ? jsonEncode(body) : null, - proxyInfo: proxy, + Future dispatch() { + switch (method) { + case 'GET': + return _httpClient.get(url: uri, headers: headers, proxyInfo: proxy); + case 'POST': + return _httpClient.post( + url: uri, + headers: headers, + body: body != null ? _asciiSafeJson(body) : null, + proxyInfo: proxy, + ); + case 'PUT': + return _httpClient.put( + url: uri, + headers: headers, + body: body != null ? jsonEncode(body) : null, + proxyInfo: proxy, + ); + case 'PATCH': + return _httpClient.patch( + url: uri, + headers: headers, + body: body != null ? _asciiSafeJson(body) : null, + proxyInfo: proxy, + ); + case 'DELETE': + return _httpClient.delete( + url: uri, + headers: headers, + proxyInfo: proxy, + ); + default: + throw ApiException('Unsupported method: $method'); + } + } + + // Retry on 429 (Too Many Requests) with backoff so we stop hammering the + // API the moment it tells us to. Respects a server-sent Retry-After when + // present, otherwise exponential backoff with jitter. Everything funnels + // through here, so all endpoints get this for free. + int attempt = 0; + bool reauthed = false; + while (true) { + final response = await dispatch().timeout(_kRequestTimeout); + // A 401 means the bearer token is stale/expired: invalidate it, + // re-authenticate once, and retry before surfacing the error. + if (response.code == 401 && needsAuth && !reauthed) { + reauthed = true; + _tokenManager.invalidate(); + final token = await _tokenManager.getValidToken(); + headers = _headers(token, customerKey: customerKey); + Logging.instance.w( + "$_kTag $method $resolved HTTP:401, re-authenticating", ); - case 'DELETE': - return _httpClient.delete(url: uri, headers: headers, proxyInfo: proxy); - default: - throw ApiException('Unsupported method: $method'); + continue; + } + if (response.code != 429 || attempt >= _kMaxRetries) { + return response; + } + final Duration delay = _backoffDelay(attempt, response.headers); + Logging.instance.w( + "$_kTag $method $resolved HTTP:429, backing off " + "${delay.inMilliseconds}ms (retry ${attempt + 1}/$_kMaxRetries)", + ); + await Future.delayed(delay); + attempt++; + } + } + + /// Next poll interval after a failed poll: double [current], capped at [max]. + static Duration nextPollBackoff(Duration current, Duration max) { + final Duration next = current * 2; + return next > max ? max : next; + } + + /// How long to wait before retrying a 429. Prefers a sane `Retry-After` + /// header; otherwise 1s, 2s, 4s... with jitter, capped at [_kMaxBackoff]. + Duration _backoffDelay(int attempt, Map headers) { + final Duration? retryAfter = _parseRetryAfter(headers['retry-after']); + if (retryAfter != null) { + return retryAfter > _kMaxBackoff ? _kMaxBackoff : retryAfter; + } + final int base = 1000 * (1 << attempt); + final int ms = base + _rng.nextInt(500); + return ms > _kMaxBackoff.inMilliseconds + ? _kMaxBackoff + : Duration(milliseconds: ms); + } + + /// Parse a `Retry-After` value, which is either delay-seconds or an + /// HTTP-date. Returns null if absent or unparseable. + Duration? _parseRetryAfter(String? value) { + if (value == null) return null; + final String trimmed = value.trim(); + final int? seconds = int.tryParse(trimmed); + if (seconds != null) { + return seconds < 0 ? Duration.zero : Duration(seconds: seconds); + } + try { + final Duration diff = HttpDate.parse(trimmed).difference(DateTime.now()); + return diff.isNegative ? Duration.zero : diff; + } catch (_) { + return null; + } + } + + // Encode [body] as JSON with all non-ASCII characters replaced by \uXXXX + // escapes. The HTTP wrapper writes string bodies with the latin1 default of + // HttpClientRequest.write, which mangles multi-byte UTF-8 like the U+00B1/±. + static String _asciiSafeJson(Object body) { + final raw = jsonEncode(body); + final buf = StringBuffer(); + for (int i = 0; i < raw.length; i++) { + final c = raw.codeUnitAt(i); + if (c < 0x80) { + buf.writeCharCode(c); + } else { + buf.write('\\u'); + buf.write(c.toRadixString(16).padLeft(4, '0')); + } } + return buf.toString(); } Future> _request( @@ -566,7 +765,7 @@ class ShopInBitClient { String path, { Map? body, Map? query, - bool needsCustomerKey = true, + required String? customerKey, required T Function(Map) parse, }) async { try { @@ -575,15 +774,28 @@ class ShopInBitClient { path, body: body, query: query, - needsCustomerKey: needsCustomerKey, + customerKey: customerKey, ); + if (kDebugMode) { + Logging.instance.i( + "$_kTag $method HTTP:${response.code} " + "body: ${response.body}", + ); + } + final resolved = _resolvePath(path); if (response.code >= 200 && response.code < 300) { Logging.instance.t("$_kTag $method $resolved HTTP:${response.code}"); if (response.body.isEmpty) { - return ApiResponse(value: parse({})); + // An empty 2xx body would make object parsers fabricate placeholder + // objects (e.g. a ticket with id 0); surface it as an error instead. + return ApiResponse( + exception: ApiException( + "Empty response body for $method $resolved", + ), + ); } final json = jsonDecode(response.body) as Map; return ApiResponse(value: parse(json)); @@ -616,7 +828,7 @@ class ShopInBitClient { String path, { Map? body, Map? query, - bool needsCustomerKey = true, + required String? customerKey, bool needsAuth = true, required T Function(String) parse, }) async { @@ -626,7 +838,7 @@ class ShopInBitClient { path, body: body, query: query, - needsCustomerKey: needsCustomerKey, + customerKey: customerKey, needsAuth: needsAuth, ); diff --git a/lib/services/shopinbit/src/models/address.dart b/lib/services/shopinbit/src/models/address.dart index 5371a37d06..63bce5b2dd 100644 --- a/lib/services/shopinbit/src/models/address.dart +++ b/lib/services/shopinbit/src/models/address.dart @@ -18,7 +18,7 @@ class Address { required this.zip, required this.city, required this.country, - this.state, + required this.state, }); Map toJson() => { diff --git a/lib/services/shopinbit/src/models/car_research.dart b/lib/services/shopinbit/src/models/car_research.dart index ea1eceb0d2..99501ef74f 100644 --- a/lib/services/shopinbit/src/models/car_research.dart +++ b/lib/services/shopinbit/src/models/car_research.dart @@ -1,3 +1,85 @@ +/// Optional request payload cached with a car research fee invoice. When +/// provided, the backend creates the real car research ticket itself after the +/// fee is paid (the BTCPay webhook failsafe), so the client does not have to. +class CarResearchRequest { + final String customerPseudonym; + final String comment; + final String deliveryCountry; + + CarResearchRequest({ + required this.customerPseudonym, + required this.comment, + required this.deliveryCountry, + }); + + Map toJson() => { + 'customer_pseudonym': customerPseudonym, + 'comment': comment, + 'delivery_country': deliveryCountry, + }; +} + +/// An unresolved car research invoice returned by +/// GET /car-research/invoices/current, used to recover a payment the user +/// started but did not finish. +class CarResearchCurrentInvoice { + final String invoiceId; + final String status; + final String? additional; + final DateTime? expiresAt; + final Map paymentLinks; + final bool hasRequestPayload; + final DateTime? createdAt; + + CarResearchCurrentInvoice({ + required this.invoiceId, + required this.status, + required this.additional, + required this.expiresAt, + required this.paymentLinks, + required this.hasRequestPayload, + required this.createdAt, + }); + + factory CarResearchCurrentInvoice.fromJson(Map json) { + final linksRaw = json['payment_links'] as Map? ?? {}; + final expiresRaw = json['expires_at'] as String; + final createdRaw = json['created_at'] as String; + return CarResearchCurrentInvoice( + invoiceId: json['invoice_id'] as String, + status: json['status'] as String, + additional: json['additional'] as String?, + expiresAt: DateTime.parse(expiresRaw), + paymentLinks: linksRaw.map((k, v) => MapEntry(k, v as String)), + hasRequestPayload: json['has_request_payload'] as bool, + createdAt: DateTime.parse(createdRaw), + ); + } +} + +/// Whether a car research invoice status counts as paid/finalized. +/// +/// Prefer the `finalized` boolean from the status endpoint (see +/// [CarResearchInvoiceStatus.finalized]). This is the fallback for the raw +/// status/additional strings: Processing, Settled, or Expired with PaidLate, +/// plus lowercase values for older concierge-style statuses. +bool carResearchIsFinalized(String? status, String? additional) { + final s = (status ?? '').toLowerCase().trim(); + final a = (additional ?? '').toLowerCase().trim(); + if (s == 'processing' || s == 'settled') return true; + if (s == 'expired' && a == 'paidlate') return true; + return const { + 'paid', + 'paid_over', + 'paid_late', + 'payment_processing', + 'confirmed', + 'complete', + 'completed', + 'finalized', + }.contains(s); +} + class CarResearchInvoice { final String btcpayInvoice; final DateTime expiresAt; @@ -19,25 +101,65 @@ class CarResearchInvoice { } } -class CarResearchPaymentResult { +/// Result of GET /car-research/invoice/{invoice_id}/status. +/// +/// Read-only: it never confirms payment, so poll until [finalized] is true. +/// Once finalized it carries the created ticket references: +/// +/// * [realTicketId] / [realTicketNumber]: the customer-facing car research +/// chat. Open this for the customer after payment. +/// * [receiptTicketId] / [receiptTicketNumber]: the paid-fee receipt only; +/// do NOT use it as the active customer chat. +/// +/// The sandbox populates only the receipt references and leaves the real ticket +/// fields null, so [realTicketId] is nullable. +class CarResearchInvoiceStatus { final String status; - final int ticketId; - final String ticketNumber; + final String? additional; + final bool finalized; + final int? receiptTicketId; + final String? receiptTicketNumber; + final int? realTicketId; + final String? realTicketNumber; final String externalCustomerKey; - CarResearchPaymentResult({ + CarResearchInvoiceStatus({ required this.status, - required this.ticketId, - required this.ticketNumber, + this.additional, + required this.finalized, + this.receiptTicketId, + this.receiptTicketNumber, + this.realTicketId, + this.realTicketNumber, required this.externalCustomerKey, }); - factory CarResearchPaymentResult.fromJson(Map json) { - return CarResearchPaymentResult( + factory CarResearchInvoiceStatus.fromJson(Map json) { + return CarResearchInvoiceStatus( status: json['status'] as String, - ticketId: json['ticket_id'] as int, - ticketNumber: json['ticket_number'] as String, + additional: json['additional']?.toString(), + finalized: json['finalized'] as bool, + receiptTicketId: json['receipt_ticket_id'] as int?, + receiptTicketNumber: json['receipt_ticket_number'] as String?, + realTicketId: json['real_ticket_id'] as int?, + realTicketNumber: json['real_ticket_number'] as String?, externalCustomerKey: json['external_customer_key'] as String, ); } + + Map toMap() { + return { + "status": status, + "additional": additional, + "finalized": finalized, + "receipt_ticket_id": receiptTicketId, + "receipt_ticket_number": receiptTicketNumber, + "real_ticket_id": realTicketId, + "real_ticket_number": realTicketNumber, + "external_customer_key": externalCustomerKey, + }; + } + + @override + String toString() => toMap().toString(); } diff --git a/lib/services/shopinbit/src/models/message.dart b/lib/services/shopinbit/src/models/message.dart index 2048b72c27..58e45cdaf4 100644 --- a/lib/services/shopinbit/src/models/message.dart +++ b/lib/services/shopinbit/src/models/message.dart @@ -1,3 +1,9 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:html/dom.dart' as dom; +import 'package:html/parser.dart' show parseFragment; + class TicketMessage { final DateTime timestamp; final bool fromAgent; @@ -9,6 +15,13 @@ class TicketMessage { required this.content, }); + /// [content] parsed once into ordered renderable segments: plain-text runs, + /// decoded inline base64 images, and `/attachment-proxy/` images and file + /// links, kept in the order they appear in the message. + late final List contentSegments = _parseSegments( + content, + ); + factory TicketMessage.fromJson(Map json) { return TicketMessage( timestamp: DateTime.parse(json['timestamp'] as String), @@ -16,4 +29,207 @@ class TicketMessage { content: json['content'] as String, ); } + + Map toMap() => { + "timestamp": timestamp.toIso8601String(), + "from_agent": fromAgent, + "content": content, + }; + + @override + String toString() => toMap().toString(); +} + +/// A renderable piece of a ticket message, in document order. +sealed class MessageContentSegment {} + +/// A run of plain text (structural tags stripped, entities decoded). +class MessageTextSegment extends MessageContentSegment { + MessageTextSegment(this.text); + final String text; +} + +/// A decoded inline base64 (data-URI) image. +class MessageImageSegment extends MessageContentSegment { + MessageImageSegment(this.bytes); + final Uint8List bytes; +} + +/// An authenticated `/attachment-proxy/` image, fetched on demand with the +/// current token. [proxyPath] is the attachment-proxy path (query/fragment +/// stripped); [filename] is the `alt` text when present. +class MessageProxyImageSegment extends MessageContentSegment { + MessageProxyImageSegment({required this.proxyPath, this.filename}); + final String proxyPath; + final String? filename; +} + +/// An authenticated `/attachment-proxy/` file link, opened in the browser. +/// [proxyPath] is the attachment-proxy path; [filename] is the link text. +class MessageFileLinkSegment extends MessageContentSegment { + MessageFileLinkSegment({required this.proxyPath, this.filename}); + final String proxyPath; + final String? filename; +} + +/// Parse a ticket message's HTML [content] into ordered renderable segments. +/// +/// Walks the parsed DOM in document order so text, inline images, proxy images +/// and file links render where they appear. Attachment ``/`` become +/// media segments and their markup is never shown as text; other markup is +/// flattened to its text. The parser handles malformed/adversarial HTML and +/// entity decoding, so there's no hand-rolled tokeniser to keep correct. +List _parseSegments(String content) { + final segments = []; + final text = StringBuffer(); + + void flushText() { + final trimmed = text.toString().trim(); + if (trimmed.isNotEmpty) segments.add(MessageTextSegment(trimmed)); + text.clear(); + } + + void visit(dom.Node node) { + if (node is dom.Text) { + text.write(node.data); + return; + } + if (node is! dom.Element) return; + + switch (node.localName) { + case 'br': + text.write('\n'); + return; + case 'img': + final src = node.attributes['src']; + if (src == null) return; + final bytes = _decodeInlineImage(src); + if (bytes != null) { + flushText(); + segments.add(MessageImageSegment(bytes)); + } else if (_isAttachmentProxy(src)) { + final proxyPath = _proxyPathOf(src); + if (proxyPath != null) { + flushText(); + segments.add( + MessageProxyImageSegment( + proxyPath: proxyPath, + filename: _emptyOrNull(node.attributes['alt']), + ), + ); + } + } + return; + case 'a': + final href = node.attributes['href']; + if (href != null && _isAttachmentProxy(href)) { + final proxyPath = _proxyPathOf(href); + if (proxyPath != null) { + flushText(); + segments.add( + MessageFileLinkSegment( + proxyPath: proxyPath, + filename: _emptyOrNull(node.text), + ), + ); + } + // The link text is its label, not body text; don't recurse. + return; + } + } + + for (final child in node.nodes) { + visit(child); + } + } + + for (final node in parseFragment(content).nodes) { + visit(node); + } + flushText(); + return segments; +} + +final _whitespaceRe = RegExp(r'\s'); + +// Decoded inline images are cached by their base64 payload and reused across +// rebuilds. refreshOne rebuilds TicketMessage objects every ~30s poll, so +// without this the `late final` memo re-decodes each poll and hands a fresh +// Uint8List to Image.memory; MemoryImage compares bytes by identity, so that's +// an image cache miss -> re-decode + GPU re-upload + a visible flicker every +// poll. Returning the same instance keeps the provider equal so the cache hits. +// Bounded by total decoded size so large/many inline images can't grow it +// without limit. +const int _kInlineImageCacheMaxBytes = 16 * 1024 * 1024; +final _inlineImageCache = {}; +int _inlineImageCacheBytes = 0; + +/// Decode a `data:image/;base64,` URI to bytes, or null if [src] is +/// not such a data URI or the payload doesn't decode. Cached by payload. +Uint8List? _decodeInlineImage(String src) { + if (!src.startsWith('data:image/')) return null; + const marker = ';base64,'; + final idx = src.indexOf(marker); + if (idx < 0) return null; + final b64 = src.substring(idx + marker.length).replaceAll(_whitespaceRe, ''); + if (b64.isEmpty) return null; + + final cached = _inlineImageCache.remove(b64); + if (cached != null) { + _inlineImageCache[b64] = cached; // move to most-recently-used + return cached; + } + + final Uint8List bytes; + try { + bytes = base64Decode(b64); + } catch (_) { + return null; + } + _inlineImageCache[b64] = bytes; + _inlineImageCacheBytes += bytes.length; + while (_inlineImageCacheBytes > _kInlineImageCacheMaxBytes && + _inlineImageCache.length > 1) { + final oldest = _inlineImageCache.keys.first; + _inlineImageCacheBytes -= _inlineImageCache.remove(oldest)?.length ?? 0; + } + return bytes; +} + +bool _isAttachmentProxy(String url) => url.contains('/attachment-proxy/'); + +String? _proxyPathOf(String url) { + const marker = '/attachment-proxy/'; + final idx = url.indexOf(marker); + if (idx < 0) return null; + var rest = url.substring(idx + marker.length); + final q = rest.indexOf(RegExp(r'[?#]')); + if (q >= 0) rest = rest.substring(0, q); + if (rest.isEmpty) return null; + // Percent-encoded path separators (`%2f`, `%5c`) survive Uri.path + // normalisation un-decoded, so the dot-segment check below would miss a + // traversal smuggled through them; reject those outright. + final lower = rest.toLowerCase(); + if (lower.contains('%2f') || lower.contains('%5c')) return null; + // Reject anything that still escapes the attachment-proxy namespace once the + // path is normalised (literal `../`, or `%2e%2e` which Uri does decode). The + // result is interpolated into a request URL that carries the user's auth + // token, so a traversal could otherwise point that authenticated request at + // another endpoint on the host. + final Uri probe; + try { + probe = Uri.parse('https://x$marker$rest'); + } catch (_) { + return null; + } + if (!probe.path.startsWith(marker) || probe.path.length <= marker.length) { + return null; + } + return rest; +} + +String? _emptyOrNull(String? s) { + if (s == null) return null; + final t = s.trim(); + return t.isEmpty ? null : t; } diff --git a/lib/services/shopinbit/src/models/payment.dart b/lib/services/shopinbit/src/models/payment.dart index bd0938da29..cdc397a11f 100644 --- a/lib/services/shopinbit/src/models/payment.dart +++ b/lib/services/shopinbit/src/models/payment.dart @@ -1,8 +1,10 @@ +import 'package:decimal/decimal.dart'; + class PaymentInfo { final String status; final String customerPrice; final String partnerPrice; - final int vatRate; + final Decimal? vatRate; final String currency; final DateTime? rateLockedUntil; final Map paymentLinks; @@ -23,22 +25,15 @@ class PaymentInfo { final linksRaw = json['payment_links'] as Map? ?? {}; return PaymentInfo( status: json['status'] as String, - customerPrice: (json['customer_price'] ?? '') as String, - partnerPrice: (json['partner_price'] ?? '') as String, - vatRate: _toInt(json['vat_rate']), - currency: (json['currency'] ?? 'EUR') as String, - rateLockedUntil: json['rate_locked_until'] != null - ? DateTime.parse(json['rate_locked_until'] as String) - : null, + customerPrice: json['customer_price'] as String, + partnerPrice: json['partner_price'] as String, + vatRate: Decimal.tryParse(json['vat_rate'].toString()), + currency: json['currency'] as String, + rateLockedUntil: DateTime.tryParse( + json['rate_locked_until']?.toString() ?? '', + ), paymentLinks: linksRaw.map((k, v) => MapEntry(k, v as String)), due: json['due'] as String?, ); } } - -int _toInt(dynamic v) { - if (v is int) return v; - if (v is String) return int.parse(v); - if (v is double) return v.toInt(); - return 0; -} diff --git a/lib/services/shopinbit/src/models/ticket.dart b/lib/services/shopinbit/src/models/ticket.dart index 1313d6032d..1e42367043 100644 --- a/lib/services/shopinbit/src/models/ticket.dart +++ b/lib/services/shopinbit/src/models/ticket.dart @@ -1,5 +1,28 @@ +import 'package:decimal/decimal.dart'; + import '../../../../utilities/logger.dart'; +/// Splits a raw `tracking_link` value into individual tracking URLs. +/// +/// Multiple links may be joined with any of `,`, `|`, or `;` (and a single +/// value may mix them). Returns an empty list for null/empty input. Each URL is +/// trimmed and empty segments are discarded. +List splitTrackingLinks(String? raw) { + if (raw == null) return const []; + return raw + .split(RegExp(r'[,|;]')) + .map((s) { + final url = s.trim(); + if (url.startsWith("http://") || url.startsWith("https://")) { + return url; + } else { + return "https://$url"; + } + }) + .where((s) => s.isNotEmpty) + .toList(); +} + enum TicketState { newTicket('NEW'), checking('CHECKING'), @@ -14,10 +37,6 @@ enum TicketState { closed('CLOSED'), closedCancelled('CLOSED/CANCELLED'), merged('MERGED'), - // Sentinel for any state string the API returns that this client does not - // recognise (e.g. the API added a new state, or renamed an existing one). - // Callers must handle this explicitly: treat as "do not trust", do not - // overwrite previously known good state with it. unknown('UNKNOWN'); final String value; @@ -33,20 +52,40 @@ enum TicketState { ); return TicketState.unknown; } + + bool get isTerminal => switch (this) { + .closed || + .closedCancelled || + .merged || + .pendingClose || + .refunded => true, + _ => false, + }; } class TicketRef { final int id; final String number; - TicketRef({required this.id, required this.number}); + /// [kind] is nullable for backwards compat only + final String? kind; + + /// True only when [kind] explicitly marks this as a receipt ticket. + /// False does not rule it out, since legacy tickets have a null [kind]. + bool get isKnownReceipt => kind == "receipt"; + + TicketRef({required this.id, required this.number, this.kind}); factory TicketRef.fromJson(Map json) { - return TicketRef(id: _toInt(json['id']), number: json['number'].toString()); + return TicketRef( + id: _toInt(json['id']), + number: json['number'] as String, + kind: json['ticket_kind'] as String?, + ); } Map toMap() { - return {"id": id, "number": number}; + return {"id": id, "number": number, "kind": kind}; } @override @@ -56,9 +95,6 @@ class TicketRef { class TicketStatus { final int ticketId; final TicketState state; - // The raw 'state' string returned by the API. Preserved verbatim so that - // unknown / renamed states can be re-derived later via a client update, - // rather than being lost to TicketState.unknown. final String stateRaw; final DateTime updatedAt; final DateTime? lastAgentMessageAt; @@ -75,6 +111,14 @@ class TicketStatus { this.trackingLink, }); + /// The tracking link(s) split into individual URLs. + /// + /// A ticket may carry zero, one, or several tracking URLs. When there are + /// several the API joins them into [trackingLink] using any of `,`, `|`, or + /// `;` as the separator (mixed separators occur in practice), so we split on + /// all three. + List get trackingLinks => splitTrackingLinks(trackingLink); + factory TicketStatus.fromJson(Map json) { final rawState = json['state'] as String; return TicketStatus( @@ -86,7 +130,9 @@ class TicketStatus { ? DateTime.parse(json['last_agent_message_at'] as String) : null, paymentInvoiceStatus: json['payment_invoice_status'] as String?, - trackingLink: json['tracking_link'] as String?, + // Production returns "" (not null) when there is no tracking link yet; + // normalize so callers can treat it like any other absent value. + trackingLink: _emptyToNull(json['tracking_link']), ); } @@ -108,13 +154,14 @@ class TicketStatus { class TicketFull { final int id; final String number; - final String productName; - final String customerPrice; - final String partnerPrice; - final String partnerCommission; - final String netPurchasePrice; - final String netShippingCosts; - final int vatRate; + final String? productName; + final String? customerPrice; + final String? partnerPrice; + final String? partnerCommission; + final String? netPurchasePrice; + final String? netShippingCosts; + final String deliveryCountry; + final Decimal? vatRate; TicketFull({ required this.id, @@ -125,20 +172,23 @@ class TicketFull { required this.partnerCommission, required this.netPurchasePrice, required this.netShippingCosts, + required this.deliveryCountry, required this.vatRate, }); factory TicketFull.fromJson(Map json) { return TicketFull( id: _toInt(json['id']), - number: json['number'].toString(), - productName: (json['product_name'] ?? '').toString(), - customerPrice: (json['customer_price'] ?? '').toString(), - partnerPrice: (json['partner_price'] ?? '').toString(), - partnerCommission: (json['partner_commission'] ?? '').toString(), - netPurchasePrice: (json['net_purchase_price'] ?? '').toString(), - netShippingCosts: (json['net_shipping_costs'] ?? '').toString(), - vatRate: _toInt(json['vat_rate']), + number: json['number'] as String, + productName: json['product_name'] as String?, + customerPrice: json['customer_price'] as String?, + partnerPrice: json['partner_price'] as String?, + partnerCommission: json['partner_commission'] as String?, + netPurchasePrice: json['net_purchase_price'] as String?, + netShippingCosts: json['net_shipping_costs'] as String?, + deliveryCountry: + (json['delivery_country'] ?? json['deliverycountry']) as String, + vatRate: Decimal.tryParse(json['vat_rate'].toString()), ); } @@ -152,6 +202,7 @@ class TicketFull { "partner_commission": partnerCommission, "net_purchase_price": netPurchasePrice, "net_shipping_costs": netShippingCosts, + "delivery_country": deliveryCountry, "vat_rate": vatRate, }; } @@ -164,3 +215,9 @@ int _toInt(dynamic value) { if (value is int) return value; return int.parse(value.toString()); } + +String? _emptyToNull(dynamic value) { + final s = value?.toString().trim(); + if (s == null || s.isEmpty) return null; + return s; +} diff --git a/lib/services/shopinbit/src/models/voucher.dart b/lib/services/shopinbit/src/models/voucher.dart index 97d048a8b4..fa7e9a47eb 100644 --- a/lib/services/shopinbit/src/models/voucher.dart +++ b/lib/services/shopinbit/src/models/voucher.dart @@ -29,7 +29,7 @@ class VoucherInfo { factory VoucherInfo.fromJson(Map json) { return VoucherInfo( - valid: json['valid'] as bool? ?? false, + valid: json['valid'] as bool, voucherCode: json['voucher_code'] as String?, discountAmount: (json['discount_amount'] as num?)?.toDouble(), voucherType: json['voucher_type'] as String?, diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 9d322d3853..03fd2ce0e3 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -243,6 +243,8 @@ class _SVG { String get trocadorRatingD => "assets/svg/trocador_rating_d.svg"; String get spark => "assets/svg/spark.svg"; + + String get sib => "assets/svg/sib.svg"; } class _PNG { diff --git a/lib/widgets/custom_buttons/blue_text_button.dart b/lib/widgets/custom_buttons/blue_text_button.dart index eee64d8e00..8304498bee 100644 --- a/lib/widgets/custom_buttons/blue_text_button.dart +++ b/lib/widgets/custom_buttons/blue_text_button.dart @@ -10,6 +10,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; + import '../../themes/stack_colors.dart'; import '../../utilities/text_styles.dart'; import '../../utilities/util.dart'; @@ -25,6 +26,7 @@ class _CustomTextButton extends StatefulWidget { this.onTap, this.enabled = true, this.textSize, + required this.overflow, }); final String text; @@ -33,6 +35,7 @@ class _CustomTextButton extends StatefulWidget { final double? textSize; final Color enabledColor; final Color disabledColor; + final TextOverflow overflow; @override State<_CustomTextButton> createState() => _CustomTextButtonState(); @@ -103,22 +106,22 @@ class _CustomTextButtonState extends State<_CustomTextButton> }, child: RichText( textAlign: TextAlign.center, + overflow: widget.overflow, text: TextSpan( text: widget.text, style: widget.textSize == null - ? STextStyles.link2(context).copyWith( - color: color, - ) - : STextStyles.link2(context).copyWith( - color: color, - fontSize: widget.textSize, - ), + ? STextStyles.link2(context).copyWith(color: color) + : STextStyles.link2( + context, + ).copyWith(color: color, fontSize: widget.textSize), recognizer: widget.enabled ? (TapGestureRecognizer() - ..onTap = () { - widget.onTap?.call(); - controller?.forward().then((value) => controller?.reverse()); - }) + ..onTap = () { + widget.onTap?.call(); + controller?.forward().then( + (value) => controller?.reverse(), + ); + }) : null, ), ), @@ -133,26 +136,29 @@ class CustomTextButton extends StatelessWidget { this.onTap, this.enabled = true, this.textSize, + this.overflow = .clip, }); final String text; final VoidCallback? onTap; final bool enabled; final double? textSize; + final TextOverflow overflow; @override Widget build(BuildContext context) { return _CustomTextButton( key: UniqueKey(), text: text, - enabledColor: Theme.of(context) - .extension()! - .customTextButtonEnabledText, - disabledColor: Theme.of(context) - .extension()! - .customTextButtonDisabledText, + enabledColor: Theme.of( + context, + ).extension()!.customTextButtonEnabledText, + disabledColor: Theme.of( + context, + ).extension()!.customTextButtonDisabledText, enabled: enabled, textSize: textSize, + overflow: overflow, onTap: onTap, ); } diff --git a/lib/widgets/detail_item.dart b/lib/widgets/detail_item.dart index b45a36d5ff..af6c62c6f5 100644 --- a/lib/widgets/detail_item.dart +++ b/lib/widgets/detail_item.dart @@ -82,6 +82,8 @@ class DetailItemBase extends StatelessWidget { this.borderColor, this.expandDetail = false, this.noPadding = false, + this.crossAxisAlignment, + this.mainAxisAlignment, }); final Widget title; @@ -91,6 +93,8 @@ class DetailItemBase extends StatelessWidget { final Color? borderColor; final bool expandDetail; final bool noPadding; + final CrossAxisAlignment? crossAxisAlignment; + final MainAxisAlignment? mainAxisAlignment; @override Widget build(BuildContext context) { @@ -113,7 +117,8 @@ class DetailItemBase extends StatelessWidget { ), child: horizontal ? Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: mainAxisAlignment ?? .spaceBetween, + crossAxisAlignment: crossAxisAlignment ?? .center, children: [ title, if (expandDetail) const SizedBox(width: 16), @@ -125,7 +130,8 @@ class DetailItemBase extends StatelessWidget { ], ) : Column( - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: mainAxisAlignment ?? .start, + crossAxisAlignment: crossAxisAlignment ?? .start, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, diff --git a/lib/widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog_route_generator.dart b/lib/widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog_route_generator.dart index 235aca453a..9c0cbc249f 100644 --- a/lib/widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog_route_generator.dart +++ b/lib/widgets/dialogs/nested_navigator_dialog/nested_navigator_dialog_route_generator.dart @@ -1,16 +1,18 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; -import '../../../models/shopinbit/shopinbit_order_model.dart'; +import '../../../db/drift/shared_db/shared_database.dart'; +import '../../../models/shopinbit/shopinbit_enums.dart'; +import '../../../models/shopinbit/shopinbit_request_draft.dart'; import '../../../pages/cakepay/cakepay_card_detail_view.dart'; import '../../../pages/cakepay/cakepay_order_view.dart'; import '../../../pages/cakepay/cakepay_orders_view.dart'; import '../../../pages/cakepay/cakepay_vendors_view.dart'; import '../../../pages/shopinbit/shopinbit_car_fee_view.dart'; import '../../../pages/shopinbit/shopinbit_car_research_payment_view.dart'; +import '../../../pages/shopinbit/shopinbit_offer_view.dart'; import '../../../pages/shopinbit/shopinbit_order_created.dart'; -import '../../../pages/shopinbit/shopinbit_step_1.dart'; +import '../../../pages/shopinbit/shopinbit_payment_view.dart'; +import '../../../pages/shopinbit/shopinbit_shipping_view.dart'; import '../../../pages/shopinbit/shopinbit_step_2.dart'; import '../../../pages/shopinbit/shopinbit_step_3.dart'; import '../../../pages/shopinbit/shopinbit_step_4.dart'; @@ -32,117 +34,136 @@ abstract final class NestedNavigatorDialogRouteGenerator { switch (settings.name) { case DesktopShopinBitFirstRun.routeName: - if (args is ShopInBitOrderModel) { + return getRoute( + builder: (_) => const DesktopShopinBitFirstRun(), + settings: RouteSettings(name: settings.name), + ); + + case ShopInBitStep2.routeName: + if (args is bool) { return getRoute( - builder: (_) => DesktopShopinBitFirstRun(model: args), + builder: (_) => ShopInBitStep2(isActuallyFirstStep: args), settings: RouteSettings(name: settings.name), ); } - return _routeError( - "${settings.name} invalid args\n" - "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + return getRoute( + builder: (_) => const ShopInBitStep2(), + settings: RouteSettings(name: settings.name), ); - case ShopInBitStep1.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitStep3.routeName: + if (args is ({ShopInBitCategory category, String customerKey})) { return getRoute( - builder: (_) => ShopInBitStep1(model: args), + builder: (_) => ShopInBitStep3( + category: args.category, + customerKey: args.customerKey, + ), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected ({ShopInBitCategory category, String customerKey})", ); - case ShopInBitStep2.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitStep4.routeName: + if (args is ShopInBitCategory) { return getRoute( - builder: (_) => ShopInBitStep2(model: args), + builder: (_) => ShopInBitStep4(category: args), settings: RouteSettings(name: settings.name), ); } - if (args is ({ShopInBitOrderModel model, bool isActuallyFirstStep})) { + return _routeError( + "${settings.name} invalid args\n" + "Got ${args.runtimeType}\n" + "Expected ShopInBitCategory", + ); + + case ShopInBitTicketsView.routeName: + return getRoute( + builder: (_) => const ShopInBitTicketsView(), + settings: RouteSettings(name: settings.name), + ); + + case ShopInBitOrderCreated.routeName: + if (args is int) { return getRoute( - builder: (_) => ShopInBitStep2( - model: args.model, - isActuallyFirstStep: args.isActuallyFirstStep, - ), + builder: (_) => ShopInBitOrderCreated(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected int apiTicketId", ); - case ShopInBitStep3.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitCarFeeView.routeName: + if (args is ShopinbitRequestDraft) { return getRoute( - builder: (_) => ShopInBitStep3(model: args), + builder: (_) => ShopInBitCarFeeView(draft: args), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected ShopinbitRequestDraft", ); - case ShopInBitStep4.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitCarResearchPaymentView.routeName: + if (args is ({CarResearchInvoice invoice, String customerKey})) { return getRoute( - builder: (_) => ShopInBitStep4(model: args), + builder: (_) => ShopInBitCarResearchPaymentView( + invoice: args.invoice, + customerKey: args.customerKey, + ), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected CarResearchInvoice", ); - case ShopInBitTicketsView.routeName: - return getRoute( - builder: (_) => const ShopInBitTicketsView(), - settings: RouteSettings(name: settings.name), - ); - - case ShopInBitOrderCreated.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitTicketDetail.routeName: + if (args is int) { return getRoute( - builder: (_) => ShopInBitOrderCreated(model: args), + builder: (_) => ShopInBitTicketDetail(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected int apiTicketId", ); - case ShopInBitCarFeeView.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitOfferView.routeName: + if (args is int) { return getRoute( - builder: (_) => ShopInBitCarFeeView(model: args), + builder: (_) => ShopInBitOfferView(apiTicketId: args), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected int apiTicketId", ); - case ShopInBitCarResearchPaymentView.routeName: - if (args is (ShopInBitOrderModel, CarResearchInvoice)) { + case ShopInBitShippingView.routeName: + if (args + is ({ + ShopInBitTicket ticket, + List> countries, + })) { return getRoute( - builder: (_) => ShopInBitCarResearchPaymentView( - model: args.$1, - invoice: args.$2, + builder: (_) => ShopInBitShippingView( + ticket: args.ticket, + countries: args.countries, ), settings: RouteSettings(name: settings.name), ); @@ -150,20 +171,24 @@ abstract final class NestedNavigatorDialogRouteGenerator { return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ({ShopInBitOrderModel model, CarResearchInvoice invoice})", + "Expected ({int apiTicketId, String deliveryCountry, " + "List> countries})", ); - case ShopInBitTicketDetail.routeName: - if (args is ShopInBitOrderModel) { + case ShopInBitPaymentView.routeName: + if (args is ({int apiTicketId, PaymentInfo paymentInfo})) { return getRoute( - builder: (_) => ShopInBitTicketDetail(model: args), + builder: (_) => ShopInBitPaymentView( + apiTicketId: args.apiTicketId, + paymentInfo: args.paymentInfo, + ), settings: RouteSettings(name: settings.name), ); } return _routeError( "${settings.name} invalid args\n" "Got ${args.runtimeType}\n" - "Expected ShopInBitOrderModel", + "Expected ({int apiTicketId, PaymentInfo paymentInfo})", ); case CakePayVendorsView.routeName: diff --git a/lib/widgets/rounded_white_container.dart b/lib/widgets/rounded_white_container.dart index a24059c8c1..46ffd5a3be 100644 --- a/lib/widgets/rounded_white_container.dart +++ b/lib/widgets/rounded_white_container.dart @@ -9,14 +9,16 @@ */ import 'package:flutter/material.dart'; + import '../themes/stack_colors.dart'; +import '../utilities/util.dart'; import 'rounded_container.dart'; class RoundedWhiteContainer extends StatelessWidget { const RoundedWhiteContainer({ super.key, this.child, - this.padding = const EdgeInsets.all(12), + this.padding, this.radiusMultiplier = 1.0, this.width, this.height, @@ -27,7 +29,7 @@ class RoundedWhiteContainer extends StatelessWidget { }); final Widget? child; - final EdgeInsets padding; + final EdgeInsets? padding; final double radiusMultiplier; final double? width; final double? height; @@ -40,7 +42,7 @@ class RoundedWhiteContainer extends StatelessWidget { Widget build(BuildContext context) { return RoundedContainer( color: Theme.of(context).extension()!.popupBG, - padding: padding, + padding: padding ?? (Util.isDesktop ? const .all(16) : const .all(12)), radiusMultiplier: radiusMultiplier, width: width, height: height, diff --git a/lib/widgets/textfields/adaptive_text_field.dart b/lib/widgets/textfields/adaptive_text_field.dart index 9d1b605d67..8963ce3cae 100644 --- a/lib/widgets/textfields/adaptive_text_field.dart +++ b/lib/widgets/textfields/adaptive_text_field.dart @@ -149,6 +149,7 @@ class _AdaptiveTextFieldState extends State { _focusNode, context, ).copyWith( + alignLabelWithHint: (widget.minLines ?? 1) > 2 ? true : null, hintText: widget.hintText, suffixText: (widget.suffixIcons?.isNotEmpty != true && diff --git a/pubspec.lock b/pubspec.lock index 091d58a6f0..2c7abc1c93 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1321,7 +1321,7 @@ packages: source: hosted version: "1.0.2" html: - dependency: transitive + dependency: "direct main" description: name: html sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" diff --git a/scripts/app_config/configure_stack_duo.sh b/scripts/app_config/configure_stack_duo.sh index 24f9f95a77..7d6bae012d 100755 --- a/scripts/app_config/configure_stack_duo.sh +++ b/scripts/app_config/configure_stack_duo.sh @@ -62,6 +62,7 @@ const Set _features = { AppFeature.themeSelection, AppFeature.buy, AppFeature.tor, + AppFeature.shopinBit, AppFeature.cakePay, AppFeature.swap }; diff --git a/scripts/app_config/configure_stack_wallet.sh b/scripts/app_config/configure_stack_wallet.sh index 6c8607609e..bf3d6c6621 100755 --- a/scripts/app_config/configure_stack_wallet.sh +++ b/scripts/app_config/configure_stack_wallet.sh @@ -90,6 +90,7 @@ const Set _features = { AppFeature.themeSelection, AppFeature.buy, AppFeature.tor, + AppFeature.shopinBit, AppFeature.cakePay, AppFeature.swap }; diff --git a/scripts/app_config/templates/pubspec.template.yaml b/scripts/app_config/templates/pubspec.template.yaml index 6764428fac..4264b4c25b 100644 --- a/scripts/app_config/templates/pubspec.template.yaml +++ b/scripts/app_config/templates/pubspec.template.yaml @@ -169,6 +169,7 @@ dependencies: image: ^4.3.0 wakelock_plus: ^1.2.8 intl: ^0.19.0 + html: ^0.15.6 devicelocale: git: url: https://github.com/cypherstack/flutter-devicelocale diff --git a/test/price_test.mocks.dart b/test/price_test.mocks.dart index a7a491f5b7..5a7636276e 100644 --- a/test/price_test.mocks.dart +++ b/test/price_test.mocks.dart @@ -97,6 +97,34 @@ class MockHTTP extends _i1.Mock implements _i2.HTTP { ) as _i3.Future<_i2.Response>); + @override + _i3.Future<_i2.Response> put({ + required Uri? url, + Map? headers, + Object? body, + required ({_i4.InternetAddress host, int port})? proxyInfo, + }) => + (super.noSuchMethod( + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + returnValue: _i3.Future<_i2.Response>.value( + _FakeResponse_0( + this, + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + ), + ), + ) + as _i3.Future<_i2.Response>); + @override _i3.Future<_i2.Response> patch({ required Uri? url, diff --git a/test/services/change_now/change_now_test.mocks.dart b/test/services/change_now/change_now_test.mocks.dart index 96aeaf72e4..2636a70d6a 100644 --- a/test/services/change_now/change_now_test.mocks.dart +++ b/test/services/change_now/change_now_test.mocks.dart @@ -97,6 +97,34 @@ class MockHTTP extends _i1.Mock implements _i2.HTTP { ) as _i3.Future<_i2.Response>); + @override + _i3.Future<_i2.Response> put({ + required Uri? url, + Map? headers, + Object? body, + required ({_i4.InternetAddress host, int port})? proxyInfo, + }) => + (super.noSuchMethod( + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + returnValue: _i3.Future<_i2.Response>.value( + _FakeResponse_0( + this, + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + ), + ), + ) + as _i3.Future<_i2.Response>); + @override _i3.Future<_i2.Response> patch({ required Uri? url, diff --git a/test/services/paynym/paynym_is_api_test.mocks.dart b/test/services/paynym/paynym_is_api_test.mocks.dart index c62d8cc0c1..2d46a6cb2d 100644 --- a/test/services/paynym/paynym_is_api_test.mocks.dart +++ b/test/services/paynym/paynym_is_api_test.mocks.dart @@ -97,6 +97,34 @@ class MockHTTP extends _i1.Mock implements _i2.HTTP { ) as _i3.Future<_i2.Response>); + @override + _i3.Future<_i2.Response> put({ + required Uri? url, + Map? headers, + Object? body, + required ({_i4.InternetAddress host, int port})? proxyInfo, + }) => + (super.noSuchMethod( + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + returnValue: _i3.Future<_i2.Response>.value( + _FakeResponse_0( + this, + Invocation.method(#put, [], { + #url: url, + #headers: headers, + #body: body, + #proxyInfo: proxyInfo, + }), + ), + ), + ) + as _i3.Future<_i2.Response>); + @override _i3.Future<_i2.Response> patch({ required Uri? url, diff --git a/test/shopinbit/car_research_persistence_test.dart b/test/shopinbit/car_research_persistence_test.dart deleted file mode 100644 index b68fd5b64b..0000000000 --- a/test/shopinbit/car_research_persistence_test.dart +++ /dev/null @@ -1,97 +0,0 @@ -import 'dart:convert'; - -import 'package:flutter_test/flutter_test.dart'; -import 'package:stackwallet/models/shopinbit/shopinbit_order_model.dart'; - -// Parses "Key: Value\n" car research description; strips " EUR" from Budget. -Map _parseCarRequestDescription(String desc) { - final result = {}; - for (final line in desc.split('\n')) { - final separatorIndex = line.indexOf(': '); - if (separatorIndex == -1) continue; - final key = line.substring(0, separatorIndex); - var value = line.substring(separatorIndex + 2); - if (key == 'Budget') { - value = value.replaceAll(' EUR', ''); - } - result[key] = value; - } - return result; -} - -void main() { - group('car research persistence', () { - group('requestDescription parsing', () { - test('parses all six fields from canonical format', () { - const desc = - 'Brand: Toyota\n' - 'Model: Corolla\n' - 'Condition: used\n' - 'Description: sedan\n' - 'Budget: 10000 EUR\n' - 'Delivery country: DE'; - final parsed = _parseCarRequestDescription(desc); - expect(parsed['Brand'], 'Toyota'); - expect(parsed['Model'], 'Corolla'); - expect(parsed['Condition'], 'used'); - expect(parsed['Description'], 'sedan'); - expect(parsed['Budget'], '10000'); - expect(parsed['Delivery country'], 'DE'); - }); - }); - - group('carResearchPaymentLinks JSON round-trip', () { - test('encode then decode preserves all keys and values', () { - final original = { - 'BTC': 'bitcoin:abc?amount=0.1', - 'ETH': 'ethereum:def', - }; - final encoded = jsonEncode(original); - final decoded = (jsonDecode(encoded) as Map).map( - (k, v) => MapEntry(k, v as String), - ); - expect(decoded, equals(original)); - }); - }); - - group('isPendingPayment defaults false', () { - test('new ShopInBitOrderModel has isPendingPayment == false', () { - final model = ShopInBitOrderModel(); - expect(model.isPendingPayment, isFalse); - }); - }); - - group('live invoice routes to payment view', () { - test('expiresAt in the future means invoice is live', () { - final expiresAt = DateTime.now().add(const Duration(hours: 1)); - expect(expiresAt.isAfter(DateTime.now()), isTrue); - }); - }); - - group('expired invoice routes to fee view', () { - test('expiresAt in the past means invoice is expired', () { - final expiresAt = DateTime.now().subtract(const Duration(hours: 1)); - expect(expiresAt.isAfter(DateTime.now()), isFalse); - }); - }); - - group('clearing isPendingPayment preserves other fields', () { - test( - 'all other model fields unchanged after clearing isPendingPayment', - () { - final model = ShopInBitOrderModel() - ..displayName = 'Test User' - ..requestDescription = - 'Brand: BMW\nModel: X5\nCondition: new\nDescription: suv\nBudget: 50000 EUR\nDelivery country: AT' - ..carResearchInvoiceId = 'inv-123' - ..isPendingPayment = true; - model.isPendingPayment = false; - expect(model.isPendingPayment, isFalse); - expect(model.displayName, 'Test User'); - expect(model.carResearchInvoiceId, 'inv-123'); - expect(model.requestDescription, startsWith('Brand: BMW')); - }, - ); - }); - }); -}