Browse Source

Select seller from last sale in new sale

Jacqueline Maldonado 7 years ago
parent
commit
07ebf83ad8
2 changed files with 4 additions and 3 deletions
  1. 3 1
      app/controllers/sales_controller.rb
  2. 1 2
      app/views/sales/_form.html.erb

+ 3 - 1
app/controllers/sales_controller.rb

@@ -45,8 +45,10 @@ class SalesController < ApplicationController
     @disabled_select = false
     @disabled_button = true
     @enable_radios = true
-    @opened_cash_registers = Pointsale.find(current_user.pointsale_id).open_cash_registers.abiertas
+    pointsale = Pointsale.find(current_user.pointsale_id)
+    @opened_cash_registers = pointsale.open_cash_registers.abiertas
     @sale.open_cash_register_id = session[:open_cash_register_id] || nil
+    @seller = @sale.seller_id.present? ? @sale.seller_id : pointsale.sales.activas.last.seller_id
     if @pre_sales.present?
       @sale.saletype = @pre_sales[0].sale_type
       @sale.customer_id = @pre_sales[0].customer_id

+ 1 - 2
app/views/sales/_form.html.erb

@@ -112,8 +112,7 @@
 					<span class="required">*</span>
 					<% end %>
 					<div class="input-group col-md-6 select2-bootstrap-prepend">
-						<%= f.collection_select :seller_id, Seller.where(:pointsale_id => current_user.pointsale_id, :status => '1'), :id, :full_name, {:prompt => "Seleccione",
-							:selected => @seller.blank? ? '' : @seller_id.to_i}, {:class => "form-control select2"} %>
+						<%= f.collection_select :seller_id, Seller.where(pointsale_id: current_user.pointsale_id, status: '1'), :id, :full_name, { prompt: "Seleccione", selected: @seller.blank? ? '' : @seller.to_i }, { class: "form-control select2" } %>
 					</div>
 				</div>
 			</div>