From 2d55ea0dab7556f28f81b5a3df8d96bb6dc4296a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 7 Jul 2017 09:56:18 +0630 Subject: [PATCH 01/71] update add order --- .../javascripts/origami/addorders.coffee | 3 + app/assets/stylesheets/origami.scss | 1 + app/assets/stylesheets/origami/addorders.scss | 3 + .../origami/addorders_controller.rb | 21 ++++ app/helpers/origami/addorders_helper.rb | 2 + app/views/origami/addorders/index.html.erb | 108 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 30 +++++ app/views/origami/home/show.html.erb | 8 +- config/routes.rb | 2 + .../origami/addorders_controller_spec.rb | 5 + spec/helpers/origami/addorders_helper_spec.rb | 15 +++ 11 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/origami/addorders.coffee create mode 100644 app/assets/stylesheets/origami/addorders.scss create mode 100644 app/controllers/origami/addorders_controller.rb create mode 100644 app/helpers/origami/addorders_helper.rb create mode 100644 app/views/origami/addorders/index.html.erb create mode 100644 app/views/origami/addorders/show.html.erb create mode 100644 spec/controllers/origami/addorders_controller_spec.rb create mode 100644 spec/helpers/origami/addorders_helper_spec.rb diff --git a/app/assets/javascripts/origami/addorders.coffee b/app/assets/javascripts/origami/addorders.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/addorders.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 7935b50e..1f195ba5 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -211,3 +211,4 @@ tr.discount-item-row:hover { margin-left:-40px !important; margin-top:-40px !important; } + diff --git a/app/assets/stylesheets/origami/addorders.scss b/app/assets/stylesheets/origami/addorders.scss new file mode 100644 index 00000000..f45d06f3 --- /dev/null +++ b/app/assets/stylesheets/origami/addorders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/addorders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb new file mode 100644 index 00000000..68a15c71 --- /dev/null +++ b/app/controllers/origami/addorders_controller.rb @@ -0,0 +1,21 @@ +class Origami::AddordersController < BaseOrigamiController + before_action :set_dining, only: [:show] + + def index + @tables = Table.all.active.order('zone_id asc').group("zone_id") + @rooms = Room.all.active.order('zone_id asc').group("zone_id") + @all_table = Table.all.active.order('status desc') + @all_room = Room.all.active.order('status desc') + end + + def show + @menu = MenuCategory.all + end + + private + + def set_dining + @dining = DiningFacility.find(params[:id]) + end + +end diff --git a/app/helpers/origami/addorders_helper.rb b/app/helpers/origami/addorders_helper.rb new file mode 100644 index 00000000..c90e5344 --- /dev/null +++ b/app/helpers/origami/addorders_helper.rb @@ -0,0 +1,2 @@ +module Origami::AddordersHelper +end diff --git a/app/views/origami/addorders/index.html.erb b/app/views/origami/addorders/index.html.erb new file mode 100644 index 00000000..50e52d3e --- /dev/null +++ b/app/views/origami/addorders/index.html.erb @@ -0,0 +1,108 @@ +
+
+ +
+ +
+ <% @tables.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_table.each do |table| %> + <% if zone.zone_id == table.zone_id %> +
" data-id = "<%= table.id %>"> +
+ +

<%= table.name %>

+

Seat : <%= table.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+ <% @rooms.each do |zone| %> +

Zone : <%=zone.zone.name%>

+
+ + <% @all_room.each do |room| %> + <% if zone.zone_id == room.zone_id %> +
" data-id = "<%= room.id %>"> +
+ +

<%= room.name %>

+

Seat : <%= room.seater %>

+
+
+ <% end %> <% end %> +
+ <% end %> +
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb new file mode 100644 index 00000000..1a2e7b8b --- /dev/null +++ b/app/views/origami/addorders/show.html.erb @@ -0,0 +1,30 @@ +
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8b613409..cb18971c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -302,7 +302,7 @@ <% if @status_order == 'order' && @status_sale != 'sale' %> - + @@ -312,7 +312,7 @@ <% else %> - + @@ -555,4 +555,8 @@ function show_customer_details(customer_id){ } }); + + $('#add_order').on('click',function(){ + window.location.href = '/origami/addorders'; + }); diff --git a/config/routes.rb b/config/routes.rb index 2b7db5eb..b04bed33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -156,6 +156,8 @@ Rails.application.routes.draw do get '/:sale_id/customers', to: "customers#add_customer" get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details" post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table + + resources :addorders end #--------- Waiter/Ordering Station ------------# diff --git a/spec/controllers/origami/addorders_controller_spec.rb b/spec/controllers/origami/addorders_controller_spec.rb new file mode 100644 index 00000000..9e0643ad --- /dev/null +++ b/spec/controllers/origami/addorders_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::AddordersController, type: :controller do + +end diff --git a/spec/helpers/origami/addorders_helper_spec.rb b/spec/helpers/origami/addorders_helper_spec.rb new file mode 100644 index 00000000..f9ea7bcf --- /dev/null +++ b/spec/helpers/origami/addorders_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::AddordersHelper. For example: +# +# describe Origami::AddordersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::AddordersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From d99ed58d28b7f7f1a527e7ea2a7cb9c94f4627da Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 9 Jul 2017 21:00:33 +0630 Subject: [PATCH 02/71] update view --- app/views/origami/addorders/show.html.erb | 16 ++++++++++++++-- app/views/origami/home/show.html.erb | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 1a2e7b8b..98055c46 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -4,7 +4,7 @@ -
- -
- +
+
+
ORDER DETAILS | Table 21
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + +
#ItemsPrice
1aaaaa x2name
+
+
+ + + + + + +
Sub Total:22222
+
+
+
+ + From 83b8d726324be48f32807b36cf9d4371038ff7f1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 15:04:35 +0630 Subject: [PATCH 04/71] update add order --- .../api/restaurant/menu_categories.rb | 37 ---- .../api/restaurant/menu_controller.rb | 2 +- .../origami/addorders_controller.rb | 1 + app/views/origami/addorders/show.html.erb | 163 ++++++++++++------ app/views/origami/home/show.html.erb | 2 +- config/routes.rb | 2 +- 6 files changed, 111 insertions(+), 96 deletions(-) delete mode 100644 app/controllers/api/restaurant/menu_categories.rb diff --git a/app/controllers/api/restaurant/menu_categories.rb b/app/controllers/api/restaurant/menu_categories.rb deleted file mode 100644 index fe7983ea..00000000 --- a/app/controllers/api/restaurant/menu_categories.rb +++ /dev/null @@ -1,37 +0,0 @@ -class Api::Restaurant::MenuController < Api::ApiController - - #Description - # Pull the default menu details and also other available (active) menus - # Input Params - order_id - def index - @menus = Menu.all - @current_menu = Menu.current_menu - - end - - #Description - # This API show current order details - # Input Params - menu_id - def show - @menu = menu_detail(params[:id]) - end - - - private - def menu_detail (menu_id) - if (menu_id) - #Pull this menu - menu = Menu.find_by_id(menu_id) - return menu - else - Menu.current_menu - end - - end - - def menu_params() - params.permit(:id) - end - - -end diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index fe7983ea..169cc1fd 100644 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -1,5 +1,5 @@ class Api::Restaurant::MenuController < Api::ApiController - + skip_before_action :authenticate #Description # Pull the default menu details and also other available (active) menus # Input Params - order_id diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 68a15c71..e65b24b7 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -10,6 +10,7 @@ class Origami::AddordersController < BaseOrigamiController def show @menu = MenuCategory.all + @table_id = params[:id] end private diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index c4f51c1e..049ba371 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -1,65 +1,42 @@
-
-
+
+
-
    - -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    -
    -
    -
    -

    Menu Name

    -

    Price : 3000 ks

    -
    -
    -
    - -
+ +
-
+
-
ORDER DETAILS | Table 21
+
ORDER DETAILS | Table <%=@table_id%>
- - -
+
@@ -90,21 +67,95 @@ - + + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 92b37cf9..8281a16e 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -579,6 +579,6 @@ function show_customer_details(customer_id){ $('#add_order').on('click',function(){ var dining_id = "<%= @dining.id %>" - window.location.href = '/origami/addorders/'+dining_id; + window.location.href = '/origami/addorders/'+ dining_id; }); diff --git a/config/routes.rb b/config/routes.rb index e4723a22..310ae0f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,7 +30,7 @@ Rails.application.routes.draw do namespace :restaurant do get 'zones' => "zones#index" resources :menu, only:[:index, :show] - resources :menu_categories, only: [:index] + resources :menu_categories, only: [:index, :show] resources :menu_items, only: [:index, :show] resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] From 50a878349d19b512de9dc5efd53997d4f99ca659 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 26 Jul 2017 15:08:44 +0630 Subject: [PATCH 05/71] update add order --- app/assets/images/logo.png | Bin 0 -> 9424 bytes .../restaurant/menu_categories_controller.rb | 39 ++++++++++++++++ .../menu_categories/show.json.jbuilder | 43 ++++++++++++++++++ app/views/origami/addorders/show.html.erb | 4 +- public/image/logo.png | Bin 0 -> 9424 bytes 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/logo.png create mode 100644 app/controllers/api/restaurant/menu_categories_controller.rb create mode 100644 app/views/api/restaurant/menu_categories/show.json.jbuilder create mode 100644 public/image/logo.png diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 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 W;#|`CF$kdm0000 1 then + + json.item_instances item.menu_item_instances do |is| + json.item_instance_item_code = is.item_instance_code + json.item_instance_name = is.item_instance_name + json.price = is.price + json.is_available = is.is_available + json.is_on_promotion = is.is_on_promotion + json.promotion_price = is.promotion_price + json.item_attributes = is.item_attributes + end + + end + #Child Menu items + if (item.children) then + json.set_items item.children.each do |item| + json.partial! 'api/restaurant/menu/menu_item', item: item + end + + end + end +end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 049ba371..952836d1 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,6 +81,7 @@ $(function(){ }); //End Booking Click function show_details(url_item){ + alert(url_item) //Start Ajax $.ajax({ type: "GET", @@ -109,9 +110,8 @@ function show_details(url_item){ +'
' +''+ price +'' +'
'; - + $(".menu_items_list").append(row); } - $(".menu_items_list").html(row); } }); //end Ajax diff --git a/public/image/logo.png b/public/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..578d16f7b25ca4b60a4db70950c07c23d96c3ce3 GIT binary patch literal 9424 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 W;#|`CF$kdm0000 Date: Wed, 26 Jul 2017 18:26:55 +0630 Subject: [PATCH 06/71] update add order view --- app/views/origami/addorders/show.html.erb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 952836d1..8fdf0c32 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -81,7 +81,9 @@ $(function(){ }); //End Booking Click function show_details(url_item){ - alert(url_item) + var menu_list = $('.menu_items_list'); + // menu_list.empty(); + // var row = ''; //Start Ajax $.ajax({ type: "GET", @@ -89,29 +91,32 @@ function show_details(url_item){ data: {}, dataType: "json", success: function(data) { - + menu_items = data.menu_items; for(var field in menu_items) { if (menu_items[field].item_instances){ - var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2); + console.log(menu_items[field].item_instances.price); + var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); }else{ var price = parseFloat(menu_items[field].price).toFixed(2); } - row = '
' +'
' +''+ menu_items[field].name +'' +'
' + +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' +'
' + +'
' +''+ price +'' +'
'; - $(".menu_items_list").append(row); + $('.menu_items_list').append(row); } + } }); //end Ajax From be0af338a891d907955d3ff072a7c22955b55178 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 27 Jul 2017 15:13:13 +0630 Subject: [PATCH 07/71] update add oresr --- app/views/origami/addorders/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 8fdf0c32..07103225 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -112,7 +112,7 @@ function show_details(url_item){ +'
' +'
' - +''+ price +'' + +''+ menu_items[field].price +'' +'
'; $('.menu_items_list').append(row); } From 9b678b8523576cb9c7c9708c56cf6a5bbcec9124 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 27 Jul 2017 16:40:35 +0630 Subject: [PATCH 08/71] update add order menu category api --- .../menu_categories/show.json.jbuilder | 24 ++++++++--------- app/views/origami/addorders/show.html.erb | 27 ++++++++----------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index c175be67..d7a6d581 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -13,22 +13,22 @@ if @menu.menu_items if item.menu_item_instances.count == 1 then item_instance = item.menu_item_instances[0] - json.price = item_instance.price - json.is_available = item_instance.is_available - json.is_on_promotion = item_instance.is_on_promotion - json.promotion_price = item_instance.promotion_price - json.item_attributes = item_instance.item_attributes + json.price item_instance.price + json.is_available item_instance.is_available + json.is_on_promotion item_instance.is_on_promotion + json.promotion_price item_instance.promotion_price + json.item_attributes item_instance.item_attributes elsif item.menu_item_instances.count > 1 then json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code = is.item_instance_code - json.item_instance_name = is.item_instance_name - json.price = is.price - json.is_available = is.is_available - json.is_on_promotion = is.is_on_promotion - json.promotion_price = is.promotion_price - json.item_attributes = is.item_attributes + json.item_instance_item_code is.item_instance_code + json.item_instance_name is.item_instance_name + json.price is.price + json.is_available is.is_available + json.is_on_promotion is.is_on_promotion + json.promotion_price is.promotion_price + json.item_attributes is.item_attributes end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 07103225..3dff858e 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -15,18 +15,7 @@
- - +
@@ -96,14 +85,14 @@ function show_details(url_item){ for(var field in menu_items) { if (menu_items[field].item_instances){ - console.log(menu_items[field].item_instances.price); - var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2); + console.log(menu_items[field].item_instances[0]); + var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2); }else{ var price = parseFloat(menu_items[field].price).toFixed(2); } row = '
' - +'
' + +'
' +''+ menu_items[field].name +'' +'
' @@ -112,7 +101,7 @@ function show_details(url_item){ +'
' +'
' - +''+ menu_items[field].price +'' + +''+ price +'' +'
'; $('.menu_items_list').append(row); } @@ -127,6 +116,12 @@ function show_details(url_item){ + From 13359cecba5c8706a6b444369ef1bd85708beefe Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 Aug 2017 13:57:52 +0630 Subject: [PATCH 14/71] update void for bitp --- app/controllers/origami/void_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 73f89d13..1cf1ec65 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -6,18 +6,19 @@ class Origami::VoidController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) - sale.payment_status = 'void' - sale.sale_status = 'void' - sale.save - + # update count for shift sale - if(sale.sale_status == "void") + if(sale.sale_status == "completed") if sale.shift_sale_id != nil shift = ShiftSale.find(sale.shift_sale_id) shift.calculate(sale_id, "void") end end + sale.payment_status = 'void' + sale.sale_status = 'void' + sale.save + bookings = sale.bookings bookings.each do |booking| orders = booking.orders From 0fc2fb1d9829fe5a7d7300baf218426ccac7db43 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 15:32:33 +0630 Subject: [PATCH 15/71] calc tax by user taxes --- app/models/sale.rb | 120 ++++++++++++++++++++++----------------------- db/seeds.rb | 5 +- 2 files changed, 62 insertions(+), 63 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 9fe8ad8f..672df8d1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -273,28 +273,33 @@ class Sale < ApplicationRecord total_tax_amount = 0 #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") + customer = Customer.find(sale.customer_id) # #Creat new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end sale.total_tax = total_tax_amount @@ -312,32 +317,35 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") - # #Creat new tax records + customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| - sale_tax = SaleTax.new(:sale => self) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + customer.tax_profiles.each do |cus_tax| + if cus_tax == tax.id + sale_tax = SaleTax.new(:sale => self) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - self.total_discount - #include or execulive - if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + # substract , to give after discount + total_tax = total_taxable - self.total_discount + #include or execulive + if tax.inclusive + sale_tax.tax_payable_amount = total_tax / 21 + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + end + + #new taxable amount is standard rule for step by step + # total_taxable = total_taxable + sale_tax.tax_payable_amount + + sale_tax.inclusive = tax.inclusive + sale_tax.save + + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end end - - #new taxable amount is standard rule for step by step - # total_taxable = total_taxable + sale_tax.tax_payable_amount - - sale_tax.inclusive = tax.inclusive - sale_tax.save - - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end - self.total_tax = total_tax_amount - end def product_get_unit_price(item_code) @@ -382,7 +390,6 @@ class Sale < ApplicationRecord end def self.search(filter,from,to) - if filter.blank? keyword = '' else @@ -399,7 +406,6 @@ class Sale < ApplicationRecord end def self.search_credit_sales(customer,filter,from,to) - if filter.blank? keyword = '' else @@ -518,31 +524,25 @@ class Sale < ApplicationRecord end def self.get_by_range_by_saleitems(from,to,status,report_type) + query = Sale.select(" + mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, + SUM(i.qty) as total_item," + + " i.unit_price as unit_price, + mi.name as product_name, + mc.name as menu_category_name, + mc.id as menu_category_id ") + .group('mi.id') + .order("mi.menu_category_id") - query = Sale.select(" - mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, - SUM(i.qty) as total_item," + - " i.unit_price as unit_price, - mi.name as product_name, - mc.name as menu_category_name, - mc.id as menu_category_id ") - .group('mi.id') - .order("mi.menu_category_id") - - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id - JOIN menu_items mi ON i.product_code = mi.item_code" + - " JOIN menu_categories mc ON mc.id = mi.menu_category_id - JOIN employees ea ON ea.id = sales.cashier_id") - - - query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) - - + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN menu_categories mc ON mc.id = mi.menu_category_id + JOIN employees ea ON ea.id = sales.cashier_id") + query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status) end - def self.get_by_shiftsales(from,to,shift) if !shift.blank? ShiftSale.where("id =?",shift.id) diff --git a/db/seeds.rb b/db/seeds.rb index 1b63bcb0..1b024797 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,9 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) - +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[2,1]"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[1]"}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 2794103e52b45986b5706010751e3f229a270b67 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 9 Aug 2017 17:54:22 +0630 Subject: [PATCH 16/71] update customer tax calc --- .../origami/customers_controller.rb | 4 +- app/models/sale.rb | 7 ++- app/views/crm/customers/_new_form.html.erb | 23 ++++---- app/views/origami/customers/index.html.erb | 57 +++++++++++++------ 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 026e59e3..ec826416 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -37,14 +37,14 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) else - @crm_customers = Customer.search(filter) - + @crm_customers = Customer.search(filter) end #@crm_customers = Customer.all @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50) @crm_customer = Customer.new @count_customer = Customer.count_customer + @taxes = TaxProfile.all.order("order_by asc") # if flash["errors"] # @crm_customer.valid? # end diff --git a/app/models/sale.rb b/app/models/sale.rb index 712584a5..b252fdf1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -277,8 +277,8 @@ class Sale < ApplicationRecord # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -318,10 +318,11 @@ class Sale < ApplicationRecord tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) + # #Create new tax records tax_profiles.each do |tax| customer.tax_profiles.each do |cus_tax| - if cus_tax == tax.id + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 5f1d1b46..35c3a46d 100644 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -82,17 +82,7 @@
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> -
- -
"> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['card_no']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end %> -
+
@@ -103,10 +93,21 @@ <%end %>
+
<%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
+
"> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['card_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end %> +
+
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 3c22c2e4..c41e3cd6 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -81,23 +81,7 @@ <%= f.error_notification %> - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> -
"> - <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> - <% flash.each do |name, msg| %> - <% str="[\"#{msg['name']}\"]" - str.gsub!('["', '') - str.gsub!('"]', '') %> - <%= str %> - <% end -%> -
-
- -
- -
-
-
+ <%= f.hidden_field :id, :class => "form-control col-md-6 " %>

@@ -176,6 +160,37 @@ <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
+
+ + +
+ +
+ <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %> +
+ +
"> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +
+
+ +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cashier Cashier Terminal Opening Date Opening float Received Amount Cast In Cast Out Total Receipt Dining Count Takeaway Count Total Void
<%= @shift.employee.name%><%=@shift.cashier_terminal.name%><%= @shift.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %> + <%=@shift.opening_balance %><%=@shift.closing_balance %><%=@shift.cash_in %><%=@shift.cash_out %><%= @shift.total_receipt %><%= @shift.dining_count %><%= @shift.takeaway_count %>(<%= @shift.total_void.round(2) %>)
+ + <% @total_amount_by_account.each do |amount| %> + + + + + + <%end%> + + + + + + + <% @total_discount_by_account.each do |amount| %> + + + + + + <%end%> + + + + + + + <% @sale_taxes.each do |tax| %> + + + + + + <%end%> + + + + + + + + + + + + + + + +
Total <%= amount.account_name %> Amount<%= amount.total_price.round(2) %>
Net Sales<%=@shift.nett_sales %>
Total <%= amount.account_name %> Discount<%= amount.total_price.round(2) %>
Overall Discount Amount<%= @shift.total_discounts %>
<%= tax.tax_name %> <%= tax.st_amount.round(2) %>
Total Tax <%=@shift.total_taxes %>
Rounding Adj <%= @shift.total_rounding.round(2) %>
Grand Total <%= @shift.grand_total.round(2) %>
+ 		+ + + + + + + + + + + + <% @total_amount = 0 + @other_payment.each do |other| %> + + + + + + + + + + <% @total_amount = @total_amount+other.mpu_amount %> + + + + + + <% @total_amount = @total_amount+other.visa_amount %> + + + + + + <% @total_amount = @total_amount+other.master_amount %> + + + + + + <% @total_amount = @total_amount+other.jcb_amount %> + + + + + + <% @total_amount = @total_amount+other.paypar_amount %> + + <%end%> + + + + + + + + + + + + +
Cash Payment <%=@shift.cash_sales %>
Credit Payment <%=@shift.credit_sales %>
Other Payment Detail
MPU Payment <%=other.mpu_amount.round(2) %>
VISA Payment <%=other.visa_amount.round(2) %>
JCB Payment <%=other.master_amount.round(2) %>
Master Payment <%=other.jcb_amount.round(2) %>
Reedem Payment <%=other.paypar_amount.round(2) %>
Total Other Payment <%=@shift.other_sales %>
Total Payment <%= @total_amount+@shift.cash_sales+@shift.credit_sales %>
+
+
+ +
+


+ + +
+
+ + \ No newline at end of file diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb index 72d8b882..27b2305e 100644 --- a/db/migrate/20170530072247_create_shops.rb +++ b/db/migrate/20170530072247_create_shops.rb @@ -19,6 +19,7 @@ class CreateShops < ActiveRecord::Migration[5.1] t.string :owner_token t.string :id_prefix, :null => false, :limit => 3 t.boolean :is_rounding_adj, :default => false + t.boolean :quick_sale_summary, :default => false t.timestamps end diff --git a/db/seeds.rb b/db/seeds.rb index 1b63bcb0..328c9e54 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) #WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000",customer_type:"Dinein"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111",customer_type:"Takeaway"}) #Default ZOne @@ -149,7 +149,7 @@ menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) shop = Shop.create({id:1, name: "OSAKA OHSHO(Tamwe)", address:'No. 256, Kyaikkasan Road, Tamwe Township, Yangon', township:"Tamwe",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"Tel: 09-258676611",reservation_no:"111",license:"123", -activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0"}) +activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111",is_rounding_adj:"0",quick_sale_summary:"0"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) From 321c65d70baf65ed674d288248cb9b9d6e74c28c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 Aug 2017 13:37:31 +0630 Subject: [PATCH 18/71] update view --- app/views/origami/home/index.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 35aa4230..cdb76bd0 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -108,8 +108,11 @@ - + <%if current_login_employee.role == "cashier" %> + + <%end%> + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> + +
+
+ <% + end + end + end + %> + + +
+
+ + <% end %> + +
+ + + +
+
+
+
ORDER DETAILS - Table
+
+
+
+ + + + + + + + + + + + + + + + + +
Order ByOrder At + Customer +
Table/Room
+
+
+ + + + + + + + + + +
ItemsQTY
+
+ +
+
+
+ + +
+ + + Back + + +
+ + diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 71077ec4..ed27aa13 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,29 +1,25 @@
-
    -
  • Processed <%= @queue_completed_item.length %>
    • - <% - # For Tab Disable for Station is inactive + <% # For Tab Disable for Station is inactive status="" - @queue_stations_items.each do |qsi| - if qsi[:is_active] == false + @queue_stations.each do |qsi| + if qsi.is_active == false status="disabled" - end - %> + end %>
  • - role="tab" <%= status %>> + role="tab" <%= status %>> <%= qsi[:station_name] %> - > - <%= qsi[:item_count] %> + > + <%= qsi.assigned_order_items.count %> - <% if qsi[:is_ap] %> + <% if qsi.auto_print %> (ap) <% end %> From 1dbd6eb60acc5058eaacc7537bba0a445f25c41e Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 14:59:16 +0630 Subject: [PATCH 24/71] inclusive tax calc by rake --- app/models/sale.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 56f52b74..9f4ae9f7 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -287,7 +287,9 @@ class Sale < ApplicationRecord total_tax = total_taxable - total_discount #include or execulive if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount @@ -330,7 +332,9 @@ class Sale < ApplicationRecord total_tax = total_taxable - self.total_discount #include or execulive if tax.inclusive - sale_tax.tax_payable_amount = total_tax / 21 + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value else sale_tax.tax_payable_amount = total_tax * tax.rate / 100 total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount From 3e0eebfa88f6bd382ca38286a029155afe56f3d6 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 16:24:56 +0630 Subject: [PATCH 25/71] nothing change before --- app/models/order.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 398fb0f2..0ef19729 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -65,7 +65,6 @@ class Order < ApplicationRecord end def adding_line_items - if self.items #re-order to ordered_list = re_order_items(self.items) From 99946deea358830c030ad1117900487f1f643020 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:01:37 +0630 Subject: [PATCH 26/71] update fix for customer --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 29834cb8..8bc16f74 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) # Default CUSTOMER -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[\"2\", \"1\"]"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[\"1\"]"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 338c4208505704f71c2bd97151df50780983c7cd Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:02:50 +0630 Subject: [PATCH 27/71] update fix for customer --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 29834cb8..8bc16f74 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) # Default CUSTOMER -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[\"2\", \"1\"]"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[\"1\"]"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 362789a93eb889cb52ddac82746595a2ab636a98 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 Aug 2017 18:19:07 +0630 Subject: [PATCH 28/71] update oqs --- app/assets/javascripts/OQS.js | 9 +- app/controllers/oqs/home_controller.rb | 18 ++- app/views/oqs/home/index.html.erb | 153 +++++++++++++++---------- config/routes.rb | 2 + 4 files changed, 113 insertions(+), 69 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 2097db44..d77a3a6a 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -24,7 +24,7 @@ $(document).ready(function(){ // window.location.reload(1); // }, 10000); - $('.queue_station').on('click',function(){ + $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text(); @@ -68,19 +68,20 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); - $(".order-item-edit").on('click', function(){ + $(document).on('click', '.order-item-edit', function(event){ var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(5); window.location.href = '/oqs/'+ assigned_item_id + "/edit" }); // complete for queue item - $('.order-complete').on('click',function(e){ + + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); var params = { 'id':assigned_item_id }; - + // Call update_delivery_status() for changed delivery and move to delivery $.ajax({ type: 'POST', diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index c4c801fa..0a120ce2 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -69,6 +69,12 @@ class Oqs::HomeController < BaseOqsController render :json => items.to_json end + def get_items_by_oqs + oqs_id = params[:id] + items = queue_items_query(false,oqs_id) + render :json => items.to_json + end + def show end @@ -88,8 +94,15 @@ class Oqs::HomeController < BaseOqsController render :json => removed_item.to_json end + + # Query for OQS with delivery status - def queue_items_query(status) + def queue_items_query(status,oqs_id=nil) + if oqs_id == nil + oqs = '' + else + oqs = " and assigned_order_items.order_queue_station_id = '#{oqs_id}' " + end AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id @@ -99,8 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'") - .group("assigned_order_items.assigned_order_item_id") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}'#{oqs}") .order("assigned_order_items.created_at") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index ed27aa13..857d9cb7 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -13,15 +13,15 @@ if qsi.is_active == false status="disabled" end %> -
  • - role="tab" <%= status %>> - <%= qsi[:station_name] %> - > - <%= qsi.assigned_order_items.count %> - - <% if qsi.auto_print %> - (ap) - <% end %> +
  • + + > + <%= qsi.station_name %> + <%= qsi.assigned_order_items.count %> + + <% if qsi.auto_print %> + (ap) + <% end %>
    • <% end %> @@ -76,63 +76,14 @@ - <% - @queue_stations_items.each do |qsi| - %> - -
    role="tabpanel"> + -
    - <% - @queue_items_details.each do |qid| - if qid.price != 0 - if qid.zone_id == qsi[:zone_id] && qid.station_name == qsi[:station_name] - %> -
    -
    -

    - <%= qid.type %> - - <%= qid.zone %> - <%= qid.order_id %> -

    -

    - <%= qid.item_name %> [x - <%= qid.qty %> ] -

    - -

    <%= qid.options == "[]"? "" : qid.options %>

    - -

    - Order at - - <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - - - - <%= qid.item_order_by %> - - -

    - - - -
    -
    - - -
    -
    - <% - end - end - end - %> +
    +
    -
    - - <% end %> - +
