git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Aung Myo
2017-08-14 15:01:44 +06:30
parent 069ad16733
commit a691eb8d64
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/customers_controller.rb
View File

@@ -60,6 +60,7 @@ class Origami::CustomersController < BaseOrigamiController
id = params[:sale_id][0,3] id = params[:sale_id][0,3]
customer_id = params[:customer_id] customer_id = params[:customer_id]
customer = Customer.find(customer_id)
# Check and find with card no # Check and find with card no
# if(!customer_id.include? "CUS") # if(!customer_id.include? "CUS")
@@ -74,7 +75,7 @@ class Origami::CustomersController < BaseOrigamiController
status = sale.update_attributes(customer_id: customer_id) status = sale.update_attributes(customer_id: customer_id)
sale.sale_orders.each do |sale_order| sale.sale_orders.each do |sale_order|
order = Order.find(sale_order.order_id) order = Order.find(sale_order.order_id)
status = order.update_attributes(customer_id: customer_id) status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type)
end end
else else
@booking = BookingOrder.find_by_order_id(params[:sale_id]) @booking = BookingOrder.find_by_order_id(params[:sale_id])
@@ -82,7 +83,7 @@ class Origami::CustomersController < BaseOrigamiController
@orders.each do |bo| @orders.each do |bo|
order = Order.find(bo.order_id) order = Order.find(bo.order_id)
status = order.update_attributes(customer_id: customer_id) status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type)
end end
end end

2
app/models/sale.rb
View File

@@ -91,7 +91,7 @@ class Sale < ApplicationRecord
add_item(item) add_item(item)
end end
# link_order_sale(order.id) link_order_sale(order.id)
end end
self.save! self.save!

9
app/views/oqs/home/index.html.erb
View File

@@ -1,16 +1,19 @@
<br>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<%= form_tag oqs_root_path, :method => :get do %> <%= form_tag oqs_root_path, :method => :get do %>
<div class="form-group col-md-4"> <div class="form-group col-md-8">
<input type="text" name="filter" class="form-control input-sm" placeholder="" style="margin-right: 10px"> <input type="text" name="filter" class="form-control input-md" placeholder="">
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-1">
<input type="submit" value="Search" class='btn btn-primary btn-sm'> <input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>
<hr>
<!-- Column One --> <!-- Column One -->
<div class="row"> <div class="row">
<div class="col-lg-8 col-md-8 col-sm-8"> <div class="col-lg-8 col-md-8 col-sm-8">

2
app/views/origami/home/index.html.erb
View File

@@ -109,7 +109,7 @@
<button id="cash_out" type="button" class="btn btn-block btn-primary"> Cash Out </button> <button id="cash_out" type="button" class="btn btn-block btn-primary"> Cash Out </button>
<!-- Temporary Disabled --> <!-- Temporary Disabled -->
<%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%>
<button id="sale_summary" type="button" class="btn btn-block btn-primary">Sale Sammary</button> <button id="sale_summary" type="button" class="btn btn-block btn-primary">Sale Summary</button>
<%end%> <%end%>
<button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier </button> <button id="close_cashier" type="button" class="btn btn-block btn-primary"> Close Cashier </button>