admin.suherdy/odoo_loyalty_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update UI theme and improve subscription data fetching and display logic

Browse Source
This commit is contained in:
Suherdy Yacob 2026-06-14 11:52:37 +07:00
parent afa528abd6
commit 6ff44041f0
4 changed files with 99 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/screens/loyalty_dashboard.dart
View File

@ -40,28 +40,10 @@ class _LoyaltyDashboardState extends State<LoyaltyDashboard> {
final rawSubs = results[1] as List<dynamic>; final rawSubs = results[1] as List<dynamic>;
final cms = results[2] as Map<String, dynamic>; final cms = results[2] as Map<String, dynamic>;
final List<dynamic> cards = [];
final List<dynamic> subs = [...rawSubs];
for (var card in rawCards) {
final progName = (card['program_id']?[1] as String? ?? '').toLowerCase();
final isSub = progName.contains('subscription') ||
card['subscription_start_date'] != null ||
card['subscription_end_date'] != null;
if (isSub) {
final code = card['code'];
if (!subs.any((s) => s['code'] == code)) {
subs.add(card);
}
} else {
cards.add(card);
}
}
if (mounted) { if (mounted) {
setState(() { setState(() {
_loyaltyCards = cards; _loyaltyCards = rawCards;
_subscriptions = subs; _subscriptions = rawSubs;
_carouselSlides = (cms['carousel'] as List<dynamic>?) ?? []; _carouselSlides = (cms['carousel'] as List<dynamic>?) ?? [];
_promos = (cms['promos'] as List<dynamic>?) ?? []; _promos = (cms['promos'] as List<dynamic>?) ?? [];
_isLoading = false; _isLoading = false;

19
lib/screens/main_shell.dart
View File

@ -185,9 +185,22 @@ class _MainShellState extends State<MainShell> {
const SizedBox(width: 4), const SizedBox(width: 4),
], ],
), ),
body: IndexedStack( body: Container(
index: _currentIndex, decoration: BoxDecoration(
children: _pages, gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
colorScheme.surfaceContainerLowest,
colorScheme.surface,
const Color(0xFFF3EAD3), // Warm traditional restaurant sand/cream
],
),
),
child: IndexedStack(
index: _currentIndex,
children: _pages,
),
), ),
bottomNavigationBar: NavigationBar( bottomNavigationBar: NavigationBar(
selectedIndex: _currentIndex, selectedIndex: _currentIndex,

13
lib/services/odoo_service.dart
View File

@ -48,9 +48,18 @@ class OdooService {
[ [
['partner_id', '=', partnerId], ['partner_id', '=', partnerId],
['program_id.program_type', '=', 'loyalty'], ['program_id.program_type', '=', 'loyalty'],
['program_id.active', '=', true],
], ],
], ],
'kwargs': {'fields': ['points', 'program_id', 'code']} 'kwargs': {
'fields': [
'points',
'program_id',
'code',
'subscription_start_date',
'subscription_end_date',
]
}
}) as List<dynamic>; }) as List<dynamic>;
} }
@ -65,10 +74,12 @@ class OdooService {
[ [
['partner_id', '=', partnerId], ['partner_id', '=', partnerId],
['program_id.program_type', '=', 'subscription'], ['program_id.program_type', '=', 'subscription'],
['program_id.active', '=', true],
], ],
], ],
'kwargs': { 'kwargs': {
'fields': [ 'fields': [
'points',
'program_id', 'program_id',
'code', 'code',
'subscription_start_date', 'subscription_start_date',

89
lib/widgets/subscription_list_widget.dart
View File

@ -187,28 +187,77 @@ class _SubscriptionCard extends StatelessWidget {
), ),
], ],
), ),
Column( if (sub['points'] != null)
crossAxisAlignment: CrossAxisAlignment.end, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.end,
Text( children: [
'Validity Period', Text(
style: theme.textTheme.bodySmall?.copyWith( 'Claim Balance',
color: colorScheme.onSurfaceVariant, style: theme.textTheme.bodySmall?.copyWith(
fontSize: 10, color: colorScheme.onSurfaceVariant,
), fontSize: 10,
), ),
const SizedBox(height: 2), ),
Text( const SizedBox(height: 2),
'$startDate - $endDate', Text(
style: theme.textTheme.bodyMedium?.copyWith( '${(sub['points'] as num).toDouble() % 1 == 0 ? (sub['points'] as num).toInt() : sub['points']} Claims',
color: colorScheme.onSurface, style: theme.textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w600, color: colorScheme.primary,
), fontWeight: FontWeight.bold,
), ),
], ),
), ],
),
], ],
), ),
if (sub['subscription_start_date'] != null && sub['subscription_start_date'] != false) ...[
const SizedBox(height: 12),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Valid From',
style: theme.textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
fontSize: 10,
),
),
const SizedBox(height: 2),
Text(
startDate,
style: theme.textTheme.bodyMedium?.copyWith(
color: colorScheme.onSurface,
fontWeight: FontWeight.w600,
),
),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
'Expires On',
style: theme.textTheme.bodySmall?.copyWith(
color: colorScheme.onSurfaceVariant,
fontSize: 10,
),
),
const SizedBox(height: 2),
Text(
endDate,
style: theme.textTheme.bodyMedium?.copyWith(
color: colorScheme.onSurface,
fontWeight: FontWeight.w600,
),
),
],
),
],
),
],
], ],
), ),
), ),