@@ -193,4 +144,82 @@
+ diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..599ec8c8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -198,6 +198,8 @@ Rails.application.routes.draw do # Pass assigned_order_item_id get 'print/print/:id', to: "print#print" get 'print/print_order_summary/:id', to: "print#print_order_summary" + + get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs" #dashboard # end From a368c4b0b690063452a16604a7bdbc78cab04a05 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:25:10 +0630 Subject: [PATCH 29/71] date convert oqs --- app/views/oqs/home/index.html.erb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 857d9cb7..02e5837f 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -77,13 +77,11 @@ - -
- - - -
- + +
+ +
+ @@ -175,7 +173,7 @@ function show_details(url){ options = data.options; } - var date = data[field]["created_at"]; + var date = new Date(data[field]["created_at"] + " UTC"); row ='
' +'
' @@ -194,7 +192,7 @@ function show_details(url){ +'

' +'Order at' - +''+ date +' - ' + +''+ date.toLocalString() +' - ' +''+ data[field]["item_order_by"] +' ' +' ' From d32fbf18e097d57875f586df57d7f95d175fd4ef Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:45:59 +0630 Subject: [PATCH 30/71] update oqs --- app/views/oqs/home/index.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 02e5837f..ad683d40 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -173,7 +173,8 @@ function show_details(url){ options = data.options; } - var date = new Date(data[field]["created_at"] + " UTC"); + var date = new Date(data[field]["created_at"]); + var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); row ='

' +'
' @@ -192,7 +193,7 @@ function show_details(url){ +'

' +'Order at' - +''+ date.toLocalString() +' - ' + +''+ show_date +' - ' +''+ data[field]["item_order_by"] +' ' +' ' From 5ffb715bd1c9ede50ad2acb81c4a972112cf53c2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:47:29 +0630 Subject: [PATCH 31/71] add menu_item_set --- db/migrate/20170810121704_menu_item_set.rb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb new file mode 100644 index 00000000..5ab5a546 --- /dev/null +++ b/db/migrate/20170810121704_menu_item_set.rb @@ -0,0 +1,4 @@ +class MenuItemSet < ActiveRecord::Migration[5.1] + def change + end +end From 9eaf04778c0a305f2ba194c52fd1b0b7f3ce1ce4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 10:25:09 +0630 Subject: [PATCH 32/71] update oqs --- app/assets/javascripts/OQS.js | 86 +++++++++++++++++++++++++++++-- app/views/oqs/home/index.html.erb | 78 ---------------------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index d77a3a6a..54e73fe1 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -24,6 +24,81 @@ $(document).ready(function(){ // window.location.reload(1); // }, 10000); + $(".oqs_click").on("click", function(){ + + var oqs_id = $(this).find(".oqs-id").text(); + var url = 'oqs/get_items/'+oqs_id; + show_details(url); + + }); //End Click + + function show_details(url){ + var oqs_append = $('.oqs_append'); + oqs_append.empty(); + + //Start Ajax + $.ajax({ + type: "GET", + url: url, + data: {}, + dataType: "json", + success: function(data) { + for(var field in data) { + var price = parseFloat(data[field].price).toFixed(2); + + if (data[field]["options"] == "[]") { + var options = ""; + }else{ + var options = data.options; + } + + var date = data[field]["created_at"]; + + row ='

' + +'
' + +'

' + +''+data[field]["zone"]+'- ' + +''+ data[field]["zone"] +'' + +''+ data[field]["order_id"] +'- ' + +'

' + + +'

' + +''+ data[field]["item_name"] +'- ' + +''+ data[field]["qty"] +'- ' + +'

' + + +'

'+ options +'

' + + +'

' + +'Order at' + +''+ date +' - ' + + +''+ data[field]["item_order_by"] +' ' + +' ' + +'

' + + +' ' + +' ' + +'
' + + +'
' + +'' + +' ' + +'
' + + +'
'; + + + + $('.oqs_append').append(row); + } + + } + }); + //end Ajax + + } + $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); @@ -41,7 +116,6 @@ $(document).ready(function(){ $('#order-from').text(orderZone); // clear order items $("#oqs-order-details-table").children("tbody").empty(); - // Call get_order_items() for Order Items by dining $.ajax({ type: 'GET', @@ -76,7 +150,7 @@ $(document).ready(function(){ // complete for queue item - $(document).on('click', '.order-complete', function(event){ + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); @@ -118,10 +192,13 @@ $(document).ready(function(){ }); // Print Order Item - $('#print_order_item').on('click',function(){ + $(document).on('click', '#print_order_item', function(event){ var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); var options = $('.selected-item').children('.card-block').find('.item-options').text(); var params = { 'options':options }; + console.log(assigned_item_id); + console.log(options); + console.log(params); $.ajax({ type: 'GET', url: '/oqs/print/print/'+assigned_item_id, @@ -130,7 +207,8 @@ $(document).ready(function(){ }); // Print Order Summary - $('#print_order_summary').on('click',function(){ + // $('#print_order_summary').on('click',function(){ + $(document).on('click', '#print_order_summary', function(event){ var table_name=$('.selected-item').children().children().children('.order-zone').text().trim(); var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); var params = { 'table_name':table_name }; diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 857d9cb7..5642e4f7 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -144,82 +144,4 @@
- From 2000eb2d6c054a47db5acb57e2d49de557285134 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:27:53 +0630 Subject: [PATCH 33/71] add pivot table for menu --- db/migrate/20170810121704_menu_item_set.rb | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb deleted file mode 100644 index 5ab5a546..00000000 --- a/db/migrate/20170810121704_menu_item_set.rb +++ /dev/null @@ -1,4 +0,0 @@ -class MenuItemSet < ActiveRecord::Migration[5.1] - def change - end -end From b0f2bbe899efef62a875ee77d63c07389be7f6f0 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:28:13 +0630 Subject: [PATCH 34/71] add pivot table for menu --- db/migrate/20170810121704_create_item_sets.rb | 9 +++++++++ .../20170811121704_create_menu_instance_item_sets.rb | 8 ++++++++ db/migrate/20170811121704_create_menu_item_sets.rb | 8 ++++++++ 3 files changed, 25 insertions(+) create mode 100644 db/migrate/20170810121704_create_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb new file mode 100644 index 00000000..da7fc570 --- /dev/null +++ b/db/migrate/20170810121704_create_item_sets.rb @@ -0,0 +1,9 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name, :null => false + t.integer :min_selectable_qty + t.integer :max_selectable_qty + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..1712065b --- /dev/null +++ b/db/migrate/20170811121704_create_menu_instance_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb new file mode 100644 index 00000000..1cacad00 --- /dev/null +++ b/db/migrate/20170811121704_create_menu_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + t.timestamps + end +end From 0e93eb37651c9d5741db1274a968ec98605c7df5 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 12:13:30 +0630 Subject: [PATCH 35/71] fix for customer tax ui and calc tax after bind customer --- app/controllers/origami/customers_controller.rb | 2 ++ app/models/sale.rb | 14 ++++++++++---- app/views/crm/customers/index.html.erb | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index ec826416..9c054378 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -89,6 +89,8 @@ class Origami::CustomersController < BaseOrigamiController if status == true render json: JSON.generate({:status => true}) + # Re-calc All Amount in Sale + sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount) else render json: JSON.generate({:status => false, :error_message => "Record not found"}) end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9f4ae9f7..7a4a7a62 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -274,11 +274,14 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) - +puts customer.tax_profiles # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| - if cus_tax.to_i == tax.id + customer.tax_profiles.each do |cus_tax| +puts tax +puts cus_tax + if cus_tax.to_i == tax.id +puts "WALSS" sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -319,11 +322,14 @@ class Sale < ApplicationRecord tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) - +puts customer.tax_profiles # #Create new tax records tax_profiles.each do |tax| customer.tax_profiles.each do |cus_tax| +puts tax +puts cus_tax if cus_tax.to_i == tax.id +puts "WALSS" sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 34aaf51e..14e38822 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -124,18 +124,20 @@ $(document).on('click',".customer_tr",function(){ var url = "customers/" + customer_id + "/edit"; } + $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});; + $.ajax({ type: "GET", url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { // Selected for Taxes var taxes = JSON.stringify(data.tax_profiles); var parse_taxes = JSON.parse(taxes); console.log(parse_taxes); $.each(parse_taxes, function(i, value){ - $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected"); + $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); }); $('#customer_id').val(data.id); From ed793bd48cd0a8b698843fd916ffecf6fb626cca Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 12:15:47 +0630 Subject: [PATCH 36/71] remove puts in sale --- app/models/sale.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 7a4a7a62..a73667ba 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -274,14 +274,10 @@ class Sale < ApplicationRecord #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) -puts customer.tax_profiles # #Creat new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| -puts tax -puts cus_tax - if cus_tax.to_i == tax.id -puts "WALSS" + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => sale) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -322,14 +318,10 @@ puts "WALSS" tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(self.customer_id) -puts customer.tax_profiles # #Create new tax records tax_profiles.each do |tax| - customer.tax_profiles.each do |cus_tax| -puts tax -puts cus_tax - if cus_tax.to_i == tax.id -puts "WALSS" + customer.tax_profiles.each do |cus_tax| + if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate From 2c7a641d47422d0426dfea8a3f179dbfc4ddce4b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 13:21:40 +0630 Subject: [PATCH 37/71] update oqs --- app/assets/javascripts/OQS.js | 8 +++++--- app/controllers/oqs/backhome_controller.rb | 2 +- app/controllers/oqs/home_controller.rb | 10 +++++++--- app/views/oqs/home/index.html.erb | 3 +-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index cad815bf..19d0429e 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -46,7 +46,8 @@ $(document).ready(function(){ url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { + for(var field in data) { var price = parseFloat(data[field].price).toFixed(2); @@ -62,7 +63,7 @@ $(document).ready(function(){ row ='
' +'
' +'

' - +''+data[field]["type"]+'- ' + +''+data[field]["table_type"]+'- ' +''+ data[field]["zone"] +'' +''+ data[field]["order_id"] +'- ' +'

