diff --git a/.gitignore b/.gitignore index 02338531..91a498bc 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,6 @@ config/deploy/config/* # Gem files #Gemfile #Gemfile.lock + +# For Redis Server log file +dump.rdb diff --git a/Gemfile b/Gemfile index 0b7c3f11..99489d5b 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,9 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.0' # Use mysql as the database for Active Record - gem 'mysql2', '>= 0.3.18', '< 0.5' +#Use PosgreSQL gem 'pg' # redis server for cable @@ -42,12 +42,10 @@ gem 'to_xls-rails' #Reporting gem #gem 'compendium' - -# Pagination -gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master' - +#gem "cancan" # Use jquery as the JavaScript library gem 'jquery-rails' +gem 'jquery-ui-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks gem 'turbolinks', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder @@ -59,8 +57,14 @@ gem 'bcrypt', '~> 3.1.7' gem 'sidekiq' +# XML parser +#gem 'nokogiri', '~> 1.6' + # Pagination -gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master' +gem 'kaminari', '~> 1.0.1' + +# Datatable +gem 'filterrific' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development @@ -90,3 +94,11 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'httparty', '~> 0.15.5' + +# gem 'momentjs-rails', '>= 2.9.0' +# gem 'bootstrap-datepicker-rails' +# # gem 'momentjs-rails', '>= 2.9.0' +# gem 'bootstrap3-datetimepicker-rails'z +gem 'bootstrap-datepicker-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5dce67dc..e6f683f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,3 @@ -GIT - remote: git://github.com/amatsuda/kaminari.git - revision: c3c853a944cd2bff072ae05e48c563b2c9a29597 - branch: master - specs: - kaminari (1.0.1) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) - actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) - activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - GEM remote: https://rubygems.org/ specs: @@ -64,6 +46,8 @@ GEM bootstrap (4.0.0.alpha6) autoprefixer-rails (>= 6.0.3) sass (>= 3.4.19) + bootstrap-datepicker-rails (1.6.4.1) + railties (>= 3.0) builder (3.2.3) byebug (9.0.6) coffee-rails (4.2.2) @@ -88,36 +72,54 @@ GEM faker (1.7.3) i18n (~> 0.5) ffi (1.9.18) + filterrific (2.1.2) font-awesome-rails (4.7.0.2) railties (>= 3.2, < 5.2) globalid (0.4.0) activesupport (>= 4.2.0) - i18n (0.8.1) - jbuilder (2.6.4) - activesupport (>= 3.0.0) + httparty (0.15.5) + multi_xml (>= 0.5.2) + i18n (0.8.4) + jbuilder (2.7.0) + activesupport (>= 4.2.0) multi_json (>= 1.2) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (6.0.1) + railties (>= 3.2.16) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.5) + mail (2.6.6) mime-types (>= 1.16, < 4) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) minitest (5.10.2) multi_json (1.12.1) + multi_xml (0.6.0) mysql2 (0.4.6) nio4r (2.1.0) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) pdf-core (0.7.0) pg (0.20.0) prawn (2.2.2) @@ -125,7 +127,7 @@ GEM ttfunk (~> 1.5) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - puma (3.8.2) + puma (3.9.1) rack (2.0.3) rack-cors (0.4.1) rack-protection (2.0.0) @@ -189,7 +191,7 @@ GEM activesupport (>= 3.2.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (5.0.0) + sidekiq (5.0.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) @@ -241,16 +243,20 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bootstrap (~> 4.0.0.alpha3) + bootstrap-datepicker-rails byebug coffee-rails (~> 4.2) cups (~> 0.0.7) database_cleaner factory_girl_rails (~> 4.0) faker + filterrific font-awesome-rails + httparty (~> 0.15.5) jbuilder (~> 2.5) jquery-rails - kaminari! + jquery-ui-rails + kaminari (~> 1.0.1) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) pg @@ -276,4 +282,4 @@ DEPENDENCIES web-console (>= 3.3.0) BUNDLED WITH - 1.15.0 + 1.15.1 diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/CRM.js similarity index 91% rename from app/assets/javascripts/orgiami.js rename to app/assets/javascripts/CRM.js index fc91e269..fc535ff7 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/CRM.js @@ -11,7 +11,10 @@ // about supported directives. // //= require jquery +//= require tether //= require bootstrap //= require jquery_ujs //= require turbolinks //= require cable +//= require jquery-ui +//= require bootstrap-datepicker \ No newline at end of file diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 80a09b47..9ad540ab 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -17,6 +17,11 @@ //= require cable $(document).ready(function(){ + // auto refresh every 10 seconds + // setTimeout(function(){ + // window.location.reload(1); + // }, 10000); + $('.queue_station').on('click',function(){ var orderZone=$(this).children().children().children('.order-zone').text(); var orderItem=$(this).children().children().children('.order-item').text(); @@ -39,36 +44,44 @@ $(document).ready(function(){ }); // complete for queue item - $('.order-complete').on('click',function(){ - var _self= $(this); + $('.order-complete').on('click',function(e){ + //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 }; - var station=$(this).parent().parent(".queue_station").parent().parent().attr('id'); $.ajax({ type: 'POST', url: '/oqs/update_delivery', data: params, dataType: 'json', - success: function(data){ - var queue_station=_self.parent().parent(".queue_station"); + success: function(data){ + for (i = 0; i < data.length; i++) { + var queue_station = $('#assigned_queue_' + data[i]).parent().parent(".queue_station"); + var station = queue_station.parent().parent().attr('id'); - // Remove a queue card from current station - queue_station.remove(); + // Remove a queue card from current station + queue_station.remove(); - // Remove a queue card from current station - queue_station.children('.card-footer').remove(); - - // Add removed queue card from station to completed - $("#completed").children('.card-columns').append(queue_station); + // Remove a queue card from current station + queue_station.children('.card-footer').remove(); + + // Add removed queue card from station to completed + $("#completed").children('.card-columns').append(queue_station); - // update queue item count in station - $("#"+station+"_count").text(parseInt($("#"+station+"_count").text())-1); - $("#completed_count").text(parseInt($("#completed_count").text())+1); + // update queue item count in each station + var station_count=parseInt($("#"+station+"_count").text()) - 1; + $("#"+station+"_count").text(station_count); + } + + // update queue item count in completed station + $("#completed_count").text(parseInt($("#completed_count").text()) + data.length); alert("updated!"); + // Page reload + location.reload(); } - }); + }); }); $('#print_order_item').on('click',function(){ @@ -80,4 +93,14 @@ $(document).ready(function(){ success: function(data){ } }); }); + + $('#print_order_summary').on('click',function(){ + var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); + var params = { 'id':assigned_item_id }; + $.ajax({ + type: 'GET', + url: '/oqs/print/print_order_summary/'+assigned_item_id, + success: function(data){ } + }); + }); }); diff --git a/app/assets/javascripts/origami/request_bills.coffee b/app/assets/javascripts/api/origami/paypar.coffee similarity index 100% rename from app/assets/javascripts/origami/request_bills.coffee rename to app/assets/javascripts/api/origami/paypar.coffee diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f7b2e2b0..202d4387 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,3 +17,141 @@ //= require turbolinks //= require cable //= require settings/processing_items +//= require jquery-ui +//= require bootstrap-datepicker + +$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ + $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); + $('.dropdown-toggle').dropdown(); +}); + +/* +* ToDo Move to here from pages +* +* + + + +$(function(){ + $('#custom_excel').hide(); + + $('#custom_excel').click(function(){ + var url = $('#custom_excel').attr('data-url'); + $('#frm_report').attr('action',url) + $('#frm_report').submit(); + // window.location = url; + }); + + var item = $('#item').val(); + var payment_type = $('#payment_type'); + + if(item == 'order'){ + $('#cashier').hide(); + $('#waiter').show(); + if(payment_type){ + $('#payment_type').hide(); + } + } + else if(item == 'sale'){ + $('#waiter').hide(); + $('#cashier').show(); + } + else{ + $('#waiter').hide(); + $('#cashier').show(); + $("#item").val('sale'); + } +}); + +//Reset the form to pervious values +$("#branch").val(<%=params[:branch]%>); +$("#waiter").val("<%=params[:waiter]%>"); +$("#cashier").val(<%=params[:cashier]%>); +$("#product").val(<%=params[:product]%>); +$("#singer").val(<%=params[:singer]%>); +$("#item").val('<%=params[:item]%>'); +$("#guest_role").val('<%=params[:guest_role]%>'); + + +$("#from").val("<%=params[:from]%>"); +$("#to").val("<%=params[:to]%>"); +$("#sel_period").val(<%=params[:period]%>); +$("#sel_sale_type").val(<%=params[:sale_type]%>); + +<% if params[:period_type] == 1 || params[:period_type] == "1" %> + $("#rd_period_type_1").attr("checked","checked"); +<% else %> + $("#rd_period_type_0").attr("checked","checked"); +<% end %> +$(".btn-group button").removeClass("active"); +<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> +$("#btn_report_type_<%= report_type %>").addClass("active"); + +$('#item').change(function(){ + var item = $('#item').val(); + var payment_type = $('#payment_type'); + + if(item == 'sale'){ + $('#waiter').hide(); + $('#cashier').show(); + if(payment_type){ + $('#payment_type').show(); + } + } + else{ + $('#cashier').hide(); + $('#waiter').show(); + if(payment_type){ + $('#payment_type').hide(); + } + } +}); + +$(function(){ + var check_arr = []; + var search = '<%= params[:period_type] %>'; + if(search){ + if(parseInt(search) == 0){ + search_by_period(); + } + else{ + search_by_date(); + } + }else{ + search_by_period(); + } + $('#sel_period').change(function(){ + search_by_period(); + }); + function search_by_period(){ + var period = $('#sel_period').val(); + var period_type = 0; + var from = ""; + var to = ""; + } + + $('#from').change(function(){ + search_by_date(); + }); + + $('#to').change(function(){ + search_by_date(); + }); + function search_by_date(){ + var from = $('#from').val(); + var to = $('#to').val(); + var period = 0; + var period_type = 1; + if(to != '' && from != ''){ + shift_name = from + ',' + to; + check_arr.push(to); + // console.log(check_arr.length) + if(check_arr.length == 1){ + } + if(check_arr.length == 3){ + check_arr = []; + } + } + } +}); +*/ diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js index 739aa5f0..43efe3f2 100644 --- a/app/assets/javascripts/cable.js +++ b/app/assets/javascripts/cable.js @@ -5,6 +5,7 @@ //= require_self //= require_tree ./channels +// Temp Disable (function() { this.App || (this.App = {}); diff --git a/app/assets/javascripts/crm/dining_queues.coffee b/app/assets/javascripts/crm/dining_queues.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/crm/dining_queues.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/javascripts/membership_actions.coffee b/app/assets/javascripts/membership_actions.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/membership_actions.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/javascripts/origami.js b/app/assets/javascripts/origami.js new file mode 100644 index 00000000..b39a4c6e --- /dev/null +++ b/app/assets/javascripts/origami.js @@ -0,0 +1,346 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require tether +//= require bootstrap +//= require jquery_ujs +//= require turbolinks +//= require cable +//= require jquery-ui +//= require bootstrap-datepicker + +$(document).ready(function(){ + // auto refresh every 60 seconds + // setTimeout(function(){ + // window.location.reload(1); + // }, 60000); + + // For selected order return + var order_status = ""; + order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim(); + + // Enable/Disable Button + control_button(order_status); + + $(".orders").on('click', function(){ + $("#order-sub-total").text(''); + // $("#order-food").text(''); + // $("#order-beverage").text(''); + $("#order-discount").text(''); + $("#order-Tax").text(''); + $("#order-grand-total").text(''); + + var zone_name=$(this).find(".orders-table").text(); + var receipt_no=$(this).find(".orders-receipt-no").text(); + var unique_id = $(this).find(".orders-id").text(); + var order_status=$(this).find(".orders-order-status").text().trim(); + + // Enable/Disable Button + control_button(order_status); + + var customer_id=$(this).find(".customer-id").text(); + show_customer_details(customer_id); + + $("#re-print").val(unique_id); + + var cashier=""; + var receipt_date=""; + var sub_total=0; + var discount_amount=0; + var tax_amount=0; + var grand_total_amount=0; + + $("#order-title").text("ORDER DETAILS - " + zone_name); + // clear order items + $("#order-items-table").children("tbody").empty(); + + // AJAX call for order + $.ajax({ + type: "POST", + url: "/origami/" + unique_id, + data: { 'booking_id' : unique_id }, + success:function(result){ + for (i = 0; i < result.length; i++) { + var data = JSON.stringify(result[i]); + var parse_data = JSON.parse(data); + var show_date = ""; + + // Receipt Header + receipt_no = result[i].receipt_no; + cashier = result[i].cashier_name; + if(result[i].receipt_date != null){ + receipt_date = new Date(result[i].receipt_date); + show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes() + } + + $("#receipt_no").text(receipt_no); + $("#cashier").text(cashier == null ? "" : cashier); + $("#receipt_date").text(show_date); + + + //Receipt Charges + sub_total += (parse_data.qty*parse_data.price); + + discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount; + tax_amount = parse_data.tax_amount; + grand_total_amount = parse_data.grand_total_amount; + + $("#order-sub-total").text(sub_total); + // $("#order-food").text(''); + // $("#order-beverage").text(''); + $("#order-discount").text(discount_amount); + $("#order-Tax").text(tax_amount); + $("#order-grand-total").text(grand_total_amount); + + // Ordered Items + var order_items_rows = "" + + "" + parse_data.item_name + "" + + "" + parse_data.qty + "" + + "" + parse_data.qty*parse_data.price + "" + + ""; + + $("#order-items-table").children("tbody").append(order_items_rows); + } + } + }); + // End AJAX Call + + $('.orders').removeClass('selected-item'); + $(this).addClass('selected-item'); + }); + + // Bill Request + $('#request_bills').click(function() { + var order_id=$(".selected-item").find(".orders-id").text(); + if(order_id!=""){ + window.location.href = '/origami/' + order_id + '/request_bills' + } + else { + alert("Please select an order!"); + } + return false; + }); + + // Discount for Payment + $('#discount').click(function() { + var order_id=$(".selected-item").find(".orders-id").text(); + if(order_id!=""){ + window.location.href = '/origami/' + order_id + '/discount' + } + else { + alert("Please select an order!"); + } + + return false; + }); + + // Pay Discount for Payment + $("#pay-discount").on('click', function(e){ + e.preventDefault(); + var sale_id = $('#sale-id').text(); + var sale_item_id = $('.selected-item').attr('id'); + var sub_total = $('#order-sub-total').text(); + var grand_total = $('#order-grand-total').text(); + var discount_type = $('#discount-type').val(); + var discount_value = $('#discount-amount').val(); + var discount_amount = discount_value; + var ajax_url = "/origami/" + sale_id + "/discount"; + + if(sale_item_id != null){ + ajax_url = "/origami/" + sale_item_id + "/discount"; + sub_total = $("#"+sale_item_id).children().find("#item-total-price").text(); + } + + // For Percentage Discount + if(discount_type == 1){ + discount_amount=(sub_total*discount_value)/100; + } + + var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount}; + $.ajax({ + type: "POST", + url: ajax_url, + data: params, + success:function(result){ } + }); + }); + + + // Payment for Bill + $('#pay-bill').click(function() { + var sale_id=$(".selected-item").find(".orders-id").text(); + if(sale_id!=""){ + window.location.href = '/origami/sale/'+ sale_id + "/payment" + } + else { + alert("Please select an order!"); + } + + return false; + }); + + $('#customer').click(function() { + var sale = $(".selected-item").find(".orders-id").text(); + if (sale.substring(0, 3)=="SAL") { + var sale_id = sale + }else{ + var sale_id = $(".selected-item").find(".order-cid").text(); + } + window.location.href = '/origami/'+ sale_id + "/customers" + + return false; + }); + + $('#re-print').click(function() { + var sale_id = $(".selected-item").find(".orders-id").text(); + + window.location.href = '/origami/'+ sale_id + "/reprint" + + return false; + }); + + function show_customer_details(customer_id){ + + if(window.location.pathname.substring(0, 12) == "/origami/SAL"){ + var url = customer_id+"/get_customer/" + }else{ + var url = "origami/"+customer_id+"/get_customer/" + } + + $('.customer_detail').removeClass('hide'); + + //Start Ajax + $.ajax({ + type: "GET", + url: url, + data: {}, + dataType: "json", + success: function(data) { + $("#customer_name").text(data["customer"].name); + $.each(data["response_data"]["data"], function (i) { + if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){ + var balance = data["response_data"]["data"][i]["balance"]; + if (data["response_data"]["status"]==true) { + $('.rebate_amount').removeClass('hide'); + row = + '' + data["response_data"]["data"][i]["accountable_type"] +'' + +'' + balance + ''; + + $(".rebate_amount").html(row); + } + + } + }); + } + }); + //End Ajax + } + + /* For Receipt - Calculate discount or tax */ + $('.cashier_number').on('click', function(event){ + if(event.handled !== true) { + var original_value=0; + original_value = $('#discount-amount').val(); + + var input_type = $(this).attr("data-type"); + + switch (input_type) { + case 'num': + var input_value = $(this).attr("data-value"); + if (original_value == "0.0"){ + $('#discount-amount').val(input_value); + update_balance(); + } + else{ + $('#discount-amount').val(original_value + '' + input_value); + update_balance(); + } + break; + + case 'add': + var input_value = $(this).attr("data-value"); + amount = parseInt(input_value); + $('#discount-amount').val(amount); + $('#discount-type').val(1); + update_balance(); + break; + + case 'del' : + var discount_text=$('#discount-amount').val(); + $('#discount-amount').val(discount_text.substr(0,discount_text.length-1)); + update_balance(); + break; + + case 'clr': + $('#discount-amount').val("0.0"); + update_balance(); + break; + } + + event.handled = true; + } else { + return false; + } + }); + + $('.discount-item-row').on('click',function(){ + $('.discount-item-row').removeClass('selected-item'); + $(this).addClass('selected-item'); + }); + +}); + +/* Button Control by Status */ +function control_button(order_status){ + if(order_status=="billed"){ + $("#customer").prop('disabled', false); + $("#request_bills").prop('disabled', true); + $("#discount").prop('disabled', false); + $("#pay-bill").prop('disabled', false); + $("#re-print").prop('disabled', true); + } + else if(order_status=="new") { + $("#customer").prop('disabled', false); + $("#request_bills").prop('disabled', false); + $("#discount").prop('disabled', true); + $("#pay-bill").prop('disabled', true); + $("#re-print").prop('disabled', true); + }else if(order_status=="completed"){ + $("#re-print").prop('disabled', false); + } + else { + $("#customer").prop('disabled', true); + $("#request_bills").prop('disabled', true); + $("#discount").prop('disabled', true); + $("#pay-bill").prop('disabled', true); + $("#re-print").prop('disabled', true); + } + +} + +/* For Receipt - Update Balance */ +function update_balance(){ + var discount_type = $('#discount-type').val(); + var discount_amount = $('#discount-amount').val(); + var sub_total = $('#order-sub-total').text(); + var tax = $('#order-Tax').text(); + + // For Percentage Discount + if(discount_type == 1){ + discount_amount=(sub_total*discount_amount)/100; + } + + var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; + $('#order-discount').text(discount_amount); + $('#order-grand-total').text(total); +} diff --git a/app/assets/javascripts/origami/redeem_payments.coffee b/app/assets/javascripts/origami/redeem_payments.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/redeem_payments.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/javascripts/payment.js b/app/assets/javascripts/payment.js new file mode 100644 index 00000000..b7aadf05 --- /dev/null +++ b/app/assets/javascripts/payment.js @@ -0,0 +1,40 @@ +// number key pad +$(document).on('click', '.cashier_number', function(event){ + event.stopPropagation(); + event.preventDefault(); + if(event.handled !== true) { + var original_value; + original_value = $('#amount').text(); + + var input_value = $(this).attr("data-value"); + + var input_type = $(this).attr("data-type"); + switch (input_type) { + case 'num': + if (original_value == "0.0"){ + $('#amount').text(input_value); + }else{ + $('#amount').append(input_value); + } + break; + + case 'add': + var input_value = $(this).attr("data-value"); + amount = parseInt(input_value) + parseInt(original_value); + $('#amount').html(amount); + + break; + case 'clr': + $('#amount').html("0.0"); + break; + case 'del' : + var cash=$('#amount').text(); + $('#amount').text(cash.substr(0,cash.length-1)); + break; + + } + event.handled = true; + } else { + return false; + } +}); diff --git a/app/assets/javascripts/report.js b/app/assets/javascripts/report.js new file mode 100644 index 00000000..09f74075 --- /dev/null +++ b/app/assets/javascripts/report.js @@ -0,0 +1,4 @@ +$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ + $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); + $('.dropdown-toggle').dropdown(); +}); \ No newline at end of file diff --git a/app/assets/javascripts/settings/membership_actions.coffee b/app/assets/javascripts/settings/membership_actions.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/membership_actions.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/javascripts/settings/orders.coffee b/app/assets/javascripts/settings/orders.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/orders.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/javascripts/transactions.js b/app/assets/javascripts/transactions.js new file mode 100644 index 00000000..12e8ee44 --- /dev/null +++ b/app/assets/javascripts/transactions.js @@ -0,0 +1,7 @@ +//= require jquery +//= require bootstrap +//= require jquery_ujs +//= require turbolinks +//= require cable +//= require jquery-ui +//= require bootstrap-datepicker \ No newline at end of file diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index b0f802f1..a88efe96 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -1,9 +1,13 @@ @import "bootstrap"; @import "font-awesome"; @import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; /* Show it is fixed to the top */ // body { // min-height: 75rem; // padding-top: 4.5rem; // } + + diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 07c98b85..b516836a 100644 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -16,5 +16,6 @@ } .selected-item { + color: #fff !important; background-color: blue; } diff --git a/app/assets/stylesheets/origami/request_bills.scss b/app/assets/stylesheets/api/origami/paypar.scss similarity index 59% rename from app/assets/stylesheets/origami/request_bills.scss rename to app/assets/stylesheets/api/origami/paypar.scss index 20719090..3ce106bb 100644 --- a/app/assets/stylesheets/origami/request_bills.scss +++ b/app/assets/stylesheets/api/origami/paypar.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the origami/RequestBills controller here. +// Place all the styles related to the api/origami/paypar controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9456be10..a4fa6b9f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,6 +2,9 @@ @import "bootstrap"; @import "font-awesome"; @import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; + /* Show it is fixed to the top */ // body { @@ -57,3 +60,19 @@ ul.dropdown-menu li a{ /*----- Header Bar -----*/ /*----- Header Bar -----*/ + +/*----- Layout ------ */ + +.margin-top-20 { + margin: 20px 0 0 0; +} + +/*----- Layout ------ */ + +/*--- Reset --- */ + +select.form-control { + height: inherit !important; +} + +/*--- Reset --- */ diff --git a/app/assets/stylesheets/membership_actions.scss b/app/assets/stylesheets/membership_actions.scss new file mode 100644 index 00000000..a916dc5b --- /dev/null +++ b/app/assets/stylesheets/membership_actions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the membership_actions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss deleted file mode 100644 index b0f802f1..00000000 --- a/app/assets/stylesheets/orgiami.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import "bootstrap"; -@import "font-awesome"; -@import "theme"; - -/* Show it is fixed to the top */ -// body { -// min-height: 75rem; -// padding-top: 4.5rem; -// } diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss new file mode 100644 index 00000000..71a9915e --- /dev/null +++ b/app/assets/stylesheets/origami.scss @@ -0,0 +1,131 @@ +@import "bootstrap"; +@import "font-awesome"; +@import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; + +/* Show it is fixed to the top */ +// body { +// min-height: 75rem; +// padding-top: 4.5rem; +// } +.others-payment{ + line-height:100px; + text-align:center; + color:white; + width:300px; + height:100px; + font-size:18px; +} + +.orders-table { + cursor: pointer; +} + +.cashier_number{ + width: 33%; + height:70px; + line-height:70px; + text-align:center; + background:#54A5AF; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} + +.del_cashier_number{ + opacity:0.6, +} + +.pay{ + width: 98%; + height:211px; + line-height:211px; + text-align:center; + font-size:20px; + color:white; +} + +.cashier_number:hover{ + background:#A9F5F2; +} + +.long{ + width:49%; +} + +.sold { + background-color: red; +} + +.paid { + background-color: green; +} + +.selected-item { + color: #fff !important; + background-color: blue !important; +} + +/* Reciept Style */ +#order-charges-table td { + border-top: none !important; +} + +.charges-name { + width: 80%; + text-align: left; +} + +.item-name { + width: 60%; + text-align: left; +} + +.item-attr { + width: 20%; + text-align: right; +} + + +/* Colors */ +.purple { + background-color:#7a62d3; +} + +.red { + background-color:#ff0000; +} + +.green{ + background-color: #009900 +} + +.left{ + margin-left:1px; +} + +.bottom{ + margin-bottom: 1px; +} +/*----- Reset -----*/ + +select.form-control { + height: inherit !important; +} + +.form-horizontal .form-group { + margin-right: 0px !important; +} + +/* Discount */ + +.discount-item-row { + cursor: pointer; +} + +tr.discount-item-row:hover { + background-color: #e3e3e3 !important; +} diff --git a/app/assets/stylesheets/origami/redeem_payments.scss b/app/assets/stylesheets/origami/redeem_payments.scss new file mode 100644 index 00000000..8fdd1e53 --- /dev/null +++ b/app/assets/stylesheets/origami/redeem_payments.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/redeem_payments controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/settings/membership_actions.scss b/app/assets/stylesheets/settings/membership_actions.scss new file mode 100644 index 00000000..66eafd50 --- /dev/null +++ b/app/assets/stylesheets/settings/membership_actions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the settings/membership_actions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/settings/orders.scss b/app/assets/stylesheets/settings/orders.scss new file mode 100644 index 00000000..436ceee1 --- /dev/null +++ b/app/assets/stylesheets/settings/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the settings/orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/transactions.scss b/app/assets/stylesheets/transactions.scss new file mode 100644 index 00000000..5ca9b171 --- /dev/null +++ b/app/assets/stylesheets/transactions.scss @@ -0,0 +1,5 @@ +@import "bootstrap"; +@import "font-awesome"; +@import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; \ No newline at end of file diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index d4940907..6b1fb225 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -8,12 +8,18 @@ class Api::BillController < Api::ApiController #create Bill by Booking ID if (params[:booking_id]) - @sale = Sale.new - @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) - + booking = Booking.find(params[:booking_id]) + if booking + if booking.sale_id.nil? + @sale = Sale.new + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee) + else + @status = true + end + end elsif (params[:order_id]) @sale = Sale.new - @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee) end end diff --git a/app/controllers/api/customers_controller.rb b/app/controllers/api/customers_controller.rb index 8ce2041c..2adc7c8a 100644 --- a/app/controllers/api/customers_controller.rb +++ b/app/controllers/api/customers_controller.rb @@ -9,4 +9,9 @@ class Api::CustomersController < ActionController::API def show @customer = Customer.find_by(params[:id]) end + + #Show customer detail by Order item + def get_customer_order + @customer = Customer.find(params[:id]) + end end diff --git a/app/controllers/api/invoices_controller.rb b/app/controllers/api/invoices_controller.rb index 7d6e2cb7..aedfc9f7 100644 --- a/app/controllers/api/invoices_controller.rb +++ b/app/controllers/api/invoices_controller.rb @@ -1,6 +1,6 @@ class Api::InvoicesController < ActionController::API - before :authenticate_token - before :set_sale_params, only:[:show, :update, :destroy] + # before :authenticate_token + # before :set_sale_params, only:[:show, :update, :destroy] #List open invoices for today. def index diff --git a/app/controllers/api/memberships_controller.rb b/app/controllers/api/memberships_controller.rb index 6b125868..ea5b5279 100644 --- a/app/controllers/api/memberships_controller.rb +++ b/app/controllers/api/memberships_controller.rb @@ -1,5 +1,5 @@ class Api::MembershipsController < ActionController::API - before :authenticate_token + #before :authenticate_token #Add Membership to invoice diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 443a754b..08847f6f 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -28,33 +28,31 @@ class Api::OrdersController < Api::ApiController @order = Order.new @order.source = params[:order_source] @order.order_type = params[:order_type] - @order.customer_id = params[:customer_id] + @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile @order.items = params[:order_items] @order.guest = params[:guest_info] @order.table_id = params[:table_id] @order.new_booking = true - #@order.employee_name = "Emenu" @order.employee_name = current_login_employee.name - - #Create Table Booking or Room Booking - if !params["booking_id"].nil? && params[:booking_id].to_i > 0 - #@order.new_booking = false - @order.new_booking = true - @order.booking_id = params[:booking_id] + if !params["booking_id"].nil? + # check booking id is already completed. + booking = Booking.find(params[:booking_id]) + if !booking.sale_id.nil? + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed" + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + end + else + @order.new_booking = false + @order.booking_id = params[:booking_id] + puts "booking sale is null" + end end @status, @booking = @order.generate - - # rescue Exception => error - # @status = false - # @error_messages = "Exception has occurs on System" - # - # logger.fatal("Exception Raise - " + error.message) - # end - - - end # Description diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb index 2c2d219b..39219c6b 100644 --- a/app/controllers/api/payments_controller.rb +++ b/app/controllers/api/payments_controller.rb @@ -29,56 +29,56 @@ class Api::PaymentsController < ActionController::API #:received_amount, :card_payment_reference, :vochure_no, :giftcard_no, #:customer_id, :external_payment_status - switch (payment_method) - case "cash" + case payment_method + when "cash" sale_payment.payment_method = "cash" sale_payment.received_amount = params[:amount] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "creditnote" + when "creditnote" sale_payment.payment_method = "creditnote" sale_payment.received_amount = params[:amount] sale_payment.customer_id = params[:customer_id] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "visa" + when "visa" sale_payment.payment_method = "visa" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "master" + when "master" sale_payment.payment_method = "master" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "jcb" + when "jcb" sale_payment.payment_method = "jcb" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "mpu" + when "mpu" sale_payment.payment_method = "mpu" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "unionpay" + when "unionpay" sale_payment.payment_method = "unionpay" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "vochure" + when "vochure" sale_payment.payment_method = "vochure" sale_payment.received_amount = params[:amount] sale_payment.customer_id = params[:customer_id] sale_payment.payment_reference = params[:vochure_no] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "giftcard" + when "giftcard" sale_payment.payment_method = "giftcard" sale_payment.received_amount = params[:amount] sale_payment.customer_id = params[:customer_id] sale_payment.payment_reference = params[:giftcard_no] @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) - case "paypar" + when "paypar" sale_payment.payment_method = "paypar" sale_payment.received_amount = params[:amount] sale_payment.payment_reference = params[:payment_reference] diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb new file mode 100644 index 00000000..c1ae1a01 --- /dev/null +++ b/app/controllers/base_report_controller.rb @@ -0,0 +1,77 @@ +class BaseReportController < ActionController::Base + include LoginVerification + layout "application" + + #before_action :check_installation + protect_from_forgery with: :exception + + PERIOD = { + "today" => 0, + "yesterday" => 1, + "this_week" => 2, + "last_week" => 3, + "last_7" => 4, + "this_month" => 5, + "last_month" => 6, + "last_30" => 7, + "this_year" => 8, + "last_year" => 9 + } + + def get_date_range_from_params + period_type = params[:period_type] + period = params[:period] + from = params[:from] + to = params[:to] + day_ref = Time.now + if period_type.to_i == 1 + if params[:from] && params[:to] + if params[:from] != "" && params[:to] !="" + from = DateTime.strptime(params[:from], "%m/%d/%Y") + to = DateTime.strptime(params[:to], "%m/%d/%Y") + else + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + end + end + else + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + return from, to + end + +end diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb index eeb19f75..65511512 100644 --- a/app/controllers/crm/bookings_controller.rb +++ b/app/controllers/crm/bookings_controller.rb @@ -1,4 +1,4 @@ -class Crm::BookingsController < ApplicationController +class Crm::BookingsController < BaseCrmController def update_booking booking = Booking.find(params[:booking_id]) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 4e97faec..4cacae00 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -1,20 +1,73 @@ -class Crm::CustomersController < ApplicationController +class Crm::CustomersController < BaseCrmController before_action :set_crm_customer, only: [:show, :edit, :update, :destroy] # GET /crm/customers # GET /crm/customers.json def index - @crm_customers = Crm::Customer.all + filter = params[:filter] + + if filter.nil? + @crm_customers = Customer.order("customer_id").page(params[:page]) + #@products = Product.order("name").page(params[:page]).per(5) + else + @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 + + # if flash["errors"] + # @crm_customer.valid? + # end + # @membership = Customer.get_member_group + # if @membership["status"] == true + # @member_group = @membership["data"] + # end + respond_to do |format| + format.html # index.html.erb + format.json { render json: @crm_customers } + end end # GET /crm/customers/1 # GET /crm/customers/1.json def show + @orders = Order.where("customer_id=?", params[:id]) + @sales = Sale.where("customer_id=?", params[:id]) + + if @orders + @order_items = [] + @orders.each do |order| + @order_items = @order_items + order.order_items + end + end + if @sales + @sale_items = [] + @sales.each do |sale| + @sale_items = @sale_items + sale.sale_items + end + end + + #get customer amount + @customer = Customer.find(params[:id]) + response = Customer.get_member_account(@customer) + + if(response["status"] == true) + @membership = response["data"] + else + @membership = 0 + end + + #end customer amount + end # GET /crm/customers/new def new - @crm_customer = Crm::Customer.new + @crm_customer = Customer.new + @membership = Customer.get_member_group() + end # GET /crm/customers/1/edit @@ -23,31 +76,109 @@ class Crm::CustomersController < ApplicationController # POST /crm/customers # POST /crm/customers.json - def create - @crm_customer = Crm::Customer.new(crm_customer_params) + def create + @crm_customers = Customer.new(customer_params) + respond_to do |format| - if @crm_customer.save - format.html { redirect_to @crm_customer, notice: 'Customer was successfully created.' } - format.json { render :show, status: :created, location: @crm_customer } + puts @crm_customers.errors.to_json + if @crm_customers.save + name = customer_params[:name] + phone = customer_params[:contact_no] + email = customer_params[:email] + dob = customer_params[:date_of_birth] + member_group_id = params[:member_group_id] + + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("create_membership_customer") + merchant_uid = memberaction.merchant_account_id.to_s + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, + dob: dob, + member_group_id: member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + + if response["status"] == true + + customer = Customer.find(@crm_customers.customer_id) + status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) + + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' } + else + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'} + end + # format.json { render :index, status: :created, location: @crm_customers } + else + + @crm_customers.destroy + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'} + else + format.html { redirect_to crm_customers_path, notice: response["message"] } + end + end else - format.html { render :new } - format.json { render json: @crm_customer.errors, status: :unprocessable_entity } + + if params[:sale_id] + flash[:errors] = @crm_customers.errors + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'} + format.json { render json: @crm_customers.errors, status: :unprocessable_entity } + else + flash[:errors] = @crm_customers.errors + format.html { redirect_to crm_customers_path} + format.json { render json: @crm_customers.errors, status: :unprocessable_entity } + end end - end + end +end # PATCH/PUT /crm/customers/1 # PATCH/PUT /crm/customers/1.json def update + respond_to do |format| - if @crm_customer.update(crm_customer_params) - format.html { redirect_to @crm_customer, notice: 'Customer was successfully updated.' } + if @crm_customer.update(customer_params) + + name = customer_params[:name] + phone = customer_params[:contact_no] + email = customer_params[:email] + dob = customer_params[:date_of_birth] + id = @crm_customer.membership_id + member_group_id = params[:member_group_id] + + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("update_membership_customer") + merchant_uid = memberaction.merchant_account_id.to_s + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, + dob: dob, + id: id,member_group_id:member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } + else - format.html { render :edit } + + flash[:errors] = @crm_customers.errors + format.html { redirect_to crm_customers_path} format.json { render json: @crm_customer.errors, status: :unprocessable_entity } end + end end @@ -64,11 +195,12 @@ class Crm::CustomersController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_crm_customer - @crm_customer = Crm::Customer.find(params[:id]) + @crm_customer = Customer.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. - def crm_customer_params - params.require(:crm_customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code) + def customer_params + + params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth) end end diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb new file mode 100644 index 00000000..41655d98 --- /dev/null +++ b/app/controllers/crm/dining_queues_controller.rb @@ -0,0 +1,84 @@ +class Crm::DiningQueuesController < BaseCrmController + before_action :set_dining_queue, only: [:show, :edit, :update, :destroy] + + # GET /crm/dining_queues + # GET /crm/dining_queues.json + def index + @dining_queues = DiningQueue.all + end + + # GET /crm/dining_queues/1 + # GET /crm/dining_queues/1.json + def show + end + + # GET /crm/dining_queues/new + def new + @dining_queue = DiningQueue.new + @queue_no = DiningQueue.generate_queue_no + end + + # GET /crm/dining_queues/1/edit + def edit + end + + # POST /crm/dining_queues + # POST /crm/dining_queues.json + def create + @dining_queue = DiningQueue.new(dining_queue_params) + + respond_to do |format| + if @dining_queue.save + + unique_code = "QueueNoPdf" + + # get printer info + print_settings = PrintSetting.find_by_unique_code(unique_code) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_queue_no(print_settings,@dining_queue) + + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully created.' } + format.json { render :show, status: :created, location: @dining_queue } + else + format.html { render :new } + format.json { render json: @dining_queue.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /crm/dining_queues/1 + # PATCH/PUT /crm/dining_queues/1.json + def update + respond_to do |format| + if @dining_queue.update(dining_queue_params) + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully updated.' } + format.json { render :show, status: :ok, location: @dining_queue } + else + format.html { render :edit } + format.json { render json: @dining_queue.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /crm/dining_queues/1 + # DELETE /crm/dining_queues/1.json + def destroy + @dining_queue.destroy + respond_to do |format| + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_dining_queue + @dining_queue = DiningQueue.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def dining_queue_params + params.require(:dining_queue).permit(:name, :contact_no, :queue_no) + end +end diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index 083f2bf7..c05e7cf3 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,24 +1,60 @@ class Crm::HomeController < BaseCrmController def index - @booking = Booking.all + @booking = Booking.all @customer = Customer.all - - #@booking = Booking.select("bookings.id as booking_id, - # bookings.checkin_at, - # bookings.checkin_by, - # bookings.dining_facility_id, - # od.customer_id as customer, - # od.id as order_id, - # od.item_count as count, - # odt.id as order_item_id, - # odt.item_name as item_name") - # .joins("join booking_orders as bko ON bko.booking_id = bookings.id") - # .joins("right join orders as od ON od.id = bko.order_id") - # .joins("right join order_items as odt ON odt.order_id=od.id") - # .order("bookings.id DESC") + from = Time.now.beginning_of_day.utc + to = Time.now.end_of_day.utc + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') + + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end + def show end + + #print for crm + def print_order + + @booking = Booking.find(params[:id]) + + @total_amount = 0.00 + @total_tax = 0.00 + + if @booking.booking_orders + order_items = [] + @booking.booking_orders.each do |bo| + order = Order.find(bo.order_id) + #if (order.status == "new") + order_items = order_items + order.order_items + #end + end + + end + + unique_code="CrmOrderPdf" + + print_settings = PrintSetting.find_by_unique_code(unique_code) + + printer = Printer::ReceiptPrinter.new(print_settings) + + printer.print_crm_order(@booking,order_items,print_settings) + + end + + # def update_sale_by_customer + + # sale = Sale.find(params[:sale_id]) + # status = sale.update_attributes(customer_id: params[:customer_id]) + + # if status == true + # render json: JSON.generate({:status => true}) + # else + # render json: JSON.generate({:status => false, :error_message => "Record not found"}) + + # end + # end + end + diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index c3dba58b..29e9082a 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -10,12 +10,20 @@ class HomeController < ApplicationController @login_form.emp_id = params[:login_form][:emp_id] @login_form.password = params[:login_form][:password] @employee = Employee.login(@login_form.emp_id, @login_form.password) - if @employee - session[:session_token] = @employee.token_session - redirect_to dashboard_path - else - render :index - end + + if @employee != nil + if @employee.role == "administrator" + session[:session_token] = @employee.token_session + redirect_to dashboard_path + elsif @employee.role == "cashier" + session[:session_token] = @employee.token_session + redirect_to origami_root_path + else + render :index + end + else + redirect_to origami_root_path, :notice => "Username and Password dosn't match!" + end end diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 1292a5e6..7af42166 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -27,23 +27,31 @@ class Oqs::HomeController < BaseOqsController # update delivery status when complete click def update_delivery_status + removed_item = [] assigned_item_id = params[:id] assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_item.delivery_status=true - assigned_item.save + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + + # update delivery status for completed same order items + assigned_items.each do |ai| + ai.delivery_status=true + ai.save + removed_item.push(ai.assigned_order_item_id) + end + render :json => removed_item.to_json end # Query for OQS with status def queue_items_query(status) - AssignedOrderItem.select("assigned_order_items.id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at") - .joins("join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id + AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at") + .joins(" left join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id left join dining_facilities as df on df.zone_id = oqpz.zone_id left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id - left join orders as od ON od.id = assigned_order_items.order_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 - left join customers as cus ON cus.id = od.customer_id") + left join customers as cus ON cus.customer_id = od.customer_id") .where("assigned_order_items.delivery_status = #{status}") - .group("assigned_order_items.id") + .group("assigned_order_items.assigned_order_item_id") .order("odt.item_name DESC") end end diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 368a513d..ecbc94e7 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -1,16 +1,45 @@ class Oqs::PrintController < ApplicationController + # Print Order Item def print unique_code="OrderItemPdf" assigned_item_id=params[:id] - assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('id='+assigned_item_id) + assigned_item=AssignedOrderItem.find(assigned_item_id) + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + # printer for each stations + printer_name = assigned_item.order_queue_station.printer_name + + # print when complete click print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings,assigned_order_item[0].order_id, assigned_order_item[0].item_code ) + order_queue_printer.print_order_item(printer_name,assigned_item.order_id, assigned_item.item_code ) + + # update print status for completed same order items + assigned_items.each do |ai| + ai.print_status=true + ai.save + end + end - # update print status when complete click - assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_item.print_status=true - assigned_item.save + # Print Order Details + def print_order_summary + unique_code="OrderSummaryPdf" + assigned_item_id=params[:id] + assigned_item=AssignedOrderItem.find(assigned_item_id) + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + + # printer for each stations + printer_name = assigned_item.order_queue_station.printer_name + + # print when complete click + print_settings=PrintSetting.find_by_unique_code(unique_code) + order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) + order_queue_printer.print_order_summary(printer_name,assigned_item.order_id) + + # update print status for completed same order items + assigned_items.each do |ai| + ai.print_status=true + ai.save + end end end diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb new file mode 100644 index 00000000..1d18e401 --- /dev/null +++ b/app/controllers/origami/card_payments_controller.rb @@ -0,0 +1,29 @@ +class Origami::CardPaymentsController < BaseOrigamiController + + + def index + @membership_rebate_balance = 0 + @membership_id = 0 + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id) + if membership_data["status"]==true + membership_account_data = membership_data["data"]; + membership_account_data.each do |acc_data| + if acc_data["accountable_type"] == "REBATEACCOUNT" + @membership_rebate_balance=acc_data["balance"] + else + @membership_rebate_balance = 0 + end + end + else + @membership_rebate_balance = 0 + end + end + + end + + def create + end + +end diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb new file mode 100644 index 00000000..a348951e --- /dev/null +++ b/app/controllers/origami/credit_payments_controller.rb @@ -0,0 +1,10 @@ +class Origami::CreditPaymentsController < BaseOrigamiController + + + def index + end + + def create + end + +end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index d9bfc39b..601055e5 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -1,7 +1,43 @@ class Origami::CustomersController < BaseOrigamiController #Form to add customer - def index + + end - def create + + # GET /crm/customers/1 + # GET /crm/customers/1.json + def show end + + def add_customer + + @sale_id = params[:sale_id] + filter = params[:filter] + + filter = params[:filter] + + if filter.nil? + @crm_customers = Customer.order("customer_id").page(params[:page]) + #@products = Product.order("name").page(params[:page]).per(5) + else + @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 + + # if flash["errors"] + # @crm_customer.valid? + # end + + respond_to do |format| + # format.html { render :template => "crm/customers/index" } + format.html { render action: "index"} + format.json { render json: @crm_customers } + end + end + + end diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 09ab1103..f5f7db9e 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -1,6 +1,57 @@ class Origami::DiscountsController < BaseOrigamiController + + #discount page show from origami index with selected order def index + sale_id = params[:id] + if Sale.exists?(sale_id) + @sale_data = Sale.find(sale_id) + end end + + #discount for selected order def create + sale_id = params[:sale_id] + sale_item_id = params[:sale_item_id] + discount_type = params[:discount_type] + discount_value = params[:discount_value] + discount_amount = params[:discount_amount] + grand_total = params[:grand_total] + product_name = "Overall Discount" + + if discount_type == 0 + remark="Discount " + discount_amount + " as net" + else + remark="Discount " + discount_amount + " as percentage" + end + + #update discount for sale + sale = Sale.find(sale_id) + sale.total_discount = sale.total_discount + discount_amount.to_f + sale.grand_total = grand_total + sale.save + + #save sale item for discount + if sale_item_id != nil + origin_sale_item = SaleItem.find(sale_item_id) + product_name = origin_sale_item.product_name + "-Disocunt" + end + sale_item = SaleItem.new + + #pull + sale_item.sale_id = sale_id + sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id + sale_item.product_name = product_name + sale_item.remark = remark + + sale_item.qty = 1 + sale_item.unit_price = (0-discount_amount.to_f) + sale_item.taxable_price = discount_amount + sale_item.is_taxable = 0 + + sale_item.price = sale_item.qty * sale_item.unit_price + sale_item.save + + redirect_to origami_path(sale_id) end + end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index cbca1424..dbde3293 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -1,15 +1,83 @@ class Origami::HomeController < BaseOrigamiController def index - @order_table = Order.get_order_table() - @order_rooms = Order.get_order_rooms() - @orders = Order.get_orders() - end - def show - str = [] - @order_details = OrderItem.get_order_items_details(params[:order_id]) - @order_details.each do |ord_detail| - str.push(ord_detail) + if params[:booking_id] != nil + type=params[:booking_id].split('-')[0]; + # Sale + if type == "SAL" + @selected_item = Sale.find(params[:booking_id]) + @selected_item_type="Sale" + # Booking + else + @selected_item = Order.find(params[:booking_id]) + @selected_item_type="Order" + end end - render :json => str.to_json + + @completed_orders = Order.get_completed_order() + @booking_orders = Order.get_booking_order_table() + @booking_rooms = Order.get_booking_order_rooms() + @orders = Order.get_orders() + end + + def item_show + selection(params[:booking_id],1) + end + + def selection(selected_id, is_ajax) + str = [] + type=selected_id.split('-')[0]; + # Sale + if type == "SAL" + @order_details = SaleItem.get_order_items_details(params[:booking_id]) + @order_details.each do |ord_detail| + str.push(ord_detail) + end + # Booking + else + @order_details = OrderItem.get_order_items_details(params[:booking_id]) + @order_details.each do |ord_detail| + str.push(ord_detail) + end + end + if is_ajax == 1 + render :json => str.to_json + else + str + end end + + def update_sale_by_customer + + id = params[:sale_id][0,3] + if(id == "SAL") + sale = Sale.find(params[:sale_id]) + else + sale = Order.find(params[:sale_id]) + end + + status = sale.update_attributes(customer_id: params[:customer_id]) + + if status == true + render json: JSON.generate({:status => true}) + else + render json: JSON.generate({:status => false, :error_message => "Record not found"}) + + end + end + + def get_customer + + @customer = Customer.find(params[:customer_id]) + + response = Customer.get_member_account(@customer) + + respond_to do |format| + format.js do + render :json => { + :response_data => response.as_json, + :customer => @customer} + end + end + end + end diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb new file mode 100644 index 00000000..5bed3470 --- /dev/null +++ b/app/controllers/origami/jcb_controller.rb @@ -0,0 +1,32 @@ +class Origami::JcbController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + + # limit jcb_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = sale_data.grand_total + @jcbcount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "jcb" + @jcbcount = @jcbcount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_jcb = total - @jcbcount - others + + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb") + end + end + +end diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb new file mode 100644 index 00000000..67107167 --- /dev/null +++ b/app/controllers/origami/master_controller.rb @@ -0,0 +1,31 @@ +class Origami::MasterController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + + # limit master_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = sale_data.grand_total + @mastercount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "master" + @mastercount = @mastercount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_master = total - @mastercount - others + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master") + end + end + +end diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb new file mode 100644 index 00000000..3707d1f4 --- /dev/null +++ b/app/controllers/origami/mpu_controller.rb @@ -0,0 +1,32 @@ +class Origami::MpuController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + + # limit mpu_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = sale_data.grand_total + @mpucount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "mpu" + @mpucount = @mpucount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_mpu = total - @mpucount - others + + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu") + end + end + +end diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb new file mode 100644 index 00000000..c050c3f3 --- /dev/null +++ b/app/controllers/origami/others_payments_controller.rb @@ -0,0 +1,39 @@ +class Origami::OthersPaymentsController < BaseOrigamiController + + + def index + @membership_rebate_balance = 0 + @sale_id = params[:sale_id] + @payment_method_setting = PaymentMethodSetting.all + + # @sale_id = params[:sale_id] + # sale_data = Sale.find_by_sale_id(@sale_id) + + # if sale_data.customer_id + # customer_data= Customer.find_by_customer_id(sale_data.customer_id) + # @membership_id = customer_data.membership_id + # if !@membership_id.nil? + # membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + # membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id) + # if membership_data["status"]==true + # membership_account_data = membership_data["data"]; + # membership_account_data.each do |acc_data| + # if acc_data["accountable_type"] == "REBATEACCOUNT" + # @membership_rebate_balance=acc_data["balance"] + # else + # @membership_rebate_balance = 0 + # end + # end + # else + # @membership_rebate_balance = 0 + # end + # end + # else + + # end + end + + def create + end + +end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 447d1282..ca497b81 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -1,6 +1,104 @@ class Origami::PaymentsController < BaseOrigamiController + + def index end + def create + cash = params[:cash] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + sale_payment.process_payment(saleObj, @user, cash, "cash") + + unique_code = "ReceiptBillPdf" + customer= Customer.find(saleObj.customer_id) + + # get member information + member_info = Customer.get_member_account(customer) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + + # Calculate Food and Beverage Total + food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info) + end end + + def show + sale_id = params[:sale_id] + if Sale.exists?(sale_id) + @cash = 0.0 + @other = 0.0 + @ppamount = 0.0 + @visacount= 0.0 + @jcbcount= 0.0 + @mastercount = 0.0 + @sale_data = Sale.find_by_sale_id(sale_id) + + #get customer amount + @customer = Customer.find(@sale_data.customer_id) + + # get member information + response = Customer.get_member_account(@customer) + + @balance = 0.00 + @accountable_type = '' + if response["data"]==true + response["data"].each do |res| + if res["accountable_type"] == "RebateAccount" + @balance = res["balance"] + @accountable_type = res["accountable_type"] + end + end + end + + #end customer amount + + @sale_data.sale_payments.each do |spay| + if spay.payment_method == "cash" + @cash = spay.payment_amount + end + if spay.payment_method == "mpu" + @other += spay.payment_amount + elsif spay.payment_method == "paypar" + @ppamount += spay.payment_amount + elsif spay.payment_method == "visa" + @visacount += spay.payment_amount + elsif spay.payment_method == "jcb" + @jcbcount += spay.payment_amount + elsif spay.payment_method == "master" + @mastercount += spay.payment_amount + end + end + end + end + + def reprint + + sale_id = params[:sale_id] + + saleObj = Sale.find(sale_id) + + unique_code = "ReceiptBillPdf" + customer= Customer.find(saleObj.customer_id) + + # get member information + member_info = Customer.get_member_account(customer) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + + # Calculate Food and Beverage Total + food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info) + end + + end diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb new file mode 100644 index 00000000..0c3ea11f --- /dev/null +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -0,0 +1,21 @@ +class Origami::PayparPaymentsController < BaseOrigamiController + def create + sale_id = params[:sale_id] + redeem_amount = params[:redeem_amount] + membership_id = params[:membership_id] + payment_method = "paypar" + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) + if status == true + @out = true, "Success!" + else + @out =false, "Please try again payment!" + end + else + @out = false, "There has no sale record!" + end + + end +end diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb new file mode 100644 index 00000000..99601449 --- /dev/null +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -0,0 +1,67 @@ +class Origami::RedeemPaymentsController < BaseOrigamiController + def index + @sale_id = params[:sale_id] + payment_method = params[:payment_method] + @membership_rebate_balance=0 + sale_data = Sale.find_by_sale_id(@sale_id) + + # limit redeem_amount + food_prices, beverage_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) + @payparcount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "paypar" + @payparcount = @payparcount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + is_bervage_exceed = others - (beverage_prices + sale_data.total_tax) + if is_bervage_exceed < 0 + @food_prices = food_prices - @payparcount + else + @food_prices = food_prices - @payparcount -is_bervage_exceed + end + + if sale_data + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + @membership_id = customer_data.membership_id + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + if membership_setting.gateway_url + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + if member_actions.gateway_url + @campaign_type_id = member_actions.additional_parameter["campaign_type_id"] + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + merchant_uid= member_actions.merchant_account_id + 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 + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out =false,0 + end + else + @out = false,0 + end + + + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + @out = false, 0 + end +end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 9f971289..e848366c 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -1,22 +1,37 @@ class Origami::RequestBillsController < BaseOrigamiController - def show + # Print Request Bill and add to sale tables + def print @sale = Sale.new + sale_order=SaleOrder.new - check_order = Order.find_by_id(params[:id]) - if check_order - @order_details = OrderItem.get_order_items_details(check_order.id) - @order_details = OrderItem.get_order_items_details(check_order.id) - @status, @sale_id = @sale.generate_invoice_from_order(check_order.id, nil,current_login_employee.name) - @sale_data = Sale.find_by_id(@sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_id) - end - unique_code="ReceiptBillPdf" + booking_id = params[:id] + check_booking = Booking.find_by_booking_id(booking_id) + if check_booking.sale_id.nil? + # Create Sale if it doesn't exist + puts "current_login_employee" + puts current_login_employee.name + @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee) + @sale_data = Sale.find_by_sale_id(@sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_id) + else + @sale_data = Sale.find_by_sale_id(check_booking.sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) + end + + unique_code = "ReceiptBillPdf" + customer= Customer.where('customer_id=' + @sale_data.customer_id) + + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) + # find order id by sale id + # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id) + + # Calculate Food and Beverage Total + food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items) + printer = Printer::ReceiptPrinter.new(print_settings) - - printer.print_receipt_bill(print_settings,@sale_items,@sale) - - + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total) + redirect_to origami_path(@sale_data.sale_id) end end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb new file mode 100644 index 00000000..3cb8cabb --- /dev/null +++ b/app/controllers/origami/visa_controller.rb @@ -0,0 +1,31 @@ +class Origami::VisaController < BaseOrigamiController + + def index + @sale_id = params[:sale_id] + + # limit visa_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = sale_data.grand_total + @visacount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "visa" + @visacount = @visacount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_visa = total - @visacount - others + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa") + end + end + +end diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_sale_controller.rb new file mode 100644 index 00000000..b487c269 --- /dev/null +++ b/app/controllers/reports/daily_sale_controller.rb @@ -0,0 +1,9 @@ +class Reports::DailySaleController < BaseReportController + + def index + from, to = get_date_range_from_params + @sale_data = Sale.get_receipt_no_list(from,to) + @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) + end + +end \ No newline at end of file diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb new file mode 100644 index 00000000..8569c051 --- /dev/null +++ b/app/controllers/reports/receipt_no_controller.rb @@ -0,0 +1,15 @@ +class Reports::ReceiptNoController < BaseReportController + def index + from, to = get_date_range_from_params + puts "from..." + puts from + puts "to..." + puts to + @sale_data = Sale.get_receipt_no_list(from,to) + @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) + end + + def show + + end +end \ No newline at end of file diff --git a/app/controllers/settings/accounts_controller.rb b/app/controllers/settings/accounts_controller.rb index 74f27c84..90e6a304 100644 --- a/app/controllers/settings/accounts_controller.rb +++ b/app/controllers/settings/accounts_controller.rb @@ -68,6 +68,6 @@ class Settings::AccountsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def account_params - params.require(:account).permit(:title, :account_type) + params.require(:account).permit(:title, :account_type,:discount,:point,:bonus,:rebate) end end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb new file mode 100644 index 00000000..ad7311f2 --- /dev/null +++ b/app/controllers/settings/membership_actions_controller.rb @@ -0,0 +1,74 @@ +class Settings::MembershipActionsController < ApplicationController + before_action :set_settings_membership_action, only: [:show, :edit, :update, :destroy] + + # GET /settings/membership_actions + # GET /settings/membership_actions.json + def index + @settings_membership_actions = MembershipAction.all + end + + # GET /settings/membership_actions/1 + # GET /settings/membership_actions/1.json + def show + end + + # GET /settings/membership_actions/new + def new + @settings_membership_action = MembershipAction.new + end + + # GET /settings/membership_actions/1/edit + def edit + end + + # POST /settings/membership_actions + # POST /settings/membership_actions.json + def create + @settings_membership_action = MembershipAction.new(settings_membership_action_params) + + respond_to do |format| + if @settings_membership_action.save + format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' } + format.json { render :show, status: :created, location: @settings_membership_action } + else + format.html { render :new } + format.json { render json: @settings_membership_action.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/membership_actions/1 + # PATCH/PUT /settings/membership_actions/1.json + def update + respond_to do |format| + if @settings_membership_action.update(settings_membership_action_params) + format.html { redirect_to settings_membership_action_path, notice: 'Membership action was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_membership_action } + else + format.html { render :edit } + format.json { render json: @settings_membership_action.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/membership_actions/1 + # DELETE /settings/membership_actions/1.json + def destroy + @settings_membership_action.destroy + respond_to do |format| + format.html { redirect_to settings_membership_actions_url, notice: 'Membership action was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_membership_action + @settings_membership_action = MembershipAction.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_membership_action_params + params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) + end +end diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index d7f373aa..c2a521ae 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -63,7 +63,14 @@ class Settings::MenuCategoriesController < ApplicationController # DELETE /settings/menu_categories/1 # DELETE /settings/menu_categories/1.json def destroy + # instances = MenuItemInstance.where("menu_item_id=?",@settings_menu_item.id) + # instances.each do |instance| + # instance.destroy + # end + # @settings_menu_item.destroy + # @settings_menu_category.destroy + abc = MenuCategory.destroyCategory(@settings_menu_category) respond_to do |format| format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' } format.json { head :no_content } diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index 6bd00638..2b1fcecf 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -11,18 +11,21 @@ class Settings::MenuItemInstancesController < ApplicationController # GET /settings/menu_item_instances/1 # GET /settings/menu_item_instances/1.json def show - @category = MenuCategory.find(@item.menu_category_id) + id = MenuItemInstance.findParentCategory(@item) + @category = MenuCategory.find(id) end # GET /settings/menu_item_instances/new def new - @category = MenuCategory.find(@item.menu_category_id) + id = MenuItemInstance.findParentCategory(@item) + @category = MenuCategory.find(id) @settings_menu_item_instances = MenuItemInstance.new end # GET /settings/menu_item_instances/1/edit def edit - @category = MenuCategory.find(@item.menu_category_id) + id = MenuItemInstance.findParentCategory(@item) + @category = MenuCategory.find(id) end # POST /settings/menu_item_instances @@ -30,6 +33,7 @@ class Settings::MenuItemInstancesController < ApplicationController def create @settings_menu_item_instances = MenuItemInstance.new(settings_menu_item_instance_params) + #check if the menu item type is simple or not( not only the diff of status .. here is different routes) if params[:simple_menu_item_id] @settings_menu_item_instances.menu_item_id = params[:simple_menu_item_id] catID = MenuItem.find(params[:simple_menu_item_id]) @@ -38,10 +42,11 @@ class Settings::MenuItemInstancesController < ApplicationController catID = MenuItem.find(params[:set_menu_item_id]) end - category = MenuCategory.find(catID.menu_category_id) + id = MenuItemInstance.findParentCategory(catID) + category = MenuCategory.find(id) respond_to do |format| if @settings_menu_item_instances.save - @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes] + @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?) @settings_menu_item_instances.save format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item_instances } @@ -55,14 +60,15 @@ class Settings::MenuItemInstancesController < ApplicationController # PATCH/PUT /settings/menu_item_instances/1 # PATCH/PUT /settings/menu_item_instances/1.json def update - puts "params[:menu_item_instance][:item_attributes]" - puts params[:menu_item_instance][:item_attributes] + #check if the menu item type is simple or not( not only the diff of status .. here is different routes) if params[:simple_menu_item_id] catID = MenuItem.find(params[:simple_menu_item_id]) else catID = MenuItem.find(params[:set_menu_item_id]) end - category = MenuCategory.find(catID.menu_category_id) + + id = MenuItemInstance.findParentCategory(catID) + category = MenuCategory.find(id) respond_to do |format| if @settings_menu_item_instances.update(settings_menu_item_instance_params) @@ -86,7 +92,13 @@ class Settings::MenuItemInstancesController < ApplicationController else catID = MenuItem.find(params[:set_menu_item_id]) end - category = MenuCategory.find(catID.menu_category_id) + # check if the menu item is sub of another menu item + if catID.menu_category_id + category = MenuCategory.find(catID.menu_category_id) + else + item = MenuItem.find(catID.menu_item_id) + category = MenuCategory.find(item.menu_category_id) + end respond_to do |format| format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' } format.json { head :no_content } diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index e0ecde30..fa6ac158 100644 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -55,7 +55,8 @@ class Settings::MenusController < ApplicationController # DELETE /settings/menus/1 # DELETE /settings/menus/1.json def destroy - @settings_menu.destroy + # @settings_menu.destroy + abc = Menu.destroyMenu(@settings_menu) respond_to do |format| format.html { redirect_to settings_menus_path, notice: 'Menu was successfully destroyed.' } format.json { head :no_content } diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index 46fcb54d..6a0a52ae 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -4,7 +4,8 @@ class Settings::OrderQueueStationsController < ApplicationController # GET /settings/order_queue_stations # GET /settings/order_queue_stations.json def index - @settings_order_queue_stations = OrderQueueStation.all.active + @settings_order_queue_stations = OrderQueueStation.all + @settings_order_queue_stations = Kaminari.paginate_array(@settings_order_queue_stations).page(params[:page]).per(50) end # GET /settings/order_queue_stations/1 @@ -70,6 +71,6 @@ class Settings::OrderQueueStationsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_order_queue_station_params - params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by) + params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] }) end end diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb index ce27f725..f3ac595e 100644 --- a/app/controllers/settings/payment_method_settings_controller.rb +++ b/app/controllers/settings/payment_method_settings_controller.rb @@ -69,6 +69,6 @@ class Settings::PaymentMethodSettingsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_payment_method_setting_params - params.require(:payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id) + params.require(:payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :additional_parameters) end end diff --git a/app/controllers/settings/rooms_controller.rb b/app/controllers/settings/rooms_controller.rb new file mode 100644 index 00000000..69e3ec22 --- /dev/null +++ b/app/controllers/settings/rooms_controller.rb @@ -0,0 +1,81 @@ +class Settings::RoomsController < ApplicationController + before_action :set_settings_room, only: [:show, :edit, :update, :destroy] + before_action :set_settings_zone, only: [:index, :show, :edit, :new, :update,:create] + # GET /settings/rooms + # GET /settings/rooms.json + def index + @settings_rooms = @zone.rooms + end + + # GET /settings/rooms/1 + # GET /settings/rooms/1.json + def show + @room = Room.find(params[:id]) + end + + # GET /settings/rooms/new + def new + @settings_room = Room.new + end + + # GET /settings/rooms/1/edit + def edit + end + + # POST /settings/rooms + # POST /settings/rooms.json + def create + @settings_room = Room.new(settings_room_params) + @settings_room.type = DiningFacility::ROOM_TYPE + @settings_room.zone_id = params[:zone_id] + respond_to do |format| + if @settings_room.save + format.html { redirect_to settings_zone_rooms_path, notice: 'Room was successfully created.' } + format.json { render :show, status: :created, location: @settings_room } + else + puts "abc" + format.html { render :new } + format.json { render json: @settings_room.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/rooms/1 + # PATCH/PUT /settings/rooms/1.json + def update + respond_to do |format| + if @settings_room.update(settings_room_params) + format.html { redirect_to settings_zone_rooms_path, notice: 'Room was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_room } + else + format.html { render :edit } + format.json { render json: @settings_room.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/rooms/1 + # DELETE /settings/rooms/1.json + def destroy + @settings_room.destroy + respond_to do |format| + format.html { redirect_to settings_zones_path, notice: 'Room was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_room + @settings_room = Room.find(params[:id]) + end + + def set_settings_zone + @zone = Zone.find(params[:zone_id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_room_params + params.require(:room).permit(:name, :status, :seater, :order_by,:is_active ,:id, :zone_id, :created_by) + end +end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index f6771548..5946ff49 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -62,7 +62,7 @@ class Settings::SetMenuItemsController < ApplicationController # DELETE /settings/menu_items/1 # DELETE /settings/menu_items/1.json def destroy - # @settings_menu_item.destroy + abc = MenuItem.deleteRecursive(@settings_menu_item) respond_to do |format| format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' } format.json { head :no_content } @@ -81,6 +81,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, :menu_category_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, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :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 e0d45fcb..05952d0d 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -59,7 +59,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # DELETE /settings/menu_items/1 # DELETE /settings/menu_items/1.json def destroy - # @settings_menu_item.destroy + abc = MenuItem.deleteRecursive(@settings_menu_item) respond_to do |format| format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' } format.json { head :no_content } @@ -78,6 +78,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,: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, :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/controllers/settings/tables_controller.rb b/app/controllers/settings/tables_controller.rb new file mode 100644 index 00000000..124a0d94 --- /dev/null +++ b/app/controllers/settings/tables_controller.rb @@ -0,0 +1,81 @@ +class Settings::TablesController < ApplicationController + before_action :set_settings_table, only: [:show, :edit, :update, :destroy] + before_action :set_settings_zone, only: [:index, :show, :edit, :new, :update,:create] + # GET /settings/tables + # GET /settings/tables.json + def index + @settings_tables = @zone.tables + end + + # GET /settings/tables/1 + # GET /settings/tables/1.json + def show + @table = Table.find(params[:id]) + end + + # GET /settings/tables/new + def new + @settings_table = Table.new + end + + # GET /settings/tables/1/edit + def edit + end + + # POST /settings/tables + # POST /settings/tables.json + def create + @settings_table = Table.new(settings_table_params) + @settings_table.type = DiningFacility::TABLE_TYPE + @settings_table.zone_id = params[:zone_id] + respond_to do |format| + if @settings_table.save + format.html { redirect_to settings_zone_tables_path, notice: 'Table was successfully created.' } + format.json { render :show, status: :created, location: @settings_table } + else + puts "abc" + format.html { render :new } + format.json { render json: @settings_table.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/tables/1 + # PATCH/PUT /settings/tables/1.json + def update + respond_to do |format| + if @settings_table.update(settings_table_params) + format.html { redirect_to settings_zone_tables_path, notice: 'Table was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_table } + else + format.html { render :edit } + format.json { render json: @settings_table.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/tables/1 + # DELETE /settings/tables/1.json + def destroy + @settings_table.destroy + respond_to do |format| + format.html { redirect_to settings_zones_path, notice: 'Table was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_table + @settings_table = Table.find(params[:id]) + end + + def set_settings_zone + @zone = Zone.find(params[:zone_id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_table_params + params.require(:table).permit(:name, :status, :seater, :order_by,:is_active ,:id, :zone_id, :created_by) + end +end diff --git a/app/controllers/settings/zones_controller.rb b/app/controllers/settings/zones_controller.rb index 779c03fe..5752b5e3 100644 --- a/app/controllers/settings/zones_controller.rb +++ b/app/controllers/settings/zones_controller.rb @@ -10,6 +10,8 @@ class Settings::ZonesController < ApplicationController # GET /settings/zones/1 # GET /settings/zones/1.json def show + @settings_tables = @settings_zone.tables + @settings_rooms = @settings_zone.rooms end # GET /settings/zones/new @@ -28,7 +30,7 @@ class Settings::ZonesController < ApplicationController respond_to do |format| if @settings_zone.save - format.html { redirect_to @settings_zone, notice: 'Zone was successfully created.' } + format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully created.' } format.json { render :show, status: :created, location: @settings_zone } else format.html { render :new } @@ -42,7 +44,7 @@ class Settings::ZonesController < ApplicationController def update respond_to do |format| if @settings_zone.update(settings_zone_params) - format.html { redirect_to @settings_zone, notice: 'Zone was successfully updated.' } + format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully updated.' } format.json { render :show, status: :ok, location: @settings_zone } else format.html { render :edit } @@ -56,7 +58,7 @@ class Settings::ZonesController < ApplicationController def destroy @settings_zone.destroy respond_to do |format| - format.html { redirect_to settings_zones_url, notice: 'Zone was successfully destroyed.' } + format.html { redirect_to settings_zones_path, notice: 'Zone was successfully destroyed.' } format.json { head :no_content } end end @@ -69,6 +71,6 @@ class Settings::ZonesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_zone_params - params.require(:settings_zone).permit(:name, :is_active, :created_by) + params.require(:zone).permit(:name, :is_active, :created_by) end end diff --git a/app/controllers/transactions/manual_sales_controller.rb b/app/controllers/transactions/manual_sales_controller.rb new file mode 100644 index 00000000..77dd4371 --- /dev/null +++ b/app/controllers/transactions/manual_sales_controller.rb @@ -0,0 +1,77 @@ +class Transactions::ManualSalesController < ApplicationController + + def void + @sale = params[:sale_id] + @reason = Lookup.where("lookup_type = 'void_reason'") + respond_to do |format| + format.html # index.html.erb + format.json { render json: @sales } + end + end + + def manual_void_sale + sale_id = params[:sale_id] + reason = params[:reason] + sale = Sale.find(sale_id) + sale.sale_status = 'void' + sale.requested_by = current_login_employee.id + if sale.save + @sale = SaleAudit.record_audit_void(sale_id, current_login_employee.id, current_login_employee.id, reason) + + if sale.sale_orders + + sale.sale_orders.each do |bo| + order =Order.find(bo.order_id) + order.status= 'void' + order.save + booking_order = BookingOrder.find_by_order_id(bo.order_id) + + if booking_order.booking_id + booking = Booking.find(booking_order.booking_id) + dining_facility = booking.dining_facility + dining_facility.status = 'available' + dining_facility.save + end + end + + end + end + respond_to do |format| + format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' } + end + + end + + def manual_complete_sale + sale_id = params[:sale_id] + sale = Sale.find(sale_id) + + sale.sale_status = 'completed' + sale.requested_by = current_login_employee.id + remark = "Complete for Sale ID #{sale_id} By #{current_login_employee.name}" + if sale.save + @sale = SaleAudit.record_audit_complete(sale_id, remark, current_login_employee.id) + + if sale.sale_orders + + sale.sale_orders.each do |bo| + # order =Order.find(bo.order_id) + # order.status= 'void' + # order.save + booking_order = BookingOrder.find_by_order_id(bo.order_id) + + if booking_order.booking_id + booking = Booking.find(booking_order.booking_id) + dining_facility = booking.dining_facility + dining_facility.status = 'available' + dining_facility.save + end + end + + end + + end + redirect_to transactions_sales_path + end + +end diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb new file mode 100644 index 00000000..35cefe6f --- /dev/null +++ b/app/controllers/transactions/orders_controller.rb @@ -0,0 +1,32 @@ +class Transactions::OrdersController < ApplicationController + def index + + filter = params[:filter] + if filter.nil? + orders = Order.order("order_id desc") + else + order = Order.search(filter) + if order.count > 0 + orders = order + else + orders = Order.order("order_id desc") + + end + end + @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50) + respond_to do |format| + format.html # index.html.erb + format.json { render json: @orders } + end + end + def show + + @order = Order.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @order } + end + end + +end diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index ea9e8ccd..fed62a34 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -4,12 +4,68 @@ class Transactions::SalesController < ApplicationController # GET /transactions/sales # GET /transactions/sales.json def index - @transactions_sales = Sale.all + + search_date = params[:date] + receipt_no = params[:receipt_no] + today = Date.today + + if receipt_no.nil? && search_date.nil? + @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + else + if !search_date.blank? && receipt_no.blank? + sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", search_date).order("sale_id desc").limit(500).page(params[:page]) + elsif !search_date.blank? && !receipt_no.blank? + sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page]) + else + sale = Sale.where("receipt_no LIKE ? and NOT sale_status = 'void' ", receipt_no).order("sale_id desc").limit(500).page(params[:page]) + end + if sale.count > 0 + @sales = sale + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + else + @sales = 0 + end + end + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @sales } + end + end # GET /transactions/sales/1 # GET /transactions/sales/1.json def show + + @sale = Sale.find(params[:id]) + + @order_items = [] + @sale.sale_orders.each do |sale_order| + order = Order.find(sale_order.order_id) + #if (order.status == "new") + @order_items = @order_items + order.order_items + #end + end + + @sale_receivables = SalePayment.where('sale_id = ?', @sale.id) + + #get customer amount + @customer = Customer.find(@sale.customer_id) + response = Customer.get_member_account(@customer) + + if(response["status"] == true) + @membership = response["data"] + else + @membership = 0 + end + #end customer amount + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @sale } + end end # GET /transactions/sales/new diff --git a/app/models/login_form.rb b/app/forms/login_form.rb similarity index 100% rename from app/models/login_form.rb rename to app/forms/login_form.rb diff --git a/app/forms/shop_form.rb b/app/forms/shop_form.rb index 19af84a5..179e73fd 100644 --- a/app/forms/shop_form.rb +++ b/app/forms/shop_form.rb @@ -1,7 +1,7 @@ #Form object to use during the installation process - will handle creation of shop model into db after verification from the cloud #provising service through license verification -class ShopForm < ActiveModel - :attr_accessor :logo, :name, :address, :township, :city, :state, :country, :license, :base_currency, :password, :password_confirmation - -end +# class ShopForm < ActiveModel +# # attr_accessor :logo, :name, :address, :township, :city, :state, :country, :license, :base_currency, :password, :password_confirmation +# +# end diff --git a/app/helpers/api/origami/paypar_helper.rb b/app/helpers/api/origami/paypar_helper.rb new file mode 100644 index 00000000..0e102f10 --- /dev/null +++ b/app/helpers/api/origami/paypar_helper.rb @@ -0,0 +1,2 @@ +module Api::Origami::PayparHelper +end diff --git a/app/helpers/crm/dining_queues_helper.rb b/app/helpers/crm/dining_queues_helper.rb new file mode 100644 index 00000000..af60bd52 --- /dev/null +++ b/app/helpers/crm/dining_queues_helper.rb @@ -0,0 +1,2 @@ +module Crm::DiningQueuesHelper +end diff --git a/app/helpers/origami/paypar_helper.rb b/app/helpers/origami/paypar_helper.rb new file mode 100644 index 00000000..fe18e897 --- /dev/null +++ b/app/helpers/origami/paypar_helper.rb @@ -0,0 +1,2 @@ +module Origami::PayparHelper +end diff --git a/app/helpers/origami/redeem_payments_helper.rb b/app/helpers/origami/redeem_payments_helper.rb new file mode 100644 index 00000000..7e9151cb --- /dev/null +++ b/app/helpers/origami/redeem_payments_helper.rb @@ -0,0 +1,2 @@ +module Origami::RedeemPaymentsHelper +end diff --git a/app/helpers/settings/membership_actions_helper.rb b/app/helpers/settings/membership_actions_helper.rb new file mode 100644 index 00000000..038ec51f --- /dev/null +++ b/app/helpers/settings/membership_actions_helper.rb @@ -0,0 +1,2 @@ +module Settings::MembershipActionsHelper +end diff --git a/app/helpers/settings/orders_helper.rb b/app/helpers/settings/orders_helper.rb new file mode 100644 index 00000000..f5825365 --- /dev/null +++ b/app/helpers/settings/orders_helper.rb @@ -0,0 +1,2 @@ +module Settings::OrdersHelper +end diff --git a/app/jobs/order_queue_processor_job.rb b/app/jobs/order_queue_processor_job.rb index e9a8c13f..e92faa36 100644 --- a/app/jobs/order_queue_processor_job.rb +++ b/app/jobs/order_queue_processor_job.rb @@ -5,7 +5,7 @@ class OrderQueueProcessorJob < ApplicationJob # Do something later #Order ID order = Order.find(order_id) - + #Loop through the order stations and process the items #Execute orders and send to order stations if order diff --git a/app/models/account.rb b/app/models/account.rb index e1cdc6d3..5d775b83 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -2,6 +2,8 @@ class Account < ApplicationRecord validates_presence_of :title, :account_type has_many :menu_items - # belongs_to :lookup , :class_name => "Lookup" - + + def self.collection + Account.select("id, title").map { |e| [e.title, e.id] } + end end diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index c2d2e8b0..3ac84077 100644 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -1,4 +1,9 @@ class AssignedOrderItem < ApplicationRecord + before_create :generate_custom_id + + #primary key - need to be unique + self.primary_key = "assigned_order_item_id" + belongs_to :order belongs_to :order_queue_station @@ -11,4 +16,9 @@ class AssignedOrderItem < ApplicationRecord assigned_order_item.delivery_status = false assigned_order_item.save end + + private + def generate_custom_id + self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + end end diff --git a/app/models/booking.rb b/app/models/booking.rb index c34ecf42..01cf0f46 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -1,9 +1,17 @@ + class Booking < ApplicationRecord + self.primary_key = "booking_id" + #primary key - need to be unique - + before_create :generate_custom_id + belongs_to :dining_facility, :optional => true belongs_to :sale, :optional => true has_many :booking_orders + has_many :orders, :through => :booking_orders - + private + def generate_custom_id + self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + end end diff --git a/app/models/booking_order.rb b/app/models/booking_order.rb index c9f748f0..ddf5ed18 100644 --- a/app/models/booking_order.rb +++ b/app/models/booking_order.rb @@ -1,5 +1,5 @@ class BookingOrder < ApplicationRecord - #primary key - need to be unique + #primary key - need to be unique belongs_to :booking belongs_to :order diff --git a/app/models/cashier_login_log.rb b/app/models/cashier_login_log.rb index d64860ce..353e9c90 100644 --- a/app/models/cashier_login_log.rb +++ b/app/models/cashier_login_log.rb @@ -1,4 +1,11 @@ class CashierLoginLog < ApplicationRecord + before_create :generate_custom_id + belongs_to :cashier_station belongs_to :employee + + private + def generate_custom_id + self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, "CLO") + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 42247791..0cbf8d58 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,11 +1,74 @@ class Customer < ApplicationRecord + + #self.primary_key = :customer_id + + before_create :generate_custom_id has_many :orders has_many :sales - validates_presence_of :name, :contact_no + validates_presence_of :name, :contact_no, :email validates :contact_no, uniqueness: true + validates :email, uniqueness: true + + paginates_per 50 + + # def self.get_member_group + + # membership = MembershipSetting.find_by_membership_type("paypar_url") + # memberaction = MembershipAction.find_by_membership_type("get_all_member_group") + # app_token = membership.auth_token.to_s + + # url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + # response = HTTParty.get(url, + # :body => { app_token: app_token}.to_json, + # :headers => { + # 'Content-Type' => 'application/json', + # 'Accept' => 'application/json' + # } + # ) + # puts response.body, response.code, response.message, response.headers.inspect + + # return response; + + # end + + def self.get_member_account(customer) + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("get_all_member_account") + merchant_uid = memberaction.merchant_account_id.to_s + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + response = HTTParty.get(url, :body => { membership_id: customer.membership_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + + return response; + + end + + def self.search(search) + if search + # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) + where("name LIKE ? OR contact_no LIKE ?", "%#{search}%", "%#{search}%",) + else + find(:all) + end + end + + # def self.search(search) + # where("name LIKE ? OR contact_no LIKE ?", "%#{search}%", "%#{search}%",) + # end def lastest_invoices sales.where(:customer_id => self.id).order("created_at desc").limit(5) end + + private + def generate_custom_id + self.customer_id = SeedGenerator.generate_id(self.class.name, "CUS") + end end diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 9a4f7a75..a3f8948f 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -9,10 +9,11 @@ class DiningFacility < ApplicationRecord scope :active, -> {where(is_active: true)} def get_current_booking - booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='occupied' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) + puts "enter booking" + booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) if booking.count > 0 then - return booking[0] + return booking[0].booking_id else return nil end diff --git a/app/models/dining_queue.rb b/app/models/dining_queue.rb new file mode 100644 index 00000000..09f8b6b5 --- /dev/null +++ b/app/models/dining_queue.rb @@ -0,0 +1,7 @@ +class DiningQueue < ApplicationRecord + + def self.generate_queue_no + queue_no = DiningQueue.all.count + 1 + return queue_no + end +end diff --git a/app/models/employee.rb b/app/models/employee.rb index 1f3cace0..98b8380b 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -6,6 +6,9 @@ class Employee < ApplicationRecord validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true validates :password, numericality: true, length: {in: 3..9}, allow_blank: true + def self.collection + Employee.select("id, name").map { |e| [e.name, e.id] } + end def self.login(emp_id, password) user = Employee.find_by_emp_id(emp_id) diff --git a/app/models/lookup.rb b/app/models/lookup.rb index e1b141df..5434cedd 100644 --- a/app/models/lookup.rb +++ b/app/models/lookup.rb @@ -17,6 +17,10 @@ class Lookup < ApplicationRecord "Gateway Communication Type" => "gateway_communication_type"} end + # def self.get_by_type( lookup_type) + # Lookup.select("value, name").where("lookup_type = ?", lookup_type ).order("name asc").map { |r| [r.name, r.value] } + # end + def self.collection_of(type) Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] } diff --git a/app/models/membership_action.rb b/app/models/membership_action.rb new file mode 100644 index 00000000..93a4b3d8 --- /dev/null +++ b/app/models/membership_action.rb @@ -0,0 +1,2 @@ +class MembershipAction < ApplicationRecord +end diff --git a/app/models/menu.rb b/app/models/menu.rb index 0c956a1e..05adfac4 100644 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -22,4 +22,13 @@ class Menu < ApplicationRecord return current_menu end + + def self.destroyMenu(menu) + cats = MenuCategory.where("menu_id=?",menu.id) + cats.each do |cat| + abc = MenuCategory.destroyCategory(cat) + end + menu.destroy + return false + end end diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 474990f2..e660b4b5 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -8,5 +8,29 @@ class MenuCategory < ApplicationRecord default_scope { order('order_by asc') } + def self.destroyCategory(menu_category) + # find the sub menu item of current item + sub_menu_cat = MenuCategory.where("menu_category_id=?",menu_category.id) + if sub_menu_cat.length != 0 + sub_menu_cat.each do |sub| + if destroyCategory(sub) + end + end + # find the items of current menu item + items = MenuItem.where("menu_category_id=?",menu_category.id) + items.each do |item| + abc = MenuItem.deleteRecursive(item) + end + menu_category.destroy + return true + else + items = MenuItem.where("menu_category_id=?",menu_category.id) + items.each do |item| + abc = MenuItem.deleteRecursive(item) + end + menu_category.destroy + return false + end + end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 2a4e86be..89967e2e 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,9 +1,10 @@ class MenuItem < ApplicationRecord - belongs_to :account + 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 :account validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item @@ -38,4 +39,31 @@ class MenuItem < ApplicationRecord return nil end + + def self.deleteRecursive(menu_item) + + # find the sub menu item of current item + sub_menu_items = MenuItem.where("menu_item_id=?",menu_item.id) + if sub_menu_items.length != 0 + sub_menu_items.each do |subitem| + if deleteRecursive(subitem) + end + end + # find the instances of current menu item + instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) + instances.each do |instance| + instance.destroy + end + menu_item.destroy + return true + else + instances = MenuItemInstance.where("menu_item_id=?",menu_item.id) + instances.each do |instance| + instance.destroy + end + menu_item.destroy + return false + end + + end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index e7f7775e..09225a23 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,4 +1,12 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item + def self.findParentCategory(item) + if item.menu_category_id + return item.menu_category_id + else + parentitem = MenuItem.find(item.menu_item_id) + findParentCategory(parentitem) + end + end end diff --git a/app/models/order.rb b/app/models/order.rb index f571faa9..f3ae798c 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,6 +1,8 @@ class Order < ApplicationRecord - #primary key - need to be unique + self.primary_key = "order_id" + #primary key - need to be unique + before_create :generate_custom_id before_create :set_order_date belongs_to :customer @@ -23,14 +25,15 @@ class Order < ApplicationRecord booking = nil if self.new_booking + booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", :checkin_at => Time.now.utc, :checkin_by => self.employee_name, :booking_status => "assign" }) + table = DiningFacility.find(self.table_id) + table.status = "occupied" + table.save else - if (self.booking_id.to_i > 0 ) - booking = Booking.find(self.booking_id) - end - + booking = Booking.find(self.booking_id) end booking.save! @@ -40,13 +43,13 @@ class Order < ApplicationRecord self.adding_line_items #Add Order Table and Room relation afrer order creation - BookingOrder.create({:booking_id => booking.id, :order => self}) + BookingOrder.create({:booking_id => booking.booking_id, :order => self}) #Send order to queue one it done! process_order_queue #send order to broadcast job - send_order_broadcast + #send_order_broadcast return true, booking @@ -182,14 +185,6 @@ class Order < ApplicationRecord return new_items_list end - private - def validate_api_inputs - - end - - def set_order_date - self.date = Time.now.utc - end #Update Items Count and Quantity changes whenever there is changes def update_products_and_quantity_count @@ -198,7 +193,7 @@ class Order < ApplicationRecord # Count number of different items self.item_count = self.order_items.item_count self.quantity_count = quantity_count - # Counter number of quantity + # Counter number of quantityf end #Process order items and send to order queue @@ -214,42 +209,125 @@ class Order < ApplicationRecord OrderBroadcastJob.perform_later(self.id) end - #Origami: Cashier : to view order type Table + #Origami: Cashier : to view order Table def self.get_order_table - order_table = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price, - order_items.id as order_items_id,dining_facilities.name as table_name") - .joins("left join booking_orders on booking_orders.order_id = orders.id - left join bookings on bookings.id = booking_orders.id + order_table = Order.select("orders.order_id as order_id,sum(order_items.qty*order_items.price) as total_price, + order_items.order_items_id as order_items_id,dining_facilities.name as table_name") + .joins("left join booking_orders on booking_orders.order_id = orders.order_id + left join bookings on bookings.booking_id = booking_orders.booking_order_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id - left join order_items on order_items.order_id = orders.id") + left join order_items on order_items.order_id = orders.order_id") .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true) - - .group("orders.id") - + .group("orders.order_id, order_items.order_items_id,dining_facilities.name") end + + #Origami: Cashier : to view booking order Table + def self.get_booking_order_table + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, + bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true) + .group("bookings.booking_id") + # For PG + # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true + # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id + end + + #Origami: Cashier : to view booking order Table + def self.get_completed_order + completed_orders = Booking.select("sales.receipt_no, sales.sale_status, orders.status as order_status,orders.order_id, + bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("sales.sale_status='completed'") + .group("sales.sale_id,bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") + # For PG + #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id + end + + #Origami: Cashier : to view order type Room + def self.get_booking_order_rooms + booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, + bookings.booking_id,orders.customer_id as customer_id, + sales.sale_id as sale_id,dining_facilities.name as room_name") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true) + .group("bookings.booking_id") + # For PG + # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true + # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id + end + #Origami: Cashier : to view order type Room def self.get_order_rooms - order_rooms = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price, - order_items.id as order_items_id,dining_facilities.name as room_name") - .joins("left join booking_orders on booking_orders.order_id = orders.id - left join bookings on bookings.id = booking_orders.id + order_rooms = Order.select("orders.order_id as order_id,sum(order_items.qty*order_items.price) as total_price, + order_items.id as order_items_id,dining_facilities.name as room_name") + .joins("left join booking_orders on booking_orders.order_id = orders.order_id + left join bookings on bookings.booking_id = booking_orders.order_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id - left join order_items on order_items.order_id = orders.id") + left join order_items on order_items.order_id = orders.order_id") .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,"dine_in",true) - .group("orders.id,order_items.id,dining_facilities.name") + .group("orders.order_id") end + #Origami: Cashier : to view orders def self.get_orders from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc - orders = Order.select("orders.id as order_id,sum(order_items.qty*order_items.price) as total_price, - order_items.id as order_items_id,dining_facilities.name as table_or_room_name") - .joins("left join booking_orders on booking_orders.order_id = orders.id - left join bookings on bookings.id = booking_orders.id - left join dining_facilities on dining_facilities.id = bookings.dining_facility_id - left join order_items on order_items.order_id = orders.id") + orders=Booking.select("sales.receipt_no, sales.sale_status as sale_status, orders.status as order_status, + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, + bookings.booking_id,orders.customer_id as customer_id, + sales.sale_id as sale_id,dining_facilities.name as table_name") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("(orders.status = 'new' or orders.status = 'billed')") + + # orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, + # orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id + # ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + # .joins("left join booking_orders on booking_orders.order_id = orders.order_id + # left join bookings on bookings.booking_id = booking_orders.order_id + # left join dining_facilities on dining_facilities.id = bookings.dining_facility_id + # left join order_items on order_items.order_id = orders.order_id + # left join sale_orders on sale_orders.order_id = orders.order_id + # left join sales on sales.sale_id = sale_orders.sale_id") + # .where("(orders.status = 'new' or orders.status = 'billed')") + # .group("orders.order_id") + # For PG + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + # .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id") - .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) - .group("orders.id") end + + def self.search(search) + if search + # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) + where("order_id LIKE ?", "%#{search}%") + else + find(:all) + end + end + + private + + def generate_custom_id + self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + end + + def set_order_date + self.date = Time.now.utc + end + end diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 1633c1c4..564aa939 100644 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -1,5 +1,8 @@ class OrderItem < ApplicationRecord + self.primary_key = "order_items_id" + #primary key - need to be unique + before_create :generate_custom_id #Associations belongs_to :order, autosave: true @@ -32,14 +35,33 @@ class OrderItem < ApplicationRecord #logger.debug orderitem.to_yml orderitem.save! - - end + #Origami : Cashier : to show order items details - def self.get_order_items_details(order_id) + def self.get_order_items_details(booking_id) + # booking_orders = BookingOrder.where("booking_id=?",booking.booking_id) + # if booking_orders + # booking_orders.each do |book_order| + # order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price") + # .joins("left join orders on orders.order_id = order_items.order_id") + # .where("order_items.order_id=?",book_order.order) + # return order_details + # end + # else + # return false + # end + order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price") - .joins("left join orders on orders.id = order_items.order_id") - .where("order_items.order_id=?",order_id) - + .joins("left join orders on orders.order_id = order_items.order_id") + .joins("left join booking_orders on booking_orders.order_id = order_items.order_id") + .joins("left join bookings on bookings.booking_id = booking_orders.booking_id") + .where("bookings.booking_id=?",booking_id) + + return order_details + end + + private + def generate_custom_id + self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index b0619af2..874f2fb0 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -5,10 +5,12 @@ class OrderQueueStation < ApplicationRecord has_many :assigned_order_items has_many :order_items + has_many :order_queue_process_by_zones + has_many :zones, through: :order_queue_process_by_zones scope :active, -> {where(is_active: true)} - def process_order (order) + def process_order (order) oqs_stations = OrderQueueStation.active order_items = order.order_items @@ -20,10 +22,10 @@ class OrderQueueStation < ApplicationRecord #Loop through the processing items pq_items.each do |pq_item| #Processing through the looping items - order_items.each do |order_item| + order_items.each do |order_item| if (pq_item == order_item.item_code) #Same Order_items can appear in two location. - AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) end end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 6a8a4b78..9b3f5205 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,45 +1,47 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker - def print_order_item(printer_settings,order_id, item_code) + def print_order_item(printer_name,order_id, item_code) #Use CUPS service #Generate PDF #Print order_item= print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) - pdf = OrderItemPdf.new(order_item[0],printer_settings) + pdf = OrderItemPdf.new(order_item[0]) pdf.render_file "tmp/receipt.pdf" - self.print("tmp/receipt.pdf") + self.print("tmp/receipt.pdf", printer_name) end - def print_order_summary(printer_settings,booking_id) + def print_order_summary(printer_name,order_id) #Use CUPS service #Generate PDF #Print - order=print_query('booking',booking_id) - filename = "tmp/order_summary_#{booking_id}" + ".pdf" - pdf = OrderSummaryPdf.new(order,printer_settings) + order=print_query('order_summary',order_id) + filename = "tmp/order_summary_#{order_id}" + ".pdf" + pdf = OrderSummaryPdf.new(order) pdf.render_file filename - self.print(filename) + self.print(filename, printer_name) end # Query for OQS with status def print_query(type, code) if type == 'order_item' - OrderItem.select("order_items.item_code, order_items.item_name,order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") - .joins("left join orders ON orders.id = order_items.order_id + OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") + .joins("left join orders ON orders.order_id = order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id - left join bookings AS b ON b.id = bo.booking_id + left join bookings AS b ON b.booking_id = bo.booking_id left join dining_facilities AS df ON df.id = b.dining_facility_id - left join customers as cus ON cus.id = orders.customer_id") - .where("order_items.item_code=" + code) + left join customers as cus ON cus.customer_id = orders.customer_id") + .where("order_items.item_code='" + code + "'") .group("order_items.item_code") else - OrderItem.select("order_items.item_code, order_items.item_name, df.name as dining") - .joins("left join orders ON orders.id = order_items.order_id + OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.name as dining") + .joins("left join orders ON orders.order_id = order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id - left join bookings AS b ON b.id = bo.booking_id - left join dining_facilities AS df ON df.id = b.dining_facility_id") - .where("booking.id=" + code) + left join bookings AS b ON b.booking_id = bo.booking_id + left join dining_facilities AS df ON df.id = b.dining_facility_id + left join customers as cus ON cus.customer_id = orders.customer_id") + .where("orders.order_id='" + code + "'") + .group("order_items.item_code") end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index d25dc8c3..92468b0e 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -63,13 +63,34 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker self.print(filename) end -#Bill Receipt Print - def print_receipt_bill(printer_settings,sale_items,sale) + + #Bill Receipt Print + def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, food_total, beverage_total, member_info = nil) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings,sale_items,sale) - pdf.render_file "tmp/receipt_bill_#{sale.id}.pdf" - self.print("tmp/receipt_bill_#{sale.id}.pdf") + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total, member_info) + pdf.render_file "tmp/receipt_bill.pdf" + self.print("tmp/receipt_bill.pdf") + end + + #Queue No Print + def print_queue_no(printer_settings,queue) + #Use CUPS service + #Generate PDF + #Print + pdf = QueueNoPdf.new(printer_settings,queue) + pdf.render_file "tmp/print_queue_no.pdf" + self.print("tmp/print_queue_no.pdf") + end + + #Bill Receipt Print + def print_crm_order(booking,order_items,setting) + #Use CUPS service + #Generate PDF + #Print + pdf = CrmOrderPdf.new(booking,order_items,setting) + pdf.render_file "tmp/print_crm_order.pdf" + self.print("tmp/print_crm_order.pdf") end end diff --git a/app/models/room_booking.rb b/app/models/room_booking.rb index fb7c0dac..7efa52cb 100644 --- a/app/models/room_booking.rb +++ b/app/models/room_booking.rb @@ -1,3 +1,4 @@ class RoomBooking < Booking - + has_many :orders + end diff --git a/app/models/sale.rb b/app/models/sale.rb index ca3bd631..9683c2b2 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1,6 +1,8 @@ -#primary key - need to be unique generated for multiple shops - class Sale < ApplicationRecord + self.primary_key = "sale_id" + + #primary key - need to be unique generated for multiple shops + before_create :generate_custom_id #before_create :generate_receipt_no belongs_to :cashier, :optional => true belongs_to :customer, :optional => true @@ -10,6 +12,7 @@ class Sale < ApplicationRecord has_many :sale_taxes has_many :sale_payments has_many :sale_orders + has_many :bookings scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } @@ -22,18 +25,19 @@ class Sale < ApplicationRecord #get all order attached to this booking and combine into 1 invoice booking.booking_orders.each do |order| if booking.sale_id - status, sale_id = generate_invoice_from_order(order.order_id, nil, requested_by) + status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by) else - status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, requested_by) + status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by) end booking.sale_id = sale_id end - - return status + order = booking.booking_orders.take.order + link_order_sale(order.id) + return status, sale_id end end - def generate_invoice_from_order (order_id, sale_id, requested_by) + def generate_invoice_from_order (order_id, sale_id, booking, requested_by) taxable = true #if sale_id is exsit and validate #add order to that invoice @@ -49,10 +53,14 @@ class Sale < ApplicationRecord generate_receipt_no order = Order.find(order_id) - #Default - Values - self.tax_type = "execlusive" + #Default Tax - Values + self.tax_type = "exclusive" + + # set cashier by current login + self.cashier_id = requested_by.id + self.cashier_name = requested_by.name + self.requested_by = requested_by.name - self.requested_by = requested_by self.requested_at = DateTime.now.utc Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}" @@ -70,11 +78,17 @@ class Sale < ApplicationRecord self.save! - #compute summary + + #compute sales summary compute #Update the order items that is billed order.update_items_status_to_billed(nil) + order.status = "billed" + order.save + + booking.sale_id = self.id + booking.save return true, self.id end @@ -172,6 +186,7 @@ class Sale < ApplicationRecord end + # Tax Calculate def apply_tax(total_taxable) #if tax is not apply create new record @@ -207,6 +222,7 @@ class Sale < ApplicationRecord private + def product_get_unit_price(item_code) menu_item_hash =MenuItem.search_by_item_code(item_code) if (menu_instance_code) @@ -217,9 +233,15 @@ class Sale < ApplicationRecord def link_order_sale(order_id) #create if it doesn't exist - if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) - SaleOrder.create(:sale_id => self.id, :order_id => order_id) + saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take + + if saleOrder.nil? + sale_order = SaleOrder.new + sale_order.create_sale_order(self.id, order_id) end + # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) + # SaleOrder.create(:sale_id => self.id, :order_id => order_id) + # end #dosomrting here #puts Time.now.format(":short") end @@ -235,11 +257,29 @@ class Sale < ApplicationRecord if self.receipt_no.nil? prefix = DateTime.now().utc #self.receipt_no = prefix.to_s + "/" + self.shit_id.to_s + "/" + SeedGenerator.new_receipt_no().to_s - self.receipt_no = prefix.strftime("%Y%m%d") + "/" + SeedGenerator.new_receipt_no().to_s + self.receipt_no = prefix.strftime("%Y%m%d") + "-" + SeedGenerator.new_receipt_no().to_s self.receipt_date = prefix Rails.logger.debug "Receipt No #{self.receipt_no} | Date #{ self.receipt_date.to_s}" end end + def self.search(search) + if search + # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) + where("receipt_no LIKE ?", "%#{search}%",) + else + find(:all) + end + end + + private + + def generate_custom_id + self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + end + + def self.get_receipt_no_list(from,to) + sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to) + end end diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index cce6982d..f8c38857 100644 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -1,21 +1,35 @@ class SaleAudit < ApplicationRecord -#primary key - need to be unique generated for multiple shops - + self.primary_key = "sale_audit_id" + + #primary key - need to be unique generated for SaleAudit + before_create :generate_custom_id + belongs_to :sale - def record_audit_void(sale_id, void_by, approved_by, reason) + def self.record_audit_void(sale_id, void_by, approved_by, reason) #sale_audit - sale_audit = SaleAudit.new() - sale_audit.sale_id = sale_id - sale_audit.action = "SALEVOID" - sale_audit.action_at = DateTime.now.utc - sale_audit.action_by = void_by + sale_audit = SaleAudit.new() + sale_audit.sale_id = sale_id + sale_audit.action = "SALEVOID" + sale_audit.action_at = DateTime.now.utc + sale_audit.action_by = void_by sale_audit.approved_by = approved_by - sale_audit.remark = reason + sale_audit.remark = reason sale_audit.save! #sale_audit. end + def self.record_audit_complete(sale_id, remark, action_by) + sale_audit = SaleAudit.new() + sale_audit.sale_id = sale_id + sale_audit.action = "SALECOMPLETE" + sale_audit.action_at = DateTime.now.utc + sale_audit.action_by = action_by + sale_audit.remark = remark + sale_audit.approved_by = Time.now + sale_audit.save! + end + def record_audit_discount(sale_id, discount_by, approved_by, reason) #sale_audit sale_audit = SaleAudit.new() @@ -41,13 +55,19 @@ class SaleAudit < ApplicationRecord sale_audit.save! end - def record_payment(sale_id, remark, action_by) + def self.record_payment(sale_id, remark, action_by) sale_audit = SaleAudit.new() sale_audit.sale_id = sale_id sale_audit.action = "SALEPAYMENT" sale_audit.action_at = DateTime.now.utc sale_audit.action_by = action_by sale_audit.remark = remark + sale_audit.approved_by = Time.now sale_audit.save! end + + private + def generate_custom_id + self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index c92ed48f..c49e9317 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -1,9 +1,80 @@ class SaleItem < ApplicationRecord -#primary key - need to be unique generated for multiple shops + self.primary_key = "sale_item_id" + + #primary key - need to be unique generated for multiple shops + before_create :generate_custom_id belongs_to :sale #compute items - discount, tax, price_change def compute_item end + + + def self.get_order_items_details(sale_id) + order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,sales.receipt_date as receipt_date, + sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price") + .joins("left join sales on sales.sale_id = sale_items.sale_id") + .where("sale_items.sale_id=?",sale_id) + + # sale_orders = SaleOrder.where("sale_id=?",sale_id) + # if sale_orders + # sale_orders.each do |sale_order| + # order_details = SaleItem.select("sales.total_discount as discount_amount,DATE_FORMAT(sales.receipt_date,'%Y-%m-%d %h:%m') as receipt_date,sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price") + # .joins("left join sales on sales.id = sale_items.sale_id") + # .where("sale_items.sale_id=?",sale_order.sale_id) + # return order_details + # end + # else + # return false + # end + end + + def self.calculate_food_beverage(sale_items) + food_prices=0 + beverage_prices=0 + + sale_items.each do |si| + food_price, beverage_price = self.get_price(si.sale_item_id) + + food_prices = food_prices + food_price + beverage_prices = beverage_prices + beverage_price + end + puts food_prices + puts beverage_prices + return food_prices, beverage_prices + end + + def self.get_price(sale_item_id) + food_price=0 + beverage_price=0 + + item=SaleItem.select("sale_items.price , menu_items.account_id") + .joins("left join menu_items on menu_items.item_code = sale_items.product_code") + .where("sale_items.sale_item_id=?", sale_item_id.to_s) + if item[0].account_id == 1 + food_price = item[0].price + else + beverage_price = item[0].price + end + + return food_price, beverage_price + end + + def self.get_overall_discount(sale_id) + price = 0.0 + item=SaleItem.where("product_code=?", sale_id) + + item.each do|i| + price += i.price + end + + return price + end + + private + def generate_custom_id + self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + + end end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 23fd39bd..786054c9 100644 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -1,6 +1,23 @@ class SaleOrder < ApplicationRecord -#primary key - need to be unique generated for multiple shops + self.primary_key = "sale_order_id" + + #primary key - need to be unique generated for multiple shops + before_create :generate_sale_order_id belongs_to :sale belongs_to :order + + def create_sale_order(sale, order) + self.sale_id = sale + self.order_id = order + self.save + + end + + private + def generate_sale_order_id + self.class.name + saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") + self.sale_order_id = saleOrderId + end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 2f7b72ea..465a8e5b 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -1,14 +1,19 @@ class SalePayment < ApplicationRecord -#primary key - need to be unique generated for multiple shops + self.primary_key = "sale_payment_id" + + #primary key - need to be unique generated for multiple shops + before_create :generate_custom_id belongs_to :sale - :attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status + attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status + + def process_payment(invoice, action_by, cash_amount, payment_method) - def process_payment(invoice, action_by) self.sale = invoice - + self.received_amount = cash_amount amount_due = invoice.grand_total + #get all payment for this invoices invoice.sale_payments.each do |payment| if (payment.payment_status == "paid" ) @@ -19,34 +24,35 @@ class SalePayment < ApplicationRecord if (amount_due > 0) payment_status = false #route to payment type - switch (payment_method) - case "cash" + case payment_method + when "cash" payment_status = cash_payment - case "creditnote" - payment_status = creditnote_payment - case "visa" - payment_status = external_terminal_card_payment(:visa) - case "master" - payment_status = external_terminal_card_payment(:master) - case "jcb" - payment_status = external_terminal_card_payment(:jcb) - case "mpu" - payment_status = external_terminal_card_payment(:mpu) - case "unionpay" - payment_status = external_terminal_card_payment(:unionpay) - case "vochure" - payment_status = vochure_payment - case "giftcard" - payment_status = giftcard_payment - case "paypar" - #TODO: implement paypar implementation + when "creditnote" + if !self.customer_id.nil? + payment_status = creditnote_payment(self.customer_id) + end + when "visa" + payment_status = external_terminal_card_payment(:visa) + when "master" + payment_status = external_terminal_card_payment(:master) + when "jcb" + payment_status = external_terminal_card_payment(:jcb) + when "mpu" + payment_status = external_terminal_card_payment(:mpu) + when "unionpay" + payment_status = external_terminal_card_payment(:unionpay) + when "vochure" + payment_status = vochure_payment + when "giftcard" + payment_status = giftcard_payment + when "paypar" payment_status = paypar_payment + else + puts "it was something else" end - - #record an payment in sale-audit - remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{amount} | Payment Status ->#{payment_status}" + remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{cash_amount} | Payment Status ->#{payment_status}" sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by) return true, self.sale @@ -58,24 +64,62 @@ class SalePayment < ApplicationRecord return false, "No outstanding Amount" end + end + + def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token) + 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}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + return response; + + end + + def self.redeem(paypar_url,token,membership_id,received_amount,sale_id) + membership_actions_data = MembershipAction.find_by_membership_type("redeem"); + if !membership_actions_data.nil? + url = paypar_url.to_s + membership_actions_data.gateway_url.to_s + merchant_uid = membership_actions_data.merchant_account_id + auth_token = membership_actions_data.auth_token + campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"] + sale_data = Sale.find_by_sale_id(sale_id) + if sale_data + response = HTTParty.post(url, + :body => { generic_customer_id:membership_id,redeem_amount:received_amount,receipt_no:sale_data.receipt_no,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + else + response = false; + end + + else + response =false; + end + return response; + end private def cash_payment payment_status = false - self.payment_method = "cash" self.payment_amount = self.received_amount - self.outstanding_amount = self.sale.grand_total - 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(self.customer_id) + def creditnote_payment(customer_id) + payment_status = false self.payment_method = "creditnote" @@ -96,7 +140,7 @@ class SalePayment < ApplicationRecord self.payment_method = method self.payment_amount = self.received_amount self.payment_reference = self.card_payment_reference - self.outstanding_amount = self.sale.grand_total- 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! @@ -140,20 +184,101 @@ class SalePayment < ApplicationRecord end def paypar_payment - ##TODO - Integration with Paypar (SmartPay) + payment_status = false + + #Next time - validate if the vochure number is valid - within + + customer_data = Customer.find_by_customer_id(self.sale.customer_id) + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id) + if membership_data["status"]==true + self.payment_method = "paypar" + self.payment_amount = self.received_amount + self.payment_reference = self.voucher_no + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f + self.payment_status = "pending" + payment_method = self.save! + SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid') + sale_update_payment_status(self.received_amount.to_f) + + else + sale_update_payment_status(0) + end + + return payment_status + end def sale_update_payment_status(paid_amount) - #update amount_outstanding - self.sale.amount_received = self.sale.amount_received + paid_amount - self.sale.amount_changed = amount - self.sale.amount_received - if (self.sale.grand_total <= self.sale.amount_received && self.sale.amount_changed > 0) + self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f + self.sale.save! + self.sale.amount_changed = self.sale.amount_received.to_f - self.sale.grand_total.to_f + all_received_amount = 0.0 + sObj = Sale.find(self.sale_id) + sObj.sale_payments.each do |spay| + all_received_amount += spay.payment_amount.to_f + end + if (self.sale.grand_total <= all_received_amount) self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! + table_update_status(sObj) + rebat(sObj) end end + def table_update_status(sale_obj) + booking = Booking.find_by_sale_id(sale_obj.id) + if booking + table = DiningFacility.find(booking.dining_facility_id) + if table + table.status = "available" + table.save + end + end + end + + def rebat(sObj) + food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + generic_customer_id = sObj.customer.membership_id + if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0 + paypar = sObj.sale_payments + payparcost = 0 + paypar.each do |pp| + if pp.payment_method == "paypar" + payparcost = payparcost + pp.payment_amount + end + end + overall_dis = SaleItem.get_overall_discount(sObj.id) + total_amount = food_prices - payparcost + overall_dis + puts "total_amount" + puts food_prices + puts payparcost + puts total_amount + if total_amount > 0 + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + merchant_uid = memberaction.merchant_account_id.to_s + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,merchant_uid:merchant_uid,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) + puts "haha" + puts response.to_json + end + end + end + + private + def generate_custom_id + self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + end end diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index 6e0a2d47..79de9134 100644 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -1,5 +1,12 @@ class SaleTax < ApplicationRecord -#primary key - need to be unique generated for multiple shops + self.primary_key = "sale_tax_id" + #primary key - need to be unique generated for multiple shops + before_create :generate_custom_id belongs_to :sale + + private + def generate_custom_id + self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + end end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 4351e74b..fe896a4d 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,7 +1,9 @@ class SeedGenerator < ApplicationRecord + def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) new_receipt_no = 0 + if (seed.nil?) seed = SeedGenerator.new() seed.model = model @@ -15,7 +17,10 @@ class SeedGenerator < ApplicationRecord seed.save end - return prefix + "-" + seed.current.to_s + padding_len = 15 - prefix.length + saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + return saleOrderId + end def self.new_receipt_no diff --git a/app/models/test.rb b/app/models/test.rb deleted file mode 100644 index fe0afa77..00000000 --- a/app/models/test.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Test < ApplicationRecord -end diff --git a/app/models/transactions.rb b/app/models/transactions.rb deleted file mode 100644 index 9cffb0d1..00000000 --- a/app/models/transactions.rb +++ /dev/null @@ -1,5 +0,0 @@ -module Transactions - def self.table_name_prefix - 'transactions_' - end -end diff --git a/app/models/zone.rb b/app/models/zone.rb index e5ad15c7..164b80f4 100644 --- a/app/models/zone.rb +++ b/app/models/zone.rb @@ -2,7 +2,12 @@ class Zone < ApplicationRecord # model association has_many :tables, dependent: :destroy has_many :rooms, dependent: :destroy + has_many :order_queue_stations # validations validates_presence_of :name, :created_by + + def self.collection + Zone.select("id, name").map { |e| [e.name, e.id] } + end end diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb new file mode 100644 index 00000000..55d08ecc --- /dev/null +++ b/app/pdf/crm_order_pdf.rb @@ -0,0 +1,136 @@ +class CrmOrderPdf < Prawn::Document + attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width + def initialize(booking,order_items,printer_settings) + self.p_width = 200 + self.page_height = 1450 + self.margin = 10 + # self.price_width = self.p_width / 2 + self.price_width=80 + self.item_width = self.p_width - self.price_width + self.item_height = self.item_height + self.qty_column_width = self.p_width / 2 + self.item_description_width=self.p_width - self.price_width + self.receipt_width=130 + + @item_width = self.p_width.to_i / 2 + @qty_width = @item_width.to_i / 3 + @double = @qty_width * 1.3 + @half_qty = @qty_width / 2 + #setting page margin and width + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) + self.header_font_size = 10 + self.item_font_size = 9 + + header( printer_settings.printer_name, printer_settings.name) + stroke_horizontal_rule + cashier_info(booking) + line_items(order_items) + + + end + + def header (printer_name, name) + text "#{printer_name}", :size => self.header_font_size,:align => :center + move_down 5 + text "#{name}", :size => self.header_font_size,:align => :center + # move_down self.item_height + move_down 5 + + stroke_horizontal_rule + + end + + def cashier_info(booking) + move_down 5 + move_down 2 + y_position = cursor + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Order By:", :size => self.item_font_size,:align => :left + end + + bounding_box([self.price_width, y_position], :width =>self.receipt_width) do + text "#{booking.checkin_by}" , :size => self.item_font_size, :align => :left + end + move_down 5 + + y_position = cursor + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Customer:", :size => self.item_font_size,:align => :left + end + bounding_box([self.price_width,y_position], :width =>self.price_width) do + text "#{booking.customer_id}" , :size => self.item_font_size,:align => :left + end + move_down 5 + + y_position = cursor + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Date:", :size => self.item_font_size,:align => :left + end + bounding_box([self.price_width,y_position], :width =>self.price_width) do + text "#{booking.checkin_at.strftime('%Y %m %d %h:%m')}" , :size => self.item_font_size,:align => :left + end + # stroke_horizontal_rule + move_down 5 + end + + def line_items(order_items) + y_position = cursor + qty_column_width = self.p_width * 0.2 + item_description_width = self.p_width * 0.5 + price_column_width = self.p_width * 0.3 + + + + stroke_horizontal_rule + move_down 5 + y_position = cursor + pad_top(15) { + # @item_width.to_i + @half_qty.to_i + text_box "Items", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size + text_box "Price", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "Qty", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "Total", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + + } + + move_down 5 + stroke_horizontal_rule + + add_line_item_row(order_items) + + + end + + def add_line_item_row(order_items) + y_position = cursor + move_down 5 + sub_total = 0.0 + order_items.each do |item| + + sub_total += item.qty*item.price + qty = item.qty + total_price = item.qty*item.price + price = item.price + item_name = item.item_name + + + y_position = cursor + + pad_top(15) { + # @item_width.to_i + @half_qty.to_i + text_box "#{item_name}", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size + text_box "#{price}", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "#{qty.to_i}", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "#{total_price}", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + + } + move_down 3 + end + stroke_horizontal_rule + move_down 5 + y_position = cursor + + end + + +end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 356327b4..96008dfd 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,31 +1,96 @@ class OrderItemPdf < 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 + def initialize(order_item) + self.page_width = 254 + self.page_height = 1450 + self.margin = 10 + self.price_width = 40 # No Need for item + self.qty_width = 34 + self.total_width = 40 # No Need for item + self.item_width = self.page_width - (self.qty_width + (self.margin*4)) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.label_width=80 - def initialize(order_item, print_settings) - super(:margin => [10, 5, 30, 5], :page_size => [200,400]) + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - font_size 9 - text "#{order_item.dining}", :size => 15 + # font "public/fonts/padauk.ttf" + self.header_font_size = 14 + self.item_font_size = 12 + + text "#{order_item.dining}", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule move_down 5 - cashier_info(order_item.order_by,order_item.order_at, order_item.customer) + #order_info + order_info(order_item.order_by,order_item.order_at) + # order items + order_items(order_item) end - def cashier_info(order_by, order_at, customer) - move_down 5 + # Write Order Information to PDF + def order_info(order_by, order_at) y_position = cursor - bounding_box([0,y_position], :width =>200, :height => 20) do - text "OrderBy:#{order_by} Customer:#{customer} Date:#{order_at.strftime("%Y %m %d")}", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left + end + + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Date: #{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule + move_down 10 + end + + # Write Order items to PDF + def order_items(order_item) + y_position = cursor + + # No Need for Order Item + # bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + # text "Item", :size => self.item_font_size,:align => :left + # end + + # bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + # text "Qty", :size => self.item_font_size,:align => :right + # end + + # stroke_horizontal_rule + # move_down 5 + + #Add Order Item + add_order_items(order_item) + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, self.page_width move_down 5 end + # Add order items under order info + def add_order_items(order_item) + y_position = cursor + + move_down 5 + + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{order_item.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "[#{order_item.qty.to_i}]", :size => self.item_font_size,:align => :left + end + + move_down 5 + + end + end diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 8b79b40e..47c1f6a5 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,17 +1,92 @@ class OrderSummaryPdf < 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 + def initialize(order) + self.page_width = 254 + self.page_height = 1450 + self.margin = 10 + self.price_width = 40 # No Need for item + self.qty_width = 34 + self.total_width = 40 # No Need for item + self.item_width = self.page_width - (self.qty_width + (self.margin*4)) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.label_width=100 - def initialize(order, print_settings) - super(:margin => [10, 5, 30, 5], :page_size => [200,400]) + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" + self.header_font_size = 12 + self.item_font_size = 10 - - font_size 9 - text "#{"table_name"}", :size => 15 + text "#{order[0].dining}", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule move_down 5 + #order_info + order_info(order[0].order_by,order[0].order_at) + + # order items + order_items(order) + + end + + # Write Order Information to PDF + def order_info(order_by, order_at) + y_position = cursor + + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left + end + + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Date: #{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left + end + + stroke_horizontal_rule + + move_down 10 + end + + # Write Order items to PDF + def order_items(order_item) + y_position = cursor + + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Item", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "Qty", :size => self.item_font_size,:align => :left + end + + stroke_horizontal_rule + move_down 5 + + #Add Order Item + add_order_items(order_item) + end + + # Add order items under order info + def add_order_items(order_item) + y_position = cursor + + move_down 5 + + order_item.each do|odi| + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{odi.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "#{odi.qty}", :size => self.item_font_size,:align => :left + end + end + + move_down 5 + end end diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb new file mode 100644 index 00000000..704dbfdb --- /dev/null +++ b/app/pdf/queue_no_pdf.rb @@ -0,0 +1,58 @@ +class QueueNoPdf < 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 + def initialize(printer_settings, queue) + self.page_width = 210 + self.page_height = 2500 + self.margin = 5 + self.price_width = 35 + self.qty_width = 20 + self.total_width = 35 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + self.label_width = 100 + + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + self.header_font_size = 10 + self.item_font_size = 8 + + header( "Beauty In the Pot", printer_settings.name) + + queue_no(queue) + stroke_horizontal_rule + + date_info(queue) + + end + + def header (printer_name, name) + text "#{printer_name}", :left_margin => -10, :size => self.header_font_size,:align => :center + text "#{name}", :size => self.header_font_size,:align => :center + # move_down self.item_height + move_down 5 + stroke_horizontal_rule + move_down 5 + end + + def queue_no (queue) + move_down 5 + text "#{queue.queue_no}", :size => 100,:align => :center + end + + def date_info(queue) + move_down 5 + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Date:", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.item_width) do + text "#{queue.created_at.strftime('%Y-%m-%d %I:%M %p')}" , :size => self.item_font_size,:align => :left + end + + move_down 5 + + end + +end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index e9ad042c..2d67989d 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,110 +1,237 @@ class ReceiptBillPdf < Prawn::Document - attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width - def initialize(printer_settings, sale_items,sale) - self.p_width = 200 - self.page_height = 1450 - self.margin = 10 - # self.price_width = self.p_width / 2 - self.price_width=90 - self.item_width = self.p_width - self.price_width - self.item_height = self.item_height - self.qty_column_width = self.p_width / 2 - self.item_description_width=self.p_width - self.price_width - self.receipt_width=130 + 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 + def initialize(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total, member_info = nil) + self.page_width = 210 + self.page_height = 2500 + self.margin = 5 + self.price_width = 35 + self.qty_width = 20 + self.total_width = 35 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + self.label_width = 100 - @item_width = self.p_width.to_i / 2 - @qty_width = @item_width.to_i / 3 - @double = @qty_width * 2 - @half_qty = @qty_width / 2 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 #setting page margin and width - super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # font "public/fonts/#{font_name}".to_s + ".ttf".to_s + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" self.header_font_size = 10 - self.item_font_size = 6 + self.item_font_size = 8 - header( printer_settings.printer_name, printer_settings.name) - stroke_horizontal_rule - cashier_info(sale.receipt_no,sale.customer.name, sale.receipt_date) - line_items(sale_items) + header( "Beauty In the Pot", printer_settings.name) - + stroke_horizontal_rule + + cashier_info(sale_data, customer_name) + line_items(sale_items, food_total, beverage_total) + all_total(sale_data) + + if member_info != nil + member_info(member_info) + end + + footer end def header (printer_name, name) - text "#{printer_name}", :size => self.header_font_size,:align => :center - move_down 5 - text "#{name}", :size => self.header_font_size,:align => :center - # move_down self.item_height - move_down 5 - - stroke_horizontal_rule + text "#{printer_name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down 5 + text "#{name}", :size => self.header_font_size,:align => :center + # move_down self.item_height + move_down 5 + stroke_horizontal_rule end - def cashier_info(receipt_no, customer, receipt_date) - move_down 5 - move_down 2 + def cashier_info(sale_data, customer_name) + move_down 7 + # move_down 2 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do text "Receipt No:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width, y_position], :width =>self.receipt_width) do - text "#{receipt_no}" , :size => self.item_font_size, :align => :left + bounding_box([self.label_width, y_position], :width =>self.item_width) do + text "#{sale_data.receipt_no}" , :size => self.item_font_size, :align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do text "Customer:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do - text "#{customer}" , :size => self.item_font_size,:align => :left + bounding_box([self.label_width,y_position], :width =>self.item_width) do + text "#{customer_name}" , :size => self.item_font_size,:align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do - text "Date:", :size => self.item_font_size,:align => :left + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Date:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do - text "#{receipt_date}" , :size => self.item_font_size,:align => :left + bounding_box([self.label_width,y_position], :width => self.item_width) do + text "#{sale_data.receipt_date.strftime('%Y-%m-%d %I:%M %p')}" , :size => self.item_font_size,:align => :left end - # stroke_horizontal_rule + + move_down 5 + stroke_horizontal_rule move_down 5 end - def line_items(sale_items) + def line_items(sale_items, food_total, beverage_total) y_position = cursor - qty_column_width = self.p_width * 0.2 - item_description_width = self.p_width * 0.5 - price_column_width = self.p_width * 0.3 - - - stroke_horizontal_rule - move_down 5 - y_position = cursor pad_top(15) { # @item_width.to_i + @half_qty.to_i - text_box "Items", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size - text_box "Price", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Qty", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Discount", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Total", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "Price", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "Total", :at =>[(self.item_width+self.price_width),y_position], :width => self.total_width+5, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } move_down 5 stroke_horizontal_rule - add_line_item_row(sale_items) - stroke_horizontal_rule + add_line_item_row(sale_items, food_total, beverage_total) end - def add_line_item_row(sale_items) - y_position = cursor - move_down 5 + def add_line_item_row(sale_items, food_total, beverage_total) + item_name_width = (self.item_width+self.price_width) + y_position = cursor + move_down 5 + sub_total = 0.0 + sale_items.each do |item| + sub_total += (item.qty*item.unit_price) + qty = item.qty + total_price = item.qty*item.unit_price + price = item.unit_price + product_name = item.product_name + + + y_position = cursor + + pad_top(15) { + text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :overflow => :shrink_to_fix, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{price.to_i}", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{qty.to_i}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{total_price.to_i}", :at =>[(item_name_width),y_position], :width =>self.total_width+5, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + move_down 3 + end + + stroke_horizontal_rule + + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Sub Total", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ sub_total }" , :size => self.item_font_size,:align => :right + end + + # Food and Beverage + food_beverage_total = food_total.to_s + "/" + beverage_total.to_s + + move_down 5 + + y_position = cursor + bounding_box([0,y_position], :width => self.item_description_width, :height => self.item_height) do + text "Food/Beverage Total", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width => self.label_width) do + text "#{ food_beverage_total }" , :size => self.item_font_size,:align => :right + end + end + + def all_total(sale_data) + item_name_width = self.item_width + move_down 5 + y_position = cursor + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Discount", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right + end + + if sale_data.sale_taxes.length > 1 + sale_data.sale_taxes.each do |st| + move_down 5 + y_position = cursor + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ st.tax_name }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "( " +"#{ st.tax_payable_amount }" +" )" , :size => self.item_font_size,:align => :right + end + end + else + + end + + # move_down 5 + # y_position = cursor + + # bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + # text "Total Tax", :size => self.item_font_size,:align => :left + # end + # bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + # text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right + # end + + move_down 5 + y_position = cursor + move_down 5 + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Grand Total", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{sale_data.grand_total}" , :size => self.item_font_size,:align => :right + end + move_down 5 + # stroke_horizontal_rule + end + + # show member information + def member_info(member_info) + + move_down 7 + if member_info["status"] == true + member_info["data"].each do |res| + + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ res["accountable_type"] }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ res["balance"] }" , :size => self.item_font_size,:align => :right + end + + end + end + end + + def footer + move_down 5 + stroke_horizontal_rule + move_down 5 + + text "*** Thank You ***", :left_margin => -10, :size => self.header_font_size,:align => :center + + move_down 5 end end diff --git a/app/reports/menu_report.rb b/app/reports/menu_report.rb index ca430f0a..2a17e851 100644 --- a/app/reports/menu_report.rb +++ b/app/reports/menu_report.rb @@ -1,5 +1,5 @@ -class MenuReport < Compendium::Report - query :list, collect: :active_record do |params| - Menu.all - end -end +# class MenuReport < Compendium::Report +# query :list, collect: :active_record do |params| +# Menu.all +# end +# end diff --git a/app/views/api/bookings/show.json.jbuilder b/app/views/api/bookings/show.json.jbuilder index c4edb79f..e1ebd5a9 100644 --- a/app/views/api/bookings/show.json.jbuilder +++ b/app/views/api/bookings/show.json.jbuilder @@ -1,7 +1,12 @@ if (@booking) - json.id @booking.id + json.id @booking.booking_id json.status @booking.booking_status - json.checkin_at @booking.checkin_at + if Sale.exists?(@booking.sale_id) + json.sale_status Sale.find(@booking.sale_id).sale_status + else + json.sale_status "" + end + json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y") json.checkin_by @booking.checkin_by json.table_name @booking.dining_facility.name @@ -17,9 +22,9 @@ if (@booking) order_items = [] @booking.booking_orders.each do |bo| order = Order.find(bo.order_id) - if (order.status == "new") + #if (order.status == "new") order_items = order_items + order.order_items - end + #end end json.order_items order_items do |item| diff --git a/app/views/api/customers/get_customer_order.json.jbuilder b/app/views/api/customers/get_customer_order.json.jbuilder new file mode 100644 index 00000000..f00ce173 --- /dev/null +++ b/app/views/api/customers/get_customer_order.json.jbuilder @@ -0,0 +1,38 @@ +if (@customer) + json.id @customer.customer_id + json.name @customer.name + json.email @customer.email + json.contact_no @customer.contact_no + json.date_of_birth @customer.date_of_birth + + + @total_amount = 0.00 + @total_tax = 0.00 + + if @customer.orders + order_items = [] + @customer.orders.each do |bo| + order = Order.find(bo.order_id) + #if (order.status == "new") + order_items = order_items + order.order_items + #end + end + + json.order_items order_items do |item| + json.item_instance_code item.item_code + json.item_name item.item_name + json.price item.price + json.qty item.qty + json.options item.options + json.remark item.remark + json.item_status item.order_item_status + @total_amount = @total_amount + (item.price * item.qty) + end + + end + + json.sub_total @total_amount + json.commerical_tax @total_amount * 0.05 + json.total @total_amount + (@total_amount * 0.05) + +end \ No newline at end of file diff --git a/app/views/crm/customers/_error_messages.html.erb b/app/views/crm/customers/_error_messages.html.erb new file mode 100644 index 00000000..bbff284b --- /dev/null +++ b/app/views/crm/customers/_error_messages.html.erb @@ -0,0 +1,9 @@ +
+ +
diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb index c5adac88..c913651a 100644 --- a/app/views/crm/customers/_form.html.erb +++ b/app/views/crm/customers/_form.html.erb @@ -1,4 +1,5 @@ -<%= simple_form_for(@crm_customer) do |f| %> + +<%= simple_form_for([:crm,@crm_customer]) do |f| %> <%= f.error_notification %>
@@ -7,7 +8,6 @@ <%= f.input :contact_no %> <%= f.input :email %> <%= f.input :date_of_birth %> - <%= f.association :membership %> <%= f.input :membership_type %> <%= f.input :membership_authentication_code %>
@@ -16,3 +16,5 @@ <%= f.button :submit %> <% end %> + + \ No newline at end of file diff --git a/app/views/crm/customers/edit.html.erb b/app/views/crm/customers/edit.html.erb index 62bd18eb..8541aa0d 100644 --- a/app/views/crm/customers/edit.html.erb +++ b/app/views/crm/customers/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', crm_customer: @crm_customer %> -<%= link_to 'Show', @crm_customer %> | +<%= link_to 'Show', @crm_customers_path %> | <%= link_to 'Back', crm_customers_path %> diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 3df65eac..f97de091 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -1,41 +1,242 @@ -

