Merge pull request #343 from Purple-Stock/staging

Staging

Author: puppe1990

app/controllers/productions_controller.rb

@@ -135,10 +135,9 @@ def set_tailors
 
   def production_params
     params.require(:production).permit(
-      :cut_date, :tailor_id, :service_order_number, :expected_delivery_date,
-      :confirmed, :paid, :consider, :observation, :notions_cost, :fabric_cost, :payment_date,
-      production_products_attributes: [:id, :product_id, :quantity, :pieces_delivered, :delivery_date,
-                                       :dirty, :error, :discard, :unit_price, :_destroy]
+      :service_order_number, :tailor_id, :cut_date, :expected_delivery_date, :payment_date,
+      :notions_cost, :fabric_cost, :observation, :confirmed, :paid,
+      production_products_attributes: [:id, :product_id, :quantity, :unit_price, :total_price, :pieces_delivered, :dirty, :error, :discard, :returned, :delivery_date, :_destroy]
     )
   end
 

app/models/production_product.rb

@@ -15,6 +15,7 @@
 #  updated_at       :datetime         not null
 #  product_id       :bigint           not null
 #  production_id    :bigint           not null
+#  returned         :boolean          default(FALSE)
 #
 # Indexes
 #
@@ -33,9 +34,11 @@ class ProductionProduct < ApplicationRecord
   validates :quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
   validates :pieces_delivered, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
   validates :unit_price, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
+  validates :returned, inclusion: { in: [true, false] }
 
   before_save :set_default_pieces_delivered
   before_save :calculate_total_price
+  before_save :set_default_unit_price
 
   private
 
@@ -46,4 +49,8 @@ def set_default_pieces_delivered
   def calculate_total_price
     self.total_price = quantity * unit_price if quantity.present? && unit_price.present?
   end
+
+  def set_default_unit_price
+    self.unit_price ||= 0
+  end
 end

app/models/services/pdf/payment_order_pdf_generator.rb

@@ -42,104 +42,127 @@ def generate_tailor_details(pdf)
         pdf.text "Data de conclusão: #{@production.production_products.maximum(:delivery_date)&.strftime("%d/%m/%Y")}"
         pdf.move_down 20
       end
-
+      
       def generate_products_table(pdf)
         pdf.text "Peças Entregues", size: 14, style: :bold
         pdf.move_down 10
-
-        data = [["Produto", "Quantidade", "Preço Un.", "Sujo", "Erro", "Descarte", "Desconto", "Total"]]
-
+      
+        data = [["Produto", "Quantidade", "Preço Un.", "Sujo", "Erro", "Descarte", "Devolvido", "Desconto", "Total"]]
+      
+        total_all_rows = 0
+        total_discount = 0
+      
         @production.production_products.each do |pp|
           adjusted_quantity = pp.pieces_delivered - (pp.dirty + pp.error + pp.discard)
           discount = pp.unit_price * (pp.dirty + pp.error + pp.discard)
-          adjusted_price = pp.unit_price * adjusted_quantity - discount
-
+          returned_discount = pp.returned ? pp.total_price : 0
+          total_discount_row = discount + returned_discount
+          adjusted_price = pp.unit_price * adjusted_quantity - total_discount_row
+      
+          total_all_rows += pp.total_price
+          total_discount += total_discount_row
+      
           data << [
             pp.product.name,
             pp.pieces_delivered,
             number_to_currency(pp.unit_price),
             pp.dirty,
             pp.error,
             pp.discard,
-            number_to_currency(discount),
+            pp.returned ? 'Sim' : 'Não',
+            number_to_currency(total_discount_row),
             number_to_currency(adjusted_price)
           ]
         end
-
-        column_widths = [120, 60, 60, 40, 40, 40, 60, 80]
-
+      
+        # Add a row for totals
+        data << [
+          "Total",
+          @production.production_products.sum(:pieces_delivered),
+          "",
+          @production.production_products.sum(:dirty),
+          @production.production_products.sum(:error),
+          @production.production_products.sum(:discard),
+          @production.production_products.where(returned: true).count,
+          number_to_currency(total_discount),
+          number_to_currency(total_all_rows - total_discount)
+        ]
+      
+        column_widths = [120, 60, 60, 40, 40, 40, 60, 60, 80]
+      
         # Calculate row heights
         row_heights = data.map do |row|
           row.map.with_index do |cell, i|
             pdf.height_of(cell.to_s, width: column_widths[i], size: 10) + 10 # Add some padding
           end.max
         end
