From f0df6a80baa2e5b85b2e8f49a3f26e0589eef8d3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 5 Jul 2018 12:50:16 +0630 Subject: [PATCH] update optimzation --- app/controllers/home_controller.rb | 1 + app/models/assigned_order_item.rb | 18 +++++---- app/models/sale.rb | 10 +++-- app/models/sale_order.rb | 12 +++--- app/views/layouts/login_dashboard.html.erb | 45 +++------------------- 5 files changed, 29 insertions(+), 57 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 09d6671e..4e0e89f3 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -20,6 +20,7 @@ class HomeController < ApplicationController def index # @employees = Employee.all_emp_except_waiter.order("name asc") @employees = Employee.all.where("is_active = true").order("name asc") + @roles = Lookup.collection_of("employee_roles") @login_form = LoginForm.new() render "layouts/login_dashboard", layout: false end diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index ea1b9b39..d5acc98a 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -8,14 +8,16 @@ class AssignedOrderItem < ApplicationRecord belongs_to :order_queue_station def self.assigned_order_item (order, item_code, instance_code, order_queue_station ) - assigned_order_item = AssignedOrderItem.new() - assigned_order_item.order = order - assigned_order_item.item_code = item_code - assigned_order_item.instance_code = instance_code - assigned_order_item.order_queue_station = order_queue_station - assigned_order_item.print_status = false - assigned_order_item.delivery_status = false - assigned_order_item.save + AssignedOrderItem.transaction do + assigned_order_item = AssignedOrderItem.new() + assigned_order_item.order = order + assigned_order_item.item_code = item_code + assigned_order_item.instance_code = instance_code + assigned_order_item.order_queue_station = order_queue_station + assigned_order_item.print_status = false + assigned_order_item.delivery_status = false + assigned_order_item.save! + end end def self.assigned_order_item_by_job(order_id) diff --git a/app/models/sale.rb b/app/models/sale.rb index 48dca4d8..574d303c 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -415,10 +415,12 @@ class Sale < ApplicationRecord shop = Shop.first #if tax is not apply create new record - SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax| - #delete existing and create new - existing_tax.delete - end + # SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax| + # #delete existing and create new + # existing_tax.delete + # end + taxes = SaleTax.where("sale_id='#{sale.sale_id}'").pluck(:sale_tax_id) + SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all total_tax_amount = 0 tax_incl_exec = "exclusive" diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 56a64353..773f2c06 100755 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -7,11 +7,13 @@ class SaleOrder < ApplicationRecord belongs_to :sale belongs_to :order - def create_sale_order(sale, order) - sale_order = SaleOrder.new - sale_order.sale_id = sale - sale_order.order_id = order - sale_order.save! + def create_sale_order(sale, order) + SaleOrder.transaction do + sale_order = SaleOrder.new + sale_order.sale_id = sale + sale_order.order_id = order + sale_order.save! + end end private diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index 5db72f79..df2a35c2 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -112,49 +112,14 @@