| <%= sale_item.qty %> | <%= sale_item.price %> | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| 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 %> | +Table No - <%=@table_no%> | Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %> |
| Customer : <%= @sale_data.customer.name%> | +Customer : <%= @sale_data.customer.name%> | +Customer ID : <%= @sale_data.customer.customer_id%> |
<%= @other %>
+
<% end %>
@@ -320,6 +321,9 @@ $(document).on('click', '.cashier_number', function(event){
});
$( document ).ready(function() {
+ // Disable click event cash to prevent
+ $(".payment .cash-color").off('click');
+
$('#credit_payment').click(function() {
var sale_id = $('#sale_id').text();
window.location.href = '/origami/sale/'+ sale_id + "/payment/credit_payment"
@@ -338,28 +342,58 @@ $( document ).ready(function() {
if($('#balance').text() > 0){
alert(" Insufficient Amount!")
}else{
- // payment
- var cash = $('#cash').text();
- var credit = $('#credit').text();
- var card = $('#card').text();
- var sale_id = $('#sale_id').text();
+ // payment
+ var cash = $('#cash').text();
+ var credit = $('#credit').text();
+ var card = $('#card').text();
+ var sale_id = $('#sale_id').text();
- $.ajax({type: "POST",
- url: "<%= origami_payment_cash_path %>",
- data: "cash="+ cash + "&sale_id=" + sale_id,
- success:function(result){
- localStorage.removeItem("cash");
- if($('#balance').text() < 0){
- alert("Changed amount " + $('#balance').text() * (-1) )
- }else{
- $('#pay').text("Pay")
- alert("Thank you")
+ $.ajax({type: "POST",
+ url: "<%= origami_payment_cash_path %>",
+ data: "cash="+ cash + "&sale_id=" + sale_id,
+ success:function(result){
+ localStorage.removeItem("cash");
+ if (result.status) {
+ var msg = result.message;
+ }
+ else{
+ var msg = '';
+ }
+
+ if($('#balance').text() < 0){
+ $.confirm({
+ title: 'Infomation!',
+ content: 'Changed amount ' + $('#balance').text() * (-1),
+ buttons: {
+ confirm: {
+ text: 'Ok',
+ btnClass: 'btn-green',
+ action: function(){
+ window.location.href = '/origami';
+ }
+ }
+ }
+ });
+ }
+ else{
+ $('#pay').text("Pay")
+ $.confirm({
+ title: 'Infomation!',
+ content: 'Thank you !',
+ buttons: {
+ confirm: {
+ text: 'Ok',
+ btnClass: 'btn-green',
+ action: function(){
+ window.location.href = '/origami';
+ }
+ }
+ }
+ });
+ }
}
-
- window.location.href = '/origami';
- }
- });
- }
+ });
+ }
});
$('#void').on('click',function () {
diff --git a/app/views/origami/request_bills/print.json.jbuilder b/app/views/origami/request_bills/print.json.jbuilder
index 08bf292c..332a9cec 100644
--- a/app/views/origami/request_bills/print.json.jbuilder
+++ b/app/views/origami/request_bills/print.json.jbuilder
@@ -1 +1,7 @@
-json.status true
+if @status == true
+ #show invoice number and stuff
+ json.status @status
+else
+ json.status @status
+ json.error_message @error_message
+end
diff --git a/app/views/origami/room_invoices/show.html.erb b/app/views/origami/room_invoices/show.html.erb
index 4b507526..b44340d4 100644
--- a/app/views/origami/room_invoices/show.html.erb
+++ b/app/views/origami/room_invoices/show.html.erb
@@ -41,7 +41,7 @@
- Other Payments
+
| # | -Items | -QTY - | Price - | Action | +# | +Items | +QTY + | Price + + | Action | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= count %> | -<%= sale_item.product_name %> | +<%= count %> | ++ <%= sale_item.product_name %> + | <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %> -- | - | - - | - ++ + | ++ + | + ++ + + | + <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %> -- | - | - + | + + | ++ + | + ++ | <% else %> -- | + | + + | ++ + | <% end %> |
| Date | -Receipt No | -Cashier Name | -Gross Sales | -Discount | -Total Sales | - <% TaxProfile.all.each do |r|%> -<%=r.name%> | - <% end %> -Nett Sales | -
|---|---|---|---|---|---|---|---|
| From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%> | +|||||||
|---|---|---|---|---|---|---|---|
| Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> ) | +|||||||
| <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %> | -<%=sale.receipt_no.to_s rescue ''%> | -<%=Employee.find(sale.cashier_id).name 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 => ',') %> | - <% sale.sale_taxes.each do |sale|%> -<%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %> | - <% end %> - -<%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %> | -
+ Rounding Adj. +
+ Rounding Adj. +
-
+
diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb
index 1112f72b..d0d55202 100644
--- a/app/views/settings/employees/index.html.erb
+++ b/app/views/settings/employees/index.html.erb
@@ -25,7 +25,7 @@
<%= link_to employee.name,settings_employee_path(employee) %>
<%= employee.role %>
- <%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', employee[:setting], method: :delete, data: { confirm: 'Are you sure?' } %>
+ <%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %>
<% end %>
+
\ No newline at end of file
diff --git a/app/views/reports/receipt_no/indexback.html.erb b/app/views/reports/receipt_no/indexback.html.erb
new file mode 100644
index 00000000..dc7d05ee
--- /dev/null
+++ b/app/views/reports/receipt_no/indexback.html.erb
@@ -0,0 +1,115 @@
+
+
+
+ <% if !params[:from].blank?%>
+
-
-
-
+ <% @sale_data.each do |result| %>
+
+ <% grand_total = grand_total.to_f + result.grand_total.to_f %>
+ <% total_tax += result.total_tax.to_f %>
+ <% total_sum += result.total_amount.to_f %>
+ <% discount_amt += result.total_discount.to_f %>
+ <% rounding_adj += result.rounding_adjustment.to_f %>
+
+
+
+ <%= result.receipt_no rescue '-' %>
+ <%= result.cashier_name rescue '-' %>
+ <%= result.total_amount rescue '-' %>
+ <%= result.total_discount rescue '-' %>
+ <%= sprintf "%.2f",result.total_tax rescue '-' %>
+
+
+ <%= result.grand_total %>
+ <%= result.rounding_adjustment.to_f rescue '-' %>
+ <%= result.grand_total_after_rounding() rescue '-'%>
+
+
+ <% end %>
+
+
+ <%= total_sum rescue '-'%>
+ <%= discount_amt rescue '-'%>
+ <%= sprintf "%.2f",total_tax rescue '-'%>
+
+ <%= grand_total.to_f.round(2) rescue '-'%>
+ <%= rounding_adj rescue '-'%>
+ <%= grand_total.to_f.round + rounding_adj %>
+
+
+
+ Total Amount
+ Discount Amount
+ Tax Amount
+ Grand Total
+ Rounding Adj.
+ Grand Total +
+ Rounding Adj. +
+
+
+
+| From Date : <%= params[:from] rescue '-' %> , To Date : <%= params[:to] rescue '-'%> | +|||||||
|---|---|---|---|---|---|---|---|
| Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> ) | +|||||||
| Date | -Receipt No | -Cashier Name | -Gross Sales | -Discount | -Total Sales | - <% TaxProfile.all.each do |r|%> -<%=r.name%> | - <% end %> -Nett Sales | -
|---|---|---|---|---|---|---|---|
| Recipt No | +Cashier Name | +Total Amount | +Discount Amount | +Tax Amount | + +Grand Total | +Rounding Adj. | +Grand Total + + Rounding Adj. + |
+
| <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %> | -<%=sale.receipt_no.to_s rescue ''%> | -<%=Employee.find(sale.cashier_id).name 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 => ',') %> | - <% sale.sale_taxes.each do |sale|%> -<%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %> | - <% end %> - -<%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %> | -
+ Rounding Adj. +
+
+
+
+
+ <%= render :partial=>'shift_sale_report_filter',
+ :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %>
+
+
+
++
+
+
+
+
+
+ Export to Excel
+
+
+
+
+<%= paginate @sale_data %>
+
+
\ No newline at end of file
diff --git a/app/views/reports/receipt_no/indexback.xls.erb b/app/views/reports/receipt_no/indexback.xls.erb
new file mode 100644
index 00000000..5befb18a
--- /dev/null
+++ b/app/views/reports/receipt_no/indexback.xls.erb
@@ -0,0 +1,43 @@
+
+
+
+
+
+| Date | +Receipt No | +Cashier Name | +Gross Sales | +Discount | +Total Sales | + <% TaxProfile.all.each do |r|%> +<%=r.name%> | + <% end %> +Nett Sales | +
|---|---|---|---|---|---|---|---|
| <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %> | +<%=sale.receipt_no.to_s rescue ''%> | +<%=Employee.find(sale.cashier_id).name 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 => ',') %> | + <% sale.sale_taxes.each do |sale|%> +<%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %> | + <% end %> + +<%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %> | +
+
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index b6482271..23b3a582 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -1,7 +1,7 @@
+
+
+
+
+
+| Date | +Receipt No | +Cashier Name | +Gross Sales | +Discount | +Total Sales | + <% TaxProfile.all.each do |r|%> +<%=r.name%> | + <% end %> +Nett Sales | +
|---|---|---|---|---|---|---|---|
| <%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %> | +<%=sale.receipt_no.to_s rescue ''%> | +<%=Employee.find(sale.cashier_id).name 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 => ',') %> | + <% sale.sale_taxes.each do |sale|%> +<%= number_with_delimiter(sprintf("%.2f",sale.tax_payable_amount.to_f), :delimiter => ',') %> | + <% end %> + +<%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %> | +
<%= notice %>
+
+
+
+
+
-
+
+
+
+
+Employee
+| Name | +Role | + +Action | +
|---|---|---|
| <%= @employee.name %> | +<%= @employee.role %> | ++ <%= link_to 'Edit', edit_settings_employee_path(@employee) %> + | +
- Role: - <%= @employee.role %> -
+ -- Employee ID: - <%= @employee.emp_id %> -
diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 4a348ed3..4019e479 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -11,17 +11,15 @@
-
+
Customer Details
-
+
@@ -205,15 +205,16 @@
<%= @customer.address%>
<%= @customer.date_of_birth %>
+
- Membership Transactions
+ Membership Transactions
Date
Redeem
Rebate
Balance
-
+ From Account
Status
Receipt No
@@ -226,7 +227,7 @@
<%= transaction["redeem"]%>
<%= transaction["rebate"] %>
<%= transaction["balance"] %>
-
+ <%= transaction["account_status"] %>
<%= transaction["status"] %>
<%= transaction["receipt_no"] %>
@@ -244,15 +245,24 @@
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f5ab7304..4d8fc580 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -53,5 +53,5 @@ Rails.application.configure do
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
# Set Cable URL
- config.action_cable.url = "ws://192.168.1.140:3002/cable"
+ # config.action_cable.url = "ws://192.168.1.140:3002/cable"
end
diff --git a/config/routes.rb b/config/routes.rb
index 19c35e2b..3320bdc6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
mount Sidekiq::Web => '/kiq'
# Action Cable Creation
- mount ActionCable.server => "/cable"
+ # mount ActionCable.server => "/cable"
#--------- SmartSales Installation ------------#
get 'install' => 'install#index'
@@ -104,6 +104,9 @@ Rails.application.routes.draw do
get "/:id/remove_all_discount" => "discounts#remove_all_discount"
post "/:id/remove_discount_items" => "discounts#remove_discount_items"
+ # Discount for Member
+ # post "/:id/member_discount" => "discounts#member_discount"
+
get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
@@ -268,10 +271,12 @@ Rails.application.routes.draw do
#--------- Reports Controller Sections ------------#
namespace :reports do
- resources :receipt_no, :only => [:index, :show]
+ resources :receipt_no
resources :dailysale, :only => [:index, :show]
resources :saleitem, :only => [:index, :show]
resources :shiftsale, :only => [:index, :show]
+
+ get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
# resources :sales, :only => [:index, :show]
# resources :orders, :only => [:index, :show]
# resources :customers, :only => [:index, :show]
diff --git a/config/schedule.rb b/config/schedule.rb
index b21a46e3..6a43ba25 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -2,6 +2,11 @@ set :environment, "development"
env :PATH, ENV['PATH']
set :output, 'log/whenever.log'
+every 30.minutes do
+ runner "Customer.update_rebate"
+end
+
every 30.minutes do
runner "Customer.update_membership"
-end
\ No newline at end of file
+end
+
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index fa0b1e15..ac1bb2d5 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,7 +1,17 @@
+# :concurrency: 25
+# :pidfile: /home/superuser/Application/production/sxrestaurant/tmp/pids/sidekiq.pid
+# :logfile: /home/superuser/Application/production/sxrestaurant/log/sidekiq.log
+# :queues:
+# - default
+# - [high_priority, 2]
+# :demon: true
+
+---
:concurrency: 25
-:pidfile: /home/superuser/Application/production/sxrestaurant/tmp/pids/sidekiq.pid
-:logfile: /home/superuser/Application/production/sxrestaurant/log/sidekiq.log
+:pidfile: ./tmp/pids/sidekiq.pid
+:logfile: ./log/sidekiq.log
:queues:
- default
- [high_priority, 2]
:demon: true
+
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index 18323c9d..d16449d7 100644
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/db/migrate/20170626191519_create_shift_sales.rb
@@ -21,6 +21,9 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
t.integer :dining_count, :default => 0
t.integer :takeaway_count, :default => 0
t.integer :member_count, :default => 0
+ t.integer :total_rounding, :default => 0
+ t.integer :total_receipt, :default => 0
+ t.decimal :total_void, :default => 0
t.timestamps
end
end
diff --git a/db/migrate/20170701101420_create_sales.rb b/db/migrate/20170701101420_create_sales.rb
index fc261826..d0e70287 100644
--- a/db/migrate/20170701101420_create_sales.rb
+++ b/db/migrate/20170701101420_create_sales.rb
@@ -13,6 +13,7 @@ class CreateSales < ActiveRecord::Migration[5.1]
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
+ t.string :discount_type, :default => "overall"
t.decimal :total_discount, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.string :tax_type, :null => false , :dfault => "exclusive_tax"
@@ -22,6 +23,7 @@ class CreateSales < ActiveRecord::Migration[5.1]
t.decimal :amount_changed, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.integer :shift_sale_id
t.decimal :old_grand_total
+ t.string :rebate_status
t.timestamps
end
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 3bff75a0..8fe62bde 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -103,7 +103,7 @@ customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contac
# 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"})
+tax_profiles = TaxProfile.create({id:1, name: "Commercial 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"})
diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake
index f8b4ae4a..e0e0be3a 100644
--- a/lib/tasks/menu_import.rake
+++ b/lib/tasks/menu_import.rake
@@ -9,24 +9,30 @@ beverage = Account.create({title: "Beverage", account_type: "1"})
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_category1_menu_item01 = SimpleMenuItem.create({item_code:"010010", name: "Beauty Collagen Broth", alt_name: "胶原蛋白养颜美容锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+ # menu_category1_menu_item02 = SimpleMenuItem.create({item_code:"010011", name: "Spicy Nourishing Broth", alt_name: "滋补养生香辣锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+ # menu_category1_menu_item03 = SimpleMenuItem.create({item_code:"010012", name: "Herbal Drunken Chicken Broth", alt_name: "养生药膳醉鸡锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+ # menu_category1_menu_item04 = SimpleMenuItem.create({item_code:"010013", name: "Cooling Coconut Broth", alt_name: "清凉解热雪耳椰子锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+ # menu_category1_menu_item05 = SimpleMenuItem.create({item_code:"010014", name: "Lonevity Wild Pine Mushroom Broth", alt_name: "长生抗癌松茸菌锅",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
+ # menu_category1_menu_item06 = SimpleMenuItem.create({item_code:"010015", name: "Vitamin C Tomato Sweet Corn Broth", alt_name: "维他命C番茄玉米锅",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:0.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen 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:"Spicy Nourishing Broth ",item_instance_code:"II0061", 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:"II0061", 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:"II0071", menu_item: menu_category1_menu_item0, price:17800.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut 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:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0091", menu_item: menu_category1_menu_item0, price:15800.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0101", 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_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:0.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen 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:"Spicy Nourishing 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:"Spicy Nourishing 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:"Herbal Drunken Chicken 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:"Cooling Coconut 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:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0092", 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:"II0102", 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_category1_menu_item2 = SimpleMenuItem.create({item_code:"01003", name: "VIP Room Individual Pot", alt_name: "VIP",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:0.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen 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:"Spicy Nourishing Broth ",item_instance_code:"II0063", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}])
diff --git a/public/fonts/NotoSansCJKtc-Regular.ttf b/public/fonts/NotoSansCJKtc-Regular.ttf
new file mode 100644
index 00000000..0e767023
Binary files /dev/null and b/public/fonts/NotoSansCJKtc-Regular.ttf differ
| Membership type | -Is active | -Gateway communication type | Gateway url | -Auth token | Merchant account | -Created by | -Additional 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?' } %> | @@ -44,4 +37,6 @@ <% end %>
<%= 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 %> | +
- 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_settings/show.html.erb b/app/views/settings/membership_settings/show.html.erb index de4d610d..ecbb9ec1 100644 --- a/app/views/settings/membership_settings/show.html.erb +++ b/app/views/settings/membership_settings/show.html.erb @@ -1,39 +1,49 @@ -<%= notice %>
-- Membership type: - <%= @settings_membership_setting.membership_type %> -
+
+
+
+
+
+
+
+
+
diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb
index e92ed0bb..fbb19182 100644
--- a/app/views/settings/order_queue_stations/show.html.erb
+++ b/app/views/settings/order_queue_stations/show.html.erb
@@ -2,62 +2,52 @@
+
+
+
+
+
+| Membership type | +Is active | +Gateway communication type | +Gateway url | +Auth token | +Merchant account | +Created by | + +Action | +
|---|---|---|---|---|---|---|---|
| <%= @settings_membership_setting.membership_type %> | +<%= @settings_membership_setting.is_active %> | +<%= @settings_membership_setting.gateway_communication_type %> | +<%= @settings_membership_setting.gateway_url %> | +<%= @settings_membership_setting.auth_token %> | +<%= @settings_membership_setting.merchant_account rescue ''%> | +<%= @settings_membership_setting.created_by %> | ++ <%= link_to 'Edit', edit_settings_membership_setting_path(@settings_membership_setting) %> | <%= link_to 'Back', settings_membership_settings_path %> + | +
+
-
+
+
+
+
+Menu Item Option
+| Station name | +Is active | +Auto Print | +Processing items | +Print copy | +Printer name | +Font size | +Cut per item | +Use alternate name | +Created by | +Action | +
|---|---|---|---|---|---|---|---|---|---|---|
| <%= @settings_order_queue_station.station_name %> | +<%= @settings_order_queue_station.is_active %> | +<%= @settings_order_queue_station.auto_print %> | +<%= @settings_order_queue_station.processing_items %> | +<%= @settings_order_queue_station.print_copy %> | +<%= @settings_order_queue_station.printer_name %> | +<%= @settings_order_queue_station.font_size %> | +<%= @settings_order_queue_station.cut_per_item %> | +<%= @settings_order_queue_station.use_alternate_name %> | +<%= @settings_order_queue_station.created_by %> | +
+ <%= link_to 'Edit', edit_settings_order_queue_station_path(@settings_order_queue_station) %> | <%= link_to 'Destroy', settings_order_queue_station_path(@settings_order_queue_station), method: :delete, data: { confirm: 'Are you sure?' } %> |
- - Station name: - <%= @settings_order_queue_station.station_name %> - + <%= link_to 'Back', settings_order_queue_stations_path %> + |
+
- Is active: - <%= @settings_order_queue_station.is_active %> -
- -- Auto Print: - <%= @settings_order_queue_station.auto_print %> -
- -- Processing items: - <%= @settings_order_queue_station.processing_items %> -
- -- Print copy: - <%= @settings_order_queue_station.print_copy %> -
- -- Printer name: - <%= @settings_order_queue_station.printer_name %> -
- -- Font size: - <%= @settings_order_queue_station.font_size %> -
- -- Cut per item: - <%= @settings_order_queue_station.cut_per_item %> -
- -- Use alternate name: - <%= @settings_order_queue_station.use_alternate_name %> -
- -- Created by: - <%= @settings_order_queue_station.created_by %> -
- -<%= link_to 'Edit', edit_settings_order_queue_station_path(@settings_order_queue_station) %> | <%= link_to 'Destroy', settings_order_queue_station_path(@settings_order_queue_station), method: :delete, data: { confirm: 'Are you sure?' } %> | - -<%= link_to 'Back', settings_order_queue_stations_path %> + diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 4dd15755..cbd07c41 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -39,9 +39,9 @@| Status | +Action | Action At | -Approved By | +Approved At | Remark |
|---|---|---|---|---|---|
| <%= audit.action%> | +<%= audit.action_at.strftime("%m-%d-%Y %H:%M %p")%> | +<%= audit.approved_by.to_datetime.strftime("%m-%d-%Y %H:%M %p")%> | +<%= audit.remark%> | + +