-
+      
         pdf.bounding_box([0, pdf.cursor], width: pdf.bounds.width, height: row_heights.sum + 1) do
           y_position = pdf.bounds.top
-
+      
           data.each_with_index do |row, row_index|
             row_height = row_heights[row_index]
-
+            
             # Fill header row
             if row_index == 0
               pdf.fill_color "DDDDDD"
               pdf.fill_rectangle [0, y_position], pdf.bounds.width, row_height
               pdf.fill_color "000000"
             end
-
+      
             # Draw horizontal line
             pdf.stroke_horizontal_line 0, pdf.bounds.width, at: y_position
-
+      
             # Draw cell contents
             x_position = 0
             row.each_with_index do |cell, col_index|
               width = column_widths[col_index]
               pdf.bounding_box([x_position, y_position], width: width, height: row_height) do
-                pdf.text_box cell.to_s,
-                             size: 10,
+                pdf.text_box cell.to_s, 
+                             size: 10, 
                              align: :center,
                              valign: :center,
                              overflow: :shrink_to_fit,
-                             style: (row_index == 0 ? :bold : :normal),
+                             style: (row_index == 0 || row_index == data.length - 1 ? :bold : :normal),
                              at: [0, pdf.cursor],
                              width: width,
                              height: row_height
               end
               x_position += width
             end
-
+      
             y_position -= row_height
           end
-
+      
           # Draw vertical lines
           column_widths.reduce(0) do |x_position, width|
             pdf.stroke_vertical_line pdf.bounds.top, pdf.bounds.bottom, at: x_position
             x_position + width
           end
           pdf.stroke_vertical_line pdf.bounds.top, pdf.bounds.bottom, at: pdf.bounds.width
-
+      
           # Draw bottom line
           pdf.stroke_horizontal_line 0, pdf.bounds.width, at: pdf.bounds.bottom
         end
-
+      
         pdf.move_down 20
       end
 
       def generate_totals(pdf)
         total_discount = @production.production_products.sum do |pp|
-          pp.unit_price * (pp.dirty + pp.error + pp.discard)
-        end
-
-        total_price = @production.production_products.sum do |pp|
-          adjusted_quantity = pp.pieces_delivered - (pp.dirty + pp.error + pp.discard)
           discount = pp.unit_price * (pp.dirty + pp.error + pp.discard)
-          pp.unit_price * adjusted_quantity - discount
+          discount += pp.total_price if pp.returned
+          discount
         end
 
+        total_price = @production.production_products.sum(&:total_price)
+        total_to_pay = total_price - total_discount
+
+        pdf.text "Total do corte: #{number_to_currency(total_price)}", style: :bold, align: :right
+        pdf.move_down 10
         pdf.text "Total desconto: #{number_to_currency(total_discount)}", style: :bold, align: :right
         pdf.move_down 10
-        pdf.text "Total a pagar: #{number_to_currency(total_price)}", style: :bold, align: :right
+        pdf.text "Total a pagar: #{number_to_currency(total_to_pay)}", style: :bold, align: :right
         pdf.move_down 30
       end
 

app/views/productions/_production_product_fields.html.erb

@@ -40,6 +40,10 @@
       <div class="col-md-1 d-flex align-items-end">
         <%= link_to_remove_association 'Remove', f, class: 'btn btn-danger btn-sm' %>
       </div>
+      <div class="col-md-1">
+        <%= f.label :returned, 'Returned', class: 'form-label' %>
+        <%= f.check_box :returned, class: 'form-check-input' %>
+      </div>
     </div>
   </div>
 </div>

app/views/productions/new.html.erb

@@ -54,6 +54,13 @@
             </div>
           </div>
 
