Skip to content

Removed code from the old Mongoose back-end and re-organised menu's #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpookyBoy99 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removed code from the old Mongoose back-end and re-organised menu's #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f8b73e
Removed code from the old Mongoose back-end and re-organised menu's
SpookyBoy99 Sep 14, 2024
8c93b13
Removed dangling route from routes.rb and payments.js
SpookyBoy99 Sep 14, 2024
9165116
Prevent close filter menu's on click in transaction page
SpookyBoy99 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 0 additions & 154 deletions app/assets/stylesheets/admin/checkout_products.css
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions app/assets/stylesheets/admin/apps.css → ...assets/stylesheets/admin/transactions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,67 +39,6 @@ tr.total {
border-top: 2px solid #dddddd;
}

/* Members - [Member] - Checkout */
div#credit.input-group {
display: inline;
width: auto;
float: right;
}

div#credit.input-group > span.input-group-btn,
div#credit.input-group > span {
float: right;
margin-left: 2px;
}

div#credit.input-group > *,
div#credit.input-group > * > * {
display: inline-block;
}

div#credit.input-group > .input-symbol > input {
width: 80px;
}

div#credit.input-group select {
background-color: white;
height: 32px;
}

/* Apps - Checkout - Opwaarderen */
#credit form.form-inline > .form-group {
padding: 0;
}

@media (min-width: 768px) {
#credit form.form-inline > .form-group {
display: block;
}
}

@media (min-width: 992px) {
#credit form.form-inline > .form-group.amount {
margin-left: 3.33%;
width: 30%;
}
}

#credit form.form-inline > .form-group > select.form-control,
#credit form.form-inline > .form-group > input.form-control,
#credit form.form-inline > .form-group > button.form-control {
width: 100%;
height: 30px;
margin: 5px 0;
padding: 1px 12px;
}

#credit .panel-body > ul.dropdown-menu {
display: none;
position: absolute;
left: 0;
top: 50px;
}

.table span.fa-sort-asc {
color: green;
position: relative;
Expand Down
128 changes: 0 additions & 128 deletions app/controllers/admin/checkout_products_controller.rb
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions app/controllers/admin/home_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ def index

@activities = Activity.where("start_date >= ?", Date.to_date(Time.zone.today.study_year)).count

@transactions = CheckoutTransaction.count(:all)

@recent = CheckoutTransaction.where(
"created_at >= ?",
Time.zone.now.beginning_of_day
).order(created_at: :desc).take(12)

@recentactivities = Payment.where(
"created_at >= ?",
Time.zone.now.beginning_of_day
Expand Down
10 changes: 10 additions & 0 deletions app/controllers/admin/logs_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#:nodoc:
class Admin::LogsController < ApplicationController
def index
@limit = params[:limit] ? params[:limit].to_i : 50

@pagination, @impressions = pagy(Impression.all.order(created_at: :desc),
items: params[:limit] ||= 50)
Copy link
Copy Markdown
Member

@SilasPeters SilasPeters Dec 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
items: params[:limit] ||= 50)
items: @limit

@total_log_items = Impression.count
end
end
Loading