<%= notice %>

+
+
+
    +
  1. Home
    2. +
  2. + Customer +
    3. + +
+
+
-

Crm Customers

- - - - - - - - - - - - - - +
+
+ +
+
+
NameCompanyContact noEmailDate of birthMembershipMembership typeMembership authentication code
+ + - - <% @crm_customers.each do |crm_customer| %> - - - - - - - - - - - - - - <% end %> - -
<%= crm_customer.name %><%= crm_customer.company %><%= crm_customer.contact_no %><%= crm_customer.email %><%= crm_customer.date_of_birth %><%= crm_customer.membership %><%= crm_customer.membership_type %><%= crm_customer.membership_authentication_code %><%= link_to 'Show', crm_customer %><%= link_to 'Edit', edit_crm_customer_path(crm_customer) %><%= link_to 'Destroy', crm_customer, method: :delete, data: { confirm: 'Are you sure?' } %>
+ + + <%= form_tag crm_customers_path, :method => :get do %> +
+ + +
+ <% end %> + + + + Select + Name + Company + Contact no + Email + + -
+ + <% if @crm_customers.count > 0 %> + <% @crm_customers.each do |crm_customer| %> + <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + + + + <%= crm_customer.name %> + <%= crm_customer.company rescue '-' %> + <%= crm_customer.contact_no %> + <%= crm_customer.email %> + <%= link_to 'Show', crm_customer_path(crm_customer) %> + + + <% end %> + <% end %> + <%else%> +