' @@ -200,7 +201,8 @@ $(document).ready(function(){ $(document).on('click', '#print_order_item', function(event){ var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); var options = $('.selected-item').children('.card-block').find('.item-options').text(); - var params = { 'options':options }; + var params = { 'options':options }; + $.ajax({ type: 'GET', url: '/oqs/print/print/'+assigned_item_id, diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb index b09e4a2d..4ac5f0a2 100644 --- a/app/controllers/oqs/backhome_controller.rb +++ b/app/controllers/oqs/backhome_controller.rb @@ -89,7 +89,7 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with delivery status def queue_items_query(status) - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index d25ab0ac..dfe648d0 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -95,7 +95,6 @@ class Oqs::HomeController < BaseOqsController end - # Query for OQS with delivery status def queue_items_query(status,oqs_id=nil) if oqs_id == nil @@ -103,7 +102,13 @@ class Oqs::HomeController < BaseOqsController else oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' " end - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, + oqs.id as station_id, oqs.station_name, + oqs.is_active, oqpz.zone_id, + df.name as zone, df.type as table_type, + odt.order_id, odt.item_code, odt.item_name, + odt.price, odt.qty, odt.item_order_by, odt.options, + cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id @@ -114,7 +119,6 @@ class Oqs::HomeController < BaseOqsController left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}") .group("assigned_order_items.assigned_order_item_id") - .order("assigned_order_items.created_at") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index c6c35e1c..3ab1cf24 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -17,12 +17,11 @@ > <%= qsi.station_name %> - <%= qsi.assigned_order_items.count(:delivery_status) %> + <%= qsi.assigned_order_items.where("delivery_status=0").count %> <% if qsi.auto_print %> (ap) <% end %> - <%= qsi.assigned_order_items.where("delivery_status=0").count %> <% end %> From b7c49f5f60702e5c03fbee5a310dd6bdb7fde9c1 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:34:58 +0630 Subject: [PATCH 38/71] remove item set migrateion --- db/migrate/20170810121704_create_item_sets.rb | 9 --------- .../20170811121704_create_menu_instance_item_sets.rb | 8 -------- db/migrate/20170811121704_create_menu_item_sets.rb | 8 -------- 3 files changed, 25 deletions(-) delete mode 100644 db/migrate/20170810121704_create_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb deleted file mode 100644 index da7fc570..00000000 --- a/db/migrate/20170810121704_create_item_sets.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateItemSets < ActiveRecord::Migration[5.1] - def change - create_table :item_sets do |t| - t.string :name, :null => false - t.integer :min_selectable_qty - t.integer :max_selectable_qty - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb deleted file mode 100644 index 1712065b..00000000 --- a/db/migrate/20170811121704_create_menu_instance_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb deleted file mode 100644 index 1cacad00..00000000 --- a/db/migrate/20170811121704_create_menu_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true - t.timestamps - end -end From b7cde3125f7c74d5c777238e8954e9e6fa7bb6f3 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:44:25 +0630 Subject: [PATCH 39/71] add item set and relation --- app/models/item_set.rb | 2 ++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item_set.rb | 2 ++ db/migrate/20170811070634_create_item_sets.rb | 11 +++++++++++ db/migrate/20170811071108_create_menu_item_sets.rb | 10 ++++++++++ .../20170811071327_create_menu_instance_item_sets.rb | 10 ++++++++++ spec/models/item_set_spec.rb | 5 +++++ spec/models/menu_instance_item_set_spec.rb | 5 +++++ spec/models/menu_item_set_spec.rb | 5 +++++ 9 files changed, 52 insertions(+) create mode 100644 app/models/item_set.rb create mode 100644 app/models/menu_instance_item_set.rb create mode 100644 app/models/menu_item_set.rb create mode 100644 db/migrate/20170811070634_create_item_sets.rb create mode 100644 db/migrate/20170811071108_create_menu_item_sets.rb create mode 100644 db/migrate/20170811071327_create_menu_instance_item_sets.rb create mode 100644 spec/models/item_set_spec.rb create mode 100644 spec/models/menu_instance_item_set_spec.rb create mode 100644 spec/models/menu_item_set_spec.rb diff --git a/app/models/item_set.rb b/app/models/item_set.rb new file mode 100644 index 00000000..83c32c82 --- /dev/null +++ b/app/models/item_set.rb @@ -0,0 +1,2 @@ +class ItemSet < ApplicationRecord +end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb new file mode 100644 index 00000000..6674c0c2 --- /dev/null +++ b/app/models/menu_instance_item_set.rb @@ -0,0 +1,2 @@ +class MenuInstanceItemSet < ApplicationRecord +end diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb new file mode 100644 index 00000000..407924bd --- /dev/null +++ b/app/models/menu_item_set.rb @@ -0,0 +1,2 @@ +class MenuItemSet < ApplicationRecord +end diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811070634_create_item_sets.rb new file mode 100644 index 00000000..d666222c --- /dev/null +++ b/db/migrate/20170811070634_create_item_sets.rb @@ -0,0 +1,11 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name + t.integer :min_selectable_qty + t.integer :max_selectable_qty + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb new file mode 100644 index 00000000..f423ea7b --- /dev/null +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..b25ba8b6 --- /dev/null +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/spec/models/item_set_spec.rb b/spec/models/item_set_spec.rb new file mode 100644 index 00000000..70c14cff --- /dev/null +++ b/spec/models/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_instance_item_set_spec.rb b/spec/models/menu_instance_item_set_spec.rb new file mode 100644 index 00000000..5711f7e7 --- /dev/null +++ b/spec/models/menu_instance_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuInstanceItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_item_set_spec.rb b/spec/models/menu_item_set_spec.rb new file mode 100644 index 00000000..f3c82b26 --- /dev/null +++ b/spec/models/menu_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 12d3e70b197efb866296bd041a4a264fc26db7ed Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 14:23:33 +0630 Subject: [PATCH 40/71] update model for menu --- app/models/item_set.rb | 5 +++++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item.rb | 3 +++ app/models/menu_item_set.rb | 2 ++ 4 files changed, 12 insertions(+) diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 83c32c82..379347a3 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -1,2 +1,7 @@ class ItemSet < ApplicationRecord + has_many :menu_item_sets + has_many :menu_items, through: :menu_item_sets + + has_many :menu_instance_item_sets + has_many :menu_item_instances, through: :menu_item_sets end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb index 6674c0c2..bc1d7aaf 100644 --- a/app/models/menu_instance_item_set.rb +++ b/app/models/menu_instance_item_set.rb @@ -1,2 +1,4 @@ class MenuInstanceItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item_instance end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..0db0cda4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,6 +8,9 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account + has_many :menu_item_sets + has_many :item_sets, through: :menu_item_sets + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb index 407924bd..a39b8522 100644 --- a/app/models/menu_item_set.rb +++ b/app/models/menu_item_set.rb @@ -1,2 +1,4 @@ class MenuItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item end From be71d187b0f1f83536051c972c6b985cc493aa1b Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 15:00:24 +0630 Subject: [PATCH 41/71] update menu --- app/models/menu_category.rb | 8 ++++---- app/models/menu_item.rb | 11 +++++------ app/models/menu_item_instance.rb | 10 +++++----- app/views/settings/menu_categories/show.html.erb | 2 +- db/migrate/20170811071108_create_menu_item_sets.rb | 4 ++-- .../20170811071327_create_menu_instance_item_sets.rb | 4 ++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 71ad42c8..29484bcc 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,5 @@ class MenuCategory < ApplicationRecord - before_create :generate_menu_category_code + # before_create :generate_menu_category_code belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" @@ -37,7 +37,7 @@ class MenuCategory < ApplicationRecord private - def generate_menu_category_code - self.code = SeedGenerator.generate_code(self.class.name, "C") - end + # def generate_menu_category_code + # self.code = SeedGenerator.generate_code(self.class.name, "C") + # end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 0db0cda4..4a661c14 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,5 @@ class MenuItem < ApplicationRecord - - before_create :generate_menu_item_code + # before_create :generate_menu_item_code belongs_to :menu_category, :optional => true has_many :menu_item_instances @@ -73,10 +72,10 @@ class MenuItem < ApplicationRecord end - private + # private - def generate_menu_item_code - self.item_code = SeedGenerator.generate_code(self.class.name, "I") - end + # def generate_menu_item_code + # self.item_code = SeedGenerator.generate_code(self.class.name, "I") + # end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index f39c29a2..579b7a5a 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,6 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - before_create :generate_menu_item_instance_code + # before_create :generate_menu_item_instance_code def self.findParentCategory(item) if item.menu_category_id @@ -11,9 +11,9 @@ class MenuItemInstance < ApplicationRecord end end - private + # private - def generate_menu_item_instance_code - self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") - end + # def generate_menu_item_instance_code + # self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") + # end end diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 25c3c9ba..7e1f44af 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,6 +1,6 @@
    -
  • Home
    • +
  • Home
  • Menus Categories
  • Details
    • diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb index f423ea7b..1d4109f9 100644 --- a/db/migrate/20170811071108_create_menu_item_sets.rb +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item, foreign_key: true t.timestamps end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb index b25ba8b6..89f08f41 100644 --- a/db/migrate/20170811071327_create_menu_instance_item_sets.rb +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item_instance, foreign_key: true t.timestamps end From 79ca1428b9a2ca3f134bc801ef96e179b6a11f2e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 15:39:08 +0630 Subject: [PATCH 42/71] update close receipt for member discount --- app/controllers/origami/home_controller.rb | 2 +- app/controllers/origami/shifts_controller.rb | 8 ++-- app/models/printer/cashier_station_printer.rb | 4 +- app/models/shift_sale.rb | 6 +++ app/pdf/close_cashier_pdf.rb | 31 +++++++++++-- app/views/origami/home/index.html.erb | 2 +- .../origami/shifts/sale_summary.html.erb | 45 +++++++++++++------ 7 files changed, 74 insertions(+), 24 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 2e8aba2c..27822a17 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -7,6 +7,7 @@ class Origami::HomeController < BaseOrigamiController @complete = Sale.where("sale_status != 'new'") @orders = Order.all.order('date desc') @shop = Shop.find_by_id(1) + # @shift = ShiftSale.current_open_shift(current_user.id) end @@ -39,7 +40,6 @@ class Origami::HomeController < BaseOrigamiController else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" && sale.sale_status != 'void' - puts "enter" @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index afb28714..e134a594 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -39,13 +39,13 @@ class Origami::ShiftsController < BaseOrigamiController # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') - + @total_member_discount = ShiftSale.get_total_member_discount(@shift) # get printer info - print_settings=PrintSetting.find_by_unique_code(unique_code) + print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) - printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account) + printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount) end @@ -72,6 +72,8 @@ class Origami::ShiftsController < BaseOrigamiController # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') + @total_member_discount = ShiftSale.get_total_member_discount(@shift) + end end diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index b7bc34ae..91100145 100644 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -22,14 +22,14 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # end #Bill Receipt Print - def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) + def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount) #Use CUPS service #Generate PDF #Print cashier = shift_sale.employee.name shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount) + pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount) filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" pdf.render_file filename self.print(filename) diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 8a8c1469..168e63ff 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -125,6 +125,12 @@ class ShiftSale < ApplicationRecord query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id) .group("acc.title").order("acc.id") end + end + + def self.get_total_member_discount(shift) + query = Sale.select("SUM(sales.total_discount) as member_discount") + .where("shift_sale_id =? and sale_status = 'completed' and discount_type = 'member_discount'", shift.id) + end end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 1955bf74..51f905d6 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,6 +1,6 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = 210 self.page_height = 7000 self.margin = 5 @@ -32,7 +32,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule - shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) @@ -51,7 +51,7 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule end - def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account) + def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) move_down 7 y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do @@ -277,9 +277,32 @@ class CloseCashierPdf < Prawn::Document end #end total amount by Account + if total_member_discount[0].member_discount.present? + @member_discount = total_member_discount[0].member_discount rescue 0.0 + @overall = shift_sale.total_discounts - @member_discount + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Member Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{@member_discount}", :size => self.item_font_size, :align => :right + end + else + @overall = shift_sale.total_discounts + end + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do - text "Overall Discount Amount :", :size => self.item_font_size, :align => :right + text "Total Overall Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{@overall}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Discount Amount :", :size => self.item_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{shift_sale.total_discounts}", :size => self.item_font_size, :align => :right diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index cdb76bd0..e3193a98 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -108,7 +108,7 @@ - <%if current_login_employee.role == "cashier" %> + <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> <%end%> diff --git a/app/views/origami/shifts/sale_summary.html.erb b/app/views/origami/shifts/sale_summary.html.erb index c552d6b0..94e59924 100644 --- a/app/views/origami/shifts/sale_summary.html.erb +++ b/app/views/origami/shifts/sale_summary.html.erb @@ -55,11 +55,29 @@ <%= amount.total_price.round(2) %> <%end%> + + <% if !@total_member_discount[0].member_discount.nil? + @member_discount = @total_member_discount[0].member_discount rescue 0.0 + @overall = @shift.total_discounts - @member_discount + %> - - Overall Discount Amount - <%= @shift.total_discounts %> + + Total Member Discount + <%= @member_discount %> + <%else @overall = @shift.total_discounts %> + + <%end%> + + + Total Overall Discount + <%= @overall %> + + + + Total Discount + <%= @shift.total_discounts %> + <% @sale_taxes.each do |tax| %> @@ -98,6 +116,7 @@ <%=@shift.credit_sales %> <% @total_amount = 0 + @other_payment.each do |other| %> @@ -107,32 +126,32 @@ MPU Payment - <%=other.mpu_amount.round(2) %> - <% @total_amount = @total_amount+other.mpu_amount %> + <%=other.mpu_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.mpu_amount rescue 0.0 %> VISA Payment - <%=other.visa_amount.round(2) %> - <% @total_amount = @total_amount+other.visa_amount %> + <%=other.visa_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.visa_amount rescue 0.0 %> JCB Payment - <%=other.master_amount.round(2) %> - <% @total_amount = @total_amount+other.master_amount %> + <%=other.master_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.master_amount rescue 0.0 %> Master Payment - <%=other.jcb_amount.round(2) %> - <% @total_amount = @total_amount+other.jcb_amount %> + <%=other.jcb_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %> Reedem Payment - <%=other.paypar_amount.round(2) %> - <% @total_amount = @total_amount+other.paypar_amount %> + <%=other.paypar_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %> <%end%> From 10aae022d23730964ecc484d086dc2510c319f5d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 Aug 2017 16:47:57 +0630 Subject: [PATCH 43/71] update oqs --- app/assets/javascripts/OQS.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 19d0429e..801fd214 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -25,11 +25,12 @@ $(document).ready(function(){ // }, 10000); $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') - + $(".oqs_append").addClass('hide') }); $(".oqs_click").on("click", function(){ $("#completed").addClass('hide') + $(".oqs_append").removeClass('hide') var oqs_id = $(this).find(".oqs-id").text(); var url = 'oqs/get_items/'+oqs_id; show_details(url); From 03a6208a766c903acda8ff9611a08d490dca132e Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 17:41:10 +0630 Subject: [PATCH 44/71] add item set with scaffold --- .../javascripts/settings/item_sets.coffee | 3 + .../stylesheets/settings/item_sets.scss | 3 + .../settings/item_sets_controller.rb | 74 +++++++++ app/helpers/settings/item_sets_helper.rb | 2 + app/models/item_set.rb | 2 +- app/models/settings/item_set.rb | 2 + app/views/settings/item_sets/_form.html.erb | 13 ++ .../_settings_item_set.json.jbuilder | 2 + app/views/settings/item_sets/edit.html.erb | 6 + app/views/settings/item_sets/index.html.erb | 31 ++++ .../settings/item_sets/index.json.jbuilder | 1 + app/views/settings/item_sets/new.html.erb | 5 + app/views/settings/item_sets/show.html.erb | 19 +++ .../settings/item_sets/show.json.jbuilder | 1 + config/routes.rb | 3 + ....rb => 20170811071000_create_item_sets.rb} | 0 .../settings/item_sets_controller_spec.rb | 141 ++++++++++++++++++ .../helpers/settings/item_sets_helper_spec.rb | 15 ++ spec/models/settings/item_set_spec.rb | 5 + .../settings/settings_item_sets_spec.rb | 10 ++ .../settings/item_sets_routing_spec.rb | 39 +++++ .../settings/item_sets/edit.html.erb_spec.rb | 24 +++ .../settings/item_sets/index.html.erb_spec.rb | 25 ++++ .../settings/item_sets/new.html.erb_spec.rb | 24 +++ .../settings/item_sets/show.html.erb_spec.rb | 18 +++ test/system/item_sets_test.rb | 9 ++ 26 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/settings/item_sets.coffee create mode 100644 app/assets/stylesheets/settings/item_sets.scss create mode 100644 app/controllers/settings/item_sets_controller.rb create mode 100644 app/helpers/settings/item_sets_helper.rb create mode 100644 app/models/settings/item_set.rb create mode 100644 app/views/settings/item_sets/_form.html.erb create mode 100644 app/views/settings/item_sets/_settings_item_set.json.jbuilder create mode 100644 app/views/settings/item_sets/edit.html.erb create mode 100644 app/views/settings/item_sets/index.html.erb create mode 100644 app/views/settings/item_sets/index.json.jbuilder create mode 100644 app/views/settings/item_sets/new.html.erb create mode 100644 app/views/settings/item_sets/show.html.erb create mode 100644 app/views/settings/item_sets/show.json.jbuilder rename db/migrate/{20170811070634_create_item_sets.rb => 20170811071000_create_item_sets.rb} (100%) create mode 100644 spec/controllers/settings/item_sets_controller_spec.rb create mode 100644 spec/helpers/settings/item_sets_helper_spec.rb create mode 100644 spec/models/settings/item_set_spec.rb create mode 100644 spec/requests/settings/settings_item_sets_spec.rb create mode 100644 spec/routing/settings/item_sets_routing_spec.rb create mode 100644 spec/views/settings/item_sets/edit.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/index.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/new.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/show.html.erb_spec.rb create mode 100644 test/system/item_sets_test.rb diff --git a/app/assets/javascripts/settings/item_sets.coffee b/app/assets/javascripts/settings/item_sets.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/item_sets.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/settings/item_sets.scss b/app/assets/stylesheets/settings/item_sets.scss new file mode 100644 index 00000000..004d8d6b --- /dev/null +++ b/app/assets/stylesheets/settings/item_sets.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Settings/ItemSets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb new file mode 100644 index 00000000..226071ef --- /dev/null +++ b/app/controllers/settings/item_sets_controller.rb @@ -0,0 +1,74 @@ +class Settings::ItemSetsController < ApplicationController + before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy] + + # GET /settings/item_sets + # GET /settings/item_sets.json + def index + @settings_item_sets = ItemSet.all + end + + # GET /settings/item_sets/1 + # GET /settings/item_sets/1.json + def show + end + + # GET /settings/item_sets/new + def new + @settings_item_set = ItemSet.new + end + + # GET /settings/item_sets/1/edit + def edit + end + + # POST /settings/item_sets + # POST /settings/item_sets.json + def create + @settings_item_set = ItemSet.new(settings_item_set_params) + + respond_to do |format| + if @settings_item_set.save + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' } + format.json { render :show, status: :created, location: @settings_item_set } + else + format.html { render :new } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/item_sets/1 + # PATCH/PUT /settings/item_sets/1.json + def update + respond_to do |format| + if @settings_item_set.update(settings_item_set_params) + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_item_set } + else + format.html { render :edit } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/item_sets/1 + # DELETE /settings/item_sets/1.json + def destroy + @settings_item_set.destroy + respond_to do |format| + format.html { redirect_to settings_item_sets_url, notice: 'Item set was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_item_set + @settings_item_set = ItemSet.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_item_set_params + params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + end +end diff --git a/app/helpers/settings/item_sets_helper.rb b/app/helpers/settings/item_sets_helper.rb new file mode 100644 index 00000000..59c3b632 --- /dev/null +++ b/app/helpers/settings/item_sets_helper.rb @@ -0,0 +1,2 @@ +module Settings::ItemSetsHelper +end diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 379347a3..55bc0c6b 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -3,5 +3,5 @@ class ItemSet < ApplicationRecord has_many :menu_items, through: :menu_item_sets has_many :menu_instance_item_sets - has_many :menu_item_instances, through: :menu_item_sets + has_many :menu_item_instances, through: :menu_instance_item_sets end diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb new file mode 100644 index 00000000..dcedbbca --- /dev/null +++ b/app/models/settings/item_set.rb @@ -0,0 +1,2 @@ +class Settings::ItemSet < ApplicationRecord +end diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb new file mode 100644 index 00000000..4e2760cd --- /dev/null +++ b/app/views/settings/item_sets/_form.html.erb @@ -0,0 +1,13 @@ +<%= simple_form_for(@settings_item_set) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :min_selectable_qty %> + <%= f.input :max_selectable_qty %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/item_sets/_settings_item_set.json.jbuilder b/app/views/settings/item_sets/_settings_item_set.json.jbuilder new file mode 100644 index 00000000..44a15ef8 --- /dev/null +++ b/app/views/settings/item_sets/_settings_item_set.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_item_set, :id, :name, :min_selectable_qty, :max_selectable_qty, :created_at, :updated_at +json.url settings_item_set_url(settings_item_set, format: :json) diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb new file mode 100644 index 00000000..75a7f10a --- /dev/null +++ b/app/views/settings/item_sets/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Show', @settings_item_set %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb new file mode 100644 index 00000000..f5b50ad6 --- /dev/null +++ b/app/views/settings/item_sets/index.html.erb @@ -0,0 +1,31 @@ +

    <%= notice %>

    + +

    Settings Item Sets

    + + + + + + + + + + + + + <% @settings_item_sets.each do |settings_item_set| %> + + + + + + + + + <% end %> + +
    NameMin selectable qtyMax selectable qty
    <%= settings_item_set.name %><%= settings_item_set.min_selectable_qty %><%= settings_item_set.max_selectable_qty %><%= link_to 'Show', settings_item_set %><%= link_to 'Edit', edit_settings_item_set_path(settings_item_set) %><%= link_to 'Destroy', settings_item_set, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Settings Item Set', new_settings_item_set_path %> diff --git a/app/views/settings/item_sets/index.json.jbuilder b/app/views/settings/item_sets/index.json.jbuilder new file mode 100644 index 00000000..ae5e4391 --- /dev/null +++ b/app/views/settings/item_sets/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_item_sets, partial: 'settings_item_sets/settings_item_set', as: :settings_item_set diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb new file mode 100644 index 00000000..a2773f42 --- /dev/null +++ b/app/views/settings/item_sets/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb new file mode 100644 index 00000000..5f7b01d0 --- /dev/null +++ b/app/views/settings/item_sets/show.html.erb @@ -0,0 +1,19 @@ +

    <%= notice %>

    + +

    + Name: + <%= @settings_item_set.name %> +

    + +

    + Min selectable qty: + <%= @settings_item_set.min_selectable_qty %> +

    + +

    + Max selectable qty: + <%= @settings_item_set.max_selectable_qty %> +

    + +<%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set) %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.json.jbuilder b/app/views/settings/item_sets/show.json.jbuilder new file mode 100644 index 00000000..db3c9813 --- /dev/null +++ b/app/views/settings/item_sets/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_item_sets/settings_item_set", settings_item_set: @settings_item_set diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..4b5cd9f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,9 @@ require 'sidekiq/web' Rails.application.routes.draw do + namespace :settings do + resources :item_sets + end root 'home#index' mount Sidekiq::Web => '/kiq' diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811071000_create_item_sets.rb similarity index 100% rename from db/migrate/20170811070634_create_item_sets.rb rename to db/migrate/20170811071000_create_item_sets.rb diff --git a/spec/controllers/settings/item_sets_controller_spec.rb b/spec/controllers/settings/item_sets_controller_spec.rb new file mode 100644 index 00000000..46593eff --- /dev/null +++ b/spec/controllers/settings/item_sets_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Settings::ItemSetsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::ItemSet. As you add validations to Settings::ItemSet, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Settings::ItemSetsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :show, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :edit, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Settings::ItemSet" do + expect { + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + }.to change(Settings::ItemSet, :count).by(1) + end + + it "redirects to the created settings_item_set" do + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::ItemSet.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: new_attributes}, session: valid_session + item_set.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(item_set) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + expect { + delete :destroy, params: {id: item_set.to_param}, session: valid_session + }.to change(Settings::ItemSet, :count).by(-1) + end + + it "redirects to the settings_item_sets list" do + item_set = Settings::ItemSet.create! valid_attributes + delete :destroy, params: {id: item_set.to_param}, session: valid_session + expect(response).to redirect_to(settings_item_sets_url) + end + end + +end diff --git a/spec/helpers/settings/item_sets_helper_spec.rb b/spec/helpers/settings/item_sets_helper_spec.rb new file mode 100644 index 00000000..b34f883a --- /dev/null +++ b/spec/helpers/settings/item_sets_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::ItemSetsHelper. For example: +# +# describe Settings::ItemSetsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::ItemSetsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/item_set_spec.rb b/spec/models/settings/item_set_spec.rb new file mode 100644 index 00000000..fcaee254 --- /dev/null +++ b/spec/models/settings/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/settings/settings_item_sets_spec.rb b/spec/requests/settings/settings_item_sets_spec.rb new file mode 100644 index 00000000..439abdaa --- /dev/null +++ b/spec/requests/settings/settings_item_sets_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::ItemSets", type: :request do + describe "GET /settings_item_sets" do + it "works! (now write some real specs)" do + get settings_item_sets_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/settings/item_sets_routing_spec.rb b/spec/routing/settings/item_sets_routing_spec.rb new file mode 100644 index 00000000..45d308b7 --- /dev/null +++ b/spec/routing/settings/item_sets_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::ItemSetsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/item_sets").to route_to("settings/item_sets#index") + end + + it "routes to #new" do + expect(:get => "/settings/item_sets/new").to route_to("settings/item_sets#new") + end + + it "routes to #show" do + expect(:get => "/settings/item_sets/1").to route_to("settings/item_sets#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/item_sets/1/edit").to route_to("settings/item_sets#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/item_sets").to route_to("settings/item_sets#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/item_sets/1").to route_to("settings/item_sets#destroy", :id => "1") + end + + end +end diff --git a/spec/views/settings/item_sets/edit.html.erb_spec.rb b/spec/views/settings/item_sets/edit.html.erb_spec.rb new file mode 100644 index 00000000..5add21aa --- /dev/null +++ b/spec/views/settings/item_sets/edit.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/edit", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders the edit settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_set_path(@settings_item_set), "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/index.html.erb_spec.rb b/spec/views/settings/item_sets/index.html.erb_spec.rb new file mode 100644 index 00000000..3dcf7fb2 --- /dev/null +++ b/spec/views/settings/item_sets/index.html.erb_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/index", type: :view do + before(:each) do + assign(:settings_item_sets, [ + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ), + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ) + ]) + end + + it "renders a list of settings/item_sets" do + render + assert_select "tr>td", :text => "Name".to_s, :count => 2 + assert_select "tr>td", :text => 2.to_s, :count => 2 + assert_select "tr>td", :text => 3.to_s, :count => 2 + end +end diff --git a/spec/views/settings/item_sets/new.html.erb_spec.rb b/spec/views/settings/item_sets/new.html.erb_spec.rb new file mode 100644 index 00000000..fc04e612 --- /dev/null +++ b/spec/views/settings/item_sets/new.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/new", type: :view do + before(:each) do + assign(:settings_item_set, Settings::ItemSet.new( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders new settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_sets_path, "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/show.html.erb_spec.rb b/spec/views/settings/item_sets/show.html.erb_spec.rb new file mode 100644 index 00000000..4e4b9b2c --- /dev/null +++ b/spec/views/settings/item_sets/show.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/show", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Name/) + expect(rendered).to match(/2/) + expect(rendered).to match(/3/) + end +end diff --git a/test/system/item_sets_test.rb b/test/system/item_sets_test.rb new file mode 100644 index 00000000..c162d36f --- /dev/null +++ b/test/system/item_sets_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::ItemSetsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_item_sets_url + # + # assert_selector "h1", text: "Settings::ItemSet" + # end +end From f8c7630b97150d79e39855f28a0da15770c42c83 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 10:28:23 +0630 Subject: [PATCH 45/71] updating item_set --- app/models/settings/item_set.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/models/settings/item_set.rb diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb deleted file mode 100644 index dcedbbca..00000000 --- a/app/models/settings/item_set.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::ItemSet < ApplicationRecord -end From 069ad167332add09bc2d7266e9605385883186cf Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 13:42:47 +0630 Subject: [PATCH 46/71] update oqs filtring --- app/assets/javascripts/OQS.js | 8 ++-- app/controllers/oqs/home_controller.rb | 49 +++++++++++++++++++----- app/views/oqs/home/index.html.erb | 52 ++++++++++++++++++++------ 3 files changed, 84 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 801fd214..5ed26997 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -31,8 +31,9 @@ $(document).ready(function(){ $(".oqs_click").on("click", function(){ $("#completed").addClass('hide') $(".oqs_append").removeClass('hide') + var oqs_id = $(this).find(".oqs-id").text(); - var url = 'oqs/get_items/'+oqs_id; + var url = 'oqs/get_items/'+oqs_id; show_details(url); }); //End Click @@ -40,15 +41,14 @@ $(document).ready(function(){ function show_details(url){ var oqs_append = $('.oqs_append'); oqs_append.empty(); - + var filter = $('.filter').text(); //Start Ajax $.ajax({ type: "GET", url: url, - data: {}, + data: {'filter':filter}, dataType: "json", success: function(data) { - for(var field in data) { var price = parseFloat(data[field].price).toFixed(2); diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index dfe648d0..dae8b02f 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -7,7 +7,17 @@ class Oqs::HomeController < BaseOqsController # @queue_items_details = queue_items_query(false) # Query for OQS with delivery status true - @queue_completed_item = completed_order + + + @filter = params[:filter] + + @queue_completed_item = completed_order(@filter) + if !@filter.nil? + @count = queue_items_count_query(false,@filter) + @count.each do |count| + + end + end # @queue_stations_items=Array.new @@ -71,7 +81,8 @@ class Oqs::HomeController < BaseOqsController def get_items_by_oqs oqs_id = params[:id] - items = queue_items_query(false,oqs_id) + filter = params[:filter] + items = queue_items_query(false,oqs_id,filter) render :json => items.to_json end @@ -96,13 +107,14 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with delivery status - def queue_items_query(status,oqs_id=nil) + def queue_items_query(status,oqs_id=nil,filter) if oqs_id == nil oqs = '' else oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' " end - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, + + query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as table_type, @@ -117,14 +129,15 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) .group("assigned_order_items.assigned_order_item_id") end # Completed Order - def completed_order - AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") + def completed_order(filter) + query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join orders as od ON od.order_id = assigned_order_items.order_id @@ -134,12 +147,28 @@ class Oqs::HomeController < BaseOqsController left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") - .group("assigned_order_items.order_id") - .limit(20) - .order("assigned_order_items.created_at") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) + .group("assigned_order_items.order_id") + .limit(20) + .order("assigned_order_items.created_at") # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); end + def queue_items_count_query(status,filter) + query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id") + .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id + left join orders as od ON od.order_id = assigned_order_items.order_id + left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id + left join customers as cus ON cus.customer_id = od.customer_id + left join booking_orders as bo on bo.order_id = assigned_order_items.order_id + left join bookings as bk on bk.booking_id = bo.booking_id + left join dining_facilities as df on df.id = bk.dining_facility_id") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ") + query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) + .group("oqs.id") + + end + end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 3ab1cf24..81e14467 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,10 +1,26 @@

    - +
    + <%= form_tag oqs_root_path, :method => :get do %> +
    + +
    + +
    + +
    +<% end %> +
    +
    + +
    +
    +
    <% @@ -73,13 +101,12 @@ %>
    + + - - -
    - +
    @@ -142,3 +169,6 @@
    + \ No newline at end of file From 74d7adbaef3f19df278c4588fd6ad2fa15057e54 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 14:27:37 +0630 Subject: [PATCH 47/71] deving item sets --- app/controllers/settings/item_sets_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 226071ef..ace39027 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -14,7 +14,7 @@ class Settings::ItemSetsController < ApplicationController # GET /settings/item_sets/new def new - @settings_item_set = ItemSet.new + @settings_item_set = ItemSet.new end # GET /settings/item_sets/1/edit From a691eb8d648931d503072584e656df43c6bd298d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 15:01:44 +0630 Subject: [PATCH 48/71] update --- app/controllers/origami/customers_controller.rb | 5 +++-- app/models/sale.rb | 2 +- app/views/oqs/home/index.html.erb | 17 ++++++++++------- app/views/origami/home/index.html.erb | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index ec826416..c67fece5 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -60,6 +60,7 @@ class Origami::CustomersController < BaseOrigamiController id = params[:sale_id][0,3] customer_id = params[:customer_id] + customer = Customer.find(customer_id) # Check and find with card no # if(!customer_id.include? "CUS") @@ -74,7 +75,7 @@ class Origami::CustomersController < BaseOrigamiController status = sale.update_attributes(customer_id: customer_id) sale.sale_orders.each do |sale_order| order = Order.find(sale_order.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @@ -82,7 +83,7 @@ class Origami::CustomersController < BaseOrigamiController @orders.each do |bo| order = Order.find(bo.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9f4ae9f7..1e47af6f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -91,7 +91,7 @@ class Sale < ApplicationRecord add_item(item) end - # link_order_sale(order.id) + link_order_sale(order.id) end self.save! diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 81e14467..824618e6 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,16 +1,19 @@ +
    <%= form_tag oqs_root_path, :method => :get do %> -
    - -
    +
    + +
    -
    - -
    -<% end %> +
    + +
    + + <% end %>
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index e3193a98..05094504 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -109,7 +109,7 @@ <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> - + <%end%> From 5a5e654dbcb78db75e995e06683e940d5894371b Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 15:26:04 +0630 Subject: [PATCH 49/71] move css to css file --- app/assets/stylesheets/settings.scss | 17 ++++++++++++++++- app/views/home/dashboard.html.erb | 5 ----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 37064f07..ba6ba39d 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -26,7 +26,22 @@ ul.dropdown-menu li a{ background-color: transparent !important; margin-bottom: 0px !important; } + .page-header{ border-bottom :0px solid #000 !important; margin :0px !important; -} \ No newline at end of file +} + +.card-block { + text-align:center; + background-color:#ddd; +} + +.footer { + position: fixed; + bottom: 0; + left: 0; + height: auto; + background-color: #ef404a; + width: 100%; + } \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index c2074720..82b99cf0 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -14,11 +14,6 @@ <% end %> <% shop = Shop.first %> - - - - -
    From ac47d7d8f03b165533448d54d5343f0c835326ea Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 15:57:34 +0630 Subject: [PATCH 50/71] update dashbiard ui --- app/assets/stylesheets/settings.scss | 11 ++++++-- app/views/home/dashboard.html.erb | 38 +++++++++++----------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index ba6ba39d..7c449de5 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -32,7 +32,7 @@ ul.dropdown-menu li a{ margin :0px !important; } -.card-block { +.center-text { text-align:center; background-color:#ddd; } @@ -44,4 +44,11 @@ ul.dropdown-menu li a{ height: auto; background-color: #ef404a; width: 100%; - } \ No newline at end of file + } + + .footer-header { + color : #ef404a; + font-weight:bold; + font-style:italic; + margin-bottom:0px; + } \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 82b99cf0..d9595c70 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -16,27 +16,19 @@ <% shop = Shop.first %>
    -
    -
    -
    -

    <%= shop.name %>

    -
    -
    - <%= shop.address %> -
    -
    - <%= shop.phone_no %> -
    - -
    +
    +
    +
    +

    + <%= shop.name %> +

    - +
    + <%= shop.address %> +
    +
    + <%= shop.phone_no %> +
    +
    +
    + \ No newline at end of file From 997cc0733c10ef7991bde879b611b867f8e6eb43 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 17:57:55 +0630 Subject: [PATCH 51/71] add item set and menu item set CRUD --- .../settings/menu_item_sets.coffee | 3 + .../stylesheets/settings/menu_item_sets.scss | 3 + .../settings/item_sets_controller.rb | 6 +- .../settings/menu_item_sets_controller.rb | 74 +++++++++ app/helpers/settings/menu_item_sets_helper.rb | 2 + app/models/item_set.rb | 2 + app/models/menu_item_set.rb | 5 + app/views/layouts/_header.html.erb | 2 + app/views/settings/item_sets/_form.html.erb | 8 +- app/views/settings/item_sets/edit.html.erb | 4 +- app/views/settings/item_sets/index.html.erb | 63 ++++---- app/views/settings/item_sets/new.html.erb | 2 +- app/views/settings/item_sets/show.html.erb | 45 ++++-- .../settings/menu_item_sets/_form.html.erb | 12 ++ .../_settings_menu_item_set.json.jbuilder | 2 + .../settings/menu_item_sets/edit.html.erb | 5 + .../settings/menu_item_sets/index.html.erb | 37 +++++ .../menu_item_sets/index.json.jbuilder | 1 + .../settings/menu_item_sets/new.html.erb | 5 + .../settings/menu_item_sets/show.html.erb | 32 ++++ .../menu_item_sets/show.json.jbuilder | 1 + config/routes.rb | 7 +- .../menu_item_sets_controller_spec.rb | 141 ++++++++++++++++++ .../settings/menu_item_sets_helper_spec.rb | 15 ++ spec/models/settings/menu_item_set_spec.rb | 5 + .../settings/settings_menu_item_sets_spec.rb | 10 ++ .../settings/menu_item_sets_routing_spec.rb | 39 +++++ .../menu_item_sets/edit.html.erb_spec.rb | 21 +++ .../menu_item_sets/index.html.erb_spec.rb | 22 +++ .../menu_item_sets/new.html.erb_spec.rb | 21 +++ .../menu_item_sets/show.html.erb_spec.rb | 16 ++ test/system/menu_item_sets_test.rb | 9 ++ 32 files changed, 563 insertions(+), 57 deletions(-) create mode 100644 app/assets/javascripts/settings/menu_item_sets.coffee create mode 100644 app/assets/stylesheets/settings/menu_item_sets.scss create mode 100644 app/controllers/settings/menu_item_sets_controller.rb create mode 100644 app/helpers/settings/menu_item_sets_helper.rb create mode 100644 app/views/settings/menu_item_sets/_form.html.erb create mode 100644 app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder create mode 100644 app/views/settings/menu_item_sets/edit.html.erb create mode 100644 app/views/settings/menu_item_sets/index.html.erb create mode 100644 app/views/settings/menu_item_sets/index.json.jbuilder create mode 100644 app/views/settings/menu_item_sets/new.html.erb create mode 100644 app/views/settings/menu_item_sets/show.html.erb create mode 100644 app/views/settings/menu_item_sets/show.json.jbuilder create mode 100644 spec/controllers/settings/menu_item_sets_controller_spec.rb create mode 100644 spec/helpers/settings/menu_item_sets_helper_spec.rb create mode 100644 spec/models/settings/menu_item_set_spec.rb create mode 100644 spec/requests/settings/settings_menu_item_sets_spec.rb create mode 100644 spec/routing/settings/menu_item_sets_routing_spec.rb create mode 100644 spec/views/settings/menu_item_sets/edit.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/index.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/new.html.erb_spec.rb create mode 100644 spec/views/settings/menu_item_sets/show.html.erb_spec.rb create mode 100644 test/system/menu_item_sets_test.rb diff --git a/app/assets/javascripts/settings/menu_item_sets.coffee b/app/assets/javascripts/settings/menu_item_sets.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/menu_item_sets.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/settings/menu_item_sets.scss b/app/assets/stylesheets/settings/menu_item_sets.scss new file mode 100644 index 00000000..7f56c1b8 --- /dev/null +++ b/app/assets/stylesheets/settings/menu_item_sets.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Settings/Menu_item_sets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index ace39027..5c089c31 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -28,7 +28,7 @@ class Settings::ItemSetsController < ApplicationController respond_to do |format| if @settings_item_set.save - format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' } + format.html { redirect_to settings_item_sets_path, notice: 'Item set was successfully created.' } format.json { render :show, status: :created, location: @settings_item_set } else format.html { render :new } @@ -42,7 +42,7 @@ class Settings::ItemSetsController < ApplicationController def update respond_to do |format| if @settings_item_set.update(settings_item_set_params) - format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' } + format.html { redirect_to settings_item_sets_path, notice: 'Item set was successfully updated.' } format.json { render :show, status: :ok, location: @settings_item_set } else format.html { render :edit } @@ -69,6 +69,6 @@ class Settings::ItemSetsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_item_set_params - params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + params.require(:item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) end end diff --git a/app/controllers/settings/menu_item_sets_controller.rb b/app/controllers/settings/menu_item_sets_controller.rb new file mode 100644 index 00000000..917e5330 --- /dev/null +++ b/app/controllers/settings/menu_item_sets_controller.rb @@ -0,0 +1,74 @@ +class Settings::MenuItemSetsController < ApplicationController + before_action :set_settings_menu_item_set, only: [:show, :edit, :update, :destroy] + + # GET /settings/menu_item_sets + # GET /settings/menu_item_sets.json + def index + @settings_menu_item_sets = MenuItemSet.all + end + + # GET /settings/menu_item_sets/1 + # GET /settings/menu_item_sets/1.json + def show + end + + # GET /settings/menu_item_sets/new + def new + @settings_menu_item_set = MenuItemSet.new + end + + # GET /settings/menu_item_sets/1/edit + def edit + end + + # POST /settings/menu_item_sets + # POST /settings/menu_item_sets.json + def create + @settings_menu_item_set = MenuItemSet.new(settings_menu_item_set_params) + + respond_to do |format| + if @settings_menu_item_set.save + format.html { redirect_to settings_menu_item_sets_path, notice: 'Menu item set was successfully created.' } + format.json { render :show, status: :created, location: @settings_menu_item_set } + else + format.html { render :new } + format.json { render json: @settings_menu_item_set.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/menu_item_sets/1 + # PATCH/PUT /settings/menu_item_sets/1.json + def update + respond_to do |format| + if @settings_menu_item_set.update(settings_menu_item_set_params) + format.html { redirect_to settings_menu_item_sets_path, notice: 'Menu item set was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_menu_item_set } + else + format.html { render :edit } + format.json { render json: @settings_menu_item_set.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/menu_item_sets/1 + # DELETE /settings/menu_item_sets/1.json + def destroy + @settings_menu_item_set.destroy + respond_to do |format| + format.html { redirect_to settings_menu_item_sets_url, notice: 'Menu item set was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_menu_item_set + @settings_menu_item_set = MenuItemSet.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_menu_item_set_params + params.require(:menu_item_set).permit(:item_set_id, :menu_item_id) + end +end diff --git a/app/helpers/settings/menu_item_sets_helper.rb b/app/helpers/settings/menu_item_sets_helper.rb new file mode 100644 index 00000000..3e909848 --- /dev/null +++ b/app/helpers/settings/menu_item_sets_helper.rb @@ -0,0 +1,2 @@ +module Settings::MenuItemSetsHelper +end diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 55bc0c6b..e4dca315 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -4,4 +4,6 @@ class ItemSet < ApplicationRecord has_many :menu_instance_item_sets has_many :menu_item_instances, through: :menu_instance_item_sets + + validates_presence_of :name end diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb index a39b8522..7cd94bcb 100644 --- a/app/models/menu_item_set.rb +++ b/app/models/menu_item_set.rb @@ -2,3 +2,8 @@ class MenuItemSet < ApplicationRecord belongs_to :item_set belongs_to :menu_item end + +# class Settings::MenuItemSet < ApplicationRecord +# belongs_to :item_set_id +# belongs_to :menu_item_id +# end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bc5ce498..3a25b101 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -13,6 +13,8 @@
  • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
  • <%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Item Sets ", settings_item_sets_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Menu Item Sets ", settings_menu_item_sets_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %>
  • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index 4e2760cd..e28cab09 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -1,13 +1,13 @@ -<%= simple_form_for(@settings_item_set) do |f| %> +<%= simple_form_for([:settings,@settings_item_set]) do |f| %> <%= f.error_notification %>
    <%= f.input :name %> - <%= f.input :min_selectable_qty %> - <%= f.input :max_selectable_qty %> + <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %> + <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
    - <%= f.button :submit %> + <%= f.button :submit ,:class=>'btn btn-success'%>
    <% end %> diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index 75a7f10a..2f0d54ba 100644 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -1,6 +1,4 @@

    Editing Settings Item Set

    <%= render 'form', settings_item_set: @settings_item_set %> - -<%= link_to 'Show', @settings_item_set %> | -<%= link_to 'Back', settings_item_sets_path %> +<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index f5b50ad6..80db10b9 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -1,31 +1,38 @@ -

    <%= notice %>

    - -

    Settings Item Sets

    - - - - - - - - - - - - - <% @settings_item_sets.each do |settings_item_set| %> - - - - - - - - - <% end %> - -
    NameMin selectable qtyMax selectable qty
    <%= settings_item_set.name %><%= settings_item_set.min_selectable_qty %><%= settings_item_set.max_selectable_qty %><%= link_to 'Show', settings_item_set %><%= link_to 'Edit', edit_settings_item_set_path(settings_item_set) %><%= link_to 'Destroy', settings_item_set, method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
      +
    • Home
      • +
    • Item Set
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_item_set_path,:class => 'btn btn-primary btn-md' %> + +
    +

    +
    + + + + + + + + + + + + <% @settings_item_sets.each do |item| %> + + + + + + + <% end %> + + +
    NameMin selectable qtyMax selectable qtyAction
    <%= item.name %><%= item.min_selectable_qty %><%= item.max_selectable_qty %><%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to 'Edit', edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
    +
    -<%= link_to 'New Settings Item Set', new_settings_item_set_path %> diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index a2773f42..ff581dc6 100644 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -2,4 +2,4 @@ <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path %> +<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index 5f7b01d0..f863b5fc 100644 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -1,19 +1,34 @@ -

    <%= notice %>

    -

    - Name: - <%= @settings_item_set.name %> -

    +
    +
      +
    • Home
      • +
    • Item Set
      • -

      - Min selectable qty: - <%= @settings_item_set.min_selectable_qty %> -

      + + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    Name:<%= @settings_item_set.name %>
    Min selectable qty: <%= @settings_item_set.min_selectable_qty %>
    Max selectable qty:<%= @settings_item_set.max_selectable_qty %>
    + <%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set),:class=>'btn btn-primary' %> + <%= link_to 'Back', settings_item_sets_path,:class=>'btn btn-danger' %> +
    -

    - Max selectable qty: - <%= @settings_item_set.max_selectable_qty %> -

    -<%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set) %> | -<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb new file mode 100644 index 00000000..c0d239b4 --- /dev/null +++ b/app/views/settings/menu_item_sets/_form.html.erb @@ -0,0 +1,12 @@ +<%= simple_form_for([:settings,@settings_menu_item_set]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.association :item_set %> + <%= f.association :menu_item %> +
    + +
    + <%= f.button :submit,:class=>'btn btn-success' %> +
    +<% end %> diff --git a/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder b/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder new file mode 100644 index 00000000..76c133fe --- /dev/null +++ b/app/views/settings/menu_item_sets/_settings_menu_item_set.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_menu_item_set, :id, :item_set_id_id, :menu_item_id_id, :created_at, :updated_at +json.url settings_menu_item_set_url(settings_menu_item_set, format: :json) diff --git a/app/views/settings/menu_item_sets/edit.html.erb b/app/views/settings/menu_item_sets/edit.html.erb new file mode 100644 index 00000000..ddd912ce --- /dev/null +++ b/app/views/settings/menu_item_sets/edit.html.erb @@ -0,0 +1,5 @@ +

    Editing Settings Menu Item Set

    + +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> + +<%= link_to 'Back', settings_menu_item_sets_path,:class => 'btn btn-danger' %> \ No newline at end of file diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb new file mode 100644 index 00000000..dfa94bcc --- /dev/null +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -0,0 +1,37 @@ + +
    +
      +
    • Home
      • +
    • Menu Item Set
      • + + <%= link_to 'New Settings Menu Item Set', new_settings_menu_item_set_path ,:class=>'btn btn-primary btn-sm pull-right'%> +
    +
    + +
    +
    + + + + + + + + + + + <% @settings_menu_item_sets.each do |item| %> + + + + + + <% end %> + +
    Item setMenu item
    <%= item.item_set.name %><%= item.menu_item_id %><%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
    + +
    + + diff --git a/app/views/settings/menu_item_sets/index.json.jbuilder b/app/views/settings/menu_item_sets/index.json.jbuilder new file mode 100644 index 00000000..3ac7917b --- /dev/null +++ b/app/views/settings/menu_item_sets/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_menu_item_sets, partial: 'settings_menu_item_sets/settings_menu_item_set', as: :settings_menu_item_set diff --git a/app/views/settings/menu_item_sets/new.html.erb b/app/views/settings/menu_item_sets/new.html.erb new file mode 100644 index 00000000..259e7bed --- /dev/null +++ b/app/views/settings/menu_item_sets/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Menu Item Set

    + +<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> + +<%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb new file mode 100644 index 00000000..f7353ca3 --- /dev/null +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -0,0 +1,32 @@ +
    + +
    + +
    + + + + + + + + + + + + + + + + +
    Name:<%= @settings_menu_item_set.item_set_id %>
    Min selectable qty:<%= @settings_menu_item_set.menu_item_id %>
    Create At<%= @settings_menu_item_set.created_at %>
    + <%= link_to 'Edit', edit_settings_menu_item_set_path(@settings_menu_item_set),:class=>'btn btn-primary' %> + <%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> +
    + diff --git a/app/views/settings/menu_item_sets/show.json.jbuilder b/app/views/settings/menu_item_sets/show.json.jbuilder new file mode 100644 index 00000000..4cb1ec44 --- /dev/null +++ b/app/views/settings/menu_item_sets/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_menu_item_sets/settings_menu_item_set", settings_menu_item_set: @settings_menu_item_set diff --git a/config/routes.rb b/config/routes.rb index bebb89bf..9dc1c2f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :item_sets - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -219,6 +216,10 @@ Rails.application.routes.draw do resources :menu_categories, only: [:new, :create, :edit,:delete] end + resources :item_sets + + resources :menu_item_sets + #accounts resources :accounts diff --git a/spec/controllers/settings/menu_item_sets_controller_spec.rb b/spec/controllers/settings/menu_item_sets_controller_spec.rb new file mode 100644 index 00000000..e2446dbb --- /dev/null +++ b/spec/controllers/settings/menu_item_sets_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Settings::MenuItemSetsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::MenuItemSet. As you add validations to Settings::MenuItemSet, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Settings::MenuItemSetsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :show, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + get :edit, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Settings::MenuItemSet" do + expect { + post :create, params: {settings_menu_item_set: valid_attributes}, session: valid_session + }.to change(Settings::MenuItemSet, :count).by(1) + end + + it "redirects to the created settings_menu_item_set" do + post :create, params: {settings_menu_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::MenuItemSet.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {settings_menu_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: new_attributes}, session: valid_session + menu_item_set.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(menu_item_set) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + put :update, params: {id: menu_item_set.to_param, settings_menu_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_menu_item_set" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + expect { + delete :destroy, params: {id: menu_item_set.to_param}, session: valid_session + }.to change(Settings::MenuItemSet, :count).by(-1) + end + + it "redirects to the settings_menu_item_sets list" do + menu_item_set = Settings::MenuItemSet.create! valid_attributes + delete :destroy, params: {id: menu_item_set.to_param}, session: valid_session + expect(response).to redirect_to(settings_menu_item_sets_url) + end + end + +end diff --git a/spec/helpers/settings/menu_item_sets_helper_spec.rb b/spec/helpers/settings/menu_item_sets_helper_spec.rb new file mode 100644 index 00000000..04329a19 --- /dev/null +++ b/spec/helpers/settings/menu_item_sets_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::MenuItemSetsHelper. For example: +# +# describe Settings::MenuItemSetsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::MenuItemSetsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/menu_item_set_spec.rb b/spec/models/settings/menu_item_set_spec.rb new file mode 100644 index 00000000..e53b1208 --- /dev/null +++ b/spec/models/settings/menu_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::MenuItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/settings/settings_menu_item_sets_spec.rb b/spec/requests/settings/settings_menu_item_sets_spec.rb new file mode 100644 index 00000000..a0d9776c --- /dev/null +++ b/spec/requests/settings/settings_menu_item_sets_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::MenuItemSets", type: :request do + describe "GET /settings_menu_item_sets" do + it "works! (now write some real specs)" do + get settings_menu_item_sets_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/settings/menu_item_sets_routing_spec.rb b/spec/routing/settings/menu_item_sets_routing_spec.rb new file mode 100644 index 00000000..f319e6e6 --- /dev/null +++ b/spec/routing/settings/menu_item_sets_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::MenuItemSetsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/menu_item_sets").to route_to("settings/menu_item_sets#index") + end + + it "routes to #new" do + expect(:get => "/settings/menu_item_sets/new").to route_to("settings/menu_item_sets#new") + end + + it "routes to #show" do + expect(:get => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/menu_item_sets/1/edit").to route_to("settings/menu_item_sets#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/menu_item_sets").to route_to("settings/menu_item_sets#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/menu_item_sets/1").to route_to("settings/menu_item_sets#destroy", :id => "1") + end + + end +end diff --git a/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb b/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb new file mode 100644 index 00000000..044ebf7d --- /dev/null +++ b/spec/views/settings/menu_item_sets/edit.html.erb_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/edit", type: :view do + before(:each) do + @settings_menu_item_set = assign(:settings_menu_item_set, Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders the edit settings_menu_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_menu_item_set_path(@settings_menu_item_set), "post" do + + assert_select "input[name=?]", "settings_menu_item_set[item_set_id_id]" + + assert_select "input[name=?]", "settings_menu_item_set[menu_item_id_id]" + end + end +end diff --git a/spec/views/settings/menu_item_sets/index.html.erb_spec.rb b/spec/views/settings/menu_item_sets/index.html.erb_spec.rb new file mode 100644 index 00000000..efbb5448 --- /dev/null +++ b/spec/views/settings/menu_item_sets/index.html.erb_spec.rb @@ -0,0 +1,22 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/index", type: :view do + before(:each) do + assign(:settings_menu_item_sets, [ + Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + ), + Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + ) + ]) + end + + it "renders a list of settings/menu_item_sets" do + render + assert_select "tr>td", :text => nil.to_s, :count => 2 + assert_select "tr>td", :text => nil.to_s, :count => 2 + end +end diff --git a/spec/views/settings/menu_item_sets/new.html.erb_spec.rb b/spec/views/settings/menu_item_sets/new.html.erb_spec.rb new file mode 100644 index 00000000..e755cff1 --- /dev/null +++ b/spec/views/settings/menu_item_sets/new.html.erb_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/new", type: :view do + before(:each) do + assign(:settings_menu_item_set, Settings::MenuItemSet.new( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders new settings_menu_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_menu_item_sets_path, "post" do + + assert_select "input[name=?]", "settings_menu_item_set[item_set_id_id]" + + assert_select "input[name=?]", "settings_menu_item_set[menu_item_id_id]" + end + end +end diff --git a/spec/views/settings/menu_item_sets/show.html.erb_spec.rb b/spec/views/settings/menu_item_sets/show.html.erb_spec.rb new file mode 100644 index 00000000..ca9e5d5c --- /dev/null +++ b/spec/views/settings/menu_item_sets/show.html.erb_spec.rb @@ -0,0 +1,16 @@ +require 'rails_helper' + +RSpec.describe "settings/menu_item_sets/show", type: :view do + before(:each) do + @settings_menu_item_set = assign(:settings_menu_item_set, Settings::MenuItemSet.create!( + :item_set_id => nil, + :menu_item_id => nil + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(//) + expect(rendered).to match(//) + end +end diff --git a/test/system/menu_item_sets_test.rb b/test/system/menu_item_sets_test.rb new file mode 100644 index 00000000..35949a53 --- /dev/null +++ b/test/system/menu_item_sets_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::MenuItemSetsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_menu_item_sets_url + # + # assert_selector "h1", text: "Settings::MenuItemSet" + # end +end From f018a56027c317eec2ec093564ab23b37cf18455 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 18:53:39 +0630 Subject: [PATCH 52/71] add CarrierWave gems for menu image upload --- Gemfile | 3 +++ Gemfile.lock | 5 ++++ .../settings/simple_menu_items_controller.rb | 5 ++-- app/models/menu_item.rb | 3 +++ .../settings/set_menu_items/_form.html.erb | 27 ++++++++++++------- .../settings/simple_menu_items/_form.html.erb | 27 ++++++++++++------- .../settings/simple_menu_items/new.html.erb | 1 - config/application.rb | 2 ++ 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index fa2990ad..67348308 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,9 @@ gem 'tether-rails' gem "font-awesome-rails" gem 'rack-cors' +# image upload +gem 'carrierwave', '~> 1.0' + #Report and Printing gems gem 'cups', '~> 0.0.7' gem 'prawn' diff --git a/Gemfile.lock b/Gemfile.lock index ba8f6a0c..45b9b826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,10 @@ GEM builder (3.2.3) byebug (9.0.6) cancancan (1.17.0) + carrierwave (1.1.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) chronic (0.10.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -250,6 +254,7 @@ DEPENDENCIES bootstrap-datepicker-rails byebug cancancan (~> 1.10) + carrierwave (~> 1.0) coffee-rails (~> 4.2) cups (~> 0.0.7) database_cleaner diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 05952d0d..526ef248 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -16,7 +16,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/new def new - @settings_menu_item = MenuItem.new + @settings_menu_item = MenuItem.new end # GET /settings/menu_items/1/edit @@ -27,6 +27,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # POST /settings/menu_items.json def create @settings_menu_item = MenuItem.new(settings_menu_item_params) + # @settings_menu_item.image_path = params[:image_path] if params[:simple_menu_item][:menu_item_id] == '' @settings_menu_item.menu_category_id = params[:menu_category_id] end @@ -78,6 +79,6 @@ class Settings::SimpleMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..569d3126 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -15,6 +15,9 @@ class MenuItem < ApplicationRecord scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') } scope :set_menu_item, -> { where(type: 'SetMenuItem') } + # Item Image Uploader + mount_uploader :image_path, MenuItemImageUploader + def self.collection MenuItem.select("id, name").map { |e| [e.name, e.id] } end diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index aeae0f5c..aef41ab1 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,17 +1,24 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> +

    +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %> +
    +
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> +
    +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> + <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> + <%= f.input :min_qty %> + <%= f.input :min_selectable_item %> + <%= f.input :max_selectable_item %> +
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 01c5b482..9b90fec8 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,16 +1,23 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> +
    +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %> +
    +
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
    +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> + <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> + <%= f.input :min_qty %> + <%= f.input :min_selectable_item %> + <%= f.input :max_selectable_item %> +
    diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index 5781850d..9e18525b 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -2,7 +2,6 @@ <%= render 'form', settings_menu_item: @settings_menu_item %>--> -
      diff --git a/config/application.rb b/config/application.rb index 7e16975c..78ff63dc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,6 +6,8 @@ require 'rails/all' # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) +require 'carrierwave/orm/activerecord' + module SXRestaurants class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. From 3bfc7f0f53ef26d771559a95d82194050dadce7b Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 18:53:54 +0630 Subject: [PATCH 53/71] add CarrierWave gems for menu image upload --- app/uploaders/menu_item_image_uploader.rb | 50 ++++++++++++++++++ .../image/menu_images/icons8-Food-100.png | Bin 0 -> 5031 bytes 2 files changed, 50 insertions(+) create mode 100644 app/uploaders/menu_item_image_uploader.rb create mode 100644 public/public/image/menu_images/icons8-Food-100.png diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb new file mode 100644 index 00000000..b35b6a6c --- /dev/null +++ b/app/uploaders/menu_item_image_uploader.rb @@ -0,0 +1,50 @@ +class MenuItemImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "public/image/menu_images" + # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url(*args) + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process scale: [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process resize_to_fit: [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + def extension_whitelist + %w(jpg jpeg gif png) + end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/public/public/image/menu_images/icons8-Food-100.png b/public/public/image/menu_images/icons8-Food-100.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 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 Date: Tue, 15 Aug 2017 10:16:25 +0630 Subject: [PATCH 54/71] update receipt bill pdf for foc and credit --- app/pdf/receipt_bill_pdf.rb | 39 ++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 1dbea502..00ef0a7b 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -54,8 +54,9 @@ class ReceiptBillPdf < Prawn::Document end items_account(item_price_by_accounts,printer_settings.precision,delimiter) + + sign(sale_data) - footer(printed_status) end @@ -409,6 +410,42 @@ class ReceiptBillPdf < Prawn::Document end end + def sign(sale_data) + SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment| + if payment.payment_method == "creditnote" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 38 + text "Approved By" , :size => self.item_font_size,:align => :center + end + end + end + if sale_data.sale_status == "FOC" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do + move_down 38 + text "Acknowledged By", :size => self.item_font_size,:align => :center + end + end + + end + def footer(printed_status) move_down 5 stroke_horizontal_rule From 655b3ccef9127e43c8f755f6d750a9db8548df7b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 14:26:22 +0630 Subject: [PATCH 55/71] update menu item --- app/views/settings/menu_item_sets/index.html.erb | 2 +- app/views/settings/menu_item_sets/show.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index dfa94bcc..95b5dbe9 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -23,7 +23,7 @@ <% @settings_menu_item_sets.each do |item| %> <%= item.item_set.name %> - <%= item.menu_item_id %> + <%= item.menu_item.name %> <%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb index f7353ca3..a22b2cdb 100644 --- a/app/views/settings/menu_item_sets/show.html.erb +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -13,12 +13,12 @@ - Name: - <%= @settings_menu_item_set.item_set_id %> + Item Set Name: + <%= @settings_menu_item_set.item_set.name %> - Min selectable qty: - <%= @settings_menu_item_set.menu_item_id %> + Menu Item Name: + <%= @settings_menu_item_set.menu_item.name %> Create At From e4a2d58e5e5749a2b5d0c8ce291f6ab4462f4926 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 15:14:55 +0630 Subject: [PATCH 56/71] update foc and pdf --- .../origami/payments_controller.rb | 29 ++++++++ app/controllers/origami/shifts_controller.rb | 2 - app/models/ability.rb | 8 +-- app/models/sale_payment.rb | 26 ++++++- app/models/shift_sale.rb | 3 +- app/pdf/close_cashier_pdf.rb | 8 +++ app/pdf/receipt_bill_pdf.rb | 23 +++--- app/views/origami/payments/show.html.erb | 72 ++++++++++++++----- .../origami/shifts/sale_summary.html.erb | 6 ++ config/routes.rb | 8 ++- 10 files changed, 146 insertions(+), 39 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 8c328030..109138a5 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -163,6 +163,35 @@ class Origami::PaymentsController < BaseOrigamiController printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print") end + def foc + cash = params[:cash] + sale_id = params[:sale_id] + sub_total = params[:sub_total] + member_info = nil + rebate_amount = nil + + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + sale_payment.process_payment(saleObj, @user, cash, "foc") + + unique_code = "ReceiptBillPdf" + customer= Customer.find(saleObj.customer_id) + + #shop detail + shop_details = Shop.find(1) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + # Calculate Food and Beverage Total + item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) + discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC") + end + end + def rounding_adj saleObj = Sale.find(params[:sale_id]) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e134a594..31c68edf 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -66,8 +66,6 @@ class Origami::ShiftsController < BaseOrigamiController @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') #other payment details for mpu or visa like card @other_payment = ShiftSale.get_by_shift_other_payment(@shift) - #t details for mpu or visa like card - @other_payment = ShiftSale.get_by_shift_other_payment(@shift) # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..7b9ba1de 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -56,6 +56,8 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment + can :move_dining, :movetable can :moving, :movetable @@ -96,17 +98,13 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment can :move_dining, :movetable can :moving, :movetable can :move_dining, :moveroom - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment - can :manage, DiningQueue elsif user.role == "account" diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ff2f6e2f..3435190d 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -46,6 +46,8 @@ class SalePayment < ApplicationRecord payment_status = giftcard_payment when "paypar" payment_status = paypar_payment + when "foc" + payment_status = foc_payment else puts "it was something else" end @@ -164,6 +166,17 @@ class SalePayment < ApplicationRecord return payment_status end + def foc_payment + payment_status = false + self.payment_method = "foc" + self.payment_amount = self.received_amount + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f + self.payment_status = "paid" + payment_method = self.save! + sale_update_payment_status(self.received_amount) + return payment_status + end + def creditnote_payment(customer_id) payment_status = false @@ -257,11 +270,15 @@ class SalePayment < ApplicationRecord all_received_amount = 0.0 sObj = Sale.find(self.sale_id) is_credit = 0 + is_foc = 0 sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f if spay.payment_method == "creditnote" is_credit = 1 end + if spay.payment_method == "foc" + is_foc = 1 + end end if (self.sale.grand_total <= all_received_amount) if is_credit == 0 @@ -269,9 +286,16 @@ class SalePayment < ApplicationRecord else self.sale.payment_status = "outstanding" end + + if is_foc == 0 + self.sale.payment_status = "paid" + else + self.sale.payment_status = "foc" + end + self.sale.sale_status = "completed" - if MembershipSetting.find_by_rebate(1) + if MembershipSetting.find_by_rebate(1) && is_foc == 0 response = rebat(sObj) if !response.nil? diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 168e63ff..68c64cff 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -105,7 +105,8 @@ class ShiftSale < ApplicationRecord SUM(case when (sale_payments.payment_method='mpu') then (sale_payments.payment_amount) else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='visa') then (sale_payments.payment_amount) else 0 end) as visa_amount, SUM(case when (sale_payments.payment_method='master') then (sale_payments.payment_amount) else 0 end) as master_amount, - SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount, SUM(case when (sale_payments.payment_method='paypar') then (sale_payments.payment_amount) else 0 end) as paypar_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 51f905d6..73db5e9d 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -223,6 +223,14 @@ class CloseCashierPdf < Prawn::Document text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "FOC :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.foc_amount.round(2)}", :size => self.item_font_size, :align => :right + end + end else diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 00ef0a7b..de18adc9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -418,32 +418,33 @@ class ReceiptBillPdf < Prawn::Document stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 + move_down 70 stroke_horizontal_rule end bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 38 + move_down 73 text "Approved By" , :size => self.item_font_size,:align => :center end end end - if sale_data.sale_status == "FOC" + if sale_data.payment_status == "foc" y_position = cursor stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 - stroke_horizontal_rule - end - - bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do - move_down 38 - text "Acknowledged By", :size => self.item_font_size,:align => :center + move_down 70 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Acknowledged By" , :size => self.item_font_size,:align => :center end end + end def footer(printed_status) @@ -453,7 +454,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do - text "#{printed_status}", :size => self.item_font_size,:align => :left + text "#{printed_status}",:style => :bold, :size => self.header_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 83373b8e..68f843a7 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -41,24 +41,24 @@ <% sub_total = 0 count = 0 %> - <% @sale_data.sale_items.each do |sale_item| + <% @sale_data.sale_items.each do |sale_item| count += 1 %> - <% sub_total += sale_item.price%> - + <% sub_total += sale_item.price%> + <%= count %> - - <%=sale_item.product_name%>@<%=sale_item.unit_price%> - - - <%=sale_item.qty%> - - - <%=(sale_item.price)%> - - - <%end %> + + <%=sale_item.product_name%>@<%=sale_item.unit_price%> + + + <%=sale_item.qty%> + + + <%=(sale_item.price)%> + + + <%end %>
    @@ -75,7 +75,7 @@ <%else%> (Discount) <%end%> - + (<%=@sale_data.total_discount rescue 0%>) @@ -258,7 +258,7 @@ - +
    @@ -443,4 +443,44 @@ function update_balance(){ $('#balance').text(result.toFixed(2)); } +$('#foc').click(function() { + + $( "#loading_wrapper" ).show(); + // payment + var cash = $('#amount_due').text(); + var sub_total = $('#sub-total').text(); + var sale_id = $('#sale_id').text(); + var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total }; + $.ajax({type: "POST", + url: "<%= origami_payment_foc_path %>", + data: params, + success:function(result){ + localStorage.removeItem("cash"); + if (result.status) { + var msg = result.message; + } + else{ + var msg = ''; + } + $( "#loading_wrapper" ).hide(); + + $.confirm({ + title: 'Infomation!', + content: 'Thank you !', + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami'; + } + } + } + }); + + } + }); + + }); + \ No newline at end of file diff --git a/app/views/origami/shifts/sale_summary.html.erb b/app/views/origami/shifts/sale_summary.html.erb index 94e59924..ad9631a0 100644 --- a/app/views/origami/shifts/sale_summary.html.erb +++ b/app/views/origami/shifts/sale_summary.html.erb @@ -153,6 +153,12 @@ <%=other.paypar_amount.round(2) rescue 0.0 %> <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %> + + + FOC + <%=other.foc_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.foc_amount rescue 0.0 %> + <%end%> diff --git a/config/routes.rb b/config/routes.rb index bebb89bf..4286303d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :item_sets - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -133,6 +130,7 @@ Rails.application.routes.draw do get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' } get 'sale/:sale_id/payment' => 'payments#show' + post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' } post 'payment/cash' => 'payments#create' post 'payment/mpu' => "mpu#create" post 'payment/jcb' => "jcb#create" @@ -219,6 +217,10 @@ Rails.application.routes.draw do resources :menu_categories, only: [:new, :create, :edit,:delete] end + resources :item_sets + + resources :menu_item_sets + #accounts resources :accounts From e69eeadb6efb297f3e99865918e633132a548fdd Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 15 Aug 2017 16:27:40 +0630 Subject: [PATCH 57/71] add bootstrap file input and menu item img implemented --- app/assets/javascripts/application.js | 46 +++++++++++++----- app/assets/javascripts/fileinput.min.js | 12 +++++ app/assets/stylesheets/fileinput.min.css | 12 +++++ app/assets/stylesheets/settings.scss | 5 ++ .../settings/set_menu_items_controller.rb | 6 +-- .../settings/simple_menu_items_controller.rb | 5 +- app/uploaders/menu_item_image_uploader.rb | 10 +++- app/views/layouts/application.html.erb | 8 +-- .../settings/set_menu_items/_form.html.erb | 11 ++++- .../settings/simple_menu_items/_form.html.erb | 11 ++++- config/initializers/assets.rb | 6 +++ config/initializers/carrier_wave.rb | 1 + public/image/menu_images/default.png | Bin 0 -> 5031 bytes 13 files changed, 111 insertions(+), 22 deletions(-) create mode 100755 app/assets/javascripts/fileinput.min.js create mode 100755 app/assets/stylesheets/fileinput.min.css create mode 100644 config/initializers/carrier_wave.rb create mode 100644 public/image/menu_images/default.png diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1b22af09..bd7c9761 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,25 +20,47 @@ //= require jquery-ui //= require bootstrap-datepicker -$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ +$(document).on('turbolinks:load', function() { + $('.datepicker').datepicker({ + format : 'dd-mm-yyyy', + autoclose: true + }); + $('.datepicker').attr('ReadOnly','true'); + $('.datepicker').css('cursor','pointer'); + + // Image Upload + $("#simple_menu_item_image_path").fileinput({ + previewFileType: "image", + allowedFileExtensions: ["jpg", "gif", "png"], + browseClass: "btn btn-success", + browseLabel: "Pick Image", + browseIcon: " ", + removeClass: "btn btn-danger", + removeLabel: "Delete", + removeIcon: " ", + showUpload: false, + // uploadClass: "btn btn-info", + // uploadLabel: "Upload", + // uploadIcon: " ", + previewTemplates: { + image: '
    \n' + + ' {caption}\n' + + '
    \n', + } + }); +}); + + $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); - $('.dropdown-toggle').dropdown(); + $('.dropdown-toggle').dropdown(); }); function export_to(path) { - var form_params = $("#frm_report").serialize(); - window.location = path+"?"+ form_params; + var form_params = $("#frm_report").serialize(); + window.location = path+"?"+ form_params; } - $(function () { - $('.datepicker').datepicker({ - format : 'dd-mm-yyyy', - autoclose: true - }); - $('.datepicker').attr('ReadOnly','true'); - $('.datepicker').css('cursor','pointer'); -}); diff --git a/app/assets/javascripts/fileinput.min.js b/app/assets/javascripts/fileinput.min.js new file mode 100755 index 00000000..d6d3ff94 --- /dev/null +++ b/app/assets/javascripts/fileinput.min.js @@ -0,0 +1,12 @@ +/*! + * bootstrap-fileinput v4.4.3 + * http://plugins.krajee.com/file-input + * + * Author: Kartik Visweswaran + * Copyright: 2014 - 2017, Kartik Visweswaran, Krajee.com + * + * Licensed under the BSD 3-Clause + * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md + */!function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof module&&module.exports?module.exports=e(require("jquery")):e(window.jQuery)}(function(e){"use strict";e.fn.fileinputLocales={},e.fn.fileinputThemes={},String.prototype.setTokens=function(e){var i,t,a=this.toString();for(i in e)e.hasOwnProperty(i)&&(t=new RegExp("{"+i+"}","g"),a=a.replace(t,e[i]));return a};var i,t;i={FRAMES:".kv-preview-thumb",SORT_CSS:"file-sortable",STYLE_SETTING:'style="width:{width};height:{height};"',OBJECT_PARAMS:'\n\n\n\n\n\n',DEFAULT_PREVIEW:'
    \n{previewFileIcon}\n
    ',MODAL_ID:"kvFileinputModal",MODAL_EVENTS:["show","shown","hide","hidden","loaded"],objUrl:window.URL||window.webkitURL,compare:function(e,i,t){return void 0!==e&&(t?e===i:e.match(i))},isIE:function(e){if("Microsoft Internet Explorer"!==navigator.appName)return!1;if(10===e)return new RegExp("msie\\s"+e,"i").test(navigator.userAgent);var i,t=document.createElement("div");return t.innerHTML="",i=t.getElementsByTagName("i").length,document.body.appendChild(t),t.parentNode.removeChild(t),i},initModal:function(i){var t=e("body");t.length&&i.appendTo(t)},isEmpty:function(i,t){return void 0===i||null===i||0===i.length||t&&""===e.trim(i)},isArray:function(e){return Array.isArray(e)||"[object Array]"===Object.prototype.toString.call(e)},ifSet:function(e,i,t){return t=t||"",i&&"object"==typeof i&&e in i?i[e]:t},cleanArray:function(e){return e instanceof Array||(e=[]),e.filter(function(e){return void 0!==e&&null!==e})},spliceArray:function(e,i){var t,a=0,n=[];if(!(e instanceof Array))return[];for(t=0;t=0?atob(e.split(",")[1]):decodeURIComponent(e.split(",")[1]),a=new ArrayBuffer(t.length),n=new Uint8Array(a),r=0;r/g,">").replace(/"/g,""").replace(/'/g,"'")},replaceTags:function(i,t){var a=i;return t?(e.each(t,function(e,i){"function"==typeof i&&(i=i()),a=a.split(e).join(i)}),a):a},cleanMemory:function(e){var t=e.is("img")?e.attr("src"):e.find("source").attr("src");i.objUrl.revokeObjectURL(t)},findFileName:function(e){var i=e.lastIndexOf("/");return-1===i&&(i=e.lastIndexOf("\\")),e.split(e.substring(i,i+1)).pop()},checkFullScreen:function(){return document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement},toggleFullScreen:function(e){var t=document,a=t.documentElement;a&&e&&!i.checkFullScreen()?a.requestFullscreen?a.requestFullscreen():a.msRequestFullscreen?a.msRequestFullscreen():a.mozRequestFullScreen?a.mozRequestFullScreen():a.webkitRequestFullscreen&&a.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT):t.exitFullscreen?t.exitFullscreen():t.msExitFullscreen?t.msExitFullscreen():t.mozCancelFullScreen?t.mozCancelFullScreen():t.webkitExitFullscreen&&t.webkitExitFullscreen()},moveArray:function(e,i,t){if(t>=e.length)for(var a=t-e.length;a--+1;)e.push(void 0);return e.splice(t,0,e.splice(i,1)[0]),e},cleanZoomCache:function(e){var i=e.closest(".kv-zoom-cache-theme");i.length||(i=e.closest(".kv-zoom-cache")),i.remove()},setOrientation:function(e,i){var t,a,n,r=new DataView(e),o=0,l=1;if(65496!==r.getUint16(o)||e.length<2)return void(i&&i());for(o+=2,t=r.byteLength;t-2>o;)switch(a=r.getUint16(o),o+=2,a){case 65505:n=r.getUint16(o),t=n-o,o+=2;break;case 274:l=r.getUint16(o+6,!1),t=0}i&&i(l)},validateOrientation:function(e,t){if(window.FileReader&&window.DataView){var a,n=new FileReader;n.onloadend=function(){a=n.result,i.setOrientation(a,t)},n.readAsArrayBuffer(e)}},adjustOrientedImage:function(e,i){var t,a,n;if(e.hasClass("is-portrait-gt4")){if(i)return void e.css({width:e.parent().height()});e.css({height:"auto",width:e.height()}),t=e.parent().offset().top,a=e.offset().top,n=t-a,e.css("margin-top",n)}}},t=function(t,a){var n=this;n.$element=e(t),n._validate()&&(n.isPreviewable=i.hasFileAPISupport(),n.isIE9=i.isIE(9),n.isIE10=i.isIE(10),n.isPreviewable||n.isIE9?(n._init(a),n._listen()):n.$element.removeClass("file-loading"))},t.prototype={constructor:t,_cleanup:function(){var e=this;e.reader=null,e.formdata={},e.uploadCount=0,e.uploadStatus={},e.uploadLog=[],e.uploadAsyncCount=0,e.loadedImages=[],e.totalImagesCount=0,e.ajaxRequests=[],e.clearStack(),e.fileInputCleared=!1,e.fileBatchCompleted=!0,e.isPreviewable||(e.showPreview=!1),e.isError=!1,e.ajaxAborted=!1,e.cancelling=!1},_init:function(t){var a,n,r,o=this,l=o.$element;o.options=t,e.each(t,function(e,t){switch(e){case"minFileCount":case"maxFileCount":case"minFileSize":case"maxFileSize":case"maxFilePreviewSize":case"resizeImageQuality":case"resizeIfSizeMoreThan":case"progressUploadThreshold":case"initialPreviewCount":case"zoomModalHeight":case"minImageHeight":case"maxImageHeight":case"minImageWidth":case"maxImageWidth":o[e]=i.getNum(t);break;default:o[e]=t}}),o.rtl&&(r=o.previewZoomButtonIcons.prev,o.previewZoomButtonIcons.prev=o.previewZoomButtonIcons.next,o.previewZoomButtonIcons.next=r),o._cleanup(),o.$form=l.closest("form"),o._initTemplateDefaults(),o.uploadFileAttr=i.isEmpty(l.attr("name"))?"file_data":l.attr("name"),n=o._getLayoutTemplate("progress"),o.progressTemplate=n.replace("{class}",o.progressClass),o.progressCompleteTemplate=n.replace("{class}",o.progressCompleteClass),o.progressErrorTemplate=n.replace("{class}",o.progressErrorClass),o.dropZoneEnabled=i.hasDragDropSupport()&&o.dropZoneEnabled,o.isDisabled=l.attr("disabled")||l.attr("readonly"),o.isDisabled&&l.attr("disabled",!0),o.isUploadable=i.hasFileUploadSupport()&&!i.isEmpty(o.uploadUrl),o.isClickable=o.browseOnZoneClick&&o.showPreview&&(o.isUploadable&&o.dropZoneEnabled||!i.isEmpty(o.defaultPreviewContent)),o.slug="function"==typeof t.slugCallback?t.slugCallback:o._slugDefault,o.mainTemplate=o.showCaption?o._getLayoutTemplate("main1"):o._getLayoutTemplate("main2"),o.captionTemplate=o._getLayoutTemplate("caption"),o.previewGenericTemplate=o._getPreviewTemplate("generic"),o.resizeImage&&(o.maxImageWidth||o.maxImageHeight)&&(o.imageCanvas=document.createElement("canvas"),o.imageCanvasContext=o.imageCanvas.getContext("2d")),i.isEmpty(l.attr("id"))&&l.attr("id",i.uniqId()),o.namespace=".fileinput_"+l.attr("id").replace(/-/g,"_"),void 0===o.$container?o.$container=o._createContainer():o._refreshContainer(),a=o.$container,o.$dropZone=a.find(".file-drop-zone"),o.$progress=a.find(".kv-upload-progress"),o.$btnUpload=a.find(".fileinput-upload"),o.$captionContainer=i.getElement(t,"elCaptionContainer",a.find(".file-caption")),o.$caption=i.getElement(t,"elCaptionText",a.find(".file-caption-name")),o.$previewContainer=i.getElement(t,"elPreviewContainer",a.find(".file-preview")),o.$preview=i.getElement(t,"elPreviewImage",a.find(".file-preview-thumbnails")),o.$previewStatus=i.getElement(t,"elPreviewStatus",a.find(".file-preview-status")),o.$errorContainer=i.getElement(t,"elErrorContainer",o.$previewContainer.find(".kv-fileinput-error")),i.isEmpty(o.msgErrorClass)||i.addCss(o.$errorContainer,o.msgErrorClass),o.$errorContainer.hide(),o.previewInitId="preview-"+i.uniqId(),o._initPreviewCache(),o._initPreview(!0),o._initPreviewActions(),o._setFileDropZoneTitle(),l.removeClass("file-loading"),l.attr("disabled")&&o.disable(),o._initZoom(),o.hideThumbnailContent&&i.addCss(o.$preview,"hide-content")},_initTemplateDefaults:function(){var t,a,n,r,o,l,s,d,c,u,p,f,m,v,h,g,w,_,b,C,y,T,E,x,F,S,I,k,P,z,A,$,D,U,j,B,L=this;t='{preview}\n
    \n
    \n {caption}\n
    \n {remove}\n {cancel}\n {upload}\n {browse}\n
    \n
    ',a='{preview}\n
    \n{remove}\n{cancel}\n{upload}\n{browse}\n',n='
    \n {close}
    \n
    \n
    \n
    \n
    \n
    \n
    ',o='
    ×
    \n',r='',l='
    \n
    \n
    \n',s='',d='{icon} {label}',c='
    {icon} {label}
    ',u='',p='
    \n
    \n
    \n
    {toggleheader}{fullscreen}{borderless}{close}
    \n

    {heading}

    \n
    \n
    \n
    \n
    \n{prev} {next}\n
    \n
    \n
    \n',f='
    \n
    \n {status}\n
    \n
    ',m=" ({sizeText})",v='
    \n
    {caption}
    {size}
    \n {progress} {indicator} {actions}\n
    ',h='{drag}\n
    \n
    \n {upload} {delete} {zoom} {other}
    \n
    \n
    ',g='\n',w='',_='',b='{dragIcon}',C='
    {indicator}
    ',y='
    \n',E=y+' title="{caption}">
    \n',x="
    {footer}\n
    \n",F="{content}\n",S='
    {data}
    \n",I='{caption}\n",k='\n",P='\n",z='
    \n",A='\n'+i.OBJECT_PARAMS+" "+i.DEFAULT_PREVIEW+"\n\n",$='\n\n'+i.OBJECT_PARAMS+" "+i.DEFAULT_PREVIEW+"\n\n",D='\n',U='
    \n'+i.DEFAULT_PREVIEW+"\n
    \n",j='',B={width:"100%",height:"100%","min-height":"480px"},L.defaults={layoutTemplates:{main1:t,main2:a,preview:n,close:o,fileIcon:r,caption:l,modalMain:u,modal:p,progress:f,size:m,footer:v,indicator:C,actions:h,actionDelete:g,actionUpload:w,actionZoom:_,actionDrag:b,btnDefault:s,btnLink:d,btnBrowse:c,zoomCache:j},previewMarkupTags:{tagBefore1:T,tagBefore2:E,tagAfter:x},previewContentTemplates:{generic:F,html:S,image:I,text:k,video:P,audio:z,flash:A,object:$,pdf:D,other:U},allowedPreviewTypes:["image","html","text","video","audio","flash","pdf","object"],previewTemplates:{},previewSettings:{image:{width:"auto",height:"160px"},html:{width:"213px",height:"160px"},text:{width:"213px",height:"160px"},video:{width:"auto",height:"100%","max-width":"100%"},audio:{width:"100%",height:"30px"},flash:{width:"auto",height:"100%","max-width":"100%"},object:{height:"100%"},pdf:{width:"160px",height:"160px"},other:{width:"160px",height:"160px"}},previewZoomSettings:{image:{width:"auto",height:"auto","max-width":"100%","max-height":"100%"},html:B,text:B,video:{width:"auto",height:"100%","max-width":"100%"},audio:{width:"100%",height:"30px"},flash:{width:"auto",height:"480px"},object:{width:"auto",height:"100%","max-width":"100%","min-height":"480px"},pdf:B,other:{width:"auto",height:"100%","min-height":"480px"}},fileTypeSettings:{image:function(e,t){return i.compare(e,"image.*")||i.compare(t,/\.(gif|png|jpe?g)$/i)},html:function(e,t){return i.compare(e,"text/html")||i.compare(t,/\.(htm|html)$/i)},text:function(e,t){return i.compare(e,"text.*")||i.compare(t,/\.(xml|javascript)$/i)||i.compare(t,/\.(txt|md|csv|nfo|ini|json|php|js|css)$/i)},video:function(e,t){return i.compare(e,"video.*")&&(i.compare(e,/(ogg|mp4|mp?g|mov|webm|3gp)$/i)||i.compare(t,/\.(og?|mp4|webm|mp?g|mov|3gp)$/i))},audio:function(e,t){return i.compare(e,"audio.*")&&(i.compare(t,/(ogg|mp3|mp?g|wav)$/i)||i.compare(t,/\.(og?|mp3|mp?g|wav)$/i))},flash:function(e,t){return i.compare(e,"application/x-shockwave-flash",!0)||i.compare(t,/\.(swf)$/i)},pdf:function(e,t){return i.compare(e,"application/pdf",!0)||i.compare(t,/\.(pdf)$/i)},object:function(){return!0},other:function(){return!0}},fileActionSettings:{showRemove:!0,showUpload:!0,showZoom:!0,showDrag:!0,removeIcon:'',removeClass:"btn btn-xs btn-default",removeTitle:"Remove file",uploadIcon:'',uploadClass:"btn btn-xs btn-default",uploadTitle:"Upload file",zoomIcon:'',zoomClass:"btn btn-xs btn-default",zoomTitle:"View Details",dragIcon:'',dragClass:"text-info",dragTitle:"Move / Rearrange",dragSettings:{},indicatorNew:'',indicatorSuccess:'',indicatorError:'',indicatorLoading:'',indicatorNewTitle:"Not uploaded yet",indicatorSuccessTitle:"Uploaded",indicatorErrorTitle:"Upload Error",indicatorLoadingTitle:"Uploading ..."}},e.each(L.defaults,function(i,t){return"allowedPreviewTypes"===i?void(void 0===L.allowedPreviewTypes&&(L.allowedPreviewTypes=t)):void(L[i]=e.extend(!0,{},t,L[i]))}),L._initPreviewTemplates()},_initPreviewTemplates:function(){var t,a=this,n=a.defaults,r=a.previewMarkupTags,o=r.tagAfter;e.each(n.previewContentTemplates,function(e,n){i.isEmpty(a.previewTemplates[e])&&(t=r.tagBefore2,"generic"!==e&&"image"!==e&&"html"!==e&&"text"!==e||(t=r.tagBefore1),a.previewTemplates[e]=t+n+o)})},_initPreviewCache:function(){var t=this;t.previewCache={data:{},init:function(){var e=t.initialPreview;e.length>0&&!i.isArray(e)&&(e=e.split(t.initialPreviewDelimiter)),t.previewCache.data={content:e,config:t.initialPreviewConfig,tags:t.initialPreviewThumbTags}},fetch:function(){return t.previewCache.data.content.filter(function(e){return null!==e})},count:function(e){return t.previewCache.data&&t.previewCache.data.content?e?t.previewCache.data.content.length:t.previewCache.fetch().length:0},get:function(a,n){var r,o,l,s,d,c,u,p="init_"+a,f=t.previewCache.data,m=f.config[a],v=f.content[a],h=t.previewInitId+"-"+p,g=i.ifSet("previewAsData",m,t.initialPreviewAsData),w=function(e,a,n,r,o,l,s,d,c){return d=" file-preview-initial "+i.SORT_CSS+(d?" "+d:""),t._generatePreviewTemplate(e,a,n,r,o,!1,null,d,l,s,c)};return v?(n=void 0===n?!0:n,l=i.ifSet("type",m,t.initialPreviewFileType||"generic"),d=i.ifSet("filename",m,i.ifSet("caption",m)),c=i.ifSet("filetype",m,l),s=t.previewCache.footer(a,n,m&&m.size||null),u=i.ifSet("frameClass",m),r=g?w(l,v,d,c,h,s,p,u):w("generic",v,d,c,h,s,p,u,l).setTokens({content:f.content[a]}),f.tags.length&&f.tags[a]&&(r=i.replaceTags(r,f.tags[a])),i.isEmpty(m)||i.isEmpty(m.frameAttr)||(o=e(document.createElement("div")).html(r),o.find(".file-preview-initial").attr(m.frameAttr),r=o.html(),o.remove()),r):""},add:function(e,a,n,r){var o,l=t.previewCache.data;return i.isArray(e)||(e=e.split(t.initialPreviewDelimiter)),r?(o=l.content.push(e)-1,l.config[o]=a,l.tags[o]=n):(o=e.length-1,l.content=e,l.config=a,l.tags=n),t.previewCache.data=l,o},set:function(e,a,n,r){var o,l,s=t.previewCache.data;if(e&&e.length&&(i.isArray(e)||(e=e.split(t.initialPreviewDelimiter)),l=e.filter(function(e){return null!==e}),l.length)){if(void 0===s.content&&(s.content=[]),void 0===s.config&&(s.config=[]),void 0===s.tags&&(s.tags=[]),r){for(o=0;oi;i++)a+=t.previewCache.get(i);return e=t._getMsgSelected(t.previewCache.count()),{content:a,caption:e}},footer:function(e,a,n){var r=t.previewCache.data;if(!r||!r.config||0===r.config.length||i.isEmpty(r.config[e]))return"";a=void 0===a?!0:a;var o,l=r.config[e],s=i.ifSet("caption",l),d=i.ifSet("width",l,"auto"),c=i.ifSet("url",l,!1),u=i.ifSet("key",l,null),p=t.fileActionSettings,f=t.initialPreviewShowDelete||!1,m=i.ifSet("showDelete",l,i.ifSet("showDelete",p,f)),v=i.ifSet("showZoom",l,i.ifSet("showZoom",p,!0)),h=i.ifSet("showDrag",l,i.ifSet("showDrag",p,!0)),g=c===!1&&a;return o=t._renderFileActions(!1,m,v,h,g,c,u,!0),t._getLayoutTemplate("footer").setTokens({progress:t._renderThumbProgress(),actions:o,caption:s,size:t._getSize(n),width:d,indicator:""})}},t.previewCache.init()},_handler:function(e,i,t){var a=this,n=a.namespace,r=i.split(" ").join(n+" ")+n;e&&e.length&&e.off(r).on(r,t)},_log:function(e){var i=this,t=i.$element.attr("id");t&&(e='"'+t+'": '+e),"undefined"!=typeof window.console.log?window.console.log(e):window.alert(e)},_validate:function(){var e=this,i="file"===e.$element.attr("type");return i||e._log('The input "type" must be set to "file" for initializing the "bootstrap-fileinput" plugin.'),i},_errorsExist:function(){var i,t=this;return t.$errorContainer.find("li").length?!0:(i=e(document.createElement("div")).html(t.$errorContainer.html()),i.find("span.kv-error-close").remove(),i.find("ul").remove(),!!e.trim(i.text()).length)},_errorHandler:function(e,i){var t=this,a=e.target.error,n=function(e){t._showError(e.replace("{name}",i))};n(a.code===a.NOT_FOUND_ERR?t.msgFileNotFound:a.code===a.SECURITY_ERR?t.msgFileSecured:a.code===a.NOT_READABLE_ERR?t.msgFileNotReadable:a.code===a.ABORT_ERR?t.msgFilePreviewAborted:t.msgFilePreviewError)},_addError:function(e){var i=this,t=i.$errorContainer;e&&t.length&&(t.html(i.errorCloseButton+e),i._handler(t.find(".kv-error-close"),"click",function(){t.fadeOut("slow")}))},_resetErrors:function(e){var i=this,t=i.$errorContainer;i.isError=!1,i.$container.removeClass("has-error"),t.html(""),e?t.fadeOut("slow"):t.hide()},_showFolderError:function(e){var t,a=this,n=a.$errorContainer;e&&(t=a.msgFoldersNotAllowed.replace("{n}",e),a._addError(t),i.addCss(a.$container,"has-error"),n.fadeIn(800),a._raise("filefoldererror",[e,t]))},_showUploadError:function(e,t,a){var n=this,r=n.$errorContainer,o=a||"fileuploaderror",l=t&&t.id?'
  • '+e+"
    • ":"
  • "+e+"
    • ";return 0===r.find("ul").length?n._addError("
      "+l+"
    "):r.find("ul").append(l),r.fadeIn(800),n._raise(o,[t,e]),n.$container.removeClass("file-input-new"),i.addCss(n.$container,"has-error"),!0},_showError:function(e,t,a){var n=this,r=n.$errorContainer,o=a||"fileerror";return t=t||{},t.reader=n.reader,n._addError(e),r.fadeIn(800),n._raise(o,[t,e]),n.isUploadable||n._clearFileInput(),n.$container.removeClass("file-input-new"),i.addCss(n.$container,"has-error"),n.$btnUpload.attr("disabled",!0),!0},_noFilesError:function(e){var t=this,a=t.minFileCount>1?t.filePlural:t.fileSingle,n=t.msgFilesTooLess.replace("{n}",t.minFileCount).replace("{files}",a),r=t.$errorContainer;t._addError(n),t.isError=!0,t._updateFileDetails(0),r.fadeIn(800),t._raise("fileerror",[e,n]),t._clearFileInput(),i.addCss(t.$container,"has-error")},_parseError:function(i,t,a,n){var r,o=this,l=e.trim(a+""),s=void 0!==t.responseJSON&&void 0!==t.responseJSON.error?t.responseJSON.error:t.responseText;return o.cancelling&&o.msgUploadAborted&&(l=o.msgUploadAborted),o.showAjaxErrorDetails&&s&&(s=e.trim(s.replace(/\n\s*\n/g,"\n")),r=s.length?"
    "+s+"
    ":"",l+=l?r:s),l||(l=o.msgAjaxError.replace("{operation}",i)),o.cancelling=!1,n?""+n+": "+l:l},_parseFileType:function(e){var t,a,n,r,o=this,l=o.allowedPreviewTypes||[];for(r=0;r-1&&(t=i.split(".").pop(),a.previewFileIconSettings&&(n=a.previewFileIconSettings[t]||a.previewFileIconSettings[t.toLowerCase()]||null),a.previewFileExtSettings&&e.each(a.previewFileExtSettings,function(e,i){return a.previewFileIconSettings[e]&&i(t)?void(n=a.previewFileIconSettings[e]):void 0})),n},_parseFilePreviewIcon:function(e,i){var t=this,a=t._getPreviewIcon(i)||t.previewFileIcon,n=e;return n.indexOf("{previewFileIcon}")>-1&&(n=n.setTokens({previewFileIconClass:t.previewFileIconClass,previewFileIcon:a})),n},_raise:function(i,t){var a=this,n=e.Event(i);if(void 0!==t?a.$element.trigger(n,t):a.$element.trigger(n),n.isDefaultPrevented()||n.result===!1)return!1;switch(i){case"filebatchuploadcomplete":case"filebatchuploadsuccess":case"fileuploaded":case"fileclear":case"filecleared":case"filereset":case"fileerror":case"filefoldererror":case"fileuploaderror":case"filebatchuploaderror":case"filedeleteerror":case"filecustomerror":case"filesuccessremove":break;default:a.ajaxAborted||(a.ajaxAborted=n.result)}return!0},_listenFullScreen:function(e){var i,t,a=this,n=a.$modal;n&&n.length&&(i=n&&n.find(".btn-fullscreen"),t=n&&n.find(".btn-borderless"),i.length&&t.length&&(i.removeClass("active").attr("aria-pressed","false"),t.removeClass("active").attr("aria-pressed","false"),e?i.addClass("active").attr("aria-pressed","true"):t.addClass("active").attr("aria-pressed","true"),n.hasClass("file-zoom-fullscreen")?a._maximizeZoomDialog():e?a._maximizeZoomDialog():t.removeClass("active").attr("aria-pressed","false")))},_listen:function(){var t,a=this,n=a.$element,r=a.$form,o=a.$container;a._handler(n,"change",e.proxy(a._change,a)),a.showBrowse&&a._handler(a.$btnFile,"click",e.proxy(a._browse,a)),a._handler(o.find(".fileinput-remove:not([disabled])"),"click",e.proxy(a.clear,a)),a._handler(o.find(".fileinput-cancel"),"click",e.proxy(a.cancel,a)),a._initDragDrop(),a._handler(r,"reset",e.proxy(a.reset,a)),a.isUploadable||a._handler(r,"submit",e.proxy(a._submitForm,a)),a._handler(a.$container.find(".fileinput-upload"),"click",e.proxy(a._uploadClick,a)),a._handler(e(window),"resize",function(){a._listenFullScreen(screen.width===window.innerWidth&&screen.height===window.innerHeight)}),t="webkitfullscreenchange mozfullscreenchange fullscreenchange MSFullscreenChange",a._handler(e(document),t,function(){a._listenFullScreen(i.checkFullScreen())}),a._initClickable()},_initClickable:function(){var t,a=this;a.isClickable&&(t=a.isUploadable?a.$dropZone:a.$preview.find(".file-default-preview"),i.addCss(t,"clickable"),t.attr("tabindex",-1),a._handler(t,"click",function(i){var n=e(i.target);n.parents(".file-preview-thumbnails").length&&!n.parents(".file-default-preview").length||(a.$element.trigger("click"),t.blur())}))},_initDragDrop:function(){var i=this,t=i.$dropZone;i.isUploadable&&i.dropZoneEnabled&&i.showPreview&&(i._handler(t,"dragenter dragover",e.proxy(i._zoneDragEnter,i)),i._handler(t,"dragleave",e.proxy(i._zoneDragLeave,i)),i._handler(t,"drop",e.proxy(i._zoneDrop,i)),i._handler(e(document),"dragenter dragover drop",i._zoneDragDropInit))},_zoneDragDropInit:function(e){e.stopPropagation(),e.preventDefault()},_zoneDragEnter:function(t){var a=this,n=e.inArray("Files",t.originalEvent.dataTransfer.types)>-1;return a._zoneDragDropInit(t),a.isDisabled||!n?(t.originalEvent.dataTransfer.effectAllowed="none",void(t.originalEvent.dataTransfer.dropEffect="none")):void i.addCss(a.$dropZone,"file-highlighted")},_zoneDragLeave:function(e){var i=this;i._zoneDragDropInit(e),i.isDisabled||i.$dropZone.removeClass("file-highlighted")},_zoneDrop:function(e){var t=this;e.preventDefault(),t.isDisabled||i.isEmpty(e.originalEvent.dataTransfer.files)||(t._change(e,"dragdrop"),t.$dropZone.removeClass("file-highlighted"))},_uploadClick:function(e){var t,a=this,n=a.$container.find(".fileinput-upload"),r=!n.hasClass("disabled")&&i.isEmpty(n.attr("disabled"));if(!e||!e.isDefaultPrevented()){if(!a.isUploadable)return void(r&&"submit"!==n.attr("type")&&(t=n.closest("form"),t.length&&t.trigger("submit"),e.preventDefault()));e.preventDefault(),r&&a.upload()}},_submitForm:function(){var e=this;return e._isFileSelectionValid()&&!e._abort({})},_clearPreview:function(){var t=this,a=t.$preview,n=t.showUploadedThumbs?t.getFrames(":not(.file-preview-success)"):t.getFrames();n.each(function(){var t=e(this);t.remove(),i.cleanZoomCache(a.find("#zoom-"+t.attr("id")))}),t.getFrames().length&&t.showPreview||t._resetUpload(),t._validateDefaultPreview()},_initSortable:function(){var t,a=this,n=a.$preview,r="."+i.SORT_CSS;window.KvSortable&&0!==n.find(r).length&&(t={handle:".drag-handle-init",dataIdAttr:"data-preview-id",scroll:!1,draggable:r,onSort:function(t){var n,r,o=t.oldIndex,l=t.newIndex;a.initialPreview=i.moveArray(a.initialPreview,o,l),a.initialPreviewConfig=i.moveArray(a.initialPreviewConfig,o,l),a.previewCache.init();for(var s=0;s
    <% end %> - <%= yield %> - + <%= yield %>
    diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index aef41ab1..1ac499fd 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,7 +1,16 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %>
    -
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    <%= f.file_field :image_path, :class => "img-thumbnail" %>
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 9b90fec8..2edc1e50 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,7 +1,16 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %>
    -
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    <%= f.file_field :image_path, :class => "img-thumbnail" %>
    diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 461f6489..adb297d1 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -19,6 +19,9 @@ Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) +# --- Image Uploader ---- +Rails.application.config.assets.precompile += %w( fileinput.min.css ) + # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( CRM.css ) Rails.application.config.assets.precompile += %w( CRM.js ) @@ -26,3 +29,6 @@ Rails.application.config.assets.precompile += %w( CRM.js ) # --- Customer/ Customer - Crm ---- Rails.application.config.assets.precompile += %w( jquery-confirm.css ) Rails.application.config.assets.precompile += %w( jquery-confirm.js ) + +# --- Image Uploader ---- +Rails.application.config.assets.precompile += %w( fileinput.min.js ) diff --git a/config/initializers/carrier_wave.rb b/config/initializers/carrier_wave.rb new file mode 100644 index 00000000..57807870 --- /dev/null +++ b/config/initializers/carrier_wave.rb @@ -0,0 +1 @@ +require 'carrierwave/orm/activerecord' \ No newline at end of file diff --git a/public/image/menu_images/default.png b/public/image/menu_images/default.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 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 Date: Tue, 15 Aug 2017 17:04:46 +0630 Subject: [PATCH 58/71] update show for foc --- app/views/origami/payments/show.html.erb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 68f843a7..36c4cc0e 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -454,17 +454,12 @@ $('#foc').click(function() { $.ajax({type: "POST", url: "<%= origami_payment_foc_path %>", data: params, - success:function(result){ - localStorage.removeItem("cash"); - if (result.status) { - var msg = result.message; - } - else{ - var msg = ''; - } - $( "#loading_wrapper" ).hide(); + success:function(result){ - $.confirm({ + $( "#loading_wrapper" ).hide(); + + if (cash > 0) { + $.confirm({ title: 'Infomation!', content: 'Thank you !', buttons: { @@ -477,6 +472,7 @@ $('#foc').click(function() { } } }); + } } }); From 67c005a836b776b4676d430e29b7cf618d93abd5 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 15 Aug 2017 17:23:14 +0630 Subject: [PATCH 59/71] fixed --- app/pdf/close_cashier_pdf.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 8e56bed3..34a9779c 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -1,7 +1,7 @@ class CloseCashierPdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes) + def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height self.margin = 5 @@ -27,16 +27,11 @@ class CloseCashierPdf < Prawn::Document self.header_font_size = 10 self.item_font_size = 8 - - header( shop_details) stroke_horizontal_rule - shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) - - - + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) end def header (shop_details) From b2f00358f102134d09b5e0ac48dffc08c13b1ece Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 17:24:06 +0630 Subject: [PATCH 60/71] update ability for setmenu --- app/controllers/settings/item_sets_controller.rb | 2 +- app/controllers/settings/menu_item_sets_controller.rb | 2 +- app/models/ability.rb | 2 ++ app/views/settings/menu_item_sets/index.html.erb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 5c089c31..5564ed98 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -1,6 +1,6 @@ class Settings::ItemSetsController < ApplicationController before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy] - + load_and_authorize_resource except: [:create] # GET /settings/item_sets # GET /settings/item_sets.json def index diff --git a/app/controllers/settings/menu_item_sets_controller.rb b/app/controllers/settings/menu_item_sets_controller.rb index 917e5330..eb710e8c 100644 --- a/app/controllers/settings/menu_item_sets_controller.rb +++ b/app/controllers/settings/menu_item_sets_controller.rb @@ -1,6 +1,6 @@ class Settings::MenuItemSetsController < ApplicationController before_action :set_settings_menu_item_set, only: [:show, :edit, :update, :destroy] - + load_and_authorize_resource except: [:create] # GET /settings/menu_item_sets # GET /settings/menu_item_sets.json def index diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..d94fef43 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -16,6 +16,8 @@ class Ability can :manage, MenuItemInstance can :manage, MenuItemOption can :manage, SetMenuItem + can :manage, ItemSet + can :manage, MenuItemSet can :manage, OrderQueueStation can :manage, Zone can :manage, CashierTerminal diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index 95b5dbe9..0a2e50d2 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -26,7 +26,7 @@ <%= item.menu_item.name %> <%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to 'Destroy', settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> + <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%> <% end %> From 0eee1fd0af3f1a0c0f1fc734326c457c07c2fa4e Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 16 Aug 2017 18:26:30 +0630 Subject: [PATCH 61/71] menu ui update --- app/assets/stylesheets/settings.scss | 4 ++ .../settings/set_menu_items_controller.rb | 58 +++++++++++++-- .../settings/simple_menu_items_controller.rb | 59 +++++++++++++-- app/models/menu_item.rb | 6 +- app/views/crm/customers/_form.html.erb | 1 - app/views/crm/customers/index.html.erb | 3 +- app/views/settings/item_sets/_form.html.erb | 1 + app/views/settings/item_sets/edit.html.erb | 1 - app/views/settings/item_sets/new.html.erb | 1 - .../settings/set_menu_items/_form.html.erb | 68 +++++++++++------- .../settings/set_menu_items/edit.html.erb | 26 ++++++- .../settings/set_menu_items/new.html.erb | 2 +- .../settings/simple_menu_items/_form.html.erb | 67 ++++++++++------- .../settings/simple_menu_items/edit.html.erb | 28 ++++++-- .../settings/simple_menu_items/new.html.erb | 6 +- .../20170331024749_create_menu_items.rb | 11 +-- .../20170628103624_create_print_settings.rb | 6 +- ...1543_remove_d_bcols_from_print_settings.rb | 8 --- ...d_Dome_dish_kitchen_restaurant_1886917.png | Bin 0 -> 6195 bytes 19 files changed, 260 insertions(+), 96 deletions(-) delete mode 100644 db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb create mode 100644 public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 2660d836..ec02f7c4 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -56,4 +56,8 @@ ul.dropdown-menu li a{ .menu-item-img { margin: 10px; text-align: center; + } + + .padding-10 { + padding: 10px; } \ No newline at end of file diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 73e8b4eb..64b9c945 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -1,6 +1,8 @@ class Settings::SetMenuItemsController < ApplicationController before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy] before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update] + before_action :set_settings_item_attribute, only: [:index, :show, :edit, :new, :update ,:create] + before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create] # GET /settings/menu_items # GET /settings/menu_items.json def index @@ -18,22 +20,43 @@ class Settings::SetMenuItemsController < ApplicationController def new @settings_menu_item = MenuItem.new @settings_menu_item.type = "SetMenuItem" + @item_sets = ItemSet.all end # GET /settings/menu_items/1/edit def edit + @item_sets = ItemSet.all end # POST /settings/menu_items # POST /settings/menu_items.json def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - if params[:simple_menu_item][:menu_item_id] == '' - @settings_menu_item.menu_category_id = params[:menu_category_id] - end + + # if params[:simple_menu_item][:menu_item_id] == '' + @settings_menu_item.menu_category_id = params[:menu_category_id] + # end @settings_menu_item.created_by = current_login_employee.name + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) respond_to do |format| if @settings_menu_item.save + menu_item = MenuItem.find(@settings_menu_item.id) + menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } else @@ -46,8 +69,27 @@ class Settings::SetMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1 # PATCH/PUT /settings/menu_items/1.json def update + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + @settings_menu_item.menu_category_id = params[:menu_category_id] + respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) + @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } else @@ -79,8 +121,16 @@ class Settings::SetMenuItemsController < ApplicationController @category = MenuCategory.find(params[:menu_category_id]) end + def set_settings_item_attribute + @item_attributes = MenuItemAttribute.all.order("id asc").map{|a| [a.name, a.value]} + end + + def set_settings_item_option + @item_options = MenuItemOption.all + end + # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) end end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 3fa1945d..9d3ac5ed 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -1,6 +1,8 @@ class Settings::SimpleMenuItemsController < ApplicationController before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy ] before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create] + before_action :set_settings_item_attribute, only: [:index, :show, :edit, :new, :update ,:create] + before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create] # GET /settings/menu_items # GET /settings/menu_items.json def index @@ -16,11 +18,13 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/new def new - @settings_menu_item = MenuItem.new + @settings_menu_item = MenuItem.new + @item_sets = ItemSet.all end # GET /settings/menu_items/1/edit - def edit + def edit + @item_sets = ItemSet.all end # POST /settings/menu_items @@ -28,13 +32,30 @@ class Settings::SimpleMenuItemsController < ApplicationController def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - if params[:simple_menu_item][:menu_item_id] == '' - @settings_menu_item.menu_category_id = params[:menu_category_id] - end + # if params[:simple_menu_item][:menu_item_id] == '' + @settings_menu_item.menu_category_id = params[:menu_category_id] + # end @settings_menu_item.created_by = current_login_employee.name + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) respond_to do |format| if @settings_menu_item.save + menu_item = MenuItem.find(@settings_menu_item.id) + menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } else @@ -47,8 +68,26 @@ class Settings::SimpleMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1 # PATCH/PUT /settings/menu_items/1.json def update + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # Bind for Item Sets + if params[:simple_menu_item][:item_sets].count > 1 + params[:simple_menu_item][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + + @settings_menu_item.menu_category_id = params[:menu_category_id] + respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) + @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } else @@ -80,8 +119,16 @@ class Settings::SimpleMenuItemsController < ApplicationController @category = MenuCategory.find(params[:menu_category_id]) end + def set_settings_item_attribute + @item_attributes = MenuItemAttribute.all.order("id asc") #.map{|a| [a.name, a.value]} + end + + def set_settings_item_option + @item_options = MenuItemOption.all + end + # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 2f575d9f..8213ae88 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -3,14 +3,14 @@ class MenuItem < ApplicationRecord belongs_to :menu_category, :optional => true has_many :menu_item_instances - belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true - has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" + # belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true + # has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account has_many :menu_item_sets has_many :item_sets, through: :menu_item_sets - validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :name, :type, :min_qty, :taxable default_scope { order('item_code asc') } diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb index c913651a..e9cef629 100644 --- a/app/views/crm/customers/_form.html.erb +++ b/app/views/crm/customers/_form.html.erb @@ -1,4 +1,3 @@ - <%= simple_form_for([:crm,@crm_customer]) do |f| %> <%= f.error_notification %> diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 14e38822..71772c92 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -124,7 +124,7 @@ $(document).on('click',".customer_tr",function(){ var url = "customers/" + customer_id + "/edit"; } - $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'});; + $("#customer_tax_profiles").children().removeAttr("selected").css({'color':'#000','background':'none'}); $.ajax({ type: "GET", @@ -135,7 +135,6 @@ $(document).on('click',".customer_tr",function(){ // Selected for Taxes var taxes = JSON.stringify(data.tax_profiles); var parse_taxes = JSON.parse(taxes); - console.log(parse_taxes); $.each(parse_taxes, function(i, value){ $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); }); diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index e28cab09..28441ea5 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -9,5 +9,6 @@
    <%= f.button :submit ,:class=>'btn btn-success'%> + <%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %>
    <% end %> diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb index 2f0d54ba..55a86645 100644 --- a/app/views/settings/item_sets/edit.html.erb +++ b/app/views/settings/item_sets/edit.html.erb @@ -1,4 +1,3 @@

    Editing Settings Item Set

    <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb index ff581dc6..003b758d 100644 --- a/app/views/settings/item_sets/new.html.erb +++ b/app/views/settings/item_sets/new.html.erb @@ -2,4 +2,3 @@ <%= render 'form', settings_item_set: @settings_item_set %> -<%= link_to 'Back', settings_item_sets_path,:class => 'btn btn-danger' %> diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index 1ac499fd..f243fb74 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -1,36 +1,52 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> -
    + +
    -
    - <% if f.object.image_path? %> -

    <%= f.object.name %>

    - <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> -

    Menu Item Image

    - <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> +
    + <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :min_qty %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> +
    +
    + <%= f.input :is_available, :class => "form-control" %> + + <%= f.input :is_sub_item, :class => "form-control" %> + + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> +
    +
    +
    + +
    +
    +
    +
    + <% if f.object.image_path? %> +

    <%= f.object.name %>

    + <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

    Menu Item Image

    + <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
    + <%= f.file_field :image_path, :class => "img-thumbnail" %>
    - <%= f.file_field :image_path, :class => "img-thumbnail" %>
    -
    -
    -
    - <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
    +
    + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
    -
    -
    - <%= f.button :submit %> +
    + <%= f.button :submit %> +
    <% end %> diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index 158b7c1c..6a4eb567 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -1,5 +1,3 @@ - -
      @@ -8,5 +6,27 @@
    • Edit
    - <%= render 'form', settings_set_menu_item: @settings_menu_item %> + + <%= render 'form', settings_set_menu_item: @settings_menu_item, item_sets: @item_sets %>
    + + \ No newline at end of file diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb index c7d277bf..f0eaf2df 100644 --- a/app/views/settings/set_menu_items/new.html.erb +++ b/app/views/settings/set_menu_items/new.html.erb @@ -11,5 +11,5 @@
  • New
- <%= render 'form', settings_set_menu_item: @settings_menu_item %> + <%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 2edc1e50..721c7230 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -1,35 +1,52 @@ <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> <%= f.error_notification %> -
+ +
-
- <% if f.object.image_path? %> -

<%= f.object.name %>

- <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> -

Menu Item Image

- <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> - <% end %> +
+ <%= f.input :item_code %> + <%= f.input :name %> + <%= f.input :alt_name %> + <%= f.input :type %> + <%= f.input :min_qty %> + <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> +
+
+ <%= f.input :is_available, :class => "form-control" %> + + <%= f.input :is_sub_item, :class => "form-control" %> + + <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true }, :class => "form-control item_attributes" %> + + <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true }, :class => "form-control item_options" %> +
+
+
+ +
+
+
+
+ <% if f.object.image_path? %> +

