From 012b7714359a202a7e13817e131f1b3f73d8086c Mon Sep 17 00:00:00 2001 From: Phyo Date: Thu, 31 Aug 2017 10:07:44 +0630 Subject: [PATCH 1/4] Set Auto Generate ID to exact 16 --- app/views/settings/promotions/new.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb index 321aa4d1..13918973 100644 --- a/app/views/settings/promotions/new.html.erb +++ b/app/views/settings/promotions/new.html.erb @@ -10,7 +10,11 @@ <%= render 'form', promotion: @promotion %> From dd19b52ebd31231ae9ccd181bf4361fb5b5df242 Mon Sep 17 00:00:00 2001 From: Phyo Date: Thu, 31 Aug 2017 14:03:43 +0630 Subject: [PATCH 2/4] Promotion Index View Change --- app/views/settings/promotions/index.html.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb index b0cfd599..3274fae1 100644 --- a/app/views/settings/promotions/index.html.erb +++ b/app/views/settings/promotions/index.html.erb @@ -39,7 +39,13 @@ <%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %> <%= pro.promo_day %> - <%= 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 %> <% if Employee.exists?(pro.created_by) %> <%= Employee.find(pro.created_by).name %> From d1003e2f6a9d7a9cc35cd034f71f3d9fdd63b4f1 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Thu, 31 Aug 2017 14:15:09 +0630 Subject: [PATCH 3/4] move load_commissioner to origamin/product_commission --- .idea/workspace.xml | 238 +++++++++--------- .../origami/product_commissions_controller.rb | 20 ++ .../settings/commissions_controller.rb | 25 -- .../load_commissioners.html.erb | 0 config/routes.rb | 12 +- dump.rdb | Bin 853 -> 852 bytes 6 files changed, 148 insertions(+), 147 deletions(-) rename app/views/{settings/commissions => origami/product_commissions}/load_commissioners.html.erb (100%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ab924a87..81ac8297 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,12 @@ + - - + + + @@ -47,71 +49,41 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -143,6 +115,7 @@ mom gem "select2-rails" custom_excel + load @@ -168,8 +141,6 @@ @@ -270,6 +243,20 @@ + + + + + + + + + + + + + + @@ -281,15 +268,30 @@ - + - - + + + + + + + + + + + + + + + + + @@ -319,14 +321,16 @@ - - - - + + + + + + - @@ -725,6 +729,7 @@ + @@ -732,12 +737,12 @@ - + - + - + @@ -795,29 +800,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -874,14 +856,6 @@ - - - - - - - - @@ -998,14 +972,6 @@ - - - - - - - - @@ -1167,14 +1133,6 @@ - - - - - - - - @@ -1199,18 +1157,66 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index 2bf38113..ada68f59 100644 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/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 diff --git a/app/controllers/settings/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb index 2fe85807..deaf566a 100644 --- a/app/controllers/settings/commissions_controller.rb +++ b/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 diff --git a/app/views/settings/commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb similarity index 100% rename from app/views/settings/commissions/load_commissioners.html.erb rename to app/views/origami/product_commissions/load_commissioners.html.erb diff --git a/config/routes.rb b/config/routes.rb index 07550bfe..f131b64c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -179,6 +179,12 @@ Rails.application.routes.draw do resources :addorders resources :in_juties + + # product_commission + get 'table/:table_id/sale/:sale_id/load_commissioners' => 'product_commissions#load_commissioners', as: 'load_commissioners' + post 'select_sale_item' => 'product_commissions#select_sale_item', as: 'select_sale_item' + post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner' + end #--------- Waiter/Ordering Station ------------# @@ -302,12 +308,6 @@ Rails.application.routes.draw do end - # commissions - get 'origami/table/:table_id/sale/:sale_id/load_commissioners' => 'settings/commissions#load_commissioners', as: 'load_commissioners' - post 'origami/select_sale_item' => 'settings/commissions#select_sale_item', as: 'select_sale_item' - # product_commission - post 'origami/select_commissioner' => 'origami/product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner' - #--------- Transactions Sections ------------# namespace :transactions do resources :sales diff --git a/dump.rdb b/dump.rdb index 84001a583c51d610d5b37b1f85134fb580904ed6..fa93236711ad0fb9f5095d373d33b9920349dcfe 100644 GIT binary patch delta 51 zcmcc0c7<(%0aL-gjYhv1Sy=Wtm~S><;$)N-G&D6ZF*GwZu`t#%F|sf+HvJ#6BwBm5 Hl&}{7n{W>1 delta 52 zcmcb@c9m^{0h4e0Mx$ShEPU~qW}6L|I2mPx3{4G83{4G<%`EgR%q Date: Thu, 31 Aug 2017 18:06:13 +0630 Subject: [PATCH 4/4] for pull --- .idea/workspace.xml | 116 ++++++++++++++++++++++++-------------------- dump.rdb | Bin 852 -> 851 bytes 2 files changed, 64 insertions(+), 52 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 81ac8297..b429350c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,7 @@ - - - - - @@ -52,18 +47,28 @@ - - + + - - + + - - + + + + + + + + + + + + @@ -72,14 +77,14 @@ - - + + - + @@ -270,6 +275,14 @@ + + + + + + + + @@ -711,12 +724,12 @@ - + - @@ -729,7 +742,6 @@ - @@ -737,12 +749,12 @@ - + - + - + @@ -800,22 +812,6 @@ - - - - - - - - - - - - - - - - @@ -896,14 +892,6 @@ - - - - - - - - @@ -1189,10 +1177,10 @@ - + - - + + @@ -1207,16 +1195,40 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dump.rdb b/dump.rdb index fa93236711ad0fb9f5095d373d33b9920349dcfe..29aafb9ab913e1ac292d9318acde28e4749120a9 100644 GIT binary patch delta 75 zcmV-R0JQ(q2Ga(RFc^mPr&;<4b#rB8Ep26O!XWDy0R8~`69JL%6tP^;0R#dB6gaam h0to>c5HU3{G%+_hGcq|YG&C|YGXF>KMQ*w;QvoU|8B+iN delta 76 zcmV-S0JHzo2Gjd5ivC|G%+?cG&nOZG%`3cGd2HIq+2Vi8WT!$tr}wh