There are no record for your search

+ <% end %> + + +
+ + <%= paginate @crm_customers %> + + -<%= link_to 'New Crm Customer', new_crm_customer_path %> + +
+ + <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + + + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> + +
"> + <%= f.input :name, :class => "form-control col-md-6 name" %> + <% flash.each do |name, msg| %> + <%= msg['name'] %> + <% end -%> + +
+
+ <%= f.input :company, :class => "form-control col-md-6 company" %> +
+
"> + <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> + <% flash.each do |name, msg| %> + <%= msg['contact_no'] %> + <% end -%> +
+ +
"> + <%= f.input :email, :class => "form-control col-md-6 email" %> + + <% flash.each do |name, msg| %> + <%= msg['email'] %> + <% end -%> +
+ +
+ + <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> +
+ +
+ + + +
+ + +
+ <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> + <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> + <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %> +
+ <%end%> +
+
+
+ + Back + +
+ + + + + \ No newline at end of file diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 30341a00..d806ec34 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -1,44 +1,163 @@ -

<%= notice %>

+
+
+ -

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

+ + + -

- Company: - <%= @crm_customer.company %> -

+
-

- Contact no: - <%= @crm_customer.contact_no %> -

+
+
+
+
+
+

Customer Profile

+
+ + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @crm_customer.name %>
Email<%= @crm_customer.email %>
Contact no<%= @crm_customer.contact_no %>
Company<%= @crm_customer.company %>
Date Of Birth<%= @crm_customer.date_of_birth %>
+
+
+
+
+
+
+
+