<%= f.object.name %>

+ <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> + <% else %> +

Menu Item Image

+ <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> + <% end %> +
+ <%= f.file_field :image_path, :class => "img-thumbnail" %>
- <%= f.file_field :image_path, :class => "img-thumbnail" %>
-
-
-
- <%= f.input :item_code %> - <%= f.input :name %> - <%= f.input :alt_name %> - <%= f.input :type %> - <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> - <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> - <%= f.input :min_qty %> - <%= f.input :min_selectable_item %> - <%= f.input :max_selectable_item %> +
+
+ <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
-
-
- <%= f.button :submit %> +
+ <%= f.button :submit %> +
<% end %> diff --git a/app/views/settings/simple_menu_items/edit.html.erb b/app/views/settings/simple_menu_items/edit.html.erb index 07849c07..84c60e04 100644 --- a/app/views/settings/simple_menu_items/edit.html.erb +++ b/app/views/settings/simple_menu_items/edit.html.erb @@ -1,7 +1,3 @@ - -
    @@ -10,5 +6,27 @@
  • Edit
- <%= render 'form', settings_simple_menu_item: @settings_menu_item %> + + <%= render 'form', settings_simple_menu_item: @settings_menu_item, item_sets: @item_sets %>
+ + diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index 9e18525b..158e7d52 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -10,5 +10,9 @@
  • New
    • - <%= render 'form', settings_simple_menu_item: @settings_menu_item %> +
    +
    + <%= render 'form', settings_simple_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %> +
    +
    diff --git a/db/migrate/20170331024749_create_menu_items.rb b/db/migrate/20170331024749_create_menu_items.rb index ce6d1486..75897d52 100644 --- a/db/migrate/20170331024749_create_menu_items.rb +++ b/db/migrate/20170331024749_create_menu_items.rb @@ -1,4 +1,3 @@ - class CreateMenuItems < ActiveRecord::Migration[5.1] def change create_table :menu_items do |t| @@ -10,12 +9,16 @@ class CreateMenuItems < ActiveRecord::Migration[5.1] t.string :information t.string :type, :null => false, :default => "SimpleMenuItem" t.references :menu_category, foreign_key: true - t.references :menu_item, foreign_key: true + t.json :item_attributes + t.json :item_options + # t.references :menu_item, foreign_key: true t.references :account, foreign_key: true t.integer :min_qty, :null => false, :default => 1 t.boolean :taxable, :null => false, :default => true - t.integer :min_selectable_item, :null => false, :default => 1 - t.integer :max_selectable_item, :null => false, :default => 1 + t.boolean :is_sub_item, :null => false, :default => false + t.boolean :is_available, :null => false, :default => true + # t.integer :min_selectable_item, :null => false, :default => 1 + # t.integer :max_selectable_item, :null => false, :default => 1 t.string :created_by t.timestamps diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb index aca49a0d..28c0ae57 100644 --- a/db/migrate/20170628103624_create_print_settings.rb +++ b/db/migrate/20170628103624_create_print_settings.rb @@ -3,11 +3,7 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1] create_table :print_settings do |t| t.string :name, :null => false t.string :unique_code, :null => false - t.string :template - t.string :db_name - t.string :db_type - t.string :db_username - t.string :db_password + t.string :template t.string :printer_name, :null => false t.string :api_settings t.decimal :page_width, :null => false, :default => 200 diff --git a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb deleted file mode 100644 index 48a7de5d..00000000 --- a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class RemoveDBcolsFromPrintSettings < ActiveRecord::Migration[5.1] - def change - remove_column :print_settings, :db_name, :string - remove_column :print_settings, :db_type, :string - remove_column :print_settings, :db_username, :string - remove_column :print_settings, :db_password, :string - end -end diff --git a/public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png b/public/image/menu_images/if_Dish_food_Dome_dish_kitchen_restaurant_1886917.png new file mode 100644 index 0000000000000000000000000000000000000000..0c364b22b1963415a7b33961eed94b45ebbdc97d GIT binary patch literal 6195 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%0Dpt;h%)ysHe!)jUR(1jk;N;vHXG@QjaPD-*UjGo z$afv}gn-&%zCID-x7whi8iD2n&IkMU>AYk$>A5k~}QUe_G9ESV2xN8cl)2(?28NMM4b@Er!`WT2Bo&tJNE zsiO&lCq^vDA%D%aJ1ZhxrDqhx2mZmnBU)`NEC?M8 z?WGoSL7$AW)|zfbK3QY^%x8o>iWXgfdI zvB-86b6v9J$t4BtTv@P1=b|-N?QzHKnPBY7r#vZ&zY=OaWr;>wX^03SfhfZ5;k-le z3-eBp%v$=Jg#|~PEQ(3*HIH8Nu6FC0oF@r@`1*mrp{8Gt20E${JQyx$_f=-zNsJ3_ zfBvTTiqWT{K5{?0zIBW+J*Pw_r>0AafkJoB<+^0)=E8^lR21E-W6_4I_JktVc>tV$B4)tySnv&suPT;0RBbWA znh_1!2p@{%J;_Uj2tV$t!TH4&K2U-YAc3|k+N^*#b}xvQ=Q{$Vo)dI!UL9p{Eaj$F z(FnjX9q*s!lm|Ke!kmr(0^B=lNW)hP`PAzPC7*V$y?VnuVZ8=Q`3ogLGFN{F(2cdfp9!&Jq(6^f=7g#cX#0sss! zb9`eyL+64-jN-*+zhjb7><$+F|KO01*gC? zsusZ~P;~@I#Sbrkt9;2v8njmfRqq@jsThX!DZ`5DhtzvWI73*&5)A`sP8Vk9D;U4 z0PXNw#M_9iZC`l0d3Uj|shsHZ1jvLyXwAPoI#yF`3Wz2MV*-K3F-xN;Gy>d6 zqI|^c1(Y{V0FFSZ2x|@z)IL(YPeA*GWfugy2x_MVdTsHO*Z!m0CUJ%0{{hwQkqJSM RX(|8!002ovPDHLkV1j2Bx55Ab literal 0 HcmV?d00001 From 88eb1d6c64e18828fff6aefc5293989e8f9a5e77 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 17 Aug 2017 10:43:45 +0630 Subject: [PATCH 62/71] update seed --- db/seeds.rb | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 8bc16f74..5ab0d36d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -175,4 +175,75 @@ queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf cashier_terminal = CashierTerminal.create({name:"Terminal 1"}) cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"}) cashier_terminal3 = CashierTerminal.create({name:"Terminal 3"}) + +zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) + table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, + {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}, +]) + +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://membership.paypar.ws"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +#Default Order Queue stations +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) + +# QueueStationZone +zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone}) +zone_queue_station2 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station2, zone: zone2}) +zone_queue_station3 = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone3}) + puts " Finished System Default Set Up Data " From 7f2bfa2348e60757af7e92d20d78042a4369dfed Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 17 Aug 2017 13:51:01 +0630 Subject: [PATCH 63/71] update add order and calculate subtotal --- .../restaurant/menu_categories_controller.rb | 2 - .../restaurant/menu/_menu_item.json.jbuilder | 4 +- .../menu_categories/show.json.jbuilder | 10 +-- app/views/origami/addorders/show.html.erb | 84 +++++++++++++------ 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/app/controllers/api/restaurant/menu_categories_controller.rb b/app/controllers/api/restaurant/menu_categories_controller.rb index 5ab10ff5..f1f3e6d0 100644 --- a/app/controllers/api/restaurant/menu_categories_controller.rb +++ b/app/controllers/api/restaurant/menu_categories_controller.rb @@ -13,9 +13,7 @@ class Api::Restaurant::MenuCategoriesController < Api::ApiController # This API show current order details # Input Params - menu_id def show - puts "SSSSSSSSSSSSS" @menu = menu_detail(params[:id]) - puts @menu.to_json end diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index c93c3b12..d86624b5 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -32,8 +32,8 @@ elsif item.menu_item_instances.count > 1 then end #Child Menu items -if (item.children) then - json.set_items item.children.each do |item| +if (item.menu_item_sets) then + json.set_items item.menu_item_sets.each do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index d7a6d581..f48f6c77 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -6,8 +6,8 @@ if @menu.menu_items json.alt_name item.alt_name json.type item.type json.min_qty item.min_qty - json.min_selectable_item item.min_selectable_item - json.max_selectable_item item.max_selectable_item + # json.min_selectable_item item.min_selectable_item + # json.max_selectable_item item.max_selectable_item #Item instance if item.menu_item_instances.count == 1 then @@ -33,11 +33,11 @@ if @menu.menu_items end #Child Menu items - if (item.children) then - json.set_items item.children.each do |item| + if (item.menu_item_sets) then + json.set_items item.menu_item_sets.each do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end - end + end end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index c7aa4455..638da002 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -23,7 +23,7 @@
    -
    +
    @@ -42,7 +42,7 @@
    - +
    Sub Total:222220.00
    @@ -53,14 +53,16 @@ $(function(){ + //click menu sidebar menu category $(".menu_category").on("click", function(){ var menu_id = $(this).find(".menu-id").text(); var url = $(this).attr('data-ref'); show_menu_item_list(url); - }); //End menu category Click - + }); + //End menu category Click + + //show menu item list when click menu category function show_menu_item_list(url_item){ - var menu_list = $('.menu_items_list'); menu_list.empty(); @@ -74,7 +76,7 @@ $(function(){ var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); menu_items = data.menu_items; - + console.log(data); for(var field in menu_items) { if (menu_items[field].item_instances){ var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2); @@ -130,47 +132,75 @@ $(function(){ } //end show detail function + // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); - show_item_detail(item_data); + show_item_detail(item_data); + calculate_sub_total(); }); //End Add Icon Click function show_item_detail(data){ + qty = 1; + append = 0; + price = data.attr('data-price'); + instance_code = data.attr('data-instance'); - price = data.attr('data-price'); - - if (data.attr('data-qty') === undefined){ - qty = 1; - }else{ - qty = data.attr('data-qty'); - } - - if (data.attr('data-instance') == "undefined"){ + if (instance_code == "undefined"){ instance = ''; }else{ - instance = data.attr('data-instance'); + instance = "("+data.attr('data-instance')+")"; } + var rowCount = $('.summary-items tbody tr').length+1; + var item_row = $('.summary-items tbody tr'); + + $(item_row).each(function(i){ + if ($(item_row[i]).attr('data-code') == data.attr('data-item-code')) { + qty = parseInt($(item_row[i]).children('#item_qty').text()) +1; + $(item_row[i]).children('#item_qty').text(qty); + $(item_row[i]).children('#item_price').text(price*qty); + append = 1; + }else{ + qty = 1; + } + }); - - var rowCount = $('.summary-items tbody'); - console.log(rowCount); - for(var field in rowCount) { - // console.log(rowCount[field].attr('data-code')); - } - - row ='' + if (append===0) { + row ="" +''+rowCount+'' - +'' + data.attr('data-name')+ ' ' + instance + '' + +'' + data.attr('data-name')+ ' ' + instance + '' +'' + qty + '' +'' + parseFloat(price).toFixed(2) +'' +''; - $(".summary-items tbody").append(row); + $(".summary-items tbody").append(row); + } } + function calculate_sub_total(){ + var total_price = 0; + var taxable_amount = 0; + var item_row = $('.summary-items tbody tr'); + + $(item_row).each(function(i){ + // var taxable = $(item_row[i]).attr('data-taxable'); + var unit_price = parseFloat($(item_row[i]).attr('data-price')); + var qty = parseFloat($(item_row[i]).children('#item_qty').text()); + // if(taxable == 'true'){ + // taxable_amount += qty*unit_price; + // } + total_price += qty*unit_price; + }); + var fixed_total_price = parseFloat(total_price).toFixed(2); + var fixed_taxable_amount = parseFloat(taxable_amount).toFixed(2); + $('#sub_total').empty(); + $('#sub_total').append(fixed_total_price); + // $('#sub_total').attr('taxable_amount',fixed_taxable_amount); + // $('#show_sub').text(fixed_total_price); +} + }); From 29b3f945737f81045514552dcaa01b0c9f6e7904 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 17 Aug 2017 18:55:13 +0630 Subject: [PATCH 64/71] add menu api --- .../api/restaurant/item_sets_controller.rb | 9 +++ .../api/restaurant/menu_controller.rb | 3 +- .../menu_item_attributes_controller.rb | 4 -- .../concerns/token_verification.rb | 3 +- .../settings/item_sets_controller.rb | 2 +- .../settings/menu_categories_controller.rb | 2 +- .../settings/set_menu_items_controller.rb | 2 +- .../settings/simple_menu_items_controller.rb | 2 +- app/models/employee.rb | 1 - .../restaurant/item_sets/index.json.jbuilder | 6 ++ .../api/restaurant/menu/_menu.json.jbuilder | 5 +- .../restaurant/menu/_menu_item.json.jbuilder | 60 ++++++++++-------- .../api/restaurant/menu/index.json.jbuilder | 12 ++-- app/views/layouts/_header.html.erb | 2 +- app/views/settings/item_sets/_form.html.erb | 1 + app/views/settings/item_sets/index.html.erb | 2 + app/views/settings/item_sets/show.html.erb | 4 ++ .../settings/menu_categories/_form.html.erb | 4 +- .../settings/menu_categories/index.html.erb | 2 + .../settings/menu_categories/show.html.erb | 2 + .../settings/set_menu_items/show.html.erb | 57 ----------------- .../settings/simple_menu_items/show.html.erb | 62 +------------------ config/routes.rb | 1 + .../20170327152733_create_menu_categories.rb | 2 +- db/migrate/20170811071000_create_item_sets.rb | 1 + .../20170816042256_settings_products.rb | 1 - 26 files changed, 84 insertions(+), 168 deletions(-) create mode 100644 app/controllers/api/restaurant/item_sets_controller.rb create mode 100644 app/views/api/restaurant/item_sets/index.json.jbuilder diff --git a/app/controllers/api/restaurant/item_sets_controller.rb b/app/controllers/api/restaurant/item_sets_controller.rb new file mode 100644 index 00000000..a7ad9efc --- /dev/null +++ b/app/controllers/api/restaurant/item_sets_controller.rb @@ -0,0 +1,9 @@ +class Api::Restaurant::ItemSetsController < Api::ApiController + + #Description + # Pull the default menu details and also other available (active) menus + # Input Params - order_id + def index + @item_sets = ItemSet.all + end +end diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index fe7983ea..f6f2902b 100644 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -5,8 +5,7 @@ class Api::Restaurant::MenuController < Api::ApiController # Input Params - order_id def index @menus = Menu.all - @current_menu = Menu.current_menu - + # @current_menu = Menu.current_menu end #Description diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb index f2aead8f..1b6a48d4 100644 --- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb +++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb @@ -6,8 +6,4 @@ class Api::Restaurant::MenuItemAttributesController < Api::ApiController def index @menu_attributes = MenuItemAttribute.all end - - - - end diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 0cc6c263..66658b6a 100644 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -14,10 +14,9 @@ module TokenVerification end def authenticate_token - authenticate_with_http_token do |token, options| + authenticate_with_http_token do |token, options| #@current_user = User.find_by(api_key: token) Rails.logger.debug "token - " + token.to_s - @user = Employee.authenticate_by_token(token) if @user return true diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 5564ed98..cbd74edb 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -69,6 +69,6 @@ class Settings::ItemSetsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_item_set_params - params.require(:item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + params.require(:item_set).permit(:name, :alt_name, :min_selectable_qty, :max_selectable_qty) end end diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index 8ca9cfb4..a15cca20 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -89,6 +89,6 @@ class Settings::MenuCategoriesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_category_params - params.require(:menu_category).permit(:code, :menu_id, :name, :alt_name, :order_by, :menu_category_id) + params.require(:menu_category).permit(:code, :menu_id, :name, :alt_name, :order_by, :menu_category_id, :is_available) end end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 64b9c945..60fa3b7d 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -12,7 +12,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show - @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 9d3ac5ed..60949618 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -12,7 +12,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show - @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end diff --git a/app/models/employee.rb b/app/models/employee.rb index 7693c448..85aeaec1 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -35,7 +35,6 @@ class Employee < ApplicationRecord end def self.authenticate_by_token(session_token) - if (session_token) user = Employee.find_by_token_session(session_token) if user && user.session_expiry.utc > DateTime.now.utc diff --git a/app/views/api/restaurant/item_sets/index.json.jbuilder b/app/views/api/restaurant/item_sets/index.json.jbuilder new file mode 100644 index 00000000..eb39022d --- /dev/null +++ b/app/views/api/restaurant/item_sets/index.json.jbuilder @@ -0,0 +1,6 @@ +json.array! @item_sets do |set| + json.name set.name + json.alt_name set.alt_name + json.min_selectable_qty set.min_selectable_qty + json.max_selectable_qty set.max_selectable_qty +end diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 43721ff0..cfa950d7 100644 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -5,13 +5,14 @@ json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") if (menu.menu_categories) - json.menu_categories menu.menu_categories do |category| + json.categories menu.menu_categories do |category| json.id category.id json.name category.name json.alt_name category.alt_name + json.is_available category.is_available if category.menu_items - json.menu_items category.menu_items do |item| + json.items category.menu_items do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end end diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index c93c3b12..f0b790b7 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,40 +1,46 @@ #Menu Item Information -json.item_code item.item_code -json.name item.name -json.alt_name item.alt_name -json.type item.type -json.min_qty item.min_qty -json.min_selectable_item item.min_selectable_item -json.max_selectable_item item.max_selectable_item +json.id item.id +json.item_code item.item_code +json.name item.name +json.alt_name item.alt_name +json.image item.image_path.url +json.description item.description +json.Information item.information +json.type item.type +json.account_id item.account_id +json.min_qty item.min_qty +json.is_available item.is_available +json.is_sub_item item.is_sub_item +json.attributes item.item_attributes +json.options item.item_options +# json.min_selectable_item item.min_selectable_item +# json.max_selectable_item item.max_selectable_item #Item instance -if item.menu_item_instances.count == 1 then +# if item.menu_item_instances.count == 1 then +# item_instance = item.menu_item_instances[0] +# json.price = item_instance.price +# json.is_available = item_instance.is_available +# json.is_on_promotion = item_instance.is_on_promotion +# json.promotion_price = item_instance.promotion_price +# json.item_attributes = item_instance.item_attributes - item_instance = item.menu_item_instances[0] - json.price = item_instance.price - json.is_available = item_instance.is_available - json.is_on_promotion = item_instance.is_on_promotion - json.promotion_price = item_instance.promotion_price - json.item_attributes = item_instance.item_attributes - -elsif item.menu_item_instances.count > 1 then - - json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code = is.item_instance_code - json.item_instance_name = is.item_instance_name +# elsif item.menu_item_instances.count > 1 then + json.instances item.menu_item_instances do |is| + json.code = is.item_instance_code + json.name = is.item_instance_name json.price = is.price json.is_available = is.is_available json.is_on_promotion = is.is_on_promotion json.promotion_price = is.promotion_price json.item_attributes = is.item_attributes - end + # end end #Child Menu items -if (item.children) then - json.set_items item.children.each do |item| - json.partial! 'api/restaurant/menu/menu_item', item: item - end - -end +# if (item.children) then +# json.set_items item.children.each do |item| +# json.partial! 'api/restaurant/menu/menu_item', item: item +# end +# end diff --git a/app/views/api/restaurant/menu/index.json.jbuilder b/app/views/api/restaurant/menu/index.json.jbuilder index b4241854..55e876f6 100644 --- a/app/views/api/restaurant/menu/index.json.jbuilder +++ b/app/views/api/restaurant/menu/index.json.jbuilder @@ -4,9 +4,11 @@ json.array! @menus do |menu| json.valid_days menu.valid_days json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") - if (@current_menu) - json.current_menu do - json.partial! 'api/restaurant/menu/menu', menu: @current_menu - end - end + + json.partial! 'api/restaurant/menu/menu', menu: menu + # if (@current_menu) + # json.current_menu do + # json.partial! 'api/restaurant/menu/menu', menu: @current_menu + # end + # end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d7ccedaf..0daa8f5f 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -31,7 +31,7 @@
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %>
    • ] +
  • <%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %>
  • <%= link_to "Products", settings_products_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index 28441ea5..8eb23795 100644 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -3,6 +3,7 @@
    <%= f.input :name %> + <%= f.input :alt_name %> <%= f.input :min_selectable_qty,input_html: {value: f.object.min_selectable_qty || '0'} %> <%= f.input :max_selectable_qty,input_html: {value: f.object.max_selectable_qty || '0'} %>
    diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb index 80db10b9..b530a018 100644 --- a/app/views/settings/item_sets/index.html.erb +++ b/app/views/settings/item_sets/index.html.erb @@ -14,6 +14,7 @@ Name + Alt Name Min selectable qty Max selectable qty Action @@ -24,6 +25,7 @@ <% @settings_item_sets.each do |item| %> <%= item.name %> + <%= item.alt_name %> <%= item.min_selectable_qty %> <%= item.max_selectable_qty %> <%= link_to 'Show', settings_item_set_path(item),:class=>'btn btn-sm btn-success' %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index f863b5fc..21e5f132 100644 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -17,6 +17,10 @@ Name: <%= @settings_item_set.name %> + + Alt Name: + <%= @settings_item_set.alt_name %> + Min selectable qty: <%= @settings_item_set.min_selectable_qty %> diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb index 6a48555d..b611b397 100644 --- a/app/views/settings/menu_categories/_form.html.erb +++ b/app/views/settings/menu_categories/_form.html.erb @@ -2,13 +2,13 @@ <%= f.error_notification %>
    - <%= f.input :menu_id, as: :hidden %> + <%= f.input :menu_id, as: :hidden %> <%= f.input :code, label: "Category Code" %> <%= f.input :name %> <%= f.input :alt_name %> + <%= f.input :is_available %> <%= f.input :order_by %> <%= f.association :parent %> -
    diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 8ac80a16..9345469c 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -17,6 +17,7 @@ Menu Name Alt name + Is Available Order by Parent @@ -31,6 +32,7 @@ <%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %> <%= settings_menu_category.alt_name rescue ''%> + <%= settings_menu_category.is_available rescue false%> <%= settings_menu_category.order_by rescue ''%> <%= settings_menu_category.parent.name rescue ''%> <%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 7e1f44af..737709cd 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -16,6 +16,7 @@ Menu Name Alt name + Is Available Order by Created At Action @@ -27,6 +28,7 @@ <%= @settings_menu_category.menu.name %> <%= @settings_menu_category.name rescue "-" %> <%= @settings_menu_category.alt_name %> + <%= settings_menu_category.is_available rescue false%> <%= @settings_menu_category.order_by %> <%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index a5762fc3..6cec8cab 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -21,10 +21,7 @@ Type Account Type Menu category - Menu item Min qty - Min selectable item - Max selectable item Created At Action @@ -38,10 +35,7 @@ <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %> <%= @settings_menu_item.menu_category_id %> - <%= @settings_menu_item.menu_item_id %> <%= @settings_menu_item.min_qty %> - <%= @settings_menu_item.min_selectable_item %> - <%= @settings_menu_item.max_selectable_item %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %> @@ -51,58 +45,7 @@
    -<% if @sub_menu.count > 0 %> -
    -
    -
    -

    Sub Menu Items

    - - - - - - - - - - - - - - - - - <% @sub_menu.each do |settings_menu_item| %> - - - - - - - - - - - <% if settings_menu_item.type == "SimpleMenuItem" %> - - - - <% else %> - - - - <% end %> - - <% end %> - -
    Item codeNameAlt nameTypeParent ItemCreated byCreated at
    <%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    -
    -
    - <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> - -<% end %> -

    Menu Item Instances diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 9bfae1b0..d9961c92 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -23,10 +23,10 @@ Type Accout Menu category - Menu item + Min qty - Min selectable item - Max selectable item + Created At Action @@ -40,10 +40,7 @@ <%= @settings_menu_item.type %> <%= @settings_menu_item.account.title %> <%= @settings_menu_item.menu_category_id %> - <%= @settings_menu_item.menu_item_id %> <%= @settings_menu_item.min_qty %> - <%= @settings_menu_item.min_selectable_item %> - <%= @settings_menu_item.max_selectable_item %> <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> @@ -54,60 +51,7 @@

    -<% if @sub_menu.count > 0 %> -
    -
    -
    -

    Sub Menu Items

    - - - - - - - - - - - - - - - - - <% @sub_menu.each do |settings_menu_item| %> - - - - - - - - - - - - <% if settings_menu_item.type == "SimpleMenuItem" %> - - - - <% else %> - - - - <% end %> - - <% end %> - -
    Item codeNameAlt nameTypeParent ItemCreated byCreated at
    <%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    -
    -
    - <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> - -<% end %> - -

    Menu Item Instances diff --git a/config/routes.rb b/config/routes.rb index 631f1316..619295eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,7 @@ Rails.application.routes.draw do resources :menu_item_attributes, only: [:index] resources :menu_item_options, only: [:index] resources :menu_sold_out, only: [:index] + get "item_sets" => "item_sets#index" end #User request move table or bills diff --git a/db/migrate/20170327152733_create_menu_categories.rb b/db/migrate/20170327152733_create_menu_categories.rb index 59e3a8c9..3b978654 100644 --- a/db/migrate/20170327152733_create_menu_categories.rb +++ b/db/migrate/20170327152733_create_menu_categories.rb @@ -8,7 +8,7 @@ class CreateMenuCategories < ActiveRecord::Migration[5.1] t.integer :order_by t.string :created_by, :null => false t.references :menu_category, :null => true - + t.boolean :is_available, :null => false, :default => true t.timestamps end end diff --git a/db/migrate/20170811071000_create_item_sets.rb b/db/migrate/20170811071000_create_item_sets.rb index d666222c..07b42355 100644 --- a/db/migrate/20170811071000_create_item_sets.rb +++ b/db/migrate/20170811071000_create_item_sets.rb @@ -2,6 +2,7 @@ class CreateItemSets < ActiveRecord::Migration[5.1] def change create_table :item_sets do |t| t.string :name + t.string :alt_name t.integer :min_selectable_qty t.integer :max_selectable_qty diff --git a/db/migrate/20170816042256_settings_products.rb b/db/migrate/20170816042256_settings_products.rb index 69c790fc..73535db3 100644 --- a/db/migrate/20170816042256_settings_products.rb +++ b/db/migrate/20170816042256_settings_products.rb @@ -2,7 +2,6 @@ class SettingsProducts < ActiveRecord::Migration[5.1] def change create_table :products do |t| t.string :item_code, :limit => 16 - t.string :name, :null => false t.string :alt_name t.integer :unit_price From e448265a48291b4e7b5fb1325134b472e6853f66 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 17 Aug 2017 18:55:29 +0630 Subject: [PATCH 65/71] update add oreder --- app/views/origami/addorders/show.html.erb | 57 ++++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 638da002..1c400d0d 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -23,7 +23,7 @@

    -
    +
    @@ -49,6 +49,51 @@ + + + From 3b8a5183577c63dde12587548761782ac22e9e78 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 18 Aug 2017 19:09:09 +0630 Subject: [PATCH 68/71] update addorder --- .../restaurant/menu/_menu_item.json.jbuilder | 14 +- .../menu_categories/show.json.jbuilder | 61 ++++---- app/views/origami/addorders/show.html.erb | 141 ++++++++++++------ 3 files changed, 132 insertions(+), 84 deletions(-) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index ffad3dc2..6446169f 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -28,13 +28,13 @@ json.options item.item_options # elsif item.menu_item_instances.count > 1 then json.instances item.menu_item_instances do |is| - json.code = is.item_instance_code - json.name = is.item_instance_name - json.price = is.price - json.is_available = is.is_available - json.is_on_promotion = is.is_on_promotion - json.promotion_price = is.promotion_price - json.item_attributes = is.item_attributes + json.code is.item_instance_code + json.name is.item_instance_name + json.price is.price + json.is_available is.is_available + json.is_on_promotion is.is_on_promotion + json.promotion_price is.promotion_price + json.item_attributes is.item_attributes # end end diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder index f48f6c77..ad05acbf 100644 --- a/app/views/api/restaurant/menu_categories/show.json.jbuilder +++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder @@ -1,43 +1,48 @@ if @menu.menu_items json.menu_items @menu.menu_items do |item| #Menu Item Information - json.item_code item.item_code - json.name item.name - json.alt_name item.alt_name - json.type item.type - json.min_qty item.min_qty + # json.item_code item.item_code + # json.name item.name + # json.alt_name item.alt_name + # json.type item.type + # json.min_qty item.min_qty # json.min_selectable_item item.min_selectable_item # json.max_selectable_item item.max_selectable_item #Item instance - if item.menu_item_instances.count == 1 then + # if item.menu_item_instances.count == 1 then - item_instance = item.menu_item_instances[0] - json.price item_instance.price - json.is_available item_instance.is_available - json.is_on_promotion item_instance.is_on_promotion - json.promotion_price item_instance.promotion_price - json.item_attributes item_instance.item_attributes + # item_instance = item.menu_item_instances[0] + # json.price item_instance.price + # json.is_available item_instance.is_available + # json.is_on_promotion item_instance.is_on_promotion + # json.promotion_price item_instance.promotion_price + # json.item_attributes item_instance.item_attributes - elsif item.menu_item_instances.count > 1 then + # elsif item.menu_item_instances.count > 1 then - json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code is.item_instance_code - json.item_instance_name is.item_instance_name - json.price is.price - json.is_available is.is_available - json.is_on_promotion is.is_on_promotion - json.promotion_price is.promotion_price - json.item_attributes is.item_attributes - end + # json.item_instances item.menu_item_instances do |is| + # json.item_instance_item_code is.item_instance_code + # json.item_instance_name is.item_instance_name + # json.price is.price + # json.is_available is.is_available + # json.is_on_promotion is.is_on_promotion + # json.promotion_price is.promotion_price + # json.item_attributes is.item_attributes + # end - end + # end #Child Menu items - if (item.menu_item_sets) then - json.set_items item.menu_item_sets.each do |item| - json.partial! 'api/restaurant/menu/menu_item', item: item - end + # if (item.menu_item_sets) then + # json.set_items item.menu_item_sets.each do |item| + # json.partial! 'api/restaurant/menu/menu_item', item: item + # end - end + #end + # if category.menu_items + # json.items category.menu_items do |item| + json.partial! 'api/restaurant/menu/menu_item', item: item + # end + # end end end diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index f30d8b84..0e8a8163 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -49,9 +49,51 @@ + + + + + -
    - - - - - - - - - - - - - - -
    Item NameQuantity
    - - - -
    - -
    + + + + + + + + + + + + + + + +
    Item NameQuantity
    + + + +
    +
    @@ -114,28 +154,21 @@ $(function(){ data: {}, dataType: "json", success: function(data) { + console.log(data); var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); menu_items = data.menu_items; console.log(data); for(var field in menu_items) { - if (menu_items[field].item_instances){ - var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2); - var is_available = menu_items[field].item_instances[1].is_available - var is_on_promotion = menu_items[field].item_instances[1].is_on_promotion - var item_attributes = menu_items[field].item_instances[1].item_attributes - var item_instance_code = menu_items[field].item_instances[1].item_instance_item_code - var item_instance_name = menu_items[field].item_instances[1].item_instance_name - var promotion_price = menu_items[field].item_instances[1].promotion_price - }else{ - var price = parseFloat(menu_items[field].price).toFixed(2); - var is_available = menu_items[field].is_available - var is_on_promotion = menu_items[field].is_on_promotion - var item_attributes = menu_items[field].item_attributes - var item_instance_code = menu_items[field].item_instance_item_code - var item_instance_name = menu_items[field].item_instance_name - var promotion_price = menu_items[field].promotion_price - } + + var code = menu_items[field].instances[0].code + var name = menu_items[field].instances[0].name + var price = parseFloat(menu_items[field].instances[0].price).toFixed(2); + var is_available = menu_items[field].instances[0].is_available + var is_on_promotion = menu_items[field].instances[0].is_on_promotion + var item_attributes = menu_items[field].instances[0].item_attributes + var promotion_price = menu_items[field].instances[0].promotion_price + row = '
    ' +'
    ' @@ -148,8 +181,8 @@ $(function(){ +'data-available="'+ is_available +'"' +'data-promotion="'+ is_on_promotion +'"' +'data-attributes="'+ item_attributes +'"' - +'data-instance-code="'+ item_instance_code +'"' - +'data-instance="'+ item_instance_name +'"' + +'data-instance-code="'+ code +'"' + +'data-instance="'+ name +'"' +'data-promotion-price="'+ promotion_price +'"' +'>' +'
    ' +'
    ' - +'
    ' - +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' - +'
    ' + +'
    ' + +'
    ' + +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' + +'
    ' - +'
    ' - +''+ price +'' + +'
    ' + +''+ price +'' + +'
    ' +'
    '; $('.menu_items_list').append(row); } @@ -230,6 +265,14 @@ $(function(){ $('#modal-qty').val(qty); }); + //click item row for update qty + $(document).on('click', '.menu_item_box', function(event){ + + data = $(this).parent().children().children('.add_icon'); + $('#title_name').text(data.attr('data-name')); + console.log(data); + }); + //click remove buttom in modal box $('#sx_itemModal').on('click','#remove', function(){ $('.summary-items tr').filter(function(){ @@ -359,7 +402,7 @@ $(function(){ .modal-dialog { left:auto; right: auto; - width: 600px; + width: 100%; padding-top: 100px; } From a1df5a0dbc73c5248a078aff6f568cd7f76896c7 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 18 Aug 2017 19:46:43 +0630 Subject: [PATCH 69/71] update menu_sync --- .../menu_item_instances_controller.rb | 30 ++++++++++++-- .../settings/set_menu_items_controller.rb | 33 ++++++++-------- .../settings/simple_menu_items_controller.rb | 37 +++++++++++++++--- app/helpers/application_helper.rb | 1 - app/models/menu_item_attribute.rb | 2 +- app/models/menu_item_instance.rb | 3 ++ .../restaurant/menu/_menu_item.json.jbuilder | 31 +++++++++++++-- .../menu_item_instances/_form.html.erb | 33 ++++++++++------ .../menu_item_instances/edit.html.erb | 2 +- .../settings/menu_item_instances/new.html.erb | 2 +- .../menu_item_instances/show.html.erb | 5 ++- ...170402084230_create_menu_item_instances.rb | 1 + db/seeds.rb | 1 + public/image/menu_images/icons8-Food-100.png | Bin 0 -> 5031 bytes 14 files changed, 135 insertions(+), 46 deletions(-) create mode 100644 public/image/menu_images/icons8-Food-100.png diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index fd651e5e..0d276602 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -21,12 +21,14 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(@item) @category = MenuCategory.find(id) @settings_menu_item_instances = MenuItemInstance.new + @item_sets = ItemSet.all end # GET /settings/menu_item_instances/1/edit def edit id = MenuItemInstance.findParentCategory(@item) @category = MenuCategory.find(id) + @item_sets = ItemSet.all end # POST /settings/menu_item_instances @@ -45,6 +47,18 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(catID) category = MenuCategory.find(id) + + # Bind for Item Sets + if params[:menu_item_instance][:item_sets].count > 1 + params[:menu_item_instance][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:menu_item_instance][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + respond_to do |format| if @settings_menu_item_instances.save @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?) @@ -70,6 +84,18 @@ class Settings::MenuItemInstancesController < ApplicationController id = MenuItemInstance.findParentCategory(catID) category = MenuCategory.find(id) + + # Bind for Item Sets + if params[:menu_item_instance][:item_sets].count > 1 + params[:menu_item_instance][:item_sets].delete_at(0) + + sets = ItemSet.find(params[:menu_item_instance][:item_sets]) + + if sets.count > 0 + @settings_menu_item.item_sets = sets + end + end + respond_to do |format| if @settings_menu_item_instances.update(settings_menu_item_instance_params) @@ -122,8 +148,6 @@ class Settings::MenuItemInstancesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_instance_params - - params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id) - + params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id, :is_default, :item_sets) end end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 60fa3b7d..4f451de5 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -33,29 +33,30 @@ class Settings::SetMenuItemsController < ApplicationController def create @settings_menu_item = MenuItem.new(settings_menu_item_params) - # if params[:simple_menu_item][:menu_item_id] == '' + # if params[:set_menu_item][:menu_item_id] == '' @settings_menu_item.menu_category_id = params[:menu_category_id] # end @settings_menu_item.created_by = current_login_employee.name + # Remove "" default first + params[:set_menu_item][:item_attributes].delete_at(0) + params[:set_menu_item][:item_options].delete_at(0) + # Bind for Item Sets - if params[:simple_menu_item][:item_sets].count > 1 - params[:simple_menu_item][:item_sets].delete_at(0) + if params[:set_menu_item][:item_sets].count > 1 + params[:set_menu_item][:item_sets].delete_at(0) - sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + sets = ItemSet.find(params[:set_menu_item][:item_sets]) if sets.count > 0 @settings_menu_item.item_sets = sets end end - - # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) - menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options]) format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } @@ -70,14 +71,14 @@ class Settings::SetMenuItemsController < ApplicationController # PATCH/PUT /settings/menu_items/1.json def update # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + params[:set_menu_item][:item_attributes].delete_at(0) + params[:set_menu_item][:item_options].delete_at(0) # Bind for Item Sets - if params[:simple_menu_item][:item_sets].count > 1 - params[:simple_menu_item][:item_sets].delete_at(0) + if params[:set_menu_item][:item_sets].count > 1 + params[:set_menu_item][:item_sets].delete_at(0) - sets = ItemSet.find(params[:simple_menu_item][:item_sets]) + sets = ItemSet.find(params[:set_menu_item][:item_sets]) if sets.count > 0 @settings_menu_item.item_sets = sets @@ -88,7 +89,7 @@ class Settings::SetMenuItemsController < ApplicationController respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) - @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + @settings_menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options]) format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item } @@ -131,6 +132,6 @@ class Settings::SetMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) + params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets) end end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 60949618..4cf9318c 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -37,6 +37,34 @@ class Settings::SimpleMenuItemsController < ApplicationController # end @settings_menu_item.created_by = current_login_employee.name + # Remove "" default first + params[:simple_menu_item][:item_attributes].delete_at(0) + params[:simple_menu_item][:item_options].delete_at(0) + + # attr_format = [] + # param_count = params[:simple_menu_item][:item_attributes].count + # # Format for attributes json + # params[:simple_menu_item][:item_attributes].each do|attr_id| + # menu_attr = MenuItemAttribute.find(attr_id) + # if attr_format.count == 0 + # attr_format.push({ type: menu_attr.attribute_type, value: [] }) + # end + + # attr_format.each do |af| + # if menu_attr.attribute_type == af[:type] + # af[:value].push(menu_attr.value) + # else + # new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] } + # attr_format.push(new_attr) + # end + + # break if attr_format.count > param_count + # end + + # param_count -= 1 + # end + # @settings_menu_item.item_attributes = attr_format + # Bind for Item Sets if params[:simple_menu_item][:item_sets].count > 1 params[:simple_menu_item][:item_sets].delete_at(0) @@ -47,14 +75,11 @@ class Settings::SimpleMenuItemsController < ApplicationController @settings_menu_item.item_sets = sets end end - - # Remove "" default first - params[:simple_menu_item][:item_attributes].delete_at(0) - params[:simple_menu_item][:item_options].delete_at(0) + respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) - menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options]) + menu_item.update_attributes(item_options: params[:simple_menu_item][:item_options]) format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item } @@ -129,6 +154,6 @@ class Settings::SimpleMenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by) + params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets) end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ae3934e4..037767c9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,4 @@ module ApplicationHelper - def flash_class(level) case level when :notice then "alert alert-info fade-in" diff --git a/app/models/menu_item_attribute.rb b/app/models/menu_item_attribute.rb index a2fd0d1c..54d2f34e 100644 --- a/app/models/menu_item_attribute.rb +++ b/app/models/menu_item_attribute.rb @@ -1,6 +1,6 @@ class MenuItemAttribute < ApplicationRecord validates_presence_of :attribute_type, :name, :value def self.collection - MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] } + MenuItemAttribute.select("name, value").map { |e| [e.name, e.value] } end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index 579b7a5a..de5be7b5 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,5 +1,8 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item + + has_many :menu_instance_item_sets + has_many :item_sets, through: :menu_instance_item_sets # before_create :generate_menu_item_instance_code def self.findParentCategory(item) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index ffad3dc2..297e7932 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,3 +1,26 @@ +# Format for attributes json +attr_format = [] +param_count = item.item_attributes.count +# Format for attributes json +item.item_attributes.each do|attr_id| + menu_attr = MenuItemAttribute.find(attr_id) + if attr_format.count == 0 + attr_format.push({ type: menu_attr.attribute_type, value: [] }) + end + + attr_format.each do |af| + if menu_attr.attribute_type == af[:type] + af[:value].push(menu_attr.value) + else + new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] } + attr_format.push(new_attr) + end + + break if attr_format.count > param_count + end + + param_count -= 1 +end #Menu Item Information json.id item.id @@ -12,7 +35,8 @@ json.account_id item.account_id json.min_qty item.min_qty json.is_available item.is_available json.is_sub_item item.is_sub_item -json.attributes item.item_attributes +json.item_sets item.item_sets +json.attributes attr_format json.options item.item_options # json.min_selectable_item item.min_selectable_item # json.max_selectable_item item.max_selectable_item @@ -26,17 +50,16 @@ json.options item.item_options # json.promotion_price = item_instance.promotion_price # json.item_attributes = item_instance.item_attributes -# elsif item.menu_item_instances.count > 1 then json.instances item.menu_item_instances do |is| json.code = is.item_instance_code json.name = is.item_instance_name json.price = is.price json.is_available = is.is_available + json.is_default = is.is_default json.is_on_promotion = is.is_on_promotion json.promotion_price = is.promotion_price json.item_attributes = is.item_attributes - # end - + json.item_sets is.item_sets end #Child Menu items diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 54edfab4..c86ff780 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -3,21 +3,32 @@ <%= f.error_notification %> -
    - <%= f.input :item_instance_code %> - <%= f.input :item_instance_name %> - <%= f.input :price %> +
    +
    + <%= f.input :item_instance_code %> + <%= f.input :item_instance_name %> + <%= f.input :price %> - <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> + <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> - - <%= f.input :is_on_promotion %> - <%= f.input :promotion_price %> - <%= f.input :is_available %> + <%= f.input :is_on_promotion %> + <%= f.input :promotion_price %> +
    -
    - <%= f.button :submit %> +
    +
    +
    + <%= f.input :is_available %> + <%= f.input :is_default %> + + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
    +
    + +
    + <%= f.button :submit %> +
    <% end %> diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 01a47cc0..d5884474 100644 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -11,6 +11,6 @@
  • Edit
    • - <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances %> + <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
    diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index ccbc8fe8..9b1c5331 100644 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -14,6 +14,6 @@
  • New Menu Item Instance
    • - <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances %> + <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
    diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 40383b51..2fb1ca39 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -24,8 +24,8 @@ On Promotion Promotion Price Available - Created At - + Is Default + Created At @@ -38,6 +38,7 @@ <%= @settings_menu_item_instances.is_on_promotion %> <%= @settings_menu_item_instances.promotion_price %> <%= @settings_menu_item_instances.is_available %> + <%= @settings_menu_item_instances.is_default %> <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if params[:simple_menu_item_id] %> <%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %> diff --git a/db/migrate/20170402084230_create_menu_item_instances.rb b/db/migrate/20170402084230_create_menu_item_instances.rb index c79cb322..8e95f8f5 100644 --- a/db/migrate/20170402084230_create_menu_item_instances.rb +++ b/db/migrate/20170402084230_create_menu_item_instances.rb @@ -9,6 +9,7 @@ class CreateMenuItemInstances < ActiveRecord::Migration[5.1] t.boolean :is_on_promotion, :null => false, :default => false t.decimal :promotion_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.boolean :is_available, :null => false, :default => true + t.boolean :is_default, :null => false, :default => true t.timestamps end end diff --git a/db/seeds.rb b/db/seeds.rb index 2a9e422a..bf458f2a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -125,6 +125,7 @@ product = Account.create({title: "Product", account_type: "2"}) #Default Menu Options menu_options = MenuItemOption.create([{option_type: "Spicy", name: "Less Spicy", value: "less_spicy"},{option_type: "Spicy", name: "Spicy", value: "spicy"},{option_type: "Spicy", name: "Super Spicy", value: "super_spicy"}]) menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{option_type: "Sweet", name: "Less Sweet", value: "less_sweet"}]) +menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}]) # #Default Menu Category menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"}) diff --git a/public/image/menu_images/icons8-Food-100.png b/public/image/menu_images/icons8-Food-100.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e616915a0092eebe86fb03492d432df762dd9 GIT binary patch literal 5031 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 Date: Mon, 21 Aug 2017 10:09:23 +0630 Subject: [PATCH 70/71] Coupon / Voucher data change --- app/controllers/origami/voucher_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb index 7eda6084..e65abc85 100644 --- a/app/controllers/origami/voucher_controller.rb +++ b/app/controllers/origami/voucher_controller.rb @@ -22,7 +22,7 @@ class Origami::VoucherController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] - sale_id = params[:refnumber] + voucher_no = params[:refnumber] if(Sale.exists?(sale_id)) customer_data= Customer.find_by_customer_id(sale_data.customer_id) if customer_data @@ -37,11 +37,12 @@ class Origami::VoucherController < BaseOrigamiController auth_token = member_actions.auth_token.to_s # membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) # if membership_data["status"]==true + # app_token: token,membership_id:membership_id, + # campaign_type_id:campaign_type_id,merchant_uid:merchant_uid, + # auth_token:auth_token begin response = HTTParty.get(url, - :body => { app_token: token,membership_id:membership_id, - campaign_type_id:campaign_type_id,merchant_uid:merchant_uid, - auth_token:auth_token + :body => { voucher_no: voucher_no,membership_id:membership_id }.to_json, :headers => { 'Content-Type' => 'application/json', From 150c843fe0bedf38a0e30a0c2ded1ebfe27e71d6 Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 21 Aug 2017 10:14:16 +0630 Subject: [PATCH 71/71] Update --- app/views/settings/products/_form.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb index 37a049c6..a6711a82 100644 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -7,6 +7,7 @@ <%= f.input :alt_name %> <%= f.input :unit_price %> <%= f.input :image_path %> + <%= f.input :description %> <%= f.input :information %>