rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity

[bug] unable to access embedded plan views

Browse Source
This commit is contained in:
Sylvain 2020-11-02 13:18:31 +01:00
parent 7084e88d2d
commit 7776fe13d6
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Refactored theme builder to use scss files
- Fix a bug: unable to build homepage custom stylesheet
- Fix a bug: unable to access embedded plan views
- [TODO DEPLOY] `rails fablab:stripe:plans_prices`
## v4.6.3 2020 October 28

2
app/frontend/templates/admin/members/edit.html
View File

@ -60,7 +60,7 @@
</form>
</uib-tab>
<uib-tab heading="{{ 'app.admin.members_edit.subscription' | translate }}" ng-if="modules.plans">
<uib-tab heading="{{ 'app.admin.members_edit.subscription' | translate }}" ng-if="$root.modules.plans">
<section class="panel panel-default bg-light m-lg">

2
app/frontend/templates/admin/members/members.html
View File

@ -25,7 +25,7 @@
<a class="btn btn-default" ng-href="api/members/export_members.xlsx" target="export-frame" ng-click="alertExport('members')">
<i class="fa fa-file-excel-o"></i> {{ 'app.admin.members.members' | translate }}
</a>
<a class="btn btn-default" ng-href="api/members/export_subscriptions.xlsx" target="export-frame" ng-if="modules.plans" ng-click="alertExport('subscriptions')">
<a class="btn btn-default" ng-href="api/members/export_subscriptions.xlsx" target="export-frame" ng-if="$root.modules.plans" ng-click="alertExport('subscriptions')">
<i class="fa fa-file-excel-o"></i> {{ 'app.admin.members.subscriptions' | translate }}
</a>
<a class="btn btn-default" ng-href="api/members/export_reservations.xlsx" target="export-frame" ng-click="alertExport('reservations')">

2
app/frontend/templates/dashboard/settings.html
View File

@ -34,7 +34,7 @@
<button class="btn btn-success m-t" ng-click="selectGroup()">Changer mon groupe</button>
</div>
</div>
<div ng-show="modules.plans">
<div ng-show="$root.modules.plans">
<h3 class="text-u-c" translate>{{ 'app.logged.dashboard.settings.subscription' }}</h3>
<div ng-show="user.subscribed_plan">
<uib-alert type="warning">

2
app/frontend/templates/machines/reserve.html
View File

@ -19,7 +19,7 @@
<div class="row no-gutter machine-reserve">
<div class="col-sm-12 col-md-12 col-lg-9">
<div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
<ng-include ng-if="modules.plans" src="'/plans/_plan.html'"></ng-include>
<ng-include ng-if="$root.modules.plans" src="'/plans/_plan.html'"></ng-include>
</div>

2
app/frontend/templates/shared/_cart.html
View File

@ -52,7 +52,7 @@
<coupon show="isSlotsValid() && (!modePlans || selectedPlan)" coupon="coupon.applied" total="totalNoCoupon" user-id="{{user.id}}"></coupon>
<div ng-show="modules.plans">
<div ng-show="$root.modules.plans">
<div ng-if="isSlotsValid() && !user.subscribed_plan" ng-show="!modePlans">
<p class="font-sbold text-base l-h-2x" translate>{{ 'app.shared.cart.to_benefit_from_attractive_prices' }}</p>
<div><button class="btn btn-warning-full rounded btn-block text-xs" ng-click="showPlans()" translate>{{ 'app.shared.cart.view_our_subscriptions' }}</button></div>

2
app/frontend/templates/spaces/reserve.html
View File

@ -17,7 +17,7 @@
<div class="row no-gutter training-reserve">
<div class="col-sm-12 col-md-12 col-lg-9">
<div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
<ng-include ng-if="modules.plans" src="'/plans/_plan.html'"></ng-include>
<ng-include ng-if="$root.modules.plans" src="'/plans/_plan.html'"></ng-include>
</div>

2
app/frontend/templates/trainings/reserve.html
View File

@ -27,7 +27,7 @@
<div class="row no-gutter training-reserve">
<div class="col-sm-12 col-md-12 col-lg-9">
<div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
<ng-include ng-if="modules.plans" src="'/plans/_plan.html'"></ng-include>
<ng-include ng-if="$root.modules.plans" src="'/plans/_plan.html'"></ng-include>
</div>