Membership Detail

+
+ + + <% if @membership == 0 %> + + + + <% else %> + <% @membership.each do |member| %> + + + + + <% end %> + + <% end %> + +
"There is no membership data"
<%= member["accountable_type"] %><%= member["balance"] %>
+
+
+
+
-

- Email: - <%= @crm_customer.email %> -

+
+

Order Details

+
+ + + + + + + + + + + + + -

- Date of birth: - <%= @crm_customer.date_of_birth %> -

+ + <% @order_items.each do |order_item| %> + + + + + + + + + + + <% end %> + +
Order IDMenu ItemQTYUnit Price OptionStatusWaiterCreated at
<%= order_item.order_id %><%= order_item.item_name %><%= order_item.qty %><%= order_item.price %><%= order_item.options %><%= order_item.order_item_status %><%= order_item.item_order_by %> <%= order_item.created_at.strftime("%d-%m-%y") %>
+
+
-

- Membership: - <%= @crm_customer.membership %> -

+
+

Sale Details

+
+ + + + + + + + + + + -

- Membership type: - <%= @crm_customer.membership_type %> -

+ + <% @sale_items.each do |sale_item| %> + + + + + + + + + + <% end %> + +
Sale ID Menu ItemQTYUnit Price Tax PriceCreated At
<%= sale_item.sale_id %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.unit_price %><%= sale_item.taxable_price %><%= sale_item.created_at %>
+
+
+ +
+ +
+ +
+

+ + Back + +
+ +
-

- Membership authentication code: - <%= @crm_customer.membership_authentication_code %> -

-<%= link_to 'Edit', edit_crm_customer_path(@crm_customer) %> | -<%= link_to 'Back', crm_customers_path %> diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder index 24d20eca..bd9680de 100644 --- a/app/views/crm/customers/show.json.jbuilder +++ b/app/views/crm/customers/show.json.jbuilder @@ -1 +1,2 @@ -json.partial! "crm_customers/crm_customer", crm_customer: @crm_customer +json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at +json.url crm_customer_url(@crm_customer, format: :json) diff --git a/app/views/crm/customers/showbackup.html.erb b/app/views/crm/customers/showbackup.html.erb new file mode 100644 index 00000000..936192cf --- /dev/null +++ b/app/views/crm/customers/showbackup.html.erb @@ -0,0 +1,85 @@ +
+
+
    +
  1. Home
    2. +
  2. + Customer +
    3. +
  3. Details +
    4. +
+
+
+ + +
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
NameEmailContact noCompanyDate Of BirthMembership Account
<%= @crm_customer.name %><%= @crm_customer.email %><%= @crm_customer.contact_no %><%= @crm_customer.company %><%= @crm_customer.date_of_birth %>
+
+ + +

Sale Items

+ + + + + + + + + + + + + + + <% @sale_items.each do |sale_item| %> + + + + + + + + + + <% end %> + +
Sale ID Menu ItemQTYUnit Price Tax PriceCreated At
<%= sale_item.sale_id %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.unit_price %><%= sale_item.taxable_price %><%= sale_item.created_at %>
+
+
+ +
+ + +
+ + + + + diff --git a/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder b/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder new file mode 100644 index 00000000..f2580e52 --- /dev/null +++ b/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! crm_dining_queue, :id, :name, :contact, :queue_no, :created_at, :updated_at +json.url crm_dining_queue_url(crm_dining_queue, format: :json) diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb new file mode 100644 index 00000000..7f02ac15 --- /dev/null +++ b/app/views/crm/dining_queues/_form.html.erb @@ -0,0 +1,25 @@ + +<%= simple_form_for([:crm,@dining_queue]) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :name %> + <%= f.input :contact_no %> + <%= f.input :queue_no , :class => "dining",:id => "dining", :readonly => true%> + +
+
+
+ <%= f.button :submit %> +
+<% end %> + + + diff --git a/app/views/crm/dining_queues/edit.html.erb b/app/views/crm/dining_queues/edit.html.erb new file mode 100644 index 00000000..e5ca3b9f --- /dev/null +++ b/app/views/crm/dining_queues/edit.html.erb @@ -0,0 +1,11 @@ + +
+
+ +
+ <%= render 'form', dining_queue: @dining_queue %> +
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb new file mode 100644 index 00000000..e7834b98 --- /dev/null +++ b/app/views/crm/dining_queues/index.html.erb @@ -0,0 +1,38 @@ + + +
+ +
+ +
+
+ + + + + + + + + + + + <% @dining_queues.each do |dining_queue| %> + + + + + + + <% end %> + +
NameContact NoQueue NoAction
<%= dining_queue.name %><%= dining_queue.contact_no %><%= dining_queue.queue_no %> + <%= link_to 'Edit', edit_crm_dining_queue_path(dining_queue) %> | <%= link_to 'Destroy', crm_dining_queue_path(dining_queue), method: :delete, data: { confirm: 'Are you sure?' } %>
+
+ diff --git a/app/views/crm/dining_queues/index.json.jbuilder b/app/views/crm/dining_queues/index.json.jbuilder new file mode 100644 index 00000000..979087b7 --- /dev/null +++ b/app/views/crm/dining_queues/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @crm_dining_queues, partial: 'crm_dining_queues/crm_dining_queue', as: :crm_dining_queue diff --git a/app/views/crm/dining_queues/new.html.erb b/app/views/crm/dining_queues/new.html.erb new file mode 100644 index 00000000..280a59b2 --- /dev/null +++ b/app/views/crm/dining_queues/new.html.erb @@ -0,0 +1,11 @@ + +
+
+ +
+ <%= render 'form', dining_queue: @dining_queue %> +
\ No newline at end of file diff --git a/app/views/crm/dining_queues/show.html.erb b/app/views/crm/dining_queues/show.html.erb new file mode 100644 index 00000000..5e52a611 --- /dev/null +++ b/app/views/crm/dining_queues/show.html.erb @@ -0,0 +1,19 @@ +

<%= notice %>

+ +

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

+ +

+ Contact: + <%= @crm_dining_queue.contact %> +

+ +

+ Queue no: + <%= @crm_dining_queue.queue_no %> +

+ +<%= link_to 'Edit', edit_crm_dining_queue_path(@crm_dining_queue) %> | +<%= link_to 'Back', crm_dining_queues_path %> diff --git a/app/views/crm/dining_queues/show.json.jbuilder b/app/views/crm/dining_queues/show.json.jbuilder new file mode 100644 index 00000000..83c09bea --- /dev/null +++ b/app/views/crm/dining_queues/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "crm_dining_queues/crm_dining_queue", crm_dining_queue: @crm_dining_queue diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index b8d2ba50..fbe837a7 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -6,28 +6,29 @@ <% @booking.each do |booking| %> <% if booking.booking_status == "new" %>
-
-

- <%= @i += 1 %> . <%= booking.dining_facility.name %> - - <%= booking.id %> -

- -

- - Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> - -

-
-
-
-
- +
+ +

+ <%= @i += 1 %> . <%= booking.dining_facility.name %> + - <%= booking.id %> +

+ +

+ + Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> + +

-
- +
+
+
+ +
+
+ +
+
-
-
<% end %> <% end %> @@ -36,47 +37,96 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/crm/home/_customer.html.erb b/app/views/crm/home/_customer.html.erb index ea643494..4b32d5b4 100644 --- a/app/views/crm/home/_customer.html.erb +++ b/app/views/crm/home/_customer.html.erb @@ -1,7 +1,7 @@
<% @customer.each do |customer| %> -
+

Name : <%= customer.name %>

diff --git a/app/views/crm/home/_queue.html.erb b/app/views/crm/home/_queue.html.erb index 5bbbd2bf..81cdd825 100644 --- a/app/views/crm/home/_queue.html.erb +++ b/app/views/crm/home/_queue.html.erb @@ -1,37 +1,21 @@
<% @i = 0 %> - <% @booking.each do |booking| %> - <% if booking.booking_status == "assign" %> -
-
+ <% @queue.each do |queue| %> + +
+

- <%= @i += 1 %> . <%= booking.dining_facility.name %> - - <%= booking.id %> + <%= @i += 1 %> . <%= queue.name %>

+

- - Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> - + Contact No - <%= queue.contact_no %>