+          <div class="row mb-3">
+            <div class="col-md-6">
+              <%= form.label :returned, 'Returned', class: 'form-label' %>
+              <%= form.number_field :returned, step: 1, class: 'form-control' %>
+            </div>
+          </div>
+
           <div class="row mb-3">
             <div class="col-12">
               <%= form.label :observation, model_class.human_attribute_name(:observation), class: 'form-label' %>

app/views/productions/show.html.erb

@@ -78,8 +78,10 @@
                 <th>Sujo</th>
                 <th>Erro</th>
                 <th>Descarte</th>
+                <th>Quantidade Devolvida</th>
                 <th>Peças Faltantes</th>
                 <th>Data de Entrega</th>
+                <th>Devolvido</th>
               </tr>
             </thead>
             <tbody>
@@ -88,16 +90,28 @@
                   <td><%= pp.product&.name || 'Nenhum produto atribuído' %></td>
                   <td><%= pp.quantity %></td>
                   <td><%= number_to_currency(pp.unit_price) %></td>
-                  <td><%= number_to_currency(pp.unit_price * (pp.dirty + pp.error + pp.discard)) %></td>
+                  <td>
+                    <% if pp.unit_price %>
+                      <%= number_to_currency(pp.unit_price * ((pp.dirty || 0) + (pp.error || 0) + (pp.discard || 0))) %>
+                    <% else %>
+                      N/A
+                    <% end %>
+                    <% if pp.returned %>
+                      <br>
+                      <%= number_to_currency(pp.total_price) %>
+                    <% end %>
+                  </td>
                   <td><%= number_to_currency(pp.total_price) %></td>
                   <td><%= pp.pieces_delivered || 0 %></td>
                   <td><%= pp.dirty || 0 %></td>
                   <td><%= pp.error || 0 %></td>
                   <td><%= pp.discard || 0 %></td>
+                  <td><%= pp.returned ? pp.quantity : 0 %></td>
                   <td>
                     <%= pp.quantity - ((pp.pieces_delivered || 0) + (pp.dirty || 0) + (pp.error || 0) + (pp.discard || 0)) %>
                   </td>
                   <td><%= pt_only_date_format(pp.delivery_date) || 'Não informado' %></td>
+                  <td><%= pp.returned ? 'Yes' : 'No' %></td>
                 </tr>
               <% end %>
             </tbody>
@@ -106,12 +120,17 @@
                 <th>Total da Produção</th>
                 <td><%= @production.production_products.sum(:quantity) %></td>
                 <td></td>
-                <td><%= number_to_currency(@production.production_products.sum { |pp| pp.unit_price * (pp.dirty + pp.error + pp.discard) }) %></td>
+                <td>
+                  <%= number_to_currency(@production.production_products.sum { |pp| pp.unit_price * (pp.dirty + pp.error + pp.discard) }) %>
+                  <br>
+                  <%= number_to_currency(@production.production_products.where(returned: true).sum(:total_price)) %>
+                </td>
                 <td><%= number_to_currency(@production.total_price) %></td>
                 <td><%= @production.production_products.sum(:pieces_delivered) %></td>
                 <td><%= @production.production_products.sum(:dirty) %></td>
                 <td><%= @production.production_products.sum(:error) %></td>
                 <td><%= @production.production_products.sum(:discard) %></td>
+                <td><%= @production.production_products.where(returned: true).sum(:quantity) %></td>
                 <td>
                   <%= @production.production_products.sum { |pp| 
                     pp.quantity - ((pp.pieces_delivered || 0) + (pp.dirty || 0) + (pp.error || 0) + (pp.discard || 0))
@@ -133,7 +152,6 @@
   <%= link_to t('.destroy', :default => t("helpers.links.destroy")), production_path(@production), :method => 'delete',
               :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
               :class => 'btn btn-danger' %>
-  <%= link_to 'Download Service Order PDF', service_order_pdf_production_path(@production), class: 'btn btn-primary', target: '_blank' %>
 </div>
 
 <% content_for(:page_title, 'Show Production') %>

db/migrate/20240923163023_add_returned_to_production_products.rb

@@ -0,0 +1,5 @@
+class AddReturnedToProductionProducts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :production_products, :returned, :boolean, default: false
+  end
+end