lp:~akostajti/openstudio/openstudio
- Get this branch:
- bzr branch lp:~akostajti/openstudio/openstudio
Branch merges
- Edwin van de Ven: Approve
-
Diff: 433 lines (+362/-4)5 files modified.bzrignore (+2/-0)
controllers/reports.py (+317/-4)
controllers/settings.py (+1/-0)
models/menu.py (+2/-0)
modules/openstudio.py (+40/-0)
Branch information
Recent revisions
- 1305. By Ákos Tajti
-
Using absolute url (controller+
function) on the share card modal so that it works also on the self checkin page. - 1304. By Ákos Tajti
-
Showing the 'Share card' button only if the partner is not already checked in to the class.
- 1302. By Ákos Tajti
-
Added the Share Card button to the attendance list. The button is only shown if the card that was used
for checking in the customer is shareable and there is at leas one class left on the card. The button
brings up a popup with a button that checks in the partner. The partner is set when buying or editing
the class card (SharedWith field). - 1299. By Ákos Tajti
-
Added the Shareable field to the school_classcards table. Also added a special validation
for the new field in the controller: for shareable cards the unlimited and the trial card
options are not allowed. - 1297. By Edwin van de Ven
-
Styled retention rates in line with OpenStudio standards
Alphabetic sorting of customers in reports - retention & drop off
Removed header on reports - retention & drop off
Retention Export uses new session variables
Retention report only looks at customers with class card or subscription
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~edwinvandeven/openstudio/3.07