From 5c12fdeeaf1a9abaeeb9a9ce5d09a578f0d626e8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 18 Aug 2017 20:05:25 +0630 Subject: [PATCH 01/17] update addorder --- app/views/origami/addorders/show.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 0e8a8163..19452e96 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -51,7 +51,6 @@ - - - - - + + + + \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 71772c92..9d2fa62b 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -25,6 +25,7 @@ <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
+ diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 2a01d664..fdea2efc 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -114,8 +114,9 @@
+
+
-

@@ -164,7 +165,7 @@ $(function(){ menu_items_list.empty(); menu_items = data.menu_items; - + for(var field in menu_items) { instances = menu_items[field].instances ; @@ -191,7 +192,7 @@ $(function(){ +'' +'' - +"
'" + +"
'" +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' @@ -212,11 +213,14 @@ $(function(){ //click item row for add order $(document).on('click', '.menu_item_box', function(event){ - $('.option-list').empty(); + $('.attributes-list').empty(); + $('.attributes-list').empty(); + data = $(this).parent().children().children('.add_icon'); attributes = $(this).data('id'); selected_item = $(this).data('item'); - console.log(attributes); + instances = $(this).data('instance'); + for(var field in attributes) { value = attributes[field]["value"]; type = attributes[field]["type"] @@ -228,13 +232,12 @@ $(function(){ status = "selected-option"; } - row +=''; + row +=""; }); - $(".option-list").append(row); - - + $(".attributes-list").append(row); } + $('#change_qty').val(1); $('#title_name').text(data.attr('data-name')); $('#total_price').text(data.attr('data-price')); @@ -242,11 +245,29 @@ $(function(){ }); // click select option icon for add - $(document).on('click', '.custom-btn', function(event){ - type = $(this).data('type'); - $('+ type +').removeClass('selected-option'); + $(document).on('click', '.attribute_btn', function(event){ + value = $(this).data('value'); + type = $(this).data('type'); + instances = $(this).data('instances'); + if ($(".attribute_btn").attr("data-type")==type){ + $('.'+type).removeClass("selected-option"); + } + $(this).addClass('selected-option'); + + selected_item = $('.selected-option').text(); + qty = $('#change_qty').val(); + + // for(var field in instances) { + // item_attr = instances[field].item_attributes; + + // status =""; + // if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ + // status = "selected-option"; + // } + + // } }); //End selecct Click @@ -445,7 +466,7 @@ $(function(){ color: #fff !important; background-color: green !important; } -.custom-btn { +.attribute_btn { white-space: normal !important; height: 60px; width: 90px; diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 6f4f53df..a3fe9264 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -22,6 +22,7 @@ <%= form_tag path, :id => "filter_form", :method => :get do %>
+
<% end %> @@ -258,9 +259,14 @@ $.ajax({ type: "POST", url: "get_customer" , - data: { filter : customer_mamber_card_no }, + data: { filter : customer_mamber_card_no ,type :"card"}, dataType: "json", - success: function(data) { + success: function(data) { + if (data.status == false) { + alert(data.message) + } + + customer_id = data[0].customer_id; customer_name = data[0].name; update_sale(customer_id, customer_name,sale_id); @@ -282,6 +288,7 @@ if(cardNo.length == 16){ $("#paypar_account_no").val(cardNo); $("#search").val(cardNo); + $("#type").val("card") } } From 352037641b21586fbdd5c98940448d0dd9e885be Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 23 Aug 2017 19:55:17 +0630 Subject: [PATCH 07/17] update jade integration --- app/controllers/origami/customers_controller.rb | 2 +- app/views/origami/customers/index.html.erb | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index a8048ff1..9dfae470 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -29,7 +29,7 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers.date_of_birth = response["customer_data"]["DOB"] @crm_customers.nrc_no = response["customer_data"]["NRC"] @crm_customers.address = response["customer_data"]["address"] - @crm_customers.card_no = 121212 + @crm_customers.card_no = response["customer_data"]["customer_card_no"] @crm_customers.paypar_account_no = filter @crm_customers.membership_id = response["customer_data"]["id"] @crm_customers.membership_type = response["customer_data"]["member_group_id"] diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a3fe9264..04b5225f 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -263,13 +263,19 @@ dataType: "json", success: function(data) { if (data.status == false) { - alert(data.message) + $.alert({ + title: 'Alert!', + content: data.message, + type: 'red', + typeAnimated: true, + btnClass: 'btn-danger', + }); } - - + if (data.status == undefined) { customer_id = data[0].customer_id; customer_name = data[0].name; update_sale(customer_id, customer_name,sale_id); + } } }); } From 7b90acd2c19d25ed824f65a917cc833ccc273d53 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 Aug 2017 11:29:04 +0630 Subject: [PATCH 08/17] update jade integration card use for all shop --- app/controllers/crm/customers_controller.rb | 2 -- app/controllers/origami/customers_controller.rb | 5 +++-- app/models/customer.rb | 8 ++------ app/views/origami/customers/index.html.erb | 16 ++++++++-------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 93d2f95b..2a0626dd 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -33,8 +33,6 @@ class Crm::CustomersController < BaseCrmController end end end - puts @crm_customers - #@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 diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 9dfae470..72597613 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -36,12 +36,13 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers.customer_type = "Dinein" @crm_customers.tax_profiles = ["1", "2"] @crm_customers.save + @crm_customers = Customer.search(filter) else - @crm_customers = {:status=> response["status"],:message=>response["message"] } + @crm_customers = [{"customer_id": response["status"],"message": response["message"] }] end end end - puts @crm_customers + render :json => @crm_customers.to_json end diff --git a/app/models/customer.rb b/app/models/customer.rb index 75978056..83a5e543 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -129,8 +129,7 @@ class Customer < ApplicationRecord sales = Sale.where("rebate_status = 'false'") sales.each do |sale| if sale.customer.membership_id - response = self.rebat(Sale.find(sale.sale_id)) - puts response.to_json + response = self.rebat(Sale.find(sale.sale_id)) if response["status"] == true status = sale.update_attributes(rebate_status: "true") end @@ -188,8 +187,7 @@ class Customer < ApplicationRecord response = { "status": false, "message": "Can't connect server"} end - return response - puts response.to_json + return response end end end @@ -224,8 +222,6 @@ class Customer < ApplicationRecord rescue SocketError response = { status: false, message: "Can't connect server"} end - puts "sssssssssssss" - puts response.to_json return response end diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 04b5225f..e0921f29 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -261,21 +261,21 @@ url: "get_customer" , data: { filter : customer_mamber_card_no ,type :"card"}, dataType: "json", - success: function(data) { - if (data.status == false) { + success: function(data) { + if (data[0].customer_id == false) { $.alert({ title: 'Alert!', - content: data.message, + content: data[0].message, type: 'red', typeAnimated: true, btnClass: 'btn-danger', }); + }else{ + customer_id = data[0].customer_id; + customer_name = data[0].name; + update_sale(customer_id, customer_name,sale_id); } - if (data.status == undefined) { - customer_id = data[0].customer_id; - customer_name = data[0].name; - update_sale(customer_id, customer_name,sale_id); - } + } }); } From d36a63313466058aef954a5ca5e6db4f370de101 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 24 Aug 2017 12:48:10 +0630 Subject: [PATCH 09/17] fix menu item json format --- .../restaurant/menu/_menu_item.json.jbuilder | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index 76b9267f..23c5061e 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,49 +1,47 @@ # 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, values: [] }) + attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] }) + next end attr_format.each do |af| - if menu_attr.attribute_type == af[:type] - af[:values].push(menu_attr.name) + if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]} + if menu_attr.attribute_type == af[:type] + af[:values].push(menu_attr.name) + end else new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] } attr_format.push(new_attr) - end - - break if attr_format.count > param_count + break + end end - - param_count -= 1 end # Format for option json opt_format = [] -param_count = item.item_options.count # Format for attributes json item.item_options.each do|opt| menu_opt = MenuItemOption.find(opt) if opt_format.count == 0 - opt_format.push({ type: menu_opt.option_type, values: [] }) + opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) + next end - opt_format.each do |af| - if menu_opt.option_type == af[:type] - af[:values].push(menu_opt.name) + opt_format.each do |of| + if menu_opt.option_type.in? opt_format.map {|k| k[:type]} + if menu_opt.option_type == of[:type] + of[:values].push(menu_opt.name) + end else - new_attr = {type: menu_opt.option_type, values: [ menu_opt.name ] } - opt_format.push(new_attr) + new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } + opt_format.push(new_opt) + break end - - break if opt_format.count > param_count - end - - param_count -= 1 + end end #Menu Item Information From 28f250c97f5b29a48f61c131cd07a3da338f3e7a Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 24 Aug 2017 15:26:46 +0630 Subject: [PATCH 10/17] update seed for tasty osaka --- db/seeds.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 27859c89..0da65820 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -218,25 +218,26 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU 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_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"}) -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"}, +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:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",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:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"}, + {membership_type:"search_paypar_account_no",gateway_url:"/api/generic_customer/get_membership_customer_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",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"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"}) #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"}) From a043a33ca55549fdb4ee486dbb7d09afa9b55be0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 Aug 2017 18:10:23 +0630 Subject: [PATCH 11/17] update addorder --- app/views/origami/addorders/show.html.erb | 111 +++++++++++++++------- 1 file changed, 79 insertions(+), 32 deletions(-) diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index fdea2efc..8f9b1c08 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -109,11 +109,14 @@

Total

-

+

-
+
+
@@ -124,7 +127,7 @@
- +
@@ -163,13 +166,10 @@ $(function(){ success: function(data) { var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); - menu_items = data.menu_items; for(var field in menu_items) { - instances = menu_items[field].instances ; - $(instances).each(function(i){ if (instances[i].is_default === true) { code = instances[i].code; @@ -177,22 +177,22 @@ $(function(){ price = parseFloat(instances[i].price).toFixed(2); is_available = instances[i].is_available ; is_on_promotion = instances[i].is_on_promotion; - item_attributes = instances[i].item_attributes; + item_attributes = instances[i].values; promotion_price = instances[i].promotion_price; code = instances[i].code; } }); - + row = '
' +'
' +''+ menu_items[field].name +'' - +"
'" + +"
" +'' +'
' +'
' - +"
'" + +"
" +'
' +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>' @@ -214,7 +214,7 @@ $(function(){ //click item row for add order $(document).on('click', '.menu_item_box', function(event){ $('.attributes-list').empty(); - $('.attributes-list').empty(); + $('.attr-alert').addClass('hide'); data = $(this).parent().children().children('.add_icon'); attributes = $(this).data('id'); @@ -222,7 +222,7 @@ $(function(){ instances = $(this).data('instance'); for(var field in attributes) { - value = attributes[field]["value"]; + value = attributes[field]["values"]; type = attributes[field]["type"] row = "

"+attributes[field]["type"]+"

" @@ -231,46 +231,93 @@ $(function(){ if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){ status = "selected-option"; } - - row +=""; - + row +=""; }); $(".attributes-list").append(row); } $('#change_qty').val(1); $('#title_name').text(data.attr('data-name')); + $('#item_code').text(data.attr('data-item-code')); $('#total_price').text(data.attr('data-price')); $('#unit_price').text(data.attr('data-price')); }); // click select option icon for add $(document).on('click', '.attribute_btn', function(event){ + value = $(this).data('value'); type = $(this).data('type'); instances = $(this).data('instances'); + console.log(instances); if ($(".attribute_btn").attr("data-type")==type){ $('.'+type).removeClass("selected-option"); } - $(this).addClass('selected-option'); - selected_item = $('.selected-option').text(); - qty = $('#change_qty').val(); + total_price = 0; - // for(var field in instances) { - // item_attr = instances[field].item_attributes; + for(var field in instances) { + item_attr = instances[field].values; + if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ + unit_price = instances[field].price + total_price = qty * unit_price + $('#instance_name').text(instances[field].name); + $('#instance_code').text(instances[field].code); + $('#promotion_price').text(instances[field].promotion_price); + $('#total_price').text(total_price); + $('#unit_price').text(unit_price); + } + } + if (total_price == 0) { + $('.attr-alert').removeClass('hide'); + $('#total_price').text(total_price); + }else{ + $('.attr-alert').addClass('hide'); + $('#total_price').text(total_price); + } + }); //End selecct attribute buttom - // status =""; - // if(parseInt(jQuery.inArray(selected_item, item_attr))!== -1){ - // status = "selected-option"; - // } - - // } + // click add order + $(document).on('click', '.add_to_order', function(event){ + total_price = $('#total_price').text(); + unit_price = $('#unit_price').text(); + qty = $('#change_qty').val(); + var item_row = $('.selected-option'); + var arr = []; - }); //End selecct Click + var attribute_arr = []; + $(item_row).each(function(i){ + value = $(item_row[i]).attr('data-value'); + arr = {value}; + }); + console.log(arr); + if(total_price > 0){ + + $('.add_to_order').attr('data-item-code',$('#item_code').text()); + $('.add_to_order').attr('data-name',$('#title_name').text()); + $('.add_to_order').attr('data-price',unit_price); + $('.add_to_order').attr('data-instance-code',$('#instance_code').text()); + $('.add_to_order').attr('data-instance',$('#instance_name').text()); + $('.add_to_order').attr('data-promotion-price',$('#promotion_price').text()); + $('.add_to_order').attr('data-attributes',$('#instance_name').text()); + + var item_data = $(this); + show_item_detail(item_data); + calculate_sub_total(); + }else{ + $.alert({ + title: 'Alert!', + content: 'Please select another item', + type: 'red', + typeAnimated: true, + btnClass: 'btn-danger', + }); + } + + }); //End Add Icon Click // click plus icon for add $(document).on('click', '.add_icon', function(event){ @@ -295,11 +342,13 @@ $(function(){ var item_row = $('.summary-items tbody tr'); $(item_row).each(function(i){ - if ($(item_row[i]).attr('data-code') == data.attr('data-item-code')) { + item_code = $(item_row[i]).attr('data-code'); + instance_code = $(item_row[i]).attr('data-instance-code'); + + if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')) { qty = parseInt($(item_row[i]).children('#item_qty').text()) +1; $(item_row[i]).children('#item_qty').text(qty); parseFloat($(item_row[i]).children('#item_price').text(price*qty)).toFixed(2); - append = 1; }else{ qty = 1; @@ -309,7 +358,7 @@ $(function(){ if (append===0) { row ="" +''+rowCount+'' - +'' + data.attr('data-name')+ ' ' + instance + data.attr('data-attributes')+'' + +'' + data.attr('data-name')+ ' ' + instance +'' +'' + qty + '' +'' + parseFloat(price).toFixed(2) @@ -317,7 +366,6 @@ $(function(){ +''; $(".summary-items tbody").append(row); } - } //click item row for update qty @@ -377,7 +425,6 @@ $(function(){ function summary_items_filter(){ $('.summary-items tr').filter(function(){ - if ($(this).attr('data-active') == 'true'){ qty = $('#modal-qty').val(); price = parseFloat($(this).attr('data-price')); From 830370dac89ab8df61a83a2ba127b6af6844fab7 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 24 Aug 2017 18:16:14 +0630 Subject: [PATCH 12/17] fix for missing item attributes in simple menu create --- app/controllers/settings/simple_menu_items_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 418cc2b8..e3010e30 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -79,7 +79,7 @@ class Settings::SimpleMenuItemsController < ApplicationController respond_to do |format| if @settings_menu_item.save menu_item = MenuItem.find(@settings_menu_item.id) - menu_item.update_attributes(item_options: params[:simple_menu_item][:item_options]) + 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 } From fb7ddd947a1ffca45f46ffd2a58e701048b12210 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 24 Aug 2017 18:18:52 +0630 Subject: [PATCH 13/17] update for check for menu item api --- .../restaurant/menu/_menu_item.json.jbuilder | 74 ++++++++++--------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index 23c5061e..3f8b5358 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,47 +1,51 @@ # Format for attributes json attr_format = [] -# 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, values: [menu_attr.name] }) - next - end +# Format for attributes json +if item.item_attributes.count > 0 + 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, values: [menu_attr.name] }) + next + end - attr_format.each do |af| - if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]} - if menu_attr.attribute_type == af[:type] - af[:values].push(menu_attr.name) - end - else - new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] } - attr_format.push(new_attr) - break - end + attr_format.each do |af| + if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]} + if menu_attr.attribute_type == af[:type] + af[:values].push(menu_attr.name) + end + else + new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] } + attr_format.push(new_attr) + break + end + end end end # Format for option json opt_format = [] -# Format for attributes json -item.item_options.each do|opt| - menu_opt = MenuItemOption.find(opt) - if opt_format.count == 0 - opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) - next - end - - opt_format.each do |of| - if menu_opt.option_type.in? opt_format.map {|k| k[:type]} - if menu_opt.option_type == of[:type] - of[:values].push(menu_opt.name) - end - else - new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } - opt_format.push(new_opt) - break +# Format for attributes json +if item.item_options.count > 0 + item.item_options.each do|opt| + menu_opt = MenuItemOption.find(opt) + if opt_format.count == 0 + opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] }) + next end - end + + opt_format.each do |of| + if menu_opt.option_type.in? opt_format.map {|k| k[:type]} + if menu_opt.option_type == of[:type] + of[:values].push(menu_opt.name) + end + else + new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] } + opt_format.push(new_opt) + break + end + end + end end #Menu Item Information From 8b79cdef7b5aa5bff82ea99034bc3e429a9507f6 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 25 Aug 2017 18:56:46 +0630 Subject: [PATCH 14/17] add doc in readme.md --- README.md | 62 ++++++++++++++++++++++++++++++++++++-- app/models/sale_payment.rb | 1 - 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 85739c2a..ee9eb1e6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,18 @@ # README -SXRestuarant is a new Dedicate project for SmartSales Restaurant. It is improvement from v1.2 with upgrade to latest Bootstrap and Rails 5. The API is better define and route are refactor. +SXRestuarant is a new Dedicate project for SmartSales Restaurant. It is improvement from v1.2 with upgrade to latest Bootstrap and Rails 5.2. The API is better define and route are refactor. Things you may want to cover: * Ruby version -ruby 2.3.2p217 +ruby 2.4.1p111 * ToDo list + +1. Cloud Sync +2. Action Cable +3. Shop Setup +4. Payment Integation * System dependencies @@ -23,4 +28,55 @@ ruby 2.3.2p217 * Deployment instructions -* ... + +* Features + +1. OQS + + 1. Filter + 2. Order Item to each Stations + 3. Edit Order Item + +2. Origami(Sale) + + 1. Sale + 2. Add Customer for membership + 3. Discount and Member Discount for Sale + 4. Assign Commissioner + 5. Add other charges to Sale + +3. CRM + + 1. Customer Management + + 2. Queue Management + +4. Backend + + 1. Dining Setup + + 2. Queue Station Setup + + 3. Menu Setup + + 4. Cashier Terminal Setup + + 5. Tax Profile Setup + + 6. Printer Setup + + 7. Payment Integration + + 8. Employee Management + + 9. Promotion Setup + + 10. Commissioner Setup + + 11. Membership Integration + + +5. Inventory + + +6. Report diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3435190d..4719e546 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -324,7 +324,6 @@ class SalePayment < ApplicationRecord update_shift end end - end # update for cashier shift From 8577754c0fdcef4dc498c164f766e1fd5ef39853 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 28 Aug 2017 14:19:40 +0630 Subject: [PATCH 15/17] add item instance code to order item --- app/models/order.rb | 2 +- app/models/order_item.rb | 3 ++- db/migrate/20170403140820_create_order_items.rb | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 0ef19729..e26d1ee2 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -90,7 +90,7 @@ class Order < ApplicationRecord # self.employee_name) # end - OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id], + OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id], item[:quantity],menu_item[:price], item[:options], set_order_items, self.id, self.employee_name) diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 897a4b1e..12c8c378 100644 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -20,11 +20,12 @@ class OrderItem < ApplicationRecord # option_values : [], # sub_order_items : [], # } - def self.processs_item (item_code, menu_name, alt_name, account_id, qty,price, options, set_menu_items, order_id, item_order_by) + def self.processs_item (item_code, instance_code, menu_name, alt_name, account_id, qty,price, options, set_menu_items, order_id, item_order_by) orderitem = OrderItem.create do |oitem| oitem.order_id = order_id oitem.item_code = item_code + oitem.item_instance_code = instance_code oitem.item_name = menu_name oitem.alt_name = alt_name oitem.account_id = account_id diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb index 1882bd62..0bca8500 100644 --- a/db/migrate/20170403140820_create_order_items.rb +++ b/db/migrate/20170403140820_create_order_items.rb @@ -6,6 +6,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1] t.string :order_item_status, :null => false, :default => "new" t.string :item_order_by #person who order this t.string :item_code, :null => false + t.string :item_instance_code t.string :item_name, :null => false t.string :alt_name, :null => false t.integer :account_id, :limit => 8, :null => false, :default => 1 From 087c120cc789151b3d35f6e511e46789cf932213 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 28 Aug 2017 14:24:53 +0630 Subject: [PATCH 16/17] tax bug fix --- app/models/promotion.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 025abd4b..482d2c3b 100644 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -69,7 +69,7 @@ class Promotion < ApplicationRecord give_promotion_nett_price(same,promo_product,promo.min_qty, orderitem, sale_id) elsif promo.promo_type == Promotion::PROMO_TYPE4 - give_promotion_nett_price(same,promo_product,promo.min_qty, orderitem, sale_id) + give_promotion_discount(same,promo_product,promo.min_qty, orderitem, sale_id) end end @@ -138,8 +138,8 @@ class Promotion < ApplicationRecord sale_item.remark = type sale_item.qty = foc_qty * (-1) - sale_item.unit_price = item_price * (-1) - sale_item.taxable_price = item_price * (-1) + sale_item.unit_price = item_price # * (-1) + sale_item.taxable_price = item_price # * (-1) sale_item.price = foc_qty * item_price * (-1) sale_item.is_taxable = false @@ -170,8 +170,8 @@ class Promotion < ApplicationRecord if same foc_qty = orderitem[1].to_i / foc_min_qty - item = OrderItem.find_by_item_code(orderitem[0]) - price = item.price - promo_product.net_price + item = OrderItem.find_by_item_code(orderitem[0]) # need to specify with menu item instance + price = item.price.to_i - promo_product.net_price.to_i update_existing_item(foc_qty, item, sale_id, "promotion nett price", price) else foc_qty = find_second_item_qty(sale_id, promo_product.item_code) @@ -187,13 +187,15 @@ class Promotion < ApplicationRecord if same foc_qty = orderitem[1].to_i / foc_min_qty item = OrderItem.find_by_item_code(orderitem[0]) - total = orderitem[1].to_i * item.price + # total = orderitem[1].to_i * item.price + total = item.price price = calculate_discount(total, promo_product.percentage) update_existing_item(foc_qty, item, sale_id, "promotion discount", price) else foc_qty = find_second_item_qty(sale_id, promo_product.item_code) item = OrderItem.find_by_item_code(promo_product.item_code) - total = item.price * foc_qty + # total = item.price * foc_qty + total = item.price price = calculate_discount(total, promo_product.percentage) update_existing_item(foc_qty, item, sale_id, "promotion discount", price) end From 81c928b3758d93367f2659009238a07b7cd2d0d6 Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 28 Aug 2017 17:55:47 +0630 Subject: [PATCH 17/17] InJutyUpdate --- .../origami/in_juties_controller.rb | 27 ++++++++---- .../in_juties/_assign_in_juty.html.erb | 22 +++++++--- .../origami/in_juties/_edit_in_juty.html.erb | 3 +- .../origami/in_juties/index_in_juty.html.erb | 42 ++++++++++++------- config/routes.rb | 7 ++-- 5 files changed, 66 insertions(+), 35 deletions(-) diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb index 821aa409..5903ace3 100644 --- a/app/controllers/origami/in_juties_controller.rb +++ b/app/controllers/origami/in_juties_controller.rb @@ -8,9 +8,10 @@ class Origami::InJutiesController < BaseOrigamiController end def index_in_juty - @juties_in= InJuty.where("dinning_id=?",params[:table_id]) + @juty_in= InJuty.where("dinning_id=?",params[:table_id]) @table = DiningFacility.find(params[:table_id]) @in_juty = InJuty.new + @juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10) end # GET /in_juties/1 @@ -31,6 +32,9 @@ class Origami::InJutiesController < BaseOrigamiController def edit_in_juty @in_juty = InJuty.find(params[:id]) @table = DiningFacility.find(params[:table_id]) + @commissioner = @in_juty.commissioner + + render json: {in_juty: @in_juty, commissioner: @commissioner} end def assign_in_juty @@ -89,12 +93,19 @@ class Origami::InJutiesController < BaseOrigamiController end - def update_for_in_juty - @in_juty.dinning_id = params[:dining_id] - @in_juty.commissioner_ids = params[:commissioner_ids] - @in_juty.in_time = params[:in_time] - @in_juty.out_time = params[:out_time] - @in_juty.save + def update_for_in_juty + @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] + @in_juty.in_time = in_juty_params[:in_time] + @in_juty.out_time = in_juty_params[:out_time] + respond_to do |format| + if @in_juty.save + format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' } + format.json { render :show, status: :ok, location: @in_juty } + else + format.html { render :edit } + format.json { render json: @in_juty.errors, status: :unprocessable_entity } + end + end end # DELETE /in_juties/1 @@ -125,6 +136,6 @@ class Origami::InJutiesController < BaseOrigamiController # Never trust parameters from the scary internet, only allow the white list through. def in_juty_params - params.require(:in_juty).permit(:dinning_id,:commissioner_ids,:in_time,:out_time) + params.require(:in_juty).permit(:id,:dinning_id,:commissioner_ids,:in_time,:out_time) end end diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index f2f0ed16..258c5eb7 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -1,9 +1,12 @@ -<%= simple_form_for @in_juty,:url => origami_create_for_in_juty_path, :method => :post do |f| %> +<%= simple_form_for @in_juty,:url => origami_index_in_juty_path(@table.id), :method => :post do |f| %> <%= f.error_notification %> - + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> +
+ <%= f.hidden_field :dinning_id,:value => @table.id, :class => "form-control col-md-6 " %> + <%= @table.name %>
@@ -12,14 +15,14 @@ <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

- <%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
+ <%= f.text_field :in_time, :value=>'',:class=>"form-control datepicker"%>
- <%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%> + <%= f.text_field :out_time, :value=>'',:class=>"form-control datepicker"%>

<%= f.button :submit, "Create",:class => 'btn btn-primary ', :id => 'create' %> - <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'disabled', :id => 'update' %> + <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update' %> <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
@@ -30,11 +33,18 @@ $(function() { $('.datepicker').datepicker({ - format : 'dd-mm-yyyy', + format : 'yyyy-mm-dd', autoclose: true }); $('.datepicker').attr('ReadOnly','true'); $('.datepicker').css('cursor','pointer'); }); +$('#reset').click(function() { + + // window.location.href = '/origami/assign_in_juty/'+ table_id; + location.reload(); + + return false; + }); \ No newline at end of file diff --git a/app/views/origami/in_juties/_edit_in_juty.html.erb b/app/views/origami/in_juties/_edit_in_juty.html.erb index a2405f58..9eaf8353 100644 --- a/app/views/origami/in_juties/_edit_in_juty.html.erb +++ b/app/views/origami/in_juties/_edit_in_juty.html.erb @@ -2,8 +2,7 @@ <%= f.error_notification %>
- <%= f.input :dinning_id %> - <%= f.input :commissioner_ids %> + <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>

<%= f.input :in_time %> <%= f.input :out_time %>
diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index 0141af05..2ac1048e 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -4,6 +4,7 @@ + @@ -21,13 +22,12 @@ - - <% end %>
Select Dining Facility Name Commissioner Ids In time<%= in_juty.commissioner.name rescue '-' %> <%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %> <%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %><%= link_to 'Back', origami_path(in_juty.dining_facility.id) %><%= link_to 'Edit', origami_edit_in_juty_path(in_juty.dining_facility.id,in_juty) %> <%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id,in_juty),method: :delete, data: {confirm: 'Are you sure?'} %>
+ <%= paginate @juties_in %>
@@ -35,40 +35,45 @@
+
+ +
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 83e7c150..ec72efa9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,10 +94,11 @@ Rails.application.routes.draw do post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item' # in_juties get '/table/:table_id/assign_in_juty' => 'in_juties#assign_in_juty', as: 'assign_in_juty' - post 'assign_in_juty' => 'in_juties#create_for_in_juty', as: 'create_for_in_juty' get 'assign_in_juty/:table_id' => 'in_juties#index_in_juty', as: 'index_in_juty' - get 'table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty' - put '/edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty' + post 'assign_in_juty/:table_id' => 'in_juties#create_for_in_juty' + + get 'assign_in_juty/table/:table_id/in_juty/:id/edit' => 'in_juties#edit_in_juty' ,as: 'edit_in_juty' + patch 'edit_in_juty/:id' => 'in_juties#update_for_in_juty', as: 'update_for_in_juty' delete 'table/:table_id/destroy_in_juty/:id' => 'in_juties#destroy_in_juty', as: 'destroy_in_juty' get 'table/:dining_id/movetable' => "movetable#move_dining"