From 1b5f657d0c35935145bcfb052320f2c073a77940 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 22 May 2018 10:53:06 +0630
Subject: [PATCH] update commission

---
 .../origami/product_commissions_controller.rb | 70 +++++++++++--------
 app/models/order_queue_station.rb             |  8 +--
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 2f209a7a..31343fe5 100755
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -88,41 +88,49 @@ class Origami::ProductCommissionsController < BaseOrigamiController
     commissioner_id = params[:commissioner_id]
     @sale_item = SaleItem.find(sale_item_id)
     @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
     @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take
-
-    if !@product_commission.nil?
-      if @product_commission.commissioner_id == @commissioner.id
-        @product_commission.destroy
-        deselect = true
-      else
-        @product_commission.commissioner_id = @commissioner.id
-        deselect = false
-      end
-    else
-      @product_commission = ProductCommission.new
-      @product_commission.product_code = @menu_item.id
-      @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
-      unless @commission.nil?
-        @product_commission.commission_id = @commission.id
-        if @commission.commission_type == 'Percentage'
-          @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0)
-          @product_commission.amount = @product_commission.price * @sale_item.qty
-        elsif @commission.commission_type == 'Net Amount'
-          @product_commission.price = @commission.amount
-          @product_commission.amount = @product_commission.price * @sale_item.qty
+    if !@commission.nil? && @commissioner.commission_id == @commission.commission_id
+      if !@product_commission.nil?
+        if @product_commission.commissioner_id == @commissioner.id
+          @product_commission.destroy
+          deselect = true
+        else
+          @product_commission.commissioner_id = @commissioner.id
+          deselect = false
         end
+      else
+        @product_commission = ProductCommission.new
+        @product_commission.product_code = @menu_item.item_code
+        @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type
+        unless @commission.nil?
+          @product_commission.commission_id = @commission.id
+          if @commission.commission_type == 'Percentage'
+            @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0)
+            @product_commission.amount = @product_commission.price * @sale_item.qty
+          elsif @commission.commission_type == 'Net Amount'
+            @product_commission.price = @commission.amount
+            @product_commission.amount = @product_commission.price * @sale_item.qty
+          end
+        end
+        @product_commission.commissioner_id = @commissioner.id
+        @product_commission.qty = @sale_item.qty
+        @product_commission.sale_id = @sale_item.sale_id
+        @product_commission.sale_item_id = @sale_item.sale_item_id
+      end
+      if @product_commission.save
+        render json: {status: true, deselect: deselect}
+      else
+        render json: {status: false, deselect: deselect}
       end
-      @product_commission.commissioner_id = @commissioner.id
-      @product_commission.qty = @sale_item.qty
-      @product_commission.sale_id = @sale_item.sale_id
-      @product_commission.sale_item_id = @sale_item.sale_item_id
-    end
-    if @product_commission.save
-      render json: {status: true, deselect: deselect}
-    else
-      render json: {status: false, deselect: deselect}
     end
   end
 
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index a775601a..d731c3d2 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -117,10 +117,10 @@ class OrderQueueStation < ApplicationRecord
     order_items = order.order_items
 
     # Order.pay_process_order_queue(order_id,table_id)
-    if order
-      oqs = OrderQueueStation.new
-      oqs.process_order(order, table_id)
-     end
+    # if order
+    #   oqs = OrderQueueStation.new
+    #   oqs.process_order(order, table_id)
+    #  end
      assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
        if ENV["SERVER_MODE"] == 'cloud'
         from = request.subdomain  + "." + request.domain