Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix

app/controllers/origami/in_juties_controller.rb

@@ -16,8 +16,7 @@ class Origami::InJutiesController < BaseOrigamiController
 
   # GET /in_juties/1
   # GET /in_juties/1.json
-  def show
-  end
+  def show; end
 
   # GET /in_juties/new
   def new
@@ -29,8 +28,7 @@ class Origami::InJutiesController < BaseOrigamiController
   end
 
   # GET /in_juties/1/edit
-  def edit
-  end
+  def edit; end
 
   def edit_in_juty
     @in_juty = InJuty.find(params[:id])
@@ -71,7 +69,7 @@ class Origami::InJutiesController < BaseOrigamiController
     out_time = out_time.change(offset: '+06:30')
     @in_juty = InJuty.new
     in_juty_id = in_juty[:id]
-    unless in_juty_id.nil?
+    unless in_juty_id.empty?
       @in_juty = InJuty.find(in_juty_id.to_i)
     end
 

app/controllers/origami/product_commissions_controller.rb

@@ -1,4 +1,4 @@
-class Origami::ProductCommissionsController < ApplicationController
+class Origami::ProductCommissionsController < BaseOrigamiController
   before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /product_commissions