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

update commission

Browse Source
This commit is contained in:
Aung Myo
2018-05-22 10:53:06 +06:30
parent b68169b244
commit 1b5f657d0c
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/origami/product_commissions_controller.rb
View File

@@ -88,10 +88,17 @@ class Origami::ProductCommissionsController < BaseOrigamiController
commissioner_id = params[:commissioner_id] commissioner_id = params[:commissioner_id]
@sale_item = SaleItem.find(sale_item_id) @sale_item = SaleItem.find(sale_item_id)
@menu_item = MenuItem.find_by_item_code(@sale_item.product_code) @menu_item = MenuItem.find_by_item_code(@sale_item.product_code)
@commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.id, true).take # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take
Commission.all.each do |com|
if com.product_code.include? @menu_item.item_code && com.active == true
@commission = Commission.find(com.id)
break
end
end
@commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take
@product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take
if !@commission.nil? && @commissioner.commission_id == @commission.commission_id
if !@product_commission.nil? if !@product_commission.nil?
if @product_commission.commissioner_id == @commissioner.id if @product_commission.commissioner_id == @commissioner.id
@product_commission.destroy @product_commission.destroy
@@ -102,7 +109,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController
end end
else else
@product_commission = ProductCommission.new @product_commission = ProductCommission.new
@product_commission.product_code = @menu_item.id @product_commission.product_code = @menu_item.item_code
@product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
unless @commission.nil? unless @commission.nil?
@product_commission.commission_id = @commission.id @product_commission.commission_id = @commission.id
@@ -125,6 +132,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController
render json: {status: false, deselect: deselect} render json: {status: false, deselect: deselect}
end end
end end
end
private private
# Use callbacks to share common setup or constraints between actions. # Use callbacks to share common setup or constraints between actions.

8
app/models/order_queue_station.rb
View File

@@ -117,10 +117,10 @@ class OrderQueueStation < ApplicationRecord
order_items = order.order_items order_items = order.order_items
# Order.pay_process_order_queue(order_id,table_id) # Order.pay_process_order_queue(order_id,table_id)
if order # if order
oqs = OrderQueueStation.new # oqs = OrderQueueStation.new
oqs.process_order(order, table_id) # oqs.process_order(order, table_id)
end # end
assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id) assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain + "." + request.domain