app/views/comable/admin/dashboard/show.slim in comable_backend-0.3.4 vs app/views/comable/admin/dashboard/show.slim in comable_backend-0.4.0
- old
+ new
@@ -2,43 +2,42 @@
.comable-page-heading
h1.page-header
= Comable.t('admin.nav.dashboard')
.comable-page-body
- section
- .col-sm-4
+ section.row
+ .col-md-4
- number = @this_week_orders.count
= render 'widget',
title: Comable.t('admin.new_orders'),
number: number_with_delimiter(number),
progress: (number.to_f / @last_week_orders.count) * 100,
color: 'green',
fa: 'shopping-cart'
- .col-sm-4
+ .col-md-4
- number = @this_week_orders.sum(:total_price)
= render 'widget',
title: Comable.t('admin.sales'),
number: number_to_currency(number),
progress: (number.to_f / @last_week_orders.sum(:total_price)) * 100,
color: 'blue',
fa: 'dollar'
/ TODO: Comment out after adding timestamp columns
- .col-sm-4
- - number = @this_week_customers.count
+ .col-md-4
+ - number = @this_week_users.count
= render 'widget',
title: Comable.t('admin.new_users'),
number: number_with_delimiter(number),
- progress: (number.to_f / @last_week_customers.count) * 100,
+ progress: (number.to_f / @last_week_users.count) * 100,
color: 'black',
fa: 'user'
section
- .col-sm-12
- .panel.panel-default
- .panel-body
- #comable-morris.morris style="height: 300px;"
+ .panel.panel-default
+ .panel-body
+ #comable-morris.morris style="height: 300px;"
javascript:
morris_data = #{raw @this_month_orders.to_morris};
morris_keys = #{raw Comable::Order.morris_keys};
morris_labels = ['#{Comable.t('admin.order_count')}', '#{Comable.t('admin.sales')}'];