Update PDF export with customers/staff

modules/openstudio/os_reports.py

@@ -529,7 +529,7 @@ def _get_class_revenue_summary_pdf_template(self, clsID, date, quick_stats=True)
  template = get_sys_property('branding_default_template_class_revenue') or 'class_revenue/default.html'
  template_file = 'templates/' + template
 
- tables = self.get_class_revenue_summary_formatted(clsID, date)
+ # tables = self.get_class_revenue_summary_formatted(clsID, date)
  cls = Class(clsID, date)
 
  teacher_payment = cls.get_teacher_payment()

views/templates/class_revenue/default.html

@@ -115,42 +115,52 @@ <h4>{{=T("Attendance")}}</h4>
  {{
  header = THEAD(TR(
  TH(T('Type')),
+ TH(T('Customers')),
+ TH(T('Guests & staff')),
+ TH(T('Attendance ')),
  TH(T('Amount')),
- TH(T('Attendance count')),
  TH(T('Total')),
  ))
 
  trial_without_membership = TR(
  TD(T('Trial without membership')),
- TD(represent_float_as_amount(revenue['trial']['no_membership']['amount'])),
  TD(revenue['trial']['no_membership']['count']),
+ TD(0),
+ TD(revenue['trial']['no_membership']['count']),
+ TD(represent_float_as_amount(revenue['trial']['no_membership']['amount'])),
  TD(represent_float_as_amount(
  revenue['trial']['no_membership']['amount'] * revenue['trial']['no_membership']['count']
  )),
  )
 
  trial_with_membership = TR(
  TD(T('Trial with membership')),
- TD(represent_float_as_amount(revenue['trial']['membership']['amount'])),
  TD(revenue['trial']['membership']['count']),
+ TD(0),
+ TD(revenue['trial']['membership']['count']),
+ TD(represent_float_as_amount(revenue['trial']['membership']['amount'])),
  TD(represent_float_as_amount(
  revenue['trial']['membership']['amount'] * revenue['trial']['membership']['count']
  )),
  )
 
  dropin_without_membership = TR(
  TD(T('Drop-in without membership')),
- TD(represent_float_as_amount(revenue['dropin']['no_membership']['amount'])),
  TD(revenue['dropin']['no_membership']['count']),
+ TD(0),
+ TD(revenue['dropin']['no_membership']['count']),
+ TD(represent_float_as_amount(revenue['dropin']['no_membership']['amount'])),
  TD(represent_float_as_amount(
  revenue['dropin']['no_membership']['amount'] * revenue['dropin']['no_membership']['count']
  )),
  )
 
  dropin_with_membership = TR(
  TD(T('Drop-in with membership')),
- TD(represent_float_as_amount(revenue['dropin']['membership']['amount'])),
  TD(revenue['dropin']['membership']['count']),
+ TD(0),
+ TD(revenue['dropin']['membership']['count']),
+ TD(represent_float_as_amount(revenue['dropin']['membership']['amount'])),
  TD(represent_float_as_amount(
  revenue['dropin']['membership']['amount'] * revenue['dropin']['membership']['count']
  )),
@@ -172,8 +182,25 @@ <h4>{{=T("Attendance")}}</h4>
 
  table_revenue.append(TR(
  TD(max_string_length(s, 42)),
+ TD(count),
+ TD(0),
+ TD(count),
  TD(represent_float_as_amount(amount)),
+ TD(represent_float_as_amount(amount * count))
+ ))
+ pass
+
+ # staff subscriptions
+ for s in sorted(revenue['staff_subscriptions']):
+ amount = revenue['staff_subscriptions'][s]['amount']
+ count = revenue['staff_subscriptions'][s]['count']
+
+ table_revenue.append(TR(
+ TD(max_string_length(s, 42)),
+ TD(0),
  TD(count),
+ TD(count),
+ TD(represent_float_as_amount(amount)),
  TD(represent_float_as_amount(amount * count))
  ))
  pass
@@ -185,25 +212,31 @@ <h4>{{=T("Attendance")}}</h4>
 
  table_revenue.append(TR(
  TD(max_string_length(c, 42)),
- TD(represent_float_as_amount(amount)),
  TD(count),
+ TD(0),
+ TD(count),
+ TD(represent_float_as_amount(amount)),
  TD(represent_float_as_amount(amount * count))
  ))
  pass
 
  # Complementary
  table_revenue.append(TR(
  TD(T('Complementary')),
- TD(),
+ TD(0),
+ TD(revenue['complementary']['count']),
  TD(revenue['complementary']['count']),
- TD(),
+ TD(represent_float_as_amount(0)),
+ TD(represent_float_as_amount(0)),
  ))
 
  # Total
  footer = TFOOT(TR(
  TH(T('Total')),
+ TH(revenue['total']['count_paid']),
+ TH(revenue['total']['count_unpaid']),
+ TH(revenue['total']['count_total']),
  TH(),
- TH(revenue['total']['count']),
  TH(represent_float_as_amount(revenue['total']['amount'])),
  ))