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

* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: Timepicker Bug Fix Show data in Edit Promotion Destory Bug Fix
2017-09-06 18:28:09 +06:30
parent 5e1e0cd5b9 9d47414292
commit 2e53b72574
4 changed files with 80 additions and 21 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -299,6 +299,7 @@ Rails.application.routes.draw do
      resources :promotion_products
    end
    get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance'
+    get '/find_parent_item' => 'promotions#find_parent_item', as:'find_parent_item'

    # commission
    resources :commissions