- +
- <% end %> + <% end %> - - - - -
\ No newline at end of file diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index a140f43c..d73a0cdc 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -3,34 +3,34 @@ -
    +
    -
    +
    <%= render :partial => 'queue' %>
    -
    +
    <%= render :partial => 'booking' %>
    -
    +
    <%= render :partial => 'customer' %>
    @@ -47,12 +47,12 @@
    - +
    - + @@ -67,17 +67,38 @@
    Order ByOrder At - Customer + Order AtCustomer
    + + + + + + + + + + + + + + + +
    Name
    Email
    Contact No
    - + + +
    Items QtyPrice + Price
    No Order Items
    + +
    @@ -92,10 +113,13 @@
    - - + +
    + diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ce88a421..35eb6481 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,25 +1,25 @@ -
    -
    - <%= simple_form_for(@login_form, url: login_path, method: "POST") do |f| %> -
    -

    Login

    -
    -
    - <%= f.input :emp_id, required: false, autofocus: true, class: "form-control" %> -
    -
    - <%= f.input :password, required: false, class: "form-control" %> -
    - +
    +
    + <%= simple_form_for(@login_form, url: login_path, method: "POST") do |f| %> +
    +

    Login

    +
    +
    + <%= f.input :emp_id, required: false, autofocus: true, class: "form-control" %>
    -
    - <%= f.button :submit, "Log in", class: "form-control btn btn-fill btn-warning btn-wd" %> - +
    + <%= f.input :password, required: false, class: "form-control" %>
    +
    + <%= f.button :submit, "Log in", class: "form-control btn btn-fill btn-warning btn-wd" %> - <% end %> -
    +
    + +
    + + <% end %>
    +
    diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb new file mode 100644 index 00000000..2682d341 --- /dev/null +++ b/app/views/kaminari/_first_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "First" page + - available local variables + url: url to the first page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %> + diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb new file mode 100644 index 00000000..bbb0f983 --- /dev/null +++ b/app/views/kaminari/_gap.html.erb @@ -0,0 +1,8 @@ +<%# Non-link tag that stands for skipped pages... + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +<%= t('views.pagination.truncate').html_safe %> diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb new file mode 100644 index 00000000..53d61307 --- /dev/null +++ b/app/views/kaminari/_last_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Last" page + - available local variables + url: url to the last page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %> + diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb new file mode 100644 index 00000000..4fc20712 --- /dev/null +++ b/app/views/kaminari/_next_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Next" page + - available local variables + url: url to the next page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %> + diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb new file mode 100644 index 00000000..582af7bc --- /dev/null +++ b/app/views/kaminari/_page.html.erb @@ -0,0 +1,12 @@ +<%# Link showing page number + - available local variables + page: a page object for "this" page + url: url to this page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> + diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb new file mode 100644 index 00000000..c52381e2 --- /dev/null +++ b/app/views/kaminari/_paginator.html.erb @@ -0,0 +1,23 @@ +<%# The container tag + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote + paginator: the paginator that renders the pagination tags inside +-%> +<%= paginator.render do -%> + +<% end %> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb new file mode 100644 index 00000000..9c4aff49 --- /dev/null +++ b/app/views/kaminari/_prev_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Previous" page + - available local variables + url: url to the previous page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %> + diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb index 4bd98526..f1a43726 100644 --- a/app/views/layouts/CRM.html.erb +++ b/app/views/layouts/CRM.html.erb @@ -9,17 +9,20 @@ SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'CRM', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %> <%= render 'layouts/header_crm' %>
    <% flash.each do |type, message| %> -
    +
    - <%= message %> + + <% if !flash["errors"]%> + <%=message%> + <% end %>
    <% end %> <%= yield %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 47c10ac9..c729f255 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -14,25 +14,35 @@
  • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
  • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %>
  • <%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %>
  • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
  • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %>
  • <%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %>
  • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
    • +
    +
  • <%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %>
    • -
    • <%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %>
      • +
    +
    • +
  • + +
      +
    • <%= link_to "Daily Sale Report", origami_root_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Sales Item Report", origami_root_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
    • -
    diff --git a/app/views/layouts/_header_crm.html.erb b/app/views/layouts/_header_crm.html.erb index 7e497f1e..e004853e 100644 --- a/app/views/layouts/_header_crm.html.erb +++ b/app/views/layouts/_header_crm.html.erb @@ -4,7 +4,7 @@ CRM
    - Queue | Bookings | Online Orders | Customers + <%= link_to 'Queue', crm_dining_queues_path, :html=>":color:white" %> | Bookings | Online Orders | <%= link_to 'Customer', crm_customers_path, :html=>":color:white" %>
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 44624a43..1d4991e6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,7 +18,7 @@ <%= render 'layouts/header' %>
    <% flash.each do |type, message| %> -
    +
    <%= message %>
    diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb index 2c438597..179d9ae1 100644 --- a/app/views/layouts/origami.html.erb +++ b/app/views/layouts/origami.html.erb @@ -9,18 +9,21 @@ SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'orgiami', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'orgiami', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %> <%= render 'layouts/header_orgiami' %>
    <% flash.each do |type, message| %> -
    - - <%= message %> -
    + <% if !flash["errors"]%> +
    + + <%=message%> +
    + <% end %> + <% end %> <%= yield %> diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 982264ab..f2120cde 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -61,11 +61,8 @@

    - +
    -
    <% end @@ -112,10 +109,10 @@

    - +
    - +
    <% @@ -193,7 +190,7 @@
    +
    diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb new file mode 100644 index 00000000..e4f97119 --- /dev/null +++ b/app/views/origami/credit_payments/index.html.erb @@ -0,0 +1 @@ +hello Credit diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb new file mode 100644 index 00000000..dd2b1b99 --- /dev/null +++ b/app/views/origami/customers/index.html.erb @@ -0,0 +1,239 @@ +
    +
    +
      +
    1. Home
      2. + + +
    +
    +
    + + +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + <% if @crm_customers.count > 0 %> + <% @crm_customers.each do |crm_customer| %> + <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + + + + + + + + + + <% end %> + <% end %> + <%else%> + + <% end %> + +
    + <% path ="/origami/#{@sale_id}/customers" %> + <%= form_tag path, :method => :get do %> +
    + + +
    + <% end %> +
    SelectNameCompanyContact noEmail
    + <%= crm_customer.name %><%= crm_customer.company rescue '-' %><%= crm_customer.contact_no %><%= crm_customer.email %>

    There are no record for your search

    +
    + + <%= paginate @crm_customers %> +
    +
    + +
    + +
    + <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + + + + <%= f.error_notification %> + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> + +
    "> + <%= f.input :name, :class => "form-control col-md-6 name" %> + <% flash.each do |name, msg| %> + <%= msg['name'] %> + <% end -%> + +
    +
    + <%= f.input :company, :class => "form-control col-md-6 company" %> +
    +
    "> + <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> + <% flash.each do |name, msg| %> + <%= msg['contact_no'] %> + <% end -%> +
    + +
    "> + <%= f.input :email, :class => "form-control col-md-6 email" %> + + <% flash.each do |name, msg| %> + <%= msg['email'] %> + <% end -%> +
    + +
    + + <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> +
    + +
    + + +
    + +
    + <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> + +
    + <%end%> +
    +
    +
    + + Back + +
    +
    + + + + + + + + diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb new file mode 100644 index 00000000..4f6b7c9a --- /dev/null +++ b/app/views/origami/discounts/index.html.erb @@ -0,0 +1,178 @@ +
    + +
    + + +
    + +
    +
    +
    + +

    Receipt No: <%=@sale_data.receipt_no rescue ' '%>

    + +
    +
    +

    Date: <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    +
    +
    +
    + + + + + + + + <% sub_total = 0 %> + <% @sale_data.sale_items.each do |sale_item| %> + <% sub_total += sale_item.qty*sale_item.unit_price%> + > + + + + + <%end %> + +
    ItemsQTY + Price +
    + <%=sale_item.product_name%>@<%=sale_item.unit_price%> + + <%=sale_item.qty%> + + <%=(sale_item.qty*sale_item.unit_price)%> +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    Sub Total:<%=sub_total%>
    Discount:(<%=@sale_data.total_discount rescue 0%>)
    +
    +
    +
    +
    + + + +
    + +
    +
    +
    Overall Discount
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    5%
    +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    + +
    +
    +
    10%
    +
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    + +
    +
    +
    20%
    +
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    + +
    +
    +
    30%
    +
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    + +
    +
    +
    50%
    +
    +
    +
    +
    +
    DEL
    +
    CLR
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 7dcc1ba8..66d65aea 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -1,9 +1,12 @@
    -
    - + +
    -
    - +
    + +
    +
    + <% + @completed_orders.each do |cpo| + # ToDo no need check new + # Assigned Id for new Order? Sale? + unique_id = "" + customer_id = "" + # For CSS- Class for Order? Sale? + # sale_status="" + # if cpo.order_status == 'new' + # unique_id=cpo.booking_id + + # customer_id=cpo.order_customer_id + # # check selected item and assign + # if @selected_item_type == "Sale" + # if cpo.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end + # else + unique_id=cpo.sale_id + customer_id=cpo.sale_customer_id + sale_status="paid" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + # end + %> +
    +
    + + + + +

    <%= cpo.table_name %>

    +

    + Receipt No : + + <%= cpo.receipt_no %> + +

    +

    + Order Status : + <%= cpo.sale_status %> + +

    +
    +
    + <% + end + %> +
    +
    + +
    - -
    - <% if @order_table %> - <% @order_table.each do |order_table| %> -
    -
    -

    <%=order_table.table_name%>

    -

    <%=order_table.total_price%>

    -
    -
    - <%end %> - <%end %> -
    +
    + <% + @booking_orders.each do |bko| + # No Show completed + if bko.sale_status == 'completed' + next + end -
    - - -
    - -
    - <% @order_rooms.each do |order_room| %> -
    - + # Assigned Id for new Order? Sale? + unique_id="" + customer_id="" + # For CSS- Class for Order? Sale? + sale_status="" + if bko.order_status == 'new' + unique_id=bko.booking_id + customer_id=bko.order_customer_id + # check selected item and assign + # if @selected_item != nil + # if bko.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end + else + unique_id=bko.sale_id + customer_id=bko.sale_customer_id + sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end + %> +
    - <% tablename = order_room.room_name%> -

    <%=order_room.room_name%>

    -

    <%=order_room.total_price%>

    + + + +

    <%= bko.table_name %>

    +

    + Receipt No : + + <%= bko.receipt_no %> + +

    +

    + Order Status : + <%= bko.order_status %> + +

    - <%end %> + <% + end + %>
    - -
    - - -
    - -
    - <% @orders.each do |order| %> -
    - + +
    +
    + <% + @booking_rooms.each do |rmo| + # No Show completed + if rmo.sale_status == 'completed' + next + end + + # Assigned Id for new Order? Sale? + unique_id="" + customer_id="" + # For CSS- Class for Order? Sale? + sale_status="" + + if rmo.order_status == 'new' + unique_id=rmo.booking_id + customer_id=rmo.order_customer_id + # check selected item and assign + # if @selected_item != nil + # if rmo.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end + else + unique_id=rmo.sale_id + customer_id=rmo.sale_customer_id + sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end + %> +
    -

    <%=order.table_or_room_name%>

    -

    <%=order.total_price%>

    + + + +

    <%= rmo.room_name %>

    +

    + Receipt No : + + <%= rmo.receipt_no %> + +

    +

    + Order Status : + <%= rmo.order_status %> + +

    - <%end %> + <% + end + %> +
    +
    + + +
    +
    + <% + @orders.each do |odr| + # No Show completed + if odr.sale_status == 'completed' + next + end + # Assigned Id for new Order? Sale? + unique_id="" + customer_id="" + # For CSS- Class for Order? Sale? + sale_status="" + + if odr.order_status == 'new' + unique_id=odr.booking_id + customer_id = odr.order_customer_id + # if @selected_item != nil + # if odr.order_id == @selected_item.order_id + # sale_status = sale_status + " selected-item" + # end + # end + else + unique_id=odr.sale_id + customer_id = odr.sale_customer_id + sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end + %> +
    +
    + + + +

    <%= odr.table_name %>

    + Receipt No : + + <%= odr.receipt_no %> + +

    +

    + Order Status : + <%= odr.order_status %> + +

    +
    +
    + <% + end + %>
    -
    -
    - - - +
    + + -
    -
    -
    -
    ORDER DETAILS
    -
    -
    -
    - - - - - - -
    ItemsQTY - Price -
    -
    -
    - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - -
    Sub Total
    +
    +
    +
    +
    ORDER DETAILS -
    +
    +
    +
    +

    Receipt No: <%=@selected_item.receipt_no rescue ' '%>

    + +
    +
    +

    Date: <%=@selected_item.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    +
    +
    +
    +
    +

    Customer :

    +
    + +
    +
    + + + + + + + + <% + # For Sale Items + sub_total = 0 + if @selected_item_type == "Sale" + @selected_item.sale_items.each do |sale_item| + sub_total += (sale_item.qty*sale_item.unit_price) + %> + + + + + + <% + end + end + %> + + <% + # For Order Items + if @selected_item_type == "Order" + @selected_item.order_items.each do |order_item| + sub_total += (order_item.qty*order_item.unit_price) + %> + + + + + + <% + end + end + %> + +
    ItemsQTY + Price +
    <%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.qty*sale_item.price %>
    <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Sub Total:<%= sub_total %>
    Discount:(<%=@selected_item.total_discount rescue 0%>)
    Tax:<%=@selected_item.total_tax rescue 0%>
    Grand Total:<%=@selected_item.grand_total rescue 0%>
    +
    +
    -
    -
    - +
    + +
    - - - + + - - - - + + + +
    - - \ No newline at end of file diff --git a/app/views/origami/jcb/create.json.jbuilder b/app/views/origami/jcb/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/jcb/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb new file mode 100644 index 00000000..9c239931 --- /dev/null +++ b/app/views/origami/jcb/index.html.erb @@ -0,0 +1,165 @@ + +
    + +
    +
    +
    +

    JCB

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @jcbcount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    +
    + + diff --git a/app/views/origami/master/create.json.jbuilder b/app/views/origami/master/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/master/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb new file mode 100644 index 00000000..a545b656 --- /dev/null +++ b/app/views/origami/master/index.html.erb @@ -0,0 +1,162 @@ + +
    + +
    +
    +
    +

    Master

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @mastercount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    +
    + + diff --git a/app/views/origami/mpu/create.json.jbuilder b/app/views/origami/mpu/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/mpu/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb new file mode 100644 index 00000000..59bc932f --- /dev/null +++ b/app/views/origami/mpu/index.html.erb @@ -0,0 +1,162 @@ + +
    + +
    +
    +
    +

    MPU

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @mpucount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    +
    + + diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb new file mode 100644 index 00000000..4b2397a2 --- /dev/null +++ b/app/views/origami/others_payments/index.html.erb @@ -0,0 +1,19 @@ +
    + +
    +
    + <% @payment_method_setting.each do |payment_method|%> +
    <%= payment_method.payment_method %>
    + <% end %> +
    +
    +
    + + diff --git a/app/views/origami/payments/create.json.jbuilder b/app/views/origami/payments/create.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/payments/create.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb new file mode 100644 index 00000000..995e13e9 --- /dev/null +++ b/app/views/origami/payments/show.html.erb @@ -0,0 +1,365 @@ + +
    +
    +
    +
    +
    + + + + + + + + + + + + +
    Receipt No : <%=@sale_data.receipt_no rescue ' '%>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
    Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %>
    Customer : <%= @sale_data.customer.name%>
    +
    +
    +
    +
    + + + + + + +
    ItemsQTY + Price +
    +
    +
    + + + <% sub_total = 0 %> + <% @sale_data.sale_items.each do |sale_item| %> + <% sub_total += sale_item.qty*sale_item.unit_price%> + + + + + + <%end %> + +
    + <%=sale_item.product_name%>@<%=sale_item.unit_price%> + + <%=sale_item.qty%> + + <%=(sale_item.qty*sale_item.unit_price)%> +
    +
    +
    + + + + + + + + + + + + + + + + + <%if @balance > 0%> + + + + + <% end %> + +
    Sub Total<%=sub_total%>
    (Discount)(<%=@sale_data.total_discount rescue 0%>)
    Tax<%=@sale_data.total_tax rescue 0%>
    Grand Total<%=@sale_data.grand_total rescue 0%>
    <%= @accountable_type %><%=@balance%>
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    Amount Due
    +
    <%= @sale_data.grand_total %>
    +
    +
    +
    +
    Cash
    +
    <%= @cash %>
    +
    +
    +
    +
    Credit
    +
    0.0
    +
    +
    + <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%> +
    +
    Other Payments
    +
    <%= @other %>
    +
    + <% else %> +
    +
    Other Payments
    +
    + <% end %> + + + <% if @other != 0.0 %> +
    +
    +
    MPU
    +
    <%= @other %>
    +
    + <% else %> + + <% end %> + + <% if @ppamount != 0.0 %> +
    +
    +
    Paypar
    +
    <%= @ppamount %>
    +
    + <% else %> + + <% end %> + + <% if @visacount != 0.0 %> +
    +
    +
    Visa
    +
    <%= @visacount %>
    +
    + <% else %> + + <% end %> + + <% if @jcbcount != 0.0 %> +
    +
    +
    JCB
    +
    <%= @jcbcount %>
    +
    + <% else %> + + <% end %> + + <% if @mastercount != 0.0 %> +
    +
    +
    Master
    +
    <%= @mastercount %>
    +
    + <% else %> + + <% end %> +
    +
    +
    Balance
    +
    <%= @sale_data.grand_total %>
    +
    +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    +
    + + + + +
    +
    + + diff --git a/app/views/origami/paypar_payments/create.json.jbuilder b/app/views/origami/paypar_payments/create.json.jbuilder new file mode 100644 index 00000000..f352b148 --- /dev/null +++ b/app/views/origami/paypar_payments/create.json.jbuilder @@ -0,0 +1,2 @@ +json.set! :status, @out[0] +json.set! :message, @out[1] \ No newline at end of file diff --git a/app/views/origami/paypar_payments/index.html.erb b/app/views/origami/paypar_payments/index.html.erb new file mode 100644 index 00000000..29656453 --- /dev/null +++ b/app/views/origami/paypar_payments/index.html.erb @@ -0,0 +1,13 @@ +
    + +
    +
    + <% if @membership_id!=0 %> +
    +
    Redim Amount
    +
    + <% end %> +
    +
    + +
    \ No newline at end of file diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb new file mode 100644 index 00000000..3d7607c4 --- /dev/null +++ b/app/views/origami/redeem_payments/index.html.erb @@ -0,0 +1,169 @@ +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @payparcount > 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    + +
    + + + +
    +
    + +
    +
    +
    + +
    + diff --git a/app/views/origami/request_bills/show.html.erb b/app/views/origami/request_bills/show.html.erb deleted file mode 100644 index 7fd5de39..00000000 --- a/app/views/origami/request_bills/show.html.erb +++ /dev/null @@ -1,69 +0,0 @@ -
    -
    -
    -
    -
    - Receipt No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %> - Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %> -
    -
    -
    -
    - - - - - - -
    ItemsQTY - Price -
    -
    -
    - - - <% sub_total = 0 %> - <% if @sale_items %> - <% @sale_items.each do |sale_item| %> - <% sub_total += sale_item.qty*sale_item.unit_price%> - - - - - - <%end %> - <%end %> - -
    - <%=sale_item.product_name%>@<%=sale_item.unit_price%> - - <%=sale_item.qty%> - - <%=(sale_item.qty*sale_item.unit_price)%> -
    -
    -
    - - - - - - - - - - - - - - - - - -
    Sub Total<%=sub_total%>
    (Discount)(<%=@sale_data.total_discount%>)
    Tax<%=@sale_data.total_tax%>
    Grand Total<%=@sale_data.grand_total%>
    -
    - -
    -
    -
    -
    \ No newline at end of file diff --git a/app/views/origami/visa/create.json.jbuilder b/app/views/origami/visa/create.json.jbuilder new file mode 100644 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/visa/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb new file mode 100644 index 00000000..81640c68 --- /dev/null +++ b/app/views/origami/visa/index.html.erb @@ -0,0 +1,162 @@ + +
    + +
    +
    +
    +

    VISA

    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + <% if @visacount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    + +
    + +
    + +
    +
    + + diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index e6ed306b..c5166103 100644 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -18,5 +18,6 @@
    <%= f.button :submit %> + <%= link_to 'Back', print_settings_path, :class => "btn btn-default" %>
    <% end %> diff --git a/app/views/print_settings/edit.html.erb b/app/views/print_settings/edit.html.erb index fdae5f78..362dce39 100644 --- a/app/views/print_settings/edit.html.erb +++ b/app/views/print_settings/edit.html.erb @@ -1,6 +1,13 @@ -

    Editing Print Setting

    +
    +
    + +
    + <%= render 'form', print_setting: @print_setting %> +
    +
    -<%= render 'form', print_setting: @print_setting %> -<%= link_to 'Show', @print_setting %> | -<%= link_to 'Back', print_settings_path %> diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index 32d3dead..0db16892 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -1,49 +1,55 @@

    <%= notice %>

    +
    +
      +
    • Home
      • +
    • Print Settings
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_print_setting_path,:class => 'btn btn-primary btn-sm' %> + +
    +
    -

    Print Settings

    - - - - - - - - - - - - - - - - - - - - - - <% @print_settings.each do |print_setting| %> +
    +
    +
    NameUnique codeTemplateDb nameDb typeDb usernameDb passwordPrinter nameApi settingsPage widthPage heightPrint copies
    + - - - - - - - - - - - - - - - + + + + + + + + + + - <% end %> - -
    <%= print_setting.name %><%= print_setting.unique_code %><%= print_setting.template %><%= print_setting.db_name %><%= print_setting.db_type %><%= print_setting.db_username %><%= print_setting.db_password %><%= print_setting.printer_name %><%= print_setting.api_settings %><%= print_setting.page_width %><%= print_setting.page_height %><%= print_setting.print_copies %><%= link_to 'Show', print_setting %><%= link_to 'Edit', edit_print_setting_path(print_setting) %><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %>NameUnique codeTemplatePrinter nameApi settingsPage widthPage heightPrint copies
    + -
    - -<%= link_to 'New Print Setting', new_print_setting_path %> + + <% @print_settings.each do |print_setting| %> + + <%= print_setting.name %> + <%= print_setting.unique_code %> + <%= print_setting.template %> + + <%= print_setting.printer_name %> + <%= print_setting.api_settings %> + <%= print_setting.page_width %> + <%= print_setting.page_height %> + <%= print_setting.print_copies %> + <%= link_to 'Show', print_setting %> + <%= link_to 'Edit', edit_print_setting_path(print_setting) %> + <%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %> + + <% end %> + + +
    diff --git a/app/views/print_settings/new.html.erb b/app/views/print_settings/new.html.erb index 810ad9c9..2521a16b 100644 --- a/app/views/print_settings/new.html.erb +++ b/app/views/print_settings/new.html.erb @@ -1,5 +1,15 @@ -

    New Print Setting

    +
    +
    + +
    + <%= render 'form', print_setting: @print_setting %> +
    +
    + + -<%= render 'form', print_setting: @print_setting %> -<%= link_to 'Back', print_settings_path %> diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index 12d15696..b15e4650 100644 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -1,5 +1,11 @@

    <%= notice %>

    - +
    + +

    Name: <%= @print_setting.name %> diff --git a/app/views/reports/_shift_sale_report_filter.html.erb b/app/views/reports/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..1b4082f5 --- /dev/null +++ b/app/views/reports/_shift_sale_report_filter.html.erb @@ -0,0 +1,211 @@ +

    +
    + <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    +
    + + +
    +
    + + + +
    +
    + + +
    +
    + +
    +
    + <% end %> + + + +
    +
    + <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> + <% end %> + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% end %> +
    +
    + + + + <% end %> +
    +
    + + + + \ No newline at end of file diff --git a/app/views/reports/daily_sale_report.html.erb b/app/views/reports/daily_sale_report.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..1b4082f5 --- /dev/null +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -0,0 +1,211 @@ +
    +
    + <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    +
    + + +
    +
    + + + +
    +
    + + +
    +
    + +
    +
    + <% end %> + + + +
    +
    + <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> + <% end %> + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% end %> +
    +
    + + + + <% end %> +
    +
    + + + + \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb new file mode 100644 index 00000000..9d5c4f88 --- /dev/null +++ b/app/views/reports/receipt_no/index.html.erb @@ -0,0 +1,110 @@ +
    +
      +
    • Home
      • +
    • Receipt List Report
      • +
    +
    + +
    + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %> +
    +
    + +
    +
    +
    + Export to Excel +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + <% total_sales = 0 %> + <% net_sales = 0 %> + <% @sale_data.each do |sale| %> + <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> + <% net_sales = total_sales.to_f + sale.total_tax.to_f%> + + + + + + + + + + + <% end %> + +
    DateReceipt NoCashier NameGross SalesDiscountTotal SalesCTNett Sales
    <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=sale.cashier_id rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_tax.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
    +
    +
    + +<%= paginate @sale_data %> + + \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb new file mode 100644 index 00000000..2191d814 --- /dev/null +++ b/app/views/reports/receipt_no/index.xls.erb @@ -0,0 +1,135 @@ +
    +
    + +<% unless @sale_data.empty? %> +

    <%=current_active_location.name%>

    +

    Sales Summary Report (BreadTalk)

    +<% if params[:from]%> +

    From Date : <%= params[:from] %> , To Date : <%= params[:to] %>

    +<% end %> + + + + + + + + + + + + + + + + + + + + + <% void = 0 %> + <% card = 0 %> + <% credit_payment = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% count = 1 %> + <% discount_rev = 0 %> + <% total_rev = 0 %> + <% grand_rev = 0 %> + <% total_other_charges=0 %> + <% total_tax=0 %> + <% cash_received = 0 %> + <% total_cash_received = 0 %> + <% today_credit_payment_amount = 0 %> + <% old_location_id = 0%> + <% sub_total = 0 %> + <% count_of_void = 0 %> + <% flag = false %> + <% @sale_data.each do |sale| %> + <% credit_payment += sale[:credit_payment].to_f %> + <% card += sale[:card_amount].to_f %> + <% cash += sale[:cash_amount].to_f %> + <% credit += sale[:credit_amount].to_f %> + <% foc += sale[:foc_amount].to_f %> + <% discount += sale[:total_discount].to_f %> + <% total += sale[:grand_total].to_f %> + <% total_other_charges +=sale[:other_charges].to_f %> + <% total_tax +=sale[:total_tax].to_f %> + + <% cash_received = sale[:cash_amount].to_f + sale[:credit_payment].to_f%> + <% total_cash_received = cash.to_f + credit_payment.to_f%> + <% today_credit_payment_amount += sale[:today_credit_payment].to_f %> + + + + + + + + + + + + + + + <% total_void_amount = 0 %> + <% if !@daily_void.nil? %> + <% @daily_void.each do |d_v|%> + + <% if d_v[:daily_void_amt].to_i > 0 %> + <% if d_v[:location_id] == sale[:location_id] %> + <% if d_v[:date].utc.getlocal.strftime("%Y-%m-%d").to_s == sale[:sale_date].to_s%> + <%count_of_void+=1%> + + <%total_void_amount += d_v[:daily_void_amt].to_f%> + <% flag = true %> + + + + <%end %> + <% end%> + <% end%> + <% end%> + <% end%> + <% if flag == true%> + <% void += total_void_amount.to_f %> + + <% flag = false %> + <% end%> + <%if count_of_void == 0%> + + <%end %> + + + + +<%count_of_void= 0%> + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + +<% end %> +
    Location NameDateCash SalesCredit SalesCredit ReceivedCard PaymentTotal DiscountTotal TaxesTotal Other ChargesFOC SalesVoid SalesGrand Total
    <%= sale[:location].to_s rescue '-' %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:credit_payment].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:card_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:total_discount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:total_tax].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:other_charges].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount].to_f), :delimiter => ',') %> <%= number_with_delimiter(sprintf("%.2f",total_void_amount.to_f), :delimiter => ',') %> <%= number_with_delimiter(sprintf("%.2f",0.to_f), :delimiter => ',') %> + <%= number_with_delimiter(sprintf("%.2f",((sale[:cash_amount].to_f + sale[:credit_amount].to_f + sale[:card_amount].to_f + sale[:credit_payment].to_f) - sale[:today_credit_payment].to_f) ).to_f, :delimiter => ',') %> +
    Grand Total<%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",credit ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",credit_payment ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",card ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",discount ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_tax ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_other_charges ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",foc ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",void ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f", (cash.to_f + credit.to_f + card.to_f + credit_payment.to_f) - today_credit_payment_amount.to_f ).to_f, :delimiter => ',') %>
    +
    +
    \ No newline at end of file diff --git a/app/views/settings/accounts/_form.html.erb b/app/views/settings/accounts/_form.html.erb index 4231ad32..b2101a43 100644 --- a/app/views/settings/accounts/_form.html.erb +++ b/app/views/settings/accounts/_form.html.erb @@ -4,11 +4,14 @@
    <%= f.input :title %> <%= f.input :account_type, :collection => Lookup.collection_of("account_type") %> + <%= f.input :discount %> + <%= f.input :point %> + <%= f.input :bonus %> + <%= f.input :rebate %>
    <%= f.button :submit %>
    - -<% end %> +<% end %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index d8469a69..23cfb7eb 100644 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -14,9 +14,14 @@ - - - + + + + + + + + @@ -25,10 +30,14 @@ + + + + <% end %> diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index 6ec1c80a..284bb602 100644 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -17,6 +17,10 @@ + + + + @@ -25,10 +29,14 @@ - + + + + +
    TitleAccount TypeActionTitleAccount TypeCan get DiscountCan get PointsCan get BonusCan rebateAction
    <%= account.title %> <%= account.account_type %><%= account.discount %><%= account.point %><%= account.bonus %><%= account.rebate %> - <%= link_to 'Edit', edit_settings_account_path(account) %> | + <%= link_to 'Edit', edit_settings_account_path(account) %> | <%= link_to 'Destroy', settings_account_path(account), method: :delete, data: { confirm: 'Are you sure?' } %> - +
    Title Account typeCan get DiscountCan get PointsCan get BonusCan rebate Action
    <%= @settings_account.title %> <%= @settings_account.account_type %><%= @settings_account.discount %><%= @settings_account.point %><%= @settings_account.bonus %><%= @settings_account.rebate %><%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account) %>
    -
    \ No newline at end of file +
    diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb index 6948734c..a6c0a4aa 100644 --- a/app/views/settings/employees/edit.html.erb +++ b/app/views/settings/employees/edit.html.erb @@ -1,11 +1,11 @@
    -
    - -
    +
    + +
    <%= render 'form', employee: @employee %>
    diff --git a/app/views/settings/employees/new.html.erb b/app/views/settings/employees/new.html.erb index 7c6498f5..430df9f2 100644 --- a/app/views/settings/employees/new.html.erb +++ b/app/views/settings/employees/new.html.erb @@ -1,11 +1,11 @@
    -
    - -
    +
    + +
    <%= render 'form', employee: @employee %>
    diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb new file mode 100644 index 00000000..3084d4ac --- /dev/null +++ b/app/views/settings/membership_actions/_form.html.erb @@ -0,0 +1,18 @@ +<%= simple_form_for([:settings,@settings_membership_action]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :membership_type %> + <%= f.input :is_active %> + <%= f.input :gateway_communication_type %> + <%= f.input :gateway_url %> + <%= f.input :auth_token %> + <%= f.input :merchant_account_id %> + <%= f.input :created_by %> + <%= f.input :additional_parameter %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/membership_actions/_settings_membership_action.json.jbuilder b/app/views/settings/membership_actions/_settings_membership_action.json.jbuilder new file mode 100644 index 00000000..30c691d4 --- /dev/null +++ b/app/views/settings/membership_actions/_settings_membership_action.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_membership_action, :id, :membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter, :created_at, :updated_at +json.url settings_membership_action_url(settings_membership_action, format: :json) diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb new file mode 100644 index 00000000..cd5cb98a --- /dev/null +++ b/app/views/settings/membership_actions/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Settings Membership Action

    + +<%= render 'form', settings_membership_action: @settings_membership_action %> + +<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> | +<%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb new file mode 100644 index 00000000..635fd34c --- /dev/null +++ b/app/views/settings/membership_actions/index.html.erb @@ -0,0 +1,41 @@ +

    <%= notice %>

    + +

    Settings Membership Actions

    + + + + + + + + + + + + + + + + + + <% @settings_membership_actions.each do |settings_membership_action| %> + + + + + + + + + + + + + + <% end %> + +
    Membership typeIs activeGateway communication typeGateway urlAuth tokenMerchant accountCreated byAdditional parameter
    <%= settings_membership_action.membership_type %><%= settings_membership_action.is_active %><%= settings_membership_action.gateway_communication_type %><%= settings_membership_action.gateway_url %><%= settings_membership_action.auth_token %><%= settings_membership_action.merchant_account_id %><%= settings_membership_action.created_by %><%= settings_membership_action.additional_parameter %><%= link_to 'Show', settings_membership_action_path(settings_membership_action) %><%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %><%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Settings Membership Action', new_settings_membership_action_path %> diff --git a/app/views/settings/membership_actions/index.json.jbuilder b/app/views/settings/membership_actions/index.json.jbuilder new file mode 100644 index 00000000..0b90b195 --- /dev/null +++ b/app/views/settings/membership_actions/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_membership_actions, partial: 'settings_membership_actions/settings_membership_action', as: :settings_membership_action diff --git a/app/views/settings/membership_actions/new.html.erb b/app/views/settings/membership_actions/new.html.erb new file mode 100644 index 00000000..802e887a --- /dev/null +++ b/app/views/settings/membership_actions/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Membership Action

    + +<%= render 'form', settings_membership_action: @settings_membership_action %> + +<%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb new file mode 100644 index 00000000..ee285af8 --- /dev/null +++ b/app/views/settings/membership_actions/show.html.erb @@ -0,0 +1,44 @@ +

    <%= notice %>

    + +

    + Membership type: + <%= @settings_membership_action.membership_type %> +

    + +

    + Is active: + <%= @settings_membership_action.is_active %> +

    + +

    + Gateway communication type: + <%= @settings_membership_action.gateway_communication_type %> +

    + +

    + Gateway url: + <%= @settings_membership_action.gateway_url %> +

    + +

    + Auth token: + <%= @settings_membership_action.auth_token %> +

    + +

    + Merchant account: + <%= @settings_membership_action.merchant_account_id %> +

    + +

    + Created by: + <%= @settings_membership_action.created_by %> +

    + +

    + Additional parameter: + <%= @settings_membership_action.additional_parameter %> +

    + +<%= link_to 'Edit', edit_settings_membership_action_path(@settings_membership_action) %> | +<%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/show.json.jbuilder b/app/views/settings/membership_actions/show.json.jbuilder new file mode 100644 index 00000000..aa642795 --- /dev/null +++ b/app/views/settings/membership_actions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_membership_actions/settings_membership_action", settings_membership_action: @settings_membership_action diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 495addcc..8ac80a16 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -33,7 +33,7 @@ <%= settings_menu_category.alt_name rescue ''%> <%= 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_categories_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= 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?' } %> <% end %> diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index 7d326c95..54edfab4 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -20,3 +20,5 @@ <%= f.button :submit %>
    <% end %> + + diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index c6d688ca..ccbc8fe8 100644 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -10,8 +10,7 @@
    diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index edd34a74..40383b51 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -3,8 +3,7 @@
    -
    -
    -
    -

    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 %><%=l settings_menu_item.created_at, :format => :short %><%= 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 %>
    diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index fdcb9d09..611f3165 100644 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -2,8 +2,7 @@
    diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 1f1bf994..d8c9c1ab 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -36,7 +36,8 @@ <%= settings_menu.created_by %> <%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> - <%= link_to 'Edit', edit_settings_menu_path(settings_menu) %> + <%= link_to 'Edit', edit_settings_menu_path(settings_menu) %> + <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index db7ed5fd..d54b69b9 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -1,3 +1,8 @@ + <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> <%= f.error_notification %> @@ -7,6 +12,8 @@ <%= f.input :printer_name %> <%= f.input :font_size %> <%= f.input :print_copy %> + <%= f.label "Select Zones", :class => 'control-label' %> + <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'ta'%> <%= f.input :cut_per_item %> <%= f.input :use_alternate_name %> <%= f.input :processing_items, as: :hidden %> diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index c87ba5f7..03da3c23 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -42,5 +42,5 @@ <% end %> - + <%= paginate @settings_order_queue_stations %>
    diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index 740ad046..c8a72dbc 100644 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -8,6 +8,7 @@ <%= f.input :gateway_url %> <%= f.input :auth_token %> <%= f.input :merchant_account_id %> + <%= f.input :additional_parameters %>
    diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb index 85b21aef..ce26c4d5 100644 --- a/app/views/settings/payment_method_settings/index.html.erb +++ b/app/views/settings/payment_method_settings/index.html.erb @@ -34,7 +34,7 @@ <%= settings_payment_method_setting.auth_token %> <%= settings_payment_method_setting.merchant_account_id %> <%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %> - | <%= link_to 'Destroy', settings_payment_method_settings_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %> + | <%= link_to 'Destroy', settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 60e493d8..61ee6438 100644 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -20,9 +20,18 @@
    diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb new file mode 100644 index 00000000..c164ab67 --- /dev/null +++ b/app/views/settings/rooms/_form.html.erb @@ -0,0 +1,16 @@ +<%= simple_form_for([:settings,@zone,@settings_room]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :status %> + <%= f.input :seater %> + <%= f.input :order_by %> + <%= f.input :is_active %> + <%= f.input :created_by, :collection => Employee.collection %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/rooms/_settings_room.json.jbuilder b/app/views/settings/rooms/_settings_room.json.jbuilder new file mode 100644 index 00000000..3b3010d8 --- /dev/null +++ b/app/views/settings/rooms/_settings_room.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_table, :id, :name, :status, :seater, :order_by, :is_active, :created_by, :created_at, :updated_at +json.url settings_table_url(settings_room, format: :json) diff --git a/app/views/settings/rooms/edit.html.erb b/app/views/settings/rooms/edit.html.erb new file mode 100644 index 00000000..7ae2b31d --- /dev/null +++ b/app/views/settings/rooms/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', settings_table: @settings_room %> +
    diff --git a/app/views/settings/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb new file mode 100644 index 00000000..1480682d --- /dev/null +++ b/app/views/settings/rooms/index.html.erb @@ -0,0 +1,51 @@ + + +
    +
      +
    • Home
      • +
    • Rooms
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_room_path,:class => 'btn btn-primary btn-sm' %> + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + <% @settings_rooms.each do |room| %> + + + + + + + + <% if Employee.exists?(room.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameStatusTypeSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to room.name, settings_menu_path(room) %><%= room.status %>Room<%= room.seater rescue "-" %><%= room.order_by rescue "-" %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/rooms/new.html.erb b/app/views/settings/rooms/new.html.erb new file mode 100644 index 00000000..60bd48ee --- /dev/null +++ b/app/views/settings/rooms/new.html.erb @@ -0,0 +1,11 @@ + +
    +
    + +
    + <%= render 'form', settings_table: @settings_room %> +
    diff --git a/app/views/settings/rooms/show.html.erb b/app/views/settings/rooms/show.html.erb new file mode 100644 index 00000000..893ea325 --- /dev/null +++ b/app/views/settings/rooms/show.html.erb @@ -0,0 +1,49 @@ +
    + +
    + +
    +
    +
    +

    Room

    + + + + + + + + + + + + + + + + + + + + + + + <% if Employee.exists?(@room.created_by) %> + + <% else %> + + <% end %> + + + + + +
    NameStatusRoomSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to @room.name, settings_menu_path(@room) %><%= @room.status %>Room<%= @room.seater rescue "-" %><%= @room.order_by rescue "-" %><%= @room.is_active rescue "-" %><%= Employee.find(@room.created_by).name %><%= @room.created_by %><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index bdf0e97e..aeae0f5c 100644 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -6,6 +6,7 @@ <%= 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 %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index 0082c819..a5762fc3 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -19,6 +19,7 @@ Name Alt name Type + Account Type Menu category Menu item Min qty @@ -35,6 +36,7 @@ <%= @settings_menu_item.name rescue "-" %> <%= @settings_menu_item.alt_name %> <%= @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 %> @@ -114,6 +116,7 @@ item_instance_code + item_instance_name item_attributes price is_on_promotion @@ -129,6 +132,7 @@ <%= settings_menu_item.item_instance_code %> + <%= settings_menu_item.item_instance_name %> <%= settings_menu_item.item_attributes %> <%= settings_menu_item.price %> <%= settings_menu_item.is_on_promotion %> diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 885f725e..01c5b482 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -6,6 +6,7 @@ <%= 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 %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index d2d93e0e..9bfae1b0 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -21,6 +21,7 @@ Name Alt name Type + Accout Menu category Menu item Min qty @@ -37,6 +38,7 @@ <%= @settings_menu_item.name rescue "-" %> <%= @settings_menu_item.alt_name %> <%= @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 %> @@ -120,6 +122,7 @@ item_instance_code + Instances Name item_attributes price is_on_promotion @@ -136,6 +139,7 @@ <%= settings_menu_item.item_instance_code %> + <%= settings_menu_item.item_instance_name %> <%= settings_menu_item.item_attributes %> <%= settings_menu_item.price %> <%= settings_menu_item.is_on_promotion %> diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb new file mode 100644 index 00000000..a411175c --- /dev/null +++ b/app/views/settings/tables/_form.html.erb @@ -0,0 +1,16 @@ +<%= simple_form_for([:settings,@zone,@settings_table]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :status %> + <%= f.input :seater %> + <%= f.input :order_by %> + <%= f.input :is_active %> + <%= f.input :created_by, :collection => Employee.collection %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/tables/_settings_table.json.jbuilder b/app/views/settings/tables/_settings_table.json.jbuilder new file mode 100644 index 00000000..97a32ec3 --- /dev/null +++ b/app/views/settings/tables/_settings_table.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_table, :id, :name, :status, :seater, :order_by, :is_active, :created_by, :created_at, :updated_at +json.url settings_table_url(settings_table, format: :json) diff --git a/app/views/settings/tables/edit.html.erb b/app/views/settings/tables/edit.html.erb new file mode 100644 index 00000000..325aaf39 --- /dev/null +++ b/app/views/settings/tables/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', settings_table: @settings_table %> +
    diff --git a/app/views/settings/tables/index.html.erb b/app/views/settings/tables/index.html.erb new file mode 100644 index 00000000..c1e509b7 --- /dev/null +++ b/app/views/settings/tables/index.html.erb @@ -0,0 +1,49 @@ + + +
    +
      +
    • Home
      • +
    • Tables
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_table_path,:class => 'btn btn-primary btn-sm' %> + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + <% @settings_tables.each do |table| %> + + + + + + + <% if Employee.exists?(table.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameStatusSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to table.name, settings_menu_path(table) %><%= table.status %><%= table.seater rescue "-" %><%= table.order_by rescue "-" %><%= table.is_active %><%= Employee.find(table.created_by).name %><%= table.created_by %><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@zone,table) %><%= link_to 'Destroy', settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/tables/new.html.erb b/app/views/settings/tables/new.html.erb new file mode 100644 index 00000000..52b87627 --- /dev/null +++ b/app/views/settings/tables/new.html.erb @@ -0,0 +1,11 @@ + +
    +
    + +
    + <%= render 'form', settings_table: @settings_table %> +
    diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb new file mode 100644 index 00000000..7b8bd8ed --- /dev/null +++ b/app/views/settings/tables/show.html.erb @@ -0,0 +1,47 @@ +
    + +
    + +
    +
    +
    +

    Table

    + + + + + + + + + + + + + + + + + + + + + <% if Employee.exists?(@table.created_by) %> + + <% else %> + + <% end %> + + + + + +
    NameStatusSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to @table.name, settings_menu_path(@table) %><%= @table.status %><%= @table.seater rescue "-" %><%= @table.order_by rescue "-" %><%= @table.is_active rescue "-" %><%= Employee.find(@table.created_by).name %><%= @table.created_by %><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@zone,@table) %><%= link_to 'Destroy', settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index c43a3244..a7740211 100644 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -1,10 +1,10 @@ -<%= simple_form_for(@settings_zone) do |f| %> +<%= simple_form_for([:settings,@settings_zone]) do |f| %> <%= f.error_notification %>
    <%= f.input :name %> <%= f.input :is_active %> - <%= f.input :created_by %> + <%= f.input :created_by, :collection => Employee.collection %>
    diff --git a/app/views/settings/zones/edit.html.erb b/app/views/settings/zones/edit.html.erb index 177c4c61..b9b19f7e 100644 --- a/app/views/settings/zones/edit.html.erb +++ b/app/views/settings/zones/edit.html.erb @@ -1,6 +1,10 @@ -

    Editing Settings Zone

    - -<%= render 'form', settings_zone: @settings_zone %> - -<%= link_to 'Show', @settings_zone %> | -<%= link_to 'Back', settings_zones_path %> +
    +
    + +
    + <%= render 'form', settings_zone: @settings_zone %> +
    diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb index 40ee09c8..cdbe1f80 100644 --- a/app/views/settings/zones/index.html.erb +++ b/app/views/settings/zones/index.html.erb @@ -1,31 +1,41 @@ -

    <%= notice %>

    -

    Settings Zones

    - - - - - - - - - - - - - <% @settings_zones.each do |settings_zone| %> - - - - - - - - - <% end %> - -
    NameIs activeCreated by
    <%= settings_zone.name %><%= settings_zone.is_active %><%= settings_zone.created_by %><%= link_to 'Show', settings_zone %><%= link_to 'Edit', edit_settings_zone_path(settings_zone) %><%= link_to 'Destroy', settings_zone, method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
      +
    • Home
      • +
    • Zones
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-sm' %> + +
    +

    +
    + + + + + + + + + -<%= link_to 'New Settings Zone', new_settings_zone_path %> + + <% @settings_zones.each do |settings_zone| %> + + + + <% if Employee.exists?(settings_zone.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameIs activeCreated by
    <%= settings_zone.name %><%= settings_zone.is_active %><%= Employee.find(settings_zone.created_by).name %><%= settings_zone.created_by %><%= link_to 'Show', settings_zone_path(settings_zone) %><%= link_to 'Edit', edit_settings_zone_path(settings_zone) %><%= link_to 'Destroy', settings_zone_path(settings_zone), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb index 4c0b93dd..33e8487c 100644 --- a/app/views/settings/zones/show.html.erb +++ b/app/views/settings/zones/show.html.erb @@ -1,19 +1,97 @@ -

    <%= notice %>

    +
    +
      +
    • Home
      • +
    • Zones
      • +
    • Details
      • + + <%= link_to 'Back', settings_zones_path %> + +
    +
    -

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

    +
    +
    +
    +

    Zone

    + + + + + + + + + -

    - Is active: - <%= @settings_zone.is_active %> -

    + + + + + <% if Employee.exists?(@settings_zone.created_by) %> + + <% else %> + + <% end %> + + + + +
    NameIs activeCreated by
    <%= @settings_zone.name %><%= @settings_zone.is_active %><%= Employee.find(@settings_zone.created_by).name %><%= @settings_zone.created_by %><%= link_to 'Edit', edit_settings_zone_path(@settings_zone) %><%= link_to 'Destroy', settings_zone_path(@settings_zone), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    +
    +
    +
    +

    Dining Facilities + + <%= link_to "New Table",new_settings_zone_table_path(@settings_zone),:class => 'btn btn-primary btn-sm' %> + <%= link_to "New Room",new_settings_zone_room_path(@settings_zone),:class => 'btn btn-primary btn-sm' %> + +

    + + + + + + + + + + + -

    - Created by: - <%= @settings_zone.created_by %> -

    - -<%= link_to 'Edit', edit_settings_zone_path(@settings_zone) %> | -<%= link_to 'Back', settings_zones_path %> + + <% @settings_tables.each do |settings_table|%> + + + + + + <% if Employee.exists?(settings_table.created_by) %> + + <% else %> + + <% end %> + + + + <% end %> + <% @settings_rooms.each do |room|%> + + + + + + <% if Employee.exists?(room.created_by) %> + + <% else %> + + <% end %> + + + + <% end %> + +
    NameTypeSeaterIs activeCreated by
    <%= link_to settings_table.name, settings_zone_table_path(@settings_zone,settings_table) %>Table<%= settings_table.seater %><%= settings_table.is_active %><%= Employee.find(settings_table.created_by).name %><%= settings_table.created_by %><%= settings_table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@settings_zone, settings_table) %>
    <%= link_to room.name, settings_zone_room_path(@settings_zone,room) %>Room<%= room.seater %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@settings_zone, room) %>
    +
    +
    diff --git a/app/views/transactions/manual_sales/void.html.erb b/app/views/transactions/manual_sales/void.html.erb new file mode 100644 index 00000000..0bcd6db6 --- /dev/null +++ b/app/views/transactions/manual_sales/void.html.erb @@ -0,0 +1,81 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. +
    3. + <%= @sale %> +
      4. +
    +
    +
    +
    + +
    +
    +

    Choose Reason For Void

    +
    + + + <% @reason.each do |r| %> + + + + + + + <% end %> +
    + + + <%= label_tag "reasons[#{r.id}]", r.name, :style=>'font-weight:bold;font-size:18px;' rescue '-' %>
    +
    +
    +
    +


    + Cancel + + +
    + +
    + + + + + + + + + diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb new file mode 100644 index 00000000..29cd001c --- /dev/null +++ b/app/views/transactions/orders/index.html.erb @@ -0,0 +1,68 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Order +
      3. + +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + + + + + <% end %> + +
    + <%= form_tag transactions_orders_path, :method => :get do %> +
    + + +
    + <% end %> +
    Order ID TypeCustomerOrder statusOrder dateItems CountAction
    <%= order.order_id %><%= order.order_type %><%= order.customer.name rescue '-' %><%= order.status %> <%= order.date.strftime("%d-%m-%Y") %> <%= order.item_count %> <%= link_to 'Show', transactions_order_path(order) %>
    +
    + + <%= paginate @orders %> +
    +
    + +
    +
    + + + + + diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb new file mode 100644 index 00000000..dc5bae88 --- /dev/null +++ b/app/views/transactions/orders/show.html.erb @@ -0,0 +1,85 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Order +
      3. +
    3. + <%= @order.order_id %> +
      4. +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    TypeCustomerOrder statusOrder dateOrder By
    <%= @order.order_type %><%= @order.customer.name rescue '-' %><%= @order.status %> <%= @order.date.strftime("%d-%m-%Y") %> <%= @order.waiter rescue '-' %>
    +

    Order Items

    + + + + + + + + + + + + + + + + + <% @order.order_items.each do |order| %> + + + + + + + + + + + + <% end %> + +
    Item NameQty Unit PriceTotal PriceOptionStatusOrder ByCreated at
    <%= order.item_name %><%= order.qty %><%= order.price %><%= order.qty * order.price %> <%= order.options %> <%= order.order_item_status %> <%= order.item_order_by %> <%= order.created_at.strftime("%d-%m-%Y") %>
    + + Back + +
    +
    + +
    +
    + + + + + diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index c39b0ac3..b7e73219 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -1,59 +1,89 @@ -

    <%= notice %>

    +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. + +
    +
    +
    -

    Transactions Sales

    +
    +
    +
    +
    + + + + + + + + + + + + + + + + -
    + <%= form_tag transactions_sales_path, :method => :get do %> +
    + + + + +
    + <% end %> +
    Sale Id Receipt no Grand totalTax amountCashierSales statusReceipt DateAction
    - - - - - - - - - - - - - - - - - - - - - - + + <% if @sales != 0 %> + <% @sales.each do |sale| %> + + + + + + + + + + + <% end %> + <% else %> + + <% end %> + +
    CashierCashier nameRequested byRequested atReceipt noReceipt dateCustomerPayment statusSale statusTotal amountTotal discountTotal taxTax typeGrand totalRounding adjustmentAmount receivedAmount changed
    <%= sale.sale_id %><%= sale.receipt_no %><%= sale.grand_total rescue '-' %><%= sale.total_tax %><%= sale.cashier_name rescue '-' %> <%= sale.sale_status %> <%= sale.receipt_date.strftime("%d-%m-%Y") %> <%= link_to 'Show', transactions_sale_path(sale) %>

    There is no data for search....

    +
    + <% if @sales != 0 %> + <%= paginate @sales %> + <% end %> +
    +
    - - <% @transactions_sales.each do |transactions_sale| %> - - <%= transactions_sale.cashier %> - <%= transactions_sale.cashier_name %> - <%= transactions_sale.requested_by %> - <%= transactions_sale.requested_at %> - <%= transactions_sale.receipt_no %> - <%= transactions_sale.receipt_date %> - <%= transactions_sale.customer %> - <%= transactions_sale.payment_status %> - <%= transactions_sale.sale_status %> - <%= transactions_sale.total_amount %> - <%= transactions_sale.total_discount %> - <%= transactions_sale.total_tax %> - <%= transactions_sale.tax_type %> - <%= transactions_sale.grand_total %> - <%= transactions_sale.rounding_adjustment %> - <%= transactions_sale.amount_received %> - <%= transactions_sale.amount_changed %> - <%= link_to 'Show', transactions_sale %> - <%= link_to 'Edit', edit_transactions_sale_path(transactions_sale) %> - <%= link_to 'Destroy', transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %> - - <% end %> - - +
    +
    -
    + + + + + -<%= link_to 'New Transactions Sale', new_transactions_sale_path %> diff --git a/app/views/transactions/sales/indexback.html.erb b/app/views/transactions/sales/indexback.html.erb new file mode 100644 index 00000000..c39b0ac3 --- /dev/null +++ b/app/views/transactions/sales/indexback.html.erb @@ -0,0 +1,59 @@ +

    <%= notice %>

    + +

    Transactions Sales

    + + + + + + + + + + + + + + + + + + + + + + + + + + + <% @transactions_sales.each do |transactions_sale| %> + + + + + + + + + + + + + + + + + + + + + + + <% end %> + +
    CashierCashier nameRequested byRequested atReceipt noReceipt dateCustomerPayment statusSale statusTotal amountTotal discountTotal taxTax typeGrand totalRounding adjustmentAmount receivedAmount changed
    <%= transactions_sale.cashier %><%= transactions_sale.cashier_name %><%= transactions_sale.requested_by %><%= transactions_sale.requested_at %><%= transactions_sale.receipt_no %><%= transactions_sale.receipt_date %><%= transactions_sale.customer %><%= transactions_sale.payment_status %><%= transactions_sale.sale_status %><%= transactions_sale.total_amount %><%= transactions_sale.total_discount %><%= transactions_sale.total_tax %><%= transactions_sale.tax_type %><%= transactions_sale.grand_total %><%= transactions_sale.rounding_adjustment %><%= transactions_sale.amount_received %><%= transactions_sale.amount_changed %><%= link_to 'Show', transactions_sale %><%= link_to 'Edit', edit_transactions_sale_path(transactions_sale) %><%= link_to 'Destroy', transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Transactions Sale', new_transactions_sale_path %> diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index c82c2c5e..5f6365e5 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -1,89 +1,192 @@ -

    <%= notice %>

    +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. +
    3. + <%= @sale.sale_id %> +
      4. +
    +
    +
    +
    +
    + -

    - Cashier: - <%= @transactions_sale.cashier %> -

    + + + -

    - Cashier name: - <%= @transactions_sale.cashier_name %> -

    +
    -

    - Requested by: - <%= @transactions_sale.requested_by %> -

    +
    +
    + + + + + + + + + + + + + -

    - Requested at: - <%= @transactions_sale.requested_at %> -

    + + + + + + + + + + + + + + + + <% @sale.sale_items.each do |s| %> -

    - Receipt no: - <%= @transactions_sale.receipt_no %> -

    + + + + + + + + <% end %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% @sale_receivables.each do |r|%> + + + + + + + <% end %> -

    - Receipt date: - <%= @transactions_sale.receipt_date %> -

    + +
     
    Receipt Date Receipt noCashierSales statusReceipt generated at
    <%= @sale.receipt_date.strftime("%d-%M-%Y") %><%= @sale.receipt_no %><%= @sale.cashier_name rescue '-' %> <%= @sale.sale_status %> <%= @sale.requested_at.strftime("%d-%m-%Y") %>
    Sale item name QtyUnit priceTotal pirce Created at
    <%=s.product_name rescue ' '%><%=s.qty rescue ' '%><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%><%= number_with_precision(s.qty * s.price, :precision => 2, :delimiter => ',') rescue ' '%><%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %>
    Total<%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%>
    Discount<%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%>
    Tax<%= number_with_precision(@sale.total_tax, :precision => 2, :delimiter => ',') rescue ' '%>
    Grand Total<%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%>
     
    Pay Amount<%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%>
    Change<%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%>
    Payment <%= r.payment_method rescue ' '%><%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%> +
    -

    - Customer: - <%= @transactions_sale.customer %> -

    +
    +
    -

    - Payment status: - <%= @transactions_sale.payment_status %> -

    +
    +
    + + + + + + + + + + + + + + + + -

    - Sale status: - <%= @transactions_sale.sale_status %> -

    + + <% @order_items.each do |order_item| %> + + + + + + + + + + + <% end %> + +
     
    Order IDMenu ItemQTYUnit Price OptionStatusWaiterCreated at
    <%= order_item.order_id %><%= order_item.item_name %><%= order_item.qty %><%= order_item.price %><%= order_item.options %><%= order_item.order_item_status %><%= order_item.item_order_by %> <%= order_item.created_at.strftime("%d-%m-%y") %>
    +
    +
    -

    - Total amount: - <%= @transactions_sale.total_amount %> -

    +
    + +
    + +
    +
    -

    - Total discount: - <%= @transactions_sale.total_discount %> -

    +
    -

    - Total tax: - <%= @transactions_sale.total_tax %> -

    +
    -

    - Tax type: - <%= @transactions_sale.tax_type %> -

    +
    + + Back + + + + -

    - Grand total: - <%= @transactions_sale.grand_total %> -

    + Void Sale +     + + Complete Sale + +
    -

    - Rounding adjustment: - <%= @transactions_sale.rounding_adjustment %> -

    +
    -

    - Amount received: - <%= @transactions_sale.amount_received %> -

    -

    - Amount changed: - <%= @transactions_sale.amount_changed %> -

    -<%= link_to 'Edit', edit_transactions_sale_path(@transactions_sale) %> | -<%= link_to 'Back', transactions_sales_path %> + + + diff --git a/config/application.rb b/config/application.rb index 90f088bd..2a47de48 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,9 +13,6 @@ module SXRestaurants # -- all .rb files in that directory are automatically loaded. config.active_record.time_zone_aware_types = [:datetime, :time] config.active_job.queue_adapter = :sidekiq - - # config.generators do |g| - # g.orm :active_record, primary_key_type: :uuid - # end + end end diff --git a/config/environments/production.rb b/config/environments/production.rb index 5aa66a01..0dac3e0e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -8,11 +8,12 @@ Rails.application.configure do # your application in memory, allowing both threaded web servers # and those relying on copy on write to perform better. # Rake tasks automatically ignore this option for performance. - config.eager_load = true + config.eager_load = false # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true + config.serve_staitc_assets = true # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. @@ -23,7 +24,7 @@ Rails.application.configure do # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 6f563b42..9952a7bc 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -11,10 +11,14 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.precompile += %w( search.js ) # --- Waiter/ Cashier - Orgiami ---- -Rails.application.config.assets.precompile += %w( orgiami.css ) -Rails.application.config.assets.precompile += %w( orgiami.js ) +Rails.application.config.assets.precompile += %w( origami.css ) +Rails.application.config.assets.precompile += %w( origami.js ) # -- Order Queue Station ----- Rails.application.config.assets.precompile += %w( OQS.css ) -Rails.application.config.assets.precompile += %w( OQS.js ) +Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) + +# --- Customer/ Customer - Crm ---- +Rails.application.config.assets.precompile += %w( CRM.css ) +Rails.application.config.assets.precompile += %w( CRM.js ) diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb new file mode 100644 index 00000000..bcf4e43b --- /dev/null +++ b/config/initializers/kaminari_config.rb @@ -0,0 +1,10 @@ +Kaminari.configure do |config| + config.default_per_page = 2 + # config.max_per_page = nil + # config.window = 4 + # config.outer_window = 0 + # config.left = 0 + # config.right = 0 + # config.page_method_name = :page + # config.param_name = :page +end diff --git a/config/locales/en.yml b/config/locales/en.yml index 06539571..ced8af0a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,23 +1,17 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - en: - hello: "Hello world" + views: + pagination: + first: "« First" + last: "Last »" + previous: "‹ Prev" + next: "Next ›" + truncate: "…" + helpers: + page_entries_info: + one_page: + display_entries: + zero: "No %{entry_name} found" + one: "Displaying 1 %{entry_name}" + other: "Displaying all %{count} %{entry_name}" + more_pages: + display_entries: "Displaying %{entry_name} %{first} - %{last} of %{total} in total" diff --git a/config/puma.rb.production b/config/puma.rb.production new file mode 100644 index 00000000..04ae9ee4 --- /dev/null +++ b/config/puma.rb.production @@ -0,0 +1,9 @@ +application_path = '/home/superuser/Application/production/sxrestaurant' +directory application_path +environment 'production' +daemonize true +pidfile "#{application_path}/tmp/pids/puma.pid" +state_path "#{application_path}/tmp/pids/puma.state" +stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" +bind 'tcp://0.0.0.0:9292' +workers 2 diff --git a/config/routes.rb b/config/routes.rb index 7ba039b0..19b07979 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 :membership_actions + end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -48,7 +51,9 @@ Rails.application.routes.draw do #Current active bookings resources :bookings, only: [:index, :show, :create, :update] - resources :customers, only: [:index, :show, :create, :update] + resources :customers + #get customer details by order items + get "customers/get_order/:id" => "customers#get_customer_order" #Generating Invoice and making payments - output render @sale resources :invoices, only: [:index, :show, :create, :update, :destroy ] do @@ -67,12 +72,41 @@ Rails.application.routes.draw do #--------- Cashier ------------# namespace :origami do root "home#index" - get "/:booking_id" => "home#show" do #origami/:booking_id will show - resources :payments, only: [:index, :new, :create ] #add payment by payment_method - resources :discounts, only: [:index,:new, :create ] #add discount type - resources :customers, only: [:index,:new, :create ] #add customer type + get "/:booking_id" => "home#index" do #origami/:booking_id will show + # resources :discounts, only: [:index,:new, :create ] #add discount type + resources :customers #add customer type end - resources :request_bills, only: [:show] + + post '/:booking_id' => 'home#item_show' + + get "/:id/discount" => "discounts#index" + post "/:id/discount" => "discounts#create" + + get "/:id/request_bills" => "request_bills#print" + get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } + #--------- Payment ------------# + get 'sale/:sale_id/payment' => 'payments#show' + + post 'payment/cash' => 'payments#create' + post 'payment/mpu' => "mpu#create" + post 'payment/jcb' => "jcb#create" + post 'payment/master' => "master#create" + post 'payment/visa' => "visa#create" + post 'payment/paypar' => 'paypar_payments#create' + + get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" + get 'sale/:sale_id/payment/others_payment' => "others_payments#index" + get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index" + get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index" + get 'sale/:sale_id/payment/others_payment/Master' => "master#index" + get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" + get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" + + #---------Add Customer --------------# + #resources :customers + get '/:sale_id/customers', to: "customers#add_customer" + get '/:customer_id/get_customer' => 'home#get_customer' + post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table end #--------- Waiter/Ordering Station ------------# @@ -84,13 +118,12 @@ Rails.application.routes.draw do #--------- Customer Relationship Management ------------# namespace :crm do - root "home#index" #queue number - #customers + root "home#index" resources :customers - #membership - #bookings - post "update_booking" , to: "bookings#update_booking", as: "update_booking" - #queue + resources :dining_queues + post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel + get '/print/:id', to: "home#print_order"#print order for crm + end #--------- Order Queue Station ------------# @@ -99,7 +132,9 @@ Rails.application.routes.draw do post 'update_delivery', to: "home#update_delivery_status" + # Pass assigned_order_item_id get 'print/print/:id', to: "print#print" + get 'print/print_order_summary/:id', to: "print#print_order_summary" #dashboard # end @@ -111,7 +146,7 @@ Rails.application.routes.draw do #menu resources :menus do #menu_categories - resources :menu_categories, only: [:new, :create, :edit] + resources :menu_categories, only: [:new, :create, :edit,:delete] end #accounts @@ -162,16 +197,22 @@ Rails.application.routes.draw do #--------- Transactions Sections ------------# namespace :transactions do resources :sales + resources :orders + + get "/sales/:sale_id/manual_complete_sale" =>"manual_sales#manual_complete_sale", :as => "manual_complete_sale" + get "/sales/:sale_id/void" =>"manual_sales#void", :as => "void" + post "sales/:sale_id/manual_void_sale", to: "manual_sales#manual_void_sale", :as => "manual_void_sale" end #--------- Reports Controller Sections ------------# namespace :reports do - resources :sales, :only => [:index, :show] - resources :orders, :only => [:index, :show] - resources :customers, :only => [:index, :show] - resources :products, :only => [:index, :show] - resources :inventory, :only => [:index, :show] - resources :employees, :only => [:index, :show] + resources :receipt_no, :only => [:index, :show] + # resources :sales, :only => [:index, :show] + # resources :orders, :only => [:index, :show] + # resources :customers, :only => [:index, :show] + # resources :products, :only => [:index, :show] + # resources :inventory, :only => [:index, :show] + # resources :employees, :only => [:index, :show] end #mount_compendium at: '/report' #, controller: 'reports' diff --git a/db/migrate/20170324135138_create_zones.rb b/db/migrate/20170324135138_create_zones.rb index 30a92048..00139170 100644 --- a/db/migrate/20170324135138_create_zones.rb +++ b/db/migrate/20170324135138_create_zones.rb @@ -1,4 +1,4 @@ -class CreateZones < ActiveRecord::Migration[5.0] +class CreateZones < ActiveRecord::Migration[5.1] def change create_table :zones do |t| t.string :name, :null => false diff --git a/db/migrate/20170325111608_create_menus.rb b/db/migrate/20170325111608_create_menus.rb index a542de50..84efdf2d 100644 --- a/db/migrate/20170325111608_create_menus.rb +++ b/db/migrate/20170325111608_create_menus.rb @@ -1,4 +1,4 @@ -class CreateMenus < ActiveRecord::Migration[5.0] +class CreateMenus < ActiveRecord::Migration[5.1] def change create_table :menus do |t| t.string :name diff --git a/db/migrate/20170327152733_create_menu_categories.rb b/db/migrate/20170327152733_create_menu_categories.rb index 9315e61e..59e3a8c9 100644 --- a/db/migrate/20170327152733_create_menu_categories.rb +++ b/db/migrate/20170327152733_create_menu_categories.rb @@ -1,4 +1,4 @@ -class CreateMenuCategories < ActiveRecord::Migration[5.0] +class CreateMenuCategories < ActiveRecord::Migration[5.1] def change create_table :menu_categories do |t| t.references :menu, foreign_key: true diff --git a/db/migrate/20170331024747_create_accounts.rb b/db/migrate/20170331024747_create_accounts.rb new file mode 100644 index 00000000..4c4a7b74 --- /dev/null +++ b/db/migrate/20170331024747_create_accounts.rb @@ -0,0 +1,14 @@ +class CreateAccounts < ActiveRecord::Migration[5.1] + def change + create_table :accounts do |t| + t.string :title + t.string :account_type + t.boolean :discount, :null => false, :default => false + t.boolean :point, :null => false, :default => false + t.boolean :bonus, :null => false, :default => false + t.boolean :rebate, :null => false, :default => false + + t.timestamps + end + end +end diff --git a/db/migrate/20170331024749_create_menu_items.rb b/db/migrate/20170331024749_create_menu_items.rb index f61a9172..ce6d1486 100644 --- a/db/migrate/20170331024749_create_menu_items.rb +++ b/db/migrate/20170331024749_create_menu_items.rb @@ -1,4 +1,5 @@ -class CreateMenuItems < ActiveRecord::Migration[5.0] + +class CreateMenuItems < ActiveRecord::Migration[5.1] def change create_table :menu_items do |t| t.string :item_code, :null => false @@ -10,6 +11,7 @@ class CreateMenuItems < ActiveRecord::Migration[5.0] t.string :type, :null => false, :default => "SimpleMenuItem" t.references :menu_category, foreign_key: true 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 diff --git a/db/migrate/20170402083337_create_menu_item_attributes.rb b/db/migrate/20170402083337_create_menu_item_attributes.rb index b2c3b0fd..302202a6 100644 --- a/db/migrate/20170402083337_create_menu_item_attributes.rb +++ b/db/migrate/20170402083337_create_menu_item_attributes.rb @@ -1,4 +1,4 @@ -class CreateMenuItemAttributes < ActiveRecord::Migration[5.0] +class CreateMenuItemAttributes < ActiveRecord::Migration[5.1] def change create_table :menu_item_attributes do |t| t.string :attribute_type, :null => false diff --git a/db/migrate/20170402083525_create_menu_item_options.rb b/db/migrate/20170402083525_create_menu_item_options.rb index a9e9734a..841b66a0 100644 --- a/db/migrate/20170402083525_create_menu_item_options.rb +++ b/db/migrate/20170402083525_create_menu_item_options.rb @@ -1,4 +1,4 @@ -class CreateMenuItemOptions < ActiveRecord::Migration[5.0] +class CreateMenuItemOptions < ActiveRecord::Migration[5.1] def change create_table :menu_item_options do |t| t.string :name, :null => false diff --git a/db/migrate/20170402084230_create_menu_item_instances.rb b/db/migrate/20170402084230_create_menu_item_instances.rb index d5effcbf..c79cb322 100644 --- a/db/migrate/20170402084230_create_menu_item_instances.rb +++ b/db/migrate/20170402084230_create_menu_item_instances.rb @@ -1,4 +1,4 @@ -class CreateMenuItemInstances < ActiveRecord::Migration[5.0] +class CreateMenuItemInstances < ActiveRecord::Migration[5.1] def change create_table :menu_item_instances do |t| t.references :menu_item, :foreign_key => true, :null => false diff --git a/db/migrate/20170403135121_create_customers.rb b/db/migrate/20170403135121_create_customers.rb index 76e9894a..318e7bf1 100644 --- a/db/migrate/20170403135121_create_customers.rb +++ b/db/migrate/20170403135121_create_customers.rb @@ -1,9 +1,10 @@ -class CreateCustomers < ActiveRecord::Migration[5.0] +class CreateCustomers < ActiveRecord::Migration[5.1] def change - create_table :customers do |t| + create_table :customers, :id => false do |t| + t.string :customer_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync t.string :name, :null => false t.string :company - t.string :contact_no + t.string :contact_no, :unique => true t.string :email t.date :date_of_birth t.string :membership_id diff --git a/db/migrate/20170403135934_create_orders.rb b/db/migrate/20170403135934_create_orders.rb index d318386e..4439bdba 100644 --- a/db/migrate/20170403135934_create_orders.rb +++ b/db/migrate/20170403135934_create_orders.rb @@ -1,10 +1,11 @@ -class CreateOrders < ActiveRecord::Migration[5.0] +class CreateOrders < ActiveRecord::Migration[5.1] def change - create_table :orders do |t| + create_table :orders, :id => false do |t| + t.string :order_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync t.datetime :date, :null => false t.string :source, :null => false, :default => "emenu" t.string :order_type, :null => false, :default => "dine-in" - t.references :customer, foreign_key: true + t.string :customer_id, foreign_key: true, :limit => 16 t.integer :item_count, :null => false, :default => 0 t.integer :quantity_count, :null => false, :default => 0 t.string :status, :null => false, :default => "new" diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb index 847381a4..c5382030 100644 --- a/db/migrate/20170403140820_create_order_items.rb +++ b/db/migrate/20170403140820_create_order_items.rb @@ -1,7 +1,8 @@ -class CreateOrderItems < ActiveRecord::Migration[5.0] +class CreateOrderItems < ActiveRecord::Migration[5.1] def change - create_table :order_items do |t| - t.references :order, foreign_key: true, :null => false + create_table :order_items, :id => false do |t| + t.string :order_items_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + t.string :order_id, foreign_key: true, :null => false, :limit => 16 t.string :order_item_status, :null => false, :default => "new" t.string :item_order_by #person who order this t.string :item_code, :null => false @@ -12,6 +13,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.0] t.string :options t.json :set_menu_items #this parameter is require to route the items correctly t.boolean :taxable, :null => false, :default => true + t.string :completed_by t.timestamps end end diff --git a/db/migrate/20170403142424_create_dining_facilities.rb b/db/migrate/20170403142424_create_dining_facilities.rb index 788747d8..cf81e775 100644 --- a/db/migrate/20170403142424_create_dining_facilities.rb +++ b/db/migrate/20170403142424_create_dining_facilities.rb @@ -1,10 +1,10 @@ -class CreateDiningFacilities < ActiveRecord::Migration[5.0] +class CreateDiningFacilities < ActiveRecord::Migration[5.1] def change create_table :dining_facilities do |t| t.references :zone, foreign_key: true t.string :name, :null => false t.string :status, :null => false, :default => "available" - t.string :type, :null => false, :default => "table" + t.string :type, :null => false, :default => "Table" t.integer :seater, :null => false, :default => 2 t.integer :order_by diff --git a/db/migrate/20170403151731_create_order_queue_stations.rb b/db/migrate/20170403151731_create_order_queue_stations.rb index f5c84269..6ad93bb1 100644 --- a/db/migrate/20170403151731_create_order_queue_stations.rb +++ b/db/migrate/20170403151731_create_order_queue_stations.rb @@ -1,4 +1,4 @@ -class CreateOrderQueueStations < ActiveRecord::Migration[5.0] +class CreateOrderQueueStations < ActiveRecord::Migration[5.1] def change create_table :order_queue_stations do |t| t.string :station_name, :null => false diff --git a/db/migrate/20170403152600_create_order_queue_process_by_zones.rb b/db/migrate/20170403152600_create_order_queue_process_by_zones.rb index d6b7d207..8f0ee73c 100644 --- a/db/migrate/20170403152600_create_order_queue_process_by_zones.rb +++ b/db/migrate/20170403152600_create_order_queue_process_by_zones.rb @@ -1,4 +1,4 @@ -class CreateOrderQueueProcessByZones < ActiveRecord::Migration[5.0] +class CreateOrderQueueProcessByZones < ActiveRecord::Migration[5.1] def change create_table :order_queue_process_by_zones do |t| t.references :order_queue_station, :null => false diff --git a/db/migrate/20170403153001_create_payment_method_settings.rb b/db/migrate/20170403153001_create_payment_method_settings.rb index 2fea9098..339a3187 100644 --- a/db/migrate/20170403153001_create_payment_method_settings.rb +++ b/db/migrate/20170403153001_create_payment_method_settings.rb @@ -1,4 +1,4 @@ -class CreatePaymentMethodSettings < ActiveRecord::Migration[5.0] +class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1] def change create_table :payment_method_settings do |t| t.string :payment_method, :null => false @@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.0] t.string :gateway_url t.string :auth_token t.string :merchant_account_id - + t.string :additional_parameters t.timestamps end end diff --git a/db/migrate/20170403155230_create_employees.rb b/db/migrate/20170403155230_create_employees.rb index a283ec95..c4bf65ac 100644 --- a/db/migrate/20170403155230_create_employees.rb +++ b/db/migrate/20170403155230_create_employees.rb @@ -1,4 +1,4 @@ -class CreateEmployees < ActiveRecord::Migration[5.0] +class CreateEmployees < ActiveRecord::Migration[5.1] def change create_table :employees do |t| t.string :name, :null => false diff --git a/db/migrate/20170403155500_create_cashier_terminals.rb b/db/migrate/20170403155500_create_cashier_terminals.rb index dc5a5eb5..274c7914 100644 --- a/db/migrate/20170403155500_create_cashier_terminals.rb +++ b/db/migrate/20170403155500_create_cashier_terminals.rb @@ -1,4 +1,4 @@ -class CreateCashierTerminals < ActiveRecord::Migration[5.0] +class CreateCashierTerminals < ActiveRecord::Migration[5.1] def change create_table :cashier_terminals do |t| t.string :name, :null => false diff --git a/db/migrate/20170403155531_create_cashier_login_logs.rb b/db/migrate/20170403155531_create_cashier_login_logs.rb index b12f258f..0887f3bd 100644 --- a/db/migrate/20170403155531_create_cashier_login_logs.rb +++ b/db/migrate/20170403155531_create_cashier_login_logs.rb @@ -1,6 +1,8 @@ -class CreateCashierLoginLogs < ActiveRecord::Migration[5.0] +class CreateCashierLoginLogs < ActiveRecord::Migration[5.1] def change - create_table :cashier_login_logs do |t| + create_table :cashier_login_logs, :id => false, :primary_key => :cashier_login_log_id do |t| + t.string :cashier_login_log_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing + t.references :cashier_terminal, foreign_key: true t.references :employee, foreign_key: true t.datetime :login_at, :null => false diff --git a/db/migrate/20170403160742_create_sales.rb b/db/migrate/20170403160742_create_sales.rb index 4780a788..7e4850f1 100644 --- a/db/migrate/20170403160742_create_sales.rb +++ b/db/migrate/20170403160742_create_sales.rb @@ -1,13 +1,15 @@ -class CreateSales < ActiveRecord::Migration[5.0] +class CreateSales < ActiveRecord::Migration[5.1] def change - create_table :sales do |t| + create_table :sales, :id => false do |t| + t.string :sale_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + t.integer :cashier_id, :index => true t.string :cashier_name t.string :requested_by, :null => false t.datetime :requested_at, :null => false t.string :receipt_no, :null => false t.datetime :receipt_date, :null => false - t.references :customer, foreign_key: true + t.string :customer_id, foreign_key: true, :limit => 16 t.string :payment_status, :null => false, :default => "outstanding" t.string :sale_status, :null => false, :default => "new" t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb index 7f4533e3..cb07db08 100644 --- a/db/migrate/20170403161857_create_sale_items.rb +++ b/db/migrate/20170403161857_create_sale_items.rb @@ -1,7 +1,8 @@ -class CreateSaleItems < ActiveRecord::Migration[5.0] +class CreateSaleItems < ActiveRecord::Migration[5.1] def change - create_table :sale_items do |t| - t.references :sale, foreign_key: true + create_table :sale_items, :id => false do |t| + t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing + t.string :sale_id, foreign_key: true, :limit => 16 t.string :product_code, :null => false t.string :product_name, :null => false t.string :remark diff --git a/db/migrate/20170403163219_create_sale_taxes.rb b/db/migrate/20170403163219_create_sale_taxes.rb index c52e4117..ef52c9dc 100644 --- a/db/migrate/20170403163219_create_sale_taxes.rb +++ b/db/migrate/20170403163219_create_sale_taxes.rb @@ -1,7 +1,9 @@ -class CreateSaleTaxes < ActiveRecord::Migration[5.0] +class CreateSaleTaxes < ActiveRecord::Migration[5.1] def change - create_table :sale_taxes do |t| - t.references :sale, foreign_key: true + create_table :sale_taxes, :id => false do |t| + t.string :sale_tax_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + + t.string :sale_id, foreign_key: true, :limit => 16 t.string :tax_name, :null => false t.decimal :tax_rate, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :tax_payable_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 diff --git a/db/migrate/20170403163734_create_sale_payments.rb b/db/migrate/20170403163734_create_sale_payments.rb index 3da5cb17..0e2f308a 100644 --- a/db/migrate/20170403163734_create_sale_payments.rb +++ b/db/migrate/20170403163734_create_sale_payments.rb @@ -1,13 +1,15 @@ -class CreateSalePayments < ActiveRecord::Migration[5.0] +class CreateSalePayments < ActiveRecord::Migration[5.1] def change - create_table :sale_payments do |t| - t.references :sale, foreign_key: true + create_table :sale_payments, :id => false do |t| + t.string :sale_payment_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + + t.string :sale_id, foreign_key: true, :limit => 16 t.string :payment_method, :null => false, :default => "cash" t.decimal :payment_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :outstanding_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.string :payment_reference t.string :payment_status, :null => false, :default => "new" - + t.timestamps end end diff --git a/db/migrate/20170403174029_create_sale_orders.rb b/db/migrate/20170403174029_create_sale_orders.rb index 50923ac2..a786163b 100644 --- a/db/migrate/20170403174029_create_sale_orders.rb +++ b/db/migrate/20170403174029_create_sale_orders.rb @@ -1,8 +1,10 @@ -class CreateSaleOrders < ActiveRecord::Migration[5.0] +class CreateSaleOrders < ActiveRecord::Migration[5.1] def change - create_table :sale_orders do |t| - t.references :sale, foreign_key: true - t.references :order, foreign_key: true + create_table :sale_orders, :id => false do |t| + + t.string :sale_order_id, :limit => 16, :primary_key => true + t.string :sale_id, foreign_key: true,:limit => 16 + t.string :order_id, foreign_key: true, :limit => 16 t.timestamps end diff --git a/db/migrate/20170403174111_create_sale_audits.rb b/db/migrate/20170403174111_create_sale_audits.rb index 1880478b..e1dcfffd 100644 --- a/db/migrate/20170403174111_create_sale_audits.rb +++ b/db/migrate/20170403174111_create_sale_audits.rb @@ -1,12 +1,14 @@ -class CreateSaleAudits < ActiveRecord::Migration[5.0] +class CreateSaleAudits < ActiveRecord::Migration[5.1] def change - create_table :sale_audits do |t| - t.references :sale, foreign_key: true + create_table :sale_audits, :id => false do |t| + t.string :sale_audit_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + + t.string :sale_id, foreign_key: true, :limit => 16 t.string :action, :null => false t.datetime :action_at, :null => false t.string :action_by, :null => false - t.string :approved_by, :null => false - t.datetime :approved_by, :null => false + t.string :approved_by, :null => true + t.datetime :approved_at, :null => true t.string :remark t.timestamps end diff --git a/db/migrate/20170403174309_create_lookups.rb b/db/migrate/20170403174309_create_lookups.rb index a825cc8f..2fbd3fa7 100644 --- a/db/migrate/20170403174309_create_lookups.rb +++ b/db/migrate/20170403174309_create_lookups.rb @@ -1,4 +1,4 @@ -class CreateLookups < ActiveRecord::Migration[5.0] +class CreateLookups < ActiveRecord::Migration[5.1] def change create_table :lookups do |t| t.string :lookup_type, :null => false diff --git a/db/migrate/20170403183755_create_tax_profiles.rb b/db/migrate/20170403183755_create_tax_profiles.rb index 7f9893d5..1f9dfceb 100644 --- a/db/migrate/20170403183755_create_tax_profiles.rb +++ b/db/migrate/20170403183755_create_tax_profiles.rb @@ -1,4 +1,4 @@ -class CreateTaxProfiles < ActiveRecord::Migration[5.0] +class CreateTaxProfiles < ActiveRecord::Migration[5.1] def change create_table :tax_profiles do |t| t.string :name, :null => false diff --git a/db/migrate/20170404034234_create_bookings.rb b/db/migrate/20170404034234_create_bookings.rb index a67e7a30..89795a83 100644 --- a/db/migrate/20170404034234_create_bookings.rb +++ b/db/migrate/20170404034234_create_bookings.rb @@ -1,6 +1,8 @@ -class CreateBookings < ActiveRecord::Migration[5.0] +class CreateBookings < ActiveRecord::Migration[5.1] def change - create_table :bookings do |t| + create_table :bookings, :id => false do |t| + t.string :booking_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing + t.references :dining_facility, foreign_key: true t.string :type, :null => false, :default => "Table" t.datetime :checkin_at, :null => false @@ -10,7 +12,8 @@ class CreateBookings < ActiveRecord::Migration[5.0] t.datetime :reserved_at t.string :reserved_by t.string :booking_status, :null => false, :default => "new" - t.references :sale, foreign_key: true + t.string :sale_id, foreign_key: true, :limit => 16 + t.string :customer_id, foreign_key: true, :limit => 16 t.timestamps end diff --git a/db/migrate/20170408105938_create_seed_generators.rb b/db/migrate/20170408105938_create_seed_generators.rb index eb58749a..14e62fe1 100644 --- a/db/migrate/20170408105938_create_seed_generators.rb +++ b/db/migrate/20170408105938_create_seed_generators.rb @@ -1,4 +1,4 @@ -class CreateSeedGenerators < ActiveRecord::Migration[5.0] +class CreateSeedGenerators < ActiveRecord::Migration[5.1] def change create_table :seed_generators do |t| t.string :model, :null => false, :default => "sale" diff --git a/db/migrate/20170414071634_create_membership_settings.rb b/db/migrate/20170414071634_create_membership_settings.rb index e15bf082..fca5cce4 100644 --- a/db/migrate/20170414071634_create_membership_settings.rb +++ b/db/migrate/20170414071634_create_membership_settings.rb @@ -1,4 +1,4 @@ -class CreateMembershipSettings < ActiveRecord::Migration[5.0] +class CreateMembershipSettings < ActiveRecord::Migration[5.1] def change create_table :membership_settings do |t| t.string :membership_type, :null => false, :default => "internal" diff --git a/db/migrate/20170414090001_create_assigned_order_items.rb b/db/migrate/20170414090001_create_assigned_order_items.rb index e617adea..3eaf58cf 100644 --- a/db/migrate/20170414090001_create_assigned_order_items.rb +++ b/db/migrate/20170414090001_create_assigned_order_items.rb @@ -1,9 +1,10 @@ -class CreateAssignedOrderItems < ActiveRecord::Migration[5.0] +class CreateAssignedOrderItems < ActiveRecord::Migration[5.1] def change - create_table :assigned_order_items do |t| + create_table :assigned_order_items, :id => false do |t| + t.string :assigned_order_item_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing t.string :item_code, :null => false, :index => true t.references :order_queue_station, foreign_key: true - t.references :order, foreign_key: true + t.string :order_id, foreign_key: true, :limit => 16 t.boolean :print_status t.boolean :delivery_status diff --git a/db/migrate/20170414110918_create_booking_orders.rb b/db/migrate/20170414110918_create_booking_orders.rb index 9a28a5af..25e24b43 100644 --- a/db/migrate/20170414110918_create_booking_orders.rb +++ b/db/migrate/20170414110918_create_booking_orders.rb @@ -1,8 +1,10 @@ -class CreateBookingOrders < ActiveRecord::Migration[5.0] +class CreateBookingOrders < ActiveRecord::Migration[5.1] def change - create_table :booking_orders do |t| - t.references :booking, foreign_key: true - t.references :order, foreign_key: true + create_table :booking_orders, :id => false do |t| + #t.string :booking_order_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing + t.primary_key :booking_order_id + t.string :booking_id, foreign_key: true, :limit => 16 + t.string :order_id, foreign_key: true, :limit => 16 t.timestamps end diff --git a/db/migrate/20170421171849_add_company_address_email.rb b/db/migrate/20170421171849_add_company_address_email.rb deleted file mode 100644 index fb0e81f1..00000000 --- a/db/migrate/20170421171849_add_company_address_email.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddCompanyAddressEmail < ActiveRecord::Migration[5.0] - def change - end -end diff --git a/db/migrate/20170507045043_order_items_completed_by.rb b/db/migrate/20170507045043_order_items_completed_by.rb deleted file mode 100644 index a00fdbb4..00000000 --- a/db/migrate/20170507045043_order_items_completed_by.rb +++ /dev/null @@ -1,6 +0,0 @@ -class OrderItemsCompletedBy < ActiveRecord::Migration[5.0] - def change - add_column :order_items, :completed_by, :string - add_column :order_items, :completed_at, :datetime - end -end diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb index 25de6c6a..4f07d5c4 100644 --- a/db/migrate/20170530072247_create_shops.rb +++ b/db/migrate/20170530072247_create_shops.rb @@ -9,7 +9,7 @@ class CreateShops < ActiveRecord::Migration[5.1] t.string :state, :null => false t.string :country, :null => false t.string :phone_no, :null => false - t.string :reserviation_no, :null => false + t.string :reservation_no, :null => false t.string :license, :null => false t.datetime :activated_at, :null => false t.text :license_data, :null => false diff --git a/db/migrate/20170602093159_create_print_settings.rb b/db/migrate/20170602093159_create_print_settings.rb index a5ce89d6..e9ea5e83 100644 --- a/db/migrate/20170602093159_create_print_settings.rb +++ b/db/migrate/20170602093159_create_print_settings.rb @@ -3,10 +3,10 @@ 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, :null => false - t.string :db_name, :null => false - t.string :db_type, :null => false - t.string :db_username, :null => false + t.string :template + t.string :db_name + t.string :db_type + t.string :db_username t.string :db_password t.string :printer_name, :null => false t.string :api_settings diff --git a/db/migrate/20170602101727_create_accounts.rb b/db/migrate/20170602101727_create_accounts.rb deleted file mode 100644 index 5816aace..00000000 --- a/db/migrate/20170602101727_create_accounts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAccounts < ActiveRecord::Migration[5.1] - def change - create_table :accounts do |t| - t.string :title - t.string :account_type - - t.timestamps - end - end -end diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb new file mode 100644 index 00000000..c980ceac --- /dev/null +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -0,0 +1,16 @@ +class CreateMembershipActions < ActiveRecord::Migration[5.1] + def change + create_table :membership_actions do |t| + t.string :membership_type + t.boolean :is_active + t.string :gateway_communication_type + t.string :gateway_url + t.string :auth_token + t.string :merchant_account_id + t.string :created_by + t.json :additional_parameter + + t.timestamps + end + end +end diff --git a/db/migrate/20170612031153_create_dining_queues.rb b/db/migrate/20170612031153_create_dining_queues.rb new file mode 100644 index 00000000..3cf26418 --- /dev/null +++ b/db/migrate/20170612031153_create_dining_queues.rb @@ -0,0 +1,12 @@ +class CreateDiningQueues < ActiveRecord::Migration[5.1] + def change + create_table :dining_queues do |t| + t.string :name + t.string :contact_no + t.string :queue_no + t.string :status + + t.timestamps + end + end +end diff --git a/db/seeds.rb b/db/seeds.rb index 5e4dd995..56591e2c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -51,6 +51,8 @@ menu_item_type = Lookup.create([{lookup_type:'menu_item_type', name: 'SIMPLE', v {lookup_type:'menu_item_type', name: 'Set Menu', value: 'setMenu'}, {lookup_type:'menu_item_type', name: 'DIY', value: 'diy'}]) +member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Normal', value: '1'}]) + #menu_item_attribute:[size|] menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type', name: 'Size', value: 'size'}]) # {lookup_type:'menu_item_attribute_type', name: 'Spicy', value: 'spicy'}, @@ -74,47 +76,55 @@ booking_status = Lookup.create([{lookup_type:'booking_status', name: 'Available' account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: 'income'}, {lookup_type:'account_type', name: 'Expense', value: 'expense'}]) -#WALK CUSTOMER - Default CUSTOMER (take key 1) -customer = Customer.create({id:1, name:"WALK-IN", contact_no:"000000000"}) -customer = Customer.create({id:2, name:"TAKEAWAY", contact_no:"000000000"}) +# sale void reason +void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manager', value: 'Approve By Manager'}, + {lookup_type:'void_reason', name: 'Customer Mistake', value: 'Customer Mistake'}, + {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'}, + {lookup_type:'void_reason', name: 'Waiter Mistake', value: 'Waiter Mistake'}]) +#WALK CUSTOMER - Default CUSTOMER (take key 1) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111"}) #Default ZOne -zone = Zone.create({id:1, name: "Default Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) -zone2 = Zone.create({id:2, name: "Default Zone 2", is_active:true, created_by: "SYSTEM DEFAULT"}) +# zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) +# zone2 = Zone.create({id:2, name: "VIP Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) #Default dining_facilities -table = Table.create({name:"Default Table", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) -room = Room.create({name:"Default Room", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"}) +# table = Table.create({name:"Table 1", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) +# room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Tax Profile tax_profiles = TaxProfile.create({id:1, name: "Commerical Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"}) +#Account for Menu Item Type (eg: Food, Beverage) +# food = Account.create({title: "Food", account_type: "0"}) +# beverage = Account.create({title: "Beverage", account_type: "1"}) #Default menu -menu = Menu.create({name: "Default Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) +# menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) menu_options = MenuItemOption.create([{name: "Less Spicy", value: "less_spicy"},{name: "Spicy", value: "spicy"},{name: "Super Spicy", value: "super_spicy"}]) menu_options = MenuItemOption.create([{name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{name: "Less Sweet", value: "less_sweet"}]) -#Default Menu Category -menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Sample Menu Category 1", alt_name: "Sample Alternate Name 1", order_by: 1,created_by: "SYSTEM DEFAULT"}) -menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Sample Menu Category 2", alt_name: "Sample Alternate Name 2", order_by: 2,created_by: "SYSTEM DEFAULT"}) -menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Menu Category 3", alt_name: "Sample Alternate Name 3", order_by: 3,created_by: "SYSTEM DEFAULT"}) -menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Sample Menu Category 4", alt_name: "Sample Alternate Category 4", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"}) - -#Default Menu items -menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 }) -menu_item0_instance = MenuItemInstance.create([{item_instance_name:"half portion",item_instance_code:"01001-1", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}]) -menu_item0_instance = MenuItemInstance.create([{item_instance_name:"full portion",item_instance_code:"01001-2", menu_item: menu_category1_menu_item0, price:18.00, is_on_promotion:false}]) - -menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 }) -menu_category1_menu_item2 = SetMenuItem.create({item_code:"I005", name: "Default Menu Item Name 2",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 }) -menu_category1_menu_item3 = SetMenuItem.create({item_code:"I006", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 }) - -menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"I007", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 }) -menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 }) -menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 }) +# #Default Menu Category +# menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1,created_by: "SYSTEM DEFAULT"}) +# menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"}) +# menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"}) +# menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"}) +# +# #Default Menu items +# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Single Pot",item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:12.00, is_on_promotion:false}]) +# menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0041", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) +# +# menu_category1_menu_item1 = SetMenuItem.create({item_code:"I004", name: "Twin Pot", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1 , account: food}) +# menu_category1_menu_item2 = SetMenuItem.create({item_code:"I005", name: "VIP Room Individual Pot",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 2", min_selectable_item: 1, max_selectable_item:1 , account: food}) +# menu_category1_menu_item3 = SetMenuItem.create({item_code:"I006", name: "Default Menu Item Name 3",parent: menu_category1_menu_item1, alt_name: "Alternate Menu Item Name 3", min_selectable_item: 1, max_selectable_item:1 , account: food}) +# +# menu_category2_menu_item0 = SimpleMenuItem.create({item_code:"I007", name: "Default Menu Item Name 0", alt_name: "Alternate Menu Item Name 0",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 , account: food}) +# menu_category2_menu_item1 = SimpleMenuItem.create({item_code:"I008", name: "Default Menu Item Name 1", alt_name: "Alternate Menu Item Name 1",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 2 , account: food}) +# menu_category2_menu_item2 = SimpleMenuItem.create({item_code:"I009", name: "Default Menu Item Name 2", alt_name: "Alternate Menu Item Name 2",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, min_qty: 3 , account: food}) menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"}) menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) @@ -122,14 +132,42 @@ menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size" #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"}) -zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue Station 2", is_active: true, printer_name: "print_station", 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"}) +# 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"}) +# zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue Station 2", is_active: true, printer_name: "print_station", 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"}) #Default Order Queue Process By Zone -zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2}) +# zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2}) #Create Adminstrator employee -admin_employee = Employee.create({name: "Administrator", role: "Administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"}) +admin_employee = Employee.create({name: "Administrator", role: "administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"}) +admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "11111", emp_id:"111", created_by: "SYSTEM DEFAULT"}) +admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"}) +admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"}) + +order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"}) +order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"}) +request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) +crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) +queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "EPSON-TM-T82-S-A"}) + +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",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"} + ]) + +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) + +puts " Finished System Default Set Up Data " diff --git a/dump.rdb b/dump.rdb index b931754d..7202f930 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake new file mode 100644 index 00000000..552c2a60 --- /dev/null +++ b/lib/tasks/clear_data.rake @@ -0,0 +1,17 @@ +namespace :clear do + desc "Clear Data" + task :data => :environment do + BookingOrder.delete_all + Booking.delete_all + OrderItem.delete_all + AssignedOrderItem.delete_all + Order.delete_all + SaleOrder.delete_all + SaleItem.delete_all + Sale.delete_all + SaleAudit.delete_all + SalePayment.delete_all + + puts "Clear Data Done." + end +end diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index 48c134a7..b533dbb2 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -1,3 +1,629 @@ -namespace :menu_import do +namespace :menu do + desc "Clear Data" + task :bitp => :environment do +# Main Menu +menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) +food = Account.create({title: "Food", account_type: "0"}) +beverage = Account.create({title: "Beverage", account_type: "1"}) +# soup base +menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1,created_by: "SYSTEM DEFAULT"}) + # single pot + menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Single Pot",item_instance_code:"II0011", menu_item: menu_category1_menu_item0, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0041", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0051", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0071", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0081", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0061", menu_item: menu_category1_menu_item0, price:17800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}]) + # twin pot + menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"01002", name: "Twin Pot", alt_name: "Twin Pot",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Twin Pot",item_instance_code:"II0021", menu_item: menu_category1_menu_item1, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0042", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0052", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0072", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0082", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0062", menu_item: menu_category1_menu_item1, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0092", menu_item: menu_category1_menu_item1, price:11800.00, is_on_promotion:false}]) + # vip room Individual pot + menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"VIP Room Individual Pot",item_instance_code:"II0031", menu_item: menu_category1_menu_item2, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0043", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0053", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0083", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0093", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) +# Assorted Platter +menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Assorted Platter", alt_name: "Assorted Platter", order_by: 2, created_by: "SYSTEM DEFAULT"}) + # Pork Platter + menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Pork Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0101", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false}]) + # Beef Platter + menu_category1_menu_item4 = SimpleMenuItem.create({item_code:"01005", name: "Beef Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Platter",item_instance_code:"II0111", menu_item: menu_category1_menu_item4, price:24000.00, is_on_promotion:false}]) + # Assorted Seafood Platter + menu_category1_menu_item5 = SimpleMenuItem.create({item_code:"01006", name: "Assorted Seafood Platter", alt_name: "Twin Pot",menu_category: menu_category2 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Assorted Seafood Platter",item_instance_code:"II0121", menu_item: menu_category1_menu_item5, price:66000.00, is_on_promotion:false}]) +# Beef & Mutton +menu_category3 = MenuCategory.create({menu: menu, code:"C003", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 3,created_by: "SYSTEM DEFAULT"}) + # Australia Angus Boneless Short Rib + menu_category1_menu_item6 = SimpleMenuItem.create({item_code:"01007", name: "Australia Angus Boneless Short Rib", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0132", menu_item: menu_category1_menu_item5, price:12500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0131", menu_item: menu_category1_menu_item5, price:25000.00, is_on_promotion:false}]) + # Spain Beef + menu_category1_menu_item7 = SimpleMenuItem.create({item_code:"01008", name: "Spain Beef", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0142", menu_item: menu_category1_menu_item7, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0141", menu_item: menu_category1_menu_item7, price:16000.00, is_on_promotion:false}]) + # Sliced Beef （Thin） + menu_category1_menu_item8 = SimpleMenuItem.create({item_code:"01009", name: "Sliced Beef （Thin）", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0152", menu_item: menu_category1_menu_item7, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0151", menu_item: menu_category1_menu_item7, price:12000.00, is_on_promotion:false}]) + # Tender Sliced Beef + menu_category1_menu_item9 = SimpleMenuItem.create({item_code:"01010", name: "Tender Sliced Beef", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0162", menu_item: menu_category1_menu_item7, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0161", menu_item: menu_category1_menu_item7, price:12000.00, is_on_promotion:false}]) + # Beef Tripe + menu_category1_menu_item10 = SimpleMenuItem.create({item_code:"01011", name: "Beef Tripe", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0172", menu_item: menu_category1_menu_item7, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0171", menu_item: menu_category1_menu_item7, price:7000.00, is_on_promotion:false}]) + # Braised Cow's Stomach + menu_category1_menu_item11 = SimpleMenuItem.create({item_code:"01012", name: "Braised Cow's Stomach", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0182", menu_item: menu_category1_menu_item11, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0181", menu_item: menu_category1_menu_item11, price:14000.00, is_on_promotion:false}]) +# Pork +menu_category4 = MenuCategory.create({menu: menu, code:"C004", name: "Pork", alt_name: "Pork", order_by: 4,created_by: "SYSTEM DEFAULT"}) + # Sliced Lamb + menu_category1_menu_item12 = SimpleMenuItem.create({item_code:"01013", name: "Sliced Lamb", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0192", menu_item: menu_category1_menu_item12, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0191", menu_item: menu_category1_menu_item12, price:12000.00, is_on_promotion:false}]) + # Sliced Tenderloin Pork + menu_category1_menu_item13 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0202", menu_item: menu_category1_menu_item13, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0201", menu_item: menu_category1_menu_item13, price:8000.00, is_on_promotion:false}]) + # Sliced Pork Belly + menu_category1_menu_item14 = SimpleMenuItem.create({item_code:"01015", name: "Sliced Pork Belly", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", menu_item: menu_category1_menu_item14, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0211", menu_item: menu_category1_menu_item14, price:8000.00, is_on_promotion:false}]) + # Sliced Pork Collar + menu_category1_menu_item15 = SimpleMenuItem.create({item_code:"01016", name: "Sliced Pork Collar", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0222", menu_item: menu_category1_menu_item15, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0221", menu_item: menu_category1_menu_item15, price:8000.00, is_on_promotion:false}]) + # Pork Jawl + menu_category1_menu_item16 = SimpleMenuItem.create({item_code:"01017", name: "Pork Jawl", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0232", menu_item: menu_category1_menu_item16, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0231", menu_item: menu_category1_menu_item16, price:8000.00, is_on_promotion:false}]) + # Tender Sliced Tenderloin Pork + menu_category1_menu_item17 = SimpleMenuItem.create({item_code:"01018", name: "Tender Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0242", menu_item: menu_category1_menu_item17, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0241", menu_item: menu_category1_menu_item17, price:8000.00, is_on_promotion:false}]) + # Spicy Sliced Pork + menu_category1_menu_item18 = SimpleMenuItem.create({item_code:"01019", name: "Spicy Sliced Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0252", menu_item: menu_category1_menu_item18, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0251", menu_item: menu_category1_menu_item18, price:8000.00, is_on_promotion:false}]) + # Pig's Tongue + menu_category1_menu_item19 = SimpleMenuItem.create({item_code:"01020", name: "Pig's Tongue", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0262", menu_item: menu_category1_menu_item19, price:60000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0261", menu_item: menu_category1_menu_item19, price:12000.00, is_on_promotion:false}]) + # Luncheon Meat + menu_category1_menu_item20 = SimpleMenuItem.create({item_code:"01021", name: "Luncheon Meat", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0272", menu_item: menu_category1_menu_item20, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0271", menu_item: menu_category1_menu_item20, price:5000.00, is_on_promotion:false}]) + # Pig's Liver + menu_category1_menu_item21 = SimpleMenuItem.create({item_code:"01022", name: "Pig's Liver", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0282", menu_item: menu_category1_menu_item21, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0281", menu_item: menu_category1_menu_item21, price:5000.00, is_on_promotion:false}]) + # Pig's Intestine + menu_category1_menu_item22 = SimpleMenuItem.create({item_code:"01023", name: "Pig's Intestine", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0292", menu_item: menu_category1_menu_item22, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0291", menu_item: menu_category1_menu_item22, price:6000.00, is_on_promotion:false}]) +# Chicken +menu_category5 = MenuCategory.create({menu: menu, code:"C005", name: "Chicken", alt_name: "Chicken", order_by: 5, created_by: "SYSTEM DEFAULT"}) + # Sliced Chicken Breast + menu_category1_menu_item23 = SimpleMenuItem.create({item_code:"01024", name: "Sliced Chicken Breast", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0302", menu_item: menu_category1_menu_item23, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0301", menu_item: menu_category1_menu_item23, price:7000.00, is_on_promotion:false}]) + # Sliced Chicken Thigh + menu_category1_menu_item24 = SimpleMenuItem.create({item_code:"01025", name: "Sliced Chicken Thigh", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0312", menu_item: menu_category1_menu_item24, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0311", menu_item: menu_category1_menu_item24, price:7000.00, is_on_promotion:false}]) + # Crunchy Gourmet Chicken Sausage + menu_category1_menu_item25 = SimpleMenuItem.create({item_code:"01026", name: "Crunchy Gourmet Chicken Sausage", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0322", menu_item: menu_category1_menu_item25, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0321", menu_item: menu_category1_menu_item25, price:8000.00, is_on_promotion:false}]) + # Cheesy Chicken Sausage + menu_category1_menu_item26 = SimpleMenuItem.create({item_code:"01027", name: "Cheesy Chicken Sausage", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0332", menu_item: menu_category1_menu_item26, price:4800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0331", menu_item: menu_category1_menu_item26, price:9600.00, is_on_promotion:false}]) + # Chicken Feet Skin + menu_category1_menu_item27 = SimpleMenuItem.create({item_code:"01028", name: "Chicken Feet Skin", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0342", menu_item: menu_category1_menu_item27, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0341", menu_item: menu_category1_menu_item27, price:5000.00, is_on_promotion:false}]) + # Chinese Wine Kampong Chicken + menu_category1_menu_item28 = SimpleMenuItem.create({item_code:"01029", name: "Chinese Wine Kampong Chicken", alt_name: "Twin Pot",menu_category: menu_category5 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0352", menu_item: menu_category1_menu_item28, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0351", menu_item: menu_category1_menu_item28, price:16000.00, is_on_promotion:false}]) +# Handmade Balls +menu_category6 = MenuCategory.create({menu: menu, code:"C006", name: "Handmade Balls", alt_name: "Soup_base", order_by: 6,created_by: "SYSTEM DEFAULT"}) + # Soft Bone Pork Meatball + menu_category1_menu_item29 = SimpleMenuItem.create({item_code:"01030", name: "Soft Bone Pork Meatball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0362", menu_item: menu_category1_menu_item29, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0361", menu_item: menu_category1_menu_item29, price:6000.00, is_on_promotion:false}]) + # Fish Ball + menu_category1_menu_item30 = SimpleMenuItem.create({item_code:"01031", name: "Fish Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0372", menu_item: menu_category1_menu_item30, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0371", menu_item: menu_category1_menu_item30, price:6000.00, is_on_promotion:false}]) + # Beef Ball + menu_category1_menu_item31 = SimpleMenuItem.create({item_code:"01032", name: "Beef Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0382", menu_item: menu_category1_menu_item31, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0381", menu_item: menu_category1_menu_item31, price:7000.00, is_on_promotion:false}]) + # Mushroom Ball + menu_category1_menu_item32 = SimpleMenuItem.create({item_code:"01033", name: "Mushroom Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0392", menu_item: menu_category1_menu_item32, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0391", menu_item: menu_category1_menu_item32, price:7000.00, is_on_promotion:false}]) + # Cuttlefish Ball + menu_category1_menu_item33 = SimpleMenuItem.create({item_code:"01034", name: "Cuttlefish Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0402", menu_item: menu_category1_menu_item33, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0401", menu_item: menu_category1_menu_item33, price:7000.00, is_on_promotion:false}]) + # Cheesy Pork Ball + menu_category1_menu_item34 = SimpleMenuItem.create({item_code:"01035", name: "Cheesy Pork Ball", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0412", menu_item: menu_category1_menu_item34, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0411", menu_item: menu_category1_menu_item34, price:7000.00, is_on_promotion:false}]) + # Assorted Ball Platter + menu_category1_menu_item35 = SimpleMenuItem.create({item_code:"01036", name: "Assorted Ball Platter", alt_name: "Twin Pot",menu_category: menu_category6 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0421", menu_item: menu_category1_menu_item35, price:7800.00, is_on_promotion:false}]) +# Specialty Homemade Paste +menu_category7 = MenuCategory.create({menu: menu, code:"C007", name: "Specialty Homemade Paste", alt_name: "Beef_and_mutton", order_by: 7,created_by: "SYSTEM DEFAULT"}) + # Fish Paste + menu_category1_menu_item36 = SimpleMenuItem.create({item_code:"01037", name: "Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0431", menu_item: menu_category1_menu_item36, price:4800.00, is_on_promotion:false}]) + # Century Egg Fish Paste + menu_category1_menu_item37 = SimpleMenuItem.create({item_code:"01038", name: "Century Egg Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0441", menu_item: menu_category1_menu_item37, price:5800.00, is_on_promotion:false}]) + # Pork Paste + menu_category1_menu_item38 = SimpleMenuItem.create({item_code:"01039", name: " Pork Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0451", menu_item: menu_category1_menu_item38, price:5800.00, is_on_promotion:false}]) + # Dried Scallop Fish Paste + menu_category1_menu_item39 = SimpleMenuItem.create({item_code:"01040", name: "Dried Scallop Fish Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0461", menu_item: menu_category1_menu_item39, price:8800.00, is_on_promotion:false}]) + # Ebiko Prawn Paste + menu_category1_menu_item40 = SimpleMenuItem.create({item_code:"01041", name: "Ebiko Prawn Paste", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0471", menu_item: menu_category1_menu_item40, price:11800.00, is_on_promotion:false}]) +# Seafood +menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", alt_name: "Pork", order_by: 8,created_by: "SYSTEM DEFAULT"}) + # Promfret + menu_category1_menu_item41 = SimpleMenuItem.create({item_code:"01042", name: "Promfret", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0481", menu_item: menu_category1_menu_item41, price:30.00, is_on_promotion:false}]) + # Garoupa + menu_category1_menu_item42 = SimpleMenuItem.create({item_code:"01043", name: "Garoupa", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Small",item_instance_code:"II0491", menu_item: menu_category1_menu_item42, price:13800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Medium",item_instance_code:"II0492", menu_item: menu_category1_menu_item42, price:18800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Large",item_instance_code:"II0493", menu_item: menu_category1_menu_item42, price:23900.00, is_on_promotion:false}]) + # Sliced Fish + menu_category1_menu_item43 = SimpleMenuItem.create({item_code:"01044", name: "Sliced Fish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0502", menu_item: menu_category1_menu_item43, price:4800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0501", menu_item: menu_category1_menu_item43, price:9600.00, is_on_promotion:false}]) + # Fresh Sea Prawns + menu_category1_menu_item44 = SimpleMenuItem.create({item_code:"01045", name: "Fresh Sea Prawns", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0512", menu_item: menu_category1_menu_item44, price:9800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0511", menu_item: menu_category1_menu_item44, price:19600.00, is_on_promotion:false}]) + # Drunken Prawns + menu_category1_menu_item45 = SimpleMenuItem.create({item_code:"01046", name: "Drunken Prawns", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0522", menu_item: menu_category1_menu_item45, price:11000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0521", menu_item: menu_category1_menu_item45, price:22000.00, is_on_promotion:false}]) + # Fish Maw + menu_category1_menu_item46 = SimpleMenuItem.create({item_code:"01047", name: "Fish Maw", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0532", menu_item: menu_category1_menu_item46, price:11000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0531", menu_item: menu_category1_menu_item46, price:22000.00, is_on_promotion:false}]) + # Fresh Cittlefish + menu_category1_menu_item47 = SimpleMenuItem.create({item_code:"01048", name: "Fresh Cittlefish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0542", menu_item: menu_category1_menu_item47, price:4700.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0541", menu_item: menu_category1_menu_item47, price:9400.00, is_on_promotion:false}]) + # Sea Cucumber + menu_category1_menu_item48 = SimpleMenuItem.create({item_code:"01049", name: "Sea Cucumber", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0552", menu_item: menu_category1_menu_item48, price:28800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0551", menu_item: menu_category1_menu_item48, price:57600.00, is_on_promotion:false}]) + # Fresh Scallop + menu_category1_menu_item49 = SimpleMenuItem.create({item_code:"01050", name: "Fresh Scallop", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0562", menu_item: menu_category1_menu_item49, price:28800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0561", menu_item: menu_category1_menu_item49, price:57600.00, is_on_promotion:false}]) + # Japanese Crab Stick + menu_category1_menu_item50 = SimpleMenuItem.create({item_code:"01051", name: "Japanese Crab Stick", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0572", menu_item: menu_category1_menu_item50, price:4400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0571", menu_item: menu_category1_menu_item50, price:8800.00, is_on_promotion:false}]) + # Fish Head + menu_category1_menu_item51 = SimpleMenuItem.create({item_code:"01052", name: "Fish Head", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0582", menu_item: menu_category1_menu_item51, price:2800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0581", menu_item: menu_category1_menu_item51, price:5600.00, is_on_promotion:false}]) + # 10-Head Abalone + menu_category1_menu_item52 = SimpleMenuItem.create({item_code:"01053", name: "10-Head Abalone", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0592", menu_item: menu_category1_menu_item52, price:15000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0591", menu_item: menu_category1_menu_item52, price:30000.00, is_on_promotion:false}]) + # Red Clams + menu_category1_menu_item53 = SimpleMenuItem.create({item_code:"01054", name: "Red Clams", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0602", menu_item: menu_category1_menu_item53, price:12000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0601", menu_item: menu_category1_menu_item53, price:24000.00, is_on_promotion:false}]) + # Scallop + menu_category1_menu_item54 = SimpleMenuItem.create({item_code:"01055", name: "Scallop", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0612", menu_item: menu_category1_menu_item54, price:19000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0611", menu_item: menu_category1_menu_item54, price:38000.00, is_on_promotion:false}]) + # Baby Octopus + menu_category1_menu_item55 = SimpleMenuItem.create({item_code:"01056", name: "Baby Octopus", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0622", menu_item: menu_category1_menu_item55, price:2900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0621", menu_item: menu_category1_menu_item55, price:58000.00, is_on_promotion:false}]) + # Fresh Cuttlefish + menu_category1_menu_item56 = SimpleMenuItem.create({item_code:"01057", name: "Fresh Cuttlefish", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0632", menu_item: menu_category1_menu_item56, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0631", menu_item: menu_category1_menu_item56, price:10.00, is_on_promotion:false}]) + # Squid Rings + menu_category1_menu_item57 = SimpleMenuItem.create({item_code:"01058", name: "Squid Rings", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0042", menu_item: menu_category1_menu_item57, price:3400.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0641", menu_item: menu_category1_menu_item57, price:6800.00, is_on_promotion:false}]) + # Green Mussels + menu_category1_menu_item58 = SimpleMenuItem.create({item_code:"01059", name: "Green Mussels", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0652", menu_item: menu_category1_menu_item58, price:6500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0651", menu_item: menu_category1_menu_item58, price:13000.00, is_on_promotion:false}]) + # Live Crab + menu_category1_menu_item59 = SimpleMenuItem.create({item_code:"01060", name: "Live Crab", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0661", menu_item: menu_category1_menu_item59, price:60.00, is_on_promotion:false}]) + # Fresh Flower Crabs + menu_category1_menu_item60 = SimpleMenuItem.create({item_code:"01061", name: "Fresh Flower Crabs", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0671", menu_item: menu_category1_menu_item60, price:60.00, is_on_promotion:false}]) + # Live Lobster + menu_category1_menu_item61 = SimpleMenuItem.create({item_code:"01062", name: "Live Lobster", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0681", menu_item: menu_category1_menu_item61, price:150.00, is_on_promotion:false}]) + # Live Mantis + menu_category1_menu_item62 = SimpleMenuItem.create({item_code:"01063", name: "Live Mantis", alt_name: "Twin Pot",menu_category: menu_category7 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0691", menu_item: menu_category1_menu_item62, price:150.00, is_on_promotion:false}]) +# Dumpling +menu_category9 = MenuCategory.create({menu: menu, code:"C009", name: "Dumpling", alt_name: "Chicken", order_by: 9, created_by: "SYSTEM DEFAULT"}) + # Pork and Chives Dumpling + menu_category1_menu_item63 = SimpleMenuItem.create({item_code:"01064", name: "Pork and Chives Dumpling", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0702", menu_item: menu_category1_menu_item63, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0701", menu_item: menu_category1_menu_item63, price:6000.00, is_on_promotion:false}]) + # Prawn Dumpling + menu_category1_menu_item64 = SimpleMenuItem.create({item_code:"01065", name: " Prawn Dumpling ", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0712", menu_item: menu_category1_menu_item64, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0711", menu_item: menu_category1_menu_item64, price:8000.00, is_on_promotion:false}]) + # Prawn Roll Dumpling + menu_category1_menu_item65 = SimpleMenuItem.create({item_code:"01066", name: "Prawn Roll Dumpling", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0722", menu_item: menu_category1_menu_item65, price:3000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0721", menu_item: menu_category1_menu_item65, price:6000.00, is_on_promotion:false}]) + # Pork Roll Dumpling + menu_category1_menu_item66 = SimpleMenuItem.create({item_code:"01067", name: "Pork Roll Dumpling", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0732", menu_item: menu_category1_menu_item66, price:2500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0731", menu_item: menu_category1_menu_item66, price:5000.00, is_on_promotion:false}]) + # Assorted Dumpling Platter + menu_category1_menu_item67 = SimpleMenuItem.create({item_code:"01068", name: "Assorted Dumpling Platter", alt_name: "Twin Pot",menu_category: menu_category9 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0741", menu_item: menu_category1_menu_item67, price:7800.00, is_on_promotion:false}]) +# Tofu & Beancurd +menu_category10 = MenuCategory.create({menu: menu, code:"C0010", name: "Tofu & Beancurd", alt_name: "Soup_base", order_by: 10,created_by: "SYSTEM DEFAULT"}) + # Signature Homemade Fish Tofu + menu_category1_menu_item68 = SimpleMenuItem.create({item_code:"01069", name: "Signature Homemade Fish Tofu ", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0751", menu_item: menu_category1_menu_item68, price:1500.00, is_on_promotion:false}]) + # SilkenTofu + menu_category1_menu_item69 = SimpleMenuItem.create({item_code:"01070", name: "SilkenTofu", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0762", menu_item: menu_category1_menu_item69, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0761", menu_item: menu_category1_menu_item69, price:2000.00, is_on_promotion:false}]) + # IceTofu + menu_category1_menu_item70 = SimpleMenuItem.create({item_code:"01071", name: "IceTofu", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0772", menu_item: menu_category1_menu_item70, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0771", menu_item: menu_category1_menu_item70, price:4000.00, is_on_promotion:false}]) + # Fried Beancurd Skin + menu_category1_menu_item71 = SimpleMenuItem.create({item_code:"01072", name: "Fried Beancurd Skin", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0782", menu_item: menu_category1_menu_item71, price:4000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0781", menu_item: menu_category1_menu_item71, price:8000.00, is_on_promotion:false}]) + # Tofu Puff + menu_category1_menu_item72 = SimpleMenuItem.create({item_code:"01073", name: "Tofu Puff Platter", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0792", menu_item: menu_category1_menu_item72, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0791", menu_item: menu_category1_menu_item72, price:4000.00, is_on_promotion:false}]) + # Dried Beancurd Stick + menu_category1_menu_item73 = SimpleMenuItem.create({item_code:"01074", name: "Dried Beancurd Stick", alt_name: "Twin Pot",menu_category: menu_category10 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0802", menu_item: menu_category1_menu_item73, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0801", menu_item: menu_category1_menu_item73, price:4000.00, is_on_promotion:false}]) +# Mushroom +menu_category12 = MenuCategory.create({menu: menu, code:"C0012", name: "Mushroom", alt_name: "Beef_and_mutton", order_by: 12,created_by: "SYSTEM DEFAULT"}) + # Black Fungus + menu_category1_menu_item74 = SimpleMenuItem.create({item_code:"01075", name: "Black Fungus", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0812", menu_item: menu_category1_menu_item74, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0811", menu_item: menu_category1_menu_item74, price:3600.00, is_on_promotion:false}]) + # White and Hon Shimeiji + menu_category1_menu_item75 = SimpleMenuItem.create({item_code:"01076", name: "White and Hon Shimeiji", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0822", menu_item: menu_category1_menu_item75, price:2800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0821", menu_item: menu_category1_menu_item75, price:5600.00, is_on_promotion:false}]) +# Drumstick Musroom + menu_category1_menu_item76 = SimpleMenuItem.create({item_code:"01077", name: "Drumstick Musroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0832", menu_item: menu_category1_menu_item76, price:2300.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0831", menu_item: menu_category1_menu_item76, price:4600.00, is_on_promotion:false}]) +# Enoki Mushroom + menu_category1_menu_item77 = SimpleMenuItem.create({item_code:"01078", name: "Enoki Mushroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0824", menu_item: menu_category1_menu_item77, price:2300.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0841", menu_item: menu_category1_menu_item77, price:4600.00, is_on_promotion:false}]) +# Fresh Mushroom + menu_category1_menu_item78 = SimpleMenuItem.create({item_code:"01079", name: "Fresh Mushroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0852", menu_item: menu_category1_menu_item78, price:2800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0851", menu_item: menu_category1_menu_item78, price:5600.00, is_on_promotion:false}]) +# Abalone Mushroom + menu_category1_menu_item79 = SimpleMenuItem.create({item_code:"01080", name: "Abalone Mushroom", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0862", menu_item: menu_category1_menu_item79, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0861", menu_item: menu_category1_menu_item79, price:3600.00, is_on_promotion:false}]) +# Snow Fungus + menu_category1_menu_item80 = SimpleMenuItem.create({item_code:"01081", name: "Snow Fungus", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0872", menu_item: menu_category1_menu_item80, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0871", menu_item: menu_category1_menu_item80, price:3600.00, is_on_promotion:false}]) +# Assorted Mushroom Platter + menu_category1_menu_item81 = SimpleMenuItem.create({item_code:"01082", name: "Assorted Mushroom Platter", alt_name: "Twin Pot",menu_category: menu_category12 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0881", menu_item: menu_category1_menu_item81, price:10000.00, is_on_promotion:false}]) +# Vegetables +menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetables", alt_name: "Beef_and_mutton", order_by: 12,created_by: "SYSTEM DEFAULT"}) + # Baby Chinese Spinach + menu_category1_menu_item82 = SimpleMenuItem.create({item_code:"01083", name: "Baby Chinese Spinach", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0892", menu_item: menu_category1_menu_item82, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0891", menu_item: menu_category1_menu_item82, price:3000.00, is_on_promotion:false}]) + # Chinese Cabbage + menu_category1_menu_item83 = SimpleMenuItem.create({item_code:"01084", name: "Chinese Cabbage ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0902", menu_item: menu_category1_menu_item83, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0901", menu_item: menu_category1_menu_item83, price:3000.00, is_on_promotion:false}]) + # Lettuce + menu_category1_menu_item84 = SimpleMenuItem.create({item_code:"01085", name: "Lettuce ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0912", menu_item: menu_category1_menu_item84, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0911", menu_item: menu_category1_menu_item84, price:3600.00, is_on_promotion:false}]) + # Baby Romaine Lettuce + menu_category1_menu_item85 = SimpleMenuItem.create({item_code:"01086", name: "Baby Romaine Lettuce ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0922", menu_item: menu_category1_menu_item85, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0921", menu_item: menu_category1_menu_item85, price:3600.00, is_on_promotion:false}]) +# Baby Tang O + menu_category1_menu_item86 = SimpleMenuItem.create({item_code:"01087", name: "Baby Tang O", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0932", menu_item: menu_category1_menu_item86, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0931", menu_item: menu_category1_menu_item86, price:3000.00, is_on_promotion:false}]) +# Sliced Lotus Root + menu_category1_menu_item87 = SimpleMenuItem.create({item_code:"01088", name: "Sliced Lotus Root", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0942", menu_item: menu_category1_menu_item87, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0941", menu_item: menu_category1_menu_item87, price:3600.00, is_on_promotion:false}]) +# Sliced Potato + menu_category1_menu_item88 = SimpleMenuItem.create({item_code:"01089", name: "Sliced Potato ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0952", menu_item: menu_category1_menu_item88, price:1300.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0951", menu_item: menu_category1_menu_item88, price:2600.00, is_on_promotion:false}]) +# Sliced Winter Melon + menu_category1_menu_item89 = SimpleMenuItem.create({item_code:"01090", name: "Sliced Winter Melon", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0962", menu_item: menu_category1_menu_item89, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0961", menu_item: menu_category1_menu_item89, price:2400.00, is_on_promotion:false}]) +# Fried Yam + menu_category1_menu_item90 = SimpleMenuItem.create({item_code:"01091", name: "Fried Yam ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0972", menu_item: menu_category1_menu_item90, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0971", menu_item: menu_category1_menu_item90, price:3600.00, is_on_promotion:false}]) +# Pearl Sweet Corn + menu_category1_menu_item91 = SimpleMenuItem.create({item_code:"01092", name: "Pearl Sweet Corn", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0982", menu_item: menu_category1_menu_item91, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0981", menu_item: menu_category1_menu_item91, price:3000.00, is_on_promotion:false}]) +# Baby Lady's Finger + menu_category1_menu_item92 = SimpleMenuItem.create({item_code:"01093", name: "Baby Lady's Finger", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0992", menu_item: menu_category1_menu_item92, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0991", menu_item: menu_category1_menu_item92, price:2400.00, is_on_promotion:false}]) +# Baby Corn + menu_category1_menu_item93 = SimpleMenuItem.create({item_code:"01094", name: "Baby Corn", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1002", menu_item: menu_category1_menu_item93, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1001", menu_item: menu_category1_menu_item93, price:3600.00, is_on_promotion:false}]) +# Asparagus + menu_category1_menu_item94 = SimpleMenuItem.create({item_code:"01095", name: "Asparagus", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1012", menu_item: menu_category1_menu_item94, price:1900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1011", menu_item: menu_category1_menu_item94, price:3800.00, is_on_promotion:false}]) +# Brocolli + menu_category1_menu_item95 = SimpleMenuItem.create({item_code:"01096", name: "Brocolli", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1022", menu_item: menu_category1_menu_item95, price:1900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1021", menu_item: menu_category1_menu_item95, price:3800.00, is_on_promotion:false}]) +# White Radish + menu_category1_menu_item96 = SimpleMenuItem.create({item_code:"01097", name: "White Radish", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1032", menu_item: menu_category1_menu_item96, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1031", menu_item: menu_category1_menu_item96, price:2400.00, is_on_promotion:false}]) +# Xiao Bai Chai + menu_category1_menu_item97 = SimpleMenuItem.create({item_code:"01098", name: "Xiao Bai Chai", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1042", menu_item: menu_category1_menu_item97, price:1900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1041", menu_item: menu_category1_menu_item97, price:3800.00, is_on_promotion:false}]) +# Bean Leaf + menu_category1_menu_item98 = SimpleMenuItem.create({item_code:"01099", name: "Bean Leaf", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1052", menu_item: menu_category1_menu_item98, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1051", menu_item: menu_category1_menu_item98, price:2400.00, is_on_promotion:false}]) +# Chayote Vine + menu_category1_menu_item99 = SimpleMenuItem.create({item_code:"01100", name: "Chayote Vine", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1062", menu_item: menu_category1_menu_item99, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1061", menu_item: menu_category1_menu_item99, price:2400.00, is_on_promotion:false}]) +# Kai Lan + menu_category1_menu_item100 = SimpleMenuItem.create({item_code:"01101", name: "Kai Lan ", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1072", menu_item: menu_category1_menu_item100, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1071", menu_item: menu_category1_menu_item100, price:2400.00, is_on_promotion:false}]) +# Cabbage + menu_category1_menu_item101 = SimpleMenuItem.create({item_code:"01102", name: "Cabbage", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1082", menu_item: menu_category1_menu_item101, price:1900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1081", menu_item: menu_category1_menu_item101, price:3800.00, is_on_promotion:false}]) +# Pumpkin + menu_category1_menu_item102 = SimpleMenuItem.create({item_code:"01103", name: "Pumpkin", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1092", menu_item: menu_category1_menu_item102, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1091", menu_item: menu_category1_menu_item102, price:2400.00, is_on_promotion:false}]) +# Sweet Potato + menu_category1_menu_item103 = SimpleMenuItem.create({item_code:"01104", name: "Sweet Potato", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1102", menu_item: menu_category1_menu_item103, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1101", menu_item: menu_category1_menu_item103, price:2400.00, is_on_promotion:false}]) +# Red Carrot + menu_category1_menu_item104 = SimpleMenuItem.create({item_code:"01105", name: "Red Carrot", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1112", menu_item: menu_category1_menu_item104, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1111", menu_item: menu_category1_menu_item104, price:2400.00, is_on_promotion:false}]) +# Kangkung + menu_category1_menu_item105 = SimpleMenuItem.create({item_code:"01106", name: "Kangkung", alt_name: "Twin Pot",menu_category: menu_category13 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1122", menu_item: menu_category1_menu_item105, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1121", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) +# Others +menu_category14 = MenuCategory.create({menu: menu, code:"C0013", name: "Others", alt_name: "Pork", order_by: 13,created_by: "SYSTEM DEFAULT"}) + # Quail’s Egg + menu_category1_menu_item106 = SimpleMenuItem.create({item_code:"01107", name: "Quail’s Egg", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1132", menu_item: menu_category1_menu_item106, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1131", menu_item: menu_category1_menu_item106, price:3000.00, is_on_promotion:false}]) +# Sliced Kelp + menu_category1_menu_item107 = SimpleMenuItem.create({item_code:"01108", name: "Sliced Kelp", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1142", menu_item: menu_category1_menu_item107, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1141", menu_item: menu_category1_menu_item107, price:3600.00, is_on_promotion:false}]) +# Crystal Vermicelli + menu_category1_menu_item108 = SimpleMenuItem.create({item_code:"01109", name: "Crystal Vermicelli", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1152", menu_item: menu_category1_menu_item108, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1151", menu_item: menu_category1_menu_item108, price:3600.00, is_on_promotion:false}]) +# Duck Blood + menu_category1_menu_item109 = SimpleMenuItem.create({item_code:"01110", name: "Duck Blood", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1162", menu_item: menu_category1_menu_item109, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1161", menu_item: menu_category1_menu_item109, price:2400.00, is_on_promotion:false}]) +# HK Fried Fish Skin + menu_category1_menu_item110 = SimpleMenuItem.create({item_code:"01111", name: "HK Fried Fish Skin", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1172", menu_item: menu_category1_menu_item110, price:7000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1171", menu_item: menu_category1_menu_item110, price:14000.00, is_on_promotion:false}]) +# Bamboo Shoot + menu_category1_menu_item111 = SimpleMenuItem.create({item_code:"01112", name: "Bamboo Shoot", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1182", menu_item: menu_category1_menu_item111, price:2300.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1181", menu_item: menu_category1_menu_item111, price:4600.00, is_on_promotion:false}]) +# Fried Dough Sticks + menu_category1_menu_item112 = SimpleMenuItem.create({item_code:"01113", name: "Fried Dough Sticks", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1192", menu_item: menu_category1_menu_item112, price:1000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1191", menu_item: menu_category1_menu_item112, price:2000.00, is_on_promotion:false}]) +# Noodles +menu_category15 = MenuCategory.create({menu: menu, code:"C0014", name: "Noodles", alt_name: "Chicken", order_by: 14, created_by: "SYSTEM DEFAULT"}) +# Potato Thin Vermicelli + menu_category1_menu_item113 = SimpleMenuItem.create({item_code:"01114", name: "Potato Thin Vermicelli", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1202", menu_item: menu_category1_menu_item113, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1201", menu_item: menu_category1_menu_item113, price:3000.00, is_on_promotion:false}]) +# Potato Wide Vermicelli + menu_category1_menu_item114 = SimpleMenuItem.create({item_code:"01115", name: "Potato Wide Vermicelli", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1212", menu_item: menu_category1_menu_item114, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1211", menu_item: menu_category1_menu_item114, price:3000.00, is_on_promotion:false}]) +# Rice Cake + menu_category1_menu_item115 = SimpleMenuItem.create({item_code:"01116", name: "Rice Cake ", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1222", menu_item: menu_category1_menu_item115, price:1900.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1221", menu_item: menu_category1_menu_item115, price:3800.00, is_on_promotion:false}]) +# La Mian + menu_category1_menu_item116 = SimpleMenuItem.create({item_code:"01117", name: "La Mian", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1231", menu_item: menu_category1_menu_item116, price:1800.00, is_on_promotion:false}]) +# Glass Noodle + menu_category1_menu_item117 = SimpleMenuItem.create({item_code:"01118", name: "Glass Noodle ", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1242", menu_item: menu_category1_menu_item117, price:1200.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1241", menu_item: menu_category1_menu_item117, price:2400.00, is_on_promotion:false}]) +# Rice + menu_category1_menu_item118 = SimpleMenuItem.create({item_code:"01119", name: "Rice", alt_name: "Twin Pot",menu_category: menu_category15 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1251", menu_item: menu_category1_menu_item118, price:1000.00, is_on_promotion:false}]) +# Drinks +menu_category16 = MenuCategory.create({menu: menu, code:"C0015", name: "Drinks", alt_name: "Soup_base", order_by: 15,created_by: "SYSTEM DEFAULT"}) +# Hot Homemade Fruit Tea + menu_category1_menu_item119 = SimpleMenuItem.create({item_code:"01120", name: "Hot Homemade Fruit Tea", alt_name: "Twin Pot",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1261", menu_item: menu_category1_menu_item119, price:1500.00, is_on_promotion:false}]) +# Chinese Tea + menu_category1_menu_item120 = SimpleMenuItem.create({item_code:"01121", name: "Chinese Tea", alt_name: "Twin Pot",menu_category: menu_category16 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1271", menu_item: menu_category1_menu_item120, price:1500.00, is_on_promotion:false}]) +# Juice +menu_category17 = MenuCategory.create({menu: menu, code:"C0016", name: "Juice", alt_name: "Beef_and_mutton", order_by: 16,created_by: "SYSTEM DEFAULT"}) +# Orange Juice + menu_category1_menu_item121 = SimpleMenuItem.create({item_code:"01122", name: "Orange Juice", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1281", menu_item: menu_category1_menu_item121, price:2000.00, is_on_promotion:false}]) +# Watermelon Juice + menu_category1_menu_item122 = SimpleMenuItem.create({item_code:"01123", name: "Watermelon Juice ", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1291", menu_item: menu_category1_menu_item122, price:2000.00, is_on_promotion:false}]) +# Lime Juice + menu_category1_menu_item123 = SimpleMenuItem.create({item_code:"01124", name: "Lime Juice", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1301", menu_item: menu_category1_menu_item123, price:2000.00, is_on_promotion:false}]) +# Sour Plum Juice + menu_category1_menu_item124 = SimpleMenuItem.create({item_code:"01125", name: "Sour Plum Juice ", alt_name: "Twin Pot",menu_category: menu_category17 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1311", menu_item: menu_category1_menu_item124, price:2000.00, is_on_promotion:false}]) +# Canned Drinks +menu_category18 = MenuCategory.create({menu: menu, code:"C0017", name: "Canned Drinks", alt_name: "Pork", order_by: 17,created_by: "SYSTEM DEFAULT"}) +# Coke + menu_category1_menu_item125 = SimpleMenuItem.create({item_code:"01126", name: "Coke ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1321", menu_item: menu_category1_menu_item125, price:1000.00, is_on_promotion:false}]) +# Coke Light + menu_category1_menu_item126 = SimpleMenuItem.create({item_code:"01127", name: "Coke Light ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1331", menu_item: menu_category1_menu_item126, price:1000.00, is_on_promotion:false}]) +# Sprite + menu_category1_menu_item127 = SimpleMenuItem.create({item_code:"01128", name: "Sprite ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1341", menu_item: menu_category1_menu_item127, price:1000.00, is_on_promotion:false}]) +# Red Bull + menu_category1_menu_item128 = SimpleMenuItem.create({item_code:"01129", name: "Red Bull ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1351", menu_item: menu_category1_menu_item128, price:1000.00, is_on_promotion:false}]) +# 100 Plus + menu_category1_menu_item129 = SimpleMenuItem.create({item_code:"01130", name: "100 Plus ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1361", menu_item: menu_category1_menu_item129, price:1000.00, is_on_promotion:false}]) +# POP Soda + menu_category1_menu_item130 = SimpleMenuItem.create({item_code:"01131", name: "POP Soda ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1371", menu_item: menu_category1_menu_item130, price:1000.00, is_on_promotion:false}]) +# Mineral Water + menu_category1_menu_item131 = SimpleMenuItem.create({item_code:"01132", name: "Mineral Water ", alt_name: "Twin Pot",menu_category: menu_category18 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1381", menu_item: menu_category1_menu_item131, price:500.00, is_on_promotion:false}]) +# Beer +menu_category19 = MenuCategory.create({menu: menu, code:"C0018", name: "Beer", alt_name: "Chicken", order_by: 18, created_by: "SYSTEM DEFAULT"}) +# Myanmar Beer + menu_category1_menu_item132 = SimpleMenuItem.create({item_code:"01133", name: "Myanmar Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1392", menu_item: menu_category1_menu_item132, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1391", menu_item: menu_category1_menu_item132, price:3000.00, is_on_promotion:false}]) +# Tiger Beer + menu_category1_menu_item133 = SimpleMenuItem.create({item_code:"01134", name: "Tiger Beer ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1402", menu_item: menu_category1_menu_item133, price:1500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1401", menu_item: menu_category1_menu_item133, price:3000.00, is_on_promotion:false}]) +# Heineken Beer + menu_category1_menu_item134 = SimpleMenuItem.create({item_code:"01135", name: "Heineken Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1412", menu_item: menu_category1_menu_item134, price:1800.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1411", menu_item: menu_category1_menu_item134, price:3600.00, is_on_promotion:false}]) +# Tsing Tao Beer + menu_category1_menu_item135 = SimpleMenuItem.create({item_code:"01136", name: "Tsing Tao Beer", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II1421", menu_item: menu_category1_menu_item135, price:2800.00, is_on_promotion:false}]) +# ABC Stout + menu_category1_menu_item136 = SimpleMenuItem.create({item_code:"01137", name: "ABC Stout ", alt_name: "Twin Pot",menu_category: menu_category19 , min_selectable_item: 1, max_selectable_item:1, account: beverage }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1432", menu_item: menu_category1_menu_item136, price:2000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Bottle",item_instance_code:"II1431", menu_item: menu_category1_menu_item136, price:4000.00, is_on_promotion:false}]) +# Signature Hot Tea" +menu_category20 = MenuCategory.create({menu: menu, code:"C0019", name: "Signature Hot Tea", alt_name: "Chicken", order_by: 19, created_by: "SYSTEM DEFAULT"}) +puts "Beauty in the pot's menu setup" +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"}) + +#Default Order Queue stations +order_queue_station1 = OrderQueueStation.create({station_name: "K1", 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: "K2", 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"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "print_station", 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}) +end end diff --git a/redis-stable.tar.gz b/redis-stable.tar.gz deleted file mode 100644 index 47c49f3b..00000000 Binary files a/redis-stable.tar.gz and /dev/null differ diff --git a/spec/controllers/api/origami/paypar_controller_spec.rb b/spec/controllers/api/origami/paypar_controller_spec.rb new file mode 100644 index 00000000..e0003e75 --- /dev/null +++ b/spec/controllers/api/origami/paypar_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Api::Origami::PayparController, type: :controller do + +end diff --git a/spec/controllers/crm/bookings_controller_spec.rb b/spec/controllers/crm/bookings_controller_spec.rb deleted file mode 100644 index 9a65a516..00000000 --- a/spec/controllers/crm/bookings_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Crm::BookingsController, type: :controller do - -end diff --git a/spec/controllers/crm/customers_controller_spec.rb b/spec/controllers/crm/customers_controller_spec.rb deleted file mode 100644 index 0a1a4ff6..00000000 --- a/spec/controllers/crm/customers_controller_spec.rb +++ /dev/null @@ -1,159 +0,0 @@ -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. - -RSpec.describe Crm::CustomersController, type: :controller do - - # This should return the minimal set of attributes required to create a valid - # Crm::Customer. As you add validations to Crm::Customer, 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 - # Crm::CustomersController. Be sure to keep this updated too. - let(:valid_session) { {} } - - describe "GET #index" do - it "assigns all crm_customers as @crm_customers" do - customer = Crm::Customer.create! valid_attributes - get :index, params: {}, session: valid_session - expect(assigns(:crm_customers)).to eq([customer]) - end - end - - describe "GET #show" do - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - get :show, params: {id: customer.to_param}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - end - - describe "GET #new" do - it "assigns a new crm_customer as @crm_customer" do - get :new, params: {}, session: valid_session - expect(assigns(:crm_customer)).to be_a_new(Crm::Customer) - end - end - - describe "GET #edit" do - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - get :edit, params: {id: customer.to_param}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - end - - describe "POST #create" do - context "with valid params" do - it "creates a new Crm::Customer" do - expect { - post :create, params: {crm_customer: valid_attributes}, session: valid_session - }.to change(Crm::Customer, :count).by(1) - end - - it "assigns a newly created crm_customer as @crm_customer" do - post :create, params: {crm_customer: valid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to be_a(Crm::Customer) - expect(assigns(:crm_customer)).to be_persisted - end - - it "redirects to the created crm_customer" do - post :create, params: {crm_customer: valid_attributes}, session: valid_session - expect(response).to redirect_to(Crm::Customer.last) - end - end - - context "with invalid params" do - it "assigns a newly created but unsaved crm_customer as @crm_customer" do - post :create, params: {crm_customer: invalid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to be_a_new(Crm::Customer) - end - - it "re-renders the 'new' template" do - post :create, params: {crm_customer: invalid_attributes}, session: valid_session - expect(response).to render_template("new") - 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 crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: new_attributes}, session: valid_session - customer.reload - skip("Add assertions for updated state") - end - - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: valid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - - it "redirects to the crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: valid_attributes}, session: valid_session - expect(response).to redirect_to(customer) - end - end - - context "with invalid params" do - it "assigns the crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: invalid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - - it "re-renders the 'edit' template" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: invalid_attributes}, session: valid_session - expect(response).to render_template("edit") - end - end - end - - describe "DELETE #destroy" do - it "destroys the requested crm_customer" do - customer = Crm::Customer.create! valid_attributes - expect { - delete :destroy, params: {id: customer.to_param}, session: valid_session - }.to change(Crm::Customer, :count).by(-1) - end - - it "redirects to the crm_customers list" do - customer = Crm::Customer.create! valid_attributes - delete :destroy, params: {id: customer.to_param}, session: valid_session - expect(response).to redirect_to(crm_customers_url) - end - end - -end diff --git a/spec/controllers/membership_actions_controller_spec.rb b/spec/controllers/membership_actions_controller_spec.rb new file mode 100644 index 00000000..f22e7497 --- /dev/null +++ b/spec/controllers/membership_actions_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 MembershipActionsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # MembershipAction. As you add validations to MembershipAction, 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 + # MembershipActionsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + membership_action = MembershipAction.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 + membership_action = MembershipAction.create! valid_attributes + get :show, params: {id: membership_action.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 + membership_action = MembershipAction.create! valid_attributes + get :edit, params: {id: membership_action.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 MembershipAction" do + expect { + post :create, params: {membership_action: valid_attributes}, session: valid_session + }.to change(MembershipAction, :count).by(1) + end + + it "redirects to the created membership_action" do + post :create, params: {membership_action: valid_attributes}, session: valid_session + expect(response).to redirect_to(MembershipAction.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {membership_action: 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 membership_action" do + membership_action = MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, membership_action: new_attributes}, session: valid_session + membership_action.reload + skip("Add assertions for updated state") + end + + it "redirects to the membership_action" do + membership_action = MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, membership_action: valid_attributes}, session: valid_session + expect(response).to redirect_to(membership_action) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + membership_action = MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, membership_action: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested membership_action" do + membership_action = MembershipAction.create! valid_attributes + expect { + delete :destroy, params: {id: membership_action.to_param}, session: valid_session + }.to change(MembershipAction, :count).by(-1) + end + + it "redirects to the membership_actions list" do + membership_action = MembershipAction.create! valid_attributes + delete :destroy, params: {id: membership_action.to_param}, session: valid_session + expect(response).to redirect_to(membership_actions_url) + end + end + +end diff --git a/spec/controllers/origami/paypar_controller_spec.rb b/spec/controllers/origami/paypar_controller_spec.rb new file mode 100644 index 00000000..749649d4 --- /dev/null +++ b/spec/controllers/origami/paypar_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::PayparController, type: :controller do + +end diff --git a/spec/controllers/origami/redeem_payments_controller_spec.rb b/spec/controllers/origami/redeem_payments_controller_spec.rb new file mode 100644 index 00000000..22e705d7 --- /dev/null +++ b/spec/controllers/origami/redeem_payments_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::RedeemPaymentsController, type: :controller do + +end diff --git a/spec/controllers/settings/membership_actions_controller_spec.rb b/spec/controllers/settings/membership_actions_controller_spec.rb new file mode 100644 index 00000000..af030c74 --- /dev/null +++ b/spec/controllers/settings/membership_actions_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::MembershipActionsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::MembershipAction. As you add validations to Settings::MembershipAction, 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::MembershipActionsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + membership_action = Settings::MembershipAction.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 + membership_action = Settings::MembershipAction.create! valid_attributes + get :show, params: {id: membership_action.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 + membership_action = Settings::MembershipAction.create! valid_attributes + get :edit, params: {id: membership_action.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::MembershipAction" do + expect { + post :create, params: {settings_membership_action: valid_attributes}, session: valid_session + }.to change(Settings::MembershipAction, :count).by(1) + end + + it "redirects to the created settings_membership_action" do + post :create, params: {settings_membership_action: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::MembershipAction.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_membership_action: 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_membership_action" do + membership_action = Settings::MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, settings_membership_action: new_attributes}, session: valid_session + membership_action.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_membership_action" do + membership_action = Settings::MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, settings_membership_action: valid_attributes}, session: valid_session + expect(response).to redirect_to(membership_action) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + membership_action = Settings::MembershipAction.create! valid_attributes + put :update, params: {id: membership_action.to_param, settings_membership_action: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_membership_action" do + membership_action = Settings::MembershipAction.create! valid_attributes + expect { + delete :destroy, params: {id: membership_action.to_param}, session: valid_session + }.to change(Settings::MembershipAction, :count).by(-1) + end + + it "redirects to the settings_membership_actions list" do + membership_action = Settings::MembershipAction.create! valid_attributes + delete :destroy, params: {id: membership_action.to_param}, session: valid_session + expect(response).to redirect_to(settings_membership_actions_url) + end + end + +end diff --git a/spec/controllers/settings/orders_controller_spec.rb b/spec/controllers/settings/orders_controller_spec.rb new file mode 100644 index 00000000..e715e84f --- /dev/null +++ b/spec/controllers/settings/orders_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::OrdersController, type: :controller do + +end diff --git a/spec/helpers/api/origami/paypar_helper_spec.rb b/spec/helpers/api/origami/paypar_helper_spec.rb new file mode 100644 index 00000000..d53d9eae --- /dev/null +++ b/spec/helpers/api/origami/paypar_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Api::Origami::PayparHelper. For example: +# +# describe Api::Origami::PayparHelper 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 Api::Origami::PayparHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/crm/dining_queues_helper_spec.rb b/spec/helpers/crm/dining_queues_helper_spec.rb new file mode 100644 index 00000000..1f104e6b --- /dev/null +++ b/spec/helpers/crm/dining_queues_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Crm::DiningQueuesHelper. For example: +# +# describe Crm::DiningQueuesHelper 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 Crm::DiningQueuesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/membership_actions_helper_spec.rb b/spec/helpers/membership_actions_helper_spec.rb new file mode 100644 index 00000000..d1dded48 --- /dev/null +++ b/spec/helpers/membership_actions_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the MembershipActionsHelper. For example: +# +# describe MembershipActionsHelper 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 MembershipActionsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/origami/paypar_helper_spec.rb b/spec/helpers/origami/paypar_helper_spec.rb new file mode 100644 index 00000000..4613b9e7 --- /dev/null +++ b/spec/helpers/origami/paypar_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::PayparHelper. For example: +# +# describe Origami::PayparHelper 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::PayparHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/origami/redeem_payments_helper_spec.rb b/spec/helpers/origami/redeem_payments_helper_spec.rb new file mode 100644 index 00000000..580d73ff --- /dev/null +++ b/spec/helpers/origami/redeem_payments_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::RedeemPaymentsHelper. For example: +# +# describe Origami::RedeemPaymentsHelper 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::RedeemPaymentsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/settings/membership_actions_helper_spec.rb b/spec/helpers/settings/membership_actions_helper_spec.rb new file mode 100644 index 00000000..16ba4a4d --- /dev/null +++ b/spec/helpers/settings/membership_actions_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::MembershipActionsHelper. For example: +# +# describe Settings::MembershipActionsHelper 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::MembershipActionsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/settings/orders_helper_spec.rb b/spec/helpers/settings/orders_helper_spec.rb new file mode 100644 index 00000000..028e7209 --- /dev/null +++ b/spec/helpers/settings/orders_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::OrdersHelper. For example: +# +# describe Settings::OrdersHelper 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::OrdersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/test_spec.rb b/spec/models/dining_queue_spec.rb similarity index 65% rename from spec/models/test_spec.rb rename to spec/models/dining_queue_spec.rb index 2b626b06..185068c3 100644 --- a/spec/models/test_spec.rb +++ b/spec/models/dining_queue_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -RSpec.describe Test, type: :model do +RSpec.describe DiningQueue, type: :model do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/models/membership_action_spec.rb b/spec/models/membership_action_spec.rb new file mode 100644 index 00000000..9f39102d --- /dev/null +++ b/spec/models/membership_action_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MembershipAction, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/print_setting_spec.rb~HEAD b/spec/models/print_setting_spec.rb~HEAD new file mode 100644 index 00000000..d2ee515b --- /dev/null +++ b/spec/models/print_setting_spec.rb~HEAD @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PrintSetting, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/print_setting_spec.rb~crm b/spec/models/print_setting_spec.rb~crm new file mode 100644 index 00000000..d2ee515b --- /dev/null +++ b/spec/models/print_setting_spec.rb~crm @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PrintSetting, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/membership_action_spec.rb b/spec/models/settings/membership_action_spec.rb new file mode 100644 index 00000000..eeab228c --- /dev/null +++ b/spec/models/settings/membership_action_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::MembershipAction, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/crm/crm_dining_queues_spec.rb b/spec/requests/crm/crm_dining_queues_spec.rb new file mode 100644 index 00000000..f8261136 --- /dev/null +++ b/spec/requests/crm/crm_dining_queues_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Crm::DiningQueues", type: :request do + describe "GET /crm_dining_queues" do + it "works! (now write some real specs)" do + get crm_dining_queues_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/requests/membership_actions_spec.rb b/spec/requests/membership_actions_spec.rb new file mode 100644 index 00000000..096fdf9f --- /dev/null +++ b/spec/requests/membership_actions_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "MembershipActions", type: :request do + describe "GET /membership_actions" do + it "works! (now write some real specs)" do + get membership_actions_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/requests/settings/settings_membership_actions_spec.rb b/spec/requests/settings/settings_membership_actions_spec.rb new file mode 100644 index 00000000..4ac7e179 --- /dev/null +++ b/spec/requests/settings/settings_membership_actions_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::MembershipActions", type: :request do + describe "GET /settings_membership_actions" do + it "works! (now write some real specs)" do + get settings_membership_actions_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/crm/dining_queues_routing_spec.rb b/spec/routing/crm/dining_queues_routing_spec.rb new file mode 100644 index 00000000..20d81871 --- /dev/null +++ b/spec/routing/crm/dining_queues_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Crm::DiningQueuesController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/crm/dining_queues").to route_to("crm/dining_queues#index") + end + + it "routes to #new" do + expect(:get => "/crm/dining_queues/new").to route_to("crm/dining_queues#new") + end + + it "routes to #show" do + expect(:get => "/crm/dining_queues/1").to route_to("crm/dining_queues#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/crm/dining_queues/1/edit").to route_to("crm/dining_queues#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/crm/dining_queues").to route_to("crm/dining_queues#create") + end + + it "routes to #update via PUT" do + expect(:put => "/crm/dining_queues/1").to route_to("crm/dining_queues#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/crm/dining_queues/1").to route_to("crm/dining_queues#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/crm/dining_queues/1").to route_to("crm/dining_queues#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/membership_actions_routing_spec.rb b/spec/routing/membership_actions_routing_spec.rb new file mode 100644 index 00000000..dd5cd196 --- /dev/null +++ b/spec/routing/membership_actions_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe MembershipActionsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/membership_actions").to route_to("membership_actions#index") + end + + it "routes to #new" do + expect(:get => "/membership_actions/new").to route_to("membership_actions#new") + end + + it "routes to #show" do + expect(:get => "/membership_actions/1").to route_to("membership_actions#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/membership_actions/1/edit").to route_to("membership_actions#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/membership_actions").to route_to("membership_actions#create") + end + + it "routes to #update via PUT" do + expect(:put => "/membership_actions/1").to route_to("membership_actions#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/membership_actions/1").to route_to("membership_actions#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/membership_actions/1").to route_to("membership_actions#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/settings/membership_actions_routing_spec.rb b/spec/routing/settings/membership_actions_routing_spec.rb new file mode 100644 index 00000000..137464f4 --- /dev/null +++ b/spec/routing/settings/membership_actions_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::MembershipActionsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/membership_actions").to route_to("settings/membership_actions#index") + end + + it "routes to #new" do + expect(:get => "/settings/membership_actions/new").to route_to("settings/membership_actions#new") + end + + it "routes to #show" do + expect(:get => "/settings/membership_actions/1").to route_to("settings/membership_actions#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/membership_actions/1/edit").to route_to("settings/membership_actions#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/membership_actions").to route_to("settings/membership_actions#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/membership_actions/1").to route_to("settings/membership_actions#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/membership_actions/1").to route_to("settings/membership_actions#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/membership_actions/1").to route_to("settings/membership_actions#destroy", :id => "1") + end + + end +end diff --git a/spec/views/crm/dining_queues/edit.html.erb_spec.rb b/spec/views/crm/dining_queues/edit.html.erb_spec.rb new file mode 100644 index 00000000..d6649b45 --- /dev/null +++ b/spec/views/crm/dining_queues/edit.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/edit", type: :view do + before(:each) do + @crm_dining_queue = assign(:crm_dining_queue, Crm::DiningQueue.create!( + :name => "MyString", + :contact => "MyString", + :queue_no => "MyString" + )) + end + + it "renders the edit crm_dining_queue form" do + render + + assert_select "form[action=?][method=?]", crm_dining_queue_path(@crm_dining_queue), "post" do + + assert_select "input[name=?]", "crm_dining_queue[name]" + + assert_select "input[name=?]", "crm_dining_queue[contact]" + + assert_select "input[name=?]", "crm_dining_queue[queue_no]" + end + end +end diff --git a/spec/views/crm/dining_queues/index.html.erb_spec.rb b/spec/views/crm/dining_queues/index.html.erb_spec.rb new file mode 100644 index 00000000..b368f621 --- /dev/null +++ b/spec/views/crm/dining_queues/index.html.erb_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/index", type: :view do + before(:each) do + assign(:crm_dining_queues, [ + Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + ), + Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + ) + ]) + end + + it "renders a list of crm/dining_queues" do + render + assert_select "tr>td", :text => "Name".to_s, :count => 2 + assert_select "tr>td", :text => "Contact".to_s, :count => 2 + assert_select "tr>td", :text => "Queue No".to_s, :count => 2 + end +end diff --git a/spec/views/crm/dining_queues/new.html.erb_spec.rb b/spec/views/crm/dining_queues/new.html.erb_spec.rb new file mode 100644 index 00000000..433d153d --- /dev/null +++ b/spec/views/crm/dining_queues/new.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/new", type: :view do + before(:each) do + assign(:crm_dining_queue, Crm::DiningQueue.new( + :name => "MyString", + :contact => "MyString", + :queue_no => "MyString" + )) + end + + it "renders new crm_dining_queue form" do + render + + assert_select "form[action=?][method=?]", crm_dining_queues_path, "post" do + + assert_select "input[name=?]", "crm_dining_queue[name]" + + assert_select "input[name=?]", "crm_dining_queue[contact]" + + assert_select "input[name=?]", "crm_dining_queue[queue_no]" + end + end +end diff --git a/spec/views/crm/dining_queues/show.html.erb_spec.rb b/spec/views/crm/dining_queues/show.html.erb_spec.rb new file mode 100644 index 00000000..93d2554a --- /dev/null +++ b/spec/views/crm/dining_queues/show.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/show", type: :view do + before(:each) do + @crm_dining_queue = assign(:crm_dining_queue, Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Name/) + expect(rendered).to match(/Contact/) + expect(rendered).to match(/Queue No/) + end +end diff --git a/spec/views/membership_actions/edit.html.erb_spec.rb b/spec/views/membership_actions/edit.html.erb_spec.rb new file mode 100644 index 00000000..77823c89 --- /dev/null +++ b/spec/views/membership_actions/edit.html.erb_spec.rb @@ -0,0 +1,39 @@ +require 'rails_helper' + +RSpec.describe "membership_actions/edit", type: :view do + before(:each) do + @membership_action = assign(:membership_action, MembershipAction.create!( + :membership_type => "MyString", + :is_active => false, + :gateway_communication_type => "MyString", + :gateway_url => "MyString", + :auth_token => "MyString", + :merchant_account_id => "MyString", + :created_by => "MyString", + :additional_parameter => "" + )) + end + + it "renders the edit membership_action form" do + render + + assert_select "form[action=?][method=?]", membership_action_path(@membership_action), "post" do + + assert_select "input[name=?]", "membership_action[membership_type]" + + assert_select "input[name=?]", "membership_action[is_active]" + + assert_select "input[name=?]", "membership_action[gateway_communication_type]" + + assert_select "input[name=?]", "membership_action[gateway_url]" + + assert_select "input[name=?]", "membership_action[auth_token]" + + assert_select "input[name=?]", "membership_action[merchant_account_id]" + + assert_select "input[name=?]", "membership_action[created_by]" + + assert_select "input[name=?]", "membership_action[additional_parameter]" + end + end +end diff --git a/spec/views/membership_actions/index.html.erb_spec.rb b/spec/views/membership_actions/index.html.erb_spec.rb new file mode 100644 index 00000000..a8913079 --- /dev/null +++ b/spec/views/membership_actions/index.html.erb_spec.rb @@ -0,0 +1,40 @@ +require 'rails_helper' + +RSpec.describe "membership_actions/index", type: :view do + before(:each) do + assign(:membership_actions, [ + MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "" + ), + MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "" + ) + ]) + end + + it "renders a list of membership_actions" do + render + assert_select "tr>td", :text => "Membership Type".to_s, :count => 2 + assert_select "tr>td", :text => false.to_s, :count => 2 + assert_select "tr>td", :text => "Gateway Communication Type".to_s, :count => 2 + assert_select "tr>td", :text => "Gateway Url".to_s, :count => 2 + assert_select "tr>td", :text => "Auth Token".to_s, :count => 2 + assert_select "tr>td", :text => "Merchant Account".to_s, :count => 2 + assert_select "tr>td", :text => "Created By".to_s, :count => 2 + assert_select "tr>td", :text => "".to_s, :count => 2 + end +end diff --git a/spec/views/membership_actions/index.json.jbuilder b/spec/views/membership_actions/index.json.jbuilder new file mode 100644 index 00000000..e69de29b diff --git a/spec/views/membership_actions/new.html.erb_spec.rb b/spec/views/membership_actions/new.html.erb_spec.rb new file mode 100644 index 00000000..e6cf42ea --- /dev/null +++ b/spec/views/membership_actions/new.html.erb_spec.rb @@ -0,0 +1,39 @@ +require 'rails_helper' + +RSpec.describe "membership_actions/new", type: :view do + before(:each) do + assign(:membership_action, MembershipAction.new( + :membership_type => "MyString", + :is_active => false, + :gateway_communication_type => "MyString", + :gateway_url => "MyString", + :auth_token => "MyString", + :merchant_account_id => "MyString", + :created_by => "MyString", + :additional_parameter => "" + )) + end + + it "renders new membership_action form" do + render + + assert_select "form[action=?][method=?]", membership_actions_path, "post" do + + assert_select "input[name=?]", "membership_action[membership_type]" + + assert_select "input[name=?]", "membership_action[is_active]" + + assert_select "input[name=?]", "membership_action[gateway_communication_type]" + + assert_select "input[name=?]", "membership_action[gateway_url]" + + assert_select "input[name=?]", "membership_action[auth_token]" + + assert_select "input[name=?]", "membership_action[merchant_account_id]" + + assert_select "input[name=?]", "membership_action[created_by]" + + assert_select "input[name=?]", "membership_action[additional_parameter]" + end + end +end diff --git a/spec/views/membership_actions/show.html.erb_spec.rb b/spec/views/membership_actions/show.html.erb_spec.rb new file mode 100644 index 00000000..5e52c84b --- /dev/null +++ b/spec/views/membership_actions/show.html.erb_spec.rb @@ -0,0 +1,28 @@ +require 'rails_helper' + +RSpec.describe "membership_actions/show", type: :view do + before(:each) do + @membership_action = assign(:membership_action, MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "" + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Membership Type/) + expect(rendered).to match(/false/) + expect(rendered).to match(/Gateway Communication Type/) + expect(rendered).to match(/Gateway Url/) + expect(rendered).to match(/Auth Token/) + expect(rendered).to match(/Merchant Account/) + expect(rendered).to match(/Created By/) + expect(rendered).to match(//) + end +end diff --git a/spec/views/settings/membership_actions/edit.html.erb_spec.rb b/spec/views/settings/membership_actions/edit.html.erb_spec.rb new file mode 100644 index 00000000..be5958c5 --- /dev/null +++ b/spec/views/settings/membership_actions/edit.html.erb_spec.rb @@ -0,0 +1,39 @@ +require 'rails_helper' + +RSpec.describe "settings/membership_actions/edit", type: :view do + before(:each) do + @settings_membership_action = assign(:settings_membership_action, Settings::MembershipAction.create!( + :membership_type => "MyString", + :is_active => false, + :gateway_communication_type => "MyString", + :gateway_url => "MyString", + :auth_token => "MyString", + :merchant_account_id => "MyString", + :created_by => "MyString", + :additional_parameter => "MyString" + )) + end + + it "renders the edit settings_membership_action form" do + render + + assert_select "form[action=?][method=?]", settings_membership_action_path(@settings_membership_action), "post" do + + assert_select "input[name=?]", "settings_membership_action[membership_type]" + + assert_select "input[name=?]", "settings_membership_action[is_active]" + + assert_select "input[name=?]", "settings_membership_action[gateway_communication_type]" + + assert_select "input[name=?]", "settings_membership_action[gateway_url]" + + assert_select "input[name=?]", "settings_membership_action[auth_token]" + + assert_select "input[name=?]", "settings_membership_action[merchant_account_id]" + + assert_select "input[name=?]", "settings_membership_action[created_by]" + + assert_select "input[name=?]", "settings_membership_action[additional_parameter]" + end + end +end diff --git a/spec/views/settings/membership_actions/index.html.erb_spec.rb b/spec/views/settings/membership_actions/index.html.erb_spec.rb new file mode 100644 index 00000000..9f8ea799 --- /dev/null +++ b/spec/views/settings/membership_actions/index.html.erb_spec.rb @@ -0,0 +1,40 @@ +require 'rails_helper' + +RSpec.describe "settings/membership_actions/index", type: :view do + before(:each) do + assign(:settings_membership_actions, [ + Settings::MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "Additional Parameter" + ), + Settings::MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "Additional Parameter" + ) + ]) + end + + it "renders a list of settings/membership_actions" do + render + assert_select "tr>td", :text => "Membership Type".to_s, :count => 2 + assert_select "tr>td", :text => false.to_s, :count => 2 + assert_select "tr>td", :text => "Gateway Communication Type".to_s, :count => 2 + assert_select "tr>td", :text => "Gateway Url".to_s, :count => 2 + assert_select "tr>td", :text => "Auth Token".to_s, :count => 2 + assert_select "tr>td", :text => "Merchant Account".to_s, :count => 2 + assert_select "tr>td", :text => "Created By".to_s, :count => 2 + assert_select "tr>td", :text => "Additional Parameter".to_s, :count => 2 + end +end diff --git a/spec/views/settings/membership_actions/new.html.erb_spec.rb b/spec/views/settings/membership_actions/new.html.erb_spec.rb new file mode 100644 index 00000000..506e06e9 --- /dev/null +++ b/spec/views/settings/membership_actions/new.html.erb_spec.rb @@ -0,0 +1,39 @@ +require 'rails_helper' + +RSpec.describe "settings/membership_actions/new", type: :view do + before(:each) do + assign(:settings_membership_action, Settings::MembershipAction.new( + :membership_type => "MyString", + :is_active => false, + :gateway_communication_type => "MyString", + :gateway_url => "MyString", + :auth_token => "MyString", + :merchant_account_id => "MyString", + :created_by => "MyString", + :additional_parameter => "MyString" + )) + end + + it "renders new settings_membership_action form" do + render + + assert_select "form[action=?][method=?]", settings_membership_actions_path, "post" do + + assert_select "input[name=?]", "settings_membership_action[membership_type]" + + assert_select "input[name=?]", "settings_membership_action[is_active]" + + assert_select "input[name=?]", "settings_membership_action[gateway_communication_type]" + + assert_select "input[name=?]", "settings_membership_action[gateway_url]" + + assert_select "input[name=?]", "settings_membership_action[auth_token]" + + assert_select "input[name=?]", "settings_membership_action[merchant_account_id]" + + assert_select "input[name=?]", "settings_membership_action[created_by]" + + assert_select "input[name=?]", "settings_membership_action[additional_parameter]" + end + end +end diff --git a/spec/views/settings/membership_actions/show.html.erb_spec.rb b/spec/views/settings/membership_actions/show.html.erb_spec.rb new file mode 100644 index 00000000..1f625a0a --- /dev/null +++ b/spec/views/settings/membership_actions/show.html.erb_spec.rb @@ -0,0 +1,28 @@ +require 'rails_helper' + +RSpec.describe "settings/membership_actions/show", type: :view do + before(:each) do + @settings_membership_action = assign(:settings_membership_action, Settings::MembershipAction.create!( + :membership_type => "Membership Type", + :is_active => false, + :gateway_communication_type => "Gateway Communication Type", + :gateway_url => "Gateway Url", + :auth_token => "Auth Token", + :merchant_account_id => "Merchant Account", + :created_by => "Created By", + :additional_parameter => "Additional Parameter" + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Membership Type/) + expect(rendered).to match(/false/) + expect(rendered).to match(/Gateway Communication Type/) + expect(rendered).to match(/Gateway Url/) + expect(rendered).to match(/Auth Token/) + expect(rendered).to match(/Merchant Account/) + expect(rendered).to match(/Created By/) + expect(rendered).to match(/Additional Parameter/) + end +end diff --git a/test/system/dining_queues_test.rb b/test/system/dining_queues_test.rb new file mode 100644 index 00000000..680e9dc1 --- /dev/null +++ b/test/system/dining_queues_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Crm::DiningQueuesTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit crm_dining_queues_url + # + # assert_selector "h1", text: "Crm::DiningQueue" + # end +end diff --git a/test/system/membership_actions_test.rb b/test/system/membership_actions_test.rb new file mode 100644 index 00000000..6223e2a5 --- /dev/null +++ b/test/system/membership_actions_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::MembershipActionsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_membership_actions_url + # + # assert_selector "h1", text: "Settings::MembershipAction" + # end +end