app/views/reports_mailer/daily.html.haml in artfully_ose-1.2.0.pre.6 vs app/views/reports_mailer/daily.html.haml in artfully_ose-1.2.0.pre.7

- old
+ new

@@ -2,41 +2,51 @@ Your Daily Order Report of = @tix.organization.name.html_safe =l @tix.start_date, :format => :date = number_to_currency((@tix.total + @donations.total) / 100.0) +:css + th.order { width: 60px; } + th.customer { width: 140px;} + th.total { width: 80px; text-align: right } + td.total { text-align: right } + td { vertical-align: top} + table { margin-bottom: 50px } + %h1 Daily Total: #{number_to_currency((@tix.total + @donations.total) / 100.0)} %h2 #{@tix.organization.name}: #{l @tix.start_date, :format => :date} - if ! @tix.rows.empty? %h3 Tickets: #{number_to_currency(@tix.total / 100.0)} %table.tabular-data{:cellspacing => "0"} %tr - %th Order - %th Total - %th Customer - %th.w200 Details - %th Special Instructions + %th.order Order + %th.customer Customer + %th Details + %th.total Total - @tix.rows.each do |row| %tr %td.order-number= link_to row.id, order_url(id: row.id) - %td.total= row.total %td= link_to row.person, person_url(id: row.person_id) - %td.w200= row.ticket_details - %td= row.special_instructions + %td + = row.ticket_details + %br + %br + = row.special_instructions + %td.total= row.total + - else %p There were no ticket orders placed. - - if ! @tix.exchange_rows.empty? %h3 Exchanges %table.tabular-data{:cellspacing => "0"} %tr - %th Order - %th Customer + %th.order Order + %th.customer Customer %th Details - @tix.exchange_rows.each do |row| %tr %td.order-number= link_to row.id, order_url(id: row.id) %td= link_to row.person, person_url(id: row.person_id) @@ -44,19 +54,41 @@ - if ! @donations.rows.empty? %h3 Donations: #{number_to_currency(@donations.total / 100.0)} %table.tabular-data{:cellspacing => "0"} %tr - %th Order - %th Donation - %th Customer + %th.order Order + %th.customer Customer + %th Details + %t.total Total - @donations.rows.each do |row| %tr %td.order-number= link_to row.id, order_url(id: row.id) - %td.total= row.total %td= link_to row.person, person_url(id: row.person_id) + %td + %td.total= row.total - elsif @tix.organization.has_kit?(:regular_donation) %p There were no donations made. + + +- if !@memberships.rows.empty? + %h3 Memberships: #{number_to_currency(@memberships.total / 100.0)} + %table.tabular-data{:cellspacing => "0"} + %tr + %th.order Order + %th.customer Customer + %th # + %th Membership + %th.total Total + - @memberships.rows.each do |row| + %tr + %td.order-number= link_to row.id, order_url(id: row.id) + %td= link_to row.person, person_url(id: row.person_id) + %td=row.quantity + %td=row.membership + %td.total= row.total +- else + %p There were no memberhsips purchased. - content_for :footer do = render :partial => "fine_print" %p To turn off this daily email report,