Skip to content

Commit a6401db

Browse files
committed
Updated Gems and Ruby Version
2 parents 1e074cb + 97101d8 commit a6401db

6 files changed

Lines changed: 22 additions & 29 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
4-
gem "rails", "~> 8.1.1"
4+
gem "rails", "~> 8.1.2"
55
gem "rails-i18n", "~> 8.1"
66

77
# The modern asset pipeline for Rails [https://github.com/rails/propshaft]

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ DEPENDENCIES
404404
prawn-table (~> 0.2.2)
405405
propshaft
406406
puma (>= 5.0)
407-
rails (~> 8.1.1)
407+
rails (~> 8.1.2)
408408
rails-i18n (~> 8.1)
409409
rubocop-rails-omakase
410410
selenium-webdriver

app/controllers/members/sales_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
class Members::SalesController < ApplicationController
2+
before_action :require_admin
23
before_action :set_member
34

45
def index

app/views/dashboard/index.html.erb

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
<div class="container mx-auto max-w-7xl p-6 space-y-8">
2-
<%# --- HEADER: BENVENUTO E RICERCA --- %>
3-
<div
4-
class="
5-
flex flex-col md:flex-row gap-6 justify-between items-end
6-
md:items-center
7-
"
8-
>
1+
<%# --- HEADER: BENVENUTO E RICERCA --- %>
2+
<header class="flex flex-col md:flex-row gap-6 justify-between items-end md:items-center">
93
<div>
104
<h1 class="text-3xl font-bold tracking-tight flex items-center gap-2">
115
Buongiorno,
@@ -18,7 +12,6 @@
1812
</p>
1913
</div>
2014

21-
<%# SEARCH BAR "SMART" %>
2215
<%= form_with scope: :query,
2316
url: members_path,
2417
method: :get,
@@ -34,12 +27,13 @@
3427
</div>
3528
<%= button_tag "Cerca", type: "submit", class: "btn btn-primary join-item" %>
3629
<% end %>
37-
</div>
30+
</header>
3831

32+
<div class="mt-6 space-y-6">
3933
<%# --- SEZIONE 1: CASSA GIORNALIERA --- %>
4034
<div
4135
class="
42-
stats stats-vertical lg:stats-horizontal shadow-xl bg-base-100 w-full
36+
stats stats-vertical lg:stats-horizontal shadow-sm bg-base-100 w-full
4337
border border-base-200
4438
"
4539
>
@@ -95,9 +89,9 @@
9589
</div>
9690

9791
<%# --- SEZIONE 2: GRIGLIA OPERATIVA --- %>
98-
<div class="grid grid-cols-1 lg:grid-cols-3 gap-8">
92+
<div class="grid grid-cols-1 lg:grid-cols-3 gap-4">
9993
<%# --- COLONNA SINISTRA (2/3): ULTIME VENDITE (Nuova) --- %>
100-
<div class="lg:col-span-2 space-y-6">
94+
<div class="lg:col-span-2">
10195
<div class="card bg-base-100 shadow-sm border border-base-200">
10296
<div class="card-body p-0">
10397
<div
@@ -128,7 +122,7 @@
128122

129123
<tbody>
130124
<% @recent_sales.each do |sale| %>
131-
<tr class="hover">
125+
<tr>
132126
<td>
133127
<div class="flex items-center gap-3">
134128
<div class="font-bold">
@@ -176,12 +170,12 @@
176170
</div>
177171

178172
<%# --- COLONNA DESTRA (1/3): AZIONI & ALERT (Invariata) --- %>
179-
<div class="space-y-6">
173+
<div class="space-y-4">
180174
<%# CARD AZIONI RAPIDE %>
181175
<div class="card bg-base-100 shadow-sm border border-base-200">
182176
<div class="card-body">
183177
<h3 class="card-title text-sm uppercase opacity-50 tracking-wider mb-2">
184-
Azioni Rapide
178+
Azioni Rapide
185179
</h3>
186180

187181
<div class="flex flex-col gap-3">

app/views/members/_shell.html.erb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
<% end %>
2626
</li>
2727

28-
<li>
29-
<%= active_link_to member_sales_path(member) do %>
30-
<%= icon("receipt", size: 18) %>
31-
<%= t("members.sidebar.sales", default: "Storico Acquisti") %>
32-
<% end %>
33-
</li>
28+
<% if current_user.admin? %>
29+
<li>
30+
<%= active_link_to member_sales_path(member) do %>
31+
<%= icon("receipt", size: 18) %>
32+
<%= t("members.sidebar.sales", default: "Storico Acquisti") %>
33+
<% end %>
34+
</li>
35+
<% end %>
3436

3537
<!-- TODO -->
3638
<% if nil %>
@@ -110,10 +112,6 @@
110112
</div>
111113
<% end %>
112114

113-
<%# Renderizza l'header standard (che usa i content_for qui sopra) %>
114-
115115
<%= render "shared/header/record" %>
116116

117-
<%# --- 3. CONTENUTO DELLA VIEW --- %>
118-
119117
<div class="mt-6"><%= yield %></div>

app/views/sales/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<%= render layout: "shared/modal", locals: { title: t(".title"), size: :large } do %>
1+
<%= render layout: "shared/modal", locals: { title: t(".title", default: "Nuova Vendita"), size: :large } do %>
22
<%= render "form", sale: @sale %>
33
<% end %>

0 commit comments

Comments
 (0)