Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/product_commissions_controller.rb

@@ -61,6 +61,26 @@ class Origami::ProductCommissionsController < ApplicationController
     end
   end
 
+  def load_commissioners
+    sale_id = params[:sale_id]
+    @table_id = params[:table_id]
+    @saleobj = Sale.find(sale_id)
+
+    @commissioners = []
+  end
+
+  def select_sale_item
+    sale_item_id = params[:sale_item_id]
+    @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
+    @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id)
+    unless @product_commission.nil?
+      selected_commissioner = @product_commission.commissioner
+    end
+    @commissioners = Commissioner.active.all
+
+    render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner}
+  end
+
   def set_commissioner_to_sale_item
     # byebug
     deselect = false

app/controllers/settings/commissions_controller.rb

@@ -64,31 +64,6 @@ class Settings::CommissionsController < ApplicationController
     end
   end
 
-  def load_commissioners
-    sale_id = params[:sale_id]
-    @table_id = params[:table_id]
-    @saleobj = Sale.find(sale_id)
-
-    @commissioners = []
-  end
-
-  def select_sale_item
-    # byebug
-    sale_item_id = params[:sale_item_id]
-    @selected_sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
-    @product_commission = ProductCommission.find_by_sale_item_id(@selected_sale_item.id)
-    unless @product_commission.nil?
-      selected_commissioner = @product_commission.commissioner
-    end
-    @commissioners = Commissioner.active.all
-
-    # respond_to do |format|
-    #   format.json {render json: {[@commissioners],[@selected_sale_item]}}
-    #   # format.html {render @commissioners}
-    # end
-    render json: {commissioner: @commissioners, selected_commissioner: selected_commissioner}
-  end
-
   private
   # Use callbacks to share common setup or constraints between actions.
   def set_commission

app/views/settings/promotions/index.html.erb

@@ -39,7 +39,13 @@
           <td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
           <td><%= pro.promo_day %></td>
           <td>
-            <%= MenuItem.find_by_item_code(pro.original_product).name  rescue "-"%>
+            <% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
+            <% if item.nil? %>
+              <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
+            <% else %>
+              <%= item.menu_item.name rescue "-" %>
+               - <%= item.item_instance_name rescue "-" %>
+            <% end %>
           </td>
           <% if Employee.exists?(pro.created_by) %>
           <td><%= Employee.find(pro.created_by).name %></td>

app/views/settings/promotions/new.html.erb

@@ -10,7 +10,11 @@
     <%= render 'form', promotion: @promotion %>
 </div>
 <script>
-$("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
+ var r_id = Math.random().toString(36).slice(5);
+ if(r_id.length > 16){
+	r_id = r_id.substring(0, 15);
+	}
+ $("#promotion_promo_code").val(r_id);
 // $( "#fromtime" ).timepicker();
 // $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
 </script>