rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-06 01:08:21 +01:00
Code Issues Releases Activity

Merge branch 'monthly-payment' into staging

Browse Source
This commit is contained in:
Sylvain 2021-02-22 10:20:01 +01:00
commit c174d895c2
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- Architecture documentation - Architecture documentation
- Improved coupon creation/deletion workflow - Improved coupon creation/deletion workflow
- Default texts for the login modal - Default texts for the login modal
- Updated caniuse to 1.0.30001191
- Fix a bug: unable to access embedded plan views - Fix a bug: unable to access embedded plan views
- Fix a bug: warning message overflow in credit wallet modal - Fix a bug: warning message overflow in credit wallet modal
- Fix a bug: when using a cash coupon, the amount shown in the statistics is invalid - Fix a bug: when using a cash coupon, the amount shown in the statistics is invalid

12
app/views/layouts/notifications_mailer.html.erb
View File

@ -23,9 +23,17 @@
<tr> <tr>
<td align="center"> <td align="center">
<% if CustomAsset.get_url('logo-file') %> <% if CustomAsset.get_url('logo-file') %>
<a href="<%= root_url %>"><img src="<%= root_url + CustomAsset.get_url('logo-file') %>" alt="<%=fablab_name%>" width="140px;"></a> <a href="<%= root_url %>">
<img src="<%= File.join(root_url, CustomAsset.get_url('logo-file')) %>"
alt="<%=fablab_name%>"
width="140px;" />
</a>
<% else %> <% else %>
<a href="<%= root_url %>"><img src="<%= root_url + asset_pack_path('media/images/fabmanager-logo.png') %>" alt="<%=fablab_name%>" width="140px;"></a> <a href="<%= root_url %>">
<img src="<%= File.join(root_url, asset_pack_path('media/images/fabmanager-logo.png')) %>"
alt="<%=fablab_name%>"
width="140px;" />
</a>
<% end %> <% end %>
</td> </td>
</tr> </tr>

6
yarn.lock
View File

@ -2365,9 +2365,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001124: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001124:
version "1.0.30001124" version "1.0.30001191"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz"
integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA== integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==
case-sensitive-paths-webpack-plugin@^2.3.0: case-sensitive-paths-webpack-plugin@^2.3.0:
version "2.3.0" version "2.3.0"